diff --git a/.github/workflows/auto-tag-on-release.yml b/.github/workflows/auto-tag-on-release.yml
index 280d23b0..f95bd076 100644
--- a/.github/workflows/auto-tag-on-release.yml
+++ b/.github/workflows/auto-tag-on-release.yml
@@ -67,7 +67,8 @@ jobs:
       # dispatch Release / Docker Publish / Desktop Package (workflow_dispatch
       # is exempt). FnOS FPK is cascaded from Release after the GitHub Release
       # exists (reuses Release wheel + waits for GHCR image from Docker Publish).
-      # Desktop builds in parallel; its release job upserts zips onto the same v*.
+      # Desktop and FnOS upsert their packages onto the same v* GitHub Release
+      # after it exists (FnOS is dispatched from Release.yml).
       - name: Trigger Release, Docker Publish, and Desktop Package
         if: steps.check_tag.outputs.should_publish == 'true'
         env:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9671aa9e..e3826b10 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,8 +1,9 @@
 name: CI
 
+# Pull requests only. GitHub runs PR checks on the merge result, so a push
+# build on main would re-test content that the release / feature PR already
+# proved green.
 on:
-  push:
-    branches: [main]
   pull_request:
 
 concurrency:
@@ -13,6 +14,9 @@ jobs:
   quality:
     name: "Python ${{ matrix.python-version }}"
     runs-on: ubuntu-latest
+    # Post-release main → develop sync PRs carry main's already-tested tree and
+    # are auto-merged by the bot before checks finish. See sync-main-to-develop.
+    if: ${{ !startsWith(github.head_ref, 'chore/sync-develop-after-') }}
     strategy:
       fail-fast: false
       matrix:
@@ -40,6 +44,7 @@ jobs:
   test-windows:
     name: Windows / Python 3.12
     runs-on: windows-latest
+    if: ${{ !startsWith(github.head_ref, 'chore/sync-develop-after-') }}
     steps:
       - uses: actions/checkout@v4
 
@@ -65,8 +70,8 @@ jobs:
     runs-on: ubuntu-latest
     # Only the main repo may access secrets; fork PRs get none and must skip.
     if: >-
-      github.event_name == 'push' ||
-      github.event.pull_request.head.repo.full_name == github.repository
+      github.event.pull_request.head.repo.full_name == github.repository &&
+      !startsWith(github.head_ref, 'chore/sync-develop-after-')
     steps:
       - uses: actions/checkout@v4
 
diff --git a/.github/workflows/fnos-build-fpk.yml b/.github/workflows/fnos-build-fpk.yml
index 23910f47..677ad9e2 100644
--- a/.github/workflows/fnos-build-fpk.yml
+++ b/.github/workflows/fnos-build-fpk.yml
@@ -3,18 +3,19 @@ name: Build Octop FPK
 # FnOS (飞牛 NAS) 安装包流水线。
 #
 # 触发：
-#   - Release 工作流在 GitHub Release 创建成功后自动 dispatch（推荐）
-#   - 亦可手动 workflow_dispatch（需对应版本镜像已在 GHCR）
+#   - Release 工作流在 GitHub Release（v*）创建成功后自动 dispatch（推荐）
+#   - 亦可手动 workflow_dispatch（需对应版本镜像已在 GHCR，且 v* Release 已存在）
 #
 # 制品复用：
 #   - Docker 镜像：不再重建，等待 docker-publish 推送的
 #     ghcr.io/tencentcloud/octop:{version|latest}
 #   - Native wheel：优先从同版本 GitHub Release（v*）下载；
 #     缺失时再回退到本仓源码构建
+#   - 产物挂到同一个 v* GitHub Release（与 wheel / 桌面包并列），不再单独打 fnos-* tag
 #
 # Jobs：
 #   version → ensure-image → fpk（Docker 版 .fpk，仅打包 compose）
-#           ↘ native（本地版 .fpk）→ release（按版本号发布 fnos-<ver>）
+#           ↘ native（本地版 .fpk）→ release（把 .fpk 挂到已有的 v* GitHub Release）
 
 on:
   workflow_dispatch:
@@ -48,9 +49,9 @@ jobs:
           IMAGE="ghcr.io/$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')"
           echo "version=$VER" >> "$GITHUB_OUTPUT"
           echo "image=$IMAGE" >> "$GITHUB_OUTPUT"
-          echo "tag=fnos-${VER}" >> "$GITHUB_OUTPUT"
+          echo "tag=v${VER}" >> "$GITHUB_OUTPUT"
           echo "pkg_ver=${VER}" >> "$GITHUB_OUTPUT"
-          echo "[version] VER=$VER, TAG=fnos-${VER}"
+          echo "[version] VER=$VER, TAG=v${VER}"
 
   # 复用 docker-publish 已推送的镜像，不在此重新 build/push。
   ensure-image:
@@ -256,52 +257,28 @@ jobs:
           cp artifacts/docker-fpk/*.fpk dist/ || true
           cp artifacts/native-fpk/*.fpk dist/ || true
           ls -lh dist
+          if ! ls dist/*.fpk >/dev/null 2>&1; then
+            echo "::error::No .fpk files to attach."
+            exit 1
+          fi
 
-      - name: Generate changelog
-        id: changelog
+      - name: Require existing v* GitHub Release
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAG: ${{ needs.version.outputs.tag }}
         run: |
-          VER="${{ needs.version.outputs.version }}"
-          IMAGE="${{ needs.version.outputs.image }}"
-          PREV_TAG=""
-          for t in $(git tag --list "fnos-*" --sort=-creatordate); do
-            [ "$t" = "fnos-latest" ] && continue
-            if git merge-base --is-ancestor "$t" HEAD 2>/dev/null; then
-              PREV_TAG="$t"
-              break
-            fi
-          done
-          echo "prev_tag=$PREV_TAG" >> "$GITHUB_OUTPUT"
-          {
-            echo "## 安装说明"
-            echo ""
-            echo "1. 飞牛应用中心 → 设置 → 手动安装应用，选择对应 .fpk。"
-            echo "2. Docker 版 **Octop-fnos-docker-${VER}.fpk**（约 80KB）：飞牛自动从 GHCR 拉取 \`${IMAGE}:latest\`。"
-            echo "3. 本地版 **Octop-fnos-native-${VER}.fpk**（约 200MB）：非 Docker，原生运行在飞牛主机；安装时自动关联系统 Python 3.12 开发工具；浏览器、远程桌面等附加组件在 Octop 应用内按需安装。"
-            echo ""
-            echo "---"
-            echo "按版本号下载对应 .fpk 即可（如 \`Octop-fnos-docker-${VER}.fpk\` / \`Octop-fnos-native-${VER}.fpk\`）。"
-            echo ""
-            echo "## 本次更新（v${VER}）"
-            echo ""
-            if [ -n "$PREV_TAG" ]; then
-              git log --oneline --no-merges "$PREV_TAG"..HEAD | head -30
-            else
-              git log --oneline --no-merges -30 HEAD
-            fi
-          } > /tmp/release-body.md
-          cat /tmp/release-body.md
+          set -euo pipefail
+          if ! gh release view "$TAG" --repo "${{ github.repository }}" >/dev/null; then
+            echo "::error::GitHub Release ${TAG} does not exist yet. Run this after Release.yml creates it."
+            exit 1
+          fi
 
-      - name: Publish versioned release
+      - name: Attach fpk to GitHub Release
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ needs.version.outputs.tag }}
-          target_commitish: ${{ github.sha }}
-          name: Octop (FnOS) v${{ needs.version.outputs.pkg_ver }}
-          body_path: /tmp/release-body.md
           files: dist/*.fpk
-          draft: false
-          prerelease: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          fail_on_unmatched_files: true
+          generate_release_notes: false
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/octop-desktop.yml b/.github/workflows/octop-desktop.yml
index df079568..9a8239a5 100644
--- a/.github/workflows/octop-desktop.yml
+++ b/.github/workflows/octop-desktop.yml
@@ -1,10 +1,8 @@
 name: Octop Desktop Package
 
-# 正式发版：Auto Tag 在打 v* 后与 Release / Docker Publish 一并 dispatch（GITHUB_TOKEN
-# 打的 tag 不会触发 push workflow）。产物由本 workflow 的 release job upsert 到同一
-# GitHub Release。workflow_dispatch 保留给手工补包 / 按平台重跑。
-# 不要对任意分支 push 跑六平台矩阵。
-# pull_request（desktop/**）打 darwin-* + windows-*，不跑 linux。
+# 正式发版：Auto Tag 在打 v* 后与 Release / Docker Publish 一并 dispatch。
+# 产物 upsert 到同一 GitHub Release。手工补包：workflow_dispatch + release_tag
+# （不必跑在 v* ref 上）。attach_from_run 只挂已有 artifact、不重打。
 
 on:
   push:
@@ -22,12 +20,12 @@ on:
         default: "all"
         type: string
       attach_release:
-        description: "If running on a v* tag, also upload zips to that GitHub Release"
+        description: "Upload artifacts to a GitHub Release (v* ref, or pass release_tag)"
         required: false
         default: true
         type: boolean
       release_tag:
-        description: "GitHub Release tag to attach to (e.g. v0.9.27). Defaults to the current v* tag ref."
+        description: "GitHub Release tag to attach to (e.g. v0.9.31). Used when not running on a v* ref."
         required: false
         default: ""
         type: string
@@ -40,9 +38,15 @@ on:
 permissions:
   contents: read
 
+# Builds on the same ref cancel each other (PR retrigger / accidental double
+# dispatch). Attach-only runs use a different group so they cannot cancel an
+# in-flight six-platform package on develop.
 concurrency:
-  group: green-portable-${{ github.ref }}
-  cancel-in-progress: true
+  group: >-
+    green-portable-${{
+      github.event.inputs.attach_from_run != '' && 'attach' || 'build'
+    }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name != 'workflow_dispatch' || github.event.inputs.attach_from_run == '' }}
 
 env:
   # Prefer GitHub upstream on Actions runners (npmmirror is for CN local builds).
@@ -67,7 +71,7 @@ jobs:
       - name: Build frontend → src/octop/dashboard
         run: make build-frontend
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v7
         with:
           name: dashboard-dist
           path: src/octop/dashboard/
@@ -139,7 +143,14 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
-      - uses: actions/download-artifact@v5
+      - name: Read package version
+        run: |
+          set -euo pipefail
+          VER=$(sed -nE 's/^version[[:space:]]*=[[:space:]]*"([^"]+)".*/\1/p' pyproject.toml | head -1)
+          echo "OCTOP_VERSION=${VER}" >> "$GITHUB_ENV"
+          echo "version=${VER}"
+
+      - uses: actions/download-artifact@v8
         with:
           name: dashboard-dist
           path: src/octop/dashboard
@@ -219,20 +230,31 @@ jobs:
       - name: Install Wails v3 CLI
         run: go install github.com/wailsapp/wails/v3/cmd/wails3@v3.0.0-beta.13
 
+      - name: Install NSIS
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          choco install nsis --yes --no-progress
+          $nsis = "${env:ProgramFiles(x86)}\NSIS"
+          if (-not (Test-Path "$nsis\makensis.exe")) {
+            throw "makensis.exe missing after NSIS install"
+          }
+          Add-Content -Path $env:GITHUB_PATH -Value $nsis
+
       - name: Package desktop app with bundled portable runtime
         working-directory: desktop/src
         run: >-
           wails3 task package
           ARCH=${{ matrix.arch }}
-          PORTABLE_ZIP=../portable/release/Octop-${{ matrix.plat }}.zip
+          VERSION=${{ env.OCTOP_VERSION }}
+          PORTABLE_ZIP=../portable/release/Octop-portable-${{ matrix.plat }}-${{ env.OCTOP_VERSION }}.zip
 
       # archive: false — upload the prebuilt zip as-is. Default archive=true would
-      # wrap it again, so Actions UI / "Download artifact" becomes zip-in-zip
-      # (Octop-<plat>.zip containing another Octop-<plat>.zip). Affects every plat.
+      # wrap it again, so Actions UI / "Download artifact" becomes zip-in-zip.
       # With archive:false, artifact name is the filename (name: is ignored).
       - uses: actions/upload-artifact@v7
         with:
-          path: desktop/portable/release/Octop-${{ matrix.plat }}.zip
+          path: desktop/portable/release/Octop-portable-${{ matrix.plat }}-${{ env.OCTOP_VERSION }}.zip
           archive: false
           if-no-files-found: error
           retention-days: 14
@@ -240,7 +262,7 @@ jobs:
       - name: Upload bundled desktop package
         uses: actions/upload-artifact@v7
         with:
-          path: desktop/src/bin/Octop-Desktop-${{ matrix.plat }}.*
+          path: desktop/src/bin/Octop-desktop-${{ matrix.plat }}-${{ env.OCTOP_VERSION }}.*
           archive: false
           if-no-files-found: error
           retention-days: 14
@@ -256,6 +278,9 @@ jobs:
       (
         (github.event_name == 'workflow_dispatch' &&
          github.event.inputs.attach_from_run != '') ||
+        (github.event_name == 'workflow_dispatch' &&
+         github.event.inputs.attach_release == 'true' &&
+         github.event.inputs.release_tag != '') ||
         (startsWith(github.ref, 'refs/tags/v') &&
          (github.event_name == 'push' ||
           (github.event_name == 'workflow_dispatch' &&
@@ -281,7 +306,7 @@ jobs:
           echo "tag=${tag}" >> "$GITHUB_OUTPUT"
 
       # v8 required for archive:false artifacts. skip-decompress keeps the
-      # uploaded .zip / .tar / .dmg / .exe intact — default unzip turns portable
+      # uploaded .zip / .tar.gz / .dmg / .exe intact — default unzip turns portable
       # zips into directories, so files: release-assets/* would skip them.
       - uses: actions/download-artifact@v8
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 48fbe6b1..563a6c19 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -122,6 +122,9 @@ jobs:
               echo '```'
             } > .release-notes.md
           fi
+          if ! grep -q '^## Downloads' .release-notes.md; then
+            python3 scripts/release_download_links.py "$version" >> .release-notes.md
+          fi
 
       - name: Create release
         uses: softprops/action-gh-release@v2
@@ -134,13 +137,12 @@ jobs:
   # started via GITHUB_TOKEN workflow_dispatch (Auto Tag). Explicitly cascade.
   #
   # This job intentionally has no checkout: pass --repo so `gh` does not need a
-  # local .git (bare runner → "fatal: not a git repository"). continue-on-error
-  # keeps a cascade miss from marking PyPI/GitHub release as failed.
+  # local .git (bare runner → "fatal: not a git repository"). Dispatch failure
+  # must fail this workflow so a missed sync is visible.
   sync-develop:
     name: Trigger sync main into develop
     needs: github-release
     runs-on: ubuntu-latest
-    continue-on-error: true
     steps:
       - name: Dispatch Sync Main Into Develop
         env:
@@ -148,15 +150,15 @@ jobs:
         run: |
           gh workflow run sync-main-to-develop.yml \
             --repo "${{ github.repository }}" \
-            --ref main
+            --ref main \
+            -f version="${{ github.ref_name }}"
 
   # FnOS FPK：复用本 Release 的 wheel + docker-publish 的 GHCR 镜像。
-  # 与 sync-develop 并行；失败不阻断发版。
+  # 与 sync-develop 并行。Dispatch 失败必须让本 workflow 变红（PyPI 已发布仍如此）。
   trigger-fnos:
     name: Trigger FnOS FPK build
     needs: github-release
     runs-on: ubuntu-latest
-    continue-on-error: true
     steps:
       - name: Dispatch Build Octop FPK
         env:
diff --git a/.github/workflows/sync-main-to-develop.yml b/.github/workflows/sync-main-to-develop.yml
index 86055936..f6cd712f 100644
--- a/.github/workflows/sync-main-to-develop.yml
+++ b/.github/workflows/sync-main-to-develop.yml
@@ -2,26 +2,21 @@ name: Sync Main Into Develop
 
 # After Release succeeds, sync main → develop.
 #
-# Primary trigger: Release.yml explicitly dispatches this workflow (see
-# sync-develop job). Do not rely only on `release: published` or
-# `workflow_run` — when Auto Tag starts Release with GITHUB_TOKEN, those
-# events often never create a Sync run. workflow_dispatch remains for
-# manual catch-up; workflow_run / release are kept as best-effort backups.
+# Only trigger: Release.yml (and humans) dispatch this workflow. Do not also
+# listen for `release: published` or `workflow_run` — those duplicate the
+# explicit dispatch and force-push the same sync branch.
 #
 # Strategy: keep main an ancestor of develop. Try merge first; on conflict,
 # rebuild on main and open a PR (develop is often branch-protected against
 # force-push). Never use head=main merge PRs — that pattern conflicts when
 # main was updated via a bulk develop merge (#150-style divergence).
 on:
-  workflow_run:
-    workflows:
-      - Release
-    types:
-      - completed
   workflow_dispatch:
-  release:
-    types:
-      - published
+    inputs:
+      version:
+        description: "Release tag being synced, e.g. v0.9.31. Blank = read main's pyproject.toml."
+        required: false
+        type: string
 
 permissions:
   contents: write
@@ -30,12 +25,6 @@ permissions:
 jobs:
   sync:
     name: Sync main into develop
-    if: >
-      github.event_name == 'workflow_dispatch' ||
-      (github.event_name == 'release' && startsWith(github.event.release.tag_name, 'v')) ||
-      (github.event_name == 'workflow_run' &&
-       github.event.workflow_run.conclusion == 'success' &&
-       startsWith(github.event.workflow_run.head_branch, 'v'))
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -47,14 +36,23 @@ jobs:
       - name: Sync develop onto main
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          TAG: ${{ github.event.release.tag_name || github.event.workflow_run.head_branch || 'manual' }}
+          TAG: ${{ inputs.version }}
         run: |
           set -euo pipefail
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git fetch origin main develop
+
+          # Prefer the version input from Release.yml. Fall back to main's
+          # shipped pyproject so a blank dispatch still gets a unique branch
+          # name instead of colliding across releases.
           version="${TAG#v}"
+          if [ -z "$version" ]; then
+            version="$(git show origin/main:pyproject.toml \
+              | sed -nE 's/^version = "([^"]+)".*/\1/p' | head -1)"
+          fi
+          : "${version:?could not resolve the version being synced}"
           sync_branch="chore/sync-develop-after-${version}"
-          git fetch origin main develop
 
           if git merge-base --is-ancestor origin/main origin/develop; then
             echo "develop already contains main tip; nothing to sync."
@@ -118,7 +116,7 @@ jobs:
               --base develop \
               --head "${sync_branch}" \
               --title "chore: sync develop onto main after ${version}" \
-              --body "Post-release sync so \`main\` stays an ancestor of \`develop\` (${TAG}). Merge when CI is green."
+              --body "Post-release sync so \`main\` stays an ancestor of \`develop\` (v${version}). Carries main's already-tested tree, so CI is skipped for this branch."
           )"
           echo "Created sync PR: ${url}"
 
diff --git a/.gitignore b/.gitignore
index 779e5c26..b1551df5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
+# Build
+build/
+!desktop/src/build/
+!desktop/src/build/**
+dist/
+
 # OS
 .DS_Store
 .DS_Store?
@@ -19,10 +25,6 @@ __pycache__/
 *$py.class
 *.so
 .Python
-build/
-!desktop/src/build/
-!desktop/src/build/**
-dist/
 *.egg-info/
 *.egg
 .eggs/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75919659..8a8dcb2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,29 @@
 
 ## [Unreleased]
 
+## [0.9.32] - 2026-09-06
+
+### 新增
+
+- 聊天运行轨迹抽屉与回合时间轴；人机确认以可读审批卡片展示
+- 知识库支持更多文档格式与可选 OCR，上传显示进度
+- 定时任务支持名称，计划回合持久化
+- 备份可选择归档内容；连接器支持多实例与共享；插件可按智能体开关
+- OpenSandbox 远程沙箱；工作台浏览器按用户隔离 profile
+- 飞书扫码创建应用；远程手机可自动安装 Docker
+- 桌面端 Windows NSIS 安装包与 macOS DMG；未知路由 404 页
+
+### 修复
+
+- 旧备份在 schema 变更后可恢复；桌面打包版本与应用元数据对齐
+- 主动关怀时区、专家卡片头像、用户表固定列
+- 运行轨迹写库开销、日志轮转、通道二维码轮询与远程 Docker 安装权限
+
+### 变更
+
+- 语音与搜索设置迁到模型页；控制台改用 OctopSpinner
+- 默认管理员凭据改为首次运行写入 `~/octop-login.txt`
+
 ## [0.9.31] - 2026-09-01
 
 ### 新增
diff --git a/README.md b/README.md
index 3b5c2b85..5fa76ec2 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 <p align="center">
   <a href="https://www.python.org/downloads/"><img alt="Python 3.12+" src="https://img.shields.io/badge/python-3.12%2B-blue?logo=python&logoColor=white" /></a>
   <a href="https://github.com/TencentCloud/Octop/blob/main/LICENSE"><img alt="License: MIT" src="https://img.shields.io/badge/license-MIT-green" /></a>
-  <a href="https://github.com/TencentCloud/Octop/releases"><img alt="Version" src="https://img.shields.io/badge/version-0.9.31-orange" /></a>
+  <a href="https://github.com/TencentCloud/Octop/releases"><img alt="Version" src="https://img.shields.io/badge/version-0.9.32-orange" /></a>
   <a href="https://pypi.org/project/octop/"><img src="https://img.shields.io/pypi/v/octop" alt="PyPI" /></a>
   <a href="https://github.com/astral-sh/ruff"><img alt="Code Style: Ruff" src="https://img.shields.io/badge/code%20style-ruff-000000?logo=ruff&logoColor=white" /></a>
   <a href="https://github.com/TencentCloud/Octop"><img alt="GitHub stars" src="https://img.shields.io/github/stars/TencentCloud/Octop?style=social" /></a>
@@ -135,12 +135,6 @@ Here are our mid-to-long term plans:
 
 This roadmap may shift as the community grows; treat it as indicative only.
 
-
-## 🖥️ FnOS (飞牛 NAS) Installation
-
-Octop can be installed on FnOS (飞牛 NAS) devices via the App Center as a `.fpk` package, either as a Docker-backed app or as a native (non-Docker) app. See [`fnos/README.md`](fnos/README.md) for the full packaging guide, the FPK build helper (`scripts/build-fpk.sh`), and the CI pipeline template (`.github/workflows/fnos-build-fpk.yml`).
-
-Initial admin credentials: `admin` / `Octop123` (change after first login). For non-root FnOS installs, the WeCom/Feishu connector CLIs require the fix in [PR #406](https://github.com/TencentCloud/Octop/pull/406) (user-level npm fallback).
 ## 🚀 Quick Start
 
 ### Prerequisites
@@ -189,6 +183,17 @@ curl -fsSL https://finnie-1258344699.cos.ap-guangzhou.myqcloud.com/octop/install
 
 See [scripts/README.md](scripts/README.md) for all install options (`--version`, `--from-source`, `--mirror`, Windows flags).
 
+**Desktop app** (GUI, no terminal) — grab the artifact for your platform from [GitHub Releases](https://github.com/TencentCloud/Octop/releases/latest):
+
+| Platform | Artifact |
+|----------|----------|
+| Windows | `Octop-desktop-windows-amd64-<version>.exe` (64-bit) / `Octop-desktop-windows-arm64-<version>.exe` (ARM64) — NSIS installer |
+| macOS | `Octop-desktop-darwin-arm64-<version>.dmg` (Apple Silicon) / `Octop-desktop-darwin-amd64-<version>.dmg` (Intel) |
+| Linux | `Octop-desktop-linux-amd64-<version>.tar.gz` / `Octop-desktop-linux-arm64-<version>.tar.gz` |
+| FnOS NAS | `Octop-fnos-docker-<version>.fpk` (Docker-backed) / `Octop-fnos-native-<version>.fpk` (no Docker) — install via App Center |
+
+See [desktop/README.md](desktop/README.md) for the desktop shell and [fnos/README.md](fnos/README.md) for the FnOS packaging guide.
+
 **Alternative — PyPI** (if you already manage Python yourself):
 
 ```bash
@@ -243,9 +248,9 @@ docker run -d \
   octop:latest
 ```
 
-Open `http://localhost:8088` — default credentials are `admin` / `Octop123` (change immediately). Credentials are also written to `/data/.octop/credential.txt` on first boot.
+Open `http://localhost:8088`. First boot creates an admin account with fixed default credentials `admin` / `Octop123` (written to `/data/.octop/credential.txt` in the container) — **not** a randomly generated password. Override the defaults via `OCTOP_ADMIN_USERNAME` / `OCTOP_DEFAULT_PASSWORD`.
 
-> **Password policy:** at least 8 characters with letters and digits. A future release may replace the fixed Docker default with a randomly generated password written only to `credential.txt`.
+> **Password policy:** at least 8 characters with letters and digits.
 
 | Variable | Default | Description |
 |----------|---------|-------------|
diff --git a/README_CN.md b/README_CN.md
index 9fc11fa3..5437e481 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -194,6 +194,17 @@ curl -fsSL https://finnie-1258344699.cos.ap-guangzhou.myqcloud.com/octop/install
 
 完整安装选项见 [scripts/README.md](scripts/README.md)（`--version`、`--from-source`、`--mirror` 及 Windows 参数）。
 
+**桌面客户端**（图形界面，无需终端）— 从 [GitHub Releases](https://github.com/TencentCloud/Octop/releases/latest) 下载对应平台的安装包：
+
+| 平台 | 制品 |
+|------|------|
+| Windows | `Octop-desktop-windows-amd64-<version>.exe`（64 位）/ `Octop-desktop-windows-arm64-<version>.exe`（ARM64）— NSIS 安装程序 |
+| macOS | `Octop-desktop-darwin-arm64-<version>.dmg`（Apple 芯片）/ `Octop-desktop-darwin-amd64-<version>.dmg`（Intel） |
+| Linux | `Octop-desktop-linux-amd64-<version>.tar.gz` / `Octop-desktop-linux-arm64-<version>.tar.gz` |
+| 飞牛 NAS（FnOS） | `Octop-fnos-docker-<version>.fpk`（依赖 Docker）/ `Octop-fnos-native-<version>.fpk`（无需 Docker）— 通过应用中心安装 |
+
+桌面客户端说明见 [desktop/README.md](desktop/README.md)，飞牛打包指南见 [fnos/README.md](fnos/README.md)。
+
 **备选 — PyPI**（若你已自行管理 Python 环境）：
 
 ```bash
@@ -224,8 +235,6 @@ octop service start
 
 打开 **http://127.0.0.1:8088**。Docker 首次初始化默认账号为 `admin` / `Octop123`，请立即修改密码。交互式 `octop init` / 设置向导会让你自行设置密码（至少 8 位，且同时包含字母和数字）。
 
-> ⚠️ **安全提醒：** Docker 默认管理员密码为 `Octop123`，首次启动后请尽快在「个人设置 → 修改密码」中更换，避免服务暴露到公网时被未授权访问。
-
 ### Docker（推荐用于生产部署）
 
 ```bash
@@ -242,9 +251,9 @@ docker run -d \
   octop:latest
 ```
 
-打开 `http://localhost:8088` — 默认账号 `admin` / `Octop123`（请立即修改密码）。首次启动也会把凭据写入 `/data/.octop/credential.txt`。
+打开 `http://localhost:8088`。首次初始化会以固定默认凭据创建管理员：`admin` / `Octop123`（并写入容器内 `/data/.octop/credential.txt`）——**并非随机生成**。可通过 `OCTOP_ADMIN_USERNAME` / `OCTOP_DEFAULT_PASSWORD` 覆盖默认值。
 
-> **密码策略：** 至少 8 位，且同时包含字母和数字。后续计划改为首次启动随机生成密码，并仅写入 `credential.txt`。
+> **密码策略：** 至少 8 位，且同时包含字母和数字。
 
 | 变量 | 默认值 | 说明 |
 |------|--------|------|
diff --git a/dashboard/public/octop-mascot-empty.png b/dashboard/public/octop-mascot-empty.png
new file mode 100644
index 00000000..80cdad90
Binary files /dev/null and b/dashboard/public/octop-mascot-empty.png differ
diff --git a/dashboard/src/App.tsx b/dashboard/src/App.tsx
index 4e353bc9..217894fd 100644
--- a/dashboard/src/App.tsx
+++ b/dashboard/src/App.tsx
@@ -4,7 +4,10 @@ import zhCN from "antd/locale/zh_CN";
 import enUS from "antd/locale/en_US";
 import { useEffect } from "react";
 import DesktopWindowControls from "./components/DesktopWindowControls";
-import { useDesktopChrome } from "./hooks/useDesktopChrome";
+import {
+  DesktopChromeProvider,
+  useDesktopChrome,
+} from "./hooks/useDesktopChrome";
 import { BrowserRouter, Routes, Route } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 import MainLayout from "./layouts/MainLayout";
@@ -13,6 +16,7 @@ import OidcComplete from "./pages/Login/OidcComplete";
 import SetupPage from "./pages/Setup";
 import InvitePage from "./pages/Invite";
 import AuthGuard from "./components/AuthGuard";
+import OctopSpinner from "./components/OctopSpinner";
 import { AntdAppProvider } from "./components/AntdAppProvider";
 import GlobalErrorBoundary from "./components/ErrorBoundary";
 import { ThemeProvider, useTheme } from "./context/ThemeContext";
@@ -26,6 +30,7 @@ import { brandTokensFor } from "./styles/themePalettes";
 import "./styles/theme-vars.css";
 import "./styles/layout.css";
 import "./styles/form-override.css";
+import "./styles/spin-override.css";
 
 const GlobalStyle = createGlobalStyle`
 * {
@@ -111,31 +116,38 @@ function ThemedApp() {
   };
 
   return (
-    <ConfigProvider theme={themeConfig} prefixCls="octop" locale={antdLocale}>
+    <ConfigProvider
+      theme={themeConfig}
+      prefixCls="octop"
+      locale={antdLocale}
+      spin={{ indicator: <OctopSpinner /> }}
+    >
       <AntdAppProvider>
-        {desktopChrome ? (
-          <DesktopWindowControls chrome={desktopChrome} />
-        ) : null}
-        <Routes>
-          <Route path="/login" element={<LoginPage />} />
-          <Route path="/login/oidc/complete" element={<OidcComplete />} />
-          <Route path="/setup" element={<SetupPage />} />
-          <Route path="/invite" element={<InvitePage />} />
-          <Route
-            path="/*"
-            element={
-              <AuthGuard>
-                <AgentProvider>
-                  <LayoutModeProvider>
-                    <VoiceOutputProvider>
-                      <MainLayout />
-                    </VoiceOutputProvider>
-                  </LayoutModeProvider>
-                </AgentProvider>
-              </AuthGuard>
-            }
-          />
-        </Routes>
+        <DesktopChromeProvider value={desktopChrome}>
+          {desktopChrome ? (
+            <DesktopWindowControls chrome={desktopChrome} />
+          ) : null}
+          <Routes>
+            <Route path="/login" element={<LoginPage />} />
+            <Route path="/login/oidc/complete" element={<OidcComplete />} />
+            <Route path="/setup" element={<SetupPage />} />
+            <Route path="/invite" element={<InvitePage />} />
+            <Route
+              path="/*"
+              element={
+                <AuthGuard>
+                  <AgentProvider>
+                    <LayoutModeProvider>
+                      <VoiceOutputProvider>
+                        <MainLayout />
+                      </VoiceOutputProvider>
+                    </LayoutModeProvider>
+                  </AgentProvider>
+                </AuthGuard>
+              }
+            />
+          </Routes>
+        </DesktopChromeProvider>
       </AntdAppProvider>
     </ConfigProvider>
   );
diff --git a/dashboard/src/api/modules/backup.ts b/dashboard/src/api/modules/backup.ts
index 2496ba83..ff83b3bc 100644
--- a/dashboard/src/api/modules/backup.ts
+++ b/dashboard/src/api/modules/backup.ts
@@ -5,6 +5,12 @@ export interface BackupFileItem {
   size: number;
   modified_at: string;
   created_at: string;
+  includes_config?: boolean;
+  includes_workspaces?: boolean;
+  includes_skill_packages?: boolean;
+  includes_plugins?: boolean;
+  includes_knowledge?: boolean;
+  includes_chats?: boolean;
 }
 
 export interface BackupListResponse {
@@ -16,9 +22,24 @@ export interface AutoBackupSettings {
   auto_enabled: boolean;
   schedule: string;
   retention_count: number;
+  include_config: boolean;
+  include_workspaces: boolean;
+  include_skill_packages: boolean;
+  include_plugins: boolean;
+  include_knowledge: boolean;
+  include_chats: boolean;
   scheduled?: boolean;
 }
 
+export interface CreateBackupOptions {
+  include_config: boolean;
+  include_workspaces: boolean;
+  include_skill_packages: boolean;
+  include_plugins: boolean;
+  include_knowledge: boolean;
+  include_chats: boolean;
+}
+
 export type BackupOperationKind = "create" | "restore" | "auto" | "export";
 
 export interface BackupStatusResponse {
@@ -37,6 +58,12 @@ export const backupApi = {
     auto_enabled: boolean;
     schedule: string;
     retention_count: number;
+    include_config: boolean;
+    include_workspaces: boolean;
+    include_skill_packages: boolean;
+    include_plugins: boolean;
+    include_knowledge: boolean;
+    include_chats: boolean;
   }) =>
     request<{ ok: boolean } & AutoBackupSettings>("/admin/backup/auto", {
       method: "PUT",
@@ -48,9 +75,10 @@ export const backupApi = {
       method: "POST",
     }),
 
-  createBackup: () =>
+  createBackup: (options: CreateBackupOptions) =>
     request<{ ok: boolean; item: BackupFileItem }>("/admin/backup/create", {
       method: "POST",
+      body: JSON.stringify(options),
     }),
 
   downloadBackup: (filename: string): Promise<Blob> =>
diff --git a/dashboard/src/api/modules/browser.ts b/dashboard/src/api/modules/browser.ts
index dccce0d8..26287bc8 100644
--- a/dashboard/src/api/modules/browser.ts
+++ b/dashboard/src/api/modules/browser.ts
@@ -18,9 +18,13 @@ import type {
 
 // -- Browser environment types --
 export interface BrowserEnvStatus {
-  installed: boolean;
-  browser_type: "system" | "playwright" | null;
-  path: string | null;
+  playwright: boolean;
+  browsers_ok: boolean;
+  harness_browser: boolean;
+  playwright_chromium?: boolean;
+  chrome_path?: string | null;
+  chrome_source?: "system" | "playwright" | null;
+  error: string | null;
 }
 
 function streamBrowserSse(
@@ -121,14 +125,8 @@ export const browserApi = {
 
   // -- Sessions --
 
-  getSessions: (conversationId?: string) => {
-    const path = conversationId
-      ? `/browser/harness-sessions?conversation_id=${encodeURIComponent(
-          conversationId,
-        )}`
-      : "/browser/harness-sessions";
-    return request<BrowserSessionsResponse>(path);
-  },
+  getSessions: () =>
+    request<BrowserSessionsResponse>("/browser/harness-sessions"),
 
   handoff: (sessionId: string, target: "agent" | "user", reason = "") =>
     request<{ ok: boolean; session: BrowserSession }>(
@@ -140,12 +138,10 @@ export const browserApi = {
     ),
 
   /** Stop the local Chrome process. Login cookies stay in the on-disk profile. */
-  shutdown: (profile?: string) => {
-    const path = profile
-      ? `/browser/shutdown?profile=${encodeURIComponent(profile)}`
-      : "/browser/shutdown";
-    return request<{ ok: boolean; profile: string }>(path, { method: "POST" });
-  },
+  shutdown: () =>
+    request<{ ok: boolean; profile: string }>("/browser/shutdown", {
+      method: "POST",
+    }),
 
   // -- Browser stream (WebSocket CDP screencast, ~10 fps) --
 
@@ -177,44 +173,6 @@ export const browserApi = {
     return new WebSocket(wsUrl);
   },
 
-  // -- Tabs (REST fallback when WebSocket is unavailable) --
-
-  /**
-   * Switch the active tab by page_id.
-   */
-  switchTab: (sessionId: string, pageId: string) =>
-    request<{ ok: boolean; page_id: string; url: string }>(
-      `/browser/sessions/${sessionId}/tabs/switch`,
-      {
-        method: "POST",
-        body: JSON.stringify({ page_id: pageId }),
-      },
-    ),
-
-  /**
-   * Create a new browser tab, optionally navigating to a URL.
-   */
-  newTab: (sessionId: string, url = "about:blank") =>
-    request<{ ok: boolean; page_id: string; url: string; tabs: TabInfo[] }>(
-      `/browser/sessions/${sessionId}/tabs/new`,
-      {
-        method: "POST",
-        body: JSON.stringify({ url }),
-      },
-    ),
-
-  /**
-   * Close a browser tab by page_id.
-   */
-  closeTab: (sessionId: string, pageId: string) =>
-    request<{ ok: boolean; closed: string; tabs: TabInfo[] }>(
-      `/browser/sessions/${sessionId}/tabs/close`,
-      {
-        method: "POST",
-        body: JSON.stringify({ page_id: pageId }),
-      },
-    ),
-
   // -- Browser record/replay --
 
   recordReplayStatus: () =>
@@ -260,11 +218,3 @@ export const browserApi = {
       },
     ),
 };
-
-// -- Tab info type --
-export interface TabInfo {
-  page_id: string;
-  url: string;
-  title?: string;
-  active: boolean;
-}
diff --git a/dashboard/src/api/modules/channel.ts b/dashboard/src/api/modules/channel.ts
index ffc5ef07..b9965562 100644
--- a/dashboard/src/api/modules/channel.ts
+++ b/dashboard/src/api/modules/channel.ts
@@ -204,7 +204,7 @@ export const channelApi = {
         current?: number;
         total?: number;
       }>;
-      qr_token?: string;
+      qr_url?: string;
       app_id?: string;
       app_secret?: string;
       return_code?: number;
diff --git a/dashboard/src/api/modules/connectors.ts b/dashboard/src/api/modules/connectors.ts
index 4b2dde42..21d9ad99 100644
--- a/dashboard/src/api/modules/connectors.ts
+++ b/dashboard/src/api/modules/connectors.ts
@@ -43,11 +43,17 @@ export interface ConnectorInstance {
   instance_id: string;
   kind: string;
   display_name: string;
+  description?: string | null;
   status: string;
   mcp_server_name: string;
   has_credentials: boolean;
   /** When true, chat composer pre-selects this connector. */
   default_open?: boolean;
+  shared: boolean;
+  owner_user_id: number;
+  owner_username?: string | null;
+  owner_display_name?: string | null;
+  can_manage: boolean;
   created_at: number;
   updated_at: number;
 }
@@ -129,6 +135,7 @@ export interface CustomMcpServerSpec {
   display_name?: string;
   /** When true, chat composer pre-selects this MCP server. */
   default_open?: boolean;
+  shared?: boolean;
   oauth?: CustomMcpOAuthPreview;
 }
 
@@ -189,8 +196,10 @@ export const connectorsApi = {
   createInstance: (body: {
     kind: string;
     display_name: string;
+    description?: string;
     credentials: Record<string, unknown>;
     default_open?: boolean;
+    shared?: boolean;
   }) =>
     request<ConnectorInstance>("/connector-instances", {
       method: "POST",
@@ -204,7 +213,14 @@ export const connectorsApi = {
 
   patchInstance: (
     instanceId: string,
-    body: { status?: "active" | "disabled"; default_open?: boolean },
+    body: {
+      status?: "active" | "disabled";
+      default_open?: boolean;
+      display_name?: string;
+      description?: string;
+      credentials?: Record<string, unknown>;
+      shared?: boolean;
+    },
   ) =>
     request<ConnectorInstance>(
       `/connector-instances/${encodeURIComponent(instanceId)}`,
@@ -347,7 +363,7 @@ export const connectorsApi = {
 
   patchCustomMcpServer: (
     name: string,
-    body: { enabled?: boolean; default_open?: boolean },
+    body: { enabled?: boolean; default_open?: boolean; shared?: boolean },
   ) =>
     request<{ servers: CustomMcpServers }>(
       `/connectors/custom-mcp/servers/${encodeURIComponent(name)}`,
diff --git a/dashboard/src/api/modules/expertMarket.ts b/dashboard/src/api/modules/expertMarket.ts
index 4072eadf..c017d531 100644
--- a/dashboard/src/api/modules/expertMarket.ts
+++ b/dashboard/src/api/modules/expertMarket.ts
@@ -70,6 +70,7 @@ export interface CreateMarketExpertBody {
   temperature?: number | null;
   top_p?: number | null;
   max_tokens?: number | null;
+  enable_trajectory?: boolean;
 }
 
 function hubListPath(query: string, scene: string): string {
diff --git a/dashboard/src/api/modules/knowledgeBases.test.ts b/dashboard/src/api/modules/knowledgeBases.test.ts
index 9c3b9ec9..3c9eff6a 100644
--- a/dashboard/src/api/modules/knowledgeBases.test.ts
+++ b/dashboard/src/api/modules/knowledgeBases.test.ts
@@ -73,6 +73,7 @@ describe("knowledgeBasesApi", () => {
       "/knowledge-bases/kb-1/documents",
       expect.any(FormData),
       { method: "POST" },
+      undefined,
     );
     expect(request).toHaveBeenNthCalledWith(
       1,
@@ -84,4 +85,18 @@ describe("knowledgeBasesApi", () => {
       "/knowledge-bases/kb-1/documents/doc-1/preview",
     );
   });
+
+  it("forwards the upload progress handler", () => {
+    const file = new File(["document"], "notes.md", { type: "text/markdown" });
+    const onProgress = vi.fn();
+
+    knowledgeBasesApi.uploadDocument("kb-1", file, "docs/notes.md", onProgress);
+
+    expect(requestUpload).toHaveBeenCalledWith(
+      "/knowledge-bases/kb-1/documents",
+      expect.any(FormData),
+      { method: "POST" },
+      onProgress,
+    );
+  });
 });
diff --git a/dashboard/src/api/modules/knowledgeBases.ts b/dashboard/src/api/modules/knowledgeBases.ts
index d8cfb256..489755ac 100644
--- a/dashboard/src/api/modules/knowledgeBases.ts
+++ b/dashboard/src/api/modules/knowledgeBases.ts
@@ -19,6 +19,18 @@ export interface KnowledgeCapability {
     deps_available: boolean;
     provider_ready: boolean;
   };
+  ocr: {
+    enabled: boolean;
+    backend: "onnx" | "remote";
+    model: string;
+    provider_id: string;
+    prerequisites_ok: boolean;
+    usable: boolean;
+    checks: {
+      deps_available: boolean;
+      provider_ready: boolean;
+    };
+  };
   limits?: KnowledgeLimits;
 }
 
@@ -76,6 +88,15 @@ export interface KnowledgeEmbeddingOptions {
   }[];
 }
 
+export interface KnowledgeOcrOptions {
+  local: { id: "rapidocr"; name: string };
+  remote: {
+    provider_id: string;
+    provider_name: string;
+    models: { id: string; name: string }[];
+  }[];
+}
+
 export interface KnowledgeOnnxDownloadState {
   status: "idle" | "downloading" | "loading" | "done" | "failed";
   progress: number;
@@ -99,6 +120,10 @@ export const knowledgeBasesApi = {
     backend?: "onnx" | "remote";
     model?: string;
     provider_id?: string;
+    ocr_enabled?: boolean;
+    ocr_backend?: "onnx" | "remote";
+    ocr_model?: string;
+    ocr_provider_id?: string;
   }) =>
     request<KnowledgeCapability>("/knowledge-bases/feature", {
       method: "PUT",
@@ -113,6 +138,9 @@ export const knowledgeBasesApi = {
         : "/knowledge-bases/embedding-options",
     ),
 
+  getOcrOptions: () =>
+    request<KnowledgeOcrOptions>("/knowledge-bases/ocr-options"),
+
   downloadOnnx: (model: string) =>
     request<KnowledgeOnnxDownloadState>("/knowledge-bases/onnx-download", {
       method: "POST",
@@ -224,7 +252,12 @@ export const knowledgeBasesApi = {
       },
     ),
 
-  uploadDocument: (id: string, file: File, relativePath?: string) => {
+  uploadDocument: (
+    id: string,
+    file: File,
+    relativePath?: string,
+    onProgress?: (percent: number) => void,
+  ) => {
     const body = new FormData();
     body.append("upload", file);
     if (relativePath) body.append("path", relativePath);
@@ -232,6 +265,7 @@ export const knowledgeBasesApi = {
       `/knowledge-bases/${id}/documents`,
       body,
       { method: "POST" },
+      onProgress,
     );
   },
 
diff --git a/dashboard/src/api/modules/plugins.ts b/dashboard/src/api/modules/plugins.ts
index 636acfad..ec799a93 100644
--- a/dashboard/src/api/modules/plugins.ts
+++ b/dashboard/src/api/modules/plugins.ts
@@ -43,6 +43,7 @@ export interface AgentPluginTool {
 export type AgentPluginsConfig = Record<
   string,
   {
+    enabled?: boolean;
     tools?: Record<
       string,
       {
@@ -53,6 +54,21 @@ export type AgentPluginsConfig = Record<
   }
 >;
 
+export interface AgentPlugin {
+  id: string;
+  version?: string | null;
+  name?: string | null;
+  kind?: string | null;
+  description?: string | null;
+  icon?: string | null;
+  loaded: boolean;
+  global_enabled: boolean;
+  agent_enabled: boolean;
+  /** Effective state: global and Agent switches must both be enabled. */
+  enabled: boolean;
+  tools: InstalledPlugin["tools"];
+}
+
 export const pluginsApi = {
   list(): Promise<InstalledPlugin[]> {
     return request<InstalledPlugin[]>("/plugins");
@@ -110,4 +126,18 @@ export const pluginsApi = {
       body: JSON.stringify({ plugins }),
     });
   },
+
+  listAgentPlugins(agentId: string): Promise<{ plugins: AgentPlugin[] }> {
+    return request(`/plugins/agents/${encodeURIComponent(agentId)}`);
+  },
+
+  patchAgentPlugins(
+    agentId: string,
+    plugins: Record<string, { enabled: boolean }>,
+  ): Promise<{ plugins: AgentPlugin[] }> {
+    return request(`/plugins/agents/${encodeURIComponent(agentId)}`, {
+      method: "PATCH",
+      body: JSON.stringify({ plugins }),
+    });
+  },
 };
diff --git a/dashboard/src/api/modules/publishedExperts.ts b/dashboard/src/api/modules/publishedExperts.ts
index 5f03f650..72e053af 100644
--- a/dashboard/src/api/modules/publishedExperts.ts
+++ b/dashboard/src/api/modules/publishedExperts.ts
@@ -9,6 +9,7 @@ export interface PublishedExpert {
   creator_username: string | null;
   source_agent_id: string | null;
   icon_name: string | null;
+  icon_url?: string | null;
   color: string | null;
   created_at: string;
   updated_at: string;
@@ -38,6 +39,7 @@ export interface InstallPublishedExpertBody {
   temperature?: number | null;
   top_p?: number | null;
   max_tokens?: number | null;
+  enable_trajectory?: boolean;
 }
 
 export interface InstalledPublishedExpert {
diff --git a/dashboard/src/api/modules/trajectory.ts b/dashboard/src/api/modules/trajectory.ts
new file mode 100644
index 00000000..bd1253e9
--- /dev/null
+++ b/dashboard/src/api/modules/trajectory.ts
@@ -0,0 +1,111 @@
+import { getApiUrl } from "../config";
+import { getAuthToken, request, requestBlob } from "../request";
+
+export type TrajectoryKind =
+  | "user"
+  | "assistant"
+  | "tool"
+  | "context"
+  | "compacted"
+  | "system"
+  | "unknown";
+
+export interface TrajectoryEvent {
+  event_id: string;
+  thread_id: string;
+  agent_id: string;
+  seq: number;
+  ts: number;
+  kind: TrajectoryKind;
+  turn_id: string | null;
+  request_seq: number | null;
+  is_error: boolean;
+  summary: string;
+  payload: Record<string, unknown>;
+}
+
+export interface TrajectoryHistory {
+  thread_id: string;
+  events: TrajectoryEvent[];
+  next_before_seq: number | null;
+  has_more: boolean;
+}
+
+export interface TrajectoryMetrics {
+  turns: number;
+  steps: number;
+  llm_duration_ms: number | null;
+  tool_duration_ms: number | null;
+  ttft_avg_ms: number | null;
+  tok_per_s: number | null;
+  cache_hit_ratio: number | null;
+  input_tokens: number | null;
+  output_tokens: number | null;
+  cache_read_tokens: number | null;
+}
+
+export type TrajectoryExportFormat = "jsonl" | "json";
+
+function trajectoryBase(agentId: string, threadId: string): string {
+  return `/agents/${encodeURIComponent(agentId)}/threads/${encodeURIComponent(
+    threadId,
+  )}/trajectory`;
+}
+
+export const trajectoryApi = {
+  history: (
+    agentId: string,
+    threadId: string,
+    params: {
+      limit?: number;
+      beforeSeq?: number;
+      kinds?: string[];
+    } = {},
+  ) => {
+    const search = new URLSearchParams();
+    if (params.limit != null) search.set("limit", String(params.limit));
+    if (params.beforeSeq != null) {
+      search.set("before_seq", String(params.beforeSeq));
+    }
+    if (params.kinds != null && params.kinds.length > 0) {
+      search.set("kinds", params.kinds.join(","));
+    }
+    const qs = search.toString();
+    return request<TrajectoryHistory>(
+      `${trajectoryBase(agentId, threadId)}${qs ? `?${qs}` : ""}`,
+    );
+  },
+
+  event: (agentId: string, threadId: string, eventId: string) =>
+    request<TrajectoryEvent>(
+      `${trajectoryBase(agentId, threadId)}/events/${encodeURIComponent(
+        eventId,
+      )}`,
+    ),
+
+  metrics: (agentId: string, threadId: string) =>
+    request<TrajectoryMetrics>(`${trajectoryBase(agentId, threadId)}/metrics`),
+
+  export: (
+    agentId: string,
+    threadId: string,
+    format: TrajectoryExportFormat = "jsonl",
+  ) =>
+    requestBlob(
+      `${trajectoryBase(agentId, threadId)}/export?format=${encodeURIComponent(
+        format,
+      )}`,
+    ),
+
+  /** Full URL for EventSource. JWT goes in ``access_token`` (no Authorization header). */
+  streamUrl: (agentId: string, threadId: string, afterSeq?: number) => {
+    const search = new URLSearchParams();
+    if (afterSeq != null) search.set("after_seq", String(afterSeq));
+    const token = getAuthToken();
+    if (token) search.set("access_token", token);
+    const qs = search.toString();
+    return getApiUrl(
+      `${trajectoryBase(agentId, threadId)}/stream${qs ? `?${qs}` : ""}`,
+    );
+  },
+};
diff --git a/dashboard/src/api/modules/voice.ts b/dashboard/src/api/modules/voice.ts
index 741c0e3c..8562a641 100644
--- a/dashboard/src/api/modules/voice.ts
+++ b/dashboard/src/api/modules/voice.ts
@@ -28,6 +28,16 @@ export interface ActiveVoice {
   tts: string;
 }
 
+export interface VoiceProviderInput {
+  name: string;
+  kind: string;
+  capability: string;
+  base_url?: string | null;
+  api_key?: string | null;
+  extra_json?: string | null;
+  note?: string | null;
+}
+
 function recordingFilename(type: string): string {
   const lower = type.toLowerCase();
   if (lower.includes("mp4")) return "recording.m4a";
@@ -83,15 +93,7 @@ export const voiceApi = {
         ...(provider ? { provider } : {}),
       }),
     }),
-  createProvider: (body: {
-    name: string;
-    kind: string;
-    capability: string;
-    base_url?: string | null;
-    api_key?: string | null;
-    extra_json?: string | null;
-    note?: string | null;
-  }) =>
+  createProvider: (body: VoiceProviderInput) =>
     request<VoiceProviderRow>("/admin/voice/providers", {
       method: "POST",
       body: JSON.stringify(body),
@@ -122,4 +124,12 @@ export const voiceApi = {
         body: JSON.stringify({ mode }),
       },
     ),
+  testConfiguration: (body: VoiceProviderInput & { mode: "stt" | "tts" }) =>
+    request<{ ok: boolean; error?: string }>(
+      "/admin/voice/providers/test-configuration",
+      {
+        method: "POST",
+        body: JSON.stringify(body),
+      },
+    ),
 };
diff --git a/dashboard/src/api/types/cronjob.ts b/dashboard/src/api/types/cronjob.ts
index e08f4f96..b701138e 100644
--- a/dashboard/src/api/types/cronjob.ts
+++ b/dashboard/src/api/types/cronjob.ts
@@ -67,6 +67,7 @@ export type CronJobViewLegacy = Record<string, unknown>;
  */
 export interface OctopCronRow {
   id: string;
+  name: string;
   agent_id: string;
   trigger: string;
   prompt: string;
@@ -83,10 +84,12 @@ export interface OctopCronRow {
 
 /** Body sent to POST /api/agents/:id/cron */
 export interface OctopCronCreateBody {
+  name?: string | null;
   trigger: string;
   prompt: string;
   session_key?: string | null;
   fresh_thread?: boolean;
+  enabled?: boolean;
   model?: string | null;
   task_type?: "text" | "agent";
   mcp_servers?: string[];
@@ -94,6 +97,7 @@ export interface OctopCronCreateBody {
 
 /** Body sent to PATCH /api/agents/:id/cron/:cron_id */
 export interface OctopCronPatchBody {
+  name?: string | null;
   trigger?: string;
   prompt?: string;
   session_key?: string | null;
diff --git a/dashboard/src/assets/mascot.ts b/dashboard/src/assets/mascot.ts
index ed3fb9fe..d8ae9a9a 100644
--- a/dashboard/src/assets/mascot.ts
+++ b/dashboard/src/assets/mascot.ts
@@ -2,4 +2,4 @@
  * Shared empty-state mascot (served from ``dashboard/public``).
  * Prefer ``OctopEmptyMascot`` / ``EmptyState variant="mascot"`` over hardcoding.
  */
-export const OCTOP_EMPTY_MASCOT_SRC = "/octop-mascot-tasks.png";
+export const OCTOP_EMPTY_MASCOT_SRC = "/octop-mascot-empty.png";
diff --git a/dashboard/src/components/BrowserWorkspace/ChatBrowserPanel.module.less b/dashboard/src/components/BrowserWorkspace/ChatBrowserPanel.module.less
index 2b96a808..2a7c3fdd 100644
--- a/dashboard/src/components/BrowserWorkspace/ChatBrowserPanel.module.less
+++ b/dashboard/src/components/BrowserWorkspace/ChatBrowserPanel.module.less
@@ -248,6 +248,11 @@
   min-width: 0;
 }
 
+.windowControlsSpacer {
+  flex-shrink: 0;
+  height: 1px;
+}
+
 .toolbarIconBtn {
   display: inline-flex;
   align-items: center;
diff --git a/dashboard/src/components/BrowserWorkspace/ChatDockPanelShell.test.tsx b/dashboard/src/components/BrowserWorkspace/ChatDockPanelShell.test.tsx
new file mode 100644
index 00000000..e232daf5
--- /dev/null
+++ b/dashboard/src/components/BrowserWorkspace/ChatDockPanelShell.test.tsx
@@ -0,0 +1,85 @@
+import { render } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+import { DesktopChromeProvider } from "../../hooks/useDesktopChrome";
+import {
+  DOCK_WINDOW_CONTROLS_PAD_PX,
+  WINDOW_CONTROLS_INSET,
+  WINDOW_CONTROLS_SPACER_ATTR,
+  resolveDesktopChromeStyle,
+} from "../../utils/desktopChrome";
+import ChatDockPanelShell from "./ChatDockPanelShell";
+
+const baseProps = {
+  onModeChange: vi.fn(),
+  onClose: vi.fn(),
+  children: <div>dock-body</div>,
+};
+
+function renderShell(
+  mode: "right" | "popup" | "bottom",
+  chrome: "mac" | "windows" | null,
+) {
+  return render(
+    <DesktopChromeProvider value={chrome}>
+      <ChatDockPanelShell {...baseProps} mode={mode} />
+    </DesktopChromeProvider>,
+  );
+}
+
+function expectedDockSpacer(chrome: "mac" | "windows"): string {
+  return `${WINDOW_CONTROLS_INSET[chrome] - DOCK_WINDOW_CONTROLS_PAD_PX}px`;
+}
+
+function spacerWidth(container: HTMLElement): string | undefined {
+  const el = container.querySelector(
+    `[${WINDOW_CONTROLS_SPACER_ATTR}]`,
+  ) as HTMLElement | null;
+  return el?.style.width;
+}
+
+describe("ChatDockPanelShell chrome inset", () => {
+  it("inserts a pixel spacer so right-dock and popup toolbars clear window controls", () => {
+    const { container, rerender } = renderShell("right", "mac");
+    expect(spacerWidth(container)).toBe(expectedDockSpacer("mac"));
+
+    rerender(
+      <DesktopChromeProvider value="windows">
+        <ChatDockPanelShell {...baseProps} mode="popup" />
+      </DesktopChromeProvider>,
+    );
+    expect(spacerWidth(container)).toBe(expectedDockSpacer("windows"));
+
+    rerender(
+      <DesktopChromeProvider value="mac">
+        <ChatDockPanelShell {...baseProps} mode="bottom" />
+      </DesktopChromeProvider>,
+    );
+    expect(
+      container.querySelector(`[${WINDOW_CONTROLS_SPACER_ATTR}]`),
+    ).toBeNull();
+  });
+
+  it("does not reserve window-control space outside the desktop shell", () => {
+    const { container } = renderShell("right", null);
+    expect(
+      container.querySelector(`[${WINDOW_CONTROLS_SPACER_ATTR}]`),
+    ).toBeNull();
+  });
+
+  it("still inserts the spacer from the Wails bridge when chrome context is missing", () => {
+    Object.defineProperty(window, "_wails", {
+      configurable: true,
+      value: { invoke: () => undefined },
+    });
+    const { container } = render(
+      <ChatDockPanelShell {...baseProps} mode="right" />,
+    );
+    expect(spacerWidth(container)).toBe(
+      `${
+        WINDOW_CONTROLS_INSET[resolveDesktopChromeStyle()] -
+        DOCK_WINDOW_CONTROLS_PAD_PX
+      }px`,
+    );
+    delete (window as Window & { _wails?: unknown })._wails;
+  });
+});
diff --git a/dashboard/src/components/BrowserWorkspace/ChatDockPanelShell.tsx b/dashboard/src/components/BrowserWorkspace/ChatDockPanelShell.tsx
index efd06497..faf02891 100644
--- a/dashboard/src/components/BrowserWorkspace/ChatDockPanelShell.tsx
+++ b/dashboard/src/components/BrowserWorkspace/ChatDockPanelShell.tsx
@@ -20,6 +20,14 @@ import {
 } from "lucide-react";
 import { beginPointerDragSession } from "../../hooks/usePointerDragSession";
 import type { PanelMode } from "./index";
+import { useDesktopChromeStyle } from "../../hooks/useDesktopChrome";
+import {
+  DOCK_WINDOW_CONTROLS_PAD_PX,
+  isDesktopShell,
+  resolveDesktopChromeStyle,
+  WINDOW_CONTROLS_SPACER_ATTR,
+  windowControlsEndSpacerPx,
+} from "../../utils/desktopChrome";
 import styles from "./ChatBrowserPanel.module.less";
 
 interface ChatDockPanelShellProps {
@@ -112,6 +120,10 @@ const ChatDockPanelShell: React.FC<ChatDockPanelShellProps> = ({
   children,
 }) => {
   const { t } = useTranslation();
+  const chromeFromContext = useDesktopChromeStyle();
+  const desktopChrome =
+    chromeFromContext ??
+    (isDesktopShell() ? resolveDesktopChromeStyle() : null);
   const panelRef = useRef<HTMLDivElement | null>(null);
   const prevModeRef = useRef<PanelMode>(mode);
   const [popupPos, setPopupPos] = useState<{ x: number; y: number } | null>(
@@ -370,6 +382,15 @@ const ChatDockPanelShell: React.FC<ChatDockPanelShellProps> = ({
     [mode, onModeChange, style],
   );
 
+  const windowControlsSpacerPx = windowControlsEndSpacerPx(
+    desktopChrome,
+    mode === "right" || mode === "popup",
+    DOCK_WINDOW_CONTROLS_PAD_PX,
+  );
+  const toolbarStyle: React.CSSProperties | undefined = popupFullscreen
+    ? { cursor: "default" }
+    : undefined;
+
   const togglePopupFullscreen = useCallback(() => {
     setPopupFullscreen((v) => !v);
   }, []);
@@ -426,7 +447,7 @@ const ChatDockPanelShell: React.FC<ChatDockPanelShellProps> = ({
       <div
         className={styles.toolbar}
         onPointerDown={handlePopupDragStart}
-        style={popupFullscreen ? { cursor: "default" } : undefined}
+        style={toolbarStyle}
       >
         <div className={styles.toolbarTitle}>{title}</div>
         <div className={styles.toolbarSpacer} />
@@ -499,6 +520,14 @@ const ChatDockPanelShell: React.FC<ChatDockPanelShellProps> = ({
             <X size={14} strokeWidth={1.8} />
           </button>
         </div>
+        {windowControlsSpacerPx > 0 ? (
+          <span
+            {...{ [WINDOW_CONTROLS_SPACER_ATTR]: "" }}
+            aria-hidden
+            className={styles.windowControlsSpacer}
+            style={{ width: windowControlsSpacerPx }}
+          />
+        ) : null}
       </div>
       {children}
       {mode === "popup" && !popupFullscreen && (
diff --git a/dashboard/src/components/BrowserWorkspace/index.tsx b/dashboard/src/components/BrowserWorkspace/index.tsx
index fba0a4e3..10c54a7c 100644
--- a/dashboard/src/components/BrowserWorkspace/index.tsx
+++ b/dashboard/src/components/BrowserWorkspace/index.tsx
@@ -32,7 +32,6 @@ import {
 } from "../../hooks/useViewportMode";
 import { normalizeUrl } from "../../utils/normalizeUrl";
 import { viewportModeLabel } from "../../utils/browserViewport";
-import { DEFAULT_BROWSER_PROFILE } from "../../utils/browserProfile";
 import { showApiError } from "../../utils/showApiToast";
 import BrowserViewer, { type BrowserViewerHandle } from "../BrowserViewer";
 import styles from "./index.module.less";
@@ -42,8 +41,7 @@ export type PanelMode = "hidden" | "bottom" | "right" | "popup";
 const DEFAULT_URL = "https://cloud.tencent.com";
 
 interface BrowserWorkspaceProps {
-  /** Conversation/session id used to attach the screencast to the agent's
-   *  Chrome. Falls back to "default" on the backend when absent. */
+  /** Harness profile for the current user. Server enforces the same mapping. */
   sessionId?: string | null;
   environment?: DisplayEnvironment;
   style?: React.CSSProperties;
@@ -171,7 +169,7 @@ const BrowserWorkspace: React.FC<BrowserWorkspaceProps> = ({
       }
       return {
         session_id: sessionInfo.session_id,
-        profile_name: DEFAULT_BROWSER_PROFILE,
+        profile_name: sessionInfo.session_id,
         conversation_id: sessionInfo.conversation_id,
         channel_source: sessionInfo.channel_source,
         state: sessionInfo.state || "idle",
diff --git a/dashboard/src/components/CatalogTypeCard/catalogTypeCard.module.less b/dashboard/src/components/CatalogTypeCard/catalogTypeCard.module.less
index 747400ba..2198cf3c 100644
--- a/dashboard/src/components/CatalogTypeCard/catalogTypeCard.module.less
+++ b/dashboard/src/components/CatalogTypeCard/catalogTypeCard.module.less
@@ -74,6 +74,14 @@
   flex-shrink: 0;
 }
 
+.titleCol {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 4px;
+  min-width: 0;
+}
+
 .title {
   font-size: 15px;
   font-weight: 600;
@@ -88,6 +96,8 @@
   -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
   overflow: hidden;
+  /* Always reserve two lines so `hint` sits at the same offset on every card. */
+  min-height: 3.1em;
 }
 
 .hint {
diff --git a/dashboard/src/components/CatalogTypeCard/index.tsx b/dashboard/src/components/CatalogTypeCard/index.tsx
index 76b0d0dd..cb5c10d1 100644
--- a/dashboard/src/components/CatalogTypeCard/index.tsx
+++ b/dashboard/src/components/CatalogTypeCard/index.tsx
@@ -7,6 +7,8 @@ export interface CatalogTypeCardProps {
   description: string;
   icon: ReactNode;
   hint?: string;
+  /** Optional chip shown under the title (e.g. a category label). */
+  tag?: ReactNode;
   configuredBadge?: ReactNode;
   disabled?: boolean;
   onClick: () => void;
@@ -18,6 +20,7 @@ export const CatalogTypeCard = memo(function CatalogTypeCard({
   description,
   icon,
   hint,
+  tag,
   configuredBadge,
   disabled = false,
   onClick,
@@ -42,7 +45,10 @@ export const CatalogTypeCard = memo(function CatalogTypeCard({
         >
           {icon}
         </div>
-        <div className={styles.title}>{title}</div>
+        <div className={styles.titleCol}>
+          <div className={styles.title}>{title}</div>
+          {tag}
+        </div>
       </div>
 
       <div className={styles.description}>{description}</div>
diff --git a/dashboard/src/components/NotFoundPage.module.less b/dashboard/src/components/NotFoundPage.module.less
new file mode 100644
index 00000000..bcd04325
--- /dev/null
+++ b/dashboard/src/components/NotFoundPage.module.less
@@ -0,0 +1,37 @@
+.wrap {
+  flex: 1;
+  min-height: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 24px;
+}
+
+.inner {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  text-align: center;
+  max-width: 420px;
+  gap: 8px;
+}
+
+.mascot {
+  display: block;
+  margin: 0 auto;
+}
+
+.title {
+  margin: 8px 0 0;
+  font-size: 22px;
+  font-weight: 600;
+  color: var(--fn-text-primary);
+  line-height: 1.4;
+}
+
+.hint {
+  margin: 0 0 8px;
+  font-size: 14px;
+  line-height: 1.6;
+  color: var(--fn-text-secondary);
+}
diff --git a/dashboard/src/components/NotFoundPage.test.tsx b/dashboard/src/components/NotFoundPage.test.tsx
new file mode 100644
index 00000000..09c6167b
--- /dev/null
+++ b/dashboard/src/components/NotFoundPage.test.tsx
@@ -0,0 +1,26 @@
+import { render, screen } from "@testing-library/react";
+import { MemoryRouter } from "react-router-dom";
+import { describe, expect, it, vi } from "vitest";
+import NotFoundPage from "./NotFoundPage";
+
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({
+    t: (key: string) => key,
+  }),
+}));
+
+describe("NotFoundPage", () => {
+  it("shows a gentle missing-page message and a path back to chat", () => {
+    render(
+      <MemoryRouter>
+        <NotFoundPage />
+      </MemoryRouter>,
+    );
+
+    expect(screen.getByText("common.notFound")).toBeInTheDocument();
+    expect(screen.getByText("common.notFoundHint")).toBeInTheDocument();
+    expect(
+      screen.getByRole("button", { name: "common.backToChat" }),
+    ).toBeInTheDocument();
+  });
+});
diff --git a/dashboard/src/components/NotFoundPage.tsx b/dashboard/src/components/NotFoundPage.tsx
new file mode 100644
index 00000000..bc7087ff
--- /dev/null
+++ b/dashboard/src/components/NotFoundPage.tsx
@@ -0,0 +1,23 @@
+import { Button } from "antd";
+import { useTranslation } from "react-i18next";
+import { useNavigate } from "react-router-dom";
+import { OctopEmptyMascot } from "./EmptyState";
+import styles from "./NotFoundPage.module.less";
+
+/** Catch-all placeholder for dashboard paths that do not match any route. */
+export default function NotFoundPage() {
+  const { t } = useTranslation();
+  const navigate = useNavigate();
+  return (
+    <div className={styles.wrap}>
+      <div className={styles.inner}>
+        <OctopEmptyMascot size={140} className={styles.mascot} />
+        <h1 className={styles.title}>{t("common.notFound")}</h1>
+        <p className={styles.hint}>{t("common.notFoundHint")}</p>
+        <Button type="primary" onClick={() => navigate("/chat")}>
+          {t("common.backToChat")}
+        </Button>
+      </div>
+    </div>
+  );
+}
diff --git a/dashboard/src/components/OctopSpinner/OctopSpinner.module.less b/dashboard/src/components/OctopSpinner/OctopSpinner.module.less
new file mode 100644
index 00000000..e334a003
--- /dev/null
+++ b/dashboard/src/components/OctopSpinner/OctopSpinner.module.less
@@ -0,0 +1,66 @@
+// Sizing vars come from `.octop-spin` in styles/spin-override.css so the
+// indicator can follow antd's size prop; fallbacks cover standalone usage.
+.host {
+  position: relative;
+  display: inline-block;
+  width: var(--octop-spinner-size, 24px);
+  height: var(--octop-spinner-size, 24px);
+  font-size: 0;
+  vertical-align: middle;
+}
+
+.ring {
+  position: absolute;
+  inset: 0;
+  box-sizing: border-box;
+  border: var(--octop-spinner-ring-width, 2.5px) solid
+    color-mix(in srgb, var(--fn-color-brand) 20%, transparent);
+  border-top-color: var(--fn-color-brand);
+  border-radius: 50%;
+  animation: octopSpinnerSpin 0.85s linear infinite;
+}
+
+// Percent box, not `inset`: an absolutely positioned replaced element with
+// `width: auto` falls back to its intrinsic size (logo.svg is 512px).
+.logo {
+  position: absolute;
+  top: 16%;
+  left: 16%;
+  display: none;
+  width: 68%;
+  height: 68%;
+  border-radius: 22%;
+  object-fit: contain;
+  animation: octopSpinnerBreathe 1.6s ease-in-out infinite;
+}
+
+// Only the large ring is roomy enough for a legible logo; smaller spins sit in
+// selects, list rows and inline labels and stay ring-only.
+:global(.octop-spin-lg) .logo {
+  display: block;
+}
+
+@keyframes octopSpinnerSpin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+@keyframes octopSpinnerBreathe {
+  0%,
+  100% {
+    transform: scale(1);
+    opacity: 1;
+  }
+  50% {
+    transform: scale(0.94);
+    opacity: 0.88;
+  }
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .ring,
+  .logo {
+    animation: none;
+  }
+}
diff --git a/dashboard/src/components/OctopSpinner/index.tsx b/dashboard/src/components/OctopSpinner/index.tsx
new file mode 100644
index 00000000..af06ec55
--- /dev/null
+++ b/dashboard/src/components/OctopSpinner/index.tsx
@@ -0,0 +1,28 @@
+import styles from "./OctopSpinner.module.less";
+
+const LOGO = `${import.meta.env.BASE_URL}logo.svg`;
+
+interface OctopSpinnerProps {
+  /** antd appends `${prefixCls}-dot` when this is the ConfigProvider indicator. */
+  className?: string;
+}
+
+/**
+ * Loading indicator matching the first-paint boot splash in index.html:
+ * brand-colored ring around the breathing Octop logo. Wired globally as the
+ * antd Spin indicator; only `size="large"` shows the logo.
+ */
+export default function OctopSpinner({ className }: OctopSpinnerProps) {
+  return (
+    <span className={[styles.host, className].filter(Boolean).join(" ")}>
+      <span className={styles.ring} />
+      <img
+        className={styles.logo}
+        src={LOGO}
+        alt=""
+        aria-hidden
+        draggable={false}
+      />
+    </span>
+  );
+}
diff --git a/dashboard/src/components/PwaInstallPrompt/index.test.tsx b/dashboard/src/components/PwaInstallPrompt/index.test.tsx
new file mode 100644
index 00000000..23c8d005
--- /dev/null
+++ b/dashboard/src/components/PwaInstallPrompt/index.test.tsx
@@ -0,0 +1,23 @@
+import { render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, it } from "vitest";
+import PwaInstallPrompt from "./index";
+
+describe("PwaInstallPrompt in desktop shell", () => {
+  afterEach(() => {
+    delete (window as Window & { _wails?: unknown })._wails;
+  });
+
+  it("hides the install button when the Wails bridge is present", () => {
+    Object.defineProperty(window, "_wails", {
+      configurable: true,
+      value: { invoke: () => undefined },
+    });
+    render(<PwaInstallPrompt appearance="chatFloat" />);
+    expect(screen.queryByLabelText("安装应用")).toBeNull();
+  });
+
+  it("still offers install in a regular browser", () => {
+    render(<PwaInstallPrompt appearance="chatFloat" />);
+    expect(screen.getByLabelText("安装应用")).toBeInTheDocument();
+  });
+});
diff --git a/dashboard/src/components/PwaInstallPrompt/index.tsx b/dashboard/src/components/PwaInstallPrompt/index.tsx
index 6daaf522..63eeedb1 100644
--- a/dashboard/src/components/PwaInstallPrompt/index.tsx
+++ b/dashboard/src/components/PwaInstallPrompt/index.tsx
@@ -8,6 +8,7 @@ import {
   triggerInstall,
   waitForInstallPrompt,
 } from "../../pwa-prompt";
+import { isDesktopShell } from "../../utils/desktopChrome";
 import styles from "./index.module.less";
 
 const DISMISSED_KEY = "pwa:install-dismissed";
@@ -165,7 +166,7 @@ export default function PwaInstallPrompt({
     () => !!localStorage.getItem(DISMISSED_KEY),
   );
 
-  if (isStandalone() || installState.installed) return null;
+  if (isStandalone() || isDesktopShell() || installState.installed) return null;
 
   // Chat right float: always expose the install entry until the app is
   // installed (ignore Header dismiss + beforeinstallprompt lag). Dev has no
@@ -262,7 +263,7 @@ export function PwaAutoPrompt() {
   const [show, setShow] = useState(false);
 
   useEffect(() => {
-    if (!isIosDevice() || isStandalone()) return;
+    if (!isIosDevice() || isStandalone() || isDesktopShell()) return;
     if (
       localStorage.getItem(DISMISSED_KEY) ||
       localStorage.getItem(IOS_SHOWN_KEY)
diff --git a/dashboard/src/components/ResizableTable/ResizableTable.module.css b/dashboard/src/components/ResizableTable/ResizableTable.module.css
index e6047454..8f245047 100644
--- a/dashboard/src/components/ResizableTable/ResizableTable.module.css
+++ b/dashboard/src/components/ResizableTable/ResizableTable.module.css
@@ -14,6 +14,12 @@
   z-index: 2;
 }
 
+/* The last header cell sits on the table edge: an outward handle would extend
+   the scrollable area and show a few-pixel horizontal scrollbar. */
+.cell:last-child .handle {
+  inset-inline-end: 0;
+}
+
 .handle::after {
   position: absolute;
   top: 20%;
diff --git a/dashboard/src/context/AgentContext.test.ts b/dashboard/src/context/AgentContext.test.ts
index ec489388..c14d3fcc 100644
--- a/dashboard/src/context/AgentContext.test.ts
+++ b/dashboard/src/context/AgentContext.test.ts
@@ -1,9 +1,6 @@
 import { describe, expect, it } from "vitest";
 import type { OctopAgent } from "./AgentContext";
-import {
-  projectChatAgentOption,
-  selectEnabledExperts,
-} from "./AgentContext";
+import { projectChatAgentOption, selectEnabledExperts } from "./AgentContext";
 
 function agent(
   agent_id: string,
@@ -66,9 +63,7 @@ describe("selectEnabledExperts", () => {
     ];
     // S1 is the resolvedAgentId (URL is /chat/S1). Without pinActive it must
     // disappear from the sidebar just like every other stopped expert.
-    const sidebar = selectEnabledExperts(agents, "S1").map(
-      (a) => a.agent_id,
-    );
+    const sidebar = selectEnabledExperts(agents, "S1").map((a) => a.agent_id);
     expect(sidebar).toEqual(["G1"]);
     // @-picker / minimal-layout path also excludes it.
     const pickable = selectEnabledExperts(agents, "S1", {
@@ -83,10 +78,7 @@ describe("selectEnabledExperts", () => {
   });
 
   it("returns empty when nothing is running and there is no active pin", () => {
-    const agents = [
-      agent("A", "stopped"),
-      agent("B", "failed"),
-    ];
+    const agents = [agent("A", "stopped"), agent("B", "failed")];
     expect(selectEnabledExperts(agents, null)).toEqual([]);
   });
 
diff --git a/dashboard/src/context/BackupOperationContext.tsx b/dashboard/src/context/BackupOperationContext.tsx
index b6906767..08e1a0c3 100644
--- a/dashboard/src/context/BackupOperationContext.tsx
+++ b/dashboard/src/context/BackupOperationContext.tsx
@@ -14,6 +14,7 @@ import {
   backupApi,
   type BackupOperationKind,
   type BackupStatusResponse,
+  type CreateBackupOptions,
 } from "../api/modules/backup";
 import { apiErrorMessage } from "../utils/apiError";
 
@@ -28,7 +29,7 @@ interface BackupOperationContextValue {
   creating: boolean;
   restoring: boolean;
   autoRunning: boolean;
-  createBackup: () => Promise<boolean>;
+  createBackup: (options: CreateBackupOptions) => Promise<boolean>;
   runAutoBackup: () => Promise<boolean>;
   restoreBackup: (name: string, restoreConfig: boolean) => Promise<boolean>;
   uploadBackup: (file: File) => Promise<boolean>;
@@ -95,22 +96,25 @@ export function BackupOperationProvider({ children }: { children: ReactNode }) {
     return true;
   }, []);
 
-  const createBackup = useCallback(async () => {
-    if (!beginLocal("create")) return false;
-    try {
-      await backupApi.createBackup();
-      message.success(t("backup.createSuccess"));
-      notifySettled();
-      return true;
-    } catch (err: unknown) {
-      message.error(apiErrorMessage(err, t("backup.createFailed"), t));
-      return false;
-    } finally {
-      localOwnedRef.current = false;
-      setKind(null);
-      void syncFromServer();
-    }
-  }, [beginLocal, message, notifySettled, syncFromServer, t]);
+  const createBackup = useCallback(
+    async (options: CreateBackupOptions) => {
+      if (!beginLocal("create")) return false;
+      try {
+        await backupApi.createBackup(options);
+        message.success(t("backup.createSuccess"));
+        notifySettled();
+        return true;
+      } catch (err: unknown) {
+        message.error(apiErrorMessage(err, t("backup.createFailed"), t));
+        return false;
+      } finally {
+        localOwnedRef.current = false;
+        setKind(null);
+        void syncFromServer();
+      }
+    },
+    [beginLocal, message, notifySettled, syncFromServer, t],
+  );
 
   const runAutoBackup = useCallback(async () => {
     if (!beginLocal("auto")) return false;
diff --git a/dashboard/src/hooks/useBrowserSessionState.ts b/dashboard/src/hooks/useBrowserSessionState.ts
index 4a579aee..3cce37a7 100644
--- a/dashboard/src/hooks/useBrowserSessionState.ts
+++ b/dashboard/src/hooks/useBrowserSessionState.ts
@@ -3,7 +3,8 @@ import api from "../api";
 import { getWsUrl } from "../api/config";
 import { getAuthToken } from "../api/request";
 import type { BrowserSession, DisplayEnvironment } from "../api/types/browser";
-import { DEFAULT_BROWSER_PROFILE } from "../utils/browserProfile";
+import { resolveBrowserProfile } from "../utils/browserProfile";
+import { useCurrentUser } from "./useCurrentUser";
 
 /**
  * Session update event pushed over WebSocket from the backend.
@@ -57,6 +58,9 @@ export function useBrowserSessionState(
   conversationId?: string,
   enabled = true,
 ): BrowserSessionState {
+  const currentUser = useCurrentUser();
+  const browserProfile = resolveBrowserProfile(currentUser?.id);
+  const active = enabled && browserProfile != null;
   const [session, setSession] = useState<BrowserSession | null>(null);
   const [environment, setEnvironment] =
     useState<DisplayEnvironment>("headless-server");
@@ -73,7 +77,7 @@ export function useBrowserSessionState(
 
   const fetchSessions = useCallback(async () => {
     try {
-      const resp = await api.getSessions(conversationIdRef.current);
+      const resp = await api.getSessions();
       if (unmountedRef.current) return;
       if (resp.ok) {
         setEnvironment(resp.environment);
@@ -104,7 +108,7 @@ export function useBrowserSessionState(
   }, []);
 
   const connectWs = useCallback(() => {
-    if (unmountedRef.current) return;
+    if (unmountedRef.current || !browserProfile) return;
 
     // Clean up any previous connection
     if (wsRef.current) {
@@ -149,7 +153,7 @@ export function useBrowserSessionState(
             width: 1,
             height: 1,
             reuse_session: true,
-            session_id: DEFAULT_BROWSER_PROFILE,
+            session_id: browserProfile,
           }),
         );
       } catch {
@@ -168,12 +172,11 @@ export function useBrowserSessionState(
           type: string;
         };
         if (msg.type === "session_update") {
-          // Shared default profile applies across conversations; also accept
-          // updates scoped to the current conversation id when present.
+          // Browser state is scoped to the authenticated user's profile.
           const cid = conversationIdRef.current;
           const shared =
-            msg.session_id === DEFAULT_BROWSER_PROFILE ||
-            msg.conversation_id === DEFAULT_BROWSER_PROFILE;
+            msg.session_id === browserProfile ||
+            msg.conversation_id === browserProfile;
           if (!cid || shared || msg.conversation_id === cid) {
             setSession((prev) => {
               if (!prev) {
@@ -182,7 +185,7 @@ export function useBrowserSessionState(
                 // HTTP fetch to complete.
                 return {
                   session_id: msg.session_id,
-                  profile_name: DEFAULT_BROWSER_PROFILE,
+                  profile_name: browserProfile,
                   conversation_id: msg.conversation_id,
                   channel_source: msg.channel_source,
                   state: msg.state,
@@ -230,7 +233,7 @@ export function useBrowserSessionState(
     };
 
     wsRef.current = ws;
-  }, [fetchSessions, scheduleReconnect]);
+  }, [browserProfile, fetchSessions, scheduleReconnect]);
 
   useEffect(() => {
     connectWsRef.current = connectWs;
@@ -240,7 +243,7 @@ export function useBrowserSessionState(
 
   // Initial HTTP fetch + WS connect
   useEffect(() => {
-    if (!enabled) return;
+    if (!active) return;
     unmountedRef.current = false;
     fetchSessions();
     connectWs();
@@ -260,13 +263,13 @@ export function useBrowserSessionState(
         wsRef.current = null;
       }
     };
-  }, [enabled, fetchSessions, connectWs]);
+  }, [active, fetchSessions, connectWs]);
 
   // Re-fetch when conversationId changes
   useEffect(() => {
-    if (!enabled) return;
+    if (!active) return;
     fetchSessions();
-  }, [enabled, conversationId, fetchSessions]);
+  }, [active, conversationId, fetchSessions]);
 
   return {
     session,
diff --git a/dashboard/src/hooks/useBrowserStream.ts b/dashboard/src/hooks/useBrowserStream.ts
index 1c33782c..773c0453 100644
--- a/dashboard/src/hooks/useBrowserStream.ts
+++ b/dashboard/src/hooks/useBrowserStream.ts
@@ -29,11 +29,7 @@ interface BrowserStreamCallbacks {
 }
 
 interface ConnectOptions {
-  /** Optional harness profile name. All surfaces (chat panel, standalone
-   *  page, and the agent's `browser_use` tool) share the same `"default"`
-   *  profile so cookies/login and open tabs stay consistent across
-   *  conversations and between headed and headless runs. When unset, the
-   *  backend falls back to `"default"` as well. */
+  /** Harness profile for the current user. The WebSocket also binds from JWT. */
   sessionId?: string | null;
 }
 
@@ -119,8 +115,6 @@ export function useBrowserStream() {
         };
         if (options.sessionId) {
           startMsg.session_id = options.sessionId;
-        } else {
-          startMsg.session_id = "default";
         }
         ws.send(JSON.stringify(startMsg));
         setCurrentUrl(url);
diff --git a/dashboard/src/hooks/useDesktopChrome.ts b/dashboard/src/hooks/useDesktopChrome.ts
index c71b572f..6b3f0e8b 100644
--- a/dashboard/src/hooks/useDesktopChrome.ts
+++ b/dashboard/src/hooks/useDesktopChrome.ts
@@ -1,4 +1,11 @@
-import { useEffect, useState } from "react";
+import {
+  createContext,
+  createElement,
+  useContext,
+  useEffect,
+  useState,
+  type ReactNode,
+} from "react";
 import {
   applyDesktopChrome,
   installDesktopWindowDrag,
@@ -7,6 +14,8 @@ import {
   type DesktopChromeStyle,
 } from "../utils/desktopChrome";
 
+const DesktopChromeContext = createContext<DesktopChromeStyle | null>(null);
+
 /** Activate frameless window chrome after the Wails bridge appears. */
 export function useDesktopChrome(): DesktopChromeStyle | null {
   const [style, setStyle] = useState<DesktopChromeStyle | null>(null);
@@ -24,7 +33,6 @@ export function useDesktopChrome(): DesktopChromeStyle | null {
     if (tryApply()) {
       return () => {
         cancelled = true;
-        applyDesktopChrome(null);
       };
     }
     const timer = window.setInterval(() => {
@@ -35,9 +43,22 @@ export function useDesktopChrome(): DesktopChromeStyle | null {
       cancelled = true;
       window.clearInterval(timer);
       window.clearTimeout(stop);
-      applyDesktopChrome(null);
     };
   }, []);
 
   return style;
 }
+
+export function DesktopChromeProvider({
+  value,
+  children,
+}: {
+  value: DesktopChromeStyle | null;
+  children: ReactNode;
+}) {
+  return createElement(DesktopChromeContext.Provider, { value }, children);
+}
+
+export function useDesktopChromeStyle(): DesktopChromeStyle | null {
+  return useContext(DesktopChromeContext);
+}
diff --git a/dashboard/src/layouts/sidebarNav.tsx b/dashboard/src/layouts/sidebarNav.tsx
index 445f6aa3..838de714 100644
--- a/dashboard/src/layouts/sidebarNav.tsx
+++ b/dashboard/src/layouts/sidebarNav.tsx
@@ -144,7 +144,6 @@ export function buildNavSections(
       path: "/knowledge-bases",
       icon: <Database size={iconSize} strokeWidth={iconStroke} />,
       labelKey: "nav.knowledgeBases",
-      badge: "BETA",
     });
   }
   if (settingsItems.length > 0) {
diff --git a/dashboard/src/locales/en.json b/dashboard/src/locales/en.json
index 7846a35a..3aafe548 100644
--- a/dashboard/src/locales/en.json
+++ b/dashboard/src/locales/en.json
@@ -52,6 +52,8 @@
     "unknownError": "Unknown error",
     "noPermission": "Permission denied",
     "noPermissionHint": "You do not have access to this page. Ask an administrator to grant it.",
+    "notFound": "Page not found",
+    "notFoundHint": "This address does not match any page. Check the link, or go back to chat.",
     "backToChat": "Back to chat",
     "viewDetail": "View Details",
     "viewMore": "View More",
@@ -75,6 +77,7 @@
     "SETUP_REQUIRED": "Initial setup is required.",
     "DATABASE_NOT_EMPTY": "The target database already has users. Use an empty database, or log in with the existing admin.",
     "BACKUP_DRIVER_MISMATCH": "This backup was made with a different database engine (SQLite vs PostgreSQL). Switch the runtime to match the backup, or create a new backup on the current engine. Cross-engine restore is not supported.",
+    "BACKUP_SCHEMA_INCOMPATIBLE": "This backup uses database schema version {{archive_schema_version}}, which cannot be restored by this Octop version (maximum supported: {{runtime_schema_version}}).",
     "BACKUP_IN_PROGRESS": "A backup or restore is already in progress. Try again shortly.",
     "FORBIDDEN": "Permission denied.",
     "NOT_FOUND": "Not found.",
@@ -101,10 +104,12 @@
     "PROVIDER_LOCAL_PROTECTED": "Local runtime providers cannot be deleted.",
     "STORAGE_BACKEND_NAME_TAKEN": "Storage backend name is already in use.",
     "STORAGE_BACKEND_REFERENCED": "Storage backend is in use and cannot be removed.",
+    "STORAGE_BACKEND_DEPS_FAILED": "Could not install optional components for this storage backend. Check network access and retry.",
     "CHANNEL_KIND_UNSUPPORTED": "Unsupported channel type.",
     "CHANNEL_INVALID_CREDENTIALS": "Invalid channel credentials.",
     "CHANNEL_NAME_TAKEN": "This channel name is already in use. Please choose another.",
     "CONNECTOR_NOT_FOUND": "Connector not found.",
+    "CONNECTOR_NAME_TAKEN": "This connector name is already in use. Please choose another.",
     "CONNECTOR_INVALID_CREDENTIALS": "Invalid connector credentials.",
     "CONNECTOR_OAUTH_HTTPS_REQUIRED": "Octop is currently being accessed over public HTTP, but Notion OAuth callbacks require HTTPS. Use HTTPS, or access Octop locally through localhost or 127.0.0.1.",
     "CONNECTOR_KIND_UNSUPPORTED": "Unsupported connector type.",
@@ -164,7 +169,7 @@
     "common": "Common",
     "control": "Control",
     "experts": "Experts",
-    "tasks": "Tasks",
+    "tasks": "Automation",
     "connectors": "Connectors",
     "acp": "ACP",
     "agents": "Agents",
@@ -297,7 +302,7 @@
     "emptyGuideStepWhat": "What is a knowledge base?",
     "emptyGuideStepWhatDetail": "A knowledge base splits and embeds uploaded documents so experts can retrieve relevant passages in chat, instead of stuffing the full text into context.",
     "emptyGuideStepHow": "How to use it",
-    "emptyGuideStepHowDetail": "Create a knowledge base and upload md / txt / pdf / docx / pptx files. Turn on Default enabled, or select it manually in chat.",
+    "emptyGuideStepHowDetail": "Create a knowledge base and upload text (md / txt / rst / html / json / yaml, …), spreadsheets (csv / tsv / xls / xlsx / xlsm), or pdf / docx / pptx. Turn on Default enabled, or select it manually in chat.",
     "emptyGuideStepShare": "What sharing does",
     "emptyGuideStepShareDetail": "When shared, everyone signed in on this instance can read and select it; only the owner can edit. Default enabled applies only to the owner.",
     "enableGuideTitle": "How do I enable knowledge bases?",
@@ -332,7 +337,8 @@
     "maxDocumentsHint": "Maximum number of files in this knowledge base. 0 = unlimited, default 100.",
     "documentTooLarge": "Each document must be at most {{sizeMb}} MB.",
     "baseLimitReached": "You can create at most {{count}} knowledge bases.",
-    "uploadHint": "Supports md / txt / pdf / docx / pptx. Max {{sizeMb}} MB per file.",
+    "uploadHint": "Supports text (md / txt / rst / html / json / yaml, …), spreadsheets (csv / tsv / xls / xlsx / xlsm), and pdf / docx / pptx. Max {{sizeMb}} MB per file.",
+    "uploadHintOcr": "Also supports png / jpg / webp images and OCR fallback for scanned PDFs. Max {{sizeMb}} MB per file.",
     "viewCard": "Cards",
     "viewTable": "Table",
     "updatedAt": "Updated",
@@ -384,6 +390,8 @@
     "pathBreadcrumb": "Path",
     "deleteFolderConfirm": "Delete this folder and everything inside it?",
     "uploaded": "Documents uploaded",
+    "uploading": "Uploading {{name}}",
+    "uploadingMany": "Uploading {{name}} ({{index}}/{{total}})",
     "uploadFailed": "Failed to upload documents",
     "emptyDocuments": "No documents yet",
     "filename": "File name",
@@ -420,7 +428,7 @@
     "localOnnx": "Local ONNX",
     "remoteEmbedding": "Online embedding",
     "rebuildConfirmTitle": "Rebuild all knowledge indexes?",
-    "rebuildConfirmDescription": "Changing the embedding model clears and re-embeds every knowledge index.",
+    "rebuildConfirmDescription": "Changing the embedding model or OCR settings rebuilds every knowledge index.",
     "notDownloaded": "not downloaded",
     "checkRuntime": "Runtime",
     "checkInstalled": "installed",
@@ -439,6 +447,15 @@
     "downloadModel": "Download",
     "downloadNeedModel": "The selected model is not downloaded yet. Download it before saving.",
     "onnxServiceEnabled": "Local ONNX service enabled",
+    "ocrTitle": "Image and scanned-document OCR",
+    "ocrDescription": "Optional. Indexes images and automatically recognizes scanned PDFs when normal text extraction returns nothing.",
+    "ocrLocal": "Local ONNX",
+    "ocrRemote": "Online vision model",
+    "ocrLocalHint": "RapidOCR components and default Chinese/English models are installed when saved.",
+    "ocrRemotePrivacy": "Images and rendered scan pages are sent to the selected online model provider.",
+    "ocrSelectModel": "Select an image-capable model",
+    "ocrNoProviders": "No online provider has an image-capable model",
+    "ocrNoModels": "This provider has no image-capable model",
     "enable": "Enable",
     "featureEnabled": "Knowledge bases enabled",
     "featureDisabled": "Knowledge bases disabled",
@@ -1047,6 +1064,13 @@
     "generating": "Generating",
     "generatingWithElapsed": "Generating · {{seconds}}s",
     "scrollToBottom": "Back to bottom",
+    "turnTimeline": {
+      "label": "Conversation turns",
+      "jumpToQuery": "Jump to message {{index}}",
+      "userFallback": "(empty message)",
+      "emptyAssistant": "(no reply yet)",
+      "runningAssistant": "(generating…)"
+    },
     "loadingEarlierMessages": "Loading earlier messages…",
     "scrollForEarlierMessages": "Scroll up for earlier messages",
     "refreshingMessages": "Refreshing messages…",
@@ -1158,12 +1182,96 @@
       "emptyResult": "Model returned an empty result"
     },
     "hitl": {
-      "title": "Tool approval required",
+      "title": "Confirm this action",
       "approve": "Approve",
       "reject": "Reject",
       "approved": "Approved",
       "rejectedLabel": "Rejected",
-      "rejected": "Rejected by user"
+      "rejected": "Rejected by user",
+      "args": {
+        "action": "Action",
+        "level": "Detail",
+        "url": "URL",
+        "command": "Command",
+        "cmd": "Command",
+        "path": "Path",
+        "file": "File",
+        "file_path": "File path",
+        "query": "Query",
+        "pattern": "Pattern",
+        "content": "Content",
+        "text": "Text",
+        "selector": "Selector",
+        "ref": "Element",
+        "key": "Key",
+        "value": "Value",
+        "direction": "Direction",
+        "amount": "Amount",
+        "prompt": "Prompt",
+        "old_string": "Original",
+        "new_string": "Replacement",
+        "timeout": "Timeout",
+        "method": "Method",
+        "body": "Body",
+        "code": "Script",
+        "wait": "Wait",
+        "element_ref": "Element",
+        "full_page": "Full page",
+        "tab_id": "Tab"
+      },
+      "bool": {
+        "true": "Yes",
+        "false": "No"
+      },
+      "browser": {
+        "actions": {
+          "navigate": "Open a page",
+          "open": "Open a page",
+          "snapshot": "Capture a page snapshot",
+          "dom_tree": "Read the page structure",
+          "screenshot": "Take a screenshot",
+          "click": "Click a page element",
+          "type": "Type into the page",
+          "fill": "Fill a form field",
+          "press": "Press a key",
+          "wait": "Wait for the page",
+          "select": "Choose a dropdown option",
+          "scroll": "Scroll the page",
+          "hover": "Hover over an element",
+          "eval_js": "Run a script on the page",
+          "go_back": "Go back",
+          "go_forward": "Go forward",
+          "reload": "Reload the page",
+          "new_tab": "Open a new tab",
+          "switch_tab": "Switch tabs",
+          "close_tab": "Close a tab",
+          "list_tabs": "List tabs",
+          "close_session": "Close the browser session"
+        },
+        "levels": {
+          "minimal": "Minimal structure",
+          "interactive": "Interactive elements only",
+          "full": "Full structure",
+          "structured": "Structured content"
+        },
+        "directions": {
+          "up": "Up",
+          "down": "Down",
+          "left": "Left",
+          "right": "Right"
+        }
+      },
+      "summaries": {
+        "domTreeInteractive": "Read the interactive structure of the current page",
+        "domTree": "Read the structure of the current page",
+        "screenshot": "Take a screenshot of the current page",
+        "openUrl": "Open {{url}}",
+        "runCommand": "Run command: {{command}}",
+        "writeFile": "Write file {{path}}",
+        "readFile": "Read file {{path}}",
+        "editFile": "Edit file {{path}}",
+        "fetchUrl": "Fetch {{url}}"
+      }
     },
     "ask": {
       "title": "A few questions first",
@@ -1176,6 +1284,8 @@
       "submit": "Send answers",
       "skip": "You decide",
       "skipMessage": "You decide — pick the best default and tell me what you assumed.",
+      "dismiss": "Close",
+      "dismissMessage": "The user closed these questions without answering. Do not ask again — wrap up this turn.",
       "answered": "Answered",
       "answeredSummary": "Answered {{count}} question(s)",
       "dismissedSummary": "Closed {{count}} question(s)",
@@ -1185,6 +1295,7 @@
     "openBrowser": "View browser",
     "openBrowserHint": "Agent is browsing the web",
     "openTerminal": "Open terminal",
+    "openTrajectory": "Trajectory",
     "openPhone": "Open remote phone",
     "openWorkspace": "Workspace",
     "editFileCard": "Edited {{count}} files",
@@ -1200,6 +1311,57 @@
     "dockFileMaybeDeleted": "This file may have been a temporary artifact during processing and has already been deleted.",
     "remoteBrowserTitle": "Remote Browser",
     "dockTerminalTitle": "Terminal",
+    "trajectoryTitle": "Trajectory",
+    "trajectoryEmpty": "No trajectory events yet",
+    "trajectorySelectSession": "Select a session to view trajectory",
+    "trajectoryLoadError": "Failed to load trajectory",
+    "trajectoryLoadEarlier": "Load earlier history",
+    "trajectoryLaneInput": "Input",
+    "trajectoryLaneModel": "Model",
+    "trajectoryLaneTools": "Tools",
+    "trajectoryTimeline": "Trajectory timeline",
+    "trajectoryMetrics": "Session metrics",
+    "trajectoryExport": "Export",
+    "trajectoryExportFailed": "Failed to export trajectory",
+    "trajectoryMetricTurns": "Turns",
+    "trajectoryMetricSteps": "Steps",
+    "trajectoryMetricLlmMs": "LLM",
+    "trajectoryMetricToolMs": "Tools",
+    "trajectoryMetricTtft": "TTFT",
+    "trajectoryMetricTokPerS": "tok/s",
+    "trajectoryMetricCacheHit": "Cache",
+    "trajectoryMetricInputTokens": "In",
+    "trajectoryMetricOutputTokens": "Out",
+    "trajectoryMetricCacheRead": "Cache read",
+    "trajectoryDetailLoading": "Loading detail…",
+    "trajectoryDetailError": "Failed to load event detail",
+    "trajectoryToolbarDuration": "Duration",
+    "trajectoryToolbarTurns": "Turns",
+    "trajectoryToolbarCalls": "Calls",
+    "trajectoryToolbarSearch": "Search trajectory",
+    "trajectoryToolCallOnly": "(tool call only)",
+    "trajectoryCollapsedToolCallOne": "{{count}} tool call · {{names}}",
+    "trajectoryCollapsedToolCallMany": "{{count}} tool calls · {{names}}",
+    "trajectoryCollapsedTurn": "{{steps}} steps · {{toolCalls}} tool calls",
+    "trajectoryInspectorKind": "Kind",
+    "trajectoryInspectorSource": "Source",
+    "trajectoryInspectorStatus": "Status",
+    "trajectoryInspectorError": "Error",
+    "trajectoryInspectorCompleted": "Completed",
+    "trajectoryInspectorTtft": "TTFT",
+    "trajectoryInspectorTokens": "Tokens",
+    "trajectoryInspectorTiming": "Request Timing",
+    "trajectoryInspectorStarted": "Started",
+    "trajectoryInspectorTotalDuration": "Total duration",
+    "trajectoryInspectorGeneration": "Generation",
+    "trajectoryInspectorThroughput": "Throughput",
+    "trajectoryInspectorPlaceholder": "Select a record",
+    "trajectoryInspectorSummary": "Summary",
+    "trajectoryInspectorPreview": "Preview",
+    "trajectoryInspectorResult": "Result",
+    "trajectoryInspectorPayload": "Payload",
+    "trajectoryInspectorEmptyPayload": "No payload",
+    "trajectoryInspectorRaw": "Raw",
     "dockPhoneTitle": "Remote Phone",
     "dockToolUiTitle": "Plugin tool",
     "dockToolUiMissing": "Tool result is no longer available in this conversation.",
@@ -1259,7 +1421,7 @@
   },
   "toolSettings": {
     "title": "Tool settings",
-    "hint": "Turn off tools you do not want the model to call. Required system tools cannot be disabled. Plugin tools need the plugin enabled globally; you can also toggle them per agent under Plugins.",
+    "hint": "Turn off built-in tools you do not want the model to call. Required system tools cannot be disabled.",
     "empty": "No tools available",
     "loadFailed": "Failed to load tool settings",
     "saveSuccess": "Tool settings saved",
@@ -1378,6 +1540,16 @@
     "storedTitle": "Backup files",
     "storedDesc": "System backups are stored in the directory below. Download or restore with one click.",
     "createButton": "Create backup",
+    "createModalTitle": "Choose backup contents",
+    "createModalDesc": "Core database data is always included. Select any additional content you need.",
+    "includeDatabase": "Core database data (required)",
+    "includeConfig": "Configuration (config.json and env)",
+    "includeWorkspaces": "Agent workspaces",
+    "includeSkillPackages": "Global skill packages (skill-packages)",
+    "includePlugins": "Installed plugins (plugins)",
+    "includeKnowledge": "Knowledge base files (knowledge)",
+    "includeChats": "Chat history (including trajectories)",
+    "includeChatsHint": "Chat history and trajectories can be large and are excluded by default.",
     "creating": "Backing up…",
     "uploadButton": "Upload backup",
     "uploadSuccess": "Saved {{name}}",
@@ -1390,6 +1562,7 @@
     "colSize": "Size",
     "colCreated": "Created",
     "colModified": "Modified",
+    "colContents": "Contents",
     "colActions": "Actions",
     "restoreAction": "Restore",
     "deleteConfirmTitle": "Delete backup",
@@ -1405,15 +1578,27 @@
     "importButton": "Choose backup file",
     "uploading": "Uploading… {{percent}}%",
     "restoring": "Restoring…",
-    "importWarning": "Restore overwrites the current database and local workspaces, then hot-reloads models, experts, and channels. While restore runs, database-backed APIs may be briefly unavailable — prefer a maintenance window. If you also restore config/env, restart the service manually for those to fully apply. This cannot be undone.",
+    "importWarning": "Restore only overwrites content present in the backup; current chat history is kept when chats are absent. Database-backed APIs may be briefly unavailable — prefer a maintenance window. If config/env is restored, restart the service manually for it to fully apply. This cannot be undone.",
     "importConfirmTitle": "Confirm restore",
     "importConfirmBody": "Restore from “{{name}}”? Existing data will be overwritten, and the service may be briefly unavailable while the database is replaced. Models, experts, and channels are hot-reloaded afterward (no service restart). If you restore config/env, restart manually for those settings to take full effect.",
     "importConfirmOk": "Restore",
     "importSuccess": "Restore complete ({{agents}} agents, {{files}} workspace files)",
     "importFailed": "Failed to restore backup",
     "restoreConfig": "Also restore config.json and env (requires a manual service restart to apply)",
+    "tagConfig": "Config",
+    "tagWorkspaces": "Workspaces",
+    "tagSkillPackages": "Skill packages",
+    "tagPlugins": "Plugins",
+    "tagKnowledge": "Knowledge",
+    "tagChatsYes": "Conversations and trajectories",
+    "restoreKeepChats": "This backup has no chat history or trajectories. Current data will be kept.",
+    "restoreNoConfig": "This backup has no config files, so config/env cannot be restored.",
+    "restoreNoWorkspaces": "This backup has no agent workspaces, so existing workspace files on disk are not replaced wholesale.",
+    "restoreNoSkillPackages": "This backup has no global skill packages, so the current skill-packages directory is kept.",
+    "restoreNoPlugins": "This backup has no plugins directory, so installed plugins are kept.",
+    "restoreNoKnowledge": "This backup has no knowledge files, so the current knowledge directory is kept.",
     "autoTitle": "Automatic backup",
-    "autoDesc": "Schedule full system backups into the backups directory. Only automatic archives are pruned by retention.",
+    "autoDesc": "Schedule system backups into the backups directory. Chat history is excluded by default. Only automatic archives are pruned by retention.",
     "autoEnabled": "Enable automatic backup",
     "autoSchedule": "Schedule",
     "autoScheduleDaily": "Daily at 04:00",
@@ -1423,6 +1608,7 @@
     "autoScheduleHint": "cron:m h dom mon dow (server timezone); interval:<seconds>, e.g. interval:43200 means every 12 hours.",
     "autoIntervalPreview": "Current: every {{seconds}} seconds (about {{hours}} h)",
     "autoRetention": "Keep last N automatic backups",
+    "autoContent": "Backup contents",
     "autoSave": "Save settings",
     "autoSaveSuccess": "Automatic backup settings saved",
     "autoSaveFailed": "Failed to save automatic backup settings",
@@ -1664,6 +1850,7 @@
       "idTooltip": "A unique identifier for this job, auto-generated by the system.",
       "name": "Job Name",
       "nameTooltip": "A descriptive name to easily identify this job in the list.",
+      "nameTooLong": "Job name must be at most {{max}} characters",
       "enabled": "Enable Job",
       "enabledTooltip": "When enabled, the job runs automatically on schedule. Disable to pause execution.",
       "sectionSchedule": "Execution Frequency",
@@ -1785,7 +1972,7 @@
       "runtimeTimeoutSeconds": "Timeout (s)",
       "runtimeMisfireGrace": "Misfire Grace (s)"
     },
-    "noAgentSelected": "Pick an agent in the top-right switcher first to manage its scheduled tasks"
+    "noAgentSelected": "Pick an expert in the top-right switcher first to manage its scheduled tasks"
   },
   "channels": {
     "title": "Channels",
@@ -1864,7 +2051,7 @@
     "displaySettings": "Message display",
     "responseMode": "Response mode",
     "responseModeDesc": "Final response hides progress narration before tool calls; live progress keeps the current staged messages",
-    "responseModeInvoke": "Final only (Recommended)",
+    "responseModeInvoke": "Final only",
     "responseModeStream": "Live progress",
     "showToolHints": "Show tool hints",
     "showToolHintsDesc": "When enabled, channel messages show tool-call activity and status hints",
@@ -1886,27 +2073,27 @@
     "checkRequestFailed": "Connection check request failed, please try again later",
     "checkFailedAutoDisabled": "Credential verification failed, channel has been auto-disabled",
     "enableFailedCheckFailed": "Enable failed: connection check did not pass",
-    "quickConfig": "Scan to Connect",
-    "manualConfig": "Manual Config",
+    "quickConfig": "Quick setup (scan)",
+    "manualConfig": "Fill in manually",
     "quickConfigStep1": "Click the button below to go to WeCom Open Platform",
     "quickConfigStep2": "Follow the instructions to authorize your bot",
     "quickConfigStep3": "Once authorized, return here and the channel will connect automatically",
     "goToAuthorize": "Go to Authorize",
     "qrLoading": "Generating QR code...",
-    "qrStep1": "Open WeCom App",
-    "qrStep2": "Scan the QR code below to authorize",
-    "qrStep3": "Credentials will be auto-filled after scanning",
-    "qrScanHint": "Scan with WeCom App",
-    "weixinQrStep1": "Open WeChat App",
-    "weixinQrStep2": "Scan the QR code below to authorize",
-    "weixinQrStep3": "Credentials will be auto-filled after scanning",
-    "weixinQrScanHint": "Scan with WeChat App",
-    "dingtalkQrLoading": "Initializing DingTalk application registration...",
+    "qrStep1": "Open WeCom",
+    "qrStep2": "Scan to register an AI bot",
+    "qrStep3": "Confirm binding",
+    "qrScanHint": "Next step starts automatically after scanning",
+    "weixinQrStep1": "Open WeChat",
+    "weixinQrStep2": "Scan to sign in",
+    "weixinQrStep3": "Confirm on phone",
+    "weixinQrScanHint": "Scan with WeChat to sign in to your personal account",
+    "dingtalkQrLoading": "Generating QR code...",
     "dingtalkQrIntro1": "Generate a DingTalk application authorization QR code",
     "dingtalkQrIntro2": "Scan and confirm in DingTalk while signed in to the same organization",
     "dingtalkQrIntro3": "Octop creates and enables the DingTalk channel automatically",
-    "dingtalkQrStep1": "Open DingTalk App",
-    "dingtalkQrStep2": "Scan the application authorization code",
+    "dingtalkQrStep1": "Open DingTalk",
+    "dingtalkQrStep2": "Scan QR code",
     "dingtalkQrStep3": "Confirm application creation",
     "dingtalkQrScanHint": "Scan with DingTalk App to finish authorization",
     "dingtalkUserCode": "User code",
@@ -1947,21 +2134,31 @@
     "qrTimeout": "Scan timed out (3 min), please retry",
     "qrFailed": "Scan failed, please retry",
     "qrGenerateFailed": "Failed to generate QR code, check network and retry",
-    "qrRetry": "Regenerate QR Code",
-    "feishuCreating": "Initializing Feishu bot creation...",
+    "qrRetry": "Regenerate",
+    "feishuCreating": "Generating QR code...",
     "feishuApiTimeout": "Feishu API timed out, please use manual configuration",
     "feishuSwitchManual": "Use Manual Config",
-    "feishuQrStep1": "Open Feishu App, tap \"+ → Scan\" in top-right",
-    "feishuQrStep2": "Scan the QR code below to login to Feishu Open Platform",
-    "feishuQrScanHint": "Use the built-in Scanner in Feishu App to scan",
+    "feishuQrStep1": "Open Feishu Scan",
+    "feishuQrStep2": "Scan QR code",
+    "feishuQrStep3": "Confirm on phone",
+    "feishuQrScanHint": "Scan with Feishu App, then confirm to receive credentials",
+    "feishuQrIntro1": "Click the button below to generate a Feishu AI bot registration QR code",
+    "feishuQrIntro2": "Scan with Feishu App to finish bot registration",
+    "feishuQrIntro3": "Credentials are filled in and saved automatically",
+    "feishuCreateButton": "Create Feishu bot",
+    "feishuCreateFailed": "Failed to create Feishu bot",
     "feishuBindSuccess": "Feishu bot created and enabled",
     "feishuCreateSuccess": "Feishu bot created successfully!",
+    "feishuCreateSuccessNamed": "Feishu bot \"{{name}}\" created successfully",
     "feishuBotName": "Bot Name",
     "feishuManageBot": "Manage on Feishu Open Platform",
-    "yuanbaoCreating": "Initializing YuanBao bot binding...",
-    "yuanbaoQrStep1": "Open Tencent YuanBao App",
-    "yuanbaoQrStep2": "Scan the QR code below to bind your bot",
-    "yuanbaoQrScanHint": "Scan with Tencent YuanBao App",
+    "yuanbaoCreating": "Generating QR code...",
+    "yuanbaoQrStep1": "Open YuanBao",
+    "yuanbaoQrStep2": "Scan to bind",
+    "yuanbaoQrStep3": "Confirm authorization",
+    "yuanbaoQrScanHint": "Confirm the binding in YuanBao after scanning",
+    "yuanbaoStarting": "Starting YuanBao scan-to-bind...",
+    "yuanbaoBindFailed": "YuanBao binding failed",
     "yuanbaoBindSuccess": "YuanBao bot bound and enabled",
     "yuanbaoCreateSuccess": "YuanBao bot bound successfully!",
     "dmPolicy": "DM Policy",
@@ -1986,6 +2183,16 @@
     "qrRetryBtn": "Retry",
     "wecomGenerateQr": "Generate WeCom scan code",
     "weixinGenerateQr": "Generate WeChat login QR code",
+    "wecomQrSuccess": "WeCom bound successfully",
+    "weixinQrSuccess": "WeChat bound successfully",
+    "weixinAccountId": "Account ID: {{id}}",
+    "fieldRequired": "{{label}} is required",
+    "fieldMustBeJsonObject": "{{label}} must be a JSON object",
+    "jsonMustBeObject": "Must be a JSON object",
+    "invalidJson": "Invalid JSON",
+    "rawConfigTooltip": "Channel-specific config — see harness-gateway docs",
+    "getCredentials": "Get credentials",
+    "channelSettingsNamed": "{{kind}} channel settings",
     "deleteConfirmTitle": "Delete channel \"{{name}}\"?"
   },
   "tokenUsage": {
@@ -2146,6 +2353,7 @@
   "voice": {
     "loading": "Loading voice settings…",
     "loadError": "Failed to load voice settings",
+    "description": "Manage speech-to-text and text-to-speech models, and choose the active services.",
     "sttSection": "Speech Input (STT)",
     "ttsSection": "Read Aloud (TTS)",
     "free": "Free",
@@ -2156,7 +2364,12 @@
     "activeUpdated": "Active voice provider updated",
     "activeUpdateFailed": "Failed to update active provider",
     "configure": "Configure",
+    "configureTitle": "Configure {{name}}",
     "saved": "Configuration saved",
+    "credentialsRequired": "Complete the connection credentials first",
+    "probe": "Probe",
+    "probeSuccess": "Voice model probe succeeded",
+    "probeFailed": "Voice model probe failed",
     "tencentHint": "Create SecretId / SecretKey in Tencent Cloud console. ASR and TTS include free trial quota.",
     "openaiHint": "Uses OpenAI Whisper for STT and OpenAI TTS for read-aloud.",
     "mimoHint": "Xiaomi MiMo ASR/TTS. Choose endpoint and enter the corresponding API key.",
@@ -2596,9 +2809,11 @@
     "ollamaNotRunning": "Ollama service is not running",
     "testUseSavedConfig": "Uses saved configuration",
     "pageTitle": "Models",
-    "pageSubtitle": "Manage conversational, image-generation, and video-generation model services in one place.",
+    "pageSubtitle": "Manage conversational, image/video generation, voice, and search engine services in one place.",
     "chatModelsTab": "Conversation models",
     "generationModelsTab": "Generation models",
+    "voiceModelsTab": "Voice models",
+    "searchModelsTab": "Search engines",
     "addCustomProvider": "New Provider",
     "loadingProviders": "Loading...",
     "noProvidersHint": "No providers yet. Click the top right to create one.",
@@ -2711,9 +2926,11 @@
   "advancedSettings": {
     "description": "Manage runtime configuration and environment variables.",
     "search": {
-      "desc": "Configure AI-powered web search providers to enable your assistant to search the internet. Each provider requires an API key from the respective service.",
+      "desc": "Manage web search providers for agents to retrieve from the internet.",
       "tip": "You can configure or modify search providers here. Changes take effect immediately on the next chat session.",
       "configure": "Configure",
+      "configureTitle": "Configure {{name}}",
+      "probe": "Probe",
       "sourceBuiltinTitle": "Current search source: built-in search",
       "sourceBuiltinDesc": "When no third-party search provider is configured, Octop still provides its built-in search service. It requires no API key, but its stability and availability are not guaranteed. It switches automatically once a third-party provider is configured.",
       "sourceConfiguredTitle": "Current search source: {{name}}",
@@ -2803,6 +3020,8 @@
     "maxInputLengthPlaceholder": "Enter max input length",
     "maxInputLengthRequired": "Max input length is required",
     "maxInputLengthMin": "Max input length must be at least 1000",
+    "enableTrajectory": "Record trajectory",
+    "enableTrajectoryTooltip": "When on, this expert's chats are written to the trajectory ledger and can be opened from Chat. On by default.",
     "saveSuccess": "Configuration saved successfully",
     "saveFailed": "Failed to save configuration",
     "loadFailed": "Failed to load configuration",
@@ -3285,10 +3504,11 @@
   },
   "personalization": {
     "title": "Personalization",
-    "description": "Configure this agent's skills, tools, subagents, channels, personality, and memory.",
+    "description": "Configure this agent's skills, tools, plugins, subagents, channels, personality, and memory.",
     "tabs": {
       "skills": "Skills",
       "tools": "Tools",
+      "plugins": "Plugins",
       "subagents": "Subagents",
       "channels": "Channels",
       "mbti": "MBTI",
@@ -3468,9 +3688,9 @@
     "launch": "Launch Browser",
     "connect": "Connect",
     "stop": "Close browser",
-    "shutdownTitle": "Close browser process",
-    "shutdownConfirm": "This stops the local Chrome process and frees memory. Login cookies stay on disk and can be reused next time. Continue?",
-    "shutdownFailed": "Failed to stop the browser process",
+    "shutdownTitle": "Close browser",
+    "shutdownConfirm": "This will close the current browser window. Signed-in sites stay logged in next time you start.",
+    "shutdownFailed": "Failed to close the browser",
     "streaming": "Streaming",
     "connecting": "Connecting",
     "browserStarted": "Starting",
@@ -3491,8 +3711,8 @@
     "viewportMode": "Viewport",
     "checkInstall": "Check Browser",
     "checkInstallShort": "Check",
-    "checkInstallTip": "Check if Playwright browser is installed; install if missing",
-    "browserAlreadyInstalled": "Browser is already installed",
+    "checkInstallTip": "Check whether a browser is ready; you can install one in one click if it's missing",
+    "browserAlreadyInstalled": "Browser is ready",
     "checkFailed": "Failed to check browser status",
     "installingBrowser": "Installing Browser",
     "installing": "Starting installation...",
@@ -3500,21 +3720,21 @@
     "installSuccessHint": "Browser is ready — you can start a session",
     "installFailed": "Installation failed",
     "installFailedHint": "Automatic installation failed. Try again. If downloads are slow, set PLAYWRIGHT_DOWNLOAD_HOST to a mirror URL and retry.",
-    "notInstalled": "Chromium not installed",
-    "notInstalledHint": "No usable browser found. Use the button below to install the bundled Chromium automatically.",
+    "notInstalled": "No browser detected",
+    "notInstalledHint": "Octop needs a browser to open pages, fill forms, and take screenshots for you. Click below to install one automatically.",
     "install": "Install browser",
     "installProgress": "Installing…",
     "installCancelHint": "Install request cancelled. The server may still be installing — refresh status later.",
     "uninstall": "Uninstall",
-    "uninstallTitle": "Remove Playwright Chromium",
-    "uninstallConfirm": "This closes Octop browser sessions and removes Chromium installed via Playwright. Your system Chrome/Chromium is not affected. Continue?",
+    "uninstallTitle": "Uninstall built-in browser",
+    "uninstallConfirm": "This will close any open browser windows in Octop and remove the browser Octop installed. Chrome and other browsers already on your computer are not affected.",
     "uninstalling": "Uninstalling…",
-    "uninstallSuccess": "Playwright Chromium removed",
+    "uninstallSuccess": "Built-in browser removed",
     "uninstallFailed": "Uninstall failed",
     "playwrightMissing": "The playwright package is missing. Install octop[browser] extras first.",
     "installLog": "Install log",
     "installRetry": "Retry install",
-    "envReady": "Playwright and Chromium are ready",
+    "envReady": "Octop can open pages, fill forms, and take screenshots for you.",
     "envProbeFailed": "Failed to probe browser environment",
     "sharedSessionHint": "Shares the same browser session as Agent in chat",
     "selectSession": "Select browser session",
@@ -3533,10 +3753,10 @@
     "startBrowserDesc": "Environment is ready — follow these steps to browse and control remotely",
     "startBrowserIdleStep1": "Click Launch Browser below to start a session",
     "startBrowserIdleStep2": "Enter a URL in the address bar, or use bookmarks and the AI assistant",
-    "setupTitle": "Browser environment setup required",
-    "setupDesc": "Follow these steps to configure Playwright and Chromium",
-    "setupStep1": "Click Check to verify Playwright and Chromium availability",
-    "setupStep2": "If components are missing, install the browser environment from the dialog",
+    "setupTitle": "A browser is required",
+    "setupDesc": "Install a browser first to start remote browsing and automated page actions",
+    "setupStep1": "Click Check to see if a browser is already available",
+    "setupStep2": "If none is found, install one from the dialog in a single click",
     "setupStep3": "When installation finishes, click Launch Browser to start a session",
     "startBrowserDisabled": "Complete browser environment check and installation first",
     "startBrowserHeaderHint": "Click Launch Browser below to start a session",
@@ -3704,7 +3924,9 @@
       "active": "Active"
     },
     "browserStatusActive": "Browser: {{owner}}",
-    "browserStatusIdle": "Browser (click to view or take over)"
+    "browserStatusIdle": "Browser (click to view or take over)",
+    "chromeMissingTitle": "No browser detected",
+    "chromeMissingJumpToInstall": "Go to Workbench → Browser to install?"
   },
   "browserViewer": {
     "goBack": "Go back",
@@ -3902,7 +4124,7 @@
   },
   "storage": {
     "pageTitle": "Storage Management",
-    "pageSubtitle": "Manage storage backends (COS, S3, OSS, Docker sandbox, etc.) for use by agents",
+    "pageSubtitle": "Manage storage backends (local, object storage, sandboxes, databases) for use by experts",
     "myStorage": "My Storage",
     "supportedTypes": "Supported Types",
     "addBackend": "Add Storage Backend",
@@ -3912,7 +4134,15 @@
     "clickToConfigure": "Click to configure this backend",
     "configuredBadge": "Configured",
     "emptyMyStorage": "No storage backends yet",
-    "emptyMyStorageHint": "Go to \"Supported Types\" to pick and configure a backend for your agents",
+    "emptyMyStorageHint": "Go to \"Supported Types\" to pick and configure a backend for your experts",
+    "emptyGuideTitle": "No storage backends yet",
+    "emptyGuideDesc": "A storage backend is the workspace an expert uses: a local directory, object store, sandbox, or database. Configure it here, then attach it by name.",
+    "emptyGuideStepWhat": "What is a storage backend?",
+    "emptyGuideStepWhatDetail": "A reusable storage profile. When an expert reads files or runs commands, it uses this backend instead of the default host directory.",
+    "emptyGuideStepHow": "How to add one",
+    "emptyGuideStepHowDetail": "Open Supported Types, pick local, object storage, sandbox, or database, then save credentials or a path. You can probe connectivity anytime.",
+    "emptyGuideStepUse": "How experts use it",
+    "emptyGuideStepUseDetail": "On the expert workspace, select a configured backend by name. Sandbox backends are created when the expert starts and destroyed when it stops.",
     "totalBackends": "{{count}} backend(s)",
     "noBackends": "No storage backends yet. Click the button above to add one.",
     "nameLabel": "Name",
@@ -3936,6 +4166,15 @@
     "dockerImageLabel": "Image",
     "dockerRegistryLabel": "Registry",
     "dockerPulling": "Pulling Docker image…",
+    "opensandboxInstalling": "Installing OpenSandbox SDK and probing…",
+    "opensandbox_probe_ok": "OpenSandbox write/read probe succeeded",
+    "opensandboxDomainLabel": "Domain",
+    "opensandboxApiKeyLabel": "API Key",
+    "opensandboxProtocolLabel": "Protocol (http / https)",
+    "groupLocal": "Local",
+    "groupObject": "Object storage",
+    "groupSandbox": "Sandbox",
+    "groupDatabase": "Database",
     "docker_image_pulled": "Image pulled and ready",
     "docker_image_ready": "Image already available locally",
     "docker_probe_roundtrip_ok": "In-container write/read probe succeeded",
@@ -3961,16 +4200,18 @@
     "kindShell": "Local Shell",
     "kindPostgres": "PostgreSQL",
     "kindDocker": "Docker Sandbox",
+    "kindOpensandbox": "OpenSandbox",
     "kindCustom": "Custom (S3-compatible)",
-    "descCos": "Tencent Cloud Object Storage — ideal for China deployments, supports CDN acceleration",
-    "descS3": "Amazon S3, the industry-standard object storage; compatible with most cloud providers",
-    "descOss": "Alibaba Cloud OSS — best for Alibaba Cloud ecosystem applications",
-    "descObs": "Huawei Cloud OBS — best for Huawei Cloud ecosystem",
-    "descFilesystem": "Mount a local host directory — ideal for development and single-machine deployments",
-    "descShell": "Execute commands in a local shell with timeout and environment isolation",
-    "descPostgres": "Use PostgreSQL tables as a structured storage backend with schema isolation",
-    "descDocker": "Run code inside Docker via the Docker API (no host workspace bind); container names follow sandbox_scope; deleting an expert does not remove the sandbox",
-    "descCustom": "Any S3-compatible service (MinIO, Ceph, Cloudflare R2, etc.)",
+    "descCos": "Tencent Cloud object storage, low latency in China; supports CDN acceleration and multipart uploads.",
+    "descS3": "Amazon S3, the industry standard; its protocol is supported by most clouds and self-hosted stores.",
+    "descOss": "Alibaba Cloud OSS — best inside the Alibaba Cloud ecosystem; free intranet traffic and tiering.",
+    "descObs": "Huawei Cloud OBS — best inside the Huawei Cloud ecosystem; S3-compatible with tiered storage.",
+    "descFilesystem": "Mount a host directory as the workspace — fastest reads and writes, no network dependency.",
+    "descShell": "Run commands in a local shell with timeouts and env isolation; experts use the host toolchain.",
+    "descPostgres": "Use PostgreSQL tables as a structured backend with schema isolation; experts can share one instance.",
+    "descDocker": "Run code in a local Docker container with no host workspace bind; containers follow sandbox_scope.",
+    "descOpensandbox": "Remote OpenSandbox: created when the expert starts, destroyed on stop; the SDK installs on enable.",
+    "descCustom": "Any S3-compatible service such as MinIO, Ceph, or Cloudflare R2; provide your own endpoint and keys.",
     "dockerEnv": {
       "drawerTitle": "Local Docker environment",
       "checking": "Checking Docker…",
@@ -4356,8 +4597,23 @@
     "loadFailed": "Failed to load connectors",
     "tabCatalog": "Catalog",
     "tabBuiltin": "Built-in connectors",
+    "tabEnabled": "Enabled connectors",
     "tabCustom": "Custom connectors",
     "listSummary": "{{total}} connectors available, {{configured}} configured",
+    "enabledSummary": "{{count}} connector instances enabled",
+    "emptyGuideTitle": "No enabled connectors yet",
+    "emptyGuideDesc": "A connector instance stores one set of credentials for an external service so agents can call its tools. Create an instance from a built-in connector.",
+    "emptyGuideStepWhat": "What is a connector instance?",
+    "emptyGuideStepWhatDetail": "One instance = one credential plus a display name. The same built-in connector can back several instances, for example two mailboxes on different accounts.",
+    "emptyGuideStepHow": "How to create one",
+    "emptyGuideStepHowDetail": "Open Built-in connectors, pick the service you need, fill in the credentials in the Create connector drawer, probe it, and save — it then shows up on this tab.",
+    "emptyGuideStepShare": "Sharing and default enabled",
+    "emptyGuideStepShareDetail": "When shared, every signed-in user on this instance can select it, but only the owner can edit it. Default enabled applies to the owner only.",
+    "emptyGuideBrowseBuiltin": "Browse built-in connectors",
+    "emptyGuideAddCustom": "Add custom MCP",
+    "noCredentials": "Missing credentials",
+    "sharedFrom": "From {{name}}",
+    "sharedReadonly": "Shared connector — only the owner can manage it",
     "customMcp": {
       "introTitle": "MCP server configuration (JSON). Refer to the following format:",
       "modeVisual": "Visual",
@@ -4483,7 +4739,12 @@
     "comingSoon": "Coming soon",
     "addConnection": "Add {{name}}",
     "displayName": "Display name",
-    "defaultOpen": "Open by default",
+    "description": "Description",
+    "shared": "Share with others",
+    "sharedHint": "Other users can select a shared connector, but cannot view or change its configuration.",
+    "sharedBadge": "Shared",
+    "defaultEnabled": "Enable by default",
+    "defaultOpen": "Enable by default",
     "defaultOpenHint": "Applies only to your account. When off, tools are injected only if you select this connector in chat.",
     "defaultOpenWarning": "When on, tools are included by default in your Dashboard, IM, and Cron jobs with no connector picks (extra tokens). Dashboard can opt out per turn; Cron explicit picks override defaults.",
     "defaultOpenLockedBadge": "Default on",
@@ -4498,8 +4759,9 @@
     "createSuccess": "Connector created",
     "createFailed": "Failed to create",
     "saveSuccess": "Connector saved",
-    "configureConnection": "Configure {{name}}",
-    "editConnection": "Configure {{name}}",
+    "configureConnection": "Create {{name}} connector",
+    "createConnection": "Create {{name}} connector",
+    "editConnection": "Edit {{name}} connector",
     "configSection": "Connection settings",
     "secretConfigured": "Configured — leave blank to keep current value",
     "secretPlaceholder": "Leave blank to keep current value",
@@ -4605,18 +4867,23 @@
     "uninstallFailed": "Uninstall failed",
     "uninstallConfirm": "Uninstall plugin {{id}}?",
     "empty": "No plugins installed",
-    "adminHint": "Plugins live under ~/.octop/plugins/ on the server. Use the enable switch to load or unload a plugin. Open Details to enable tools for the agent selected in the sidebar.",
+    "adminHint": "Plugins live under ~/.octop/plugins/ on the server. Use this page to install, reload, globally enable, inspect, or uninstall them.",
     "guideTitle": "How to build and import a plugin",
     "guideDevelopTitle": "1. Develop",
     "guideDevelopBody": "Create a folder with plugin.yaml and an entry Python file (for example main.py). plugin.yaml needs id, version, name, kind (tool / skill / hook), and entry. In setup(ctx): tool → ctx.tool(...); skill → ctx.skills(\"skills\"); hook → ctx.middleware(...). See the repo plugins/ demos for each kind.",
     "guidePackageTitle": "2. Package",
     "guidePackageBody": "Zip the plugin so the archive contains exactly one plugin root with plugin.yaml inside it (either at the zip root or in a single top-level folder). Example: zip -r my-plugin.zip my-plugin/",
     "guideImportTitle": "3. Import",
-    "guideImportBody": "Host the .zip where Octop can download it over HTTP(S). Prefer a raw file URL. After install, open Details on the plugin card, select an agent in the sidebar, and enable tools. Local demos: octop plugin install ./plugins/demo-toolkit --force",
+    "guideImportBody": "Host the .zip where Octop can download it over HTTP(S). Prefer a raw file URL. Configure each agent from Personalization → Plugins. Local demos: octop plugin install ./plugins/demo-toolkit --force",
     "guideExampleTitle": "Minimal plugin.yaml",
     "guideExampleYaml": "id: my-plugin\nversion: 1.0.0\nname: My Plugin\ndescription: Example tool plugin\nicon: \"🧩\"\nkind: tool\nentry: main.py",
     "agentHint": "Once a plugin is enabled, its tools are available to all agents by default. You can turn individual tools off per agent. Configure API keys first when required. New chats pick up the latest tool list.",
+    "agentPluginHint": "Installed plugins are enabled for this expert by default. Turning one off disables all of its tools, skills, and hooks for this expert while preserving tool configuration.",
+    "agentEnabled": "Enabled for this agent",
+    "globallyDisabled": "Disabled globally",
+    "globalDisabledHint": "An administrator disabled this plugin globally, so it is unavailable even when enabled for this agent.",
     "noAgent": "Select an agent in the sidebar first",
+    "noPlugins": "No plugins are installed. Ask an administrator to install one.",
     "noTools": "No plugin tools available. Ask an admin to install tool plugins.",
     "enablePluginFirst": "Enable this plugin first. Tools are on by default; you can still turn them off per agent.",
     "detailToolsHint": "On by default. Turning a tool off applies only to the agent selected in the sidebar (same config as Experts → Tools). Takes effect on the next turn — no restart needed.",
@@ -4699,7 +4966,7 @@
       "subtitle": "Create and manage your AI experts, or pick a scenario template to get started quickly."
     },
     "tasks": {
-      "title": "Tasks",
+      "title": "Automation",
       "subtitle": "Scheduled tasks that run on a cron trigger"
     },
     "connectors": {
@@ -4744,7 +5011,7 @@
     },
     "models": {
       "title": "Model Management",
-      "subtitle": "Configure LLM providers and API keys"
+      "subtitle": "Configure conversation, generation, voice, and search engines"
     },
     "voice": {
       "title": "Voice Services",
@@ -4772,7 +5039,7 @@
     },
     "adminAdvanced": {
       "title": "Application Settings",
-      "subtitle": "Environment variables, search, voice, backup, HTTPS, and updates"
+      "subtitle": "Environment variables, backup, HTTPS, and updates"
     },
     "security": {
       "title": "Security",
@@ -4780,7 +5047,7 @@
     },
     "adminPlugins": {
       "title": "Plugin Management",
-      "subtitle": "Install and manage server plugins; enable tools for an agent in the details drawer"
+      "subtitle": "Install and manage server plugins; configure each agent under Personalization → Plugins"
     },
     "adminUpdates": {
       "title": "Updates",
@@ -4817,7 +5084,7 @@
     "pickDevice": "Select a device first",
     "devicePlaceholder": "Select device",
     "needsInstall": "Container install required",
-    "needsInstallDesc": "This host uses a container Android backend. One-click install pulls and starts the container (Docker required on the host).",
+    "needsInstallDesc": "This host uses a container Android backend. One-click install pulls and starts the container; Docker is installed automatically when missing (manual install required if that fails).",
     "install": "Install container",
     "installing": "Starting install…",
     "installProgress": "Installing Android container…",
@@ -4825,8 +5092,8 @@
     "installFailed": "Container install failed. Check the log and retry.",
     "installRetry": "Retry install",
     "installCancelHint": "Install request cancelled. The server may still be installing — refresh status later.",
-    "installStep1": "Make sure Docker is installed and usable on this host",
-    "installStep2": "Click Install container to pull and start the Android container",
+    "installStep1": "Click Install container; Docker is installed automatically when missing",
+    "installStep2": "Wait for the Android container to be pulled and started",
     "installStep3": "When install finishes, refresh status, then click Connect",
     "needsDevice": "No device connected",
     "needsDeviceDesc": "Start an Android emulator or connect a phone via USB, then refresh.",
diff --git a/dashboard/src/locales/zh.json b/dashboard/src/locales/zh.json
index cb7bef76..6f0cebf9 100644
--- a/dashboard/src/locales/zh.json
+++ b/dashboard/src/locales/zh.json
@@ -52,6 +52,8 @@
     "unknownError": "未知错误",
     "noPermission": "没有权限",
     "noPermissionHint": "你没有访问此页面的权限，请联系管理员开通。",
+    "notFound": "页面不存在",
+    "notFoundHint": "这个地址没有对应的页面。检查一下链接，或返回对话继续使用。",
     "backToChat": "返回聊天",
     "viewDetail": "查看详情",
     "viewMore": "查看更多",
@@ -75,6 +77,7 @@
     "SETUP_REQUIRED": "需要完成初始设置。",
     "DATABASE_NOT_EMPTY": "目标数据库已有用户。请改用空库，或直接登录现有管理员账户。",
     "BACKUP_DRIVER_MISMATCH": "该备份与当前数据库引擎不一致（SQLite 与 PostgreSQL 不能互恢）。请将运行时切回备份所用引擎后再恢复，或在当前引擎上重新备份。暂不支持跨引擎恢复。",
+    "BACKUP_SCHEMA_INCOMPATIBLE": "该备份使用数据库结构版本 {{archive_schema_version}}，当前 Octop 版本无法恢复（最高支持版本：{{runtime_schema_version}}）。",
     "BACKUP_IN_PROGRESS": "已有备份或恢复任务正在进行，请稍后再试。",
     "FORBIDDEN": "没有权限。",
     "NOT_FOUND": "未找到。",
@@ -101,10 +104,12 @@
     "PROVIDER_LOCAL_PROTECTED": "本地提供商无法删除。",
     "STORAGE_BACKEND_NAME_TAKEN": "存储后端名称已被占用。",
     "STORAGE_BACKEND_REFERENCED": "存储后端正在使用中，无法删除。",
+    "STORAGE_BACKEND_DEPS_FAILED": "无法安装此后端所需的可选组件。请检查网络后重试。",
     "CHANNEL_KIND_UNSUPPORTED": "不支持的通道类型。",
     "CHANNEL_INVALID_CREDENTIALS": "通道凭证无效。",
     "CHANNEL_NAME_TAKEN": "该通道名称已被使用，请换一个名称。",
     "CONNECTOR_NOT_FOUND": "未找到连接器。",
+    "CONNECTOR_NAME_TAKEN": "该连接器名称已被使用，请换一个名称。",
     "CONNECTOR_INVALID_CREDENTIALS": "连接器凭证无效。",
     "CONNECTOR_OAUTH_HTTPS_REQUIRED": "当前通过公网 HTTP 访问 Octop，Notion 授权回调地址需要 HTTPS。请改用 HTTPS，或通过 localhost、127.0.0.1 在本机访问 Octop。",
     "CONNECTOR_KIND_UNSUPPORTED": "不支持的连接器类型。",
@@ -130,7 +135,7 @@
     "SKILL_ALREADY_EXISTS": "技能 {{name}} 已存在，如需覆盖请启用 overwrite。",
     "SKILL_PACKAGE_NOT_FOUND": "未找到技能包。",
     "SKILL_PACKAGE_NAME_TAKEN": "技能包 {{name}} 已存在。",
-    "SKILL_PACKAGE_BACKEND_UNSUPPORTED": "技能包目前仅支持「本地完整环境（文件系统+指令执行）」或「本地文件系统（不能执行指令）」，且存储根目录须为 /（POSIX）或 Agent 工作区根目录（Windows 默认）。",
+    "SKILL_PACKAGE_BACKEND_UNSUPPORTED": "技能包目前仅支持「本地完整环境（文件系统+指令执行）」或「本地文件系统（不能执行指令）」，且存储根目录须为 /（POSIX）或 专家的工作区根目录（Windows 默认）。",
     "PUBLISHED_EXPERT_SLUG_TAKEN": "已存在发布专家 slug：{{slug}}。",
     "PUBLISHED_EXPERT_ALREADY_EXISTS": "该专家已发布为「{{name}}」，请改为刷新已发布模板。",
     "OIDC_BAD_REQUEST": "OIDC 请求无效：{{detail}}",
@@ -164,7 +169,7 @@
     "common": "常用",
     "control": "控制",
     "experts": "专家",
-    "tasks": "任务",
+    "tasks": "自动化",
     "connectors": "连接器",
     "acp": "ACP",
     "agents": "Agents",
@@ -297,7 +302,7 @@
     "emptyGuideStepWhat": "什么是知识库？",
     "emptyGuideStepWhatDetail": "知识库会把上传的文档切分并向量化。对话时专家可以检索引用相关段落，而不必把全文塞进上下文。",
     "emptyGuideStepHow": "知识库怎么用",
-    "emptyGuideStepHowDetail": "创建知识库并上传 md / txt / pdf / docx / pptx。可设为默认启用，或在对话中手动勾选。",
+    "emptyGuideStepHowDetail": "创建知识库并上传文本（md / txt / rst / html / json / yaml 等）、表格（csv / tsv / xls / xlsx / xlsm）、pdf / docx / pptx。可设为默认启用，或在对话中手动勾选。",
     "emptyGuideStepShare": "共享有什么作用",
     "emptyGuideStepShareDetail": "共享后实例内登录用户可读、可选用；仅所有者可编辑。默认启用只对创建者生效。",
     "enableGuideTitle": "怎么开启知识库功能？",
@@ -332,7 +337,8 @@
     "maxDocumentsHint": "本知识库可容纳的最大文档数，0 表示不限制，默认为 100。",
     "documentTooLarge": "单个文档不能超过 {{sizeMb}} MB。",
     "baseLimitReached": "每个用户最多可创建 {{count}} 个知识库。",
-    "uploadHint": "支持 md / txt / pdf / docx / pptx，单文件不超过 {{sizeMb}} MB。",
+    "uploadHint": "支持文本（md / txt / rst / html / json / yaml 等）、表格（csv / tsv / xls / xlsx / xlsm）、pdf / docx / pptx，单文件不超过 {{sizeMb}} MB。",
+    "uploadHintOcr": "另支持 png / jpg / webp 图片及扫描 PDF OCR，单文件不超过 {{sizeMb}} MB。",
     "viewCard": "卡片",
     "viewTable": "表格",
     "updatedAt": "更新时间",
@@ -384,6 +390,8 @@
     "pathBreadcrumb": "路径导航",
     "deleteFolderConfirm": "删除此文件夹及其内部文档？",
     "uploaded": "文档已上传",
+    "uploading": "正在上传 {{name}}",
+    "uploadingMany": "正在上传 {{name}}（{{index}}/{{total}}）",
     "uploadFailed": "上传文档失败",
     "emptyDocuments": "暂无文档",
     "filename": "文件名",
@@ -420,7 +428,7 @@
     "localOnnx": "本地 ONNX",
     "remoteEmbedding": "在线 Embedding",
     "rebuildConfirmTitle": "重建知识库索引？",
-    "rebuildConfirmDescription": "切换向量模型会清空并重新嵌入所有知识库索引。",
+    "rebuildConfirmDescription": "更改向量模型或 OCR 设置会重建所有知识库索引。",
     "notDownloaded": "未下载",
     "checkRuntime": "运行时组件",
     "checkInstalled": "已安装",
@@ -439,6 +447,15 @@
     "downloadModel": "下载",
     "downloadNeedModel": "所选模型尚未下载，请先下载后再保存。",
     "onnxServiceEnabled": "已开启本地 ONNX 服务",
+    "ocrTitle": "图片与扫描件 OCR",
+    "ocrDescription": "可选能力。启用后可索引图片，并在普通 PDF 无法提取文字时自动识别扫描页。",
+    "ocrLocal": "本地 ONNX",
+    "ocrRemote": "在线视觉模型",
+    "ocrLocalHint": "保存时自动安装 RapidOCR 组件和默认中英文模型。",
+    "ocrRemotePrivacy": "图片和扫描页会发送给所选在线模型提供商。",
+    "ocrSelectModel": "选择支持图片输入的模型",
+    "ocrNoProviders": "暂无支持图片输入的在线模型提供商",
+    "ocrNoModels": "该提供商没有支持图片输入的模型",
     "enable": "启用",
     "featureEnabled": "知识库已启用",
     "featureDisabled": "知识库已停用",
@@ -877,7 +894,7 @@
       "localShellDesc": "可读写文件并执行 Shell 指令，权限范围最大。",
       "localShellWarning": "⚠️ 此模式可访问主机完整环境，请仅在信任的场景下使用。",
       "filesystem": "本地文件系统（不能执行指令）",
-      "filesystemDesc": "仅在 Agent 工作区目录内读写文件，不能执行 Shell 指令。",
+      "filesystemDesc": "仅在专家的工作区目录内读写文件，不能执行 Shell 指令。",
       "state": "会话状态（不实际操作文件和执行指令）",
       "stateDesc": "进程内临时状态存储，不读写真实文件、不执行指令，重启后数据不保留。",
       "composite": "组合模式（可以通过路径组合多种模式）",
@@ -1047,6 +1064,13 @@
     "generating": "生成中",
     "generatingWithElapsed": "生成中 · {{seconds}}s",
     "scrollToBottom": "回到底部",
+    "turnTimeline": {
+      "label": "对话回合",
+      "jumpToQuery": "跳转到第 {{index}} 条消息",
+      "userFallback": "（空消息）",
+      "emptyAssistant": "（暂无回复）",
+      "runningAssistant": "（生成中…）"
+    },
     "loadingEarlierMessages": "正在加载更早的消息…",
     "scrollForEarlierMessages": "向上滚动加载更早的消息",
     "refreshingMessages": "正在刷新消息…",
@@ -1158,12 +1182,96 @@
       "emptyResult": "模型未返回润色结果"
     },
     "hitl": {
-      "title": "需要审批工具调用",
+      "title": "需要确认这次操作",
       "approve": "批准",
       "reject": "拒绝",
       "approved": "已批准",
       "rejectedLabel": "已拒绝",
-      "rejected": "用户已拒绝"
+      "rejected": "用户已拒绝",
+      "args": {
+        "action": "操作",
+        "level": "范围",
+        "url": "网址",
+        "command": "命令",
+        "cmd": "命令",
+        "path": "路径",
+        "file": "文件",
+        "file_path": "文件路径",
+        "query": "查询",
+        "pattern": "匹配",
+        "content": "内容",
+        "text": "文字",
+        "selector": "选择器",
+        "ref": "元素",
+        "key": "按键",
+        "value": "值",
+        "direction": "方向",
+        "amount": "幅度",
+        "prompt": "提示词",
+        "old_string": "原文",
+        "new_string": "替换为",
+        "timeout": "超时",
+        "method": "方法",
+        "body": "内容",
+        "code": "脚本",
+        "wait": "等待",
+        "element_ref": "目标元素",
+        "full_page": "整页",
+        "tab_id": "标签页"
+      },
+      "bool": {
+        "true": "是",
+        "false": "否"
+      },
+      "browser": {
+        "actions": {
+          "navigate": "打开网页",
+          "open": "打开网页",
+          "snapshot": "获取页面快照",
+          "dom_tree": "获取网页结构",
+          "screenshot": "截取网页截图",
+          "click": "点击页面元素",
+          "type": "在页面中输入文字",
+          "fill": "填写表单",
+          "press": "按下按键",
+          "wait": "等待页面就绪",
+          "select": "选择下拉选项",
+          "scroll": "滚动页面",
+          "hover": "悬停在元素上",
+          "eval_js": "在页面中执行脚本",
+          "go_back": "返回上一页",
+          "go_forward": "前进到下一页",
+          "reload": "刷新页面",
+          "new_tab": "打开新标签页",
+          "switch_tab": "切换标签页",
+          "close_tab": "关闭标签页",
+          "list_tabs": "列出标签页",
+          "close_session": "关闭浏览器会话"
+        },
+        "levels": {
+          "minimal": "精简结构",
+          "interactive": "仅交互元素",
+          "full": "完整结构",
+          "structured": "结构化内容"
+        },
+        "directions": {
+          "up": "向上",
+          "down": "向下",
+          "left": "向左",
+          "right": "向右"
+        }
+      },
+      "summaries": {
+        "domTreeInteractive": "获取当前网页的可交互元素结构",
+        "domTree": "获取当前网页结构",
+        "screenshot": "截取当前网页截图",
+        "openUrl": "打开网页 {{url}}",
+        "runCommand": "执行命令：{{command}}",
+        "writeFile": "写入文件 {{path}}",
+        "readFile": "读取文件 {{path}}",
+        "editFile": "编辑文件 {{path}}",
+        "fetchUrl": "抓取网页 {{url}}"
+      }
     },
     "ask": {
       "title": "先问几个问题",
@@ -1176,6 +1284,8 @@
       "submit": "提交回答",
       "skip": "你决定",
       "skipMessage": "你决定吧——按最优默认方案继续，并告诉我你依据的假设。",
+      "dismiss": "关闭",
+      "dismissMessage": "用户关闭了这些问题，没有作答。不要再追问，请就此结束本轮。",
       "answered": "已回答",
       "answeredSummary": "已回答 {{count}} 个问题",
       "dismissedSummary": "已关闭 {{count}} 个问题",
@@ -1185,6 +1295,7 @@
     "openBrowser": "查看浏览器",
     "openBrowserHint": "Agent 正在网页中操作",
     "openTerminal": "打开终端",
+    "openTrajectory": "运行轨迹",
     "openPhone": "打开远程手机",
     "openWorkspace": "工作区",
     "editFileCard": "编辑了{{count}}个文件",
@@ -1200,6 +1311,57 @@
     "dockFileMaybeDeleted": "该文件可能为处理过程中的临时文件，当前已经被删除。",
     "remoteBrowserTitle": "远程浏览器",
     "dockTerminalTitle": "终端",
+    "trajectoryTitle": "运行轨迹",
+    "trajectoryEmpty": "暂无运行轨迹",
+    "trajectorySelectSession": "请选择一个会话以查看运行轨迹",
+    "trajectoryLoadError": "加载运行轨迹失败",
+    "trajectoryLoadEarlier": "加载更早历史",
+    "trajectoryLaneInput": "输入",
+    "trajectoryLaneModel": "模型",
+    "trajectoryLaneTools": "工具",
+    "trajectoryTimeline": "运行轨迹时间线",
+    "trajectoryMetrics": "会话指标",
+    "trajectoryExport": "导出",
+    "trajectoryExportFailed": "导出运行轨迹失败",
+    "trajectoryMetricTurns": "回合",
+    "trajectoryMetricSteps": "步骤",
+    "trajectoryMetricLlmMs": "模型",
+    "trajectoryMetricToolMs": "工具",
+    "trajectoryMetricTtft": "首字时延",
+    "trajectoryMetricTokPerS": "tok/s",
+    "trajectoryMetricCacheHit": "缓存命中",
+    "trajectoryMetricInputTokens": "输入",
+    "trajectoryMetricOutputTokens": "输出",
+    "trajectoryMetricCacheRead": "缓存读取",
+    "trajectoryDetailLoading": "正在加载详情…",
+    "trajectoryDetailError": "加载事件详情失败",
+    "trajectoryToolbarDuration": "耗时",
+    "trajectoryToolbarTurns": "回合",
+    "trajectoryToolbarCalls": "调用",
+    "trajectoryToolbarSearch": "搜索轨迹",
+    "trajectoryToolCallOnly": "（仅工具调用）",
+    "trajectoryCollapsedToolCallOne": "{{count}} 次工具调用 · {{names}}",
+    "trajectoryCollapsedToolCallMany": "{{count}} 次工具调用 · {{names}}",
+    "trajectoryCollapsedTurn": "{{steps}} 步 · {{toolCalls}} 次工具调用",
+    "trajectoryInspectorKind": "类型",
+    "trajectoryInspectorSource": "来源",
+    "trajectoryInspectorStatus": "状态",
+    "trajectoryInspectorError": "错误",
+    "trajectoryInspectorCompleted": "已完成",
+    "trajectoryInspectorTtft": "首字时延",
+    "trajectoryInspectorTokens": "Token",
+    "trajectoryInspectorTiming": "请求耗时",
+    "trajectoryInspectorStarted": "开始时间",
+    "trajectoryInspectorTotalDuration": "总耗时",
+    "trajectoryInspectorGeneration": "生成耗时",
+    "trajectoryInspectorThroughput": "吞吐",
+    "trajectoryInspectorPlaceholder": "选择一条记录",
+    "trajectoryInspectorSummary": "摘要",
+    "trajectoryInspectorPreview": "预览",
+    "trajectoryInspectorResult": "结果",
+    "trajectoryInspectorPayload": "参数",
+    "trajectoryInspectorEmptyPayload": "无参数",
+    "trajectoryInspectorRaw": "原始",
     "dockPhoneTitle": "远程手机",
     "dockToolUiTitle": "插件工具",
     "dockToolUiMissing": "该工具结果已不在当前对话中。",
@@ -1259,7 +1421,7 @@
   },
   "toolSettings": {
     "title": "工具设置",
-    "hint": "关闭后模型将无法调用该工具。系统必需工具不可关闭。插件工具需插件已全局启用；也可在「插件管理」里按专家开关。",
+    "hint": "关闭后模型将无法调用该内置工具。系统必需工具不可关闭。",
     "empty": "暂无工具",
     "loadFailed": "加载工具设置失败",
     "saveSuccess": "工具设置已保存",
@@ -1340,7 +1502,7 @@
     "archiveImportSuccess": "已导入 {{count}} 个文件",
     "archiveImportFailed": "导入压缩包失败",
     "archiveImportTitle": "导入工作区压缩包",
-    "archiveImportBody": "将导入「{{name}}」到当前 Agent 工作区。",
+    "archiveImportBody": "将导入「{{name}}」到当前专家工作区。",
     "archiveImportConfirm": "开始导入",
     "archiveModeMerge": "合并（覆盖同名文件，保留其他文件）",
     "archiveModeReplace": "替换（清空本地工作区后导入）",
@@ -1377,6 +1539,16 @@
     "storedTitle": "备份文件",
     "storedDesc": "系统备份保存在以下目录，可下载或一键恢复。",
     "createButton": "新建备份",
+    "createModalTitle": "选择备份内容",
+    "createModalDesc": "数据库基础数据始终备份，其他内容可按需选择。",
+    "includeDatabase": "数据库基础数据（必选）",
+    "includeConfig": "配置文件（config.json 与 env）",
+    "includeWorkspaces": "专家工作区",
+    "includeSkillPackages": "全局技能包（skill-packages）",
+    "includePlugins": "已安装插件（plugins）",
+    "includeKnowledge": "知识库文件（knowledge）",
+    "includeChats": "聊天记录（含运行轨迹）",
+    "includeChatsHint": "聊天记录和运行轨迹可能占用大量空间，默认不备份。",
     "creating": "备份中…",
     "uploadButton": "上传备份",
     "uploadSuccess": "已保存 {{name}}",
@@ -1389,6 +1561,7 @@
     "colSize": "大小",
     "colCreated": "创建时间",
     "colModified": "修改时间",
+    "colContents": "内容",
     "colActions": "操作",
     "restoreAction": "恢复",
     "deleteConfirmTitle": "删除备份",
@@ -1404,15 +1577,27 @@
     "importButton": "选择备份文件",
     "uploading": "正在上传… {{percent}}%",
     "restoring": "恢复中…",
-    "importWarning": "恢复将覆盖当前数据库与本地工作区，并热加载模型、专家与通道。恢复期间依赖数据库的接口可能短暂不可用，建议在维护窗口操作。若同时恢复了 config/env，完整生效仍需手动重启服务。此操作不可撤销。",
+    "importWarning": "恢复只覆盖备份中包含的内容；未包含聊天记录时会保留当前聊天记录。恢复期间依赖数据库的接口可能短暂不可用，建议在维护窗口操作。若同时恢复了 config/env，完整生效仍需手动重启服务。此操作不可撤销。",
     "importConfirmTitle": "确认恢复备份",
     "importConfirmBody": "确定从「{{name}}」恢复？这将覆盖现有数据，替换数据库期间服务可能短暂不可用。恢复后会热加载模型、专家与通道，无需重启服务；若勾选恢复配置，config/env 需重启后才完全生效。",
     "importConfirmOk": "恢复",
     "importSuccess": "恢复完成（{{agents}} 个 Agent，{{files}} 个工作区文件）",
     "importFailed": "恢复备份失败",
     "restoreConfig": "同时恢复 config.json 与 env（需手动重启服务后生效）",
+    "tagConfig": "配置",
+    "tagWorkspaces": "工作区",
+    "tagSkillPackages": "技能包",
+    "tagPlugins": "插件",
+    "tagKnowledge": "知识库",
+    "tagChatsYes": "对话及运行轨迹",
+    "restoreKeepChats": "此备份不含聊天记录和运行轨迹，恢复后会保留当前数据。",
+    "restoreNoConfig": "此备份不含配置文件，无法恢复 config/env。",
+    "restoreNoWorkspaces": "此备份不含专家工作区，磁盘上现有工作区文件不会被整包替换。",
+    "restoreNoSkillPackages": "此备份不含全局技能包，现有 skill-packages 目录会保留。",
+    "restoreNoPlugins": "此备份不含插件目录，现有 plugins 会保留。",
+    "restoreNoKnowledge": "此备份不含知识库文件，现有 knowledge 目录会保留。",
     "autoTitle": "自动备份",
-    "autoDesc": "按计划将全量系统备份写入备份目录；保留策略只清理自动备份，不影响手动备份。",
+    "autoDesc": "按计划将系统备份写入备份目录；默认不包含聊天记录。保留策略只清理自动备份，不影响手动备份。",
     "autoEnabled": "启用自动备份",
     "autoSchedule": "备份周期",
     "autoScheduleDaily": "每天 04:00",
@@ -1422,6 +1607,7 @@
     "autoScheduleHint": "cron:分 时 日 月 周（服务器时区）；interval:秒数，例如 interval:43200 表示每 12 小时。",
     "autoIntervalPreview": "当前：每 {{seconds}} 秒（约 {{hours}} 小时）",
     "autoRetention": "保留最近 N 份自动备份",
+    "autoContent": "备份内容",
     "autoSave": "保存设置",
     "autoSaveSuccess": "自动备份设置已保存",
     "autoSaveFailed": "保存自动备份设置失败",
@@ -1603,7 +1789,7 @@
   "cronJobs": {
     "title": "定时任务",
     "description": "配置和监控定时任务",
-    "createJob": "创建任务",
+    "createJob": "创建定时任务",
     "editJob": "编辑任务",
     "confirmDelete": "确认删除",
     "deleteConfirm": "确定要删除此定时任务吗？",
@@ -1629,7 +1815,7 @@
     "loadingJobs": "正在加载当前专家的任务…",
     "syncing": "正在同步…",
     "noJobs": "开启你的第一个定时任务吧",
-    "noJobsDesc": "选择下方示例，或点击「创建任务」从头开始",
+    "noJobsDesc": "选择下方示例，或点击「创建定时任务」从头开始",
     "viewTable": "表格",
     "viewCard": "卡片",
     "noJobsSuggestion1": "设置每日「14:00」的自动定时任务，根据我的星座「双子座」提供今日的行动注意事项发送给我",
@@ -1662,6 +1848,7 @@
       "idTooltip": "任务的唯一标识符，由系统自动生成。",
       "name": "任务名称",
       "nameTooltip": "给任务起一个易于辨识的名称，方便在列表中快速找到。",
+      "nameTooLong": "任务名称不能超过 {{max}} 个字符",
       "enabled": "启用任务",
       "enabledTooltip": "开启后任务将按照设定的时间自动执行，关闭则暂停执行。",
       "sectionSchedule": "执行频率",
@@ -1784,7 +1971,7 @@
       "runtimeTimeoutSeconds": "超时时间 (秒)",
       "runtimeMisfireGrace": "错过容忍 (秒)"
     },
-    "noAgentSelected": "请先在右上角选择一个 Agent 来管理它的定时任务"
+    "noAgentSelected": "请先在右上角选择一个专家来管理它的定时任务"
   },
   "channels": {
     "title": "通道",
@@ -1863,7 +2050,7 @@
     "displaySettings": "消息展示",
     "responseMode": "回复方式",
     "responseModeDesc": "仅发送最终回复会隐藏工具调用前的过程说明；实时过程保留当前逐阶段消息",
-    "responseModeInvoke": "仅最终回复（推荐）",
+    "responseModeInvoke": "仅最终回复",
     "responseModeStream": "实时过程",
     "showToolHints": "显示工具调用提示",
     "showToolHintsDesc": "开启后，频道消息中将展示工具调用过程与状态提示",
@@ -1885,27 +2072,27 @@
     "checkRequestFailed": "连接检测请求失败，请稍后重试",
     "checkFailedAutoDisabled": "凭据验证失败，频道已自动停用",
     "enableFailedCheckFailed": "启用失败：连接检测未通过",
-    "quickConfig": "扫码接入",
-    "manualConfig": "手动配置",
+    "quickConfig": "快捷配置（扫码）",
+    "manualConfig": "手动填写",
     "quickConfigStep1": "点击下方按钮前往企业微信开放平台",
     "quickConfigStep2": "按照指引完成机器人授权",
     "quickConfigStep3": "授权完成后回到此页面，频道将自动连接",
     "goToAuthorize": "前往授权",
-    "qrLoading": "正在获取二维码...",
-    "qrStep1": "打开企业微信 App",
-    "qrStep2": "扫描下方二维码完成授权",
-    "qrStep3": "扫码成功后自动获取凭据并接入",
-    "qrScanHint": "请使用企业微信扫描二维码",
+    "qrLoading": "生成二维码中...",
+    "qrStep1": "打开企业微信",
+    "qrStep2": "扫码注册 AI 机器人",
+    "qrStep3": "确认绑定",
+    "qrScanHint": "扫码后自动跳转下一步",
     "weixinQrStep1": "打开微信 App",
-    "weixinQrStep2": "扫描下方二维码完成授权",
-    "weixinQrStep3": "扫码成功后自动获取凭据并接入",
-    "weixinQrScanHint": "请使用微信扫描二维码",
-    "dingtalkQrLoading": "正在初始化钉钉应用创建流程...",
+    "weixinQrStep2": "扫码登录",
+    "weixinQrStep3": "手机确认",
+    "weixinQrScanHint": "使用微信扫码登录个人账号",
+    "dingtalkQrLoading": "生成二维码中...",
     "dingtalkQrIntro1": "点击按钮生成钉钉应用授权二维码",
     "dingtalkQrIntro2": "使用同一组织账号登录的钉钉 App 扫码并确认",
     "dingtalkQrIntro3": "Octop 将自动创建并启用钉钉频道",
-    "dingtalkQrStep1": "打开钉钉 App",
-    "dingtalkQrStep2": "扫描应用授权二维码",
+    "dingtalkQrStep1": "打开钉钉",
+    "dingtalkQrStep2": "扫描二维码",
     "dingtalkQrStep3": "确认创建应用",
     "dingtalkQrScanHint": "请使用钉钉 App 扫码完成授权",
     "dingtalkUserCode": "用户码",
@@ -1946,21 +2133,31 @@
     "qrTimeout": "扫码超时（3 分钟），请重试",
     "qrFailed": "扫码失败，请重试",
     "qrGenerateFailed": "获取二维码失败，请检查网络后重试",
-    "qrRetry": "重新获取二维码",
-    "feishuCreating": "正在初始化飞书机器人创建流程...",
+    "qrRetry": "重新生成",
+    "feishuCreating": "生成二维码中...",
     "feishuApiTimeout": "调用飞书接口超时，请使用手动配置",
     "feishuSwitchManual": "使用手动配置",
-    "feishuQrStep1": "打开飞书 App，点击右上角「+」→「扫一扫」",
-    "feishuQrStep2": "扫描下方二维码登录飞书开放平台",
-    "feishuQrScanHint": "请使用飞书 App 内的「扫一扫」扫描二维码",
+    "feishuQrStep1": "打开飞书扫一扫",
+    "feishuQrStep2": "扫描二维码",
+    "feishuQrStep3": "确认创建应用",
+    "feishuQrScanHint": "请使用飞书 App 内的「扫一扫」扫描，确认后即可拿到凭证",
+    "feishuQrIntro1": "点击下方按钮，生成飞书 AI 机器人注册二维码",
+    "feishuQrIntro2": "用飞书 App 扫码，完成机器人注册",
+    "feishuQrIntro3": "凭据自动填入并保存",
+    "feishuCreateButton": "一键创建飞书机器人",
+    "feishuCreateFailed": "飞书机器人创建失败",
     "feishuBindSuccess": "飞书机器人已创建并启用",
     "feishuCreateSuccess": "飞书机器人创建成功！",
+    "feishuCreateSuccessNamed": "飞书机器人「{{name}}」创建成功",
     "feishuBotName": "机器人名称",
     "feishuManageBot": "前往飞书开放平台管理",
-    "yuanbaoCreating": "正在初始化元宝机器人绑定流程...",
-    "yuanbaoQrStep1": "打开腾讯元宝 App",
-    "yuanbaoQrStep2": "扫描下方二维码完成机器人绑定",
-    "yuanbaoQrScanHint": "请使用腾讯元宝 App 扫描二维码",
+    "yuanbaoCreating": "生成二维码中...",
+    "yuanbaoQrStep1": "打开元宝 App",
+    "yuanbaoQrStep2": "扫码绑定",
+    "yuanbaoQrStep3": "确认授权",
+    "yuanbaoQrScanHint": "扫码后在元宝 App 确认绑定",
+    "yuanbaoStarting": "启动元宝扫码绑定流程...",
+    "yuanbaoBindFailed": "元宝绑定失败",
     "yuanbaoBindSuccess": "元宝机器人已绑定并启用",
     "yuanbaoCreateSuccess": "元宝机器人绑定成功！",
     "dmPolicy": "私聊策略",
@@ -1986,6 +2183,16 @@
     "qrRetryBtn": "重试",
     "wecomGenerateQr": "生成扫码二维码",
     "weixinGenerateQr": "生成微信扫码二维码",
+    "wecomQrSuccess": "企业微信绑定成功",
+    "weixinQrSuccess": "微信绑定成功",
+    "weixinAccountId": "账号 ID: {{id}}",
+    "fieldRequired": "{{label}} 必填",
+    "fieldMustBeJsonObject": "{{label}} 必须是 JSON 对象",
+    "jsonMustBeObject": "必须是 JSON 对象",
+    "invalidJson": "非法 JSON",
+    "rawConfigTooltip": "渠道特定配置 — 详见 harness-gateway 文档",
+    "getCredentials": "前往获取凭据",
+    "channelSettingsNamed": "{{kind}} 频道设置",
     "deleteConfirmTitle": "删除频道「{{name}}」？"
   },
   "tokenUsage": {
@@ -2146,6 +2353,7 @@
   "voice": {
     "loading": "加载语音配置…",
     "loadError": "加载语音配置失败",
+    "description": "管理语音识别与语音合成模型，并选择当前使用的服务。",
     "sttSection": "语音输入 (STT)",
     "ttsSection": "语音朗读 (TTS)",
     "free": "免费",
@@ -2156,7 +2364,12 @@
     "activeUpdated": "已更新当前语音服务",
     "activeUpdateFailed": "更新失败",
     "configure": "配置",
+    "configureTitle": "配置 {{name}}",
     "saved": "配置已保存",
+    "credentialsRequired": "请先填写完整的连接凭证",
+    "probe": "探测",
+    "probeSuccess": "语音模型探测成功",
+    "probeFailed": "语音模型探测失败",
     "tencentHint": "在腾讯云控制台创建 SecretId / SecretKey，语音识别与合成均有免费试用额度。",
     "openaiHint": "使用 OpenAI Whisper 识别、OpenAI TTS 朗读。",
     "mimoHint": "小米 Mimo 语音识别与合成。选择接入点并填写对应的 API Key。",
@@ -2594,9 +2807,11 @@
     "ollamaNotRunning": "Ollama 服务未启动",
     "testUseSavedConfig": "使用已保存的配置",
     "pageTitle": "模型设置",
-    "pageSubtitle": "统一管理对话模型与图片、视频生成模型服务。",
+    "pageSubtitle": "统一管理对话模型、图片视频生成模型、语音模型与搜索引擎。",
     "chatModelsTab": "对话模型",
     "generationModelsTab": "生成模型",
+    "voiceModelsTab": "语音模型",
+    "searchModelsTab": "搜索引擎",
     "addCustomProvider": "自定义供应商",
     "loadingProviders": "加载中...",
     "noProvidersHint": "还没有 provider,点击右上角新建",
@@ -2708,9 +2923,11 @@
   "advancedSettings": {
     "description": "管理运行配置和环境变量等高级选项。",
     "search": {
-      "desc": "配置 AI 驱动的网络搜索提供商，使您的助手能够搜索互联网。每个提供商需要来自相应服务的 API 密钥。",
+      "desc": "管理网络搜索提供商，供智能体检索互联网。",
       "tip": "您可以在此处配置或修改搜索提供商。更改将在下一次聊天会话时生效。",
       "configure": "配置",
+      "configureTitle": "配置 {{name}}",
+      "probe": "探测",
       "sourceBuiltinTitle": "当前搜索源：内置搜索",
       "sourceBuiltinDesc": "未配置第三方搜索服务时，仍可使用产品内置搜索服务；该服务无需 API Key，但不保证稳定性和可用性。配置第三方服务后会自动切换。",
       "sourceConfiguredTitle": "当前搜索源：{{name}}",
@@ -2800,6 +3017,8 @@
     "maxInputLengthPlaceholder": "请输入最大输入长度",
     "maxInputLengthRequired": "最大输入长度为必填项",
     "maxInputLengthMin": "最大输入长度必须大于等于 1000",
+    "enableTrajectory": "记录运行轨迹",
+    "enableTrajectoryTooltip": "开启后，该专家的对话会写入运行轨迹，可在聊天页查看。默认开启。",
     "saveSuccess": "配置保存成功",
     "saveFailed": "配置保存失败",
     "loadFailed": "配置加载失败",
@@ -3415,10 +3634,11 @@
   },
   "personalization": {
     "title": "个性化",
-    "description": "配置当前智能体的技能、工具、子智能体、通道、人格与记忆。",
+    "description": "配置当前智能体的技能、工具、插件、子智能体、通道、人格与记忆。",
     "tabs": {
       "skills": "技能",
       "tools": "工具",
+      "plugins": "插件",
       "subagents": "子智能体",
       "channels": "通道",
       "mbti": "MBTI",
@@ -3608,9 +3828,9 @@
     "launch": "启动浏览器",
     "connect": "连接",
     "stop": "关闭浏览器",
-    "shutdownTitle": "关闭浏览器进程",
-    "shutdownConfirm": "将结束本机 Chrome 进程并释放内存。登录状态会保留在磁盘，下次启动仍可复用。是否继续？",
-    "shutdownFailed": "关闭浏览器进程失败",
+    "shutdownTitle": "关闭浏览器",
+    "shutdownConfirm": "将关闭当前浏览器窗口。已登录的网站下次打开时仍然有效。",
+    "shutdownFailed": "关闭浏览器失败",
     "streaming": "推流中",
     "connecting": "连接中",
     "browserStarted": "启动中",
@@ -3630,8 +3850,8 @@
     "viewportMode": "视口模式",
     "checkInstall": "检查浏览器",
     "checkInstallShort": "检查",
-    "checkInstallTip": "检查 Playwright 浏览器是否已安装，未安装则自动安装",
-    "browserAlreadyInstalled": "浏览器已安装",
+    "checkInstallTip": "检查本机是否已准备好浏览器，未安装时可一键安装",
+    "browserAlreadyInstalled": "浏览器已就绪",
     "checkFailed": "检查浏览器状态失败",
     "installingBrowser": "安装浏览器",
     "installing": "正在启动安装...",
@@ -3639,21 +3859,21 @@
     "installSuccessHint": "浏览器已就绪，可启动会话",
     "installFailed": "安装失败",
     "installFailedHint": "自动安装失败，请重试。若网络不稳定，可配置 PLAYWRIGHT_DOWNLOAD_HOST 镜像源后再次安装。",
-    "notInstalled": "Chromium 未安装",
-    "notInstalledHint": "尚未检测到可用浏览器，请点击下方按钮自动安装内置 Chromium。",
+    "notInstalled": "未检测到可用浏览器",
+    "notInstalledHint": "Octop 需要浏览器才能帮你自动打开网页、填写表单和截图。点击下方按钮即可自动安装，无需手动配置。",
     "install": "安装浏览器",
     "installProgress": "正在安装中…",
     "installCancelHint": "已取消安装请求，服务端可能仍在继续安装，请稍后刷新状态。",
     "uninstall": "卸载",
-    "uninstallTitle": "删除 Playwright Chromium",
-    "uninstallConfirm": "将关闭 Octop 浏览器会话，并删除通过 Playwright 安装的 Chromium。不会影响本机已有的 Chrome/Chromium。是否继续？",
+    "uninstallTitle": "卸载内置浏览器",
+    "uninstallConfirm": "将关闭当前浏览器窗口，并卸载 Octop 自动安装的浏览器。你电脑上已有的 Chrome 等浏览器不受影响。",
     "uninstalling": "正在卸载…",
-    "uninstallSuccess": "已删除 Playwright Chromium",
+    "uninstallSuccess": "内置浏览器已卸载",
     "uninstallFailed": "卸载失败",
     "playwrightMissing": "playwright 包未安装，请先安装 octop[browser] extras。",
     "installLog": "安装日志",
     "installRetry": "重新安装",
-    "envReady": "Playwright 与 Chromium 均可用",
+    "envReady": "可以帮你打开网页、填写表单和截图了",
     "envProbeFailed": "检测浏览器环境失败",
     "sharedSessionHint": "与聊天中 Agent 共用同一浏览器会话",
     "selectSession": "选择浏览器会话",
@@ -3672,10 +3892,10 @@
     "startBrowserDesc": "环境已就绪，按以下步骤开始远程浏览与操控",
     "startBrowserIdleStep1": "点击下方「启动浏览器」建立会话",
     "startBrowserIdleStep2": "在地址栏输入网址并访问，也可使用收藏夹与 AI 助手",
-    "setupTitle": "需要配置浏览器环境",
-    "setupDesc": "按以下步骤完成 Playwright / Chromium 环境配置",
-    "setupStep1": "点击「检查」，检测 Playwright 与 Chromium 是否可用",
-    "setupStep2": "若组件缺失，在弹窗中一键安装浏览器环境",
+    "setupTitle": "需要安装浏览器",
+    "setupDesc": "先安装浏览器，即可开始远程浏览和自动操作网页",
+    "setupStep1": "点击「检查」，确认本机是否已有可用浏览器",
+    "setupStep2": "如果还没有，在弹窗中一键安装即可",
     "setupStep3": "安装完成后，点击「启动浏览器」开始会话",
     "startBrowserDisabled": "请先完成浏览器环境检查与安装",
     "startBrowserHeaderHint": "点击下方「启动浏览器」开始会话",
@@ -3843,7 +4063,9 @@
       "active": "运行中"
     },
     "browserStatusActive": "浏览器：{{owner}}",
-    "browserStatusIdle": "浏览器（点击查看/接管）"
+    "browserStatusIdle": "浏览器（点击查看/接管）",
+    "chromeMissingTitle": "检测到未安装浏览器",
+    "chromeMissingJumpToInstall": "即将跳转「工作区-浏览器」进行安装"
   },
   "browserViewer": {
     "goBack": "后退",
@@ -4041,7 +4263,7 @@
   },
   "storage": {
     "pageTitle": "存储管理",
-    "pageSubtitle": "管理存储后端（COS、S3、OSS、Docker 沙箱等），供 Agent 使用",
+    "pageSubtitle": "管理存储后端（本地、对象存储、沙箱、数据库），供专家使用",
     "myStorage": "我的存储",
     "supportedTypes": "支持类型",
     "addBackend": "添加存储后端",
@@ -4051,7 +4273,15 @@
     "clickToConfigure": "点击配置此后端",
     "configuredBadge": "已配置",
     "emptyMyStorage": "暂无存储后端",
-    "emptyMyStorageHint": "前往「支持类型」选择并配置一个存储后端，供 Agent 使用",
+    "emptyMyStorageHint": "前往「支持类型」选择并配置一个存储后端，供专家使用",
+    "emptyGuideTitle": "还没有存储后端",
+    "emptyGuideDesc": "存储后端是给专家用的工作区：本地目录、对象存储、沙箱或数据库，配好后按名称挂到专家上即可。",
+    "emptyGuideStepWhat": "存储后端是什么",
+    "emptyGuideStepWhatDetail": "一份可复用的存储配置。专家读写文件、执行命令时走这份后端，而不是默认的本机目录。",
+    "emptyGuideStepHow": "怎么添加",
+    "emptyGuideStepHowDetail": "打开「支持类型」，选本地、对象存储、沙箱或数据库，填好凭证或路径后保存。可随时探测连通性。",
+    "emptyGuideStepUse": "专家怎么用",
+    "emptyGuideStepUseDetail": "在专家工作区里选择已配置的后端名称。沙箱类后端随专家启动创建、停止销毁。",
     "totalBackends": "共 {{count}} 个后端",
     "noBackends": "暂无存储后端，点击右上角添加",
     "nameLabel": "名称",
@@ -4075,6 +4305,15 @@
     "dockerImageLabel": "镜像（image）",
     "dockerRegistryLabel": "Registry",
     "dockerPulling": "正在拉取 Docker 镜像…",
+    "opensandboxInstalling": "正在安装 OpenSandbox SDK 并探测…",
+    "opensandbox_probe_ok": "OpenSandbox 读写探测成功",
+    "opensandboxDomainLabel": "域名",
+    "opensandboxApiKeyLabel": "API Key",
+    "opensandboxProtocolLabel": "协议（http / https）",
+    "groupLocal": "本地",
+    "groupObject": "对象存储",
+    "groupSandbox": "沙箱",
+    "groupDatabase": "数据库",
     "docker_image_pulled": "镜像已拉取并就绪",
     "docker_image_ready": "镜像已在本地，可用",
     "docker_probe_roundtrip_ok": "容器内写入与读取探测成功",
@@ -4100,16 +4339,18 @@
     "kindShell": "本地 Shell",
     "kindPostgres": "PostgreSQL",
     "kindDocker": "Docker 沙箱",
+    "kindOpensandbox": "OpenSandbox",
     "kindCustom": "自定义（S3 兼容）",
-    "descCos": "腾讯云对象存储，适合国内业务；支持大文件上传、CDN 加速",
-    "descS3": "Amazon S3，业界标准对象存储；兼容绝大多数云厂商",
-    "descOss": "阿里云对象存储 OSS，适合阿里云生态的应用场景",
-    "descObs": "华为云对象存储 OBS，适合华为云生态",
-    "descFilesystem": "挂载宿主机本地目录，适合开发/单机部署场景",
-    "descShell": "在宿主机本地 Shell 中执行命令，支持超时、环境变量隔离",
-    "descPostgres": "将 PostgreSQL 表用作结构化存储后端，支持 Schema 隔离",
-    "descDocker": "在 Docker 容器内执行代码（经 Docker API，不挂载宿主工作区）；按 sandbox_scope 命名容器；删专家不删沙箱",
-    "descCustom": "任意 S3 兼容服务（MinIO、Ceph、R2 等）",
+    "descCos": "腾讯云对象存储，国内访问延迟低；支持 CDN 加速与大文件分片上传，适合国内部署。",
+    "descS3": "Amazon S3，业界标准对象存储；协议兼容绝大多数云厂商与自建服务，适合跨区域部署。",
+    "descOss": "阿里云对象存储 OSS，适合阿里云生态；内网访问免流量费，支持生命周期与冷热分层。",
+    "descObs": "华为云对象存储 OBS，适合华为云生态；兼容 S3 接口，支持多级存储与并行文件语义。",
+    "descFilesystem": "挂载宿主机本地目录作为工作区，读写最快、无网络依赖；适合开发调试与单机部署。",
+    "descShell": "在宿主机本地 Shell 中执行命令，支持超时与环境变量隔离；专家可直接使用宿主工具链。",
+    "descPostgres": "将 PostgreSQL 表用作结构化存储后端，支持 Schema 隔离；多个专家可共享同一实例。",
+    "descDocker": "在本机 Docker 容器内执行代码，不挂载宿主工作区；容器按 sandbox_scope 复用与命名。",
+    "descOpensandbox": "远程 OpenSandbox 沙箱，专家启动时创建、停止时销毁；启用该后端会自动安装官方 SDK。",
+    "descCustom": "任意 S3 兼容服务，如 MinIO、Ceph、Cloudflare R2；需自行填写 Endpoint 与访问密钥。",
     "dockerEnv": {
       "drawerTitle": "本机 Docker 环境",
       "checking": "正在检测 Docker…",
@@ -4495,8 +4736,23 @@
     "loadFailed": "加载连接器失败",
     "tabCatalog": "服务目录",
     "tabBuiltin": "内置连接器",
+    "tabEnabled": "已启用连接器",
     "tabCustom": "自定义连接器",
     "listSummary": "当前支持 {{total}} 个连接器，已配置 {{configured}} 个",
+    "enabledSummary": "已启用 {{count}} 个连接器实例",
+    "emptyGuideTitle": "还没有已启用的连接器",
+    "emptyGuideDesc": "连接器实例保存一份外部服务的凭证，Agent 通过它调用对方的工具。请基于内置连接器创建实例。",
+    "emptyGuideStepWhat": "连接器实例是什么",
+    "emptyGuideStepWhatDetail": "一个实例 = 一份凭证 + 一个显示名称。同一个内置连接器可以创建多个实例，例如两个不同账号的邮箱。",
+    "emptyGuideStepHow": "怎么创建",
+    "emptyGuideStepHowDetail": "打开「内置连接器」，选择要接入的服务，在弹出的「创建连接器」中填写凭证并探测，保存后即出现在本页。",
+    "emptyGuideStepShare": "共享与默认开启",
+    "emptyGuideStepShareDetail": "开启共享后本实例内所有登录用户可选用，但仅所有者可编辑；默认开启只对所有者生效。",
+    "emptyGuideBrowseBuiltin": "浏览内置连接器",
+    "emptyGuideAddCustom": "添加自定义 MCP",
+    "noCredentials": "缺少凭证",
+    "sharedFrom": "来自 {{name}}",
+    "sharedReadonly": "共享连接器，仅所有者可管理",
     "customMcp": {
       "introTitle": "MCP 服务器配置（JSON 格式）。参考以下格式：",
       "modeVisual": "可视化",
@@ -4622,7 +4878,12 @@
     "comingSoon": "即将推出",
     "addConnection": "添加 {{name}}",
     "displayName": "显示名称",
-    "defaultOpen": "是否默认打开",
+    "description": "描述",
+    "shared": "是否共享",
+    "sharedHint": "共享后其他用户可以选择使用，但不能查看或修改配置。",
+    "sharedBadge": "共享",
+    "defaultEnabled": "是否默认开启",
+    "defaultOpen": "是否默认开启",
     "defaultOpenHint": "仅对你自己的账号生效：关闭时需在对话中手动勾选才会注入工具。",
     "defaultOpenWarning": "开启后默认会在你的 Dashboard、IM 与 Cron（未特殊选连接器时）携带该工具（额外消耗 token）。Dashboard 可关本轮；Cron 若显式选择连接器则以选择为准。",
     "defaultOpenLockedBadge": "默认打开",
@@ -4637,8 +4898,9 @@
     "createSuccess": "连接器已创建",
     "createFailed": "创建失败",
     "saveSuccess": "连接器已保存",
-    "configureConnection": "配置 {{name}}",
-    "editConnection": "配置 {{name}}",
+    "configureConnection": "创建 {{name}} 连接器",
+    "createConnection": "创建 {{name}} 连接器",
+    "editConnection": "编辑 {{name}} 连接器",
     "configSection": "连接配置",
     "secretConfigured": "已配置，留空表示不修改",
     "secretPlaceholder": "留空表示不修改",
@@ -4744,18 +5006,23 @@
     "uninstallFailed": "卸载失败",
     "uninstallConfirm": "确定卸载插件 {{id}}？",
     "empty": "尚未安装插件",
-    "adminHint": "插件安装在服务器 ~/.octop/plugins/。可用启用开关控制插件是否加载。打开「查看详情」可为侧栏当前 Agent 开关工具。",
+    "adminHint": "插件安装在服务器 ~/.octop/plugins/。此页面仅用于安装、重载、全局启停、查看详情和卸载。",
     "guideTitle": "如何开发并导入插件",
     "guideDevelopTitle": "1. 开发",
     "guideDevelopBody": "创建一个包含 plugin.yaml 与入口 Python 文件（如 main.py）的目录。plugin.yaml 需包含 id、version、name、kind（tool / skill / hook）和 entry。setup(ctx) 中：tool → ctx.tool(...)；skill → ctx.skills(\"skills\")；hook → ctx.middleware(...)。仓库 plugins/ 下有三类 demo 可参考。",
     "guidePackageTitle": "2. 打包",
     "guidePackageBody": "将插件打成 ZIP，且压缩包内只能有一个带 plugin.yaml 的插件根目录（可在 ZIP 根目录，或唯一的一层子目录中）。示例：zip -r my-plugin.zip my-plugin/",
     "guideImportTitle": "3. 导入",
-    "guideImportBody": "把 .zip 放到 Octop 可通过 HTTP(S) 下载的位置，优先使用 raw 直链。安装后打开插件「查看详情」，在侧栏选好 Agent，再启用工具。本地 demo：octop plugin install ./plugins/demo-toolkit --force",
+    "guideImportBody": "把 .zip 放到 Octop 可通过 HTTP(S) 下载的位置，优先使用 raw 直链。安装后前往「个性化 → 插件」为 Agent 配置。本地 demo：octop plugin install ./plugins/demo-toolkit --force",
     "guideExampleTitle": "最小 plugin.yaml 示例",
     "guideExampleYaml": "id: my-plugin\nversion: 1.0.0\nname: My Plugin\ndescription: Example tool plugin\nicon: \"🧩\"\nkind: tool\nentry: main.py",
-    "agentHint": "插件启用后，其工具默认对所有 Agent 可用；可在详情里按 Agent 单独关闭。需要 API Key 的插件请先点「配置」。新会话会使用最新工具列表。",
+    "agentHint": "插件启用后，其工具默认对所有 Agent 可用；可按 Agent 单独关闭。需要 API Key 的插件请先点「配置」。新会话会使用最新工具列表。",
+    "agentPluginHint": "已安装插件默认对当前专家开启。关闭后，该插件的工具、技能和 Hook 均不再用于此专家，但已有工具配置会保留。",
+    "agentEnabled": "为当前 Agent 启用",
+    "globallyDisabled": "已全局关闭",
+    "globalDisabledHint": "管理员已全局关闭此插件，因此即使当前 Agent 开启也不可用。",
     "noAgent": "请先在侧栏选择一个 Agent",
+    "noPlugins": "暂无已安装插件，请联系管理员先安装插件。",
     "noTools": "没有可用的插件工具。请先安装 tool 类插件。",
     "enablePluginFirst": "请先启用该插件。启用后工具默认可用，也可按 Agent 单独关闭。",
     "detailToolsHint": "默认开启。关闭后仅对侧栏当前选中的 Agent 生效（与专家「工具设置」共用配置）；下一轮对话即可生效，无需重启。",
@@ -4838,8 +5105,8 @@
       "subtitle": "创建与管理你的 AI 专家，也可从模板库挑选场景一键新建。"
     },
     "tasks": {
-      "title": "定时任务",
-      "subtitle": "配置 Agent 定期执行的计划任务"
+      "title": "自动化",
+      "subtitle": "配置专家定期执行的计划任务"
     },
     "connectors": {
       "title": "连接器",
@@ -4883,7 +5150,7 @@
     },
     "models": {
       "title": "模型配置",
-      "subtitle": "配置 LLM 提供商和 API 密钥"
+      "subtitle": "配置对话模型、生成模型、语音模型与搜索引擎"
     },
     "voice": {
       "title": "语音服务",
@@ -4911,7 +5178,7 @@
     },
     "adminAdvanced": {
       "title": "应用设置",
-      "subtitle": "环境变量、搜索、语音、备份、HTTPS 与更新"
+      "subtitle": "环境变量、备份、HTTPS 与更新"
     },
     "security": {
       "title": "安全防护",
@@ -4919,7 +5186,7 @@
     },
     "adminPlugins": {
       "title": "插件管理",
-      "subtitle": "安装与管理服务器插件，在详情中为 Agent 启用工具"
+      "subtitle": "安装并管理服务器插件；各 Agent 的启用状态在「个性化 → 插件」中配置"
     },
     "adminUpdates": {
       "title": "应用更新",
@@ -4956,7 +5223,7 @@
     "pickDevice": "请先选择设备",
     "devicePlaceholder": "选择设备",
     "needsInstall": "需要安装容器",
-    "needsInstallDesc": "此主机使用容器 Android 后端。可一键拉取并启动容器（需本机已安装 Docker）。",
+    "needsInstallDesc": "此主机使用容器 Android 后端。可一键拉取并启动容器；若未安装 Docker 将自动尝试安装（失败时需手动安装）。",
     "install": "安装容器",
     "installing": "正在启动安装…",
     "installProgress": "正在安装 Android 容器…",
@@ -4964,8 +5231,8 @@
     "installFailed": "容器安装失败，请查看日志后重试",
     "installRetry": "重新安装",
     "installCancelHint": "已取消安装请求，服务端可能仍在继续安装，请稍后刷新状态。",
-    "installStep1": "确认主机已安装并可使用 Docker",
-    "installStep2": "点击「安装容器」，拉取并启动 Android 容器",
+    "installStep1": "点击「安装容器」；若主机未安装 Docker 将自动安装",
+    "installStep2": "等待拉取并启动 Android 容器",
     "installStep3": "安装完成后刷新状态，再点击「连接」",
     "needsDevice": "未连接设备",
     "needsDeviceDesc": "请启动 Android 模拟器或通过 USB 连接手机，然后刷新。",
diff --git a/dashboard/src/pages/Admin/Plugins/InstalledPluginsPanel.tsx b/dashboard/src/pages/Admin/Plugins/InstalledPluginsPanel.tsx
index 883f54b7..4aa302da 100644
--- a/dashboard/src/pages/Admin/Plugins/InstalledPluginsPanel.tsx
+++ b/dashboard/src/pages/Admin/Plugins/InstalledPluginsPanel.tsx
@@ -12,9 +12,7 @@ import {
   Collapse,
   Drawer,
   Empty,
-  Form,
   Input,
-  InputNumber,
   Modal,
   Popconfirm,
   Segmented,
@@ -31,22 +29,13 @@ import {
   List,
   Package,
   Plus,
-  Settings2,
   Trash2,
   Upload,
-  Wrench,
 } from "lucide-react";
 import { useTranslation } from "react-i18next";
-import {
-  pluginsApi,
-  type AgentPluginTool,
-  type AgentPluginsConfig,
-  type InstalledPlugin,
-  type PluginConfigField,
-} from "../../../api/modules/plugins";
+import { pluginsApi, type InstalledPlugin } from "../../../api/modules/plugins";
 import { ResizableTable } from "../../../components/ResizableTable";
 import { CardSkeleton } from "../../../components/Skeleton";
-import { useAgent } from "../../../context/AgentContext";
 import { useCardTableView } from "../../../hooks/useCardTableView";
 import {
   ensureBuiltinToolRenderers,
@@ -76,57 +65,10 @@ function statusTag(row: InstalledPlugin, t: (key: string) => string) {
   );
 }
 
-function buildPluginsConfig(tools: AgentPluginTool[]): AgentPluginsConfig {
-  const out: AgentPluginsConfig = {};
-  for (const tool of tools) {
-    if (!out[tool.plugin_id]) out[tool.plugin_id] = { tools: {} };
-    out[tool.plugin_id].tools![tool.name] = {
-      enabled: tool.enabled,
-      config: { ...tool.config },
-    };
-  }
-  return out;
-}
-
-function renderConfigField(field: PluginConfigField) {
-  const common = {
-    label: field.label || field.name,
-    name: field.name,
-    rules: field.required
-      ? [{ required: true, message: field.label || field.name }]
-      : undefined,
-    extra: field.help,
-  };
-  if (field.type === "password") {
-    return (
-      <Form.Item key={field.name} {...common}>
-        <Input.Password placeholder={field.placeholder} autoComplete="off" />
-      </Form.Item>
-    );
-  }
-  if (field.type === "number") {
-    return (
-      <Form.Item key={field.name} {...common}>
-        <InputNumber
-          style={{ width: "100%" }}
-          placeholder={field.placeholder}
-        />
-      </Form.Item>
-    );
-  }
-  return (
-    <Form.Item key={field.name} {...common}>
-      <Input placeholder={field.placeholder} />
-    </Form.Item>
-  );
-}
-
-/** Server-wide plugin install / uninstall list (+ per-agent tools in detail). */
+/** Server-wide plugin install, reload, enable, detail, and uninstall surface. */
 export function InstalledPluginsPanel() {
   const { t } = useTranslation();
-  const { activeAgentId } = useAgent();
   const [plugins, setPlugins] = useState<InstalledPlugin[]>([]);
-  const [agentTools, setAgentTools] = useState<AgentPluginTool[]>([]);
   const [loading, setLoading] = useState(true);
   const [installOpen, setInstallOpen] = useState(false);
   const [installUrl, setInstallUrl] = useState("");
@@ -136,17 +78,9 @@ export function InstalledPluginsPanel() {
   const [overwrite, setOverwrite] = useState(false);
   const [reloading, setReloading] = useState(false);
   const [togglingId, setTogglingId] = useState<string | null>(null);
-  const [toolSavingKey, setToolSavingKey] = useState<string | null>(null);
   const [detail, setDetail] = useState<InstalledPlugin | null>(null);
-  const [configTool, setConfigTool] = useState<AgentPluginTool | null>(null);
-  const [form] = Form.useForm();
-  const agentRef = useRef(activeAgentId);
   const { viewMode, setViewMode, showCardView } = useCardTableView("card");
 
-  useEffect(() => {
-    agentRef.current = activeAgentId;
-  }, [activeAgentId]);
-
   const fetchPlugins = useCallback(async () => {
     setLoading(true);
     try {
@@ -163,30 +97,10 @@ export function InstalledPluginsPanel() {
     }
   }, [t]);
 
-  const fetchAgentTools = useCallback(async () => {
-    if (!activeAgentId) {
-      setAgentTools([]);
-      return;
-    }
-    const agentId = activeAgentId;
-    try {
-      const data = await pluginsApi.listAgentTools(agentId);
-      if (agentRef.current === agentId) {
-        setAgentTools(data.tools || []);
-      }
-    } catch (err) {
-      console.error(err);
-    }
-  }, [activeAgentId]);
-
   useEffect(() => {
     void fetchPlugins();
   }, [fetchPlugins]);
 
-  useEffect(() => {
-    void fetchAgentTools();
-  }, [fetchAgentTools]);
-
   const handleInstall = async () => {
     const url = installUrl.trim();
     if (!url) return;
@@ -197,7 +111,6 @@ export function InstalledPluginsPanel() {
       setInstallOpen(false);
       setInstallUrl("");
       await fetchPlugins();
-      await fetchAgentTools();
     } catch (err) {
       message.error(apiErrorMessage(err, t("plugins.installFailed"), t));
     } finally {
@@ -218,7 +131,6 @@ export function InstalledPluginsPanel() {
       await pluginsApi.upload(next, overwrite);
       message.success(t("plugins.installSuccess"));
       await fetchPlugins();
-      await fetchAgentTools();
     } catch (err) {
       message.error(apiErrorMessage(err, t("plugins.installFailed"), t));
     } finally {
@@ -232,7 +144,6 @@ export function InstalledPluginsPanel() {
       await pluginsApi.reload();
       message.success(t("plugins.reloadSuccess"));
       await fetchPlugins();
-      await fetchAgentTools();
     } catch (err) {
       message.error(apiErrorMessage(err, t("plugins.reloadFailed"), t));
     } finally {
@@ -246,7 +157,6 @@ export function InstalledPluginsPanel() {
       message.success(t("plugins.uninstallSuccess"));
       if (detail?.id === pluginId) setDetail(null);
       await fetchPlugins();
-      await fetchAgentTools();
     } catch (err) {
       message.error(apiErrorMessage(err, t("plugins.uninstallFailed"), t));
     }
@@ -271,7 +181,6 @@ export function InstalledPluginsPanel() {
         enabled ? t("plugins.enabledSuccess") : t("plugins.disabledSuccess"),
       );
       await fetchPlugins();
-      await fetchAgentTools();
     } catch (err) {
       message.error(apiErrorMessage(err, t("plugins.enableFailed"), t));
     } finally {
@@ -279,63 +188,6 @@ export function InstalledPluginsPanel() {
     }
   };
 
-  const toolKey = (tool: AgentPluginTool) => `${tool.plugin_id}:${tool.name}`;
-
-  const persistTools = useCallback(async (nextTools: AgentPluginTool[]) => {
-    const agentId = agentRef.current;
-    if (!agentId) return;
-    await pluginsApi.patchAgentTools(agentId, buildPluginsConfig(nextTools));
-    if (agentRef.current === agentId) setAgentTools(nextTools);
-  }, []);
-
-  const handleToggleTool = async (tool: AgentPluginTool, enabled: boolean) => {
-    const key = toolKey(tool);
-    setToolSavingKey(key);
-    const next = agentTools.map((row) =>
-      row.plugin_id === tool.plugin_id && row.name === tool.name
-        ? { ...row, enabled }
-        : row,
-    );
-    try {
-      await persistTools(next);
-      message.success(t("plugins.saved"));
-    } catch (err) {
-      message.error(apiErrorMessage(err, t("plugins.saveFailed"), t));
-    } finally {
-      setToolSavingKey(null);
-    }
-  };
-
-  const openConfig = (tool: AgentPluginTool) => {
-    setConfigTool(tool);
-    form.setFieldsValue(tool.config || {});
-  };
-
-  const saveConfig = async () => {
-    if (!configTool) return;
-    const values = await form.validateFields();
-    const next = agentTools.map((row) =>
-      row.plugin_id === configTool.plugin_id && row.name === configTool.name
-        ? { ...row, config: values, enabled: true }
-        : row,
-    );
-    setToolSavingKey(toolKey(configTool));
-    try {
-      await persistTools(next);
-      message.success(t("plugins.saved"));
-      setConfigTool(null);
-    } catch (err) {
-      message.error(apiErrorMessage(err, t("plugins.saveFailed"), t));
-    } finally {
-      setToolSavingKey(null);
-    }
-  };
-
-  const detailTools =
-    detail == null
-      ? []
-      : agentTools.filter((tool) => tool.plugin_id === detail.id);
-
   const columns = [
     {
       title: t("plugins.colName"),
@@ -735,118 +587,10 @@ export function InstalledPluginsPanel() {
                 </div>
               </div>
             </section>
-
-            <section className={styles.drawerSection}>
-              <div className={styles.toolsSectionHead}>
-                <h4 className={styles.drawerSectionTitle}>
-                  {t("plugins.colTools")}
-                </h4>
-                {detailTools.length > 0 ? (
-                  <span className={styles.toolsCountBadge}>
-                    {detailTools.length}
-                  </span>
-                ) : null}
-              </div>
-              {!activeAgentId ? (
-                <div className={styles.toolsEmpty}>{t("plugins.noAgent")}</div>
-              ) : detail.enabled === false ? (
-                <div className={styles.toolsEmpty}>
-                  {t("plugins.enablePluginFirst")}
-                </div>
-              ) : detailTools.length === 0 ? (
-                <div className={styles.toolsEmpty}>
-                  {t("plugins.noToolsListed")}
-                </div>
-              ) : (
-                <>
-                  <p className={styles.toolsHint}>
-                    {t("plugins.detailToolsHint")}
-                  </p>
-                  <div className={styles.detailTools}>
-                    {detailTools.map((tool) => {
-                      const key = toolKey(tool);
-                      const busy = toolSavingKey === key;
-                      const hasConfig = (tool.config_fields?.length ?? 0) > 0;
-                      return (
-                        <div
-                          key={key}
-                          className={`${styles.detailToolItem}${
-                            tool.enabled ? "" : ` ${styles.detailToolItemOff}`
-                          }`}
-                        >
-                          <span className={styles.detailToolIcon} aria-hidden>
-                            <Wrench size={15} />
-                          </span>
-                          <div className={styles.detailToolMeta}>
-                            <div className={styles.detailToolNameRow}>
-                              <span className={styles.detailToolName}>
-                                {tool.name}
-                              </span>
-                              {hasConfig ? (
-                                <Tag className={styles.detailToolBadge}>
-                                  {t("plugins.hasConfig")}
-                                </Tag>
-                              ) : null}
-                            </div>
-                            {tool.description ? (
-                              <div className={styles.detailToolDesc}>
-                                {tool.description}
-                              </div>
-                            ) : null}
-                          </div>
-                          <div className={styles.detailToolActions}>
-                            {hasConfig ? (
-                              <Button
-                                type="text"
-                                size="small"
-                                className={styles.iconBtn}
-                                icon={<Settings2 size={15} />}
-                                onClick={() => openConfig(tool)}
-                                disabled={busy}
-                                aria-label={t("plugins.configure")}
-                              />
-                            ) : null}
-                            <Switch
-                              size="small"
-                              checked={tool.enabled}
-                              loading={busy}
-                              onChange={(checked) =>
-                                void handleToggleTool(tool, checked)
-                              }
-                            />
-                          </div>
-                        </div>
-                      );
-                    })}
-                  </div>
-                </>
-              )}
-            </section>
           </div>
         ) : null}
       </Drawer>
 
-      <Drawer
-        title={configTool ? configTool.name : ""}
-        open={!!configTool}
-        onClose={() => setConfigTool(null)}
-        width={420}
-        destroyOnHidden
-        extra={
-          <Button
-            type="primary"
-            onClick={() => void saveConfig()}
-            loading={!!toolSavingKey}
-          >
-            {t("common.save")}
-          </Button>
-        }
-      >
-        <Form form={form} layout="vertical">
-          {configTool?.config_fields?.map(renderConfigField)}
-        </Form>
-      </Drawer>
-
       <Modal
         title={t("plugins.installTitle")}
         open={installOpen}
diff --git a/dashboard/src/pages/Admin/Storage/StorageBackendCard.tsx b/dashboard/src/pages/Admin/Storage/StorageBackendCard.tsx
index 6cb79b40..d907a7fc 100644
--- a/dashboard/src/pages/Admin/Storage/StorageBackendCard.tsx
+++ b/dashboard/src/pages/Admin/Storage/StorageBackendCard.tsx
@@ -20,6 +20,7 @@ import { request } from "../../../api/request";
 import { apiErrorMessage, parseApiError } from "../../../utils/apiError";
 import {
   STORAGE_TYPE_DEFS,
+  storageKindGroup,
   type StorageBackendRow,
 } from "./useStorageBackends";
 import { StorageBackendDrawer } from "./StorageBackendModal";
@@ -48,6 +49,7 @@ export function StorageBackendCard({
   const typeDef = STORAGE_TYPE_DEFS.find((d) => d.kind === backend.kind);
   const accent = typeDef?.color ?? "#8c8c8c";
   const icon = typeDef?.icon ?? null;
+  const group = storageKindGroup(backend.kind);
 
   const handleToggle = async (next: boolean) => {
     setToggling(true);
@@ -58,9 +60,19 @@ export function StorageBackendCard({
       });
       await onSaved();
       // Enabling a Docker sandbox should kick off image pull immediately.
-      if (next && backend.kind === "docker") {
+      if (
+        next &&
+        (backend.kind === "docker" || backend.kind === "opensandbox")
+      ) {
         setTesting(true);
-        const hide = message.loading(t("storage.dockerPulling"), 0);
+        const hide = message.loading(
+          t(
+            backend.kind === "opensandbox"
+              ? "storage.opensandboxInstalling"
+              : "storage.dockerPulling",
+          ),
+          0,
+        );
         try {
           const result = await request<{
             ok: boolean;
@@ -137,7 +149,9 @@ export function StorageBackendCard({
     });
   };
 
-  const isConfigured = !!backend.access_key || !!backend.bucket;
+  const bucketField = typeDef?.fields.find((f) => f.key === "bucket");
+  const isConfigured =
+    !!backend.access_key || !!backend.bucket || !!backend.endpoint;
   const primaryInfo = backend.bucket ?? backend.endpoint ?? "—";
 
   const handleTest = async () => {
@@ -187,7 +201,15 @@ export function StorageBackendCard({
           <div className={styles.backendCardTitle}>
             <div className={styles.backendCardName}>{backend.name}</div>
             <div className={styles.backendCardKind}>
-              {typeDef ? t(typeDef.nameKey) : backend.kind}
+              <span>{typeDef ? t(typeDef.nameKey) : backend.kind}</span>
+              {group ? (
+                <span
+                  className={styles.groupChip}
+                  style={{ color: accent, background: `${accent}18` }}
+                >
+                  {t(group.titleKey)}
+                </span>
+              ) : null}
             </div>
           </div>
           <div
@@ -212,7 +234,7 @@ export function StorageBackendCard({
         <div className={styles.backendCardInfo}>
           <div className={styles.infoRow}>
             <span className={styles.infoLabel}>
-              {t("storage.bucketLabel")}:
+              {t(bucketField?.labelKey ?? "storage.bucketLabel")}:
             </span>
             <span className={styles.infoValue}>
               {primaryInfo !== "—" ? (
diff --git a/dashboard/src/pages/Admin/Storage/StorageBackendModal.tsx b/dashboard/src/pages/Admin/Storage/StorageBackendModal.tsx
index 3f9bd9b8..65a3a04f 100644
--- a/dashboard/src/pages/Admin/Storage/StorageBackendModal.tsx
+++ b/dashboard/src/pages/Admin/Storage/StorageBackendModal.tsx
@@ -120,6 +120,10 @@ export function StorageBackendDrawer({
           form.setFieldValue("sandbox_scope", "agent");
           form.setFieldValue("sandbox_prefix", "octop_sandbox");
         }
+        if (kind === "opensandbox") {
+          form.setFieldValue("bucket", "python:3.12");
+          form.setFieldValue("region", "http");
+        }
       }
       const draft = loadFormDraft<Partial<StorageForm>>(draftScope);
       if (draft) {
@@ -199,9 +203,20 @@ export function StorageBackendDrawer({
         message.success(t("storage.createSuccess", { name: backendName }));
       }
 
-      // New docker backends are enabled by default — start image pull right away.
-      if (values.kind === "docker" && backendId != null) {
-        const hide = message.loading(t("storage.dockerPulling"), 0);
+      // New docker / OpenSandbox backends are enabled by default — probe (and
+      // install optional SDK) immediately.
+      if (
+        (values.kind === "docker" || values.kind === "opensandbox") &&
+        backendId != null
+      ) {
+        const hide = message.loading(
+          t(
+            values.kind === "opensandbox"
+              ? "storage.opensandboxInstalling"
+              : "storage.dockerPulling",
+          ),
+          0,
+        );
         try {
           const result = await request<{
             ok: boolean;
diff --git a/dashboard/src/pages/Admin/Storage/StorageTypeCard.tsx b/dashboard/src/pages/Admin/Storage/StorageTypeCard.tsx
index 34d0a7a8..0749a1d5 100644
--- a/dashboard/src/pages/Admin/Storage/StorageTypeCard.tsx
+++ b/dashboard/src/pages/Admin/Storage/StorageTypeCard.tsx
@@ -5,8 +5,9 @@ import { memo } from "react";
 import { CheckCircle } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import { CatalogTypeCard } from "../../../components/CatalogTypeCard";
-import type { StorageTypeDef } from "./useStorageBackends";
+import { storageKindGroup, type StorageTypeDef } from "./useStorageBackends";
 import cardStyles from "../../../components/CatalogTypeCard/catalogTypeCard.module.less";
+import styles from "./storage.module.less";
 
 interface StorageTypeCardProps {
   typeDef: StorageTypeDef;
@@ -20,6 +21,7 @@ export const StorageTypeCard = memo(function StorageTypeCard({
   onClick,
 }: StorageTypeCardProps) {
   const { t } = useTranslation();
+  const group = storageKindGroup(typeDef.kind);
 
   return (
     <CatalogTypeCard
@@ -28,6 +30,19 @@ export const StorageTypeCard = memo(function StorageTypeCard({
       description={t(typeDef.descKey)}
       hint={t("storage.clickToConfigure")}
       icon={typeDef.icon}
+      tag={
+        group ? (
+          <span
+            className={styles.groupChip}
+            style={{
+              color: typeDef.color,
+              background: `${typeDef.color}18`,
+            }}
+          >
+            {t(group.titleKey)}
+          </span>
+        ) : undefined
+      }
       onClick={() => onClick(typeDef)}
       configuredBadge={
         isConfigured ? (
diff --git a/dashboard/src/pages/Admin/Storage/index.tsx b/dashboard/src/pages/Admin/Storage/index.tsx
index cb447daa..a566a127 100644
--- a/dashboard/src/pages/Admin/Storage/index.tsx
+++ b/dashboard/src/pages/Admin/Storage/index.tsx
@@ -8,9 +8,11 @@
  */
 import { useMemo, useState } from "react";
 import { Spin, Tabs } from "antd";
-import { HardDrive } from "lucide-react";
+import { HardDrive, LayoutGrid } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import PageShell from "../../../layouts/PageShell";
+import { OctopEmptyMascot } from "../../../components/EmptyState";
+import StreamSetupGuide from "../../../components/StreamSetupGuide/StreamSetupGuide";
 import {
   useStorageBackends,
   STORAGE_TYPE_DEFS,
@@ -80,19 +82,33 @@ export default function AdminStoragePage() {
     }
     if (backends.length === 0) {
       return (
-        <div className={styles.emptyState}>
-          <HardDrive size={44} style={{ color: "var(--fn-text-tertiary)" }} />
-          <div className={styles.emptyTitle}>{t("storage.emptyMyStorage")}</div>
-          <div className={styles.emptyHint}>
-            {t("storage.emptyMyStorageHint")}
-          </div>
-          <button
-            className={styles.emptyAction}
-            onClick={() => setActiveTab("types")}
-          >
-            {t("storage.goToTypes")}
-          </button>
-        </div>
+        <StreamSetupGuide
+          wide
+          icon={
+            <OctopEmptyMascot size={120} className={styles.emptyGuideMascot} />
+          }
+          title={t("storage.emptyGuideTitle")}
+          description={t("storage.emptyGuideDesc")}
+          steps={[
+            {
+              label: t("storage.emptyGuideStepWhat"),
+              detail: t("storage.emptyGuideStepWhatDetail"),
+            },
+            {
+              label: t("storage.emptyGuideStepHow"),
+              detail: t("storage.emptyGuideStepHowDetail"),
+            },
+            {
+              label: t("storage.emptyGuideStepUse"),
+              detail: t("storage.emptyGuideStepUseDetail"),
+            },
+          ]}
+          primaryAction={{
+            label: t("storage.goToTypes"),
+            onClick: () => setActiveTab("types"),
+            icon: <LayoutGrid size={14} />,
+          }}
+        />
       );
     }
     return (
diff --git a/dashboard/src/pages/Admin/Storage/storage.module.less b/dashboard/src/pages/Admin/Storage/storage.module.less
index 23ae5606..e694b6bb 100644
--- a/dashboard/src/pages/Admin/Storage/storage.module.less
+++ b/dashboard/src/pages/Admin/Storage/storage.module.less
@@ -8,16 +8,41 @@
 
 .cardGrid {
   display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(360px, 1fr));
-  gap: 16px;
+  grid-template-columns: repeat(auto-fill, minmax(320px, 1fr));
+  gap: 20px;
   padding: 20px 0 40px;
 
-  @media (max-width: 640px) {
+  @media (max-width: 767px) {
     grid-template-columns: 1fr;
     gap: 12px;
   }
 }
 
+.emptyGuideMascot {
+  display: block;
+  width: 120px;
+  height: 120px;
+  object-fit: contain;
+  user-select: none;
+  -webkit-user-drag: none;
+}
+
+/* ── Group chip (local / object storage / sandbox / database) ───── */
+
+.groupChip {
+  display: inline-flex;
+  align-items: center;
+  flex-shrink: 0;
+  padding: 0 7px;
+  border-radius: 9px;
+  font-size: 10px;
+  font-weight: 500;
+  line-height: 18px;
+  letter-spacing: 0;
+  text-transform: none;
+  white-space: nowrap;
+}
+
 /* ── Toolbar row above grid ─────────────────────────────────────── */
 
 .gridToolbar {
@@ -104,12 +129,22 @@
 }
 
 .backendCardKind {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  min-width: 0;
   font-size: 11px;
   color: var(--fn-text-tertiary);
   margin-top: 2px;
   font-weight: 500;
   text-transform: uppercase;
   letter-spacing: 0.04em;
+
+  > span:first-child {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
 }
 
 .backendCardInfo {
diff --git a/dashboard/src/pages/Admin/Storage/useStorageBackends.tsx b/dashboard/src/pages/Admin/Storage/useStorageBackends.tsx
index c390a7fa..14e2eef3 100644
--- a/dashboard/src/pages/Admin/Storage/useStorageBackends.tsx
+++ b/dashboard/src/pages/Admin/Storage/useStorageBackends.tsx
@@ -13,6 +13,7 @@ import {
   Archive,
   Package,
   Container,
+  Box,
 } from "lucide-react";
 import { request } from "../../../api/request";
 
@@ -58,6 +59,7 @@ export const AGENT_RESOLVABLE_STORAGE_KINDS = new Set([
   "shell",
   "postgres",
   "docker",
+  "opensandbox",
 ]);
 
 export function isAgentResolvableStorageKind(kind: string): boolean {
@@ -286,6 +288,38 @@ export const STORAGE_TYPE_DEFS: StorageTypeDef[] = [
       },
     ],
   },
+  {
+    kind: "opensandbox",
+    nameKey: "storage.kindOpensandbox",
+    descKey: "storage.descOpensandbox",
+    color: "#0f766e",
+    icon: <Box size={20} />,
+    fields: [
+      {
+        key: "bucket",
+        labelKey: "storage.dockerImageLabel",
+        requiredMessageKey: "storage.pleaseEnterDockerImage",
+        required: true,
+        placeholder: "python:3.12",
+      },
+      {
+        key: "endpoint",
+        labelKey: "storage.opensandboxDomainLabel",
+        placeholder: "localhost:8080",
+      },
+      {
+        key: "secret_key",
+        labelKey: "storage.opensandboxApiKeyLabel",
+        secret: true,
+        placeholder: "sk-…",
+      },
+      {
+        key: "region",
+        labelKey: "storage.opensandboxProtocolLabel",
+        placeholder: "http",
+      },
+    ],
+  },
   {
     kind: "postgres",
     nameKey: "storage.kindPostgres",
@@ -371,6 +405,41 @@ export const STORAGE_KINDS = STORAGE_TYPE_DEFS.map((t) => ({
   labelKey: t.nameKey,
 }));
 
+export interface StorageTypeGroup {
+  id: string;
+  titleKey: string;
+  kinds: readonly string[];
+}
+
+export const STORAGE_TYPE_GROUPS: StorageTypeGroup[] = [
+  {
+    id: "local",
+    titleKey: "storage.groupLocal",
+    kinds: ["filesystem", "shell"],
+  },
+  {
+    id: "object",
+    titleKey: "storage.groupObject",
+    kinds: ["cos", "s3", "oss", "obs", "custom"],
+  },
+  {
+    id: "sandbox",
+    titleKey: "storage.groupSandbox",
+    kinds: ["docker", "opensandbox"],
+  },
+  {
+    id: "database",
+    titleKey: "storage.groupDatabase",
+    kinds: ["postgres"],
+  },
+];
+
+/** Group a backend kind belongs to (local / object / sandbox / database). */
+export function storageKindGroup(kind: string): StorageTypeGroup | undefined {
+  const normalized = kind.toLowerCase();
+  return STORAGE_TYPE_GROUPS.find((g) => g.kinds.includes(normalized));
+}
+
 export interface UseStorageBackendsResult {
   backends: StorageBackendRow[];
   loading: boolean;
diff --git a/dashboard/src/pages/Admin/Users/UsersListPanel.tsx b/dashboard/src/pages/Admin/Users/UsersListPanel.tsx
index 0129127a..d276f389 100644
--- a/dashboard/src/pages/Admin/Users/UsersListPanel.tsx
+++ b/dashboard/src/pages/Admin/Users/UsersListPanel.tsx
@@ -63,6 +63,7 @@ import { useTranslation } from "react-i18next";
 import { request } from "../../../api/request";
 import { authApi } from "../../../api/modules/auth";
 import { useCardTableView } from "../../../hooks/useCardTableView";
+import { useIsMobile } from "../../../hooks/useIsMobile";
 import { useServerTimezone } from "../../../hooks/useServerTimezone";
 import { formatServerDateTime } from "../../../utils/formatMessageTime";
 import type { OctopAgent } from "../../../context/AgentContext";
@@ -766,6 +767,7 @@ function UserLoginLock({
 export default function UsersListPanel() {
   const { t } = useTranslation();
   const timeZone = useServerTimezone();
+  const isMobile = useIsMobile();
   const [agents, setAgents] = useState<OctopAgent[]>([]);
   const [agentsLoading, setAgentsLoading] = useState(true);
   const [rows, setRows] = useState<UserRow[]>([]);
@@ -1190,7 +1192,7 @@ export default function UsersListPanel() {
           loading={loading}
           dataSource={filteredRows}
           pagination={false}
-          scroll={{ x: 960 }}
+          scroll={{ x: 1360 }}
           rowClassName={(row) =>
             [
               row.disabled ? styles.userTableRowDisabled : "",
@@ -1203,6 +1205,7 @@ export default function UsersListPanel() {
             {
               title: t("adminUsers.colUsername"),
               width: 240,
+              fixed: isMobile ? undefined : "left",
               render: (_, row) => {
                 const displayName = row.display_name?.trim() || row.username;
                 return (
@@ -1332,6 +1335,7 @@ export default function UsersListPanel() {
             {
               title: t("adminUsers.colActions"),
               width: 120,
+              fixed: isMobile ? undefined : "right",
               render: (_, row) => (
                 <Space size={4}>
                   <Tooltip title={t("common.edit")}>
diff --git a/dashboard/src/pages/Admin/Users/index.module.less b/dashboard/src/pages/Admin/Users/index.module.less
index 8e5fa8d2..4cf233de 100644
--- a/dashboard/src/pages/Admin/Users/index.module.less
+++ b/dashboard/src/pages/Admin/Users/index.module.less
@@ -806,7 +806,7 @@
   :global(.ant-table-container) {
     border: 1px solid var(--fn-border-primary);
     border-radius: var(--fn-radius-lg, 12px);
-    overflow: hidden;
+    // Do not set overflow:hidden — it breaks Ant Design sticky fixed columns.
   }
 
   :global(.ant-table-thead > tr > th) {
diff --git a/dashboard/src/pages/Agent/Channels/components/ChannelDrawer.tsx b/dashboard/src/pages/Agent/Channels/components/ChannelDrawer.tsx
index 444b8e67..89840186 100644
--- a/dashboard/src/pages/Agent/Channels/components/ChannelDrawer.tsx
+++ b/dashboard/src/pages/Agent/Channels/components/ChannelDrawer.tsx
@@ -122,7 +122,7 @@ type QrPhase =
     }
   | { phase: "dingtalk_success"; channelId: string }
   | { phase: "feishu_creating"; message: string }
-  | { phase: "feishu_qr"; qrToken: string }
+  | { phase: "feishu_qr"; qrUrl: string }
   | { phase: "feishu_progress"; message: string }
   | {
       phase: "feishu_done";
@@ -160,6 +160,7 @@ interface ChannelDrawerProps {
 }
 
 function FormItemForField({ field }: { field: ChannelField }) {
+  const { t } = useTranslation();
   const Input1 =
     field.type === "password"
       ? Input.Password
@@ -167,7 +168,12 @@ function FormItemForField({ field }: { field: ChannelField }) {
       ? Input.TextArea
       : Input;
   const rules: Rule[] = field.required
-    ? [{ required: true, message: `${field.label} 必填` }]
+    ? [
+        {
+          required: true,
+          message: t("channels.fieldRequired", { label: field.label }),
+        },
+      ]
     : [];
   if (field.type === "json") {
     rules.push({
@@ -176,7 +182,9 @@ function FormItemForField({ field }: { field: ChannelField }) {
         try {
           normalizeChannelFieldValue(field.name, value);
         } catch {
-          throw new Error(`${field.label} 必须是 JSON 对象`);
+          throw new Error(
+            t("channels.fieldMustBeJsonObject", { label: field.label }),
+          );
         }
       },
     });
@@ -511,16 +519,31 @@ export function ChannelDrawer({
     }
   }, [open, resetQr]);
 
-  useEffect(() => {
-    resetQr();
-  }, [selectedKind, resetQr]);
-
   useEffect(() => {
     if (open && initialValues?.kind) {
       setSelectedKind(initialValues.kind);
     }
   }, [open, initialValues?.kind]);
 
+  // Only wipe an in-flight QR when the kind actually changes while the drawer
+  // is already open. A blanket `[selectedKind]` reset races the open-time
+  // kickoff: QR appears, kind sync/draft fires, resetQr hides it, and a second
+  // start often never gets a new qr_url.
+  const kindWhileOpenRef = useRef<ChannelKey | null>(null);
+  useEffect(() => {
+    if (!open) {
+      kindWhileOpenRef.current = null;
+      return;
+    }
+    if (kindWhileOpenRef.current === null) {
+      kindWhileOpenRef.current = selectedKind;
+      return;
+    }
+    if (kindWhileOpenRef.current === selectedKind) return;
+    kindWhileOpenRef.current = selectedKind;
+    resetQr();
+  }, [open, selectedKind, resetQr]);
+
   // Restore session draft after server/default values are applied.
   useEffect(() => {
     if (!open || loadingConfig || !draftScope) return;
@@ -533,7 +556,8 @@ export function ChannelDrawer({
   }, [open, loadingConfig, draftScope, form]);
 
   // ── QQ Bot Flow ────────────────────────────────────────────────────────
-  const startQqQr = useCallback(async () => {
+  const startQqQr = async () => {
+    stopPolling();
     setQrState({ phase: "loading" });
     try {
       const res = await channelApi.qqQrcodeGenerate(agentId);
@@ -570,10 +594,11 @@ export function ChannelDrawer({
         reason: e instanceof Error ? e.message : String(e),
       });
     }
-  }, [agentId, stopPolling, t]);
+  };
 
   // ── WeCom Flow ─────────────────────────────────────────────────────────
-  const startWecomQr = useCallback(async () => {
+  const startWecomQr = async () => {
+    stopPolling();
     setQrState({ phase: "loading" });
     try {
       const res = await channelApi.wecomQrcodeGenerate(agentId);
@@ -594,7 +619,10 @@ export function ChannelDrawer({
             });
           } else if (poll.status === "error") {
             stopPolling();
-            setQrState({ phase: "error", reason: poll.reason ?? "扫码失败" });
+            setQrState({
+              phase: "error",
+              reason: poll.reason ?? t("channels.qrFailed"),
+            });
           }
         } catch {
           // network error — keep polling
@@ -607,10 +635,11 @@ export function ChannelDrawer({
         reason: e instanceof Error ? e.message : String(e),
       });
     }
-  }, [agentId, stopPolling]);
+  };
 
   // ── WeChat Flow ─────────────────────────────────────────────────────────
-  const startWeixinQr = useCallback(async () => {
+  const startWeixinQr = async () => {
+    stopPolling();
     setQrState({ phase: "loading" });
     try {
       const res = await channelApi.weixinQrcodeGenerate(agentId);
@@ -635,7 +664,10 @@ export function ChannelDrawer({
             });
           } else if (poll.status === "error") {
             stopPolling();
-            setQrState({ phase: "error", reason: poll.message ?? "扫码失败" });
+            setQrState({
+              phase: "error",
+              reason: poll.message ?? t("channels.qrFailed"),
+            });
           }
         } catch {
           // keep polling
@@ -648,10 +680,11 @@ export function ChannelDrawer({
         reason: e instanceof Error ? e.message : String(e),
       });
     }
-  }, [agentId, stopPolling]);
+  };
 
   // ── DingTalk Flow ───────────────────────────────────────────────────────
-  const startDingtalkQr = useCallback(async () => {
+  const startDingtalkQr = async () => {
+    stopPolling();
     setQrState({ phase: "loading" });
     try {
       const res = await channelApi.dingtalkQrcodeGenerate(agentId);
@@ -703,94 +736,70 @@ export function ChannelDrawer({
         reason: e instanceof Error ? e.message : String(e),
       });
     }
-  }, [agentId, onProvisioned, stopPolling, t]);
+  };
 
   // ── Feishu Flow ─────────────────────────────────────────────────────────
-  const startFeishuCreator = useCallback(
-    async (platform: "feishu" | "lark" = "feishu") => {
+  const startFeishuCreator = async (platform: "feishu" | "lark" = "feishu") => {
+    stopPolling();
+    setQrState({
+      phase: "feishu_creating",
+      message: t("channels.feishuCreating"),
+    });
+    try {
+      await channelApi.feishuBotCreatorStart(agentId, { platform });
+    } catch (e: unknown) {
       setQrState({
-        phase: "feishu_creating",
-        message: "启动飞书机器人创建流程...",
+        phase: "error",
+        reason: e instanceof Error ? e.message : String(e),
       });
+      return;
+    }
+    const timer = setInterval(async () => {
       try {
-        await channelApi.feishuBotCreatorStart(agentId, { platform });
-      } catch (e: unknown) {
-        setQrState({
-          phase: "error",
-          reason: e instanceof Error ? e.message : String(e),
-        });
-        return;
-      }
-      const timer = setInterval(async () => {
-        try {
-          const poll = await channelApi.feishuBotCreatorPoll(agentId);
-          let enteredProgress = false;
-          for (const ev of poll.events) {
-            if (
-              ev.action === "progress" &&
-              ev.message !== "Waiting for scan..."
-            ) {
-              enteredProgress = true;
-              setQrState({ phase: "feishu_progress", message: ev.message });
-            }
-            if (
-              ev.action === "log" &&
-              ev.step === "login" &&
-              (ev.message.includes("Scanned") || ev.level === "success")
-            ) {
-              enteredProgress = true;
-              setQrState({
-                phase: "feishu_progress",
-                message: ev.message.includes("Scanned")
-                  ? "已扫码，请在手机上确认登录"
-                  : "登录成功，正在自动创建机器人，请稍候…",
-              });
-            }
-          }
-          if (poll.qr_token && !enteredProgress) {
-            setQrState((prev) =>
-              prev.phase === "feishu_progress"
-                ? prev
-                : { phase: "feishu_qr", qrToken: poll.qr_token! },
-            );
-          }
-          if (poll.status === "finished" && poll.app_id && poll.app_secret) {
-            stopPolling();
-            const finishEvent = poll.events.find(
-              (e) => e.action === "finish" && e.level === "success",
-            );
-            const data = (finishEvent?.data ?? {}) as Record<string, unknown>;
-            setQrState({
-              phase: "feishu_done",
-              appId: poll.app_id,
-              appSecret: poll.app_secret,
-              botName: data.bot_name as string | undefined,
-              manageUrl: data.manage_url as string | undefined,
-            });
-          } else if (poll.status === "failed") {
-            stopPolling();
-            const errEvent = poll.events.find(
-              (e) => e.action === "finish" && e.level === "error",
-            );
-            setQrState({
-              phase: "error",
-              reason: errEvent?.message ?? "飞书机器人创建失败",
-            });
-          }
-        } catch {
-          // keep polling
+        const poll = await channelApi.feishuBotCreatorPoll(agentId);
+        if (poll.qr_url) {
+          setQrState((prev) =>
+            prev.phase === "feishu_progress" || prev.phase === "feishu_done"
+              ? prev
+              : { phase: "feishu_qr", qrUrl: poll.qr_url! },
+          );
         }
-      }, 1500);
-      pollTimerRef.current = timer;
-    },
-    [agentId, stopPolling],
-  );
+        if (poll.status === "finished" && poll.app_id && poll.app_secret) {
+          stopPolling();
+          const finishEvent = poll.events.find(
+            (e) => e.action === "finish" && e.level === "success",
+          );
+          const data = (finishEvent?.data ?? {}) as Record<string, unknown>;
+          setQrState({
+            phase: "feishu_done",
+            appId: poll.app_id,
+            appSecret: poll.app_secret,
+            botName: data.bot_name as string | undefined,
+            manageUrl: data.manage_url as string | undefined,
+          });
+        } else if (poll.status === "failed") {
+          stopPolling();
+          const errEvent = poll.events.find(
+            (e) => e.action === "finish" && e.level === "error",
+          );
+          setQrState({
+            phase: "error",
+            reason: errEvent?.message ?? t("channels.feishuCreateFailed"),
+          });
+        }
+      } catch {
+        // keep polling
+      }
+    }, 1500);
+    pollTimerRef.current = timer;
+  };
 
   // ── YuanBao Flow ────────────────────────────────────────────────────────
-  const startYuanbaoCreator = useCallback(async () => {
+  const startYuanbaoCreator = async () => {
+    stopPolling();
     setQrState({
       phase: "yuanbao_creating",
-      message: "启动元宝扫码绑定流程...",
+      message: t("channels.yuanbaoStarting"),
     });
     try {
       await channelApi.yuanbaoBotCreatorStart(agentId, {});
@@ -833,7 +842,7 @@ export function ChannelDrawer({
           );
           setQrState({
             phase: "error",
-            reason: errEvent?.message ?? "元宝绑定失败",
+            reason: errEvent?.message ?? t("channels.yuanbaoBindFailed"),
           });
         }
       } catch {
@@ -841,7 +850,49 @@ export function ChannelDrawer({
       }
     }, 2000);
     pollTimerRef.current = timer;
-  }, [agentId, stopPolling]);
+  };
+
+  // Entering quick-config starts QR generation immediately (no extra click).
+  useEffect(() => {
+    if (!open || isEdit || loadingConfig) return;
+    if (configMode !== "quick" && selectedKind !== "weixin") return;
+    if (qrState.phase !== "idle") return;
+    // Wait until local kind matches the card that opened the drawer.
+    if (initialValues?.kind && selectedKind !== initialValues.kind) return;
+
+    switch (selectedKind) {
+      case "qq":
+        void startQqQr();
+        break;
+      case "wecom":
+        void startWecomQr();
+        break;
+      case "weixin":
+        void startWeixinQr();
+        break;
+      case "dingtalk":
+        void startDingtalkQr();
+        break;
+      case "feishu":
+        void startFeishuCreator("feishu");
+        break;
+      case "yuanbao":
+        void startYuanbaoCreator();
+        break;
+      default:
+        break;
+    }
+    // start* omitted: recreated each render; idle-phase already one-shots.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [
+    open,
+    isEdit,
+    loadingConfig,
+    configMode,
+    selectedKind,
+    qrState.phase,
+    initialValues?.kind,
+  ]);
 
   // ── Form ────────────────────────────────────────────────────────────────
   const fields = CHANNEL_FIELDS[selectedKind];
@@ -1111,13 +1162,48 @@ export function ChannelDrawer({
   };
 
   // ── QR Panels ───────────────────────────────────────────────────────────
+  function renderQrSteps(step1: string, step2: string, step3: string) {
+    return (
+      <div className={styles.qrSteps}>
+        <span className={styles.qrStep}>
+          <span className={styles.qrDot}>1</span>
+          {step1}
+        </span>
+        <span className={styles.qrStepDivider} />
+        <span className={styles.qrStep}>
+          <span className={styles.qrDot}>2</span>
+          {step2}
+        </span>
+        <span className={styles.qrStepDivider} />
+        <span className={styles.qrStep}>
+          <span className={styles.qrDot}>3</span>
+          {step3}
+        </span>
+      </div>
+    );
+  }
+
+  function renderQrLoading(step1: string, step2: string, step3: string) {
+    return (
+      <div className={styles.qrPanel}>
+        {renderQrSteps(step1, step2, step3)}
+        <div className={styles.qrCardWrap}>
+          <div className={styles.qrFrame}>
+            <Spin />
+          </div>
+        </div>
+        <p className={styles.qrScanHint}>{t("channels.qrLoading")}</p>
+      </div>
+    );
+  }
+
   function renderQqPanel() {
     const s = qrState;
-    if (s.phase === "loading")
-      return (
-        <div className={styles.qrPanel}>
-          <Spin />
-        </div>
+    if (s.phase === "loading" || s.phase === "idle")
+      return renderQrLoading(
+        t("channels.qqQrStep1"),
+        t("channels.qqQrStep2"),
+        t("channels.qqQrStep3"),
       );
     if (s.phase === "qq_success") {
       const retrySave = () =>
@@ -1146,30 +1232,23 @@ export function ChannelDrawer({
     if (s.phase === "qq_ready") {
       return (
         <div className={styles.qrPanel}>
-          <div className={styles.qrSteps}>
-            <span className={styles.qrStep}>
-              <span className={styles.qrDot}>1</span>
-              {t("channels.qqQrStep1")}
-            </span>
-            <span className={styles.qrStepDivider} />
-            <span className={styles.qrStep}>
-              <span className={styles.qrDot}>2</span>
-              {t("channels.qqQrStep2")}
-            </span>
-            <span className={styles.qrStepDivider} />
-            <span className={styles.qrStep}>
-              <span className={styles.qrDot}>3</span>
-              {t("channels.qqQrStep3")}
-            </span>
-          </div>
+          {renderQrSteps(
+            t("channels.qqQrStep1"),
+            t("channels.qqQrStep2"),
+            t("channels.qqQrStep3"),
+          )}
           <div className={styles.qrCardWrap}>
             <div className={styles.qrFrame}>
               <QRCodeSVG value={s.qrcodeUrl} size={200} />
             </div>
           </div>
           <p className={styles.qrScanHint}>{t("channels.qqQrScanHint")}</p>
-          <Button size="small" onClick={resetQr} style={{ marginTop: 4 }}>
-            {t("channels.qrRetry")}
+          <Button
+            size="small"
+            onClick={() => void startQqQr()}
+            style={{ marginTop: 4 }}
+          >
+            {t("channels.qrRegenerate")}
           </Button>
         </div>
       );
@@ -1183,46 +1262,21 @@ export function ChannelDrawer({
             style={{ width: "100%", marginBottom: 12 }}
           />
           <Button onClick={() => void startQqQr()}>
-            {t("channels.qrRetry")}
+            {t("channels.qrRegenerate")}
           </Button>
         </div>
       );
     }
-    return (
-      <div className={styles.quickConfigPanel}>
-        <div className={styles.quickConfigSteps}>
-          <div className={styles.quickConfigStep}>
-            <span className={styles.stepNumber}>1</span>
-            {t("channels.qqQrIntro1")}
-          </div>
-          <div className={styles.quickConfigStep}>
-            <span className={styles.stepNumber}>2</span>
-            {t("channels.qqQrIntro2")}
-          </div>
-          <div className={styles.quickConfigStep}>
-            <span className={styles.stepNumber}>3</span>
-            {t("channels.qqQrIntro3")}
-          </div>
-        </div>
-        <Button
-          type="primary"
-          className={styles.quickConfigBtn}
-          block
-          onClick={() => void startQqQr()}
-        >
-          {t("channels.qqQrGenerate")}
-        </Button>
-      </div>
-    );
+    return null;
   }
 
   function renderWecomPanel() {
     const s = qrState;
-    if (s.phase === "loading")
-      return (
-        <div className={styles.qrPanel}>
-          <Spin />
-        </div>
+    if (s.phase === "loading" || s.phase === "idle")
+      return renderQrLoading(
+        t("channels.qrStep1"),
+        t("channels.qrStep2"),
+        t("channels.qrStep3"),
       );
     if (s.phase === "wecom_success") {
       const retrySave = () =>
@@ -1236,7 +1290,7 @@ export function ChannelDrawer({
         <div className={styles.qrPanel}>
           <Alert
             type="success"
-            message="企业微信绑定成功"
+            message={t("channels.wecomQrSuccess")}
             description={`Bot ID: ${s.botId}`}
             style={{ width: "100%", marginBottom: 12 }}
           />
@@ -1247,26 +1301,22 @@ export function ChannelDrawer({
     if (s.phase === "wecom_ready") {
       return (
         <div className={styles.qrPanel}>
-          <div className={styles.qrSteps}>
-            <span className={styles.qrStep}>
-              <span className={styles.qrDot}>1</span>打开企业微信
-            </span>
-            <span className={styles.qrStepDivider} />
-            <span className={styles.qrStep}>
-              <span className={styles.qrDot}>2</span>扫码注册 AI 机器人
-            </span>
-            <span className={styles.qrStepDivider} />
-            <span className={styles.qrStep}>
-              <span className={styles.qrDot}>3</span>确认绑定
-            </span>
-          </div>
+          {renderQrSteps(
+            t("channels.qrStep1"),
+            t("channels.qrStep2"),
+            t("channels.qrStep3"),
+          )}
           <div className={styles.qrCardWrap}>
             <div className={styles.qrFrame}>
               <QRCodeSVG value={s.authUrl} size={200} />
             </div>
           </div>
-          <p className={styles.qrScanHint}>扫码后自动跳转下一步</p>
-          <Button size="small" onClick={resetQr} style={{ marginTop: 4 }}>
+          <p className={styles.qrScanHint}>{t("channels.qrScanHint")}</p>
+          <Button
+            size="small"
+            onClick={() => void startWecomQr()}
+            style={{ marginTop: 4 }}
+          >
             {t("channels.qrRegenerate")}
           </Button>
         </div>
@@ -1286,41 +1336,16 @@ export function ChannelDrawer({
         </div>
       );
     }
-    return (
-      <div className={styles.quickConfigPanel}>
-        <div className={styles.quickConfigSteps}>
-          <div className={styles.quickConfigStep}>
-            <span className={styles.stepNumber}>1</span>
-            点击下方按钮，生成企业微信 AI 机器人注册二维码
-          </div>
-          <div className={styles.quickConfigStep}>
-            <span className={styles.stepNumber}>2</span>用企业微信 App
-            扫码，完成机器人注册
-          </div>
-          <div className={styles.quickConfigStep}>
-            <span className={styles.stepNumber}>3</span>
-            凭据自动填入并保存
-          </div>
-        </div>
-        <Button
-          type="primary"
-          className={styles.quickConfigBtn}
-          block
-          onClick={() => void startWecomQr()}
-        >
-          {t("channels.wecomGenerateQr")}
-        </Button>
-      </div>
-    );
+    return null;
   }
 
   function renderWeixinPanel() {
     const s = qrState;
-    if (s.phase === "loading")
-      return (
-        <div className={styles.qrPanel}>
-          <Spin />
-        </div>
+    if (s.phase === "loading" || s.phase === "idle")
+      return renderQrLoading(
+        t("channels.weixinQrStep1"),
+        t("channels.weixinQrStep2"),
+        t("channels.weixinQrStep3"),
       );
     if (s.phase === "weixin_success") {
       const weixinConfig = mergeDisplayConfig({
@@ -1342,8 +1367,8 @@ export function ChannelDrawer({
         <div className={styles.qrPanel}>
           <Alert
             type="success"
-            message="微信绑定成功"
-            description={`账号 ID: ${s.accountId}`}
+            message={t("channels.weixinQrSuccess")}
+            description={t("channels.weixinAccountId", { id: s.accountId })}
             style={{ width: "100%", marginBottom: 12 }}
           />
           {renderQrAutoSaveStatus(retrySave)}
@@ -1353,26 +1378,22 @@ export function ChannelDrawer({
     if (s.phase === "weixin_ready") {
       return (
         <div className={styles.qrPanel}>
-          <div className={styles.qrSteps}>
-            <span className={styles.qrStep}>
-              <span className={styles.qrDot}>1</span>打开微信 App
-            </span>
-            <span className={styles.qrStepDivider} />
-            <span className={styles.qrStep}>
-              <span className={styles.qrDot}>2</span>扫码登录
-            </span>
-            <span className={styles.qrStepDivider} />
-            <span className={styles.qrStep}>
-              <span className={styles.qrDot}>3</span>手机确认
-            </span>
-          </div>
+          {renderQrSteps(
+            t("channels.weixinQrStep1"),
+            t("channels.weixinQrStep2"),
+            t("channels.weixinQrStep3"),
+          )}
           <div className={styles.qrCardWrap}>
             <div className={styles.qrFrame}>
               <QRCodeSVG value={s.qrcodeUrl} size={200} />
             </div>
           </div>
-          <p className={styles.qrScanHint}>使用微信扫码登录个人账号</p>
-          <Button size="small" onClick={resetQr} style={{ marginTop: 4 }}>
+          <p className={styles.qrScanHint}>{t("channels.weixinQrScanHint")}</p>
+          <Button
+            size="small"
+            onClick={() => void startWeixinQr()}
+            style={{ marginTop: 4 }}
+          >
             {t("channels.qrRegenerate")}
           </Button>
         </div>
@@ -1392,40 +1413,16 @@ export function ChannelDrawer({
         </div>
       );
     }
-    return (
-      <div className={styles.quickConfigPanel}>
-        <div className={styles.quickConfigSteps}>
-          <div className={styles.quickConfigStep}>
-            <span className={styles.stepNumber}>1</span>
-            点击按钮生成微信登录二维码
-          </div>
-          <div className={styles.quickConfigStep}>
-            <span className={styles.stepNumber}>2</span>微信扫码并在手机确认登录
-          </div>
-          <div className={styles.quickConfigStep}>
-            <span className={styles.stepNumber}>3</span>登录成功后自动保存配置
-          </div>
-        </div>
-        <Button
-          type="primary"
-          className={styles.quickConfigBtn}
-          block
-          onClick={() => void startWeixinQr()}
-        >
-          {t("channels.weixinGenerateQr")}
-        </Button>
-      </div>
-    );
+    return null;
   }
 
   function renderDingtalkPanel() {
     const s = qrState;
-    if (s.phase === "loading") {
-      return (
-        <div className={styles.qrPanel}>
-          <Spin />
-          <p className={styles.qrScanHint}>{t("channels.dingtalkQrLoading")}</p>
-        </div>
+    if (s.phase === "loading" || s.phase === "idle") {
+      return renderQrLoading(
+        t("channels.dingtalkQrStep1"),
+        t("channels.dingtalkQrStep2"),
+        t("channels.dingtalkQrStep3"),
       );
     }
     if (s.phase === "dingtalk_success") {
@@ -1442,22 +1439,11 @@ export function ChannelDrawer({
     if (s.phase === "dingtalk_ready") {
       return (
         <div className={styles.qrPanel}>
-          <div className={styles.qrSteps}>
-            <span className={styles.qrStep}>
-              <span className={styles.qrDot}>1</span>
-              {t("channels.dingtalkQrStep1")}
-            </span>
-            <span className={styles.qrStepDivider} />
-            <span className={styles.qrStep}>
-              <span className={styles.qrDot}>2</span>
-              {t("channels.dingtalkQrStep2")}
-            </span>
-            <span className={styles.qrStepDivider} />
-            <span className={styles.qrStep}>
-              <span className={styles.qrDot}>3</span>
-              {t("channels.dingtalkQrStep3")}
-            </span>
-          </div>
+          {renderQrSteps(
+            t("channels.dingtalkQrStep1"),
+            t("channels.dingtalkQrStep2"),
+            t("channels.dingtalkQrStep3"),
+          )}
           <div className={styles.qrCardWrap}>
             <div className={styles.qrFrame}>
               <QRCodeSVG value={s.qrcodeUrl} size={200} />
@@ -1469,7 +1455,11 @@ export function ChannelDrawer({
           <p className={styles.qrScanHint}>
             {t("channels.dingtalkUserCode")}: <code>{s.userCode}</code>
           </p>
-          <Button size="small" onClick={resetQr} style={{ marginTop: 4 }}>
+          <Button
+            size="small"
+            onClick={() => void startDingtalkQr()}
+            style={{ marginTop: 4 }}
+          >
             {t("channels.qrRegenerate")}
           </Button>
         </div>
@@ -1489,77 +1479,48 @@ export function ChannelDrawer({
         </div>
       );
     }
-    return (
-      <div className={styles.quickConfigPanel}>
-        <div className={styles.quickConfigSteps}>
-          <div className={styles.quickConfigStep}>
-            <span className={styles.stepNumber}>1</span>
-            {t("channels.dingtalkQrIntro1")}
-          </div>
-          <div className={styles.quickConfigStep}>
-            <span className={styles.stepNumber}>2</span>
-            {t("channels.dingtalkQrIntro2")}
-          </div>
-          <div className={styles.quickConfigStep}>
-            <span className={styles.stepNumber}>3</span>
-            {t("channels.dingtalkQrIntro3")}
-          </div>
-        </div>
-        <Button
-          type="primary"
-          className={styles.quickConfigBtn}
-          block
-          onClick={() => void startDingtalkQr()}
-        >
-          {t("channels.dingtalkGenerateQr")}
-        </Button>
-      </div>
-    );
+    return null;
   }
 
   function renderFeishuPanel() {
     const s = qrState;
-    if (s.phase === "feishu_creating" || s.phase === "feishu_progress") {
+    const feishuPending =
+      s.phase === "idle" ||
+      s.phase === "loading" ||
+      s.phase === "feishu_creating" ||
+      s.phase === "feishu_progress";
+    if (feishuPending || s.phase === "feishu_qr") {
       return (
         <div className={styles.qrPanel}>
-          <Spin />
-          <p
-            style={{
-              marginTop: 12,
-              color: "var(--fn-text-secondary)",
-              fontSize: 13,
-            }}
-          >
-            {s.message}
-          </p>
-        </div>
-      );
-    }
-    if (s.phase === "feishu_qr") {
-      const qrContent = JSON.stringify({ qrlogin: { token: s.qrToken } });
-      return (
-        <div className={styles.qrPanel}>
-          <div className={styles.qrSteps}>
-            <span className={styles.qrStep}>
-              <span className={styles.qrDot}>1</span>打开飞书 App
-            </span>
-            <span className={styles.qrStepDivider} />
-            <span className={styles.qrStep}>
-              <span className={styles.qrDot}>2</span>扫码登录
-            </span>
-            <span className={styles.qrStepDivider} />
-            <span className={styles.qrStep}>
-              <span className={styles.qrDot}>3</span>自动创建机器人
-            </span>
-          </div>
+          {renderQrSteps(
+            t("channels.feishuQrStep1"),
+            t("channels.feishuQrStep2"),
+            t("channels.feishuQrStep3"),
+          )}
           <div className={styles.qrCardWrap}>
             <div className={styles.qrFrame}>
-              <QRCodeSVG value={qrContent} size={200} />
+              {s.phase === "feishu_qr" ? (
+                <QRCodeSVG value={s.qrUrl} size={200} />
+              ) : (
+                <Spin />
+              )}
             </div>
           </div>
           <p className={styles.qrScanHint}>
-            扫码后将自动完成机器人创建和配置（约 1-2 分钟）
+            {s.phase === "feishu_qr"
+              ? t("channels.feishuQrScanHint")
+              : t("channels.qrLoading")}
           </p>
+          <Button
+            size="small"
+            style={{
+              marginTop: 4,
+              visibility: s.phase === "feishu_qr" ? "visible" : "hidden",
+            }}
+            onClick={() => void startFeishuCreator()}
+          >
+            {t("channels.qrRegenerate")}
+          </Button>
         </div>
       );
     }
@@ -1578,7 +1539,11 @@ export function ChannelDrawer({
         <div className={styles.qrPanel}>
           <Alert
             type="success"
-            message={`飞书机器人「${s.botName ?? ""}」创建成功`}
+            message={
+              s.botName
+                ? t("channels.feishuCreateSuccessNamed", { name: s.botName })
+                : t("channels.feishuCreateSuccess")
+            }
             style={{ width: "100%", marginBottom: 12 }}
           />
           {s.manageUrl && (
@@ -1588,7 +1553,7 @@ export function ChannelDrawer({
               rel="noopener noreferrer"
               style={{ fontSize: 13, marginBottom: 12, display: "block" }}
             >
-              前往管理后台 →
+              {t("channels.feishuManageBot")}
             </a>
           )}
           {renderQrAutoSaveStatus(retrySave)}
@@ -1603,78 +1568,55 @@ export function ChannelDrawer({
             message={s.reason}
             style={{ width: "100%", marginBottom: 12 }}
           />
-          <Button onClick={() => void startFeishuCreator()}>重试</Button>
+          <Button onClick={() => void startFeishuCreator()}>
+            {t("channels.qrRegenerate")}
+          </Button>
         </div>
       );
     }
-    return (
-      <div className={styles.quickConfigPanel}>
-        <div className={styles.quickConfigSteps}>
-          <div className={styles.quickConfigStep}>
-            <span className={styles.stepNumber}>1</span>
-            点击按钮，启动自动创建流程
-          </div>
-          <div className={styles.quickConfigStep}>
-            <span className={styles.stepNumber}>2</span>扫码登录飞书账号
-          </div>
-          <div className={styles.quickConfigStep}>
-            <span className={styles.stepNumber}>3</span>
-            自动完成机器人注册和权限配置
-          </div>
-        </div>
-        <Button
-          type="primary"
-          className={styles.quickConfigBtn}
-          block
-          onClick={() => void startFeishuCreator("feishu")}
-        >
-          一键创建飞书机器人
-        </Button>
-      </div>
+    return renderQrLoading(
+      t("channels.feishuQrStep1"),
+      t("channels.feishuQrStep2"),
+      t("channels.feishuQrStep3"),
     );
   }
 
   function renderYuanbaoPanel() {
     const s = qrState;
-    if (s.phase === "yuanbao_creating" || s.phase === "yuanbao_progress") {
-      return (
-        <div className={styles.qrPanel}>
-          <Spin />
-          <p
-            style={{
-              marginTop: 12,
-              color: "var(--fn-text-secondary)",
-              fontSize: 13,
-            }}
-          >
-            {s.message}
-          </p>
-        </div>
+    if (
+      s.phase === "idle" ||
+      s.phase === "loading" ||
+      s.phase === "yuanbao_creating" ||
+      s.phase === "yuanbao_progress"
+    ) {
+      return renderQrLoading(
+        t("channels.yuanbaoQrStep1"),
+        t("channels.yuanbaoQrStep2"),
+        t("channels.yuanbaoQrStep3"),
       );
     }
     if (s.phase === "yuanbao_scan") {
       const qrValue = s.scanUrl ?? s.scanCode;
       return (
         <div className={styles.qrPanel}>
-          <div className={styles.qrSteps}>
-            <span className={styles.qrStep}>
-              <span className={styles.qrDot}>1</span>打开元宝 App
-            </span>
-            <span className={styles.qrStepDivider} />
-            <span className={styles.qrStep}>
-              <span className={styles.qrDot}>2</span>扫码绑定
-            </span>
-            <span className={styles.qrStepDivider} />
-            <span className={styles.qrStep}>
-              <span className={styles.qrDot}>3</span>确认授权
-            </span>
-          </div>
+          {renderQrSteps(
+            t("channels.yuanbaoQrStep1"),
+            t("channels.yuanbaoQrStep2"),
+            t("channels.yuanbaoQrStep3"),
+          )}
           <div className={styles.qrCardWrap}>
             <div className={styles.qrFrame}>
               <QRCodeSVG value={qrValue} size={200} />
             </div>
           </div>
-          <p className={styles.qrScanHint}>扫码后在元宝 App 确认绑定</p>
+          <p className={styles.qrScanHint}>{t("channels.yuanbaoQrScanHint")}</p>
+          <Button
+            size="small"
+            onClick={() => void startYuanbaoCreator()}
+            style={{ marginTop: 4 }}
+          >
+            {t("channels.qrRegenerate")}
+          </Button>
         </div>
       );
     }
@@ -1695,7 +1637,7 @@ export function ChannelDrawer({
         <div className={styles.qrPanel}>
           <Alert
             type="success"
-            message="元宝机器人绑定成功"
+            message={t("channels.yuanbaoCreateSuccess")}
             style={{ width: "100%", marginBottom: 12 }}
           />
           {renderQrAutoSaveStatus(retrySave)}
@@ -1710,33 +1652,16 @@ export function ChannelDrawer({
             message={s.reason}
             style={{ width: "100%", marginBottom: 12 }}
           />
-          <Button onClick={() => void startYuanbaoCreator()}>重试</Button>
+          <Button onClick={() => void startYuanbaoCreator()}>
+            {t("channels.qrRetryBtn")}
+          </Button>
         </div>
       );
     }
-    return (
-      <div className={styles.quickConfigPanel}>
-        <div className={styles.quickConfigSteps}>
-          <div className={styles.quickConfigStep}>
-            <span className={styles.stepNumber}>1</span>点击按钮，获取元宝扫码
-          </div>
-          <div className={styles.quickConfigStep}>
-            <span className={styles.stepNumber}>2</span>在元宝 App
-            扫码并确认授权
-          </div>
-          <div className={styles.quickConfigStep}>
-            <span className={styles.stepNumber}>3</span>凭据自动填入并保存
-          </div>
-        </div>
-        <Button
-          type="primary"
-          className={styles.quickConfigBtn}
-          block
-          onClick={() => void startYuanbaoCreator()}
-        >
-          生成元宝扫码
-        </Button>
-      </div>
+    return renderQrLoading(
+      t("channels.yuanbaoQrStep1"),
+      t("channels.yuanbaoQrStep2"),
+      t("channels.yuanbaoQrStep3"),
     );
   }
 
@@ -1756,7 +1681,7 @@ export function ChannelDrawer({
           )}
           <span>
             {isEdit
-              ? `${kindLabel} ${t("channels.channelSettings")}`
+              ? t("channels.channelSettingsNamed", { kind: kindLabel })
               : t("channels.createChannel")}
           </span>
         </div>
@@ -1833,8 +1758,8 @@ export function ChannelDrawer({
               value={configMode}
               onChange={(v) => setConfigMode(v as "quick" | "manual")}
               options={[
-                { label: "快捷配置（扫码）", value: "quick" },
-                { label: "手动填写", value: "manual" },
+                { label: t("channels.quickConfig"), value: "quick" },
+                { label: t("channels.manualConfig"), value: "manual" },
               ]}
             />
           )}
@@ -1868,7 +1793,7 @@ export function ChannelDrawer({
                       rel="noopener noreferrer"
                       className={styles.bannerLink}
                     >
-                      前往获取凭据
+                      {t("channels.getCredentials")}
                       <span className={styles.bannerLinkArrow}>&#8250;</span>
                     </a>
                   </div>
@@ -1901,7 +1826,7 @@ export function ChannelDrawer({
                 <Form.Item
                   name="__raw_config"
                   label="Config (JSON)"
-                  tooltip="渠道特定配置 — 详见 harness-gateway 文档"
+                  tooltip={t("channels.rawConfigTooltip")}
                   rules={[
                     {
                       validator: (_, value) => {
@@ -1914,12 +1839,14 @@ export function ChannelDrawer({
                             Array.isArray(parsed)
                           ) {
                             return Promise.reject(
-                              new Error("必须是 JSON 对象"),
+                              new Error(t("channels.jsonMustBeObject")),
                             );
                           }
                           return Promise.resolve();
                         } catch {
-                          return Promise.reject(new Error("非法 JSON"));
+                          return Promise.reject(
+                            new Error(t("channels.invalidJson")),
+                          );
                         }
                       },
                     },
diff --git a/dashboard/src/pages/Agent/Channels/index.module.less b/dashboard/src/pages/Agent/Channels/index.module.less
index 8f8b69e2..0e4986cb 100644
--- a/dashboard/src/pages/Agent/Channels/index.module.less
+++ b/dashboard/src/pages/Agent/Channels/index.module.less
@@ -612,6 +612,15 @@
 }
 
 .qrFrame {
+  box-sizing: content-box;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 200px;
+  height: 200px;
+  min-width: 200px;
+  min-height: 200px;
+  flex-shrink: 0;
   padding: 8px;
   background: #fff;
   border-radius: 10px;
@@ -635,6 +644,7 @@
   gap: 6px;
   width: 100%;
   justify-content: center;
+  margin-bottom: 8px;
 }
 
 .qrStep {
@@ -647,6 +657,7 @@
   border: 1px solid var(--fn-border-secondary, rgba(0, 0, 0, 0.07));
   padding: 4px 10px 4px 5px;
   border-radius: 999px;
+  white-space: nowrap;
 }
 
 .qrDot {
diff --git a/dashboard/src/pages/Agent/Connectors/ConnectorCard.tsx b/dashboard/src/pages/Agent/Connectors/ConnectorCard.tsx
index 17eb9f83..174b7091 100644
--- a/dashboard/src/pages/Agent/Connectors/ConnectorCard.tsx
+++ b/dashboard/src/pages/Agent/Connectors/ConnectorCard.tsx
@@ -1,35 +1,22 @@
 import { memo } from "react";
-import { Switch } from "antd";
 import { useTranslation } from "react-i18next";
 
-import type {
-  ConnectorCatalogEntry,
-  ConnectorInstance,
-} from "../../../api/modules/connectors";
+import type { ConnectorCatalogEntry } from "../../../api/modules/connectors";
 import { ConnectorLogo, connectorAccent } from "./connectorDefs";
 import styles from "./index.module.less";
 
 interface ConnectorCardProps {
   entry: ConnectorCatalogEntry;
-  instance: ConnectorInstance | null;
-  onConfigure: (
-    entry: ConnectorCatalogEntry,
-    instance: ConnectorInstance | null,
-  ) => void;
-  onToggleEnabled: (instance: ConnectorInstance, enabled: boolean) => void;
+  onConfigure: (entry: ConnectorCatalogEntry, instance: null) => void;
 }
 
 export const ConnectorCard = memo(function ConnectorCard({
   entry,
-  instance,
   onConfigure,
-  onToggleEnabled,
 }: ConnectorCardProps) {
   const { t } = useTranslation();
   const accent = connectorAccent(entry);
   const disabled = entry.phase !== "available";
-  const configured = instance != null && instance.has_credentials;
-  const enabled = configured && instance?.status === "active";
 
   return (
     <div
@@ -37,11 +24,11 @@ export const ConnectorCard = memo(function ConnectorCard({
         disabled ? ` ${styles.typeCardDisabled}` : ""
       }`}
       style={{ "--connector-accent": accent } as React.CSSProperties}
-      onClick={() => !disabled && onConfigure(entry, instance)}
+      onClick={() => !disabled && onConfigure(entry, null)}
       role="button"
       tabIndex={disabled ? -1 : 0}
       onKeyDown={(e) =>
-        e.key === "Enter" && !disabled && onConfigure(entry, instance)
+        e.key === "Enter" && !disabled && onConfigure(entry, null)
       }
     >
       <div className={styles.typeCardBody}>
@@ -58,23 +45,8 @@ export const ConnectorCard = memo(function ConnectorCard({
       {!disabled ? (
         <div className={styles.typeCardFooter}>
           <div className={styles.typeCardHint}>
-            {configured
-              ? t("connectors.clickToManage", "点击管理连接")
-              : t("connectors.clickToConnect", "点击连接")}
+            {t("connectors.clickToConnect", "点击连接")}
           </div>
-          {configured && instance && (
-            <div
-              className={styles.typeCardSwitch}
-              onClick={(e) => e.stopPropagation()}
-              onKeyDown={(e) => e.stopPropagation()}
-            >
-              <Switch
-                size="small"
-                checked={enabled}
-                onChange={(checked) => onToggleEnabled(instance, checked)}
-              />
-            </div>
-          )}
         </div>
       ) : (
         <div className={styles.typeCardFooterSpacer} aria-hidden />
diff --git a/dashboard/src/pages/Agent/Connectors/ConnectorInstanceCard.tsx b/dashboard/src/pages/Agent/Connectors/ConnectorInstanceCard.tsx
index 9ed6cba7..7337c59f 100644
--- a/dashboard/src/pages/Agent/Connectors/ConnectorInstanceCard.tsx
+++ b/dashboard/src/pages/Agent/Connectors/ConnectorInstanceCard.tsx
@@ -1,6 +1,6 @@
-import { App, Button } from "antd";
+import { App, Switch, Tag, Tooltip } from "antd";
 
-import { Activity, Trash2 } from "lucide-react";
+import { Trash2 } from "lucide-react";
 import { useTranslation } from "react-i18next";
 
 import {
@@ -8,34 +8,33 @@ import {
   type ConnectorCatalogEntry,
   type ConnectorInstance,
 } from "../../../api/modules/connectors";
+import { useCurrentUser } from "../../../hooks/useCurrentUser";
 import { ConnectorLogo, connectorAccent } from "./connectorDefs";
 import styles from "./index.module.less";
 
 interface ConnectorInstanceCardProps {
   instance: ConnectorInstance;
   catalogEntry: ConnectorCatalogEntry | undefined;
-  onDeleted: () => void | Promise<void>;
+  onEdit: (instance: ConnectorInstance) => void;
+  onChanged: () => void | Promise<void>;
 }
 
 export function ConnectorInstanceCard({
   instance,
   catalogEntry,
-  onDeleted,
+  onEdit,
+  onChanged,
 }: ConnectorInstanceCardProps) {
   const { t } = useTranslation();
   const { modal, message } = App.useApp();
+  const user = useCurrentUser();
   const accent = catalogEntry ? connectorAccent(catalogEntry) : "#8c8c8c";
-
-  const handleTest = async () => {
-    try {
-      const r = await connectorsApi.testInstance(instance.instance_id);
-      if (r.ok) message.success(t("connectors.testOk", "连接正常"));
-      else message.error(r.error ?? t("connectors.testFailed", "测试失败"));
-    } catch (e) {
-      console.error(e);
-      message.error(t("connectors.testFailed", "测试失败"));
-    }
-  };
+  const isOwner = user?.id === instance.owner_user_id;
+  const ownerLabel =
+    instance.owner_display_name || instance.owner_username || "";
+  const editable =
+    instance.can_manage &&
+    (catalogEntry != null || (instance.kind === "custom-mcp" && isOwner));
 
   const handleDelete = () => {
     modal.confirm({
@@ -46,44 +45,106 @@ export function ConnectorInstanceCard({
       onOk: async () => {
         await connectorsApi.deleteInstance(instance.instance_id);
         message.success(t("connectors.deleteSuccess", "已删除"));
-        await onDeleted();
+        await onChanged();
       },
     });
   };
 
+  const handleToggle = async (enabled: boolean) => {
+    try {
+      await connectorsApi.patchInstance(instance.instance_id, {
+        status: enabled ? "active" : "disabled",
+      });
+      message.success(
+        enabled
+          ? t("connectors.enableSuccess", "已启用")
+          : t("connectors.disableSuccess", "已停用"),
+      );
+      await onChanged();
+    } catch (error) {
+      console.error(error);
+      message.error(t("connectors.toggleFailed", "更新失败"));
+    }
+  };
+
   return (
     <div
-      className={styles.instanceCard}
+      className={styles.typeCard}
       style={{ "--connector-accent": accent } as React.CSSProperties}
+      onClick={() => editable && onEdit(instance)}
+      role={editable ? "button" : undefined}
+      tabIndex={editable ? 0 : -1}
+      onKeyDown={(e) => e.key === "Enter" && editable && onEdit(instance)}
     >
-      <div className={styles.instanceCardMain}>
-        <div
-          className={styles.instanceCardIcon}
-          style={{ color: accent, background: `${accent}18` }}
-        >
-          <ConnectorLogo kind={instance.kind} icon={catalogEntry?.icon} />
-        </div>
-        <div className={styles.instanceCardMeta}>
-          <div className={styles.instanceCardName}>{instance.display_name}</div>
-          <div className={styles.instanceCardKind}>
-            {catalogEntry?.name ?? instance.kind}
+      <div className={styles.typeCardBody}>
+        <div className={styles.typeCardHeader}>
+          <div className={styles.typeCardIconLarge}>
+            <ConnectorLogo
+              kind={instance.kind}
+              icon={catalogEntry?.icon}
+              size={40}
+            />
+          </div>
+          <div className={styles.typeCardTitle}>{instance.display_name}</div>
+          <div
+            className={styles.instanceCardHeaderActions}
+            onClick={(e) => e.stopPropagation()}
+            onKeyDown={(e) => e.stopPropagation()}
+          >
+            {instance.shared ? (
+              <Tag color="blue" className={styles.instanceCardTag}>
+                {isOwner || !ownerLabel
+                  ? t("connectors.sharedBadge", "共享")
+                  : t("connectors.sharedFrom", {
+                      name: ownerLabel,
+                      defaultValue: `来自 ${ownerLabel}`,
+                    })}
+              </Tag>
+            ) : null}
+            {instance.can_manage ? (
+              <Switch
+                size="small"
+                checked={instance.status === "active"}
+                onChange={(enabled) => void handleToggle(enabled)}
+              />
+            ) : null}
           </div>
         </div>
+
+        <div className={styles.typeCardDesc}>
+          {instance.description ||
+            catalogEntry?.description ||
+            catalogEntry?.name ||
+            instance.kind}
+        </div>
       </div>
-      <div className={styles.instanceCardActions}>
-        <Button
-          size="small"
-          icon={<Activity size={14} />}
-          onClick={() => void handleTest()}
-        >
-          {t("connectors.test", "测试")}
-        </Button>
-        <Button
-          size="small"
-          danger
-          icon={<Trash2 size={14} />}
-          onClick={handleDelete}
-        />
+
+      <div className={styles.typeCardFooter}>
+        <div className={styles.typeCardHint}>
+          {!instance.has_credentials
+            ? t("connectors.noCredentials", "缺少凭证")
+            : editable
+            ? t("connectors.clickToManage", "点击管理连接")
+            : t("connectors.sharedReadonly", "共享连接器，仅所有者可管理")}
+        </div>
+        {instance.can_manage ? (
+          <div
+            className={styles.instanceCardActions}
+            onClick={(e) => e.stopPropagation()}
+            onKeyDown={(e) => e.stopPropagation()}
+          >
+            <Tooltip title={t("common.delete")} mouseEnterDelay={0.5}>
+              <button
+                type="button"
+                className={styles.instanceCardDelBtn}
+                onClick={handleDelete}
+                aria-label={t("common.delete")}
+              >
+                <Trash2 size={13} />
+              </button>
+            </Tooltip>
+          </div>
+        ) : null}
       </div>
     </div>
   );
diff --git a/dashboard/src/pages/Agent/Connectors/CustomMcpServerCard.tsx b/dashboard/src/pages/Agent/Connectors/CustomMcpServerCard.tsx
index d17a9bdb..6b2c9813 100644
--- a/dashboard/src/pages/Agent/Connectors/CustomMcpServerCard.tsx
+++ b/dashboard/src/pages/Agent/Connectors/CustomMcpServerCard.tsx
@@ -31,6 +31,7 @@ interface CustomMcpServerCardProps {
   onProbe: () => void;
   onAuthorize?: () => void;
   onDefaultOpenChange?: (defaultOpen: boolean) => void;
+  onSharedChange?: (shared: boolean) => void;
 }
 
 export function CustomMcpServerCard({
@@ -46,6 +47,7 @@ export function CustomMcpServerCard({
   onProbe,
   onAuthorize,
   onDefaultOpenChange,
+  onSharedChange,
 }: CustomMcpServerCardProps) {
   const { t } = useTranslation();
   const { modal } = App.useApp();
@@ -308,9 +310,29 @@ export function CustomMcpServerCard({
           )}
 
           <div className={styles.customMcpField}>
-            <label>
-              {t("connectors.customMcp.defaultOpen", "对话默认选中")}
-            </label>
+            <label>{t("connectors.shared", "是否共享")}</label>
+            <div className={styles.customMcpDefaultOpenRow}>
+              <Switch
+                checked={card.shared}
+                onChange={(checked) => {
+                  if (onSharedChange) {
+                    onSharedChange(checked);
+                    return;
+                  }
+                  onUpdate(card.key, { shared: checked });
+                }}
+              />
+              <span className={styles.customMcpFieldHint}>
+                {t(
+                  "connectors.sharedHint",
+                  "共享后其他用户可以选择使用，但不能查看或修改配置。",
+                )}
+              </span>
+            </div>
+          </div>
+
+          <div className={styles.customMcpField}>
+            <label>{t("connectors.defaultEnabled", "是否默认开启")}</label>
             <div className={styles.customMcpDefaultOpenRow}>
               <Switch
                 checked={card.defaultOpen}
diff --git a/dashboard/src/pages/Agent/Connectors/CustomMcpTab.tsx b/dashboard/src/pages/Agent/Connectors/CustomMcpTab.tsx
index 75fe9b6d..7ee8d82b 100644
--- a/dashboard/src/pages/Agent/Connectors/CustomMcpTab.tsx
+++ b/dashboard/src/pages/Agent/Connectors/CustomMcpTab.tsx
@@ -28,7 +28,11 @@ import {
 } from "./customMcpUtils";
 import styles from "./index.module.less";
 
-export function CustomMcpTab() {
+interface CustomMcpTabProps {
+  focusServerName?: string | null;
+}
+
+export function CustomMcpTab({ focusServerName }: CustomMcpTabProps) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(true);
   const [saving, setSaving] = useState(false);
@@ -92,9 +96,25 @@ export function CustomMcpTab() {
     void load();
   }, [load]);
 
+  useEffect(() => {
+    if (!focusServerName || loading) return;
+    setMode("visual");
+    setCards((prev) =>
+      prev.map((card) =>
+        card.name.trim() === focusServerName
+          ? { ...card, collapsed: false }
+          : card,
+      ),
+    );
+  }, [focusServerName, loading]);
+
   const persistServerPatch = async (
     card: ServerCardState,
-    apiPatch: { enabled?: boolean; default_open?: boolean },
+    apiPatch: {
+      enabled?: boolean;
+      default_open?: boolean;
+      shared?: boolean;
+    },
     localPatch: Partial<ServerCardState>,
   ) => {
     const optimisticCards = cards.map((item) =>
@@ -751,6 +771,9 @@ export function CustomMcpTab() {
                           { defaultOpen },
                         );
                       }}
+                      onSharedChange={(shared) => {
+                        void persistServerPatch(card, { shared }, { shared });
+                      }}
                       onRemove={() => handleRemove(card.key)}
                       onProbe={() => void handleProbe(card)}
                       onAuthorize={() => void handleOAuth(card)}
diff --git a/dashboard/src/pages/Agent/Connectors/customMcpUtils.ts b/dashboard/src/pages/Agent/Connectors/customMcpUtils.ts
index bfc3850f..9bbc835e 100644
--- a/dashboard/src/pages/Agent/Connectors/customMcpUtils.ts
+++ b/dashboard/src/pages/Agent/Connectors/customMcpUtils.ts
@@ -18,6 +18,7 @@ export interface ServerCardState {
   envText: string;
   enabled: boolean;
   defaultOpen: boolean;
+  shared: boolean;
   collapsed: boolean;
   oauthConfigured: boolean;
   oauthExpiresAt?: number;
@@ -125,6 +126,7 @@ export function serversToCards(servers: CustomMcpServers): ServerCardState[] {
     envText: envToText(spec.env),
     enabled: spec.enabled !== false,
     defaultOpen: spec.default_open === true,
+    shared: spec.shared === true,
     collapsed: true,
     oauthConfigured: spec.oauth?.configured === true,
     oauthExpiresAt: spec.oauth?.expires_at,
@@ -152,6 +154,9 @@ export function cardsToServers(cards: ServerCardState[]): CustomMcpServers {
     if (card.defaultOpen) {
       spec.default_open = true;
     }
+    if (card.shared) {
+      spec.shared = true;
+    }
     if (card.transport === "streamable_http") {
       spec.url = card.url.trim();
       const headers = parseHeadersText(card.headersText);
@@ -243,6 +248,7 @@ export function newCard(
     envText: "",
     enabled: true,
     defaultOpen: false,
+    shared: false,
     collapsed: false,
     oauthConfigured: false,
   };
diff --git a/dashboard/src/pages/Agent/Connectors/index.module.less b/dashboard/src/pages/Agent/Connectors/index.module.less
index 032e1b52..f6f5ecb4 100644
--- a/dashboard/src/pages/Agent/Connectors/index.module.less
+++ b/dashboard/src/pages/Agent/Connectors/index.module.less
@@ -40,6 +40,15 @@
   gap: 16px;
 }
 
+.emptyGuideMascot {
+  display: block;
+  width: 120px;
+  height: 120px;
+  object-fit: contain;
+  user-select: none;
+  -webkit-user-drag: none;
+}
+
 /* ── Type Card (service catalog) ───────────────────────────────── */
 
 .typeCard {
@@ -154,16 +163,6 @@
   flex-shrink: 0;
 }
 
-.typeCardSwitch {
-  display: flex;
-  align-items: center;
-  flex-shrink: 0;
-}
-
-.typeCardSwitchLabel {
-  display: none;
-}
-
 .typeCardIcon {
   width: 40px;
   height: 40px;
@@ -208,67 +207,45 @@
 
 /* ── Instance Card (my connections) ────────────────────────────── */
 
-.instanceCard {
-  background: var(--fn-bg-primary);
-  border: 2px solid var(--fn-card-border-normal);
-  border-radius: var(--fn-radius-lg);
-  padding: 16px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 12px;
-  transition:
-    border-color 0.2s,
-    box-shadow 0.2s;
-
-  &:hover {
-    border-color: color-mix(
-      in srgb,
-      var(--connector-accent, var(--fn-color-brand)) 40%,
-      var(--fn-card-border-normal)
-    );
-    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.06);
-  }
+.instanceCardTag {
+  flex-shrink: 0;
+  margin-inline-end: 0;
 }
 
-.instanceCardMain {
+.instanceCardHeaderActions {
   display: flex;
   align-items: center;
-  gap: 12px;
-  min-width: 0;
+  gap: 8px;
+  flex-shrink: 0;
 }
 
-.instanceCardIcon {
-  width: 40px;
-  height: 40px;
-  border-radius: var(--fn-radius-md);
+.instanceCardActions {
   display: flex;
   align-items: center;
-  justify-content: center;
+  gap: 6px;
   flex-shrink: 0;
 }
 
-.instanceCardMeta {
-  min-width: 0;
-}
-
-.instanceCardName {
-  font-weight: 600;
-  font-size: 14px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.instanceCardKind {
-  font-size: 12px;
+.instanceCardDelBtn {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  padding: 4px;
+  border-radius: var(--fn-radius-sm);
+  border: 1px solid var(--fn-border-primary);
+  background: transparent;
+  cursor: pointer;
   color: var(--fn-text-tertiary);
-}
+  transition:
+    color 0.15s,
+    border-color 0.15s,
+    background 0.15s;
 
-.instanceCardActions {
-  display: flex;
-  gap: 8px;
-  flex-shrink: 0;
+  &:hover {
+    color: #ff4d4f;
+    border-color: #ff4d4f;
+    background: color-mix(in srgb, #ff4d4f 8%, transparent);
+  }
 }
 
 .connectorLogo {
diff --git a/dashboard/src/pages/Agent/Connectors/index.tsx b/dashboard/src/pages/Agent/Connectors/index.tsx
index 2dc8258a..5453bb55 100644
--- a/dashboard/src/pages/Agent/Connectors/index.tsx
+++ b/dashboard/src/pages/Agent/Connectors/index.tsx
@@ -9,6 +9,8 @@ import {
   Copy,
   Download,
   ExternalLink,
+  Plug,
+  Plus,
   RefreshCw,
   Sparkles,
 } from "lucide-react";
@@ -16,6 +18,8 @@ import { useTranslation } from "react-i18next";
 import { useSearchParams } from "react-router-dom";
 
 import PageShell from "../../../layouts/PageShell";
+import StreamSetupGuide from "../../../components/StreamSetupGuide/StreamSetupGuide";
+import { OctopEmptyMascot } from "../../../components/EmptyState/OctopEmptyMascot";
 import { useCurrentUser } from "../../../hooks/useCurrentUser";
 import { userCan } from "../../../utils/permissions";
 import { apiErrorMessage } from "../../../utils/apiError";
@@ -36,6 +40,7 @@ import {
   type FeishuUserAuthStartResult,
 } from "../../../api/modules/connectors";
 import { ConnectorCard } from "./ConnectorCard";
+import { ConnectorInstanceCard } from "./ConnectorInstanceCard";
 import { CustomMcpTab } from "./CustomMcpTab";
 import {
   INLINE_CREDENTIAL_GUIDE_KINDS,
@@ -137,15 +142,19 @@ function previewToFormValues(
   if (!detail) {
     return {
       display_name: entry.name,
+      description: entry.description,
       mail_provider: "qq",
       default_open: false,
+      shared: false,
     };
   }
   const preview = detail.credentials_preview ?? {};
   const values: Record<string, unknown> = {
     display_name: detail.display_name || entry.name,
+    description: detail.description || entry.description,
     default_open:
       detail.default_open === true || detail.config?.default_open === true,
+    shared: detail.shared === true,
   };
   if (preview.email) values.email = preview.email;
   if (preview.mail_provider) values.mail_provider = preview.mail_provider;
@@ -353,7 +362,12 @@ function ConnectorConfigDrawer({
     setFeishuAuthNeedsReauth(false);
     setFeishuRefreshExpiresAt(null);
     form.resetFields();
-    form.setFieldsValue({ display_name: entry.name, default_open: false });
+    form.setFieldsValue({
+      display_name: entry.name,
+      description: entry.description,
+      default_open: false,
+      shared: false,
+    });
 
     void connectorsApi
       .authInfo(entry.kind)
@@ -403,6 +417,7 @@ function ConnectorConfigDrawer({
         .catch(() => {
           form.setFieldsValue({
             display_name: instance.display_name || entry.name,
+            description: instance.description || entry.description,
             default_open: instance.default_open === true,
           });
           applyConnectorDraft();
@@ -869,12 +884,24 @@ function ConnectorConfigDrawer({
           return;
         }
 
-        await connectorsApi.createInstance({
-          kind: entry.kind,
-          display_name: String(values.display_name || entry.name),
-          credentials,
-          default_open: values.default_open === true,
-        });
+        if (instance) {
+          await connectorsApi.patchInstance(instance.instance_id, {
+            display_name: String(values.display_name || entry.name),
+            description: String(values.description || entry.description),
+            credentials,
+            default_open: values.default_open === true,
+            shared: values.shared === true,
+          });
+        } else {
+          await connectorsApi.createInstance({
+            kind: entry.kind,
+            display_name: String(values.display_name || entry.name),
+            description: String(values.description || entry.description),
+            credentials,
+            default_open: values.default_open === true,
+            shared: values.shared === true,
+          });
+        }
         clearFormDraft(draftScope);
         message.success(t("connectors.createSuccess", "连接器已创建"));
         onSaved();
@@ -883,6 +910,7 @@ function ConnectorConfigDrawer({
         console.error(e);
         form.setFieldsValue({
           display_name: entry.name,
+          description: entry.description,
           access_token: tokens.access_token,
           refresh_token: tokens.refresh_token,
           expires_at: tokens.expires_at,
@@ -1077,12 +1105,24 @@ function ConnectorConfigDrawer({
     setSaving(true);
     try {
       const payload = buildCredentials(entry, values);
-      await connectorsApi.createInstance({
-        kind: entry.kind,
-        display_name: values.display_name as string,
-        credentials: payload,
-        default_open: values.default_open === true,
-      });
+      if (instance) {
+        await connectorsApi.patchInstance(instance.instance_id, {
+          display_name: values.display_name as string,
+          description: values.description as string,
+          credentials: payload,
+          default_open: values.default_open === true,
+          shared: values.shared === true,
+        });
+      } else {
+        await connectorsApi.createInstance({
+          kind: entry.kind,
+          display_name: values.display_name as string,
+          description: values.description as string,
+          credentials: payload,
+          default_open: values.default_open === true,
+          shared: values.shared === true,
+        });
+      }
       message.success(
         hasStoredCredentials
           ? t("connectors.saveSuccess", "连接器已保存")
@@ -1129,11 +1169,11 @@ function ConnectorConfigDrawer({
         hasStoredCredentials
           ? t("connectors.editConnection", {
               name: entry.name,
-              defaultValue: `配置 ${entry.name}`,
+              defaultValue: `编辑 ${entry.name} 连接器`,
             })
-          : t("connectors.configureConnection", {
+          : t("connectors.createConnection", {
               name: entry.name,
-              defaultValue: `配置 ${entry.name}`,
+              defaultValue: `创建 ${entry.name} 连接器`,
             })
       }
       open={open}
@@ -1445,6 +1485,18 @@ function ConnectorConfigDrawer({
           >
             <Input placeholder={entry.name} />
           </Form.Item>
+          <Form.Item
+            name="description"
+            label={t("connectors.description", "描述")}
+            rules={[{ required: true }]}
+          >
+            <Input.TextArea
+              rows={3}
+              maxLength={500}
+              showCount
+              placeholder={entry.description}
+            />
+          </Form.Item>
 
           {entry.auth_kind === "custom_fields" &&
             (entry.credential_fields ?? []).map((field) => {
@@ -1957,9 +2009,21 @@ function ConnectorConfigDrawer({
             </>
           )}
 
+          <Form.Item
+            name="shared"
+            label={t("connectors.shared", "是否共享")}
+            valuePropName="checked"
+            extra={t(
+              "connectors.sharedHint",
+              "共享后其他用户可以选择使用，但不能查看或修改配置。",
+            )}
+          >
+            <Switch />
+          </Form.Item>
+
           <Form.Item
             name="default_open"
-            label={t("connectors.defaultOpen", "是否默认打开")}
+            label={t("connectors.defaultEnabled", "是否默认开启")}
             valuePropName="checked"
             extra={
               defaultOpen
@@ -2037,32 +2101,22 @@ function ConnectorConfigDrawer({
 export default function ConnectorsPage() {
   const { t } = useTranslation();
   const [searchParams, setSearchParams] = useSearchParams();
-  const [activeTab, setActiveTab] = useState<"builtin" | "custom">("builtin");
+  const [activeTab, setActiveTab] = useState<"enabled" | "builtin" | "custom">(
+    "enabled",
+  );
   const [drawerEntry, setDrawerEntry] = useState<ConnectorCatalogEntry | null>(
     null,
   );
   const [drawerInstance, setDrawerInstance] =
     useState<ConnectorInstance | null>(null);
+  const [customFocusServerName, setCustomFocusServerName] = useState<
+    string | null
+  >(null);
   const { catalog, instances, loading, refresh } = useConnectorInstances();
 
-  const instanceByKind = useMemo(() => {
-    const map = new Map<string, ConnectorInstance>();
-    for (const inst of instances) {
-      if (!map.has(inst.kind)) {
-        map.set(inst.kind, inst);
-      }
-    }
-    return map;
-  }, [instances]);
-
   const configuredCount = useMemo(() => {
-    let count = 0;
-    for (const entry of catalog) {
-      const inst = instanceByKind.get(entry.kind);
-      if (inst?.has_credentials) count += 1;
-    }
-    return count;
-  }, [catalog, instanceByKind]);
+    return instances.filter((instance) => instance.has_credentials).length;
+  }, [instances]);
 
   useEffect(() => {
     const oauthState = searchParams.get("oauth_state");
@@ -2092,6 +2146,7 @@ export default function ConnectorsPage() {
         await connectorsApi.createInstance({
           kind: entry.kind,
           display_name: entry.name,
+          description: entry.description,
           credentials,
           default_open: false,
         });
@@ -2114,26 +2169,6 @@ export default function ConnectorsPage() {
     [],
   );
 
-  const handleToggleEnabled = useCallback(
-    async (instance: ConnectorInstance, enabled: boolean) => {
-      try {
-        await connectorsApi.patchInstance(instance.instance_id, {
-          status: enabled ? "active" : "disabled",
-        });
-        await refresh();
-        message.success(
-          enabled
-            ? t("connectors.enableSuccess", "已启用")
-            : t("connectors.disableSuccess", "已停用"),
-        );
-      } catch (e) {
-        console.error(e);
-        message.error(t("connectors.toggleFailed", "更新失败"));
-      }
-    },
-    [refresh, t],
-  );
-
   const handleSaved = useCallback(async () => {
     await refresh();
     notifyConnectorsChanged();
@@ -2150,6 +2185,15 @@ export default function ConnectorsPage() {
       subtitle={t("pageShell.connectors.subtitle")}
       tabBar={
         <div className={styles.tabBar}>
+          <button
+            type="button"
+            className={`${styles.tab}${
+              activeTab === "enabled" ? ` ${styles.active}` : ""
+            }`}
+            onClick={() => setActiveTab("enabled")}
+          >
+            {t("connectors.tabEnabled", "已启用连接器")}
+          </button>
           <button
             type="button"
             className={`${styles.tab}${
@@ -2164,7 +2208,10 @@ export default function ConnectorsPage() {
             className={`${styles.tab}${
               activeTab === "custom" ? ` ${styles.active}` : ""
             }`}
-            onClick={() => setActiveTab("custom")}
+            onClick={() => {
+              setCustomFocusServerName(null);
+              setActiveTab("custom");
+            }}
           >
             {t("connectors.tabCustom", "自定义连接器")}
           </button>
@@ -2172,7 +2219,92 @@ export default function ConnectorsPage() {
       }
     >
       {activeTab === "custom" ? (
-        <CustomMcpTab />
+        <CustomMcpTab focusServerName={customFocusServerName} />
+      ) : activeTab === "enabled" ? (
+        loading ? (
+          <div className={styles.loadingState}>
+            <Spin />
+          </div>
+        ) : instances.length === 0 ? (
+          <StreamSetupGuide
+            wide
+            icon={
+              <OctopEmptyMascot
+                size={120}
+                className={styles.emptyGuideMascot}
+              />
+            }
+            title={t("connectors.emptyGuideTitle")}
+            description={t("connectors.emptyGuideDesc")}
+            steps={[
+              {
+                label: t("connectors.emptyGuideStepWhat"),
+                detail: t("connectors.emptyGuideStepWhatDetail"),
+              },
+              {
+                label: t("connectors.emptyGuideStepHow"),
+                detail: t("connectors.emptyGuideStepHowDetail"),
+              },
+              {
+                label: t("connectors.emptyGuideStepShare"),
+                detail: t("connectors.emptyGuideStepShareDetail"),
+              },
+            ]}
+            primaryAction={{
+              label: t("connectors.emptyGuideBrowseBuiltin"),
+              onClick: () => setActiveTab("builtin"),
+              icon: <Plug size={14} />,
+            }}
+            secondaryAction={{
+              label: t("connectors.emptyGuideAddCustom"),
+              onClick: () => {
+                setCustomFocusServerName(null);
+                setActiveTab("custom");
+              },
+              icon: <Plus size={14} />,
+              type: "default",
+            }}
+          />
+        ) : (
+          <>
+            <div className={styles.listToolbar}>
+              <span className={styles.listToolbarMeta}>
+                {t("connectors.enabledSummary", {
+                  count: instances.length,
+                  defaultValue: "已启用 {{count}} 个连接器实例",
+                })}
+              </span>
+              <Button
+                icon={<RefreshCw size={14} />}
+                loading={loading}
+                onClick={() => void refresh()}
+              >
+                {t("common.refresh")}
+              </Button>
+            </div>
+            <div className={styles.typeGrid}>
+              {instances.map((instance) => (
+                <ConnectorInstanceCard
+                  key={instance.instance_id}
+                  instance={instance}
+                  catalogEntry={catalog.find(
+                    (entry) => entry.kind === instance.kind,
+                  )}
+                  onEdit={(item) => {
+                    if (item.kind === "custom-mcp") {
+                      setCustomFocusServerName(item.mcp_server_name);
+                      setActiveTab("custom");
+                      return;
+                    }
+                    const entry = catalog.find((row) => row.kind === item.kind);
+                    if (entry) handleConfigure(entry, item);
+                  }}
+                  onChanged={handleSaved}
+                />
+              ))}
+            </div>
+          </>
+        )
       ) : (
         <>
           <div className={styles.listToolbar}>
@@ -2202,11 +2334,7 @@ export default function ConnectorsPage() {
                 <ConnectorCard
                   key={entry.kind}
                   entry={entry}
-                  instance={instanceByKind.get(entry.kind) ?? null}
                   onConfigure={handleConfigure}
-                  onToggleEnabled={(inst, enabled) =>
-                    void handleToggleEnabled(inst, enabled)
-                  }
                 />
               ))}
             </div>
diff --git a/dashboard/src/pages/Agent/Personalization/components/AgentPluginsPanel.module.less b/dashboard/src/pages/Agent/Personalization/components/AgentPluginsPanel.module.less
new file mode 100644
index 00000000..d3d859ed
--- /dev/null
+++ b/dashboard/src/pages/Agent/Personalization/components/AgentPluginsPanel.module.less
@@ -0,0 +1,46 @@
+.panel {
+  height: 100%;
+  overflow: auto;
+  padding: 4px;
+}
+
+.loading {
+  display: flex;
+  min-height: 240px;
+  align-items: center;
+  justify-content: center;
+}
+
+.hint {
+  display: flex;
+  align-items: flex-start;
+  gap: 8px;
+  margin: 0 0 16px;
+  padding: 10px 12px;
+  font-size: 13px;
+  line-height: 1.6;
+  color: var(--fn-text-secondary);
+  background: var(--fn-bg-info-light);
+  border: 1px solid var(--fn-color-info-border);
+  border-radius: var(--fn-radius-md);
+}
+
+.hintIcon {
+  flex-shrink: 0;
+  margin-top: 2px;
+  color: var(--fn-color-info);
+}
+
+.detailDescription {
+  margin: 16px 0;
+  color: var(--text-secondary);
+}
+
+.pluginSwitch {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 24px;
+  padding: 12px 0;
+  border-bottom: 1px solid var(--border-color);
+}
diff --git a/dashboard/src/pages/Agent/Personalization/components/AgentPluginsPanel.tsx b/dashboard/src/pages/Agent/Personalization/components/AgentPluginsPanel.tsx
new file mode 100644
index 00000000..afd31532
--- /dev/null
+++ b/dashboard/src/pages/Agent/Personalization/components/AgentPluginsPanel.tsx
@@ -0,0 +1,369 @@
+import { useCallback, useEffect, useMemo, useState } from "react";
+import {
+  Alert,
+  Button,
+  Drawer,
+  Empty,
+  Form,
+  Input,
+  InputNumber,
+  Spin,
+  Switch,
+  Tag,
+} from "antd";
+import { Info, Settings2, Wrench } from "lucide-react";
+import { useTranslation } from "react-i18next";
+import {
+  pluginsApi,
+  type AgentPlugin,
+  type AgentPluginTool,
+  type AgentPluginsConfig,
+  type PluginConfigField,
+} from "../../../../api/modules/plugins";
+import { PluginIconView } from "../../../Admin/Plugins/PluginIconView";
+import { message } from "../../../../utils/antdMessage";
+import { apiErrorMessage } from "../../../../utils/apiError";
+import pluginStyles from "../../../Admin/Plugins/index.module.less";
+import styles from "./AgentPluginsPanel.module.less";
+
+interface AgentPluginsPanelProps {
+  agentId: string | null;
+}
+
+function toolsConfig(tools: AgentPluginTool[]): AgentPluginsConfig {
+  const plugins: AgentPluginsConfig = {};
+  for (const tool of tools) {
+    const entry = (plugins[tool.plugin_id] ??= { tools: {} });
+    entry.tools![tool.name] = {
+      enabled: tool.enabled,
+      config: { ...tool.config },
+    };
+  }
+  return plugins;
+}
+
+function configField(field: PluginConfigField) {
+  const props = {
+    label: field.label || field.name,
+    name: field.name,
+    rules: field.required
+      ? [{ required: true, message: field.label || field.name }]
+      : undefined,
+    extra: field.help,
+  };
+  if (field.type === "password") {
+    return (
+      <Form.Item key={field.name} {...props}>
+        <Input.Password placeholder={field.placeholder} autoComplete="off" />
+      </Form.Item>
+    );
+  }
+  if (field.type === "number") {
+    return (
+      <Form.Item key={field.name} {...props}>
+        <InputNumber
+          style={{ width: "100%" }}
+          placeholder={field.placeholder}
+        />
+      </Form.Item>
+    );
+  }
+  return (
+    <Form.Item key={field.name} {...props}>
+      <Input placeholder={field.placeholder} />
+    </Form.Item>
+  );
+}
+
+export default function AgentPluginsPanel({ agentId }: AgentPluginsPanelProps) {
+  const { t } = useTranslation();
+  const [plugins, setPlugins] = useState<AgentPlugin[]>([]);
+  const [tools, setTools] = useState<AgentPluginTool[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [saving, setSaving] = useState<string | null>(null);
+  const [detailId, setDetailId] = useState<string | null>(null);
+  const [configTool, setConfigTool] = useState<AgentPluginTool | null>(null);
+  const [form] = Form.useForm();
+
+  const load = useCallback(async () => {
+    if (!agentId) {
+      setPlugins([]);
+      setTools([]);
+      return;
+    }
+    setLoading(true);
+    try {
+      const [pluginResult, toolResult] = await Promise.all([
+        pluginsApi.listAgentPlugins(agentId),
+        pluginsApi.listAgentTools(agentId),
+      ]);
+      setPlugins(pluginResult.plugins);
+      setTools(toolResult.tools);
+    } catch (error) {
+      message.error(apiErrorMessage(error, t("plugins.loadError"), t));
+    } finally {
+      setLoading(false);
+    }
+  }, [agentId, t]);
+
+  useEffect(() => {
+    // Defer to a microtask so the initial setLoading(true) inside `load`
+    // doesn't run synchronously within the effect body.
+    queueMicrotask(() => {
+      void load();
+    });
+  }, [load]);
+
+  const detail = plugins.find((plugin) => plugin.id === detailId) ?? null;
+  const detailTools = useMemo(
+    () => tools.filter((tool) => tool.plugin_id === detailId),
+    [detailId, tools],
+  );
+
+  const togglePlugin = async (plugin: AgentPlugin, enabled: boolean) => {
+    if (!agentId || !plugin.global_enabled) return;
+    setSaving(`plugin:${plugin.id}`);
+    try {
+      const result = await pluginsApi.patchAgentPlugins(agentId, {
+        [plugin.id]: { enabled },
+      });
+      setPlugins(result.plugins);
+      message.success(t("plugins.saved"));
+    } catch (error) {
+      message.error(apiErrorMessage(error, t("plugins.saveFailed"), t));
+    } finally {
+      setSaving(null);
+    }
+  };
+
+  const persistTools = async (next: AgentPluginTool[]) => {
+    if (!agentId) return;
+    await pluginsApi.patchAgentTools(agentId, toolsConfig(next));
+    setTools(next);
+  };
+
+  const toggleTool = async (tool: AgentPluginTool, enabled: boolean) => {
+    const key = `tool:${tool.plugin_id}:${tool.name}`;
+    setSaving(key);
+    const next = tools.map((item) =>
+      item.plugin_id === tool.plugin_id && item.name === tool.name
+        ? { ...item, enabled }
+        : item,
+    );
+    try {
+      await persistTools(next);
+      message.success(t("plugins.saved"));
+    } catch (error) {
+      message.error(apiErrorMessage(error, t("plugins.saveFailed"), t));
+    } finally {
+      setSaving(null);
+    }
+  };
+
+  const openConfig = (tool: AgentPluginTool) => {
+    setConfigTool(tool);
+    form.setFieldsValue(tool.config);
+  };
+
+  const saveConfig = async () => {
+    if (!configTool) return;
+    const values = await form.validateFields();
+    const key = `tool:${configTool.plugin_id}:${configTool.name}`;
+    setSaving(key);
+    try {
+      await persistTools(
+        tools.map((item) =>
+          item.plugin_id === configTool.plugin_id &&
+          item.name === configTool.name
+            ? { ...item, config: values }
+            : item,
+        ),
+      );
+      setConfigTool(null);
+      message.success(t("plugins.saved"));
+    } catch (error) {
+      message.error(apiErrorMessage(error, t("plugins.saveFailed"), t));
+    } finally {
+      setSaving(null);
+    }
+  };
+
+  if (!agentId) {
+    return (
+      <Empty
+        description={t("skills.noAgentSelected")}
+        style={{ marginTop: 64 }}
+      />
+    );
+  }
+  if (loading) {
+    return (
+      <div className={styles.loading}>
+        <Spin />
+      </div>
+    );
+  }
+  if (plugins.length === 0) {
+    return <Empty description={t("plugins.noPlugins")} />;
+  }
+
+  return (
+    <div className={styles.panel}>
+      <div className={styles.hint}>
+        <Info size={15} className={styles.hintIcon} />
+        <span>{t("plugins.agentPluginHint")}</span>
+      </div>
+      <div className={pluginStyles.cardGrid}>
+        {plugins.map((plugin) => (
+          <article
+            key={plugin.id}
+            className={`${pluginStyles.card} ${
+              plugin.enabled ? "" : pluginStyles.cardDisabled
+            }`}
+          >
+            <div className={pluginStyles.cardBody}>
+              <div className={pluginStyles.cardTop}>
+                <PluginIconView
+                  icon={plugin.icon}
+                  size={48}
+                  className={pluginStyles.cardIcon}
+                />
+                <div className={pluginStyles.cardTitleCol}>
+                  <h3 className={pluginStyles.cardName}>
+                    {plugin.name || plugin.id}
+                  </h3>
+                  <div className={pluginStyles.cardChips}>
+                    {plugin.kind ? <Tag>{plugin.kind}</Tag> : null}
+                    {!plugin.global_enabled ? (
+                      <Tag>{t("plugins.globallyDisabled")}</Tag>
+                    ) : null}
+                  </div>
+                </div>
+              </div>
+              <p className={pluginStyles.cardDesc}>
+                {plugin.description || t("plugins.noDescription")}
+              </p>
+            </div>
+            <div className={pluginStyles.cardFooter}>
+              <button
+                type="button"
+                className={pluginStyles.detailLink}
+                onClick={() => setDetailId(plugin.id)}
+              >
+                {t("plugins.viewDetails")}
+              </button>
+              <span className={pluginStyles.cardFooterSpacer} />
+              <Switch
+                size="small"
+                checked={plugin.enabled}
+                disabled={!plugin.global_enabled}
+                loading={saving === `plugin:${plugin.id}`}
+                onChange={(checked) => void togglePlugin(plugin, checked)}
+              />
+            </div>
+          </article>
+        ))}
+      </div>
+
+      <Drawer
+        title={detail?.name || detail?.id}
+        open={!!detail}
+        onClose={() => setDetailId(null)}
+        width={500}
+        destroyOnHidden
+      >
+        {detail ? (
+          <>
+            {!detail.global_enabled ? (
+              <Alert
+                type="warning"
+                showIcon
+                message={t("plugins.globalDisabledHint")}
+              />
+            ) : null}
+            <p className={styles.detailDescription}>
+              {detail.description || t("plugins.noDescription")}
+            </p>
+            <div className={styles.pluginSwitch}>
+              <span>{t("plugins.agentEnabled")}</span>
+              <Switch
+                checked={detail.enabled}
+                disabled={!detail.global_enabled}
+                loading={saving === `plugin:${detail.id}`}
+                onChange={(checked) => void togglePlugin(detail, checked)}
+              />
+            </div>
+            <h4>{t("plugins.colTools")}</h4>
+            {detailTools.length === 0 ? (
+              <Empty description={t("plugins.noToolsListed")} />
+            ) : (
+              <div className={pluginStyles.detailTools}>
+                {detailTools.map((tool) => {
+                  const key = `tool:${tool.plugin_id}:${tool.name}`;
+                  const configurable = (tool.config_fields?.length ?? 0) > 0;
+                  return (
+                    <div key={key} className={pluginStyles.detailToolItem}>
+                      <span className={pluginStyles.detailToolIcon} aria-hidden>
+                        <Wrench size={15} />
+                      </span>
+                      <div className={pluginStyles.detailToolMeta}>
+                        <div className={pluginStyles.detailToolName}>
+                          {tool.name}
+                        </div>
+                        {tool.description ? (
+                          <div className={pluginStyles.detailToolDesc}>
+                            {tool.description}
+                          </div>
+                        ) : null}
+                      </div>
+                      <div className={pluginStyles.detailToolActions}>
+                        {configurable ? (
+                          <Button
+                            type="text"
+                            size="small"
+                            icon={<Settings2 size={15} />}
+                            disabled={!detail.enabled}
+                            onClick={() => openConfig(tool)}
+                            aria-label={t("plugins.configure")}
+                          />
+                        ) : null}
+                        <Switch
+                          size="small"
+                          checked={tool.enabled}
+                          disabled={!detail.enabled}
+                          loading={saving === key}
+                          onChange={(checked) => void toggleTool(tool, checked)}
+                        />
+                      </div>
+                    </div>
+                  );
+                })}
+              </div>
+            )}
+          </>
+        ) : null}
+      </Drawer>
+
+      <Drawer
+        title={configTool?.name}
+        open={!!configTool}
+        onClose={() => setConfigTool(null)}
+        width={420}
+        destroyOnHidden
+        extra={
+          <Button
+            type="primary"
+            loading={saving?.startsWith("tool:")}
+            onClick={() => void saveConfig()}
+          >
+            {t("common.save")}
+          </Button>
+        }
+      >
+        <Form form={form} layout="vertical">
+          {configTool?.config_fields.map(configField)}
+        </Form>
+      </Drawer>
+    </div>
+  );
+}
diff --git a/dashboard/src/pages/Agent/Personalization/index.tsx b/dashboard/src/pages/Agent/Personalization/index.tsx
index 7db33599..d9f93890 100644
--- a/dashboard/src/pages/Agent/Personalization/index.tsx
+++ b/dashboard/src/pages/Agent/Personalization/index.tsx
@@ -5,6 +5,7 @@ import {
   Bot,
   Brain,
   Notebook,
+  Puzzle,
   Sparkles,
   Waypoints,
   Wrench,
@@ -19,6 +20,7 @@ import SkillsTabs from "../Skills/components/SkillsTabs";
 import ToolsPanel from "../Tools/ToolsPanel";
 import SubagentManager from "../../Experts/components/SubagentManager";
 import MBTISelector from "./components/MBTISelector";
+import AgentPluginsPanel from "./components/AgentPluginsPanel";
 import MemoryPanel from "../Memory/MemoryPanel";
 import ChannelsPanel from "../Channels/ChannelsPanel";
 import styles from "./index.module.less";
@@ -27,6 +29,7 @@ export type PersonalizationTab =
   | "skills"
   | "subagents"
   | "tools"
+  | "plugins"
   | "mbti"
   | "memory"
   | "channels";
@@ -35,6 +38,7 @@ const PERSONALIZATION_TABS = [
   "skills",
   "subagents",
   "tools",
+  "plugins",
   "mbti",
   "memory",
   "channels",
@@ -44,6 +48,7 @@ const TAB_ICONS = {
   skills: Sparkles,
   subagents: Bot,
   tools: Wrench,
+  plugins: Puzzle,
   mbti: Brain,
   memory: Notebook,
   channels: Waypoints,
@@ -124,6 +129,18 @@ export default function PersonalizationPage() {
           </div>
         )}
 
+        {isMounted("plugins") && (
+          <div
+            className={styles.panel}
+            style={{ display: activeTab === "plugins" ? "flex" : "none" }}
+            aria-hidden={activeTab !== "plugins"}
+          >
+            <div className={pageShellStyles.fillChild}>
+              <AgentPluginsPanel agentId={activeAgentId} />
+            </div>
+          </div>
+        )}
+
         {isMounted("subagents") && (
           <div
             className={styles.panel}
diff --git a/dashboard/src/pages/Agent/Tools/ToolsPanel.tsx b/dashboard/src/pages/Agent/Tools/ToolsPanel.tsx
index 231f0e50..adf83daf 100644
--- a/dashboard/src/pages/Agent/Tools/ToolsPanel.tsx
+++ b/dashboard/src/pages/Agent/Tools/ToolsPanel.tsx
@@ -64,7 +64,6 @@ const CATEGORY_ORDER = [
   "mobile",
   "teams",
   "misc",
-  "plugin",
 ] as const;
 
 /** Icon square fill per category. */
@@ -80,7 +79,6 @@ const CATEGORY_ACCENT: Record<string, string> = {
   mobile: "#0EA5E9",
   teams: "#F97316",
   misc: "#64748B",
-  plugin: "#A855F7",
 };
 
 const TOOL_ICONS: Record<string, LucideIcon> = {
@@ -142,8 +140,7 @@ interface ToolsPanelProps {
 }
 
 /**
- * Full tools surface (builtin + plugin), shared by Personalization tab and
- * Experts ToolCatalogDrawer — mirrors SkillsTabs.
+ * Built-in tools surface shared by Personalization and Experts.
  */
 export default function ToolsPanel({ agentId }: ToolsPanelProps) {
   const { t } = useTranslation();
@@ -161,9 +158,12 @@ export default function ToolsPanel({ agentId }: ToolsPanelProps) {
     setLoading(true);
     try {
       const res = await agentToolsApi.get(agentId);
-      setTools(res.tools);
+      const builtinTools = res.tools.filter(
+        (tool) => tool.source === "builtin",
+      );
+      setTools(builtinTools);
       const next: Record<string, boolean> = {};
-      for (const tool of res.tools) {
+      for (const tool of builtinTools) {
         next[toolKey(tool)] = tool.enabled;
       }
       setEnabledMap(next);
diff --git a/dashboard/src/pages/Chat/chatMessages.partial.less b/dashboard/src/pages/Chat/chatMessages.partial.less
index 0d296912..0404c331 100644
--- a/dashboard/src/pages/Chat/chatMessages.partial.less
+++ b/dashboard/src/pages/Chat/chatMessages.partial.less
@@ -8,6 +8,22 @@
   flex-direction: column;
 }
 
+/* Left gutter so the in-thread turn timeline ticks do not cover bubbles.
+   Prefer parent `.chatMainWithTurnRail` (title + composer + list). This local
+   class remains as a fallback when MessageList is mounted alone. */
+.messageListWrapperWithRail {
+  --chat-turn-rail-gutter: 48px;
+
+  .messageListInner {
+    padding-inline-start: var(--chat-turn-rail-gutter);
+    padding-inline-end: var(--chat-column-pad-x, 24px);
+
+    @media (max-width: 863px) {
+      padding-inline-start: var(--chat-column-pad-x, 24px);
+    }
+  }
+}
+
 .messageList {
   flex: 1;
   overflow-y: auto;
@@ -182,6 +198,12 @@
   }
 }
 
+.hitlSegment {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+
 /* Legacy grouped bubbles (kept for compatibility) */
 .assistantGroup {
   display: flex;
@@ -646,36 +668,6 @@
   margin-top: 4px;
 }
 
-.hitlCard {
-  border: 1px solid var(--fn-border);
-  border-radius: 8px;
-  padding: 12px;
-  background: var(--fn-bg-elevated, var(--fn-bg-container));
-}
-
-.hitlTitle {
-  font-weight: 600;
-  margin-bottom: 8px;
-}
-
-.hitlAction {
-  margin-bottom: 8px;
-}
-
-.hitlResolved {
-  margin-top: 4px;
-  font-size: 13px;
-  font-weight: 500;
-}
-
-.hitlResolvedApproved {
-  color: var(--fn-color-success, #389e0d);
-}
-
-.hitlResolvedRejected {
-  color: var(--fn-color-error, #cf1322);
-}
-
 /* ---------- Assistant turn process summary (tools + thinking) ---------- */
 .processSummaryRow {
   display: block;
diff --git a/dashboard/src/pages/Chat/components/AskQuestionCard.module.less b/dashboard/src/pages/Chat/components/AskQuestionCard.module.less
index d7e613ca..c094ed3e 100644
--- a/dashboard/src/pages/Chat/components/AskQuestionCard.module.less
+++ b/dashboard/src/pages/Chat/components/AskQuestionCard.module.less
@@ -22,6 +22,39 @@
   color: var(--fn-text-primary);
 }
 
+.titleActions {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.closeButton {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 24px;
+  height: 24px;
+  padding: 0;
+  border: none;
+  border-radius: var(--fn-radius-sm);
+  background: transparent;
+  color: var(--fn-text-tertiary);
+  cursor: pointer;
+  transition:
+    color var(--fn-transition-fast),
+    background var(--fn-transition-fast);
+
+  &:hover {
+    color: var(--fn-text-secondary);
+    background: var(--fn-bg-secondary);
+  }
+
+  &:focus-visible {
+    outline: 2px solid var(--fn-color-brand);
+    outline-offset: 2px;
+  }
+}
+
 .progress {
   padding: 2px 8px;
   border: 1px solid var(--fn-border-secondary);
diff --git a/dashboard/src/pages/Chat/components/AskQuestionCard.test.tsx b/dashboard/src/pages/Chat/components/AskQuestionCard.test.tsx
index a87bb33c..99f6e51d 100644
--- a/dashboard/src/pages/Chat/components/AskQuestionCard.test.tsx
+++ b/dashboard/src/pages/Chat/components/AskQuestionCard.test.tsx
@@ -79,6 +79,24 @@ describe("AskQuestionCard", () => {
     expect(screen.queryByText("chat.ask.other")).not.toBeInTheDocument();
   });
 
+  it("closes the card without answering", () => {
+    const onSubmit = vi.fn();
+    const onDismiss = vi.fn();
+    render(
+      <AskQuestionCard
+        questions={questions}
+        status="pending"
+        onSubmit={onSubmit}
+        onDismiss={onDismiss}
+      />,
+    );
+
+    fireEvent.click(screen.getByRole("button", { name: "chat.ask.dismiss" }));
+
+    expect(onDismiss).toHaveBeenCalledOnce();
+    expect(onSubmit).not.toHaveBeenCalled();
+  });
+
   it("collapses an answered question set in message history", () => {
     const { container } = render(
       <AskQuestionCard questions={questions} status="approved" />,
diff --git a/dashboard/src/pages/Chat/components/AskQuestionCard.tsx b/dashboard/src/pages/Chat/components/AskQuestionCard.tsx
index 19020530..1ec63f6b 100644
--- a/dashboard/src/pages/Chat/components/AskQuestionCard.tsx
+++ b/dashboard/src/pages/Chat/components/AskQuestionCard.tsx
@@ -1,5 +1,6 @@
 import { useState } from "react";
 import { Input } from "antd";
+import { X } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import type { AskQuestion } from "../../../api/types/hitl";
 import styles from "./AskQuestionCard.module.less";
@@ -15,6 +16,8 @@ export interface AskQuestionCardProps {
   questions: AskQuestion[];
   status: "pending" | "approved" | "rejected";
   onSubmit?: (message: string) => void;
+  /** Close the card without answering, ending the pause. */
+  onDismiss?: () => void;
 }
 
 /** What the user picked for one question. */
@@ -150,6 +153,7 @@ function AskQuestionCard({
   questions,
   status,
   onSubmit,
+  onDismiss,
 }: AskQuestionCardProps) {
   const { t } = useTranslation();
   const interactive = status === "pending" && Boolean(onSubmit);
@@ -233,8 +237,21 @@ function AskQuestionCard({
     <div className={styles.card}>
       <div className={styles.titleRow}>
         <span className={styles.title}>{t("chat.ask.title")}</span>
-        <span className={styles.progress}>
-          {reviewing ? t("chat.ask.reviewTag") : `${current + 1} / ${total}`}
+        <span className={styles.titleActions}>
+          <span className={styles.progress}>
+            {reviewing ? t("chat.ask.reviewTag") : `${current + 1} / ${total}`}
+          </span>
+          {onDismiss ? (
+            <button
+              type="button"
+              className={styles.closeButton}
+              onClick={onDismiss}
+              title={t("chat.ask.dismiss")}
+              aria-label={t("chat.ask.dismiss")}
+            >
+              <X size={15} />
+            </button>
+          ) : null}
         </span>
       </div>
 
diff --git a/dashboard/src/pages/Chat/components/AssistantTurnView.tsx b/dashboard/src/pages/Chat/components/AssistantTurnView.tsx
index d7014d1f..5422f5a5 100644
--- a/dashboard/src/pages/Chat/components/AssistantTurnView.tsx
+++ b/dashboard/src/pages/Chat/components/AssistantTurnView.tsx
@@ -165,7 +165,7 @@ export default function AssistantTurnView({
           idx === segmentProcess.length - 1 &&
           hitlLayout.trailingMessages.length === 0;
         return (
-          <div key={hitl.id}>
+          <div key={hitl.id} className={styles.hitlSegment}>
             {showProcess ? (
               <>
                 <TurnProcessBlocks
diff --git a/dashboard/src/pages/Chat/components/ChatDockPanel.tsx b/dashboard/src/pages/Chat/components/ChatDockPanel.tsx
index 135dab32..b383a9e0 100644
--- a/dashboard/src/pages/Chat/components/ChatDockPanel.tsx
+++ b/dashboard/src/pages/Chat/components/ChatDockPanel.tsx
@@ -24,6 +24,7 @@ import BrowserWorkspace, {
 } from "../../../components/BrowserWorkspace";
 import ChatDockPanelShell from "../../../components/BrowserWorkspace/ChatDockPanelShell";
 import type { DisplayEnvironment } from "../../../api/types/browser";
+import { useCurrentUser } from "../../../hooks/useCurrentUser";
 import { resolveBrowserProfile } from "../../../utils/browserProfile";
 import type { DockTab, DockTabId } from "../hooks/useChatDockPanel";
 import { dockFileBasename } from "../utils/dockFilePath";
@@ -79,6 +80,7 @@ const ChatDockPanel: React.FC<ChatDockPanelProps> = ({
   surfaceVisible = true,
 }) => {
   const { t } = useTranslation();
+  const currentUser = useCurrentUser();
   const [browserMounted, setBrowserMounted] = useState(
     openTabs.some((tab) => tab.kind === "browser"),
   );
@@ -171,7 +173,7 @@ const ChatDockPanel: React.FC<ChatDockPanelProps> = ({
     return handler;
   }, []);
 
-  const sessionId = resolveBrowserProfile();
+  const sessionId = resolveBrowserProfile(currentUser?.id);
   const activeTab =
     openTabs.find((tab) => tab.id === activeTabId) ?? openTabs[0] ?? null;
   const terminalVisible = surfaceVisible && activeTab?.kind === "terminal";
diff --git a/dashboard/src/pages/Chat/components/HitlApprovalCard.module.less b/dashboard/src/pages/Chat/components/HitlApprovalCard.module.less
new file mode 100644
index 00000000..b044734a
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/HitlApprovalCard.module.less
@@ -0,0 +1,198 @@
+.card {
+  border: 1px solid
+    color-mix(
+      in srgb,
+      var(--fn-color-warning, #d48806) 42%,
+      var(--fn-border-primary)
+    );
+  border-radius: var(--fn-radius-lg);
+  padding: 14px 16px;
+  background: color-mix(
+    in srgb,
+    var(--fn-color-warning, #d48806) 7%,
+    var(--fn-bg-primary)
+  );
+  box-shadow: var(--fn-shadow-xs);
+  box-sizing: border-box;
+  width: 100%;
+  max-width: var(--chat-column-max, 960px);
+}
+
+.titleRow {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin-bottom: 10px;
+}
+
+.iconWrap {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+  width: 28px;
+  height: 28px;
+  border-radius: var(--fn-radius-full);
+  color: var(--fn-color-warning, #d48806);
+  background: color-mix(
+    in srgb,
+    var(--fn-color-warning, #d48806) 16%,
+    transparent
+  );
+}
+
+.title {
+  font-weight: 600;
+  font-size: 14px;
+  color: var(--fn-text-primary);
+}
+
+.action + .action {
+  margin-top: 12px;
+  padding-top: 12px;
+  border-top: 1px solid var(--fn-border-secondary);
+}
+
+.toolName {
+  font-size: 13px;
+  font-weight: 600;
+  color: var(--fn-text-brand, var(--fn-color-brand));
+  margin-bottom: 4px;
+}
+
+.summary {
+  margin: 0 0 10px;
+  font-size: 14px;
+  line-height: 1.55;
+  color: var(--fn-text-primary);
+}
+
+.rows {
+  margin: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+}
+
+.row {
+  display: grid;
+  grid-template-columns: minmax(64px, 72px) minmax(0, 1fr);
+  gap: 10px;
+  align-items: start;
+  font-size: 13px;
+  line-height: 1.5;
+}
+
+.row dt {
+  margin: 0;
+  color: var(--fn-text-tertiary);
+  font-weight: 400;
+}
+
+.row dd {
+  margin: 0;
+  color: var(--fn-text-primary);
+  overflow-wrap: anywhere;
+  white-space: pre-wrap;
+}
+
+.mono {
+  font-family: var(
+    --fn-font-mono,
+    ui-monospace,
+    SFMono-Regular,
+    Menlo,
+    monospace
+  );
+  font-size: 12px;
+}
+
+.actions {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 8px;
+  margin-top: 6px;
+  padding-top: 12px;
+  border-top: 1px solid var(--fn-border-secondary);
+}
+
+.actionButton {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 68px;
+  height: 34px;
+  padding: 0 15px;
+  border: 1px solid transparent;
+  border-radius: var(--fn-radius-md);
+  font: inherit;
+  font-size: 13px;
+  font-weight: 500;
+  line-height: 1;
+  cursor: pointer;
+  transition:
+    color var(--fn-transition-fast),
+    background var(--fn-transition-fast),
+    border-color var(--fn-transition-fast),
+    box-shadow var(--fn-transition-fast),
+    transform var(--fn-transition-fast);
+
+  &:active:not(:disabled) {
+    transform: scale(0.97);
+  }
+
+  &:focus-visible {
+    outline: 2px solid var(--fn-color-brand);
+    outline-offset: 2px;
+  }
+}
+
+.primaryAction {
+  color: var(--fn-color-on-brand);
+  background: var(--fn-color-brand);
+  border-color: var(--fn-color-brand);
+  box-shadow: 0 1px 2px var(--fn-color-brand-shadow);
+
+  &:hover:not(:disabled) {
+    background: var(--fn-color-brand-hover);
+    border-color: var(--fn-color-brand-hover);
+    box-shadow: var(--fn-shadow-brand);
+  }
+}
+
+.dangerAction {
+  color: var(--fn-color-error, #cf1322);
+  background: var(--fn-bg-primary);
+  border-color: var(--fn-color-error-border, #ffa39e);
+
+  &:hover:not(:disabled) {
+    background: var(--fn-color-error-bg, #fff2f0);
+    border-color: var(--fn-color-error, #cf1322);
+  }
+}
+
+.resolved {
+  margin-top: 8px;
+  font-size: 13px;
+  font-weight: 500;
+}
+
+.approved {
+  color: var(--fn-color-success, #389e0d);
+}
+
+.rejected {
+  color: var(--fn-color-error, #cf1322);
+}
+
+@media (max-width: 767px) {
+  .card {
+    padding: 12px;
+  }
+
+  .row {
+    grid-template-columns: 1fr;
+    gap: 2px;
+  }
+}
diff --git a/dashboard/src/pages/Chat/components/HitlApprovalCard.test.tsx b/dashboard/src/pages/Chat/components/HitlApprovalCard.test.tsx
new file mode 100644
index 00000000..6d5e74ef
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/HitlApprovalCard.test.tsx
@@ -0,0 +1,58 @@
+import { fireEvent, render, screen } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+import HitlApprovalCard from "./HitlApprovalCard";
+
+describe("HitlApprovalCard", () => {
+  it("does not dump raw JSON arguments", () => {
+    render(
+      <HitlApprovalCard
+        actions={[
+          {
+            name: "browser_use",
+            args: { action: "dom_tree", level: "interactive" },
+          },
+        ]}
+        status="pending"
+        onDecision={vi.fn()}
+      />,
+    );
+
+    expect(
+      screen.getByText("Read the interactive structure of the current page"),
+    ).toBeInTheDocument();
+    expect(screen.queryByText(/"action"/)).not.toBeInTheDocument();
+    expect(screen.queryByText(/\{\s*"action"/)).not.toBeInTheDocument();
+    expect(document.querySelector("svg")).toBeTruthy();
+  });
+
+  it("approves and rejects through the decision callback", () => {
+    const onDecision = vi.fn();
+    render(
+      <HitlApprovalCard
+        actions={[{ name: "execute", args: { command: "ls" } }]}
+        status="pending"
+        onDecision={onDecision}
+      />,
+    );
+
+    fireEvent.click(screen.getByRole("button", { name: "Approve" }));
+    expect(onDecision).toHaveBeenCalledWith([{ type: "approve" }]);
+
+    fireEvent.click(screen.getByRole("button", { name: "Reject" }));
+    expect(onDecision).toHaveBeenCalledWith([
+      { type: "reject", message: "Rejected by user" },
+    ]);
+  });
+
+  it("does not treat a pending card without a callback as rejected", () => {
+    render(
+      <HitlApprovalCard
+        actions={[{ name: "execute", args: { command: "ls" } }]}
+        status="pending"
+      />,
+    );
+
+    expect(screen.queryByText("Rejected")).not.toBeInTheDocument();
+    expect(screen.queryByRole("button")).not.toBeInTheDocument();
+  });
+});
diff --git a/dashboard/src/pages/Chat/components/HitlApprovalCard.tsx b/dashboard/src/pages/Chat/components/HitlApprovalCard.tsx
new file mode 100644
index 00000000..04d87a69
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/HitlApprovalCard.tsx
@@ -0,0 +1,104 @@
+import { ShieldAlert } from "lucide-react";
+import { useTranslation } from "react-i18next";
+import type { HitlActionRequest } from "../../../api/types/hitl";
+import { useToolDisplayNames } from "../hooks/toolDisplayNames";
+import {
+  summarizeHitlAction,
+  type HitlTranslate,
+} from "../utils/summarizeHitlAction";
+import styles from "./HitlApprovalCard.module.less";
+
+export interface HitlApprovalCardProps {
+  actions: HitlActionRequest[];
+  status: "pending" | "approved" | "rejected";
+  onDecision?: (decisions: Array<{ type: string; message?: string }>) => void;
+}
+
+export default function HitlApprovalCard({
+  actions,
+  status,
+  onDecision,
+}: HitlApprovalCardProps) {
+  const { t } = useTranslation();
+  const toolLabelOf = useToolDisplayNames();
+  const interactive = status === "pending" && Boolean(onDecision);
+
+  return (
+    <div className={styles.card} role="status">
+      <div className={styles.titleRow}>
+        <span className={styles.iconWrap} aria-hidden="true">
+          <ShieldAlert size={18} strokeWidth={2} />
+        </span>
+        <div className={styles.title}>
+          {t("chat.hitl.title", "Confirm this action")}
+        </div>
+      </div>
+      {actions.map((action, idx) => {
+        const view = summarizeHitlAction(
+          action.name,
+          action.args,
+          t as HitlTranslate,
+          toolLabelOf(action.name),
+          action.description,
+        );
+        return (
+          <div key={`${action.name}-${idx}`} className={styles.action}>
+            <div className={styles.toolName}>{view.toolLabel}</div>
+            {view.summary && view.summary !== view.toolLabel ? (
+              <p className={styles.summary}>{view.summary}</p>
+            ) : null}
+            {view.rows.length > 0 ? (
+              <dl className={styles.rows}>
+                {view.rows.map((row, rowIdx) => (
+                  <div key={`${row.label}-${rowIdx}`} className={styles.row}>
+                    <dt>{row.label}</dt>
+                    <dd className={row.mono ? styles.mono : undefined}>
+                      {row.value}
+                    </dd>
+                  </div>
+                ))}
+              </dl>
+            ) : null}
+          </div>
+        );
+      })}
+      {interactive ? (
+        <div className={styles.actions}>
+          <button
+            type="button"
+            className={`${styles.actionButton} ${styles.primaryAction}`}
+            onClick={() =>
+              onDecision?.(actions.map(() => ({ type: "approve" })))
+            }
+          >
+            {t("chat.hitl.approve", "Approve")}
+          </button>
+          <button
+            type="button"
+            className={`${styles.actionButton} ${styles.dangerAction}`}
+            onClick={() =>
+              onDecision?.(
+                actions.map(() => ({
+                  type: "reject",
+                  message: t("chat.hitl.rejected", "Rejected by user"),
+                })),
+              )
+            }
+          >
+            {t("chat.hitl.reject", "Reject")}
+          </button>
+        </div>
+      ) : status !== "pending" ? (
+        <div
+          className={`${styles.resolved} ${
+            status === "approved" ? styles.approved : styles.rejected
+          }`}
+        >
+          {status === "approved"
+            ? t("chat.hitl.approved", "Approved")
+            : t("chat.hitl.rejectedLabel", "Rejected")}
+        </div>
+      ) : null}
+    </div>
+  );
+}
diff --git a/dashboard/src/pages/Chat/components/MessageBubble.tsx b/dashboard/src/pages/Chat/components/MessageBubble.tsx
index 0ce5a00e..76b12ece 100644
--- a/dashboard/src/pages/Chat/components/MessageBubble.tsx
+++ b/dashboard/src/pages/Chat/components/MessageBubble.tsx
@@ -1,5 +1,5 @@
 import { memo, useMemo, useState, useCallback, useRef, useEffect } from "react";
-import { Image, Button, Tooltip } from "antd";
+import { Image, Tooltip } from "antd";
 import { message as antMessage } from "@/utils/antdMessage";
 
 import Markdown from "../../../components/Markdown/LazyMarkdown";
@@ -39,6 +39,7 @@ import {
 } from "../../../utils/chatStreamError";
 import { MessageFileCard } from "./MessageFileCard";
 import AskQuestionCard from "./AskQuestionCard";
+import HitlApprovalCard from "./HitlApprovalCard";
 import { extractAskQuestions, isAskHitl } from "../../../api/types/hitl";
 import styles from "../index.module.less";
 import {
@@ -616,58 +617,11 @@ function MessageBubble({
           compact ? styles.compact : ""
         }`}
       >
-        <div className={styles.hitlCard}>
-          <div className={styles.hitlTitle}>
-            {t("chat.hitl.title", "Tool approval required")}
-          </div>
-          {actions.map((action, idx) => (
-            <div key={`${action.name}-${idx}`} className={styles.hitlAction}>
-              <code>{action.name}</code>
-              {action.args && Object.keys(action.args).length > 0 && (
-                <pre className={styles.inlineToolCode}>
-                  {JSON.stringify(action.args, null, 2)}
-                </pre>
-              )}
-            </div>
-          ))}
-          {hitlStatus === "pending" && onHitlDecision ? (
-            <div className={styles.acpPermissionActions}>
-              <Button
-                type="primary"
-                onClick={() =>
-                  onHitlDecision(actions.map(() => ({ type: "approve" })))
-                }
-              >
-                {t("chat.hitl.approve", "Approve")}
-              </Button>
-              <Button
-                danger
-                onClick={() =>
-                  onHitlDecision(
-                    actions.map(() => ({
-                      type: "reject",
-                      message: t("chat.hitl.rejected", "Rejected by user"),
-                    })),
-                  )
-                }
-              >
-                {t("chat.hitl.reject", "Reject")}
-              </Button>
-            </div>
-          ) : hitlStatus !== "pending" ? (
-            <div
-              className={`${styles.hitlResolved} ${
-                hitlStatus === "approved"
-                  ? styles.hitlResolvedApproved
-                  : styles.hitlResolvedRejected
-              }`}
-            >
-              {hitlStatus === "approved"
-                ? t("chat.hitl.approved", "Approved")
-                : t("chat.hitl.rejectedLabel", "Rejected")}
-            </div>
-          ) : null}
-        </div>
+        <HitlApprovalCard
+          actions={actions}
+          status={hitlStatus}
+          onDecision={onHitlDecision}
+        />
       </div>
     );
   }
diff --git a/dashboard/src/pages/Chat/components/MessageList.tsx b/dashboard/src/pages/Chat/components/MessageList.tsx
index 750dc493..dd70414b 100644
--- a/dashboard/src/pages/Chat/components/MessageList.tsx
+++ b/dashboard/src/pages/Chat/components/MessageList.tsx
@@ -18,6 +18,7 @@ import MessageBubble from "./MessageBubble";
 import AssistantTurnView from "./AssistantTurnView";
 import ScrollToBottomButton from "./ScrollToBottomButton";
 import GeneratingIndicator from "./GeneratingIndicator";
+import TurnTimelineRail from "./TurnTimelineRail";
 import { isLiveAssistantTurn } from "./liveAssistantTurn";
 import { chatGeneratingPhase } from "./generatingGate";
 import { useAutoScroll } from "../hooks/useAutoScroll";
@@ -109,6 +110,8 @@ interface MessageListProps {
   shellCommandDisabled?: boolean;
   shellCommandDisabledTitle?: string;
   compactProcess?: boolean;
+  /** Notify chat chrome when the in-thread turn rail is shown (for gutter align). */
+  onTurnRailVisibilityChange?: (visible: boolean) => void;
 }
 
 interface GroupRenderContext {
@@ -157,6 +160,8 @@ function renderMessageGroup(
     if (msg.role === "assistant") {
       return (
         <div
+          data-message-id={msg.id}
+          data-role="assistant"
           ref={(el) => {
             ctx.registerBubbleRef(msg.id, el);
           }}
@@ -184,6 +189,8 @@ function renderMessageGroup(
     }
     return (
       <div
+        data-message-id={msg.id}
+        data-role={msg.role}
         ref={(el) => {
           ctx.registerBubbleRef(msg.id, el);
         }}
@@ -203,6 +210,8 @@ function renderMessageGroup(
   return (
     <div
       key={groupKey}
+      data-message-id={group.messages[0]?.id}
+      data-role="assistant"
       ref={(el) => {
         for (const msg of group.messages) {
           ctx.registerBubbleRef(msg.id, el);
@@ -259,10 +268,12 @@ export default function MessageList(props: MessageListProps) {
     shellCommandDisabled,
     shellCommandDisabledTitle,
     compactProcess,
+    onTurnRailVisibilityChange,
   } = props;
 
   const { t } = useTranslation();
   const virtuosoRef = useRef<VirtuosoHandle | null>(null);
+  const wrapperRef = useRef<HTMLDivElement | null>(null);
   const containerRef = useRef<HTMLDivElement | null>(null);
   const scrollerRef = useRef<HTMLElement | null>(null);
   const endRef = useRef<HTMLDivElement | null>(null);
@@ -766,7 +777,22 @@ export default function MessageList(props: MessageListProps) {
   }
 
   return (
-    <div className={styles.messageListWrapper}>
+    <div ref={wrapperRef} className={styles.messageListWrapper}>
+      <TurnTimelineRail
+        messages={messages}
+        messageGroups={messageGroups}
+        isStreaming={isStreaming}
+        following={!showScrollBtn}
+        useVirtual={useVirtual}
+        firstItemIndex={firstItemIndex}
+        scrollerRef={scrollerRef}
+        containerRef={containerRef}
+        virtuosoRef={virtuosoRef}
+        bubbleRefsMap={bubbleRefsMap}
+        wrapperRef={wrapperRef}
+        armProgrammaticGuard={armProgrammaticGuard}
+        onVisibilityChange={onTurnRailVisibilityChange}
+      />
       {useVirtual ? (
         <Virtuoso
           key={stableSessionKey}
diff --git a/dashboard/src/pages/Chat/components/TrajectoryDrawer.module.less b/dashboard/src/pages/Chat/components/TrajectoryDrawer.module.less
new file mode 100644
index 00000000..5b337976
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/TrajectoryDrawer.module.less
@@ -0,0 +1,143 @@
+.drawerTitleRow {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+  padding-right: 8px;
+  min-width: 0;
+  width: 100%;
+}
+
+.drawerTitleText {
+  flex: 1;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-weight: 600;
+}
+
+.drawerTitleActions {
+  flex-shrink: 0;
+
+  :global(.octop-btn),
+  :global(.ant-btn) {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+  }
+}
+
+.body {
+  flex: 1;
+  min-height: 0;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  background: var(--fn-bg-primary);
+  padding: 8px 16px 10px;
+  box-sizing: border-box;
+  gap: 6px;
+}
+
+.split {
+  flex: 1;
+  min-height: 0;
+  display: flex;
+  gap: 0;
+  border-top: 1px solid var(--fn-border-secondary, rgba(0, 0, 0, 0.06));
+}
+
+.splitMobile {
+  flex-direction: column;
+}
+
+.ledgerPane,
+.inspectorPane {
+  min-width: 0;
+  min-height: 0;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+
+.ledgerPane {
+  flex: 1;
+}
+
+.inspectorPane {
+  flex: 0 0 38%;
+  max-width: 40%;
+  border-left: 1px solid var(--fn-border-secondary, rgba(0, 0, 0, 0.08));
+  padding: 8px 0 0 12px;
+
+  > * {
+    flex: 1;
+    min-height: 0;
+  }
+}
+
+.splitMobile .inspectorPane {
+  flex: 0 0 auto;
+  max-width: none;
+  border-left: none;
+  border-top: 1px solid var(--fn-border-secondary, rgba(0, 0, 0, 0.08));
+  padding-left: 0;
+  padding-top: 8px;
+}
+
+.status {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  min-height: 0;
+  padding: 24px;
+}
+
+.errorText {
+  margin: 0;
+  font-size: 13px;
+  color: var(--fn-text-secondary);
+  text-align: center;
+}
+
+.retry {
+  border: none;
+  background: transparent;
+  padding: 0;
+  font: inherit;
+  font-size: 13px;
+  color: var(--fn-color-brand, var(--fn-text-brand));
+  cursor: pointer;
+
+  &:hover {
+    text-decoration: underline;
+  }
+
+  &:focus-visible {
+    outline: 2px solid var(--fn-color-brand);
+    outline-offset: 2px;
+  }
+}
+
+@media (max-width: 767px) {
+  .drawerTitleRow {
+    gap: 4px;
+    padding-right: 0;
+  }
+
+  .drawerTitleActions {
+    :global(.octop-btn),
+    :global(.ant-btn) {
+      min-width: 32px;
+      padding-inline: 8px;
+    }
+  }
+
+  .body {
+    padding: 10px 12px;
+  }
+}
diff --git a/dashboard/src/pages/Chat/components/TrajectoryDrawer.test.tsx b/dashboard/src/pages/Chat/components/TrajectoryDrawer.test.tsx
new file mode 100644
index 00000000..8c29f8d2
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/TrajectoryDrawer.test.tsx
@@ -0,0 +1,348 @@
+import {
+  act,
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+} from "@testing-library/react";
+import type { ReactElement } from "react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { TrajectoryEvent } from "../../../api/modules/trajectory";
+
+const { session, useTrajectorySession, messageError } = vi.hoisted(() => {
+  const session = {
+    events: [] as TrajectoryEvent[],
+    metrics: null,
+    loading: false,
+    error: false,
+    hasMore: false,
+    retry: vi.fn(),
+    loadEarlier: vi.fn(async () => {}),
+    refresh: vi.fn(),
+  };
+  return {
+    session,
+    useTrajectorySession: vi.fn(() => session),
+    messageError: vi.fn(),
+  };
+});
+
+const exportMock = vi.fn();
+
+vi.mock("../hooks/useTrajectorySession", () => ({
+  useTrajectorySession: (...args: unknown[]) => useTrajectorySession(...args),
+}));
+
+vi.mock("../../../hooks/useIsMobile", () => ({
+  useIsMobile: () => false,
+}));
+
+vi.mock("@/utils/antdMessage", () => ({
+  message: { error: (...args: unknown[]) => messageError(...args) },
+}));
+
+vi.mock("../../../api/modules/trajectory", async (importOriginal) => {
+  const actual = await importOriginal<
+    typeof import("../../../api/modules/trajectory")
+  >();
+  return {
+    ...actual,
+    trajectoryApi: {
+      ...actual.trajectoryApi,
+      export: (...args: unknown[]) => exportMock(...args),
+    },
+  };
+});
+
+import TrajectoryDrawer from "./TrajectoryDrawer";
+
+function event(
+  overrides: Partial<TrajectoryEvent> &
+    Pick<TrajectoryEvent, "event_id" | "kind">,
+): TrajectoryEvent {
+  return {
+    thread_id: "T1",
+    agent_id: "A1",
+    seq: 1,
+    ts: 1,
+    turn_id: null,
+    request_seq: null,
+    is_error: false,
+    summary: "",
+    payload: {},
+    ...overrides,
+  };
+}
+
+const sampleEvents: TrajectoryEvent[] = [
+  event({
+    event_id: "u1",
+    kind: "user",
+    seq: 1,
+    turn_id: "turn-a",
+    summary: "hello",
+  }),
+  event({
+    event_id: "a1",
+    kind: "assistant",
+    seq: 2,
+    turn_id: "turn-a",
+    request_seq: 1,
+    summary: "thinking",
+  }),
+  event({
+    event_id: "t1",
+    kind: "tool",
+    seq: 3,
+    turn_id: "turn-a",
+    summary: "open a.py",
+    payload: { name: "read_file", args: { path: "a.py" }, result: "ok" },
+  }),
+  event({
+    event_id: "t2",
+    kind: "tool",
+    seq: 4,
+    turn_id: "turn-b",
+    summary: "save a.py",
+    payload: { name: "write_file", args: { path: "a.py" }, result: "saved" },
+  }),
+];
+
+async function renderDrawer(ui: ReactElement) {
+  const view = render(ui);
+  await act(async () => {
+    await Promise.resolve();
+  });
+  return view;
+}
+
+describe("TrajectoryDrawer", () => {
+  beforeEach(() => {
+    session.events = sampleEvents;
+    session.loading = false;
+    session.error = false;
+    session.hasMore = false;
+    session.retry.mockReset();
+    session.loadEarlier.mockReset();
+    session.refresh.mockReset();
+    useTrajectorySession.mockClear();
+    exportMock.mockReset();
+    messageError.mockReset();
+  });
+
+  it("renders the drawer title, Duration toggle, and timeline when open", async () => {
+    await renderDrawer(
+      <TrajectoryDrawer agentId="A1" threadId="T1" open onClose={() => {}} />,
+    );
+
+    expect(useTrajectorySession).toHaveBeenCalledWith({
+      agentId: "A1",
+      threadId: "T1",
+      visible: true,
+    });
+    expect(screen.getByText("Trajectory")).toBeInTheDocument();
+    expect(
+      screen.getByRole("button", { name: "Duration" }),
+    ).toBeInTheDocument();
+    expect(
+      screen.getByRole("group", { name: "Trajectory timeline" }),
+    ).toBeInTheDocument();
+  });
+
+  it("dims ledger search misses and collapses turns or consecutive calls", async () => {
+    await renderDrawer(
+      <TrajectoryDrawer agentId="A1" threadId="T1" open onClose={() => {}} />,
+    );
+
+    expect(screen.getByText("hello")).toBeInTheDocument();
+    expect(screen.getByText("Request #1")).toBeInTheDocument();
+    expect(screen.getByText("read_file")).toBeInTheDocument();
+    expect(screen.getByText("write_file")).toBeInTheDocument();
+
+    fireEvent.change(screen.getByRole("searchbox"), {
+      target: { value: "read_file" },
+    });
+    const readRow = screen
+      .getAllByText("read_file")
+      .map((node) => node.closest("tr"))
+      .find((node): node is HTMLTableRowElement => node != null);
+    const writeRow = screen
+      .getAllByText("write_file")
+      .map((node) => node.closest("tr"))
+      .find((node): node is HTMLTableRowElement => node != null);
+    expect(readRow).toHaveAttribute("data-search-match", "true");
+    expect(writeRow).toHaveAttribute("data-search-match", "false");
+
+    fireEvent.change(screen.getByRole("searchbox"), { target: { value: "" } });
+
+    fireEvent.click(screen.getByRole("button", { name: "Turns" }));
+    expect(screen.getByText("hello")).toBeInTheDocument();
+    expect(screen.queryByText("Request #1")).not.toBeInTheDocument();
+    expect(screen.queryByText("read_file")).not.toBeInTheDocument();
+    expect(screen.getByText("write_file")).toBeInTheDocument();
+
+    fireEvent.click(screen.getByRole("button", { name: "Turns" }));
+    fireEvent.click(screen.getByRole("button", { name: "Calls" }));
+    expect(screen.getByText("hello")).toBeInTheDocument();
+    expect(screen.getByText("Request #1")).toBeInTheDocument();
+    expect(document.querySelectorAll('tr[data-kind="tool"]')).toHaveLength(0);
+    expect(
+      document.querySelectorAll('tr[data-kind="collapsed-summary"]'),
+    ).toHaveLength(1);
+    expect(
+      screen.getByText(/2 tool calls · read_file, write_file/),
+    ).toBeInTheDocument();
+  });
+
+  it("dims timeline search hits from the full event list while calls are collapsed", async () => {
+    await renderDrawer(
+      <TrajectoryDrawer agentId="A1" threadId="T1" open onClose={() => {}} />,
+    );
+
+    fireEvent.click(screen.getByRole("button", { name: "Calls" }));
+    expect(document.querySelectorAll('tr[data-kind="tool"]')).toHaveLength(0);
+
+    fireEvent.change(screen.getByRole("searchbox"), {
+      target: { value: "read_file" },
+    });
+
+    expect(document.querySelector('[data-event-ids="t1"]')).toHaveAttribute(
+      "data-search-match",
+      "true",
+    );
+    expect(document.querySelector('[data-event-ids="u1"]')).toHaveAttribute(
+      "data-search-match",
+      "false",
+    );
+  });
+
+  it("keeps the inspector visible and shows a placeholder until a record is selected", async () => {
+    await renderDrawer(
+      <TrajectoryDrawer agentId="A1" threadId="T1" open onClose={() => {}} />,
+    );
+
+    expect(screen.getByTestId("trajectory-inspector-pane")).toBeInTheDocument();
+    expect(screen.getByText("Select a record")).toBeInTheDocument();
+
+    fireEvent.click(screen.getByRole("button", { name: /hello/ }));
+    expect(screen.queryByText("Select a record")).not.toBeInTheDocument();
+    expect(screen.getByText("Kind")).toBeInTheDocument();
+  });
+
+  it("switches timeline duration mode from the toolbar", async () => {
+    session.events = [
+      event({
+        event_id: "a",
+        kind: "assistant",
+        payload: { llm_duration_ms: 100 },
+      }),
+      event({
+        event_id: "t",
+        kind: "tool",
+        payload: { name: "read_file", tool_duration_ms: 50 },
+      }),
+    ];
+    await renderDrawer(
+      <TrajectoryDrawer agentId="A1" threadId="T1" open onClose={() => {}} />,
+    );
+
+    expect(screen.getByRole("button", { name: /Model/ })).toHaveAttribute(
+      "data-end",
+      "1",
+    );
+
+    fireEvent.click(screen.getByRole("button", { name: "Duration" }));
+    expect(screen.getByRole("button", { name: /Model/ })).toHaveAttribute(
+      "data-end",
+      "100",
+    );
+    expect(screen.getByRole("button", { name: /Tools/ })).toHaveAttribute(
+      "data-end",
+      "150",
+    );
+  });
+
+  it("wires loadEarlier to the timeline earlier-history control", async () => {
+    session.hasMore = true;
+    await renderDrawer(
+      <TrajectoryDrawer agentId="A1" threadId="T1" open onClose={() => {}} />,
+    );
+
+    await act(async () => {
+      fireEvent.click(
+        screen.getByRole("button", { name: "Load earlier history" }),
+      );
+    });
+    expect(session.loadEarlier).toHaveBeenCalled();
+  });
+
+  it("exports from the drawer header only", async () => {
+    const blob = new Blob(["{}\n"], { type: "application/x-ndjson" });
+    exportMock.mockResolvedValue(blob);
+    const createObjectURL = vi.fn(() => "blob:trajectory-export");
+    URL.createObjectURL = createObjectURL;
+    URL.revokeObjectURL = vi.fn();
+    const click = vi
+      .spyOn(HTMLAnchorElement.prototype, "click")
+      .mockImplementation(() => {});
+
+    await renderDrawer(
+      <TrajectoryDrawer agentId="A1" threadId="T1" open onClose={() => {}} />,
+    );
+
+    expect(screen.getAllByRole("button", { name: "Export" })).toHaveLength(1);
+    fireEvent.click(screen.getByRole("button", { name: "Export" }));
+
+    await waitFor(() => {
+      expect(exportMock).toHaveBeenCalledWith("A1", "T1");
+      expect(createObjectURL).toHaveBeenCalledWith(blob);
+      expect(click).toHaveBeenCalled();
+    });
+    expect(messageError).not.toHaveBeenCalled();
+  });
+
+  it("toasts when export fails", async () => {
+    exportMock.mockRejectedValue(new Error("export failed"));
+
+    await renderDrawer(
+      <TrajectoryDrawer agentId="A1" threadId="T1" open onClose={() => {}} />,
+    );
+
+    fireEvent.click(screen.getByRole("button", { name: "Export" }));
+
+    await waitFor(() => {
+      expect(messageError).toHaveBeenCalledWith("Failed to export trajectory");
+    });
+  });
+
+  it("shows empty, loading, and error+retry inside the body", async () => {
+    session.events = [];
+    const view = await renderDrawer(
+      <TrajectoryDrawer agentId="A1" threadId={null} open onClose={() => {}} />,
+    );
+    expect(
+      screen.getByText("Select a session to view trajectory"),
+    ).toBeInTheDocument();
+
+    session.loading = true;
+    view.rerender(
+      <TrajectoryDrawer agentId="A1" threadId="T1" open onClose={() => {}} />,
+    );
+    await act(async () => {
+      await Promise.resolve();
+    });
+    expect(document.querySelector(".ant-spin")).not.toBeNull();
+
+    session.loading = false;
+    session.error = true;
+    view.rerender(
+      <TrajectoryDrawer agentId="A1" threadId="T1" open onClose={() => {}} />,
+    );
+    await act(async () => {
+      await Promise.resolve();
+    });
+    expect(screen.getByText("Failed to load trajectory")).toBeInTheDocument();
+    fireEvent.click(screen.getByRole("button", { name: "Retry" }));
+    expect(session.retry).toHaveBeenCalled();
+  });
+});
diff --git a/dashboard/src/pages/Chat/components/TrajectoryDrawer.tsx b/dashboard/src/pages/Chat/components/TrajectoryDrawer.tsx
new file mode 100644
index 00000000..f0a5cee5
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/TrajectoryDrawer.tsx
@@ -0,0 +1,329 @@
+import { Button, Drawer, Empty, Space, Spin } from "antd";
+import { Download, RefreshCw } from "lucide-react";
+import { useEffect, useMemo, useState, type ReactNode } from "react";
+import { useTranslation } from "react-i18next";
+import { message } from "@/utils/antdMessage";
+import { trajectoryApi } from "../../../api/modules/trajectory";
+import { useIsMobile } from "../../../hooks/useIsMobile";
+import { useTrajectorySession } from "../hooks/useTrajectorySession";
+import {
+  collapseCallRows,
+  collapseTurnRows,
+  collapsibleAssistantIds,
+  ensureToolCallParents,
+  filterRows,
+  toLedgerRow,
+} from "../utils/trajectoryModel";
+import {
+  deriveSwimlaneSpans,
+  trajectoryFocusEventIds,
+  type TrajectoryTimeRange,
+} from "../utils/trajectoryTimeline";
+import styles from "./TrajectoryDrawer.module.less";
+import TrajectoryInspector from "./TrajectoryInspector";
+import TrajectoryLedger from "./TrajectoryLedger";
+import TrajectoryMetricsBar from "./TrajectoryMetricsBar";
+import TrajectoryTimeline from "./TrajectoryTimeline";
+import TrajectoryToolbar from "./TrajectoryToolbar";
+
+export interface TrajectoryDrawerProps {
+  agentId: string;
+  threadId: string | null;
+  open: boolean;
+  onClose: () => void;
+}
+
+const EMPTY_IDS = new Set<string>();
+
+export default function TrajectoryDrawer({
+  agentId,
+  threadId,
+  open,
+  onClose,
+}: TrajectoryDrawerProps) {
+  const { t } = useTranslation();
+  const isMobile = useIsMobile();
+  const {
+    events,
+    metrics,
+    loading,
+    error,
+    retry,
+    hasMore,
+    loadEarlier,
+    refresh,
+  } = useTrajectorySession({
+    agentId,
+    threadId,
+    visible: open,
+  });
+  const [durationOn, setDurationOn] = useState(false);
+  const [collapseTurn, setCollapseTurn] = useState(false);
+  const [collapsedAssistants, setCollapsedAssistants] =
+    useState<ReadonlySet<string>>(EMPTY_IDS);
+  const [query, setQuery] = useState("");
+  const [range, setRange] = useState<TrajectoryTimeRange | null>(null);
+  const [selectedEventId, setSelectedEventId] = useState<string | null>(null);
+
+  useEffect(() => {
+    setRange(null);
+    setSelectedEventId(null);
+    setQuery("");
+    setCollapseTurn(false);
+    setCollapsedAssistants(EMPTY_IDS);
+    setDurationOn(false);
+  }, [agentId, threadId]);
+
+  const mode = durationOn ? "duration" : "sequence";
+  const toolCallOnlyLabel = t(
+    "chat.trajectoryToolCallOnly",
+    "(tool call only)",
+  );
+  const formatCallSummary = (count: number, names: readonly string[]) => {
+    const namesJoined = names.join(", ");
+    if (count === 1) {
+      return t(
+        "chat.trajectoryCollapsedToolCallOne",
+        "{{count}} tool call · {{names}}",
+        { count, names: namesJoined },
+      );
+    }
+    return t(
+      "chat.trajectoryCollapsedToolCallMany",
+      "{{count}} tool calls · {{names}}",
+      { count, names: namesJoined },
+    );
+  };
+  const formatTurnSummary = (steps: number, toolCalls: number) =>
+    t(
+      "chat.trajectoryCollapsedTurn",
+      "{{steps}} steps · {{toolCalls}} tool calls",
+      { steps, toolCalls },
+    );
+
+  const displayEvents = useMemo(
+    () => ensureToolCallParents(events, toolCallOnlyLabel),
+    [events, toolCallOnlyLabel],
+  );
+  const assistantIdsWithTools = useMemo(
+    () => collapsibleAssistantIds(displayEvents),
+    [displayEvents],
+  );
+  const allCallsCollapsed =
+    assistantIdsWithTools.length > 0 &&
+    assistantIdsWithTools.every((id) => collapsedAssistants.has(id));
+
+  const ledgerEvents = useMemo(() => {
+    let rows = displayEvents;
+    if (collapseTurn) {
+      rows = collapseTurnRows(rows, formatTurnSummary);
+    }
+    if (collapsedAssistants.size > 0) {
+      rows = collapseCallRows(rows, formatCallSummary, collapsedAssistants);
+    }
+    return rows;
+  }, [displayEvents, collapseTurn, collapsedAssistants, t]);
+
+  const searchMatchIds = useMemo(() => {
+    if (!query.trim()) return null;
+    return new Set(
+      filterRows(displayEvents.map(toLedgerRow), query).map((row) => row.id),
+    );
+  }, [displayEvents, query]);
+  const focusEventIds = useMemo(() => {
+    if (range == null) return null;
+    return trajectoryFocusEventIds(
+      deriveSwimlaneSpans(displayEvents, mode),
+      range,
+    );
+  }, [displayEvents, mode, range]);
+  const selectedEvent =
+    displayEvents.find((event) => event.event_id === selectedEventId) ?? null;
+
+  const toggleAllCalls = () => {
+    setCollapsedAssistants(() => {
+      if (allCallsCollapsed) return EMPTY_IDS;
+      return new Set(assistantIdsWithTools);
+    });
+  };
+
+  const onExpandCollapsed = (
+    parentEventId: string,
+    kind: "assistant" | "turn",
+  ) => {
+    if (kind === "turn") {
+      setCollapseTurn(false);
+      return;
+    }
+    setCollapsedAssistants((current) => {
+      if (!current.has(parentEventId)) return current;
+      const next = new Set(current);
+      next.delete(parentEventId);
+      return next.size === 0 ? EMPTY_IDS : next;
+    });
+  };
+
+  const onExport = () => {
+    if (!threadId) return;
+    void (async () => {
+      try {
+        const blob = await trajectoryApi.export(agentId, threadId);
+        const url = URL.createObjectURL(blob);
+        const link = document.createElement("a");
+        link.href = url;
+        link.download = `trajectory-${threadId}.jsonl`;
+        link.click();
+        URL.revokeObjectURL(url);
+      } catch {
+        message.error(
+          t("chat.trajectoryExportFailed", "Failed to export trajectory"),
+        );
+      }
+    })();
+  };
+
+  const drawerTitle = (
+    <div className={styles.drawerTitleRow}>
+      <span className={styles.drawerTitleText}>
+        {t("chat.trajectoryTitle", "Trajectory")}
+      </span>
+      <Space size={isMobile ? 4 : 8} className={styles.drawerTitleActions}>
+        <Button
+          size="small"
+          icon={<RefreshCw size={13} />}
+          onClick={() => refresh()}
+          aria-label={t("common.refresh", "Refresh")}
+        >
+          {isMobile ? null : t("common.refresh", "Refresh")}
+        </Button>
+        <Button
+          size="small"
+          icon={<Download size={13} />}
+          disabled={!threadId}
+          onClick={() => void onExport()}
+          aria-label={t("chat.trajectoryExport", "Export")}
+        >
+          {isMobile ? null : t("chat.trajectoryExport", "Export")}
+        </Button>
+      </Space>
+    </div>
+  );
+
+  let body: ReactNode;
+  if (!threadId) {
+    body = (
+      <div className={styles.status}>
+        <Empty
+          image={Empty.PRESENTED_IMAGE_SIMPLE}
+          description={t(
+            "chat.trajectorySelectSession",
+            "Select a session to view trajectory",
+          )}
+        />
+      </div>
+    );
+  } else if (loading && events.length === 0) {
+    body = (
+      <div className={styles.status}>
+        <Spin size="small" />
+      </div>
+    );
+  } else if (error && events.length === 0) {
+    body = (
+      <div className={styles.status}>
+        <p className={styles.errorText}>
+          {t("chat.trajectoryLoadError", "Failed to load trajectory")}
+        </p>
+        <button type="button" className={styles.retry} onClick={retry}>
+          {t("chat.retry", "Retry")}
+        </button>
+      </div>
+    );
+  } else if (events.length === 0) {
+    body = (
+      <div className={styles.status}>
+        <Empty
+          image={Empty.PRESENTED_IMAGE_SIMPLE}
+          description={t("chat.trajectoryEmpty", "No trajectory events yet")}
+        />
+      </div>
+    );
+  } else {
+    body = (
+      <>
+        <TrajectoryToolbar
+          durationOn={durationOn}
+          onDurationOnChange={setDurationOn}
+          allTurnsCollapsed={collapseTurn}
+          onToggleAllTurns={() => setCollapseTurn((value) => !value)}
+          allCallsCollapsed={allCallsCollapsed}
+          onToggleAllCalls={toggleAllCalls}
+          searchQuery={query}
+          onSearchQueryChange={setQuery}
+        />
+        <TrajectoryTimeline
+          events={displayEvents}
+          mode={mode}
+          range={range}
+          onRangeChange={setRange}
+          selectedEventId={selectedEventId}
+          searchMatchIds={searchMatchIds}
+          hasEarlier={hasMore}
+          onLoadEarlier={loadEarlier}
+          onRecordSelect={setSelectedEventId}
+        />
+        <div
+          className={`${styles.split} ${isMobile ? styles.splitMobile : ""}`}
+        >
+          <div className={styles.ledgerPane}>
+            <TrajectoryLedger
+              events={ledgerEvents}
+              selectedEventId={selectedEventId}
+              onSelect={setSelectedEventId}
+              onExpandCollapsed={onExpandCollapsed}
+              focusEventIds={focusEventIds}
+              searchMatchIds={searchMatchIds}
+            />
+          </div>
+          <div
+            className={styles.inspectorPane}
+            data-testid="trajectory-inspector-pane"
+          >
+            <TrajectoryInspector
+              agentId={agentId}
+              threadId={threadId}
+              event={selectedEvent}
+              events={displayEvents}
+              onSelectEvent={setSelectedEventId}
+            />
+          </div>
+        </div>
+        <TrajectoryMetricsBar
+          agentId={agentId}
+          threadId={threadId}
+          metrics={metrics}
+        />
+      </>
+    );
+  }
+
+  return (
+    <Drawer
+      title={drawerTitle}
+      open={open}
+      onClose={onClose}
+      width={isMobile ? "100%" : "80vw"}
+      destroyOnHidden
+      styles={{
+        body: {
+          padding: 0,
+          display: "flex",
+          flexDirection: "column",
+          overflow: "hidden",
+        },
+      }}
+    >
+      <div className={styles.body}>{body}</div>
+    </Drawer>
+  );
+}
diff --git a/dashboard/src/pages/Chat/components/TrajectoryInspector.module.less b/dashboard/src/pages/Chat/components/TrajectoryInspector.module.less
new file mode 100644
index 00000000..39066113
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/TrajectoryInspector.module.less
@@ -0,0 +1,292 @@
+.root {
+  flex: 1;
+  min-height: 0;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+
+  :global(.ant-tabs),
+  :global(.octop-tabs) {
+    flex: 1 1 0% !important;
+    min-height: 0;
+    height: 100%;
+    display: flex !important;
+    flex-direction: column;
+  }
+
+  :global(.ant-tabs-nav),
+  :global(.octop-tabs-nav) {
+    flex: none;
+    margin-bottom: 8px !important;
+  }
+
+  :global(.ant-tabs-content-holder),
+  :global(.octop-tabs-content-holder) {
+    flex: 1 1 0% !important;
+    min-height: 0 !important;
+    overflow: hidden !important;
+  }
+
+  :global(.ant-tabs-content),
+  :global(.octop-tabs-content) {
+    height: 100% !important;
+  }
+
+  :global(.ant-tabs-tabpane),
+  :global(.octop-tabs-tabpane) {
+    height: 100%;
+    overflow: hidden;
+  }
+
+  :global(.ant-tabs-tabpane-active),
+  :global(.octop-tabs-tabpane-active) {
+    display: flex !important;
+    flex-direction: column;
+    height: 100% !important;
+  }
+}
+
+.header {
+  flex: none;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+  min-width: 0;
+  padding: 0 0 8px;
+  border-bottom: 1px solid var(--fn-border-secondary, rgba(0, 0, 0, 0.06));
+  margin-bottom: 4px;
+}
+
+.headerTitle {
+  display: flex;
+  align-items: baseline;
+  gap: 8px;
+  min-width: 0;
+}
+
+.headerKind {
+  flex: none;
+  font-size: 12px;
+  font-weight: 650;
+  letter-spacing: 0.03em;
+  color: var(--fn-text-primary);
+
+  &[data-kind="tool"] {
+    color: var(--fn-color-warning, #d48806);
+  }
+
+  &[data-kind="assistant"],
+  &[data-kind="compacted"] {
+    color: color-mix(in srgb, #a855f7 55%, #e11d48);
+  }
+
+  &[data-kind="user"] {
+    color: color-mix(
+      in srgb,
+      var(--fn-color-success, #389e0d) 72%,
+      var(--fn-text-secondary, #595959)
+    );
+  }
+
+  &[data-kind="context"] {
+    color: color-mix(in srgb, #0891b2 78%, var(--fn-text-secondary, #595959));
+  }
+}
+
+.headerLocation {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-family: var(
+    --fn-font-mono,
+    ui-monospace,
+    SFMono-Regular,
+    Menlo,
+    monospace
+  );
+  font-size: 11px;
+  color: var(--fn-text-tertiary, var(--fn-text-secondary));
+}
+
+.tabs {
+  flex: 1;
+  min-height: 0;
+}
+
+.placeholder {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 16px 12px;
+  font-size: 13px;
+  color: var(--fn-text-secondary);
+  text-align: center;
+}
+
+.summary {
+  margin: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  padding: 4px 4px 0 0;
+}
+
+.summaryScroll {
+  flex: 1;
+  min-height: 0;
+  overflow: auto;
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  padding-right: 2px;
+}
+
+.section {
+  margin: 0;
+  border-top: 1px solid var(--fn-border-secondary, rgba(0, 0, 0, 0.06));
+  padding-top: 8px;
+}
+
+.sectionSummary {
+  cursor: pointer;
+  list-style: none;
+  font-size: 12px;
+  font-weight: 600;
+  color: var(--fn-text-secondary);
+  user-select: none;
+  margin-bottom: 8px;
+
+  &::-webkit-details-marker {
+    display: none;
+  }
+
+  &::before {
+    content: "▸";
+    display: inline-block;
+    margin-right: 6px;
+    color: var(--fn-text-tertiary, #8b8b8b);
+    transition: transform 120ms ease;
+  }
+}
+
+.section[open] > .sectionSummary::before {
+  transform: rotate(90deg);
+}
+
+.sourceJump {
+  display: inline-flex;
+  align-items: center;
+  gap: 2px;
+  margin: 0;
+  padding: 0;
+  border: none;
+  background: transparent;
+  font: inherit;
+  font-size: 13px;
+  color: var(--fn-color-brand, var(--fn-text-brand));
+  cursor: pointer;
+
+  &:hover {
+    text-decoration: underline;
+  }
+
+  &:focus-visible {
+    outline: 2px solid var(--fn-color-brand, #1677ff);
+    outline-offset: 2px;
+  }
+}
+
+.sourceChevron {
+  font-size: 14px;
+  line-height: 1;
+  color: inherit;
+}
+
+.field {
+  display: grid;
+  grid-template-columns: 72px 1fr;
+  gap: 8px;
+  align-items: baseline;
+  margin: 0;
+
+  dt {
+    margin: 0;
+    font-size: 12px;
+    color: var(--fn-text-tertiary, var(--fn-text-secondary));
+  }
+
+  dd {
+    margin: 0;
+    font-size: 13px;
+    color: var(--fn-text-primary);
+    overflow-wrap: anywhere;
+  }
+}
+
+.preview {
+  flex: 1;
+  min-height: 0;
+  margin: 0;
+  padding: 10px 12px;
+  box-sizing: border-box;
+  overflow: auto;
+  border: 1px solid var(--fn-border-secondary, rgba(0, 0, 0, 0.08));
+  border-radius: 6px;
+  background: var(--fn-bg-elevated, #fff);
+  font-size: 13px;
+  line-height: 1.55;
+  color: var(--fn-text-primary);
+  word-break: break-word;
+}
+
+.previewPlain {
+  flex: 1;
+  min-height: 0;
+  margin: 0;
+  padding: 10px 12px;
+  box-sizing: border-box;
+  overflow: auto;
+  border: 1px solid var(--fn-border-secondary, rgba(0, 0, 0, 0.08));
+  border-radius: 6px;
+  background: var(--fn-bg-elevated, #fff);
+  font-family: var(
+    --fn-font-mono,
+    ui-monospace,
+    SFMono-Regular,
+    Menlo,
+    monospace
+  );
+  font-size: 12px;
+  line-height: 1.5;
+  color: var(--fn-text-primary);
+  white-space: pre-wrap;
+  word-break: break-word;
+}
+
+.raw {
+  flex: 1;
+  min-height: 0;
+  margin: 0;
+  padding: 8px 10px;
+  box-sizing: border-box;
+  overflow: auto;
+  border: 1px solid var(--fn-border-secondary, rgba(0, 0, 0, 0.08));
+  border-radius: 6px;
+  background: var(--fn-bg-secondary, #f5f5f7);
+  font-family: var(
+    --fn-font-mono,
+    ui-monospace,
+    SFMono-Regular,
+    Menlo,
+    monospace
+  );
+  font-size: 12px;
+  line-height: 1.5;
+  color: var(--fn-text-secondary);
+  white-space: pre-wrap;
+  word-break: break-word;
+}
diff --git a/dashboard/src/pages/Chat/components/TrajectoryInspector.test.tsx b/dashboard/src/pages/Chat/components/TrajectoryInspector.test.tsx
new file mode 100644
index 00000000..f35af7d4
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/TrajectoryInspector.test.tsx
@@ -0,0 +1,306 @@
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { TrajectoryEvent } from "../../../api/modules/trajectory";
+
+const eventMock = vi.fn();
+
+vi.mock("../../../api/modules/trajectory", async (importOriginal) => {
+  const actual = await importOriginal<
+    typeof import("../../../api/modules/trajectory")
+  >();
+  return {
+    ...actual,
+    trajectoryApi: {
+      ...actual.trajectoryApi,
+      event: (...args: unknown[]) => eventMock(...args),
+    },
+  };
+});
+
+import TrajectoryInspector, { findSourceEventId } from "./TrajectoryInspector";
+
+function event(
+  overrides: Partial<TrajectoryEvent> &
+    Pick<TrajectoryEvent, "event_id" | "kind">,
+): TrajectoryEvent {
+  return {
+    thread_id: "T1",
+    agent_id: "A1",
+    seq: 1,
+    ts: 1_700_000_000,
+    turn_id: null,
+    request_seq: null,
+    is_error: false,
+    summary: "",
+    payload: {},
+    ...overrides,
+  };
+}
+
+describe("findSourceEventId", () => {
+  it("prefers the assistant event for a request_seq", () => {
+    const events = [
+      event({ event_id: "a", kind: "assistant", request_seq: 3 }),
+      event({ event_id: "t", kind: "tool", request_seq: 3 }),
+    ];
+    expect(findSourceEventId(events, 3, "t")).toBe("a");
+  });
+});
+
+describe("TrajectoryInspector", () => {
+  beforeEach(() => {
+    eventMock.mockReset();
+  });
+
+  it("shows a placeholder when no event is selected", () => {
+    render(<TrajectoryInspector agentId="A1" threadId="T1" event={null} />);
+    expect(screen.getByText("Select a record")).toBeInTheDocument();
+  });
+
+  it("shows Summary fields and Request Timing for a selected event", () => {
+    render(
+      <TrajectoryInspector
+        agentId="A1"
+        threadId="T1"
+        event={event({
+          event_id: "asst-1",
+          kind: "assistant",
+          request_seq: 3,
+          is_error: false,
+          summary: "thinking…",
+          payload: {
+            llm_duration_ms: 120,
+            ttft_ms: 40,
+            input_tokens: 10,
+            output_tokens: 20,
+            tok_per_s: 12.5,
+          },
+        })}
+      />,
+    );
+
+    expect(screen.getByRole("tab", { name: "Summary" })).toBeInTheDocument();
+    expect(screen.getAllByText("ASSISTANT").length).toBeGreaterThanOrEqual(1);
+    expect(screen.getAllByText(/Request #3/).length).toBeGreaterThanOrEqual(1);
+    expect(screen.getByText("Request Timing")).toBeInTheDocument();
+    expect(screen.getAllByText("120ms").length).toBeGreaterThanOrEqual(1);
+    expect(screen.getAllByText("40ms").length).toBeGreaterThanOrEqual(1);
+    expect(screen.getByText("80ms")).toBeInTheDocument();
+    expect(screen.getByText("12.5 tok/s")).toBeInTheDocument();
+  });
+
+  it("jumps Source Request # to the parent assistant", () => {
+    const onSelectEvent = vi.fn();
+    const assistant = event({
+      event_id: "asst-1",
+      kind: "assistant",
+      request_seq: 5,
+      summary: "calling tools",
+    });
+    const tool = event({
+      event_id: "tool-1",
+      kind: "tool",
+      request_seq: 5,
+      summary: "read",
+      payload: { name: "read" },
+    });
+
+    render(
+      <TrajectoryInspector
+        agentId="A1"
+        threadId="T1"
+        event={tool}
+        events={[assistant, tool]}
+        onSelectEvent={onSelectEvent}
+      />,
+    );
+
+    fireEvent.click(screen.getByTestId("trajectory-source-jump"));
+    expect(onSelectEvent).toHaveBeenCalledWith("asst-1");
+  });
+
+  it("loads event detail on the Raw tab", async () => {
+    eventMock.mockResolvedValue(
+      event({
+        event_id: "user-1",
+        kind: "user",
+        summary: "hello there",
+        payload: { content: "hello there" },
+      }),
+    );
+
+    render(
+      <TrajectoryInspector
+        agentId="A1"
+        threadId="T1"
+        event={event({
+          event_id: "user-1",
+          kind: "user",
+          summary: "hello there",
+          payload: {},
+        })}
+      />,
+    );
+
+    fireEvent.click(screen.getByRole("tab", { name: "Raw" }));
+
+    await waitFor(() => {
+      expect(eventMock).toHaveBeenCalledWith("A1", "T1", "user-1");
+      expect(screen.getByTestId("trajectory-raw")).toHaveTextContent(
+        '"content": "hello there"',
+      );
+    });
+  });
+
+  it("loads full content on the Preview tab", async () => {
+    eventMock.mockResolvedValue(
+      event({
+        event_id: "ctx-1",
+        kind: "context",
+        summary: "clipped…",
+        payload: {
+          label: "AGENTS.md",
+          content:
+            "---\nsummary: meta\n---\n\n## Rules\n\nPrefer **BackendWorkspace** paths.",
+        },
+      }),
+    );
+
+    render(
+      <TrajectoryInspector
+        agentId="A1"
+        threadId="T1"
+        event={event({
+          event_id: "ctx-1",
+          kind: "context",
+          summary: "clipped…",
+          payload: { label: "AGENTS.md" },
+        })}
+      />,
+    );
+
+    fireEvent.click(screen.getByRole("tab", { name: "Preview" }));
+
+    await waitFor(() => {
+      expect(eventMock).toHaveBeenCalledWith("A1", "T1", "ctx-1");
+      const preview = screen.getByTestId("trajectory-preview");
+      expect(preview).toHaveTextContent("Prefer BackendWorkspace paths");
+      // Rendered markdown — not the raw ## / ** markers.
+      expect(preview.querySelector("h2")).toHaveTextContent("Rules");
+      expect(preview.querySelector("strong")).toHaveTextContent(
+        "BackendWorkspace",
+      );
+      expect(preview).not.toHaveTextContent("summary: meta");
+    });
+  });
+
+  it("labels the middle tab Result for tool events", () => {
+    render(
+      <TrajectoryInspector
+        agentId="A1"
+        threadId="T1"
+        event={event({
+          event_id: "tool-1",
+          kind: "tool",
+          summary: "memory_search",
+          payload: { name: "memory_search", result: "Memory hits:\n- a" },
+        })}
+      />,
+    );
+
+    expect(screen.getByRole("tab", { name: "Result" })).toBeInTheDocument();
+    expect(
+      screen.queryByRole("tab", { name: "Preview" }),
+    ).not.toBeInTheDocument();
+  });
+
+  it("renders tool Result as plain text, not markdown", async () => {
+    eventMock.mockResolvedValue(
+      event({
+        event_id: "tool-1",
+        kind: "tool",
+        summary: "read",
+        payload: {
+          name: "read",
+          result: "<path>/tmp/a.rs</path>\n## Heading\n**bold**",
+        },
+      }),
+    );
+
+    render(
+      <TrajectoryInspector
+        agentId="A1"
+        threadId="T1"
+        event={event({
+          event_id: "tool-1",
+          kind: "tool",
+          summary: "read",
+          payload: { name: "read" },
+        })}
+      />,
+    );
+
+    fireEvent.click(screen.getByRole("tab", { name: "Result" }));
+
+    await waitFor(() => {
+      const preview = screen.getByTestId("trajectory-preview");
+      expect(preview).toHaveTextContent("<path>/tmp/a.rs</path>");
+      expect(preview).toHaveTextContent("## Heading");
+      expect(preview).toHaveTextContent("**bold**");
+      expect(preview.querySelector("h2")).toBeNull();
+      expect(preview.querySelector("strong")).toBeNull();
+    });
+  });
+
+  it("unwraps MCP content blocks on the Result tab and shows Payload", async () => {
+    eventMock.mockResolvedValue(
+      event({
+        event_id: "tool-mcp",
+        kind: "tool",
+        summary: "tool list_projects",
+        payload: {
+          name: "list_projects",
+          args: {},
+          result: [
+            {
+              type: "text",
+              text: '{\n  "id": "1",\n  "name": "工作"\n}',
+            },
+          ],
+        },
+      }),
+    );
+
+    render(
+      <TrajectoryInspector
+        agentId="A1"
+        threadId="T1"
+        event={event({
+          event_id: "tool-mcp",
+          kind: "tool",
+          summary: "tool list_projects",
+          payload: {
+            name: "list_projects",
+            args: {},
+            result: [
+              {
+                type: "text",
+                text: '{\n  "id": "1",\n  "name": "工作"\n}',
+              },
+            ],
+          },
+        })}
+      />,
+    );
+
+    expect(screen.getByRole("tab", { name: "Payload" })).toBeInTheDocument();
+    fireEvent.click(screen.getByRole("tab", { name: "Result" }));
+
+    await waitFor(() => {
+      const preview = screen.getByTestId("trajectory-preview");
+      expect(preview).toHaveTextContent('"name": "工作"');
+      expect(preview).not.toHaveTextContent("tool list_projects");
+      expect(preview).not.toHaveTextContent('"type": "text"');
+    });
+  });
+});
diff --git a/dashboard/src/pages/Chat/components/TrajectoryInspector.tsx b/dashboard/src/pages/Chat/components/TrajectoryInspector.tsx
new file mode 100644
index 00000000..b13a0e0c
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/TrajectoryInspector.tsx
@@ -0,0 +1,442 @@
+import { Tabs } from "antd";
+import { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import {
+  trajectoryApi,
+  type TrajectoryEvent,
+} from "../../../api/modules/trajectory";
+import Markdown from "../../../components/Markdown/LazyMarkdown";
+import { useServerTimezone } from "../../../hooks/useServerTimezone";
+import { formatServerDateTime } from "../../../utils/formatMessageTime";
+import { splitMarkdownFrontmatter } from "../../../utils/markdown";
+import {
+  kindLabelFor,
+  formatDurationMs,
+  coerceToolResultText,
+  coerceToolArgsText,
+} from "../utils/trajectoryModel";
+import styles from "./TrajectoryInspector.module.less";
+
+export interface TrajectoryInspectorProps {
+  agentId: string;
+  threadId: string;
+  event: TrajectoryEvent | null;
+  /** All loaded events — used to resolve Source → Request # jumps. */
+  events?: TrajectoryEvent[];
+  onSelectEvent?: (eventId: string) => void;
+}
+
+function payloadNumber(
+  payload: Record<string, unknown>,
+  key: string,
+): number | null {
+  const value = payload[key];
+  return typeof value === "number" ? value : null;
+}
+
+/** Prefer the assistant row for a request; fall back to any matching event. */
+export function findSourceEventId(
+  events: readonly TrajectoryEvent[],
+  requestSeq: number,
+  currentEventId?: string,
+): string | null {
+  let fallback: string | null = null;
+  for (const event of events) {
+    if (event.request_seq !== requestSeq) continue;
+    if (event.event_id === currentEventId) continue;
+    if (event.kind === "assistant") return event.event_id;
+    if (fallback == null) fallback = event.event_id;
+  }
+  return fallback;
+}
+
+function formatStartedAt(ts: number, timeZone?: string): string {
+  // Trajectory timestamps are unix seconds (float); tolerate ms.
+  if (!Number.isFinite(ts) || ts <= 0) return "—";
+  const epochSec = ts > 1e12 ? ts / 1000 : ts;
+  return formatServerDateTime(epochSec, timeZone);
+}
+
+function TimingSection({ event }: { event: TrajectoryEvent }) {
+  const { t } = useTranslation();
+  const timeZone = useServerTimezone();
+  const total =
+    payloadNumber(event.payload, "llm_duration_ms") ??
+    payloadNumber(event.payload, "tool_duration_ms");
+  const ttft = payloadNumber(event.payload, "ttft_ms");
+  const tokPerS = payloadNumber(event.payload, "tok_per_s");
+  const generation =
+    total != null && ttft != null && total >= ttft ? total - ttft : null;
+
+  const hasTiming =
+    total != null || ttft != null || tokPerS != null || event.ts > 0;
+  if (!hasTiming) return null;
+
+  return (
+    <details className={styles.section} open>
+      <summary className={styles.sectionSummary}>
+        {t("chat.trajectoryInspectorTiming", "Request Timing")}
+      </summary>
+      <dl className={styles.summary}>
+        <div className={styles.field}>
+          <dt>{t("chat.trajectoryInspectorStarted", "Started")}</dt>
+          <dd>{formatStartedAt(event.ts, timeZone)}</dd>
+        </div>
+        {total != null ? (
+          <div className={styles.field}>
+            <dt>
+              {t("chat.trajectoryInspectorTotalDuration", "Total duration")}
+            </dt>
+            <dd>{formatDurationMs(total)}</dd>
+          </div>
+        ) : null}
+        {ttft != null ? (
+          <div className={styles.field}>
+            <dt>{t("chat.trajectoryInspectorTtft", "TTFT")}</dt>
+            <dd>{formatDurationMs(ttft)}</dd>
+          </div>
+        ) : null}
+        {generation != null ? (
+          <div className={styles.field}>
+            <dt>{t("chat.trajectoryInspectorGeneration", "Generation")}</dt>
+            <dd>{formatDurationMs(generation)}</dd>
+          </div>
+        ) : null}
+        {tokPerS != null ? (
+          <div className={styles.field}>
+            <dt>{t("chat.trajectoryInspectorThroughput", "Throughput")}</dt>
+            <dd>{`${
+              Number.isInteger(tokPerS) ? tokPerS : tokPerS.toFixed(1)
+            } tok/s`}</dd>
+          </div>
+        ) : null}
+      </dl>
+    </details>
+  );
+}
+
+function SummaryPane({
+  event,
+  events,
+  onSelectEvent,
+}: {
+  event: TrajectoryEvent;
+  events: TrajectoryEvent[];
+  onSelectEvent?: (eventId: string) => void;
+}) {
+  const { t } = useTranslation();
+  const inputTokens = payloadNumber(event.payload, "input_tokens");
+  const outputTokens = payloadNumber(event.payload, "output_tokens");
+  const sourceId =
+    event.request_seq != null
+      ? findSourceEventId(events, event.request_seq, event.event_id)
+      : null;
+  const canJump =
+    sourceId != null &&
+    onSelectEvent != null &&
+    // Jumping from a tool (or other) to its assistant; or from assistant to
+    // another event in the same request is useful. Skip self-only dead ends.
+    sourceId !== event.event_id;
+
+  return (
+    <div className={styles.summaryScroll}>
+      <dl className={styles.summary}>
+        <div className={styles.field}>
+          <dt>{t("chat.trajectoryInspectorKind", "Kind")}</dt>
+          <dd>{kindLabelFor(event.kind)}</dd>
+        </div>
+        {event.request_seq != null ? (
+          <div className={styles.field}>
+            <dt>{t("chat.trajectoryInspectorSource", "Source")}</dt>
+            <dd>
+              {canJump ? (
+                <button
+                  type="button"
+                  className={styles.sourceJump}
+                  data-testid="trajectory-source-jump"
+                  onClick={() => onSelectEvent(sourceId)}
+                >
+                  {`Request #${event.request_seq}`}
+                  <span className={styles.sourceChevron} aria-hidden>
+                    ›
+                  </span>
+                </button>
+              ) : (
+                `Request #${event.request_seq}`
+              )}
+            </dd>
+          </div>
+        ) : null}
+        <div className={styles.field}>
+          <dt>{t("chat.trajectoryInspectorStatus", "Status")}</dt>
+          <dd>
+            {event.is_error
+              ? t("chat.trajectoryInspectorError", "Error")
+              : t("chat.trajectoryInspectorCompleted", "Completed")}
+          </dd>
+        </div>
+        {inputTokens != null || outputTokens != null ? (
+          <div className={styles.field}>
+            <dt>{t("chat.trajectoryInspectorTokens", "Tokens")}</dt>
+            <dd>
+              {[inputTokens, outputTokens]
+                .filter((value): value is number => value != null)
+                .map((value) => `${value} tok`)
+                .join(" · ")}
+            </dd>
+          </div>
+        ) : null}
+      </dl>
+      <TimingSection event={event} />
+    </div>
+  );
+}
+
+function RawPane({
+  agentId,
+  threadId,
+  eventId,
+}: {
+  agentId: string;
+  threadId: string;
+  eventId: string;
+}) {
+  const { t } = useTranslation();
+  const [text, setText] = useState("");
+  const [loading, setLoading] = useState(true);
+  const [failed, setFailed] = useState(false);
+
+  useEffect(() => {
+    let cancelled = false;
+    setLoading(true);
+    setFailed(false);
+    void trajectoryApi
+      .event(agentId, threadId, eventId)
+      .then((detail) => {
+        if (!cancelled) {
+          setText(JSON.stringify(detail.payload, null, 2));
+        }
+      })
+      .catch(() => {
+        if (!cancelled) setFailed(true);
+      })
+      .finally(() => {
+        if (!cancelled) setLoading(false);
+      });
+    return () => {
+      cancelled = true;
+    };
+  }, [agentId, eventId, threadId]);
+
+  return (
+    <pre className={styles.raw} data-testid="trajectory-raw">
+      {loading
+        ? t("chat.trajectoryDetailLoading", "Loading detail…")
+        : failed
+        ? t("chat.trajectoryDetailError", "Failed to load event detail")
+        : text}
+    </pre>
+  );
+}
+
+function previewTextFromDetail(
+  detail: TrajectoryEvent,
+  fallback: string,
+): string {
+  const payload = detail.payload ?? {};
+  if (detail.kind === "tool") {
+    return (
+      coerceToolResultText(payload.result) ??
+      coerceToolResultText(payload.output) ??
+      coerceToolResultText(payload.content) ??
+      (detail.summary || fallback)
+    );
+  }
+  const content = payload.content;
+  if (typeof content === "string" && content.trim()) return content;
+  const text = payload.text;
+  if (typeof text === "string" && text.trim()) return text;
+  const result = coerceToolResultText(payload.result);
+  if (result) return result;
+  return detail.summary || fallback;
+}
+
+function PayloadPane({ event }: { event: TrajectoryEvent }) {
+  const { t } = useTranslation();
+  const args =
+    event.payload.args ?? event.payload.arguments ?? event.payload.input;
+  const text = coerceToolArgsText(args);
+  return (
+    <div className={styles.previewPlain} data-testid="trajectory-payload">
+      {text || t("chat.trajectoryInspectorEmptyPayload", "No payload")}
+    </div>
+  );
+}
+
+function PreviewPane({
+  agentId,
+  threadId,
+  event,
+}: {
+  agentId: string;
+  threadId: string;
+  event: TrajectoryEvent;
+}) {
+  const { t } = useTranslation();
+  const plain = event.kind === "tool";
+  const initial = plain
+    ? coerceToolResultText(event.payload.result) ||
+      coerceToolResultText(event.payload.output) ||
+      event.summary ||
+      ""
+    : event.summary || "";
+  const [text, setText] = useState(initial);
+  const [loading, setLoading] = useState(true);
+
+  useEffect(() => {
+    let cancelled = false;
+    const fallback =
+      (plain
+        ? coerceToolResultText(event.payload.result) ||
+          coerceToolResultText(event.payload.output)
+        : null) ||
+      event.summary ||
+      "";
+    setLoading(true);
+    setText(fallback);
+    void trajectoryApi
+      .event(agentId, threadId, event.event_id)
+      .then((detail) => {
+        if (!cancelled) {
+          setText(previewTextFromDetail(detail, fallback));
+        }
+      })
+      .catch(() => {
+        /* keep summary fallback */
+      })
+      .finally(() => {
+        if (!cancelled) setLoading(false);
+      });
+    return () => {
+      cancelled = true;
+    };
+  }, [
+    agentId,
+    event.event_id,
+    event.kind,
+    event.payload.result,
+    event.payload.output,
+    event.summary,
+    plain,
+    threadId,
+  ]);
+
+  return (
+    <div
+      className={plain ? styles.previewPlain : styles.preview}
+      data-testid="trajectory-preview"
+    >
+      {loading && !text ? (
+        t("chat.trajectoryDetailLoading", "Loading detail…")
+      ) : text ? (
+        plain ? (
+          text
+        ) : (
+          <Markdown content={splitMarkdownFrontmatter(text).body || text} />
+        )
+      ) : null}
+    </div>
+  );
+}
+
+export default function TrajectoryInspector({
+  agentId,
+  threadId,
+  event,
+  events = [],
+  onSelectEvent,
+}: TrajectoryInspectorProps) {
+  const { t } = useTranslation();
+
+  if (event == null) {
+    return (
+      <div className={styles.placeholder}>
+        {t("chat.trajectoryInspectorPlaceholder", "Select a record")}
+      </div>
+    );
+  }
+
+  const kindLabel = kindLabelFor(event.kind);
+  const locationParts = [
+    event.request_seq != null ? `Request #${event.request_seq}` : null,
+    `Step ${event.seq}`,
+  ].filter(Boolean);
+
+  return (
+    <div className={styles.root}>
+      <header className={styles.header}>
+        <div className={styles.headerTitle}>
+          <span className={styles.headerKind} data-kind={event.kind}>
+            {kindLabel}
+          </span>
+          {locationParts.length > 0 ? (
+            <span className={styles.headerLocation}>
+              {locationParts.join(" · ")}
+            </span>
+          ) : null}
+        </div>
+      </header>
+      <Tabs
+        destroyOnHidden
+        className={styles.tabs}
+        items={[
+          {
+            key: "summary",
+            label: t("chat.trajectoryInspectorSummary", "Summary"),
+            children: (
+              <SummaryPane
+                event={event}
+                events={events}
+                onSelectEvent={onSelectEvent}
+              />
+            ),
+          },
+          ...(event.kind === "tool"
+            ? [
+                {
+                  key: "payload",
+                  label: t("chat.trajectoryInspectorPayload", "Payload"),
+                  children: <PayloadPane event={event} />,
+                },
+              ]
+            : []),
+          {
+            key: "preview",
+            label:
+              event.kind === "tool"
+                ? t("chat.trajectoryInspectorResult", "Result")
+                : t("chat.trajectoryInspectorPreview", "Preview"),
+            children: (
+              <PreviewPane
+                agentId={agentId}
+                threadId={threadId}
+                event={event}
+              />
+            ),
+          },
+          {
+            key: "raw",
+            label: t("chat.trajectoryInspectorRaw", "Raw"),
+            children: (
+              <RawPane
+                agentId={agentId}
+                threadId={threadId}
+                eventId={event.event_id}
+              />
+            ),
+          },
+        ]}
+      />
+    </div>
+  );
+}
diff --git a/dashboard/src/pages/Chat/components/TrajectoryLedger.module.less b/dashboard/src/pages/Chat/components/TrajectoryLedger.module.less
new file mode 100644
index 00000000..1c94a1bb
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/TrajectoryLedger.module.less
@@ -0,0 +1,327 @@
+/* Dense table ledger aligned with DeepSeek Harness ui-trajectory. */
+
+.tablePane {
+  flex: 1;
+  min-height: 0;
+  min-width: 0;
+  overflow: auto;
+  border: none;
+  border-radius: 0;
+  background: transparent;
+}
+
+.table {
+  --trajectory-turn-accent: color-mix(
+    in srgb,
+    var(--fn-color-brand, #1677ff) 22%,
+    var(--fn-bg-elevated, #fff)
+  );
+  width: 100%;
+  min-width: 0;
+  border-spacing: 0;
+  table-layout: fixed;
+  color: var(--fn-text-primary);
+  font-size: 12px;
+  line-height: 18px;
+}
+
+.row {
+  cursor: pointer;
+
+  &:hover {
+    background: var(--fn-bg-secondary, #f5f5f7);
+  }
+}
+
+.rowSelected {
+  background: color-mix(
+    in srgb,
+    var(--fn-color-brand, #1677ff) 10%,
+    transparent
+  );
+}
+
+.rowError {
+  background: color-mix(
+    in srgb,
+    var(--fn-color-error, #cf1322) 8%,
+    transparent
+  );
+}
+
+.row[data-focus-match="false"],
+.row[data-search-match="false"] {
+  opacity: 0.4;
+}
+
+.row:focus-visible {
+  outline: 2px solid var(--fn-color-brand, #1677ff);
+  outline-offset: -2px;
+}
+
+.event,
+.content {
+  box-sizing: border-box;
+  height: 30px;
+  padding: 0 8px;
+  border-bottom: 1px solid var(--fn-border-secondary, rgba(0, 0, 0, 0.06));
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  vertical-align: middle;
+}
+
+.event {
+  position: relative;
+  width: 132px;
+  padding-left: 28px;
+  padding-right: 4px;
+  overflow: visible;
+}
+
+.content {
+  width: auto;
+  padding-left: 4px;
+  color: var(--fn-text-primary);
+}
+
+.eventInner {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 6px;
+  min-width: 0;
+  height: 100%;
+}
+
+.turnRail {
+  position: absolute;
+  z-index: 1;
+  top: -1px;
+  bottom: -1px;
+  left: 0;
+  width: 2px;
+  background: var(--trajectory-turn-accent);
+  pointer-events: none;
+}
+
+.row[data-turn-start="true"] .turnRail {
+  top: 0;
+}
+
+.selectionRail {
+  position: absolute;
+  z-index: 2;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  width: 3px;
+  background: var(--fn-color-brand, #1677ff);
+  pointer-events: none;
+}
+
+.turnLabel {
+  position: absolute;
+  z-index: 3;
+  top: 0;
+  left: 0;
+  max-width: 48px;
+  padding: 1px 4px;
+  border-radius: 0 0 2px 0;
+  background: var(--fn-bg-secondary, #f5f5f7);
+  color: var(--fn-text-tertiary, #8b8b8b);
+  font-family: var(
+    --fn-font-mono,
+    ui-monospace,
+    SFMono-Regular,
+    Menlo,
+    monospace
+  );
+  font-size: 8px;
+  line-height: 10px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  user-select: none;
+  pointer-events: none;
+}
+
+.requestLabel {
+  flex: none;
+  color: var(--fn-text-tertiary, #8b8b8b);
+  font-size: 10px;
+  font-variant-numeric: tabular-nums;
+  letter-spacing: 0.01em;
+}
+
+.kindTag {
+  box-sizing: border-box;
+  display: inline-flex;
+  flex: none;
+  align-items: center;
+  justify-content: center;
+  gap: 0;
+  height: 19px;
+  width: 19px;
+  padding: 0;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  font-size: 10px;
+  font-weight: 650;
+  letter-spacing: 0.035em;
+  line-height: 16px;
+  user-select: none;
+  overflow: hidden;
+}
+
+.kindTagLabel {
+  display: none;
+}
+
+.kindIcon {
+  display: block;
+  flex: none;
+}
+
+.kindUser {
+  color: color-mix(
+    in srgb,
+    var(--fn-color-success, #389e0d) 72%,
+    var(--fn-text-secondary, #595959)
+  );
+  background: color-mix(
+    in srgb,
+    var(--fn-color-success, #389e0d) 14%,
+    transparent
+  );
+}
+
+.kindContext {
+  color: color-mix(in srgb, #0891b2 78%, var(--fn-text-secondary, #595959));
+  background: color-mix(in srgb, #0891b2 14%, transparent);
+}
+
+.kindAssistant {
+  color: color-mix(in srgb, #a855f7 55%, #e11d48);
+  background: color-mix(
+    in srgb,
+    color-mix(in srgb, #a855f7 55%, #e11d48) 15%,
+    var(--fn-bg-elevated, #fff)
+  );
+}
+
+.kindTool {
+  color: var(--fn-color-warning, #d48806);
+  background: color-mix(
+    in srgb,
+    var(--fn-color-warning, #d48806) 16%,
+    transparent
+  );
+}
+
+.kindSystem {
+  color: var(--fn-text-secondary, #595959);
+  background: var(--fn-bg-secondary, #f5f5f7);
+}
+
+.contentText {
+  display: block;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.toolCallOnlyLabel {
+  color: var(--fn-text-tertiary, #8b8b8b);
+}
+
+.collapsedCalls {
+  margin-left: 6px;
+  color: var(--fn-text-secondary, #595959);
+}
+
+.collapsedSummary {
+  display: block;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: var(--fn-text-tertiary, #8b8b8b);
+}
+
+.collapsedEllipsis {
+  margin-right: 4px;
+}
+
+.rowCollapsedSummary {
+  td {
+    padding-top: 2px;
+    padding-bottom: 2px;
+  }
+}
+
+.toolLine {
+  display: flex;
+  align-items: center;
+  min-width: 0;
+  overflow: hidden;
+  font-family: var(
+    --fn-font-mono,
+    ui-monospace,
+    SFMono-Regular,
+    Menlo,
+    monospace
+  );
+  font-size: 12px;
+  line-height: 18px;
+}
+
+.toolName {
+  flex: none;
+  color: var(--fn-text-primary);
+}
+
+.toolArgs {
+  margin-left: 6px;
+  color: var(--fn-text-secondary);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.arrow {
+  flex: none;
+  margin: 0 8px;
+  color: var(--fn-text-tertiary, #8b8b8b);
+}
+
+.toolResult {
+  min-width: 0;
+  color: var(--fn-text-secondary);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+@media (min-width: 1100px) {
+  .event {
+    width: 168px;
+  }
+
+  .kindTag {
+    width: auto;
+    max-width: 92px;
+    padding: 0 5px;
+    gap: 4px;
+    justify-content: flex-start;
+  }
+
+  .kindTagLabel {
+    display: inline-block;
+    max-width: 72px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
diff --git a/dashboard/src/pages/Chat/components/TrajectoryLedger.test.tsx b/dashboard/src/pages/Chat/components/TrajectoryLedger.test.tsx
new file mode 100644
index 00000000..b0b9b3c4
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/TrajectoryLedger.test.tsx
@@ -0,0 +1,295 @@
+import { fireEvent, render, screen } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+import type { TrajectoryEvent } from "../../../api/modules/trajectory";
+import TrajectoryLedger from "./TrajectoryLedger";
+
+function event(
+  overrides: Partial<TrajectoryEvent> &
+    Pick<TrajectoryEvent, "event_id" | "kind">,
+): TrajectoryEvent {
+  return {
+    thread_id: "T1",
+    agent_id: "A1",
+    seq: 1,
+    ts: 1,
+    turn_id: null,
+    request_seq: null,
+    is_error: false,
+    summary: "",
+    payload: {},
+    ...overrides,
+  };
+}
+
+const idle = {
+  selectedEventId: null as string | null,
+  onSelect: () => {},
+  focusEventIds: null as ReadonlySet<string> | null,
+  searchMatchIds: null as ReadonlySet<string> | null,
+};
+
+describe("TrajectoryLedger", () => {
+  it("renders tool names and assistant Request # labels", () => {
+    render(
+      <TrajectoryLedger
+        events={[
+          event({
+            event_id: "tool-1",
+            kind: "tool",
+            seq: 1,
+            summary: "tool read_file",
+            payload: {
+              name: "read_file",
+              args: { path: "a.py" },
+              result: "ok",
+            },
+          }),
+          event({
+            event_id: "asst-1",
+            kind: "assistant",
+            seq: 2,
+            request_seq: 3,
+            summary: "thinking…",
+          }),
+        ]}
+        {...idle}
+      />,
+    );
+
+    expect(screen.getByText("read_file")).toBeInTheDocument();
+    expect(screen.getByText("Request #3")).toBeInTheDocument();
+    expect(screen.getByText("TOOL")).toBeInTheDocument();
+    expect(screen.getByText("ASSISTANT")).toBeInTheDocument();
+  });
+
+  it("calls onSelect when a row is clicked and does not expand Raw inline", () => {
+    const onSelect = vi.fn();
+    render(
+      <TrajectoryLedger
+        events={[
+          event({
+            event_id: "user-1",
+            kind: "user",
+            summary: "hello there",
+            payload: {},
+          }),
+        ]}
+        {...idle}
+        onSelect={onSelect}
+      />,
+    );
+
+    fireEvent.click(screen.getByRole("button", { name: /hello there/ }));
+    expect(onSelect).toHaveBeenCalledWith("user-1");
+    expect(screen.queryByTestId("trajectory-payload")).not.toBeInTheDocument();
+  });
+
+  it("marks the selected row and dims rows outside the focus set", () => {
+    render(
+      <TrajectoryLedger
+        events={[
+          event({
+            event_id: "in",
+            kind: "user",
+            summary: "kept",
+          }),
+          event({
+            event_id: "out",
+            kind: "user",
+            summary: "dimmed",
+          }),
+        ]}
+        {...idle}
+        selectedEventId="in"
+        focusEventIds={new Set(["in"])}
+      />,
+    );
+
+    const kept = screen.getByRole("button", { name: /kept/ });
+    const dimmed = screen.getByRole("button", { name: /dimmed/ });
+    expect(kept).toHaveAttribute("aria-selected", "true");
+    expect(dimmed).toHaveAttribute("aria-selected", "false");
+    expect(kept).toHaveAttribute("data-focus-match", "true");
+    expect(dimmed).toHaveAttribute("data-focus-match", "false");
+  });
+
+  it("scrolls the selected row into view", () => {
+    const scrollIntoView = vi.fn();
+    const proto = Element.prototype as Element & {
+      scrollIntoView: typeof scrollIntoView;
+    };
+    const original = proto.scrollIntoView;
+    proto.scrollIntoView = scrollIntoView;
+
+    try {
+      const { rerender } = render(
+        <TrajectoryLedger
+          events={[
+            event({
+              event_id: "first",
+              kind: "user",
+              summary: "kept",
+            }),
+            event({
+              event_id: "second",
+              kind: "assistant",
+              summary: "later",
+            }),
+          ]}
+          {...idle}
+        />,
+      );
+
+      expect(scrollIntoView).not.toHaveBeenCalled();
+
+      rerender(
+        <TrajectoryLedger
+          events={[
+            event({
+              event_id: "first",
+              kind: "user",
+              summary: "kept",
+            }),
+            event({
+              event_id: "second",
+              kind: "assistant",
+              summary: "later",
+            }),
+          ]}
+          {...idle}
+          selectedEventId="second"
+        />,
+      );
+
+      expect(scrollIntoView).toHaveBeenCalled();
+    } finally {
+      proto.scrollIntoView = original;
+    }
+  });
+
+  it("inserts a turn header when turn_id changes", () => {
+    render(
+      <TrajectoryLedger
+        events={[
+          event({
+            event_id: "a",
+            kind: "user",
+            turn_id: "turn-a",
+            summary: "first",
+          }),
+          event({
+            event_id: "b",
+            kind: "assistant",
+            turn_id: "turn-a",
+            summary: "same turn",
+          }),
+          event({
+            event_id: "c",
+            kind: "user",
+            turn_id: "turn-b",
+            summary: "next turn",
+          }),
+        ]}
+        {...idle}
+      />,
+    );
+
+    const headers = screen.getAllByTestId("trajectory-turn-header");
+    expect(headers).toHaveLength(2);
+    expect(headers[0]).toHaveTextContent("T1");
+    expect(headers[1]).toHaveTextContent("T2");
+  });
+
+  it("follows the live tail when near the bottom", () => {
+    const { rerender } = render(
+      <TrajectoryLedger
+        events={[
+          event({ event_id: "e1", kind: "user", seq: 1, summary: "one" }),
+        ]}
+        {...idle}
+      />,
+    );
+
+    const pane = screen.getByTestId("trajectory-ledger-pane");
+    Object.defineProperty(pane, "clientHeight", {
+      configurable: true,
+      value: 100,
+    });
+    Object.defineProperty(pane, "scrollHeight", {
+      configurable: true,
+      get() {
+        return 400;
+      },
+    });
+    let scrollTop = 0;
+    Object.defineProperty(pane, "scrollTop", {
+      configurable: true,
+      get() {
+        return scrollTop;
+      },
+      set(value: number) {
+        scrollTop = value;
+      },
+    });
+
+    rerender(
+      <TrajectoryLedger
+        events={[
+          event({ event_id: "e1", kind: "user", seq: 1, summary: "one" }),
+          event({ event_id: "e2", kind: "assistant", seq: 2, summary: "two" }),
+        ]}
+        {...idle}
+      />,
+    );
+
+    expect(scrollTop).toBe(400);
+  });
+
+  it("does not follow the live tail after the user scrolls up", () => {
+    const { rerender } = render(
+      <TrajectoryLedger
+        events={[
+          event({ event_id: "e1", kind: "user", seq: 1, summary: "one" }),
+          event({ event_id: "e2", kind: "assistant", seq: 2, summary: "two" }),
+        ]}
+        {...idle}
+      />,
+    );
+
+    const pane = screen.getByTestId("trajectory-ledger-pane");
+    Object.defineProperty(pane, "clientHeight", {
+      configurable: true,
+      value: 100,
+    });
+    Object.defineProperty(pane, "scrollHeight", {
+      configurable: true,
+      value: 500,
+    });
+    let scrollTop = 50;
+    Object.defineProperty(pane, "scrollTop", {
+      configurable: true,
+      get() {
+        return scrollTop;
+      },
+      set(value: number) {
+        scrollTop = value;
+      },
+    });
+
+    fireEvent.scroll(pane);
+    expect(scrollTop).toBe(50);
+
+    rerender(
+      <TrajectoryLedger
+        events={[
+          event({ event_id: "e1", kind: "user", seq: 1, summary: "one" }),
+          event({ event_id: "e2", kind: "assistant", seq: 2, summary: "two" }),
+          event({ event_id: "e3", kind: "tool", seq: 3, summary: "three" }),
+        ]}
+        {...idle}
+      />,
+    );
+
+    expect(scrollTop).toBe(50);
+  });
+});
diff --git a/dashboard/src/pages/Chat/components/TrajectoryLedger.tsx b/dashboard/src/pages/Chat/components/TrajectoryLedger.tsx
new file mode 100644
index 00000000..fd6ae078
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/TrajectoryLedger.tsx
@@ -0,0 +1,357 @@
+import { Fragment, useEffect, useLayoutEffect, useRef } from "react";
+import type { TrajectoryEvent } from "../../../api/modules/trajectory";
+import { laneForKind, toLedgerRow } from "../utils/trajectoryModel";
+import styles from "./TrajectoryLedger.module.less";
+
+/** px from bottom — stay pinned to the live tail while the user is near it */
+const FOLLOW_TAIL_THRESHOLD_PX = 80;
+
+export interface TrajectoryLedgerProps {
+  events: TrajectoryEvent[];
+  selectedEventId: string | null;
+  onSelect: (eventId: string) => void;
+  /** Expand a folded assistant/turn summary row (DSH click-to-expand). */
+  onExpandCollapsed?: (
+    parentEventId: string,
+    kind: "assistant" | "turn",
+  ) => void;
+  focusEventIds: ReadonlySet<string> | null;
+  searchMatchIds: ReadonlySet<string> | null;
+}
+
+function distanceFromBottom(el: HTMLElement): number {
+  return el.scrollHeight - el.scrollTop - el.clientHeight;
+}
+
+function matchAttr(
+  ids: ReadonlySet<string> | null,
+  eventId: string,
+): "true" | "false" | undefined {
+  if (ids == null) return undefined;
+  return ids.has(eventId) ? "true" : "false";
+}
+
+function KindIcon({ kind }: { kind: string }) {
+  if (kind === "tool") {
+    return (
+      <svg
+        className={styles.kindIcon}
+        width="13"
+        height="13"
+        viewBox="0 0 16 16"
+        fill="none"
+        stroke="currentColor"
+        strokeWidth="1.5"
+        aria-hidden
+      >
+        <path d="M10.5 2.5a2.5 2.5 0 0 1 3 3L9 10l-3 1 1-3 4.5-5.5Z" />
+        <path d="M2 14l4-1" />
+      </svg>
+    );
+  }
+  if (kind === "assistant" || kind === "compacted") {
+    return (
+      <svg
+        className={styles.kindIcon}
+        width="13"
+        height="13"
+        viewBox="0 0 16 16"
+        fill="currentColor"
+        aria-hidden
+      >
+        <path d="M8 1.6 9.7 6l4.5.4-3.4 3.1.9 4.4L8 11.7 4.3 13.9l.9-4.4L1.8 6.4 6.3 6 8 1.6Z" />
+      </svg>
+    );
+  }
+  return (
+    <svg
+      className={styles.kindIcon}
+      width="13"
+      height="13"
+      viewBox="0 0 16 16"
+      fill="none"
+      stroke="currentColor"
+      strokeWidth="1.5"
+      aria-hidden
+    >
+      <circle cx="8" cy="8" r="5.25" />
+    </svg>
+  );
+}
+
+function kindTagClass(kind: string): string {
+  const lane = laneForKind(kind);
+  if (lane === "tools") return styles.kindTool;
+  if (lane === "model") return styles.kindAssistant;
+  if (kind === "context") return styles.kindContext;
+  if (kind === "system" || kind === "compacted") return styles.kindSystem;
+  return styles.kindUser;
+}
+
+function ContentCell({
+  kind,
+  title,
+  content,
+  toolArgs,
+  toolResult,
+  toolCallOnly,
+  collapsedSummary,
+}: {
+  kind: string;
+  title: string;
+  content: string;
+  toolArgs: string | null;
+  toolResult: string | null;
+  toolCallOnly?: boolean;
+  collapsedSummary?: boolean;
+}) {
+  if (collapsedSummary) {
+    return (
+      <span className={styles.collapsedSummary}>
+        <span className={styles.collapsedEllipsis} aria-hidden>
+          …
+        </span>
+        <span>{content || title}</span>
+      </span>
+    );
+  }
+  if (kind === "tool") {
+    // List API often keeps only `name` in payload; summary already has
+    // `name {args} → result` (DSH-style). Prefer structured fields when present.
+    if (!toolArgs && !toolResult) {
+      return (
+        <span className={styles.toolLine}>
+          <span className={styles.toolResult}>{content || title}</span>
+        </span>
+      );
+    }
+    return (
+      <span className={styles.toolLine}>
+        <span className={styles.toolName}>{title}</span>
+        {toolArgs ? <span className={styles.toolArgs}>{toolArgs}</span> : null}
+        {toolResult ? (
+          <>
+            <span className={styles.arrow} aria-hidden>
+              →
+            </span>
+            <span className={styles.toolResult}>{toolResult}</span>
+          </>
+        ) : null}
+      </span>
+    );
+  }
+  if (toolCallOnly) {
+    return (
+      <span className={styles.contentText}>
+        <span className={styles.toolCallOnlyLabel}>{title}</span>
+        {content && content !== title ? (
+          <span className={styles.collapsedCalls}>{content}</span>
+        ) : null}
+      </span>
+    );
+  }
+  return <span className={styles.contentText}>{content || title}</span>;
+}
+
+export default function TrajectoryLedger({
+  events,
+  selectedEventId,
+  onSelect,
+  onExpandCollapsed,
+  focusEventIds,
+  searchMatchIds,
+}: TrajectoryLedgerProps) {
+  const paneRef = useRef<HTMLDivElement>(null);
+  const rowRefs = useRef(new Map<string, HTMLTableRowElement>());
+  const followTailRef = useRef(true);
+  const lastEventId = events[events.length - 1]?.event_id ?? null;
+  const turnNumbers = new Map<string, number>();
+  for (const event of events) {
+    if (event.turn_id == null || turnNumbers.has(event.turn_id)) continue;
+    turnNumbers.set(event.turn_id, turnNumbers.size + 1);
+  }
+
+  useEffect(() => {
+    const pane = paneRef.current;
+    if (pane == null) return;
+    const onScroll = () => {
+      followTailRef.current =
+        distanceFromBottom(pane) <= FOLLOW_TAIL_THRESHOLD_PX;
+    };
+    pane.addEventListener("scroll", onScroll, { passive: true });
+    return () => pane.removeEventListener("scroll", onScroll);
+  }, []);
+
+  useLayoutEffect(() => {
+    if (!followTailRef.current || lastEventId == null) return;
+    const pane = paneRef.current;
+    if (pane == null) return;
+    pane.scrollTop = pane.scrollHeight;
+  }, [events.length, lastEventId]);
+
+  useEffect(() => {
+    if (selectedEventId == null) return;
+    const node = rowRefs.current.get(selectedEventId);
+    if (typeof node?.scrollIntoView !== "function") return;
+    node.scrollIntoView({
+      block: "nearest",
+      inline: "nearest",
+    });
+  }, [selectedEventId]);
+
+  return (
+    <div
+      ref={paneRef}
+      className={styles.tablePane}
+      data-testid="trajectory-ledger-pane"
+    >
+      <table className={styles.table}>
+        <tbody>
+          {events.map((event, index) => {
+            const row = toLedgerRow(event);
+            const selected = selectedEventId === row.id;
+            const prevTurn = events[index - 1]?.turn_id;
+            const turnStart =
+              event.turn_id != null && event.turn_id !== prevTurn;
+            const turnNumber =
+              event.turn_id != null
+                ? turnNumbers.get(event.turn_id)
+                : undefined;
+            const turnLabel =
+              turnNumber != null ? `T${turnNumber}` : event.turn_id;
+            const showRequest =
+              row.kind === "assistant" &&
+              row.requestSeq != null &&
+              !row.collapsedSummary;
+            const accessibleName = row.collapsedSummary
+              ? row.content || row.title
+              : [
+                  showRequest ? `Request #${row.requestSeq}` : null,
+                  row.kindLabel,
+                  row.kind === "tool"
+                    ? [row.title, row.toolArgs, row.toolResult, row.content]
+                        .filter(Boolean)
+                        .filter(
+                          (part, partIndex, all) =>
+                            all.indexOf(part) === partIndex,
+                        )
+                        .join(" ")
+                    : row.toolCallOnly
+                    ? [row.title, row.content]
+                        .filter(Boolean)
+                        .filter(
+                          (part, partIndex, all) =>
+                            all.indexOf(part) === partIndex,
+                        )
+                        .join(" ")
+                    : row.content || row.title,
+                ]
+                  .filter(Boolean)
+                  .join(", ");
+
+            const activate = () => {
+              if (
+                row.collapsedSummary &&
+                row.collapsedParentId &&
+                onExpandCollapsed
+              ) {
+                onExpandCollapsed(
+                  row.collapsedParentId,
+                  row.collapsedSummaryKind ?? "assistant",
+                );
+                return;
+              }
+              onSelect(row.id);
+            };
+
+            return (
+              <Fragment key={row.id}>
+                <tr
+                  ref={(node) => {
+                    if (node) rowRefs.current.set(row.id, node);
+                    else rowRefs.current.delete(row.id);
+                  }}
+                  className={`${styles.row}${
+                    selected ? ` ${styles.rowSelected}` : ""
+                  }${row.isError ? ` ${styles.rowError}` : ""}${
+                    row.collapsedSummary ? ` ${styles.rowCollapsedSummary}` : ""
+                  }`}
+                  data-kind={
+                    row.collapsedSummary ? "collapsed-summary" : row.kind
+                  }
+                  data-turn-start={
+                    turnStart && !row.collapsedSummary ? "true" : undefined
+                  }
+                  data-selected={selected ? "true" : "false"}
+                  data-focus-match={matchAttr(focusEventIds, row.id)}
+                  data-search-match={matchAttr(searchMatchIds, row.id)}
+                  tabIndex={0}
+                  role="button"
+                  aria-selected={selected}
+                  aria-label={accessibleName}
+                  onClick={activate}
+                  onKeyDown={(keyboardEvent) => {
+                    if (
+                      keyboardEvent.key === "Enter" ||
+                      keyboardEvent.key === " "
+                    ) {
+                      keyboardEvent.preventDefault();
+                      activate();
+                    }
+                  }}
+                >
+                  <td className={styles.event}>
+                    <span className={styles.turnRail} aria-hidden />
+                    {selected && !row.collapsedSummary ? (
+                      <span className={styles.selectionRail} aria-hidden />
+                    ) : null}
+                    {turnStart && turnLabel && !row.collapsedSummary ? (
+                      <span
+                        className={styles.turnLabel}
+                        data-testid="trajectory-turn-header"
+                        title={event.turn_id ?? turnLabel}
+                      >
+                        {turnLabel}
+                      </span>
+                    ) : null}
+                    {!row.collapsedSummary ? (
+                      <span className={styles.eventInner}>
+                        {showRequest ? (
+                          <span className={styles.requestLabel}>
+                            {`Request #${row.requestSeq}`}
+                          </span>
+                        ) : null}
+                        <span
+                          className={`${styles.kindTag} ${kindTagClass(
+                            row.kind,
+                          )}`}
+                          title={row.kindLabel}
+                        >
+                          <KindIcon kind={row.kind} />
+                          <span className={styles.kindTagLabel}>
+                            {row.kindLabel}
+                          </span>
+                        </span>
+                      </span>
+                    ) : null}
+                  </td>
+                  <td className={styles.content}>
+                    <ContentCell
+                      kind={row.kind}
+                      title={row.title}
+                      content={row.content}
+                      toolArgs={row.toolArgs}
+                      toolResult={row.toolResult}
+                      toolCallOnly={row.toolCallOnly}
+                      collapsedSummary={row.collapsedSummary}
+                    />
+                  </td>
+                </tr>
+              </Fragment>
+            );
+          })}
+        </tbody>
+      </table>
+    </div>
+  );
+}
diff --git a/dashboard/src/pages/Chat/components/TrajectoryMetricsBar.module.less b/dashboard/src/pages/Chat/components/TrajectoryMetricsBar.module.less
new file mode 100644
index 00000000..ea9b1e1f
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/TrajectoryMetricsBar.module.less
@@ -0,0 +1,42 @@
+.root {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 0;
+  flex: 0 0 auto;
+  min-height: 28px;
+  padding: 6px 0 0;
+  border-top: 1px solid var(--fn-border-secondary, rgba(0, 0, 0, 0.08));
+  color: var(--fn-text-tertiary, var(--fn-text-secondary));
+  font-size: 11px;
+  line-height: 1.3;
+  font-variant-numeric: tabular-nums;
+}
+
+.chips {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 0;
+  flex: 1 1 auto;
+  min-width: 0;
+}
+
+.chipGroup {
+  display: inline-flex;
+  align-items: baseline;
+}
+
+.sep {
+  margin: 0 8px;
+  color: var(--fn-text-tertiary, #8b8b8b);
+}
+
+.chip {
+  display: inline-flex;
+  align-items: baseline;
+  font-size: 11px;
+  line-height: 1.2;
+  color: var(--fn-text-secondary);
+  white-space: nowrap;
+}
diff --git a/dashboard/src/pages/Chat/components/TrajectoryMetricsBar.test.tsx b/dashboard/src/pages/Chat/components/TrajectoryMetricsBar.test.tsx
new file mode 100644
index 00000000..97777f5d
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/TrajectoryMetricsBar.test.tsx
@@ -0,0 +1,49 @@
+import { render } from "@testing-library/react";
+import { describe, expect, it } from "vitest";
+import type { TrajectoryMetrics } from "../../../api/modules/trajectory";
+import TrajectoryMetricsBar from "./TrajectoryMetricsBar";
+
+const metrics: TrajectoryMetrics = {
+  turns: 2,
+  steps: 5,
+  llm_duration_ms: null,
+  tool_duration_ms: 40,
+  ttft_avg_ms: null,
+  tok_per_s: 0,
+  cache_hit_ratio: null,
+  input_tokens: 10,
+  output_tokens: null,
+  cache_read_tokens: null,
+};
+
+describe("TrajectoryMetricsBar", () => {
+  it("hides null metric fields and keeps zeros", () => {
+    const { container } = render(
+      <TrajectoryMetricsBar agentId="A1" threadId="T1" metrics={metrics} />,
+    );
+
+    expect(container.querySelector('[data-metric="turns"]')).not.toBeNull();
+    expect(container.querySelector('[data-metric="steps"]')).not.toBeNull();
+    expect(
+      container.querySelector('[data-metric="tool_duration_ms"]'),
+    ).not.toBeNull();
+    expect(
+      container.querySelector('[data-metric="tok_per_s"]'),
+    ).toHaveTextContent("0");
+    expect(
+      container.querySelector('[data-metric="input_tokens"]'),
+    ).not.toBeNull();
+
+    expect(
+      container.querySelector('[data-metric="llm_duration_ms"]'),
+    ).toBeNull();
+    expect(container.querySelector('[data-metric="ttft_avg_ms"]')).toBeNull();
+    expect(
+      container.querySelector('[data-metric="cache_hit_ratio"]'),
+    ).toBeNull();
+    expect(container.querySelector('[data-metric="output_tokens"]')).toBeNull();
+    expect(
+      container.querySelector('[data-metric="cache_read_tokens"]'),
+    ).toBeNull();
+  });
+});
diff --git a/dashboard/src/pages/Chat/components/TrajectoryMetricsBar.tsx b/dashboard/src/pages/Chat/components/TrajectoryMetricsBar.tsx
new file mode 100644
index 00000000..12382a3f
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/TrajectoryMetricsBar.tsx
@@ -0,0 +1,126 @@
+import { useTranslation } from "react-i18next";
+import { type TrajectoryMetrics } from "../../../api/modules/trajectory";
+import { formatDurationMs, visibleMetrics } from "../utils/trajectoryModel";
+import styles from "./TrajectoryMetricsBar.module.less";
+
+interface TrajectoryMetricsBarProps {
+  agentId: string;
+  threadId: string;
+  metrics: TrajectoryMetrics | null;
+}
+
+const METRIC_LABEL: Record<
+  keyof TrajectoryMetrics,
+  { key: string; fallback: string }
+> = {
+  turns: { key: "chat.trajectoryMetricTurns", fallback: "Turns" },
+  steps: { key: "chat.trajectoryMetricSteps", fallback: "Steps" },
+  llm_duration_ms: {
+    key: "chat.trajectoryMetricLlmMs",
+    fallback: "LLM",
+  },
+  tool_duration_ms: {
+    key: "chat.trajectoryMetricToolMs",
+    fallback: "Tool call",
+  },
+  ttft_avg_ms: { key: "chat.trajectoryMetricTtft", fallback: "TTFT avg" },
+  tok_per_s: { key: "chat.trajectoryMetricTokPerS", fallback: "tok/s" },
+  cache_hit_ratio: {
+    key: "chat.trajectoryMetricCacheHit",
+    fallback: "Cache hit",
+  },
+  input_tokens: { key: "chat.trajectoryMetricInputTokens", fallback: "Input" },
+  output_tokens: {
+    key: "chat.trajectoryMetricOutputTokens",
+    fallback: "Output",
+  },
+  cache_read_tokens: {
+    key: "chat.trajectoryMetricCacheRead",
+    fallback: "Cache read",
+  },
+};
+
+function formatTokenCount(value: number): string {
+  if (value >= 1000) {
+    const kilo = value / 1000;
+    return `${kilo >= 10 ? Math.round(kilo) : kilo.toFixed(1)}k`;
+  }
+  return String(Math.round(value));
+}
+
+function formatMetric(key: keyof TrajectoryMetrics, value: number): string {
+  if (key === "cache_hit_ratio") {
+    return `${Math.round(value * 100)}%`;
+  }
+  if (key.endsWith("_ms")) {
+    return formatDurationMs(value);
+  }
+  if (
+    key === "input_tokens" ||
+    key === "output_tokens" ||
+    key === "cache_read_tokens"
+  ) {
+    return formatTokenCount(value);
+  }
+  if (key === "tok_per_s") {
+    return Number.isInteger(value) ? String(value) : value.toFixed(1);
+  }
+  if (Number.isInteger(value)) {
+    return String(value);
+  }
+  return value.toFixed(1);
+}
+
+function chipText(
+  key: keyof TrajectoryMetrics,
+  value: number,
+  label: string,
+): string {
+  if (key === "turns" || key === "steps") {
+    return `${formatMetric(key, value)} ${label.toLowerCase()}`;
+  }
+  if (key === "tok_per_s") {
+    return `${formatMetric(key, value)} ${label}`;
+  }
+  if (key === "cache_hit_ratio") {
+    return `${label} ${formatMetric(key, value)}`;
+  }
+  return `${label} ${formatMetric(key, value)}`;
+}
+
+export default function TrajectoryMetricsBar({
+  metrics,
+}: TrajectoryMetricsBarProps) {
+  const { t } = useTranslation();
+  const entries = metrics ? visibleMetrics(metrics) : [];
+
+  return (
+    <div
+      className={styles.root}
+      aria-label={t("chat.trajectoryMetrics", "Session metrics")}
+    >
+      <div className={styles.chips}>
+        {entries.map((entry, index) => {
+          const label = METRIC_LABEL[entry.key];
+          const text = chipText(
+            entry.key,
+            entry.value,
+            t(label.key, label.fallback),
+          );
+          return (
+            <span key={entry.key} className={styles.chipGroup}>
+              {index > 0 ? (
+                <span className={styles.sep} aria-hidden>
+                  ·
+                </span>
+              ) : null}
+              <span className={styles.chip} data-metric={entry.key}>
+                {text}
+              </span>
+            </span>
+          );
+        })}
+      </div>
+    </div>
+  );
+}
diff --git a/dashboard/src/pages/Chat/components/TrajectoryTimeline.module.less b/dashboard/src/pages/Chat/components/TrajectoryTimeline.module.less
new file mode 100644
index 00000000..eeffc8c6
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/TrajectoryTimeline.module.less
@@ -0,0 +1,286 @@
+/* Chrome-Network-style three-lane overview (aligned with DSH ui-trajectory). */
+
+.root {
+  position: relative;
+  z-index: 1;
+  isolation: isolate;
+  flex: none;
+  border-bottom: 1px solid var(--fn-border-secondary, rgba(0, 0, 0, 0.08));
+  user-select: none;
+}
+
+.plot {
+  display: grid;
+  grid-template-columns: 44px minmax(0, 1fr);
+  height: 50px;
+  overflow: hidden;
+  background: var(--fn-bg-secondary, #f5f5f7);
+}
+
+.labels {
+  position: relative;
+  border-right: 1px solid var(--fn-border-secondary, rgba(0, 0, 0, 0.08));
+  color: var(--fn-text-tertiary, #8b8b8b);
+  font-size: 10px;
+  line-height: 1;
+}
+
+.labels span {
+  position: absolute;
+  right: 3px;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  height: 8px;
+  text-align: right;
+}
+
+.labels span:nth-child(1) {
+  top: 7px;
+}
+
+.labels span:nth-child(2) {
+  top: 21px;
+}
+
+.labels span:nth-child(3) {
+  top: 35px;
+}
+
+.track {
+  position: relative;
+  overflow: hidden;
+  cursor: crosshair;
+  touch-action: none;
+}
+
+.track[data-panning="true"] {
+  cursor: grabbing;
+}
+
+.track:focus-visible {
+  outline: 1px solid var(--fn-color-brand, #1677ff);
+  outline-offset: -1px;
+}
+
+.earlierHistory {
+  position: absolute;
+  z-index: 5;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  display: flex;
+  width: 28px;
+  align-items: center;
+  justify-content: flex-start;
+  appearance: none;
+  box-sizing: border-box;
+  padding-left: 3px;
+  border: 0;
+  outline: none;
+  background: linear-gradient(
+    to right,
+    var(--fn-bg-secondary, #f5f5f7) 0,
+    var(--fn-bg-secondary, #f5f5f7) 38%,
+    transparent 100%
+  );
+  color: var(--fn-text-secondary, #595959);
+  font-size: 13px;
+  line-height: 1;
+  opacity: 0.72;
+  cursor: pointer;
+}
+
+.earlierHistory:hover {
+  opacity: 1;
+}
+
+.earlierHistory[aria-disabled="true"],
+.earlierHistory:disabled {
+  cursor: default;
+}
+
+.earlierHistory:focus-visible {
+  box-shadow: inset 0 0 0 1px var(--fn-border-secondary, rgba(0, 0, 0, 0.08));
+}
+
+.empty {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  color: var(--fn-text-tertiary, #8b8b8b);
+  font-size: 12px;
+}
+
+.lanes {
+  position: absolute;
+  z-index: 2;
+  top: 7px;
+  bottom: 7px;
+  left: var(--trajectory-domain-left, 0%);
+  width: var(--trajectory-domain-width, 100%);
+}
+
+@media (prefers-reduced-motion: no-preference) {
+  .lanes[data-animate-viewport="true"] {
+    transition: left 180ms ease-out;
+  }
+}
+
+.span {
+  position: absolute;
+  top: calc(var(--trajectory-span-lane) * 14px);
+  left: calc(var(--trajectory-span-left) + var(--trajectory-span-gap));
+  width: max(
+    2px,
+    calc(
+      var(--trajectory-span-width) - var(--trajectory-span-gap) -
+        var(--trajectory-span-gap)
+    )
+  );
+  height: 8px;
+  min-width: 2px;
+  margin: 0;
+  padding: 0;
+  border: none;
+  border-radius: 1px;
+  background: var(--fn-text-tertiary, #8b8b8b);
+  opacity: 0.78;
+  cursor: pointer;
+
+  &:focus-visible {
+    outline: 1px solid var(--fn-color-brand, #1677ff);
+    outline-offset: 1px;
+  }
+}
+
+.span[data-timeline-span="user"] {
+  /* DSH Input lane: business/success green, not brand blue */
+  background: color-mix(
+    in srgb,
+    var(--fn-color-success, #389e0d) 78%,
+    var(--fn-text-tertiary, #8b8b8b)
+  );
+}
+
+.span[data-timeline-span="context"] {
+  /* Distinct from USER green: cool cyan for injected context */
+  background: color-mix(in srgb, #0891b2 82%, var(--fn-text-tertiary, #8b8b8b));
+}
+
+.span[data-timeline-span="message"],
+.span[data-timeline-span="assistant"],
+.span[data-timeline-span="compacted"] {
+  /* DSH model lane: magenta/violet mix rather than primary blue */
+  background: color-mix(in srgb, #a855f7 55%, #e11d48);
+  opacity: 1;
+}
+
+.span[data-timeline-span="tool"] {
+  background: var(--fn-color-warning, #d48806);
+  opacity: 1;
+}
+
+.span[data-error="true"] {
+  background: var(--fn-color-error, #cf1322);
+}
+
+.span[data-selected="false"] {
+  opacity: 0.2;
+}
+
+.span[data-hovered="true"]:not([data-current="true"]) {
+  z-index: 1;
+  opacity: 1;
+  box-shadow:
+    0 0 0 1px var(--fn-bg-secondary, #f5f5f7),
+    0 0 0 2px
+      color-mix(in srgb, var(--fn-color-brand, #1677ff) 80%, transparent);
+}
+
+.span[data-current="true"] {
+  z-index: 1;
+  opacity: 1;
+  box-shadow:
+    0 0 0 1px var(--fn-bg-secondary, #f5f5f7),
+    0 0 0 2px var(--fn-color-brand, #1677ff);
+}
+
+.span[data-search-match="false"] {
+  opacity: 0.14;
+}
+
+.selection {
+  position: absolute;
+  z-index: 1;
+  top: 0;
+  bottom: 0;
+  left: var(--trajectory-selection-left);
+  width: var(--trajectory-selection-width);
+  min-width: 1px;
+  background: color-mix(
+    in srgb,
+    var(--fn-color-brand, #1677ff) 12%,
+    transparent
+  );
+  box-shadow:
+    -100vw 0 0 100vw
+      color-mix(in srgb, var(--fn-bg-primary, #fff) 58%, transparent),
+    100vw 0 0 100vw
+      color-mix(in srgb, var(--fn-bg-primary, #fff) 58%, transparent);
+  pointer-events: none;
+}
+
+.selectionEdges {
+  position: absolute;
+  z-index: 4;
+  top: 0;
+  bottom: 0;
+  left: var(--trajectory-selection-left);
+  width: var(--trajectory-selection-width);
+  min-width: 1px;
+  pointer-events: none;
+}
+
+.hoverLine {
+  position: absolute;
+  z-index: 4;
+  top: 0;
+  bottom: 0;
+  left: clamp(0px, calc(var(--trajectory-hover-left) - 1px), calc(100% - 2px));
+  width: 2px;
+  background: var(--fn-color-brand, #1677ff);
+  pointer-events: none;
+}
+
+.selectionEdges::before,
+.selectionEdges::after {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  width: 3px;
+  background: var(--fn-color-brand, #1677ff);
+  content: "";
+}
+
+.selectionEdges::before {
+  left: 0;
+}
+
+.selectionEdges::after {
+  right: 0;
+}
+
+.selectionEdges[data-dragging="true"]::before,
+.selectionEdges[data-dragging="true"]::after {
+  width: 2px;
+}
+
+.selection[data-dragging="true"] {
+  background: color-mix(
+    in srgb,
+    var(--fn-color-brand, #1677ff) 18%,
+    transparent
+  );
+}
diff --git a/dashboard/src/pages/Chat/components/TrajectoryTimeline.test.tsx b/dashboard/src/pages/Chat/components/TrajectoryTimeline.test.tsx
new file mode 100644
index 00000000..ef8f9aa3
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/TrajectoryTimeline.test.tsx
@@ -0,0 +1,254 @@
+import { act, fireEvent, render, screen } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+import type { TrajectoryEvent } from "../../../api/modules/trajectory";
+import TrajectoryTimeline from "./TrajectoryTimeline";
+
+function event(
+  overrides: Partial<TrajectoryEvent> &
+    Pick<TrajectoryEvent, "event_id" | "kind">,
+): TrajectoryEvent {
+  return {
+    thread_id: "T1",
+    agent_id: "A1",
+    seq: 1,
+    ts: 1,
+    turn_id: null,
+    request_seq: null,
+    is_error: false,
+    summary: "",
+    payload: {},
+    ...overrides,
+  };
+}
+
+const sampleEvents: TrajectoryEvent[] = [
+  event({ event_id: "u", kind: "user", seq: 1 }),
+  event({
+    event_id: "a",
+    kind: "assistant",
+    seq: 2,
+    request_seq: 1,
+    payload: { llm_duration_ms: 100 },
+  }),
+  event({
+    event_id: "t1",
+    kind: "tool",
+    seq: 3,
+    payload: { name: "read_file", tool_duration_ms: 50 },
+  }),
+  event({
+    event_id: "t2",
+    kind: "tool",
+    seq: 4,
+    payload: { name: "write_file", tool_duration_ms: 50 },
+  }),
+];
+
+const interactiveProps = {
+  range: null,
+  onRangeChange: () => {},
+  selectedEventId: null,
+  searchMatchIds: null,
+  onRecordSelect: () => {},
+} as const;
+
+function mockTrack(track: HTMLElement): HTMLElement {
+  vi.spyOn(track, "getBoundingClientRect").mockReturnValue({
+    x: 0,
+    y: 0,
+    top: 0,
+    left: 0,
+    right: 400,
+    bottom: 50,
+    width: 400,
+    height: 50,
+    toJSON: () => ({}),
+  });
+  return track;
+}
+
+function pointer(
+  target: HTMLElement,
+  type: "pointerdown" | "pointermove" | "pointerup",
+  init: { button?: number; pointerId?: number; clientX: number },
+) {
+  const event = new MouseEvent(type, {
+    bubbles: true,
+    cancelable: true,
+    button: init.button ?? 0,
+    buttons: (init.button ?? 0) === 0 ? 1 : 0,
+    clientX: init.clientX,
+    clientY: 10,
+  });
+  Object.defineProperty(event, "pointerId", {
+    value: init.pointerId ?? 1,
+  });
+  Object.defineProperty(event, "pointerType", { value: "mouse" });
+  act(() => {
+    target.dispatchEvent(event);
+  });
+}
+
+describe("TrajectoryTimeline", () => {
+  it("renders discrete per-event spans on a shared three-lane track", () => {
+    render(
+      <TrajectoryTimeline
+        events={sampleEvents}
+        mode="sequence"
+        {...interactiveProps}
+      />,
+    );
+
+    expect(
+      screen.getByRole("group", { name: "Trajectory timeline" }),
+    ).toBeInTheDocument();
+    expect(screen.getByText("Input")).toBeInTheDocument();
+    expect(screen.getByText("Model")).toBeInTheDocument();
+    expect(screen.getByText("Tools")).toBeInTheDocument();
+
+    const spans = screen.getAllByRole("button", {
+      name: /^(Input|Model|Tools):/,
+    });
+    expect(spans).toHaveLength(4);
+    expect(spans[0]).toHaveAttribute("data-lane", "input");
+    expect(spans[0]).toHaveAttribute("data-timeline-span", "user");
+    expect(spans[1]).toHaveAttribute("data-lane", "model");
+    expect(spans[1]).toHaveAttribute("data-timeline-span", "message");
+    expect(spans[2]).toHaveAttribute("data-lane", "tools");
+    expect(spans[2]).toHaveAttribute("data-event-ids", "t1");
+    expect(spans[3]).toHaveAttribute("data-event-ids", "t2");
+    spans[0].focus();
+    expect(spans[0]).toHaveFocus();
+  });
+
+  it("sizes duration-mode spans from payload durations", () => {
+    render(
+      <TrajectoryTimeline
+        events={sampleEvents.slice(1)}
+        mode="duration"
+        {...interactiveProps}
+      />,
+    );
+
+    const model = screen.getByRole("button", { name: /Model: assistant/ });
+    const tools = screen.getAllByRole("button", { name: /Tools: tool/ });
+    expect(model).toHaveAttribute("data-start", "0");
+    expect(model).toHaveAttribute("data-end", "100");
+    expect(tools[0]).toHaveAttribute("data-start", "100");
+    expect(tools[0]).toHaveAttribute("data-end", "150");
+    expect(tools[1]).toHaveAttribute("data-start", "150");
+    expect(tools[1]).toHaveAttribute("data-end", "200");
+  });
+
+  it("calls onRecordSelect when a span is clicked", () => {
+    const onRecordSelect = vi.fn();
+    render(
+      <TrajectoryTimeline
+        events={sampleEvents}
+        mode="sequence"
+        range={null}
+        onRangeChange={() => {}}
+        selectedEventId={null}
+        searchMatchIds={null}
+        onRecordSelect={onRecordSelect}
+      />,
+    );
+    fireEvent.click(screen.getByRole("button", { name: /Input: user/ }));
+    expect(onRecordSelect).toHaveBeenCalledWith("u");
+  });
+
+  it("dims non-matching spans when searchMatchIds is set", () => {
+    render(
+      <TrajectoryTimeline
+        events={sampleEvents}
+        mode="sequence"
+        range={null}
+        onRangeChange={() => {}}
+        selectedEventId={null}
+        searchMatchIds={new Set(["u"])}
+        onRecordSelect={() => {}}
+      />,
+    );
+    expect(
+      screen.getByRole("button", { name: /Model: assistant/ }),
+    ).toHaveAttribute("data-search-match", "false");
+    expect(screen.getByRole("button", { name: /Input: user/ })).toHaveAttribute(
+      "data-search-match",
+      "true",
+    );
+  });
+
+  it("commits a range when dragging on the track", () => {
+    const onRangeChange = vi.fn();
+    render(
+      <TrajectoryTimeline
+        events={sampleEvents}
+        mode="sequence"
+        range={null}
+        onRangeChange={onRangeChange}
+        selectedEventId={null}
+        searchMatchIds={null}
+        onRecordSelect={() => {}}
+      />,
+    );
+    const track = mockTrack(
+      screen.getByRole("group", { name: "Trajectory timeline" }),
+    );
+    pointer(track, "pointerdown", { clientX: 40 });
+    pointer(track, "pointermove", { clientX: 200 });
+    pointer(track, "pointerup", { clientX: 200 });
+    expect(onRangeChange).toHaveBeenCalledTimes(1);
+    const committed = onRangeChange.mock.calls[0][0] as {
+      start: number;
+      end: number;
+    };
+    expect(committed.end).toBeGreaterThan(committed.start);
+  });
+
+  it("clears the range on Escape", () => {
+    const onRangeChange = vi.fn();
+    render(
+      <TrajectoryTimeline
+        events={sampleEvents}
+        mode="sequence"
+        range={{ start: 0, end: 2 }}
+        onRangeChange={onRangeChange}
+        selectedEventId={null}
+        searchMatchIds={null}
+        onRecordSelect={() => {}}
+      />,
+    );
+    fireEvent.keyDown(
+      screen.getByRole("group", { name: "Trajectory timeline" }),
+      { key: "Escape" },
+    );
+    expect(onRangeChange).toHaveBeenCalledWith(null);
+  });
+
+  it("calls onRecordSelect after a whitespace range commit", async () => {
+    const onRangeChange = vi.fn();
+    const onRecordSelect = vi.fn();
+    render(
+      <TrajectoryTimeline
+        events={sampleEvents}
+        mode="sequence"
+        range={null}
+        onRangeChange={onRangeChange}
+        selectedEventId={null}
+        searchMatchIds={null}
+        onRecordSelect={onRecordSelect}
+      />,
+    );
+    const track = mockTrack(
+      screen.getByRole("group", { name: "Trajectory timeline" }),
+    );
+    pointer(track, "pointerdown", { clientX: 10 });
+    pointer(track, "pointerup", { clientX: 10 });
+    expect(onRangeChange).toHaveBeenCalledTimes(1);
+    expect(onRangeChange.mock.calls[0][0]).not.toBeNull();
+
+    await Promise.resolve();
+    fireEvent.click(screen.getByRole("button", { name: /Input: user/ }));
+    expect(onRecordSelect).toHaveBeenCalledWith("u");
+  });
+});
diff --git a/dashboard/src/pages/Chat/components/TrajectoryTimeline.tsx b/dashboard/src/pages/Chat/components/TrajectoryTimeline.tsx
new file mode 100644
index 00000000..907fc770
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/TrajectoryTimeline.tsx
@@ -0,0 +1,697 @@
+import { Tooltip } from "antd";
+import {
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+  type CSSProperties,
+  type KeyboardEvent,
+  type PointerEvent,
+} from "react";
+import { useTranslation } from "react-i18next";
+import type { TrajectoryEvent } from "../../../api/modules/trajectory";
+import {
+  clamp,
+  deriveSwimlaneSpans,
+  orderedRange,
+  panDomain,
+  zoomDomain,
+  type SwimlaneSpan,
+  type TrajectoryTimeRange,
+} from "../utils/trajectoryTimeline";
+import styles from "./TrajectoryTimeline.module.less";
+
+const LANE_INDEX = { input: 0, model: 1, tools: 2 } as const;
+const MINIMUM_DRAG_PX = 3;
+const MINIMUM_ZOOM_OPERATIONS = 4;
+const DURATION_MIN_DOMAIN = 20;
+const EDGE_PAN_ZONE_FRACTION = 0.08;
+const EDGE_PAN_STEP_FRACTION = 0.025;
+const MAXIMUM_EDGE_PAN_PX = 32;
+const TIMELINE_TOOLTIP_DELAY_S = 0.5;
+
+export type TrajectoryTimelineMode = "sequence" | "duration";
+
+export interface TrajectoryTimelineProps {
+  events: TrajectoryEvent[];
+  mode: TrajectoryTimelineMode;
+  range: TrajectoryTimeRange | null;
+  onRangeChange: (range: TrajectoryTimeRange | null) => void;
+  selectedEventId: string | null;
+  searchMatchIds: ReadonlySet<string> | null;
+  hasEarlier?: boolean;
+  onLoadEarlier?: () => void | Promise<void>;
+  onRecordSelect: (eventId: string) => void;
+  onRecordFocus?: (eventId: string) => void;
+}
+
+interface HoverPoint {
+  fraction: number;
+  eventId: string | null;
+}
+
+interface DragGesture {
+  pointerId: number;
+  anchorTime: number;
+  anchorClientX: number;
+  eventId: string | null;
+}
+
+interface PanGesture {
+  anchorClientX: number;
+  anchorStart: number;
+  moved: boolean;
+  pannable: boolean;
+  pointerId: number;
+}
+
+function spanKindAttr(kind: string): string {
+  if (kind === "assistant") return "message";
+  return kind;
+}
+
+function spanPrimaryId(span: SwimlaneSpan): string {
+  return span.eventIds[0] ?? span.id;
+}
+
+function spanIntersects(
+  span: SwimlaneSpan,
+  range: TrajectoryTimeRange,
+): boolean {
+  return span.start <= range.end && span.end >= range.start;
+}
+
+function rangeFraction(
+  range: TrajectoryTimeRange,
+  start: number,
+  duration: number,
+  minimum: number,
+  maximum: number,
+): { start: number; end: number } {
+  const bounded = orderedRange(
+    clamp(range.start, minimum, maximum),
+    clamp(range.end, minimum, maximum),
+  );
+  return {
+    start: (bounded.start - start) / duration,
+    end: (bounded.end - start) / duration,
+  };
+}
+
+function centeredRange(
+  center: number,
+  width: number,
+  minimum: number,
+  maximum: number,
+): TrajectoryTimeRange {
+  const clampedWidth = Math.min(maximum - minimum, Math.max(0, width));
+  const start = Math.min(
+    Math.max(center - clampedWidth / 2, minimum),
+    maximum - clampedWidth,
+  );
+  return { start, end: start + clampedWidth };
+}
+
+function eventIdAt(target: EventTarget | null): string | null {
+  const el = target instanceof HTMLElement ? target : null;
+  const value = el?.closest("[data-event-ids]")?.getAttribute("data-event-ids");
+  if (value == null || value === "") return null;
+  return value.split(",")[0] ?? null;
+}
+
+function nearestSpan(
+  spans: readonly SwimlaneSpan[],
+  timelinePoint: number,
+): SwimlaneSpan | undefined {
+  if (spans.length === 0) return undefined;
+  const distance = (span: SwimlaneSpan): number => {
+    if (timelinePoint < span.start) return span.start - timelinePoint;
+    if (timelinePoint > span.end) return timelinePoint - span.end;
+    return 0;
+  };
+  return spans.reduce((candidate, span) =>
+    distance(span) < distance(candidate) ? span : candidate,
+  );
+}
+
+function EarlierHistoryBoundary({
+  loading,
+  onHover,
+  onLoad,
+  label,
+}: {
+  loading: boolean;
+  onHover: () => void;
+  onLoad: (() => void) | undefined;
+  label: string;
+}) {
+  return (
+    <button
+      type="button"
+      className={styles.earlierHistory}
+      aria-label={label}
+      aria-disabled={onLoad === undefined}
+      disabled={loading || onLoad === undefined}
+      onClick={(event) => {
+        event.stopPropagation();
+        onLoad?.();
+      }}
+      onPointerEnter={() => {
+        onHover();
+      }}
+      onPointerMove={(event) => {
+        event.stopPropagation();
+      }}
+      onPointerDown={(event) => {
+        event.stopPropagation();
+      }}
+    >
+      …
+    </button>
+  );
+}
+
+export default function TrajectoryTimeline({
+  events,
+  mode,
+  range,
+  onRangeChange,
+  selectedEventId,
+  searchMatchIds,
+  hasEarlier = false,
+  onLoadEarlier,
+  onRecordSelect,
+  onRecordFocus,
+}: TrajectoryTimelineProps) {
+  const { t } = useTranslation();
+  const spans = useMemo(
+    () => deriveSwimlaneSpans(events, mode),
+    [events, mode],
+  );
+  const modelStart = spans.reduce(
+    (min, span) => Math.min(min, span.start),
+    spans[0]?.start ?? 0,
+  );
+  const modelEnd = spans.reduce(
+    (max, span) => Math.max(max, span.end),
+    modelStart + 1,
+  );
+  const dragRef = useRef<DragGesture | null>(null);
+  const panRef = useRef<PanGesture | null>(null);
+  const suppressClickRef = useRef(false);
+  const rootRef = useRef<HTMLElement | null>(null);
+  const trackRef = useRef<HTMLDivElement | null>(null);
+  const [draft, setDraft] = useState<TrajectoryTimeRange | null>(null);
+  const [hover, setHover] = useState<HoverPoint | null>(null);
+  const [loadingEarlier, setLoadingEarlier] = useState(false);
+  const [panning, setPanning] = useState(false);
+  const [viewport, setViewport] = useState<TrajectoryTimeRange | null>(null);
+  const [animateViewport, setAnimateViewport] = useState(false);
+
+  useEffect(() => {
+    if (range !== null && (range.end < modelStart || range.start > modelEnd)) {
+      onRangeChange(null);
+    }
+  }, [modelEnd, modelStart, onRangeChange, range]);
+
+  useEffect(() => {
+    setAnimateViewport(false);
+    setViewport((current) =>
+      current !== null && (current.end < modelStart || current.start > modelEnd)
+        ? null
+        : current,
+    );
+  }, [modelEnd, modelStart]);
+
+  useEffect(() => {
+    if (selectedEventId === null) return;
+    const selectedSpan = spans.find((span) =>
+      span.eventIds.includes(selectedEventId),
+    );
+    if (selectedSpan === undefined) return;
+    setAnimateViewport(true);
+    setViewport((current) => {
+      if (current === null) return current;
+      if (
+        selectedSpan.end > current.start &&
+        selectedSpan.start < current.end
+      ) {
+        return current;
+      }
+      const duration = Math.max(1, current.end - current.start);
+      const desiredStart =
+        selectedSpan.end <= current.start
+          ? selectedSpan.start
+          : selectedSpan.end - duration;
+      const nextStart = Math.min(
+        Math.max(desiredStart, modelStart),
+        Math.max(modelStart, modelEnd - duration),
+      );
+      if (nextStart === current.start) return current;
+      return { start: nextStart, end: nextStart + duration };
+    });
+  }, [modelEnd, modelStart, selectedEventId, spans]);
+
+  const fullDuration = Math.max(1, modelEnd - modelStart);
+  const viewportDuration = Math.min(
+    fullDuration,
+    Math.max(1, (viewport?.end ?? 0) - (viewport?.start ?? 0)),
+  );
+  const viewportStart =
+    viewport === null
+      ? modelStart
+      : Math.min(
+          Math.max(viewport.start, modelStart),
+          modelEnd - viewportDuration,
+        );
+  const domainDuration = viewport === null ? fullDuration : viewportDuration;
+  const domainStart = viewport === null ? modelStart : viewportStart;
+  const showsEarlierBoundary =
+    hasEarlier && (spans.length === 0 || domainStart === modelStart);
+  const loadEarlier =
+    onLoadEarlier === undefined || loadingEarlier
+      ? undefined
+      : () => {
+          setLoadingEarlier(true);
+          void Promise.resolve(onLoadEarlier()).finally(() => {
+            setLoadingEarlier(false);
+          });
+        };
+
+  const projectedDomainStyle = {
+    "--trajectory-domain-left": `${
+      (-(domainStart - modelStart) / domainDuration) * 100
+    }%`,
+    "--trajectory-domain-width": `${(fullDuration / domainDuration) * 100}%`,
+  } as CSSProperties;
+  const committed =
+    range === null
+      ? null
+      : rangeFraction(range, domainStart, domainDuration, modelStart, modelEnd);
+  const draftFraction =
+    draft === null
+      ? null
+      : rangeFraction(draft, domainStart, domainDuration, modelStart, modelEnd);
+  const visibleRange = draftFraction ?? committed;
+  const activeRange = draft ?? range;
+
+  useEffect(() => {
+    const root = rootRef.current;
+    if (root === null) return;
+    const onWheel = (event: WheelEvent): void => {
+      event.preventDefault();
+      const track = trackRef.current;
+      if (track === null || spans.length === 0) return;
+      setAnimateViewport(false);
+      const rect = track.getBoundingClientRect();
+      const anchorFraction = clamp(
+        (event.clientX - rect.left) / Math.max(1, rect.width),
+        0,
+        1,
+      );
+      const next = zoomDomain({
+        fullStart: modelStart,
+        fullEnd: modelEnd,
+        domainStart,
+        domainEnd: domainStart + domainDuration,
+        anchorFraction,
+        zoomFactor: Math.exp(event.deltaY * 0.0015),
+        minDomain: Math.min(
+          mode === "sequence" ? MINIMUM_ZOOM_OPERATIONS : DURATION_MIN_DOMAIN,
+          fullDuration,
+        ),
+      });
+      if (next.end - next.start >= fullDuration * 0.999) {
+        setViewport(null);
+        return;
+      }
+      setViewport(next);
+    };
+    root.addEventListener("wheel", onWheel, { passive: false });
+    return () => {
+      root.removeEventListener("wheel", onWheel);
+    };
+  }, [
+    domainDuration,
+    domainStart,
+    fullDuration,
+    mode,
+    modelEnd,
+    modelStart,
+    spans.length,
+  ]);
+
+  const laneName = {
+    input: t("chat.trajectoryLaneInput", "Input"),
+    model: t("chat.trajectoryLaneModel", "Model"),
+    tools: t("chat.trajectoryLaneTools", "Tools"),
+  };
+  const earlierLabel = t("chat.trajectoryLoadEarlier", "Load earlier history");
+
+  const fractionAt = (event: PointerEvent<HTMLDivElement>): number => {
+    const rect = event.currentTarget.getBoundingClientRect();
+    return clamp((event.clientX - rect.left) / Math.max(1, rect.width), 0, 1);
+  };
+
+  const capturePointer = (event: PointerEvent<HTMLDivElement>) => {
+    if (typeof event.currentTarget.setPointerCapture === "function") {
+      event.currentTarget.setPointerCapture(event.pointerId);
+    }
+  };
+
+  const armSuppressTrailingClick = () => {
+    suppressClickRef.current = true;
+    queueMicrotask(() => {
+      suppressClickRef.current = false;
+    });
+  };
+
+  const onPointerDown = (event: PointerEvent<HTMLDivElement>) => {
+    suppressClickRef.current = false;
+    if (event.button === 2) {
+      panRef.current = {
+        anchorClientX: event.clientX,
+        anchorStart: domainStart,
+        moved: false,
+        pannable: viewport !== null,
+        pointerId: event.pointerId,
+      };
+      if (viewport !== null) setAnimateViewport(false);
+      setPanning(true);
+      capturePointer(event);
+      return;
+    }
+    if (event.button !== 0 || spans.length === 0) return;
+    const anchor = fractionAt(event);
+    const anchorTime = domainStart + anchor * domainDuration;
+    const eventId = eventIdAt(event.target);
+    setHover({ fraction: anchor, eventId });
+    dragRef.current = {
+      pointerId: event.pointerId,
+      anchorTime,
+      anchorClientX: event.clientX,
+      eventId,
+    };
+    capturePointer(event);
+    setDraft({ start: anchorTime, end: anchorTime });
+  };
+
+  const onPointerMove = (event: PointerEvent<HTMLDivElement>) => {
+    const rect = event.currentTarget.getBoundingClientRect();
+    const fraction = fractionAt(event);
+    setHover({ fraction, eventId: eventIdAt(event.target) });
+    const pan = panRef.current;
+    if (pan !== null && pan.pointerId === event.pointerId) {
+      if (Math.abs(event.clientX - pan.anchorClientX) >= MINIMUM_DRAG_PX) {
+        pan.moved = true;
+      }
+      if (!pan.pannable) return;
+      setViewport(
+        panDomain({
+          fullStart: modelStart,
+          fullEnd: modelEnd,
+          domainStart: pan.anchorStart,
+          domainEnd: pan.anchorStart + domainDuration,
+          deltaFraction:
+            -(event.clientX - pan.anchorClientX) / Math.max(1, rect.width),
+        }),
+      );
+      return;
+    }
+    const drag = dragRef.current;
+    if (drag === null || drag.pointerId !== event.pointerId) return;
+    let nextDomainStart = domainStart;
+    if (viewport !== null) {
+      const localX = event.clientX - rect.left;
+      const edgeWidth = Math.min(
+        MAXIMUM_EDGE_PAN_PX,
+        Math.max(1, rect.width * EDGE_PAN_ZONE_FRACTION),
+      );
+      const direction =
+        localX < edgeWidth ? -1 : localX > rect.width - edgeWidth ? 1 : 0;
+      if (direction !== 0) {
+        const edgeDistance =
+          direction < 0
+            ? edgeWidth - localX
+            : localX - (rect.width - edgeWidth);
+        const strength = clamp(edgeDistance / edgeWidth, 0, 1);
+        const desiredStart =
+          domainStart +
+          direction *
+            domainDuration *
+            EDGE_PAN_STEP_FRACTION *
+            Math.max(0.2, strength);
+        nextDomainStart = Math.min(
+          Math.max(desiredStart, modelStart),
+          modelEnd - domainDuration,
+        );
+        if (nextDomainStart !== domainStart) {
+          setAnimateViewport(false);
+          setViewport({
+            start: nextDomainStart,
+            end: nextDomainStart + domainDuration,
+          });
+        }
+      }
+    }
+    const pointTime = nextDomainStart + fraction * domainDuration;
+    setDraft(orderedRange(drag.anchorTime, pointTime));
+  };
+
+  const onPointerEnd = (event: PointerEvent<HTMLDivElement>) => {
+    const pan = panRef.current;
+    if (pan !== null && pan.pointerId === event.pointerId) {
+      const moved =
+        pan.moved ||
+        Math.abs(event.clientX - pan.anchorClientX) >= MINIMUM_DRAG_PX;
+      panRef.current = null;
+      setPanning(false);
+      if (!moved) onRangeChange(null);
+      return;
+    }
+    const drag = dragRef.current;
+    if (drag === null || drag.pointerId !== event.pointerId) return;
+    const pointFraction = fractionAt(event);
+    const pointTime = domainStart + pointFraction * domainDuration;
+    const selected = orderedRange(drag.anchorTime, pointTime);
+    setHover({ fraction: pointFraction, eventId: eventIdAt(event.target) });
+    dragRef.current = null;
+    setDraft(null);
+    const click =
+      Math.abs(event.clientX - drag.anchorClientX) < MINIMUM_DRAG_PX;
+    if (click && drag.eventId !== null) {
+      return;
+    }
+    const minimumSelectionDuration = Math.min(
+      domainDuration,
+      fullDuration / Math.max(1, spans.length),
+    );
+    const committedRange =
+      selected.end - selected.start < minimumSelectionDuration
+        ? centeredRange(
+            click ? selected.start : (selected.start + selected.end) / 2,
+            minimumSelectionDuration,
+            modelStart,
+            modelEnd,
+          )
+        : selected;
+    armSuppressTrailingClick();
+    onRangeChange(committedRange);
+    if (click) {
+      const nearest = nearestSpan(spans, selected.start);
+      if (nearest !== undefined) onRecordFocus?.(spanPrimaryId(nearest));
+    }
+  };
+
+  const onPointerCancel = () => {
+    dragRef.current = null;
+    panRef.current = null;
+    suppressClickRef.current = false;
+    setDraft(null);
+    setHover(null);
+    setPanning(false);
+  };
+
+  const onKeyDown = (event: KeyboardEvent<HTMLDivElement>) => {
+    if (event.key !== "Escape" || range === null) return;
+    event.preventDefault();
+    onRangeChange(null);
+  };
+
+  const onSpanClick = (eventId: string) => {
+    if (suppressClickRef.current) {
+      suppressClickRef.current = false;
+      return;
+    }
+    onRangeChange(null);
+    onRecordSelect(eventId);
+  };
+
+  const empty = spans.length === 0;
+  const selectionStyle =
+    visibleRange === null
+      ? undefined
+      : ({
+          "--trajectory-selection-left": `${visibleRange.start * 100}%`,
+          "--trajectory-selection-width": `${
+            (visibleRange.end - visibleRange.start) * 100
+          }%`,
+        } as CSSProperties);
+  const hoverStyle =
+    hover === null
+      ? undefined
+      : ({
+          "--trajectory-hover-left": `${hover.fraction * 100}%`,
+        } as CSSProperties);
+
+  return (
+    <section
+      ref={rootRef}
+      className={styles.root}
+      aria-label={t("chat.trajectoryTimeline", "Trajectory timeline")}
+    >
+      <div className={styles.plot}>
+        <div className={styles.labels} aria-hidden="true">
+          <span>{laneName.input}</span>
+          <span>{laneName.model}</span>
+          <span>{laneName.tools}</span>
+        </div>
+        <div
+          ref={trackRef}
+          className={styles.track}
+          role="group"
+          tabIndex={0}
+          data-panning={panning || undefined}
+          aria-label={t("chat.trajectoryTimeline", "Trajectory timeline")}
+          style={hoverStyle}
+          onPointerDown={onPointerDown}
+          onPointerMove={onPointerMove}
+          onPointerUp={onPointerEnd}
+          onPointerCancel={onPointerCancel}
+          onKeyDown={onKeyDown}
+          onPointerLeave={() => {
+            if (dragRef.current === null && panRef.current === null) {
+              setHover(null);
+            }
+          }}
+          onDoubleClick={(event) => {
+            event.preventDefault();
+            onRangeChange(null);
+          }}
+          onContextMenu={(event) => {
+            event.preventDefault();
+          }}
+        >
+          {showsEarlierBoundary ? (
+            <EarlierHistoryBoundary
+              loading={loadingEarlier}
+              onHover={() => {
+                setHover(null);
+              }}
+              onLoad={loadEarlier}
+              label={earlierLabel}
+            />
+          ) : null}
+          {hover !== null && hover.eventId === null && draft === null ? (
+            <div className={styles.hoverLine} aria-hidden="true" />
+          ) : null}
+          {visibleRange !== null && selectionStyle !== undefined ? (
+            <>
+              <div
+                className={styles.selection}
+                data-dragging={draft !== null || undefined}
+                style={selectionStyle}
+                aria-hidden="true"
+              />
+              <div
+                className={styles.selectionEdges}
+                data-dragging={draft !== null || undefined}
+                style={selectionStyle}
+                aria-hidden="true"
+              />
+            </>
+          ) : null}
+          {empty ? (
+            <span className={styles.empty}>
+              {t("chat.trajectoryEmpty", "No trajectory events yet")}
+            </span>
+          ) : (
+            <div
+              className={styles.lanes}
+              data-animate-viewport={animateViewport || undefined}
+              style={projectedDomainStyle}
+            >
+              {spans
+                .filter(
+                  (span) =>
+                    span.eventIds.includes(selectedEventId ?? "") ||
+                    (span.end >= domainStart &&
+                      span.start <= domainStart + domainDuration),
+                )
+                .map((span) => {
+                  const eventId = spanPrimaryId(span);
+                  const current =
+                    selectedEventId !== null &&
+                    span.eventIds.includes(selectedEventId);
+                  const left = ((span.start - modelStart) / fullDuration) * 100;
+                  const width = ((span.end - span.start) / fullDuration) * 100;
+                  const label = `${laneName[span.lane]}: ${span.kind}`;
+                  return (
+                    <Tooltip
+                      key={span.id}
+                      title={label}
+                      mouseEnterDelay={TIMELINE_TOOLTIP_DELAY_S}
+                    >
+                      <button
+                        type="button"
+                        className={styles.span}
+                        data-timeline-span={spanKindAttr(span.kind)}
+                        data-lane={span.lane}
+                        data-start={span.start}
+                        data-end={span.end}
+                        data-event-ids={span.eventIds.join(",")}
+                        data-error={span.isError || undefined}
+                        data-current={current || undefined}
+                        data-selected={
+                          activeRange === null
+                            ? undefined
+                            : spanIntersects(span, activeRange)
+                            ? "true"
+                            : "false"
+                        }
+                        data-search-match={
+                          searchMatchIds === null
+                            ? undefined
+                            : span.eventIds.some((id) => searchMatchIds.has(id))
+                            ? "true"
+                            : "false"
+                        }
+                        data-hovered={
+                          hover?.eventId === eventId ? "true" : undefined
+                        }
+                        aria-pressed={current}
+                        aria-label={label}
+                        style={
+                          {
+                            "--trajectory-span-left": `${left}%`,
+                            "--trajectory-span-width": `${width}%`,
+                            "--trajectory-span-gap": `min(${
+                              width * 0.08
+                            }%, 1px)`,
+                            "--trajectory-span-lane": LANE_INDEX[span.lane],
+                          } as CSSProperties
+                        }
+                        onClick={() => {
+                          onSpanClick(eventId);
+                        }}
+                      />
+                    </Tooltip>
+                  );
+                })}
+            </div>
+          )}
+        </div>
+      </div>
+    </section>
+  );
+}
diff --git a/dashboard/src/pages/Chat/components/TrajectoryToolbar.module.less b/dashboard/src/pages/Chat/components/TrajectoryToolbar.module.less
new file mode 100644
index 00000000..4352e0dc
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/TrajectoryToolbar.module.less
@@ -0,0 +1,139 @@
+.root {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 8px;
+  flex: 0 0 auto;
+}
+
+.toggles {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 2px;
+  min-width: 0;
+}
+
+.search {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  flex: 0 0 auto;
+  width: 220px;
+  max-width: min(220px, 48vw);
+  height: 26px;
+  margin-left: auto;
+  padding: 0 8px;
+  border: 1px solid var(--fn-border-secondary, rgba(0, 0, 0, 0.08));
+  border-radius: 4px;
+  background: var(--fn-bg-secondary, #f5f5f7);
+  cursor: text;
+
+  &:hover {
+    border-color: var(--fn-border-primary, rgba(0, 0, 0, 0.14));
+  }
+
+  &:focus-within {
+    border-color: var(--fn-border-primary, rgba(0, 0, 0, 0.22));
+    background: var(--fn-bg-primary, #fff);
+    box-shadow: none;
+    outline: none;
+  }
+
+  input {
+    flex: 1 1 auto;
+    min-width: 0;
+    height: 100%;
+    margin: 0;
+    padding: 0;
+    border: 0;
+    outline: none;
+    background: transparent;
+    font: inherit;
+    font-size: 12px;
+    line-height: 1;
+    color: var(--fn-text-primary);
+    appearance: none;
+
+    &::placeholder {
+      color: var(--fn-text-tertiary, #8b8b8b);
+    }
+
+    &::-webkit-search-decoration,
+    &::-webkit-search-cancel-button,
+    &::-webkit-search-results-button,
+    &::-webkit-search-results-decoration {
+      display: none;
+    }
+  }
+}
+
+.searchIcon {
+  flex: none;
+  color: var(--fn-text-tertiary, #8b8b8b);
+}
+
+.icon {
+  flex: none;
+}
+
+.toggle,
+.switch {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  height: 22px;
+  border: none;
+  background: transparent;
+  border-radius: 3px;
+  padding: 0 7px;
+  font: inherit;
+  font-size: 12px;
+  line-height: 1;
+  color: var(--fn-text-tertiary, var(--fn-text-secondary));
+  cursor: pointer;
+
+  &:hover {
+    color: var(--fn-text-primary);
+    background: var(--fn-bg-secondary, #f5f5f7);
+  }
+
+  &[aria-pressed="true"] {
+    color: var(--fn-text-primary);
+  }
+
+  &:focus-visible {
+    outline: 1px solid var(--fn-color-brand, #1677ff);
+    outline-offset: 1px;
+  }
+}
+
+.switchTrack {
+  position: relative;
+  display: inline-block;
+  flex: none;
+  width: 20px;
+  height: 10px;
+  border-radius: 5px;
+  background: var(--fn-border-secondary, rgba(0, 0, 0, 0.14));
+  transition: background-color 120ms ease;
+
+  &[data-on="true"] {
+    background: var(--fn-color-brand, #1677ff);
+  }
+}
+
+.switchThumb {
+  position: absolute;
+  top: 2px;
+  left: 2px;
+  width: 6px;
+  height: 6px;
+  border-radius: 50%;
+  background: var(--fn-bg-primary, #fff);
+  transition: transform 120ms ease;
+
+  .switchTrack[data-on="true"] & {
+    transform: translateX(10px);
+  }
+}
diff --git a/dashboard/src/pages/Chat/components/TrajectoryToolbar.test.tsx b/dashboard/src/pages/Chat/components/TrajectoryToolbar.test.tsx
new file mode 100644
index 00000000..2028e9fb
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/TrajectoryToolbar.test.tsx
@@ -0,0 +1,76 @@
+import { render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { describe, expect, it, vi } from "vitest";
+import TrajectoryToolbar from "./TrajectoryToolbar";
+
+describe("TrajectoryToolbar", () => {
+  it("toggles duration and search", async () => {
+    const user = userEvent.setup();
+    const onDurationOnChange = vi.fn();
+    const onSearchQueryChange = vi.fn();
+    render(
+      <TrajectoryToolbar
+        durationOn={false}
+        onDurationOnChange={onDurationOnChange}
+        allTurnsCollapsed={false}
+        onToggleAllTurns={() => {}}
+        allCallsCollapsed={false}
+        onToggleAllCalls={() => {}}
+        searchQuery=""
+        onSearchQueryChange={onSearchQueryChange}
+      />,
+    );
+    await user.click(screen.getByRole("button", { name: /Duration/i }));
+    expect(onDurationOnChange).toHaveBeenCalledWith(true);
+    await user.type(screen.getByRole("searchbox"), "read");
+    expect(onSearchQueryChange).toHaveBeenCalled();
+  });
+
+  it("shows fold icons for turns and calls instead of a selected-filter look", () => {
+    const { rerender } = render(
+      <TrajectoryToolbar
+        durationOn={false}
+        onDurationOnChange={() => {}}
+        allTurnsCollapsed={false}
+        onToggleAllTurns={() => {}}
+        allCallsCollapsed={false}
+        onToggleAllCalls={() => {}}
+        searchQuery=""
+        onSearchQueryChange={() => {}}
+      />,
+    );
+    expect(screen.getByRole("button", { name: /Turns/i })).toHaveAttribute(
+      "aria-pressed",
+      "false",
+    );
+    expect(screen.getByRole("button", { name: /Calls/i })).toHaveAttribute(
+      "aria-pressed",
+      "false",
+    );
+
+    rerender(
+      <TrajectoryToolbar
+        durationOn={true}
+        onDurationOnChange={() => {}}
+        allTurnsCollapsed={true}
+        onToggleAllTurns={() => {}}
+        allCallsCollapsed={true}
+        onToggleAllCalls={() => {}}
+        searchQuery=""
+        onSearchQueryChange={() => {}}
+      />,
+    );
+    expect(screen.getByRole("button", { name: /Duration/i })).toHaveAttribute(
+      "aria-pressed",
+      "true",
+    );
+    expect(screen.getByRole("button", { name: /Turns/i })).toHaveAttribute(
+      "aria-pressed",
+      "true",
+    );
+    expect(screen.getByRole("button", { name: /Calls/i })).toHaveAttribute(
+      "aria-pressed",
+      "true",
+    );
+  });
+});
diff --git a/dashboard/src/pages/Chat/components/TrajectoryToolbar.tsx b/dashboard/src/pages/Chat/components/TrajectoryToolbar.tsx
new file mode 100644
index 00000000..92b712aa
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/TrajectoryToolbar.tsx
@@ -0,0 +1,123 @@
+import { Clock, Search, SquareMinus, SquarePlus } from "lucide-react";
+import { useTranslation } from "react-i18next";
+import styles from "./TrajectoryToolbar.module.less";
+
+export interface TrajectoryToolbarProps {
+  durationOn: boolean;
+  onDurationOnChange: (next: boolean) => void;
+  allTurnsCollapsed: boolean;
+  onToggleAllTurns: () => void;
+  allCallsCollapsed: boolean;
+  onToggleAllCalls: () => void;
+  searchQuery: string;
+  onSearchQueryChange: (query: string) => void;
+}
+
+export default function TrajectoryToolbar({
+  durationOn,
+  onDurationOnChange,
+  allTurnsCollapsed,
+  onToggleAllTurns,
+  allCallsCollapsed,
+  onToggleAllCalls,
+  searchQuery,
+  onSearchQueryChange,
+}: TrajectoryToolbarProps) {
+  const { t } = useTranslation();
+  const searchLabel = t("chat.trajectoryToolbarSearch", "Search trajectory");
+  const durationLabel = t("chat.trajectoryToolbarDuration", "Duration");
+  const turnsLabel = t("chat.trajectoryToolbarTurns", "Turns");
+  const callsLabel = t("chat.trajectoryToolbarCalls", "Calls");
+
+  return (
+    <div className={styles.root}>
+      <div className={styles.toggles}>
+        <button
+          type="button"
+          className={styles.switch}
+          aria-pressed={durationOn}
+          aria-label={durationLabel}
+          onClick={() => onDurationOnChange(!durationOn)}
+        >
+          <Clock
+            size={12}
+            strokeWidth={1.75}
+            aria-hidden
+            className={styles.icon}
+          />
+          <span
+            className={styles.switchTrack}
+            data-on={durationOn ? "true" : "false"}
+            aria-hidden
+          >
+            <span className={styles.switchThumb} />
+          </span>
+          <span>{durationLabel}</span>
+        </button>
+        <button
+          type="button"
+          className={styles.toggle}
+          aria-pressed={allTurnsCollapsed}
+          aria-label={turnsLabel}
+          onClick={onToggleAllTurns}
+        >
+          {allTurnsCollapsed ? (
+            <SquarePlus
+              size={12}
+              strokeWidth={1.75}
+              aria-hidden
+              className={styles.icon}
+            />
+          ) : (
+            <SquareMinus
+              size={12}
+              strokeWidth={1.75}
+              aria-hidden
+              className={styles.icon}
+            />
+          )}
+          <span>{turnsLabel}</span>
+        </button>
+        <button
+          type="button"
+          className={styles.toggle}
+          aria-pressed={allCallsCollapsed}
+          aria-label={callsLabel}
+          onClick={onToggleAllCalls}
+        >
+          {allCallsCollapsed ? (
+            <SquarePlus
+              size={12}
+              strokeWidth={1.75}
+              aria-hidden
+              className={styles.icon}
+            />
+          ) : (
+            <SquareMinus
+              size={12}
+              strokeWidth={1.75}
+              aria-hidden
+              className={styles.icon}
+            />
+          )}
+          <span>{callsLabel}</span>
+        </button>
+      </div>
+      <label className={styles.search}>
+        <Search
+          size={12}
+          strokeWidth={2}
+          aria-hidden
+          className={styles.searchIcon}
+        />
+        <input
+          type="search"
+          value={searchQuery}
+          placeholder={searchLabel}
+          aria-label={searchLabel}
+          onChange={(event) => onSearchQueryChange(event.target.value)}
+        />
+      </label>
+    </div>
+  );
+}
diff --git a/dashboard/src/pages/Chat/components/TurnTimelineRail.module.less b/dashboard/src/pages/Chat/components/TurnTimelineRail.module.less
new file mode 100644
index 00000000..e694952c
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/TurnTimelineRail.module.less
@@ -0,0 +1,183 @@
+.rail {
+  pointer-events: none;
+  position: absolute;
+  inset-block: 0;
+  inset-inline-start: 0;
+  z-index: 10;
+  width: 48px;
+  opacity: 0;
+  visibility: hidden;
+  transform: translateX(-8px);
+  transition:
+    opacity 150ms ease-out,
+    transform 150ms ease-out,
+    visibility 150ms ease-out;
+
+  @media (prefers-reduced-motion: reduce) {
+    transition: none;
+  }
+}
+
+.railVisible {
+  pointer-events: none;
+  opacity: 1;
+  visibility: visible;
+  transform: translateX(0);
+}
+
+.railScroll {
+  pointer-events: auto;
+  position: absolute;
+  inset-inline-start: 8px;
+  top: 50%;
+  max-height: calc(100% - 6rem);
+  width: 40px;
+  transform: translateY(-50%);
+  overflow-x: hidden;
+  overflow-y: auto;
+  padding-block: 4px;
+  scrollbar-width: none;
+
+  &::-webkit-scrollbar {
+    display: none;
+  }
+}
+
+.railInner {
+  position: relative;
+  width: 40px;
+}
+
+.tickRow {
+  position: absolute;
+  inset-inline-start: 0;
+  top: 0;
+  height: 14px;
+  width: 40px;
+}
+
+.tickButton {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  width: 40px;
+  height: 14px;
+  padding: 0 0 0 2px;
+  border: 0;
+  border-radius: 4px;
+  background: transparent;
+  cursor: pointer;
+
+  &:focus-visible {
+    outline: 2px solid var(--fn-color-brand);
+    outline-offset: 2px;
+  }
+}
+
+.tickBar {
+  display: block;
+  width: 12px;
+  height: 2px;
+  border-radius: 999px;
+  transform-origin: left center;
+  background: var(--fn-text-quaternary);
+  transition:
+    opacity 150ms ease-out,
+    transform 150ms ease-out,
+    background-color 150ms ease-out,
+    height 150ms ease-out;
+
+  @media (prefers-reduced-motion: reduce) {
+    transition: none;
+  }
+}
+
+.tickBarFocus {
+  background: var(--fn-text-primary);
+}
+
+.tickBarMuted {
+  background: var(--fn-text-quaternary);
+}
+
+.tickBarActive {
+  background: var(--fn-text-primary);
+}
+
+.previewOverlay {
+  :global(.ant-popover-inner) {
+    padding: 10px 12px;
+    border: 1px solid var(--fn-border-primary);
+    border-radius: 10px;
+    background: var(--fn-bg-elevated, var(--fn-bg-primary));
+    box-shadow: 0 8px 24px
+      color-mix(in srgb, var(--fn-text-primary) 12%, transparent);
+  }
+
+  :global(.ant-popover-arrow) {
+    display: none;
+  }
+}
+
+.preview {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  width: min(20rem, calc(100vw - 2rem));
+}
+
+.previewUser {
+  margin: 0;
+  white-space: pre-line;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  font-size: 13px;
+  font-weight: 600;
+  line-height: 20px;
+  color: var(--fn-text-primary);
+}
+
+.previewAssistant {
+  margin: 0;
+  white-space: pre-line;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 3;
+  overflow: hidden;
+  font-size: 13px;
+  line-height: 20px;
+  color: color-mix(in srgb, var(--fn-text-primary) 80%, transparent);
+}
+
+.previewAssistantMuted {
+  color: var(--fn-text-tertiary);
+}
+
+:global(.turn-timeline-flash) {
+  animation: turnTimelineFlash 700ms ease-out;
+  border-radius: 12px;
+}
+
+@media (prefers-reduced-motion: reduce) {
+  :global(.turn-timeline-flash) {
+    animation: none;
+  }
+}
+
+@keyframes turnTimelineFlash {
+  0% {
+    box-shadow: 0 0 0 0
+      color-mix(in srgb, var(--fn-color-brand) 40%, transparent);
+    background-color: color-mix(
+      in srgb,
+      var(--fn-color-brand) 14%,
+      transparent
+    );
+  }
+  100% {
+    box-shadow: 0 0 0 0 transparent;
+    background-color: transparent;
+  }
+}
diff --git a/dashboard/src/pages/Chat/components/TurnTimelineRail.test.tsx b/dashboard/src/pages/Chat/components/TurnTimelineRail.test.tsx
new file mode 100644
index 00000000..344aeadf
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/TurnTimelineRail.test.tsx
@@ -0,0 +1,260 @@
+import {
+  cleanup,
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+} from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { ChatMessage } from "../hooks/useChat";
+import { groupConsecutiveAssistantMessages } from "../utils/messageGrouping";
+import TurnTimelineRail from "./TurnTimelineRail";
+
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({
+    t: (key: string, opts?: Record<string, string>) => {
+      if (key === "chat.turnTimeline.jumpToQuery") {
+        return `Jump ${opts?.index ?? ""}`.trim();
+      }
+      return key;
+    },
+  }),
+}));
+
+function msg(
+  role: ChatMessage["role"],
+  id: string,
+  content: string,
+): ChatMessage {
+  return {
+    id,
+    role,
+    content,
+    status: "done",
+    timestamp: Date.now(),
+  };
+}
+
+function mountScrollerWithAnchors(ids: string[]) {
+  const scroller = document.createElement("div");
+  Object.defineProperty(scroller, "clientHeight", {
+    configurable: true,
+    value: 600,
+  });
+  Object.defineProperty(scroller, "scrollTop", {
+    configurable: true,
+    writable: true,
+    value: 0,
+  });
+  scroller.getBoundingClientRect = () =>
+    ({
+      top: 0,
+      left: 0,
+      bottom: 600,
+      right: 400,
+      width: 400,
+      height: 600,
+      x: 0,
+      y: 0,
+      toJSON() {
+        return {};
+      },
+    }) as DOMRect;
+
+  const bubbleRefsMap = new Map<string, HTMLDivElement>();
+  ids.forEach((id, index) => {
+    const el = document.createElement("div");
+    el.dataset.messageId = id;
+    el.dataset.role = "user";
+    el.className = "userBubble messageBubble";
+    el.getBoundingClientRect = () =>
+      ({
+        top: 40 + index * 200,
+        left: 80,
+        bottom: 140 + index * 200,
+        right: 360,
+        width: 280,
+        height: 100,
+        x: 80,
+        y: 40 + index * 200,
+        toJSON() {
+          return {};
+        },
+      }) as DOMRect;
+    scroller.appendChild(el);
+    bubbleRefsMap.set(id, el);
+  });
+  document.body.appendChild(scroller);
+  return { scroller, bubbleRefsMap };
+}
+
+describe("TurnTimelineRail", () => {
+  beforeEach(() => {
+    vi.stubGlobal(
+      "MutationObserver",
+      class {
+        observe() {}
+        disconnect() {}
+        takeRecords() {
+          return [];
+        }
+      },
+    );
+    vi.stubGlobal(
+      "ResizeObserver",
+      class {
+        callback: ResizeObserverCallback;
+        constructor(cb: ResizeObserverCallback) {
+          this.callback = cb;
+        }
+        observe(target: Element) {
+          this.callback(
+            [
+              {
+                target,
+                contentRect: {
+                  width: 960,
+                  height: 700,
+                } as DOMRectReadOnly,
+                borderBoxSize: [],
+                contentBoxSize: [],
+                devicePixelContentBoxSize: [],
+              } as ResizeObserverEntry,
+            ],
+            this as unknown as ResizeObserver,
+          );
+        }
+        unobserve() {}
+        disconnect() {}
+      },
+    );
+  });
+
+  afterEach(() => {
+    cleanup();
+    document.body.innerHTML = "";
+    vi.unstubAllGlobals();
+  });
+
+  it("renders ticks for two user turns and jumps on click", async () => {
+    const messages = [
+      msg("user", "u1", "first question"),
+      msg("assistant", "a1", "first answer"),
+      msg("user", "u2", "second question"),
+      msg("assistant", "a2", "second answer"),
+    ];
+    const messageGroups = groupConsecutiveAssistantMessages(messages);
+    const { scroller, bubbleRefsMap } = mountScrollerWithAnchors(["u1", "u2"]);
+    const scrollerRef = { current: null as HTMLElement | null };
+    const containerRef = { current: scroller as HTMLDivElement | null };
+    const virtuosoRef = { current: null };
+    const wrapper = document.createElement("div");
+    Object.defineProperty(wrapper, "clientWidth", {
+      configurable: true,
+      value: 960,
+    });
+    document.body.appendChild(wrapper);
+    const wrapperRef = { current: wrapper };
+    const armProgrammaticGuard = vi.fn();
+    const scrollTo = vi.fn();
+    scroller.scrollTo = scrollTo;
+
+    render(
+      <TurnTimelineRail
+        messages={messages}
+        messageGroups={messageGroups}
+        following={false}
+        useVirtual={false}
+        firstItemIndex={0}
+        scrollerRef={scrollerRef}
+        containerRef={containerRef}
+        virtuosoRef={virtuosoRef}
+        bubbleRefsMap={{ current: bubbleRefsMap }}
+        wrapperRef={wrapperRef}
+        armProgrammaticGuard={armProgrammaticGuard}
+      />,
+    );
+
+    const rail = await screen.findByTestId("turn-timeline-rail");
+    expect(rail).toHaveAttribute("data-item-count", "2");
+    expect(rail).toHaveAttribute("data-visible", "true");
+    expect(rail).toHaveAttribute("data-direction", "ltr");
+
+    fireEvent.click(screen.getByTestId("turn-timeline-tick-0"));
+    await waitFor(() => {
+      expect(armProgrammaticGuard).toHaveBeenCalled();
+    });
+    expect(scrollTo).toHaveBeenCalled();
+  });
+
+  it("marks rtl direction for preview placement", async () => {
+    document.documentElement.setAttribute("dir", "rtl");
+    const messages = [
+      msg("user", "u1", "first"),
+      msg("assistant", "a1", "a"),
+      msg("user", "u2", "second"),
+      msg("assistant", "a2", "b"),
+    ];
+    const messageGroups = groupConsecutiveAssistantMessages(messages);
+    const { scroller, bubbleRefsMap } = mountScrollerWithAnchors(["u1", "u2"]);
+    const wrapper = document.createElement("div");
+    Object.defineProperty(wrapper, "clientWidth", {
+      configurable: true,
+      value: 960,
+    });
+    document.body.appendChild(wrapper);
+
+    render(
+      <TurnTimelineRail
+        messages={messages}
+        messageGroups={messageGroups}
+        useVirtual={false}
+        firstItemIndex={0}
+        scrollerRef={{ current: null }}
+        containerRef={{ current: scroller }}
+        virtuosoRef={{ current: null }}
+        bubbleRefsMap={{ current: bubbleRefsMap }}
+        wrapperRef={{ current: wrapper }}
+        armProgrammaticGuard={vi.fn()}
+      />,
+    );
+
+    const rail = await screen.findByTestId("turn-timeline-rail");
+    expect(rail).toHaveAttribute("data-direction", "rtl");
+    document.documentElement.setAttribute("dir", "ltr");
+  });
+
+  it("hides when fewer than two user turns", () => {
+    const messages = [
+      msg("user", "u1", "only one"),
+      msg("assistant", "a1", "reply"),
+    ];
+    const messageGroups = groupConsecutiveAssistantMessages(messages);
+    const { scroller, bubbleRefsMap } = mountScrollerWithAnchors(["u1"]);
+    const wrapper = document.createElement("div");
+    Object.defineProperty(wrapper, "clientWidth", {
+      configurable: true,
+      value: 960,
+    });
+    document.body.appendChild(wrapper);
+
+    const { container } = render(
+      <TurnTimelineRail
+        messages={messages}
+        messageGroups={messageGroups}
+        useVirtual={false}
+        firstItemIndex={0}
+        scrollerRef={{ current: null }}
+        containerRef={{ current: scroller }}
+        virtuosoRef={{ current: null }}
+        bubbleRefsMap={{ current: bubbleRefsMap }}
+        wrapperRef={{ current: wrapper }}
+        armProgrammaticGuard={vi.fn()}
+      />,
+    );
+
+    expect(
+      container.querySelector('[data-testid="turn-timeline-rail"]'),
+    ).toBeNull();
+  });
+});
diff --git a/dashboard/src/pages/Chat/components/TurnTimelineRail.tsx b/dashboard/src/pages/Chat/components/TurnTimelineRail.tsx
new file mode 100644
index 00000000..5d993b18
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/TurnTimelineRail.tsx
@@ -0,0 +1,426 @@
+import {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+  type MutableRefObject,
+  type RefObject,
+} from "react";
+import { Popover } from "antd";
+import type { VirtuosoHandle } from "react-virtuoso";
+import { useTranslation } from "react-i18next";
+import type { ChatMessage } from "../hooks/useChat";
+import type { MessageGroup } from "../utils/messageGrouping";
+import {
+  TURN_TIMELINE_HOVER_CLOSE_DELAY_S,
+  TURN_TIMELINE_HOVER_OPEN_DELAY_S,
+  TURN_TIMELINE_MIN_TURNS,
+  TURN_TIMELINE_MIN_WIDTH_PX,
+  TURN_TIMELINE_ROW_PX,
+  TURN_TIMELINE_VIRTUALIZE_THRESHOLD,
+  alignElementToScrollerTop,
+  buildTurnTimelineItems,
+  mergeTurnPositions,
+  prefersReducedMotion,
+  readElementDirection,
+  resolveActiveTurnId,
+  resolveFlashTarget,
+  resolveFollowPinnedTurnId,
+  tickVisualForDistance,
+  visibleTurnWindow,
+  type TurnTimelineItem,
+} from "../utils/turnTimeline";
+import styles from "./TurnTimelineRail.module.less";
+
+const FLASH_CLASS = "turn-timeline-flash";
+const FLASH_MS = 700;
+const JUMP_RETRY_FRAMES = 30;
+
+interface TurnTimelineRailProps {
+  messages: ChatMessage[];
+  messageGroups: MessageGroup[];
+  isStreaming?: boolean;
+  /** When true (pinned near bottom), keep the latest tick active. */
+  following?: boolean;
+  useVirtual: boolean;
+  firstItemIndex: number;
+  scrollerRef: RefObject<HTMLElement | null>;
+  containerRef: RefObject<HTMLDivElement | null>;
+  virtuosoRef: RefObject<VirtuosoHandle | null>;
+  bubbleRefsMap: MutableRefObject<Map<string, HTMLDivElement>>;
+  wrapperRef: RefObject<HTMLDivElement | null>;
+  armProgrammaticGuard: (ms?: number) => void;
+  onVisibilityChange?: (visible: boolean) => void;
+}
+
+function flashElement(anchor: HTMLElement): void {
+  const el = resolveFlashTarget(anchor);
+  el.classList.remove(FLASH_CLASS);
+  void el.offsetWidth;
+  el.classList.add(FLASH_CLASS);
+  window.setTimeout(() => {
+    el.classList.remove(FLASH_CLASS);
+  }, FLASH_MS);
+}
+
+export default function TurnTimelineRail({
+  messages,
+  messageGroups,
+  isStreaming,
+  following = false,
+  useVirtual,
+  firstItemIndex,
+  scrollerRef,
+  containerRef,
+  virtuosoRef,
+  bubbleRefsMap,
+  wrapperRef,
+  armProgrammaticGuard,
+  onVisibilityChange,
+}: TurnTimelineRailProps) {
+  const { t } = useTranslation();
+  const railScrollRef = useRef<HTMLDivElement | null>(null);
+  const [hoverIndex, setHoverIndex] = useState<number | undefined>(undefined);
+  const [activeMessageId, setActiveMessageId] = useState<string | undefined>(
+    undefined,
+  );
+  const [wideEnough, setWideEnough] = useState(false);
+  const [reducedMotion, setReducedMotion] = useState(false);
+  const [textDirection, setTextDirection] = useState<"ltr" | "rtl">("ltr");
+  const [railViewport, setRailViewport] = useState({
+    scrollTop: 0,
+    height: 0,
+  });
+
+  const turns = useMemo(
+    () =>
+      buildTurnTimelineItems(
+        messages,
+        messageGroups,
+        {
+          userFallback: t("chat.turnTimeline.userFallback"),
+          emptyAssistant: t("chat.turnTimeline.emptyAssistant"),
+          runningAssistant: t("chat.turnTimeline.runningAssistant"),
+        },
+        { isStreaming },
+      ),
+    [messages, messageGroups, isStreaming, t],
+  );
+
+  const showRail = wideEnough && turns.length >= TURN_TIMELINE_MIN_TURNS;
+
+  useEffect(() => {
+    onVisibilityChange?.(showRail);
+  }, [showRail, onVisibilityChange]);
+
+  useEffect(() => {
+    setReducedMotion(prefersReducedMotion());
+    if (typeof window === "undefined" || !window.matchMedia) return;
+    const mq = window.matchMedia("(prefers-reduced-motion: reduce)");
+    const onChange = () => setReducedMotion(mq.matches);
+    mq.addEventListener("change", onChange);
+    return () => mq.removeEventListener("change", onChange);
+  }, []);
+
+  useEffect(() => {
+    const el = wrapperRef.current;
+    if (!el) return;
+    const update = () => {
+      setWideEnough(el.clientWidth >= TURN_TIMELINE_MIN_WIDTH_PX);
+      setTextDirection(readElementDirection(el));
+    };
+    update();
+    if (typeof ResizeObserver === "undefined") {
+      window.addEventListener("resize", update);
+      return () => window.removeEventListener("resize", update);
+    }
+    const ro = new ResizeObserver(update);
+    ro.observe(el);
+    const mo = new MutationObserver(update);
+    mo.observe(document.documentElement, {
+      attributes: true,
+      attributeFilter: ["dir"],
+    });
+    return () => {
+      ro.disconnect();
+      mo.disconnect();
+    };
+  }, [wrapperRef]);
+
+  useEffect(() => {
+    const el = railScrollRef.current;
+    if (!el || !showRail) return;
+    const sync = () => {
+      setRailViewport({
+        scrollTop: el.scrollTop,
+        height: el.clientHeight,
+      });
+    };
+    sync();
+    el.addEventListener("scroll", sync, { passive: true });
+    if (typeof ResizeObserver === "undefined") {
+      window.addEventListener("resize", sync);
+      return () => {
+        el.removeEventListener("scroll", sync);
+        window.removeEventListener("resize", sync);
+      };
+    }
+    const ro = new ResizeObserver(sync);
+    ro.observe(el);
+    return () => {
+      el.removeEventListener("scroll", sync);
+      ro.disconnect();
+    };
+  }, [showRail, turns.length]);
+
+  const getScroller = useCallback((): HTMLElement | null => {
+    if (useVirtual) return scrollerRef.current;
+    return containerRef.current;
+  }, [useVirtual, scrollerRef, containerRef]);
+
+  const measureActive = useCallback(() => {
+    const pinned = resolveFollowPinnedTurnId(turns, { following });
+    if (pinned) {
+      setActiveMessageId(pinned);
+      return;
+    }
+
+    const scroller = getScroller();
+    if (!scroller || turns.length === 0) {
+      setActiveMessageId(undefined);
+      return;
+    }
+    const scrollerRect = scroller.getBoundingClientRect();
+    const measured: Array<{ messageId: string; start: number; end: number }> =
+      [];
+    for (const turn of turns) {
+      const el =
+        bubbleRefsMap.current.get(turn.messageId) ??
+        (scroller.querySelector(
+          `[data-message-id="${CSS.escape(turn.messageId)}"]`,
+        ) as HTMLElement | null);
+      if (!el) continue;
+      const rect = el.getBoundingClientRect();
+      const start = scroller.scrollTop + rect.top - scrollerRect.top;
+      measured.push({
+        messageId: turn.messageId,
+        start,
+        end: start + rect.height,
+      });
+    }
+    const positions = mergeTurnPositions({ turns, measured });
+    setActiveMessageId(
+      resolveActiveTurnId({
+        positions,
+        scrollOffsetPx: scroller.scrollTop,
+        viewportHeightPx: scroller.clientHeight,
+      }),
+    );
+  }, [bubbleRefsMap, following, getScroller, turns]);
+
+  useEffect(() => {
+    const scroller = getScroller();
+    if (!scroller) return;
+    const onScroll = () => {
+      measureActive();
+    };
+    measureActive();
+    scroller.addEventListener("scroll", onScroll, { passive: true });
+    return () => scroller.removeEventListener("scroll", onScroll);
+  }, [getScroller, measureActive, messages.length, useVirtual]);
+
+  const activeIndex = useMemo(() => {
+    if (!activeMessageId) return -1;
+    return turns.findIndex((turn) => turn.messageId === activeMessageId);
+  }, [activeMessageId, turns]);
+
+  useEffect(() => {
+    if (!showRail || activeIndex < 0 || turns.length < 2) return;
+    const scroller = railScrollRef.current;
+    if (!scroller) return;
+    const rowTop = activeIndex * TURN_TIMELINE_ROW_PX;
+    const rowBottom = rowTop + TURN_TIMELINE_ROW_PX;
+    if (rowTop < scroller.scrollTop) {
+      scroller.scrollTop = rowTop;
+    } else if (rowBottom > scroller.scrollTop + scroller.clientHeight) {
+      scroller.scrollTop = rowBottom - scroller.clientHeight;
+    }
+  }, [activeIndex, showRail, turns.length]);
+
+  const jumpToTurn = useCallback(
+    (turn: TurnTimelineItem) => {
+      const scroller = getScroller();
+      if (!scroller) return;
+      armProgrammaticGuard(reducedMotion ? 200 : 450);
+      const behavior: ScrollBehavior = reducedMotion ? "auto" : "smooth";
+
+      const tryAlign = (): boolean => {
+        const target =
+          bubbleRefsMap.current.get(turn.messageId) ??
+          (scroller.querySelector(
+            `[data-message-id="${CSS.escape(turn.messageId)}"]`,
+          ) as HTMLElement | null);
+        if (!target) return false;
+        alignElementToScrollerTop(scroller, target, behavior);
+        flashElement(target);
+        measureActive();
+        return true;
+      };
+
+      if (tryAlign()) return;
+
+      if (useVirtual) {
+        virtuosoRef.current?.scrollToIndex({
+          index: firstItemIndex + turn.groupIndex,
+          align: "start",
+          behavior: "auto",
+        });
+        let attempts = JUMP_RETRY_FRAMES;
+        const retry = () => {
+          if (tryAlign() || --attempts <= 0) return;
+          window.requestAnimationFrame(retry);
+        };
+        window.requestAnimationFrame(retry);
+      }
+    },
+    [
+      armProgrammaticGuard,
+      bubbleRefsMap,
+      firstItemIndex,
+      getScroller,
+      measureActive,
+      reducedMotion,
+      useVirtual,
+      virtuosoRef,
+    ],
+  );
+
+  if (turns.length < TURN_TIMELINE_MIN_TURNS) {
+    return null;
+  }
+
+  const totalHeight = turns.length * TURN_TIMELINE_ROW_PX;
+  const forceFull = turns.length < TURN_TIMELINE_VIRTUALIZE_THRESHOLD;
+  const tickWindow = visibleTurnWindow({
+    count: turns.length,
+    scrollTop: railViewport.scrollTop,
+    viewportHeight: railViewport.height || totalHeight,
+    forceFull,
+  });
+  const previewPlacement = textDirection === "rtl" ? "leftTop" : "rightTop";
+
+  return (
+    <nav
+      className={[styles.rail, showRail ? styles.railVisible : ""]
+        .filter(Boolean)
+        .join(" ")}
+      aria-label={t("chat.turnTimeline.label")}
+      aria-hidden={!showRail}
+      data-testid="turn-timeline-rail"
+      data-item-count={turns.length}
+      data-visible={showRail ? "true" : "false"}
+      data-direction={textDirection}
+    >
+      <div
+        ref={railScrollRef}
+        className={styles.railScroll}
+        onPointerLeave={() => setHoverIndex(undefined)}
+      >
+        <div className={styles.railInner} style={{ height: totalHeight }}>
+          {turns.slice(tickWindow.start, tickWindow.end).map((turn, offset) => {
+            const index = tickWindow.start + offset;
+            const isActive = index === activeIndex;
+            const visual = tickVisualForDistance(index, hoverIndex);
+            const scrollActiveNoHover = hoverIndex === undefined && isActive;
+            const opacity = scrollActiveNoHover
+              ? 0.9
+              : turn.isRunning
+              ? Math.max(visual.opacity, 0.72)
+              : visual.opacity;
+            const scaleX =
+              reducedMotion && hoverIndex !== undefined
+                ? hoverIndex === index
+                  ? 2.6
+                  : 1
+                : visual.scaleX;
+            const barClass = [
+              styles.tickBar,
+              visual.colorTone === "focus"
+                ? styles.tickBarFocus
+                : styles.tickBarMuted,
+              scrollActiveNoHover ? styles.tickBarActive : "",
+            ]
+              .filter(Boolean)
+              .join(" ");
+
+            return (
+              <div
+                key={turn.messageId}
+                className={styles.tickRow}
+                style={{
+                  transform: `translateY(${index * TURN_TIMELINE_ROW_PX}px)`,
+                }}
+              >
+                <Popover
+                  trigger="hover"
+                  placement={previewPlacement}
+                  arrow={false}
+                  mouseEnterDelay={TURN_TIMELINE_HOVER_OPEN_DELAY_S}
+                  mouseLeaveDelay={TURN_TIMELINE_HOVER_CLOSE_DELAY_S}
+                  overlayClassName={styles.previewOverlay}
+                  content={
+                    <div className={styles.preview}>
+                      <p className={styles.previewUser}>{turn.userPreview}</p>
+                      <p
+                        className={[
+                          styles.previewAssistant,
+                          turn.assistantPreviewKind !== "text"
+                            ? styles.previewAssistantMuted
+                            : "",
+                        ]
+                          .filter(Boolean)
+                          .join(" ")}
+                      >
+                        {turn.assistantPreview}
+                      </p>
+                    </div>
+                  }
+                >
+                  <button
+                    type="button"
+                    className={styles.tickButton}
+                    aria-current={isActive ? "location" : undefined}
+                    aria-label={t("chat.turnTimeline.jumpToQuery", {
+                      index: String(index + 1),
+                    })}
+                    aria-posinset={index + 1}
+                    aria-setsize={turns.length}
+                    data-testid={`turn-timeline-tick-${index}`}
+                    data-message-id={turn.messageId}
+                    data-active={isActive ? "true" : "false"}
+                    data-running={turn.isRunning ? "true" : "false"}
+                    data-visual-tone={visual.tone}
+                    onBlur={() => setHoverIndex(undefined)}
+                    onFocus={() => setHoverIndex(index)}
+                    onPointerEnter={() => setHoverIndex(index)}
+                    onPointerLeave={() => setHoverIndex(undefined)}
+                    onClick={() => jumpToTurn(turn)}
+                  >
+                    <span
+                      className={barClass}
+                      style={{
+                        opacity,
+                        transform: `scaleX(${scaleX})`,
+                      }}
+                    />
+                  </button>
+                </Popover>
+              </div>
+            );
+          })}
+        </div>
+      </div>
+    </nav>
+  );
+}
diff --git a/dashboard/src/pages/Chat/hooks/chatStore.ts b/dashboard/src/pages/Chat/hooks/chatStore.ts
index 8a4c9ec4..32c8c2dc 100644
--- a/dashboard/src/pages/Chat/hooks/chatStore.ts
+++ b/dashboard/src/pages/Chat/hooks/chatStore.ts
@@ -2160,12 +2160,14 @@ export async function resumeHitl(
   threadId: string,
   decisions: Array<{ type: string; message?: string }>,
   onStreamEnd?: () => void,
+  dismissed = false,
 ): Promise<void> {
   const state = getOrCreate(sessionId);
   state.abortController?.abort();
-  const hitlStatus = decisions.some((d) => d.type === "reject")
-    ? "rejected"
-    : "approved";
+  const hitlStatus =
+    dismissed || decisions.some((d) => d.type === "reject")
+      ? "rejected"
+      : "approved";
   resolveHitlPending(state, hitlStatus);
   beginStream(state, sessionId);
   notify(state);
diff --git a/dashboard/src/pages/Chat/hooks/useChat.ts b/dashboard/src/pages/Chat/hooks/useChat.ts
index 12f5830f..2156c457 100644
--- a/dashboard/src/pages/Chat/hooks/useChat.ts
+++ b/dashboard/src/pages/Chat/hooks/useChat.ts
@@ -1058,15 +1058,23 @@ export function useChat(
     (
       decisions: Array<{ type: string; message?: string }>,
       storeKey?: string,
+      dismissed?: boolean,
     ) => {
       if (!agentId) return;
       const key = storeKey || stableSessionId;
       const threadId =
         storeKey || (stableSessionId !== "__empty__" ? stableSessionId : "");
       if (!threadId || threadId === "__empty__") return;
-      void chatStore.resumeHitl(key, agentId, threadId, decisions, () => {
-        void refreshHistory(threadId);
-      });
+      void chatStore.resumeHitl(
+        key,
+        agentId,
+        threadId,
+        decisions,
+        () => {
+          void refreshHistory(threadId);
+        },
+        dismissed,
+      );
     },
     [agentId, stableSessionId, refreshHistory],
   );
diff --git a/dashboard/src/pages/Chat/hooks/useChatComposerResources.ts b/dashboard/src/pages/Chat/hooks/useChatComposerResources.ts
index 7ba748c0..ff286fc7 100644
--- a/dashboard/src/pages/Chat/hooks/useChatComposerResources.ts
+++ b/dashboard/src/pages/Chat/hooks/useChatComposerResources.ts
@@ -134,9 +134,15 @@ export function useChatComposerResources(
           .filter((i) => i.status === "active" && i.has_credentials)
           .map((i) => ({
             mcp_server_name: i.mcp_server_name,
-            label: i.display_name,
+            label:
+              currentUserId !== null && i.owner_user_id !== currentUserId
+                ? `${i.display_name} · ${
+                    i.owner_display_name || i.owner_username || i.owner_user_id
+                  }`
+                : i.display_name,
             kind: i.kind,
-            default_open: i.default_open === true,
+            default_open:
+              i.default_open === true && i.owner_user_id === currentUserId,
           }));
         setChatConnectors(options);
         const allowed = new Set(options.map((o) => o.mcp_server_name));
@@ -165,7 +171,7 @@ export function useChatComposerResources(
       window.removeEventListener("focus", onFocus);
       window.removeEventListener(CONNECTORS_CHANGED_EVENT, loadConnectors);
     };
-  }, [resolvedAgentId]);
+  }, [resolvedAgentId, currentUserId]);
 
   useEffect(() => {
     if (!resolvedAgentId) {
diff --git a/dashboard/src/pages/Chat/hooks/useChatDockPanel.test.ts b/dashboard/src/pages/Chat/hooks/useChatDockPanel.test.ts
index 0fa60191..69e23561 100644
--- a/dashboard/src/pages/Chat/hooks/useChatDockPanel.test.ts
+++ b/dashboard/src/pages/Chat/hooks/useChatDockPanel.test.ts
@@ -1,7 +1,7 @@
 import { act, renderHook } from "@testing-library/react";
 import { describe, expect, it } from "vitest";
 import { dockFileTabId } from "../utils/dockFilePath";
-import { useChatDockPanel } from "./useChatDockPanel";
+import { ensureNoTrajectoryTab, useChatDockPanel } from "./useChatDockPanel";
 
 describe("useChatDockPanel tabs", () => {
   it("openFileList focuses the pinned files tab", () => {
@@ -61,6 +61,19 @@ describe("useChatDockPanel tabs", () => {
     expect(result.current.openTabs.map((t) => t.id)).toEqual(["terminal"]);
   });
 
+  it("ensureNoTrajectoryTab strips leftover trajectory tabs", () => {
+    expect(
+      ensureNoTrajectoryTab([
+        { id: "files", kind: "files" },
+        { id: "trajectory", kind: "trajectory" },
+        { id: "browser", kind: "browser" },
+      ]),
+    ).toEqual([
+      { id: "files", kind: "files" },
+      { id: "browser", kind: "browser" },
+    ]);
+  });
+
   it("reopening terminal does not add another dock tab", () => {
     const { result } = renderHook(() => useChatDockPanel(false));
     act(() => {
@@ -180,6 +193,7 @@ describe("useChatDockPanel tabs", () => {
     expect(result.current).not.toHaveProperty("openFilePanel");
     expect(result.current).not.toHaveProperty("openBrowserPanel");
     expect(result.current).not.toHaveProperty("resetDismissOnSessionGone");
+    expect(result.current).not.toHaveProperty("toggleTrajectoryPanel");
   });
 
   it("closes the dock and clears tabs when agentId changes", () => {
diff --git a/dashboard/src/pages/Chat/hooks/useChatDockPanel.ts b/dashboard/src/pages/Chat/hooks/useChatDockPanel.ts
index d6ae45da..21993ac5 100644
--- a/dashboard/src/pages/Chat/hooks/useChatDockPanel.ts
+++ b/dashboard/src/pages/Chat/hooks/useChatDockPanel.ts
@@ -32,6 +32,13 @@ export type DockTab =
 
 export type DockTabId = DockTab["id"];
 
+/** Drop retired dock tabs (pre-drawer trajectory) if they appear in stored lists. */
+export function ensureNoTrajectoryTab<T extends { kind: string }>(
+  tabs: readonly T[],
+): T[] {
+  return tabs.filter((t) => t.kind !== "trajectory");
+}
+
 function loadPanelMode(): PanelMode {
   try {
     const saved = localStorage.getItem(PANEL_MODE_KEY);
diff --git a/dashboard/src/pages/Chat/hooks/useChatSend.ts b/dashboard/src/pages/Chat/hooks/useChatSend.ts
index 69acd868..7ef5dd5f 100644
--- a/dashboard/src/pages/Chat/hooks/useChatSend.ts
+++ b/dashboard/src/pages/Chat/hooks/useChatSend.ts
@@ -268,10 +268,7 @@ export function useChatSend({
         setTimeout(async () => {
           try {
             const { browserApi } = await import("../../../api/modules/browser");
-            const profile = activeThreadId || "default";
             const data = await browserApi.startRecording({
-              profile,
-              agentProfile: profile,
               name: activeThreadId
                 ? `chat-${activeThreadId}`
                 : "skill-recording",
diff --git a/dashboard/src/pages/Chat/hooks/useTrajectorySession.test.ts b/dashboard/src/pages/Chat/hooks/useTrajectorySession.test.ts
new file mode 100644
index 00000000..816cc213
--- /dev/null
+++ b/dashboard/src/pages/Chat/hooks/useTrajectorySession.test.ts
@@ -0,0 +1,445 @@
+import { act, renderHook, waitFor } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { TrajectoryEvent } from "../../../api/modules/trajectory";
+import { useTrajectorySession } from "./useTrajectorySession";
+
+const historyMock = vi.fn();
+const metricsMock = vi.fn();
+const streamUrlMock = vi.fn(
+  (_agentId: string, _threadId: string, afterSeq?: number) =>
+    `http://trajectory.test/stream?after_seq=${afterSeq ?? ""}`,
+);
+
+vi.mock("../../../api/modules/trajectory", () => ({
+  trajectoryApi: {
+    history: (...args: unknown[]) => historyMock(...args),
+    metrics: (...args: unknown[]) => metricsMock(...args),
+    streamUrl: (agentId: string, threadId: string, afterSeq?: number): string =>
+      streamUrlMock(agentId, threadId, afterSeq),
+  },
+}));
+
+type Listener = (event: MessageEvent) => void;
+
+class MockEventSource {
+  static instances: MockEventSource[] = [];
+  url: string;
+  close = vi.fn();
+  onerror: ((event: Event) => void) | null = null;
+  private listeners = new Map<string, Set<Listener>>();
+
+  constructor(url: string) {
+    this.url = url;
+    MockEventSource.instances.push(this);
+  }
+
+  addEventListener(type: string, listener: EventListener): void {
+    const set = this.listeners.get(type) ?? new Set<Listener>();
+    set.add(listener as Listener);
+    this.listeners.set(type, set);
+  }
+
+  removeEventListener(type: string, listener: EventListener): void {
+    this.listeners.get(type)?.delete(listener as Listener);
+  }
+
+  emit(type: string, data: unknown): void {
+    const event = { data: JSON.stringify(data) } as MessageEvent;
+    this.listeners.get(type)?.forEach((listener) => listener(event));
+  }
+}
+
+function event(
+  overrides: Partial<TrajectoryEvent> &
+    Pick<TrajectoryEvent, "event_id" | "kind">,
+): TrajectoryEvent {
+  return {
+    thread_id: "T1",
+    agent_id: "A1",
+    seq: 1,
+    ts: 1,
+    turn_id: null,
+    request_seq: null,
+    is_error: false,
+    summary: "",
+    payload: {},
+    ...overrides,
+  };
+}
+
+const toolEvent = event({
+  event_id: "tool-1",
+  kind: "tool",
+  seq: 1,
+  payload: { name: "read_file" },
+});
+
+const assistantEvent = event({
+  event_id: "asst-1",
+  kind: "assistant",
+  seq: 2,
+  request_seq: 1,
+  summary: "ok",
+});
+
+describe("useTrajectorySession", () => {
+  beforeEach(() => {
+    MockEventSource.instances = [];
+    historyMock.mockReset();
+    metricsMock.mockReset();
+    streamUrlMock.mockClear();
+    historyMock.mockResolvedValue({
+      thread_id: "T1",
+      events: [toolEvent],
+      next_before_seq: null,
+      has_more: false,
+    });
+    metricsMock.mockResolvedValue({
+      turns: 1,
+      steps: 1,
+      llm_duration_ms: null,
+      tool_duration_ms: null,
+      ttft_avg_ms: null,
+      tok_per_s: null,
+      cache_hit_ratio: null,
+      input_tokens: null,
+      output_tokens: null,
+      cache_read_tokens: null,
+    });
+    vi.stubGlobal("EventSource", MockEventSource);
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+    vi.unstubAllGlobals();
+  });
+
+  it("loads history and appends live SSE events while visible", async () => {
+    const { result } = renderHook(() =>
+      useTrajectorySession({
+        agentId: "A1",
+        threadId: "T1",
+        visible: true,
+      }),
+    );
+
+    await waitFor(() => expect(result.current.events).toHaveLength(1));
+    expect(historyMock).toHaveBeenCalledWith("A1", "T1");
+    expect(MockEventSource.instances).toHaveLength(1);
+    expect(streamUrlMock).toHaveBeenCalledWith("A1", "T1", 1);
+
+    act(() => {
+      MockEventSource.instances[0].emit("event", assistantEvent);
+    });
+
+    expect(result.current.events.map((row) => row.event_id)).toEqual([
+      "tool-1",
+      "asst-1",
+    ]);
+  });
+
+  it("upserts a live event with the same event_id", async () => {
+    const { result } = renderHook(() =>
+      useTrajectorySession({
+        agentId: "A1",
+        threadId: "T1",
+        visible: true,
+      }),
+    );
+
+    await waitFor(() => expect(result.current.events).toHaveLength(1));
+
+    act(() => {
+      MockEventSource.instances[0].emit("event", {
+        ...assistantEvent,
+        event_id: "tool-1",
+        kind: "assistant",
+        summary: "updated",
+      });
+    });
+
+    expect(result.current.events).toHaveLength(1);
+    expect(result.current.events[0]).toMatchObject({
+      event_id: "tool-1",
+      kind: "assistant",
+      summary: "updated",
+    });
+  });
+
+  it("applies live SSE metrics", async () => {
+    const { result } = renderHook(() =>
+      useTrajectorySession({
+        agentId: "A1",
+        threadId: "T1",
+        visible: true,
+      }),
+    );
+
+    await waitFor(() => expect(MockEventSource.instances).toHaveLength(1));
+    await waitFor(() =>
+      expect(result.current.metrics).toMatchObject({ turns: 1, steps: 1 }),
+    );
+
+    act(() => {
+      MockEventSource.instances[0].emit("metrics", {
+        turns: 3,
+        steps: 8,
+        llm_duration_ms: 120,
+        tool_duration_ms: null,
+        ttft_avg_ms: null,
+        tok_per_s: null,
+        cache_hit_ratio: null,
+        input_tokens: 40,
+        output_tokens: null,
+        cache_read_tokens: null,
+      });
+    });
+
+    expect(result.current.metrics).toMatchObject({
+      turns: 3,
+      steps: 8,
+      llm_duration_ms: 120,
+      input_tokens: 40,
+    });
+  });
+
+  it("does not fetch or subscribe while the panel is hidden", async () => {
+    renderHook(() =>
+      useTrajectorySession({
+        agentId: "A1",
+        threadId: "T1",
+        visible: false,
+      }),
+    );
+
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(historyMock).not.toHaveBeenCalled();
+    expect(MockEventSource.instances).toHaveLength(0);
+  });
+
+  it("clears events when the thread changes before the next page loads", async () => {
+    const { result, rerender } = renderHook(
+      ({ threadId }: { threadId: string }) =>
+        useTrajectorySession({
+          agentId: "A1",
+          threadId,
+          visible: true,
+        }),
+      { initialProps: { threadId: "T1" } },
+    );
+
+    await waitFor(() => expect(result.current.events).toHaveLength(1));
+
+    let resolveNext: ((value: unknown) => void) | undefined;
+    historyMock.mockReturnValue(
+      new Promise((resolve) => {
+        resolveNext = resolve;
+      }),
+    );
+
+    rerender({ threadId: "T2" });
+
+    await waitFor(() => expect(result.current.events).toEqual([]));
+    expect(resolveNext).toBeTypeOf("function");
+  });
+
+  it("loadEarlier prepends older events and fetches with beforeSeq", async () => {
+    const olderEvent = event({
+      event_id: "tool-0",
+      kind: "tool",
+      seq: 0,
+    });
+
+    historyMock
+      .mockResolvedValueOnce({
+        thread_id: "T1",
+        events: [toolEvent],
+        next_before_seq: 5,
+        has_more: true,
+      })
+      .mockResolvedValueOnce({
+        thread_id: "T1",
+        events: [olderEvent],
+        next_before_seq: null,
+        has_more: false,
+      });
+
+    const { result } = renderHook(() =>
+      useTrajectorySession({
+        agentId: "A1",
+        threadId: "T1",
+        visible: true,
+      }),
+    );
+
+    await waitFor(() => expect(result.current.events).toHaveLength(1));
+    expect(result.current.hasMore).toBe(true);
+
+    await act(async () => {
+      await result.current.loadEarlier();
+    });
+
+    expect(historyMock).toHaveBeenLastCalledWith("A1", "T1", { beforeSeq: 5 });
+    expect(result.current.events.map((row) => row.event_id)).toEqual([
+      "tool-0",
+      "tool-1",
+    ]);
+    expect(result.current.hasMore).toBe(false);
+  });
+
+  it("loadEarlier ignores stale responses after thread change", async () => {
+    const staleOlderEvent = event({
+      event_id: "stale-old",
+      kind: "tool",
+      seq: 0,
+    });
+    const t2Event = event({
+      event_id: "tool-t2",
+      kind: "tool",
+      seq: 1,
+      thread_id: "T2",
+    });
+
+    let resolveEarlier: ((value: unknown) => void) | undefined;
+
+    historyMock
+      .mockResolvedValueOnce({
+        thread_id: "T1",
+        events: [toolEvent],
+        next_before_seq: 5,
+        has_more: true,
+      })
+      .mockImplementationOnce(
+        () =>
+          new Promise((resolve) => {
+            resolveEarlier = resolve;
+          }),
+      )
+      .mockResolvedValueOnce({
+        thread_id: "T2",
+        events: [t2Event],
+        next_before_seq: null,
+        has_more: false,
+      });
+
+    const { result, rerender } = renderHook(
+      ({ threadId }: { threadId: string }) =>
+        useTrajectorySession({
+          agentId: "A1",
+          threadId,
+          visible: true,
+        }),
+      { initialProps: { threadId: "T1" } },
+    );
+
+    await waitFor(() => expect(result.current.events).toHaveLength(1));
+
+    let loadEarlierPromise: Promise<void> | undefined;
+    act(() => {
+      loadEarlierPromise = result.current.loadEarlier();
+    });
+
+    rerender({ threadId: "T2" });
+
+    await waitFor(() =>
+      expect(result.current.events.map((row) => row.event_id)).toEqual([
+        "tool-t2",
+      ]),
+    );
+
+    await act(async () => {
+      resolveEarlier?.({
+        thread_id: "T1",
+        events: [staleOlderEvent],
+        next_before_seq: null,
+        has_more: false,
+      });
+      await loadEarlierPromise;
+    });
+
+    expect(result.current.events.map((row) => row.event_id)).toEqual([
+      "tool-t2",
+    ]);
+  });
+
+  it("closes the EventSource when the panel is hidden", async () => {
+    const { rerender } = renderHook(
+      ({ visible }: { visible: boolean }) =>
+        useTrajectorySession({
+          agentId: "A1",
+          threadId: "T1",
+          visible,
+        }),
+      { initialProps: { visible: true } },
+    );
+
+    await waitFor(() => expect(MockEventSource.instances).toHaveLength(1));
+
+    rerender({ visible: false });
+
+    expect(MockEventSource.instances[0].close).toHaveBeenCalled();
+  });
+
+  it("reconnects EventSource after an error using the last seq", async () => {
+    renderHook(() =>
+      useTrajectorySession({
+        agentId: "A1",
+        threadId: "T1",
+        visible: true,
+      }),
+    );
+
+    await waitFor(() => expect(MockEventSource.instances).toHaveLength(1));
+
+    act(() => {
+      MockEventSource.instances[0].onerror?.(new Event("error"));
+    });
+
+    await waitFor(() =>
+      expect(MockEventSource.instances.length).toBeGreaterThanOrEqual(2),
+    );
+    expect(streamUrlMock).toHaveBeenLastCalledWith("A1", "T1", 1);
+  });
+
+  it("loadEarlier keeps current events when the older page fails", async () => {
+    historyMock.mockImplementation(
+      (
+        _agentId: string,
+        _threadId: string,
+        params?: { beforeSeq?: number },
+      ) => {
+        if (params?.beforeSeq != null) {
+          return Promise.reject(new Error("network"));
+        }
+        return Promise.resolve({
+          thread_id: "T1",
+          events: [toolEvent],
+          next_before_seq: 5,
+          has_more: true,
+        });
+      },
+    );
+
+    const { result } = renderHook(() =>
+      useTrajectorySession({
+        agentId: "A1",
+        threadId: "T1",
+        visible: true,
+      }),
+    );
+
+    await waitFor(() => expect(result.current.hasMore).toBe(true));
+
+    await act(async () => {
+      await result.current.loadEarlier();
+    });
+
+    expect(result.current.events.map((row) => row.event_id)).toEqual([
+      "tool-1",
+    ]);
+    expect(result.current.hasMore).toBe(true);
+  });
+});
diff --git a/dashboard/src/pages/Chat/hooks/useTrajectorySession.ts b/dashboard/src/pages/Chat/hooks/useTrajectorySession.ts
new file mode 100644
index 00000000..5b8371e5
--- /dev/null
+++ b/dashboard/src/pages/Chat/hooks/useTrajectorySession.ts
@@ -0,0 +1,212 @@
+import { useCallback, useEffect, useRef, useState } from "react";
+import {
+  trajectoryApi,
+  type TrajectoryEvent,
+  type TrajectoryMetrics,
+} from "../../../api/modules/trajectory";
+
+interface UseTrajectorySessionOptions {
+  agentId?: string;
+  threadId?: string | null;
+  visible?: boolean;
+}
+
+interface TrajectorySessionState {
+  events: TrajectoryEvent[];
+  metrics: TrajectoryMetrics | null;
+  loading: boolean;
+  error: boolean;
+  hasMore: boolean;
+  retry: () => void;
+  loadEarlier: () => Promise<void>;
+  refresh: () => void;
+}
+
+function isTrajectoryEvent(value: unknown): value is TrajectoryEvent {
+  if (value == null || typeof value !== "object") return false;
+  const record = value as Record<string, unknown>;
+  return typeof record.event_id === "string" && typeof record.kind === "string";
+}
+
+function isTrajectoryMetrics(value: unknown): value is TrajectoryMetrics {
+  if (value == null || typeof value !== "object") return false;
+  const record = value as Record<string, unknown>;
+  return typeof record.turns === "number" && typeof record.steps === "number";
+}
+
+function parseSseData(raw: MessageEvent<string>): unknown {
+  try {
+    return JSON.parse(raw.data);
+  } catch {
+    return undefined;
+  }
+}
+
+function upsertByEventId(
+  prev: TrajectoryEvent[],
+  incoming: TrajectoryEvent,
+): TrajectoryEvent[] {
+  const index = prev.findIndex((row) => row.event_id === incoming.event_id);
+  if (index === -1) return [...prev, incoming];
+  const next = prev.slice();
+  next[index] = incoming;
+  return next;
+}
+
+export function useTrajectorySession({
+  agentId,
+  threadId,
+  visible = true,
+}: UseTrajectorySessionOptions): TrajectorySessionState {
+  const [events, setEvents] = useState<TrajectoryEvent[]>([]);
+  const [metrics, setMetrics] = useState<TrajectoryMetrics | null>(null);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState(false);
+  const [hasMore, setHasMore] = useState(false);
+  const [nextBeforeSeq, setNextBeforeSeq] = useState<number | null>(null);
+  const [reloadToken, setReloadToken] = useState(0);
+  const sessionGenRef = useRef(0);
+  const loadEarlierLockRef = useRef(false);
+  const lastSeqRef = useRef<number | undefined>(undefined);
+
+  const retry = useCallback(() => {
+    setReloadToken((token) => token + 1);
+  }, []);
+
+  const refresh = useCallback(() => {
+    sessionGenRef.current += 1;
+    setEvents([]);
+    setMetrics(null);
+    setHasMore(false);
+    setNextBeforeSeq(null);
+    setReloadToken((token) => token + 1);
+  }, []);
+
+  const loadEarlier = useCallback(async () => {
+    if (!agentId || !threadId || nextBeforeSeq == null) return;
+    if (loadEarlierLockRef.current) return;
+
+    loadEarlierLockRef.current = true;
+    const loadGen = sessionGenRef.current;
+    try {
+      const page = await trajectoryApi.history(agentId, threadId, {
+        beforeSeq: nextBeforeSeq,
+      });
+      if (loadGen !== sessionGenRef.current) return;
+
+      setHasMore(page.has_more);
+      setNextBeforeSeq(page.next_before_seq);
+      setEvents((prev) => {
+        const seen = new Set(prev.map((row) => row.event_id));
+        const older = page.events.filter((row) => !seen.has(row.event_id));
+        return [...older, ...prev];
+      });
+    } catch {
+      /* Keep the already-loaded page; caller can retry. */
+    } finally {
+      loadEarlierLockRef.current = false;
+    }
+  }, [agentId, threadId, nextBeforeSeq]);
+
+  useEffect(() => {
+    sessionGenRef.current += 1;
+    setEvents([]);
+    setMetrics(null);
+    setError(false);
+    setHasMore(false);
+    setNextBeforeSeq(null);
+    lastSeqRef.current = undefined;
+  }, [agentId, threadId]);
+
+  useEffect(() => {
+    if (!visible || !agentId || !threadId) return;
+
+    sessionGenRef.current += 1;
+    const fetchGen = sessionGenRef.current;
+    let cancelled = false;
+    let source: EventSource | null = null;
+    let reconnectTimer: ReturnType<typeof setTimeout> | null = null;
+    let reconnectAttempt = 0;
+
+    const bindSource = (es: EventSource) => {
+      es.addEventListener("event", (raw) => {
+        const parsed = parseSseData(raw as MessageEvent<string>);
+        if (!isTrajectoryEvent(parsed)) return;
+        lastSeqRef.current = parsed.seq;
+        setEvents((prev) => upsertByEventId(prev, parsed));
+      });
+      es.addEventListener("metrics", (raw) => {
+        const parsed = parseSseData(raw as MessageEvent<string>);
+        if (!isTrajectoryMetrics(parsed)) return;
+        setMetrics(parsed);
+      });
+      es.onerror = () => {
+        es.close();
+        if (cancelled || fetchGen !== sessionGenRef.current) return;
+        const delay =
+          reconnectAttempt === 0
+            ? 0
+            : Math.min(1000 * 2 ** reconnectAttempt, 15_000);
+        reconnectAttempt += 1;
+        reconnectTimer = setTimeout(() => {
+          if (cancelled || fetchGen !== sessionGenRef.current) return;
+          openStream(lastSeqRef.current);
+        }, delay);
+      };
+    };
+
+    const openStream = (afterSeq?: number) => {
+      if (cancelled) return;
+      source?.close();
+      source = new EventSource(
+        trajectoryApi.streamUrl(agentId, threadId, afterSeq),
+      );
+      bindSource(source);
+    };
+
+    setLoading(true);
+    setError(false);
+    void trajectoryApi
+      .history(agentId, threadId)
+      .then(async (page) => {
+        if (cancelled || fetchGen !== sessionGenRef.current) return;
+        setEvents(page.events);
+        setHasMore(page.has_more);
+        setNextBeforeSeq(page.next_before_seq);
+        const lastSeq = page.events[page.events.length - 1]?.seq;
+        lastSeqRef.current = lastSeq;
+        try {
+          const snapshot = await trajectoryApi.metrics(agentId, threadId);
+          if (!cancelled && fetchGen === sessionGenRef.current) {
+            setMetrics(snapshot);
+          }
+        } catch {
+          /* Live SSE metrics remain the primary source. */
+        }
+        openStream(lastSeq);
+      })
+      .catch(() => {
+        if (!cancelled) setError(true);
+      })
+      .finally(() => {
+        if (!cancelled) setLoading(false);
+      });
+
+    return () => {
+      cancelled = true;
+      if (reconnectTimer != null) clearTimeout(reconnectTimer);
+      source?.close();
+    };
+  }, [visible, agentId, threadId, reloadToken]);
+
+  return {
+    events,
+    metrics,
+    loading,
+    error,
+    hasMore,
+    retry,
+    loadEarlier,
+    refresh,
+  };
+}
diff --git a/dashboard/src/pages/Chat/index.module.less b/dashboard/src/pages/Chat/index.module.less
index 4be09021..e6b0021f 100644
--- a/dashboard/src/pages/Chat/index.module.less
+++ b/dashboard/src/pages/Chat/index.module.less
@@ -46,6 +46,37 @@
   }
 }
 
+/* Turn timeline rail visible: align title, message column, and composer gutters. */
+.chatMainWithTurnRail {
+  --chat-turn-rail-gutter: 48px;
+
+  .chatTitleBar {
+    padding-inline: var(--chat-turn-rail-gutter)
+      max(var(--chat-column-pad-x, 24px), var(--window-controls-inset-end, 0px));
+    padding-block: 0;
+  }
+
+  .messageListInner {
+    padding-inline-start: var(--chat-turn-rail-gutter);
+    padding-inline-end: var(--chat-column-pad-x, 24px);
+  }
+
+  .chatInput {
+    padding-inline-start: var(--chat-turn-rail-gutter);
+  }
+
+  .runUsageBar {
+    width: 100%;
+    max-width: var(--chat-column-max, 960px);
+    padding-inline: var(--chat-turn-rail-gutter) var(--chat-column-pad-x, 24px);
+    box-sizing: border-box;
+  }
+
+  @media (max-width: 863px) {
+    --chat-turn-rail-gutter: var(--chat-column-pad-x, 24px);
+  }
+}
+
 .chatTitleBar {
   display: flex;
   align-items: center;
diff --git a/dashboard/src/pages/Chat/index.tsx b/dashboard/src/pages/Chat/index.tsx
index 95f378ca..0d6a4afe 100644
--- a/dashboard/src/pages/Chat/index.tsx
+++ b/dashboard/src/pages/Chat/index.tsx
@@ -9,9 +9,11 @@ import {
   FilePen,
   Terminal,
   FolderOpen,
+  Activity,
 } from "lucide-react";
 import { Tooltip } from "antd";
 import { message as antMessage } from "@/utils/antdMessage";
+import { showConfirmModal } from "../../utils/confirmModal";
 
 import { useIsMobile } from "../../hooks/useIsMobile";
 import { useCurrentUser } from "../../hooks/useCurrentUser";
@@ -37,6 +39,10 @@ import { useChatContextWindow } from "./hooks/useChatContextWindow";
 import { useBrowserToolDetection } from "./hooks/useBrowserToolDetection";
 import { useSkillRecordingWorkflow } from "./hooks/useSkillRecordingWorkflow";
 import { listDockFilePathsForTree } from "./utils/dockFilePath";
+import {
+  shouldJumpToChromeInstall,
+  WORKBENCH_BROWSER_PATH,
+} from "./utils/chromeInstallGate";
 import { isFileToolName } from "./constants";
 import { browserApi } from "../../api/modules/browser";
 import { octopThreadsApi } from "../../api/modules/octopThreads";
@@ -48,6 +54,7 @@ import WelcomeScreen from "./components/WelcomeScreen";
 import AgentNotReadyScreen from "./components/AgentNotReadyScreen";
 import AgentProfileDrawer from "../../components/AgentProfileDrawer";
 import WorkspaceDrawer from "../Agent/Workspace/components/WorkspaceDrawer";
+import TrajectoryDrawer from "./components/TrajectoryDrawer";
 import { useExpertChatWelcome } from "./hooks/useExpertQuickCards";
 import { useSkills } from "../Agent/Skills/useSkills";
 import {
@@ -179,6 +186,8 @@ function ChatPageInner() {
     [agents, resolvedAgentId],
   );
   const agentChatReady = isAgentChatReady(activeAgent?.state);
+  const trajectoryEnabled =
+    activeAgent !== null && activeAgent.config?.enable_trajectory !== false;
   const sharedExpertViewer = isSharedExpertViewer(activeAgent ?? {});
   const noAgents = !agentsLoading && agents.length === 0;
 
@@ -215,7 +224,8 @@ function ChatPageInner() {
   );
   const [agentProfileOpen, setAgentProfileOpen] = useState(false);
   const [workspaceDrawerOpen, setWorkspaceDrawerOpen] = useState(false);
-
+  const [trajectoryDrawerOpen, setTrajectoryDrawerOpen] = useState(false);
+  const [turnRailVisible, setTurnRailVisible] = useState(false);
   const {
     sessions,
     loading: sessionsLoading,
@@ -255,6 +265,7 @@ function ChatPageInner() {
     }
     setAgentProfileOpen(false);
     setWorkspaceDrawerOpen(false);
+    setTrajectoryDrawerOpen(false);
   }, [resolvedAgentId]);
 
   // Weak stream resume may skip intermediate tokens — hint once after rebind.
@@ -347,6 +358,40 @@ function ChatPageInner() {
     setActiveTab: setDockActiveTab,
   } = useChatDockPanel(isMobile, resolvedAgentId);
 
+  const chromeCheckInFlightRef = useRef(false);
+  const handleToggleBrowserPanel = useCallback(async () => {
+    // A live session means Chrome is already running — skip the probe.
+    if (browserSessionId) {
+      toggleBrowserPanel();
+      return;
+    }
+    if (chromeCheckInFlightRef.current) return;
+    chromeCheckInFlightRef.current = true;
+    try {
+      const env = await browserApi.checkEnvStatus();
+      if (shouldJumpToChromeInstall(env)) {
+        showConfirmModal(
+          {
+            title: t("browserWorkspace.chromeMissingTitle"),
+            content: t("browserWorkspace.chromeMissingJumpToInstall"),
+            okText: t("common.confirm"),
+            cancelText: t("common.cancel"),
+            onOk: () => {
+              navigate(WORKBENCH_BROWSER_PATH);
+            },
+          },
+          { isMobile },
+        );
+        return;
+      }
+    } catch {
+      // Probe failed — keep the existing open-panel behavior.
+    } finally {
+      chromeCheckInFlightRef.current = false;
+    }
+    toggleBrowserPanel();
+  }, [browserSessionId, isMobile, navigate, t, toggleBrowserPanel]);
+
   const closeToolUiPanel = useCallback(
     (callId: string) => {
       closeDockTab(dockTabIdForToolCall(callId));
@@ -641,6 +686,22 @@ function ChatPageInner() {
     [resumeHitl, activeThreadId],
   );
 
+  /** Close an ask pause without answering: ``respond`` is the only decision
+   *  the agent allows for ``ask_user_question``, so tell it to wrap up. */
+  const handleAskDismiss = useCallback(
+    (actions: unknown[]) => {
+      resumeHitl(
+        actions.map(() => ({
+          type: "respond",
+          message: t("chat.ask.dismissMessage"),
+        })),
+        activeThreadId ?? undefined,
+        true,
+      );
+    },
+    [resumeHitl, activeThreadId, t],
+  );
+
   useEffect(() => {
     let cancelled = false;
     browserApi
@@ -828,6 +889,13 @@ function ChatPageInner() {
     activeThreadId && !hasMessages && (historyLoading || !historyHydrated),
   );
   const showWelcome = !hasMessages && !awaitingThreadHistory;
+
+  useEffect(() => {
+    if (showWelcome || !agentChatReady || noAgents) {
+      setTurnRailVisible(false);
+    }
+  }, [showWelcome, agentChatReady, noAgents]);
+
   const activeSession = useMemo(() => {
     if (!activeThreadId || showWelcome) return null;
     return (
@@ -913,7 +981,14 @@ function ChatPageInner() {
           }`}
         >
           {/* Main chat area */}
-          <div className={styles.chatMain}>
+          <div
+            className={[
+              styles.chatMain,
+              turnRailVisible ? styles.chatMainWithTurnRail : "",
+            ]
+              .filter(Boolean)
+              .join(" ")}
+          >
             {/* Mobile toolbar — session list + optional title + agent profile */}
             {isMobile && (
               <div className={styles.mobileToolbar}>
@@ -1031,6 +1106,7 @@ function ChatPageInner() {
                   forkDisabledHint={forkDisabledHint}
                   onAcpPermissionSelect={handleAcpPermissionSelect}
                   onHitlDecision={handleHitlDecision}
+                  onTurnRailVisibilityChange={setTurnRailVisible}
                   onOpenBrowser={
                     hasBrowserTool && !isMobile ? openBrowserTab : undefined
                   }
@@ -1048,7 +1124,8 @@ function ChatPageInner() {
             {!isMobile &&
               !dockOpen &&
               !agentProfileOpen &&
-              !workspaceDrawerOpen && (
+              !workspaceDrawerOpen &&
+              !trajectoryDrawerOpen && (
                 <div className={styles.chatFloatActions}>
                   {/* PWA install first when available — same column as browser / experts. */}
                   <PwaInstallPrompt appearance="chatFloat" />
@@ -1142,6 +1219,34 @@ function ChatPageInner() {
                       </span>
                     </Tooltip>
                   )}
+                  {trajectoryEnabled && (
+                    <Tooltip
+                      title={
+                        !agentChatReady
+                          ? t("workspace.requiresRunning")
+                          : !activeThreadId
+                          ? t(
+                              "chat.trajectorySelectSession",
+                              "Select a session to view trajectory",
+                            )
+                          : t("chat.openTrajectory", "运行轨迹")
+                      }
+                      mouseEnterDelay={0.35}
+                      placement="left"
+                    >
+                      <span className={styles.chatFloatBtnWrap}>
+                        <button
+                          type="button"
+                          className={styles.chatFloatBtn}
+                          disabled={!activeThreadId || !agentChatReady}
+                          onClick={() => setTrajectoryDrawerOpen(true)}
+                          aria-label={t("chat.openTrajectory", "运行轨迹")}
+                        >
+                          <Activity size={20} strokeWidth={2.1} />
+                        </button>
+                      </span>
+                    </Tooltip>
+                  )}
                   <Tooltip
                     title={
                       browserSessionId
@@ -1173,7 +1278,7 @@ function ChatPageInner() {
                         ]
                           .filter(Boolean)
                           .join(" ")}
-                        onClick={toggleBrowserPanel}
+                        onClick={() => void handleToggleBrowserPanel()}
                         aria-label={t("chat.openBrowser")}
                       >
                         <Globe size={20} strokeWidth={2.1} />
@@ -1206,6 +1311,7 @@ function ChatPageInner() {
                         })),
                       )
                     }
+                    onDismiss={() => handleAskDismiss(pendingAsk.actions)}
                   />
                 </div>
               </div>
@@ -1288,6 +1394,14 @@ function ChatPageInner() {
               />
             </>
           )}
+          {trajectoryEnabled && (
+            <TrajectoryDrawer
+              agentId={resolvedAgentId ?? ""}
+              threadId={activeThreadId}
+              open={trajectoryDrawerOpen}
+              onClose={() => setTrajectoryDrawerOpen(false)}
+            />
+          )}
         </div>
       </ChatToolDockProvider>
     </ChatFilePreviewProvider>
diff --git a/dashboard/src/pages/Chat/utils/chromeInstallGate.test.ts b/dashboard/src/pages/Chat/utils/chromeInstallGate.test.ts
new file mode 100644
index 00000000..17f897e9
--- /dev/null
+++ b/dashboard/src/pages/Chat/utils/chromeInstallGate.test.ts
@@ -0,0 +1,20 @@
+import { describe, expect, it } from "vitest";
+import {
+  shouldJumpToChromeInstall,
+  WORKBENCH_BROWSER_PATH,
+} from "./chromeInstallGate";
+
+describe("shouldJumpToChromeInstall", () => {
+  it("redirects when browsers_ok is missing or false", () => {
+    expect(shouldJumpToChromeInstall({})).toBe(true);
+    expect(shouldJumpToChromeInstall({ browsers_ok: false })).toBe(true);
+  });
+
+  it("stays in chat when Chrome is available", () => {
+    expect(shouldJumpToChromeInstall({ browsers_ok: true })).toBe(false);
+  });
+
+  it("points at the workbench browser tab", () => {
+    expect(WORKBENCH_BROWSER_PATH).toBe("/workbench/browser");
+  });
+});
diff --git a/dashboard/src/pages/Chat/utils/chromeInstallGate.ts b/dashboard/src/pages/Chat/utils/chromeInstallGate.ts
new file mode 100644
index 00000000..adc9e3e0
--- /dev/null
+++ b/dashboard/src/pages/Chat/utils/chromeInstallGate.ts
@@ -0,0 +1,9 @@
+/** Workbench tab that hosts Playwright Chromium install. */
+export const WORKBENCH_BROWSER_PATH = "/workbench/browser";
+
+/** Host has no launchable Chrome/Chromium (`GET /browser/env-status`). */
+export function shouldJumpToChromeInstall(env: {
+  browsers_ok?: boolean;
+}): boolean {
+  return env.browsers_ok !== true;
+}
diff --git a/dashboard/src/pages/Chat/utils/summarizeHitlAction.test.ts b/dashboard/src/pages/Chat/utils/summarizeHitlAction.test.ts
new file mode 100644
index 00000000..d6cc3891
--- /dev/null
+++ b/dashboard/src/pages/Chat/utils/summarizeHitlAction.test.ts
@@ -0,0 +1,137 @@
+import { describe, expect, it } from "vitest";
+import zh from "../../../locales/zh.json";
+import { summarizeHitlAction, type HitlTranslate } from "./summarizeHitlAction";
+
+function lookup(bundle: unknown, key: string): string | undefined {
+  let node: unknown = bundle;
+  for (const part of key.split(".")) {
+    if (!node || typeof node !== "object") return undefined;
+    node = (node as Record<string, unknown>)[part];
+  }
+  return typeof node === "string" ? node : undefined;
+}
+
+function interpolate(template: string, vars: Record<string, unknown>): string {
+  return template.replace(/\{\{(\w+)\}\}/g, (_, name: string) =>
+    name in vars ? String(vars[name]) : `{{${name}}}`,
+  );
+}
+
+/** Mimic i18next: missing keys return the key; `{{name}}` is interpolated. */
+function tFrom(bundle: unknown): HitlTranslate {
+  return (key, options) => {
+    const vars =
+      options && typeof options === "object"
+        ? (options as Record<string, unknown>)
+        : {};
+    const fallback = typeof options === "string" ? options : undefined;
+    const found = lookup(bundle, key);
+    if (found === undefined) return fallback ?? key;
+    return interpolate(found, vars);
+  };
+}
+
+const tZh = tFrom(zh);
+
+describe("summarizeHitlAction", () => {
+  it("explains browser_use dom_tree in Chinese instead of dumping JSON", () => {
+    const view = summarizeHitlAction(
+      "browser_use",
+      { action: "dom_tree", level: "interactive" },
+      tZh,
+      "使用浏览器",
+    );
+
+    expect(view.toolLabel).toBe("使用浏览器");
+    expect(view.summary).toBe("获取当前网页的可交互元素结构");
+    expect(view.rows).toEqual([
+      { label: "操作", value: "获取网页结构" },
+      { label: "范围", value: "仅交互元素" },
+    ]);
+    const blob = [view.summary, ...view.rows.map((row) => row.value)].join(" ");
+    expect(blob).not.toContain('"action"');
+    expect(blob).not.toContain("{");
+  });
+
+  it("puts the target URL into the navigate summary", () => {
+    const view = summarizeHitlAction(
+      "browser_use",
+      { action: "navigate", url: "https://news.example.com" },
+      tZh,
+      "使用浏览器",
+    );
+
+    expect(view.summary).toBe("打开网页 https://news.example.com");
+    expect(view.rows).toEqual([
+      { label: "操作", value: "打开网页" },
+      { label: "网址", value: "https://news.example.com", mono: true },
+    ]);
+  });
+
+  it("explains a shell command instead of wrapping it in JSON", () => {
+    const view = summarizeHitlAction(
+      "execute",
+      { command: "ls -la inbound" },
+      tZh,
+      "执行指令",
+    );
+
+    expect(view.summary).toBe("执行命令：ls -la inbound");
+    expect(view.rows).toEqual([
+      { label: "命令", value: "ls -la inbound", mono: true },
+    ]);
+  });
+
+  it("prefers the action description when the model already explained it", () => {
+    const view = summarizeHitlAction(
+      "custom_plugin_tool",
+      { foo_bar: "secret.txt" },
+      tZh,
+      "custom_plugin_tool",
+      "读取工作区里的密钥文件",
+    );
+
+    expect(view.summary).toBe("读取工作区里的密钥文件");
+    expect(view.rows).toEqual([{ label: "Foo bar", value: "secret.txt" }]);
+  });
+
+  it("ignores the English HITL template and explains write_file in Chinese", () => {
+    const view = summarizeHitlAction(
+      "write_file",
+      {
+        file_path: "/.octop/workspaces/J7Y3TW/test.txt",
+        content: "Hello, this is a test file!\nCreated at: 2025-01-25\n",
+      },
+      tZh,
+      "写入文件",
+      "Tool execution requires approval Tool: write_file Args: {'file_path': '/.octop/workspaces/J7Y3TW/test.txt', 'content': 'Hello, this is a test file!\\nCreated at: 2025-01-25\\n'}",
+    );
+
+    expect(view.summary).toBe("写入文件 /.octop/workspaces/J7Y3TW/test.txt");
+    expect(view.summary).not.toContain("Tool execution");
+    expect(view.rows).toEqual([
+      {
+        label: "文件路径",
+        value: "/.octop/workspaces/J7Y3TW/test.txt",
+        mono: true,
+      },
+      {
+        label: "内容",
+        value: "Hello, this is a test file!\nCreated at: 2025-01-25\n",
+      },
+    ]);
+  });
+
+  it("omits server-owned profile and skips empty args", () => {
+    const view = summarizeHitlAction(
+      "browser_use",
+      { action: "screenshot", profile: "user-7" },
+      tZh,
+      "使用浏览器",
+    );
+
+    expect(view.summary).toBe("截取当前网页截图");
+    expect(view.rows.map((row) => row.label)).toEqual(["操作"]);
+    expect(view.rows.some((row) => row.value === "user-7")).toBe(false);
+  });
+});
diff --git a/dashboard/src/pages/Chat/utils/summarizeHitlAction.ts b/dashboard/src/pages/Chat/utils/summarizeHitlAction.ts
new file mode 100644
index 00000000..db543e74
--- /dev/null
+++ b/dashboard/src/pages/Chat/utils/summarizeHitlAction.ts
@@ -0,0 +1,270 @@
+/**
+ * Turn a HITL tool-call into a short explanation plus labelled rows.
+ * Approval cards should never dump raw JSON as the primary view.
+ */
+
+export interface HitlArgRow {
+  label: string;
+  value: string;
+  mono?: boolean;
+}
+
+export interface HitlActionView {
+  toolLabel: string;
+  summary: string;
+  rows: HitlArgRow[];
+}
+
+export type HitlTranslate = (
+  key: string,
+  options?: string | Record<string, unknown>,
+) => string;
+
+const ALWAYS_HIDDEN = new Set(["session_id", "profile"]);
+const TRUNCATE_KEYS = new Set([
+  "content",
+  "body",
+  "html",
+  "text",
+  "old_string",
+  "new_string",
+  "code",
+  "script",
+]);
+const BROWSER_TOOLS = new Set(["browser_use", "browser_control"]);
+const SHELL_TOOLS = new Set(["execute", "bash", "run_terminal_cmd"]);
+const MONO_KEYS = new Set([
+  "command",
+  "cmd",
+  "path",
+  "file",
+  "file_path",
+  "url",
+  "code",
+  "script",
+  "selector",
+  "pattern",
+]);
+const MAX_TRUNCATED = 280;
+const MAX_HARD = 2000;
+
+const MACHINE_HITL_DESC = /tool execution requires approval/i;
+const TOOL_ARGS_DUMP = /\bTool:\s+\S[\s\S]*\bArgs:\s*[{'"]/;
+
+/** True when harness/langgraph stuffed a raw English args dump into ``description``. */
+export function isMachineHitlDescription(text: string): boolean {
+  const trimmed = text.trim();
+  if (!trimmed) return false;
+  return MACHINE_HITL_DESC.test(trimmed) || TOOL_ARGS_DUMP.test(trimmed);
+}
+
+function resolve(
+  t: HitlTranslate,
+  key: string,
+  fallback: string,
+  vars?: Record<string, unknown>,
+): string {
+  const result = vars
+    ? t(key, { defaultValue: fallback, ...vars })
+    : t(key, fallback);
+  if (!result || result === key) return fallback;
+  return result;
+}
+
+export function humanizeArgKey(key: string): string {
+  const cleaned = key.replace(/[_-]+/g, " ").trim();
+  if (!cleaned) return key;
+  return cleaned[0].toUpperCase() + cleaned.slice(1);
+}
+
+function isEmpty(value: unknown): boolean {
+  return value === null || value === undefined || value === "";
+}
+
+function shouldHide(key: string, value: unknown): boolean {
+  if (ALWAYS_HIDDEN.has(key) || isEmpty(value)) return true;
+  return false;
+}
+
+function truncate(text: string, max: number): string {
+  if (text.length <= max) return text;
+  return `${text.slice(0, Math.max(0, max - 1))}…`;
+}
+
+function formatPlain(value: unknown, t: HitlTranslate): string {
+  if (typeof value === "boolean") {
+    return resolve(
+      t,
+      value ? "chat.hitl.bool.true" : "chat.hitl.bool.false",
+      value ? "Yes" : "No",
+    );
+  }
+  if (typeof value === "number") return String(value);
+  if (typeof value === "string") return value;
+  if (Array.isArray(value)) {
+    return value
+      .filter((item) => !isEmpty(item))
+      .map((item) => formatPlain(item, t))
+      .join(", ");
+  }
+  if (value && typeof value === "object") {
+    return Object.entries(value as Record<string, unknown>)
+      .filter(([k, v]) => !shouldHide(k, v))
+      .map(([k, v]) => `${humanizeArgKey(k)}: ${formatPlain(v, t)}`)
+      .join("; ");
+  }
+  return String(value);
+}
+
+function formatKnownString(
+  toolName: string,
+  key: string,
+  raw: string,
+  t: HitlTranslate,
+): string {
+  if (BROWSER_TOOLS.has(toolName) || key === "action") {
+    if (key === "action") {
+      return resolve(t, `chat.hitl.browser.actions.${raw}`, raw);
+    }
+    if (key === "level") {
+      return resolve(t, `chat.hitl.browser.levels.${raw}`, raw);
+    }
+    if (key === "direction") {
+      return resolve(t, `chat.hitl.browser.directions.${raw}`, raw);
+    }
+  }
+  return raw;
+}
+
+function formatArgValue(
+  toolName: string,
+  key: string,
+  value: unknown,
+  t: HitlTranslate,
+): string {
+  if (typeof value === "string") {
+    const labelled = formatKnownString(toolName, key, value, t);
+    const max = TRUNCATE_KEYS.has(key) ? MAX_TRUNCATED : MAX_HARD;
+    return truncate(labelled, max);
+  }
+  const plain = formatPlain(value, t);
+  const max = TRUNCATE_KEYS.has(key) ? MAX_TRUNCATED : MAX_HARD;
+  return truncate(plain, max);
+}
+
+function argLabel(key: string, t: HitlTranslate): string {
+  return resolve(t, `chat.hitl.args.${key}`, humanizeArgKey(key));
+}
+
+function stringArg(
+  args: Record<string, unknown>,
+  ...keys: string[]
+): string | undefined {
+  for (const key of keys) {
+    const value = args[key];
+    if (typeof value === "string" && value.trim()) return value.trim();
+  }
+  return undefined;
+}
+
+function browserSummary(
+  args: Record<string, unknown>,
+  t: HitlTranslate,
+  toolLabel: string,
+): string {
+  const action = stringArg(args, "action") ?? "";
+  const url = stringArg(args, "url");
+  const level = stringArg(args, "level");
+  if ((action === "navigate" || action === "open") && url) {
+    return resolve(t, "chat.hitl.summaries.openUrl", `Open ${url}`, { url });
+  }
+  if (action === "new_tab" && url) {
+    return resolve(t, "chat.hitl.summaries.openUrl", `Open ${url}`, { url });
+  }
+  if (action === "screenshot") {
+    return resolve(
+      t,
+      "chat.hitl.summaries.screenshot",
+      "Take a screenshot of the current page",
+    );
+  }
+  if (action === "dom_tree" && level === "interactive") {
+    return resolve(
+      t,
+      "chat.hitl.summaries.domTreeInteractive",
+      "Read the interactive structure of the current page",
+    );
+  }
+  if (action === "dom_tree") {
+    return resolve(
+      t,
+      "chat.hitl.summaries.domTree",
+      "Read the structure of the current page",
+    );
+  }
+  if (action) {
+    return resolve(t, `chat.hitl.browser.actions.${action}`, toolLabel);
+  }
+  return toolLabel;
+}
+
+function buildSummary(
+  name: string,
+  args: Record<string, unknown>,
+  t: HitlTranslate,
+  toolLabel: string,
+  description?: string,
+): string {
+  const explained = description?.trim();
+  if (explained && !isMachineHitlDescription(explained)) return explained;
+  if (BROWSER_TOOLS.has(name)) return browserSummary(args, t, toolLabel);
+  const command = stringArg(args, "command", "cmd");
+  if (SHELL_TOOLS.has(name) && command) {
+    return resolve(t, "chat.hitl.summaries.runCommand", `Run: ${command}`, {
+      command,
+    });
+  }
+  const path = stringArg(args, "path", "file", "file_path");
+  if (name === "write_file" && path) {
+    return resolve(t, "chat.hitl.summaries.writeFile", `Write ${path}`, {
+      path,
+    });
+  }
+  if (name === "read_file" && path) {
+    return resolve(t, "chat.hitl.summaries.readFile", `Read ${path}`, { path });
+  }
+  if (name === "edit_file" && path) {
+    return resolve(t, "chat.hitl.summaries.editFile", `Edit ${path}`, { path });
+  }
+  const url = stringArg(args, "url");
+  if (name === "web_fetch" && url) {
+    return resolve(t, "chat.hitl.summaries.fetchUrl", `Fetch ${url}`, { url });
+  }
+  return toolLabel;
+}
+
+export function summarizeHitlAction(
+  name: string,
+  args: Record<string, unknown> | undefined,
+  t: HitlTranslate,
+  toolLabel: string,
+  description?: string,
+): HitlActionView {
+  const safeArgs = args && typeof args === "object" ? args : {};
+  const rows: HitlArgRow[] = [];
+  for (const [key, value] of Object.entries(safeArgs)) {
+    if (shouldHide(key, value)) continue;
+    const formatted = formatArgValue(name, key, value, t);
+    if (!formatted) continue;
+    rows.push({
+      label: argLabel(key, t),
+      value: formatted,
+      ...(MONO_KEYS.has(key) ? { mono: true } : {}),
+    });
+  }
+  return {
+    toolLabel,
+    summary: buildSummary(name, safeArgs, t, toolLabel, description),
+    rows,
+  };
+}
diff --git a/dashboard/src/pages/Chat/utils/trajectoryModel.test.ts b/dashboard/src/pages/Chat/utils/trajectoryModel.test.ts
new file mode 100644
index 00000000..417ef8c5
--- /dev/null
+++ b/dashboard/src/pages/Chat/utils/trajectoryModel.test.ts
@@ -0,0 +1,370 @@
+import { describe, expect, it } from "vitest";
+import type {
+  TrajectoryEvent,
+  TrajectoryMetrics,
+} from "../../../api/modules/trajectory";
+import {
+  collapseCalls,
+  collapseCallRows,
+  collapseTurns,
+  ensureToolCallParents,
+  filterRows,
+  formatCollapsedToolCalls,
+  formatDurationMs,
+  kindLabelFor,
+  laneForKind,
+  toLedgerRow,
+  visibleMetrics,
+  coerceToolResultText,
+} from "./trajectoryModel";
+
+function event(
+  overrides: Partial<TrajectoryEvent> &
+    Pick<TrajectoryEvent, "event_id" | "kind">,
+): TrajectoryEvent {
+  return {
+    thread_id: "T1",
+    agent_id: "A1",
+    seq: 1,
+    ts: 1,
+    turn_id: null,
+    request_seq: null,
+    is_error: false,
+    summary: "",
+    payload: {},
+    ...overrides,
+  };
+}
+
+describe("laneForKind", () => {
+  it("maps user and system to the input lane", () => {
+    expect(laneForKind("user")).toBe("input");
+    expect(laneForKind("system")).toBe("input");
+  });
+
+  it("maps assistant and compacted to the model lane", () => {
+    expect(laneForKind("assistant")).toBe("model");
+    expect(laneForKind("compacted")).toBe("model");
+  });
+
+  it("maps context to the input lane (DSH parity)", () => {
+    expect(laneForKind("context")).toBe("input");
+  });
+
+  it("maps tool to the tools lane", () => {
+    expect(laneForKind("tool")).toBe("tools");
+  });
+
+  it("maps unknown kinds to the input lane", () => {
+    expect(laneForKind("unknown")).toBe("input");
+  });
+});
+
+describe("toLedgerRow", () => {
+  it("copies id, summary, and error flag from the event", () => {
+    const row = toLedgerRow(
+      event({
+        event_id: "e1",
+        kind: "user",
+        summary: "hello",
+        is_error: true,
+      }),
+    );
+    expect(row).toMatchObject({
+      id: "e1",
+      kind: "user",
+      summary: "hello",
+      isError: true,
+    });
+  });
+
+  it("labels assistant rows as Request #N when request_seq is set", () => {
+    const row = toLedgerRow(
+      event({
+        event_id: "a1",
+        kind: "assistant",
+        request_seq: 3,
+        summary: "thinking…",
+      }),
+    );
+    expect(row.title).toBe("Request #3");
+    expect(row.requestSeq).toBe(3);
+  });
+
+  it("uses the tool name as the row title", () => {
+    const row = toLedgerRow(
+      event({
+        event_id: "t1",
+        kind: "tool",
+        summary: "tool read_file",
+        payload: { name: "read_file" },
+      }),
+    );
+    expect(row.title).toBe("read_file");
+  });
+
+  it("unwraps MCP content-block tool results for the ledger", () => {
+    const row = toLedgerRow(
+      event({
+        event_id: "t2",
+        kind: "tool",
+        summary: "tool list_projects",
+        payload: {
+          name: "list_projects",
+          result: [
+            {
+              type: "text",
+              text: '{\n  "id": "1",\n  "name": "工作"\n}',
+            },
+          ],
+        },
+      }),
+    );
+    expect(row.toolResult).toContain('"name": "工作"');
+    expect(row.toolResult).not.toContain('"type": "text"');
+  });
+
+  it("omits requestSeq when the event has none", () => {
+    const row = toLedgerRow(event({ event_id: "u1", kind: "user" }));
+    expect(row.requestSeq).toBeUndefined();
+  });
+});
+
+describe("coerceToolResultText", () => {
+  it("pretty-prints unwrapped MCP text JSON", () => {
+    const text = coerceToolResultText([
+      { type: "text", text: '{"id":"1","name":"工作"}' },
+    ]);
+    expect(text).toContain('"name": "工作"');
+    expect(text).not.toContain("type");
+  });
+});
+
+describe("filterRows", () => {
+  const rows = [
+    {
+      id: "1",
+      kind: "tool",
+      kindLabel: "TOOL" as const,
+      title: "read_file",
+      summary: "open a.py",
+      content: "open a.py",
+      toolArgs: null,
+      toolResult: null,
+      isError: false,
+    },
+    {
+      id: "2",
+      kind: "assistant",
+      kindLabel: "ASSISTANT" as const,
+      title: "Request #1",
+      summary: "I'll look at the source",
+      content: "I'll look at the source",
+      toolArgs: null,
+      toolResult: null,
+      requestSeq: 1,
+      isError: false,
+    },
+  ];
+
+  it("returns every row when the query is empty or whitespace", () => {
+    expect(filterRows(rows, "")).toEqual(rows);
+    expect(filterRows(rows, "   ")).toEqual(rows);
+  });
+
+  it("matches title, summary, or kind case-insensitively", () => {
+    expect(filterRows(rows, "READ").map((row) => row.id)).toEqual(["1"]);
+    expect(filterRows(rows, "source")).toHaveLength(1);
+    expect(filterRows(rows, "source")[0].id).toBe("2");
+    expect(filterRows(rows, "tool").map((row) => row.id)).toEqual(["1"]);
+  });
+
+  it("returns no rows when nothing matches", () => {
+    expect(filterRows(rows, "xyz")).toEqual([]);
+  });
+});
+
+describe("visibleMetrics", () => {
+  const base: TrajectoryMetrics = {
+    turns: 2,
+    steps: 5,
+    llm_duration_ms: null,
+    tool_duration_ms: 40,
+    ttft_avg_ms: null,
+    tok_per_s: 0,
+    cache_hit_ratio: null,
+    input_tokens: 10,
+    output_tokens: null,
+    cache_read_tokens: null,
+  };
+
+  it("omits null metric fields and keeps zeros", () => {
+    const entries = visibleMetrics(base);
+    expect(entries.map((entry) => entry.key)).toEqual([
+      "turns",
+      "steps",
+      "tool_duration_ms",
+      "tok_per_s",
+      "input_tokens",
+    ]);
+    expect(entries.find((entry) => entry.key === "tok_per_s")?.value).toBe(0);
+    expect(entries.some((entry) => entry.key === "llm_duration_ms")).toBe(
+      false,
+    );
+  });
+});
+
+describe("collapseTurns", () => {
+  it("groups consecutive events that share a turn_id", () => {
+    const groups = collapseTurns([
+      event({ event_id: "1", kind: "user", turn_id: "t1" }),
+      event({ event_id: "2", kind: "assistant", turn_id: "t1" }),
+      event({ event_id: "3", kind: "user", turn_id: "t2" }),
+    ]);
+    expect(groups.map((group) => group.map((ev) => ev.event_id))).toEqual([
+      ["1", "2"],
+      ["3"],
+    ]);
+  });
+
+  it("falls back to USER boundaries when turn_id is missing", () => {
+    const groups = collapseTurns([
+      event({ event_id: "s", kind: "system", turn_id: null }),
+      event({ event_id: "u1", kind: "user", turn_id: null }),
+      event({ event_id: "a1", kind: "assistant", turn_id: null }),
+      event({ event_id: "t1", kind: "tool", turn_id: null }),
+      event({ event_id: "u2", kind: "user", turn_id: null }),
+      event({ event_id: "a2", kind: "assistant", turn_id: null }),
+    ]);
+    expect(groups.map((group) => group.map((ev) => ev.event_id))).toEqual([
+      ["s"],
+      ["u1", "a1", "t1"],
+      ["u2", "a2"],
+    ]);
+  });
+});
+
+describe("collapseCalls", () => {
+  it("folds tool rows under the preceding assistant and drops orphan tools", () => {
+    const groups = collapseCalls([
+      event({ event_id: "1", kind: "tool" }),
+      event({ event_id: "2", kind: "tool" }),
+      event({ event_id: "3", kind: "assistant" }),
+      event({ event_id: "4", kind: "tool" }),
+      event({ event_id: "5", kind: "tool" }),
+      event({ event_id: "6", kind: "user" }),
+    ]);
+    expect(groups.map((group) => group.map((ev) => ev.event_id))).toEqual([
+      ["3", "4", "5"],
+      ["6"],
+    ]);
+  });
+});
+
+describe("collapseCallRows", () => {
+  it("keeps the assistant and inserts a separate DSH summary row", () => {
+    const rows = collapseCallRows([
+      event({
+        event_id: "a",
+        kind: "assistant",
+        summary: "(tool call only)",
+        payload: { tool_call_only: true, content: "" },
+      }),
+      event({
+        event_id: "t1",
+        kind: "tool",
+        payload: { name: "todo_write" },
+      }),
+      event({
+        event_id: "t2",
+        kind: "tool",
+        payload: { name: "bash" },
+      }),
+      event({
+        event_id: "t3",
+        kind: "tool",
+        payload: { name: "bash" },
+      }),
+      event({
+        event_id: "t4",
+        kind: "tool",
+        payload: { name: "glob" },
+      }),
+      event({
+        event_id: "u",
+        kind: "user",
+        summary: "next",
+      }),
+    ]);
+    expect(rows.map((row) => row.event_id)).toEqual([
+      "a",
+      "a__assistant_summary",
+      "u",
+    ]);
+    expect(rows[0]?.payload.tool_call_only).toBe(true);
+    expect(rows[0]?.summary).toBe("(tool call only)");
+    expect(rows[1]?.payload.collapsed_summary).toBe(true);
+    expect(rows[1]?.payload.content).toBe(
+      "4 tool calls · todo_write, bash, glob",
+    );
+  });
+
+  it("formats singular tool call counts", () => {
+    expect(formatCollapsedToolCalls(1, ["read"])).toBe("1 tool call · read");
+  });
+});
+
+describe("ensureToolCallParents", () => {
+  it("inserts a tool-call-only assistant before orphan tool bursts", () => {
+    const rows = ensureToolCallParents([
+      event({ event_id: "u", kind: "user" }),
+      event({ event_id: "t1", kind: "tool", summary: "tool ls" }),
+      event({ event_id: "t2", kind: "tool", summary: "tool ls" }),
+      event({
+        event_id: "a",
+        kind: "assistant",
+        summary: "done",
+        payload: { content: "done" },
+      }),
+    ]);
+    expect(rows.map((row) => row.kind)).toEqual([
+      "user",
+      "assistant",
+      "tool",
+      "tool",
+      "assistant",
+    ]);
+    expect(rows[1]?.payload.tool_call_only).toBe(true);
+    expect(rows[1]?.summary).toBe("(tool call only)");
+  });
+
+  it("does not duplicate parents when an assistant already precedes tools", () => {
+    const rows = ensureToolCallParents([
+      event({
+        event_id: "a",
+        kind: "assistant",
+        summary: "(tool call only)",
+        payload: { tool_call_only: true },
+      }),
+      event({ event_id: "t1", kind: "tool" }),
+    ]);
+    expect(rows.map((row) => row.event_id)).toEqual(["a", "t1"]);
+  });
+});
+
+describe("formatDurationMs", () => {
+  it("formats compact DSH-style durations", () => {
+    expect(formatDurationMs(45)).toBe("45ms");
+    expect(formatDurationMs(1200)).toBe("1.2s");
+    expect(formatDurationMs(12_500)).toBe("13s");
+    expect(formatDurationMs(74_370)).toBe("1m14s");
+  });
+});
+
+describe("kindLabelFor", () => {
+  it("maps kinds to DSH uppercase labels", () => {
+    expect(kindLabelFor("assistant")).toBe("ASSISTANT");
+    expect(kindLabelFor("tool")).toBe("TOOL");
+    expect(kindLabelFor("user")).toBe("USER");
+  });
+});
diff --git a/dashboard/src/pages/Chat/utils/trajectoryModel.ts b/dashboard/src/pages/Chat/utils/trajectoryModel.ts
new file mode 100644
index 00000000..c48c449f
--- /dev/null
+++ b/dashboard/src/pages/Chat/utils/trajectoryModel.ts
@@ -0,0 +1,576 @@
+import type {
+  TrajectoryEvent,
+  TrajectoryKind,
+  TrajectoryMetrics,
+} from "../../../api/modules/trajectory";
+
+export type TrajectoryLane = "input" | "model" | "tools";
+
+export type TrajectoryKindLabel =
+  | "USER"
+  | "ASSISTANT"
+  | "TOOL"
+  | "CONTEXT"
+  | "SYSTEM"
+  | "COMPACTED"
+  | "UNKNOWN";
+
+export interface TrajectoryLedgerRow {
+  id: string;
+  kind: string;
+  kindLabel: TrajectoryKindLabel;
+  title: string;
+  summary: string;
+  /** Single-line primary text shown in the content cell. */
+  content: string;
+  /** Tool args JSON (or preview) when kind is tool. */
+  toolArgs: string | null;
+  /** Tool result preview when kind is tool. */
+  toolResult: string | null;
+  /** ASSISTANT parent that owns a tool burst (DSH “tool call only”). */
+  toolCallOnly?: boolean;
+  /** DSH collapsed summary row (no kind badge; leading ellipsis). */
+  collapsedSummary?: boolean;
+  collapsedSummaryKind?: "assistant" | "turn";
+  /** Parent assistant/turn head id when this is a collapsed summary row. */
+  collapsedParentId?: string;
+  requestSeq?: number;
+  isError: boolean;
+}
+
+/** Match DeepSeek Harness ui-trajectory lanes: Input / Model / Tools. */
+const INPUT_KINDS = new Set<string>(["user", "system", "context", "unknown"]);
+const MODEL_KINDS = new Set<string>(["assistant", "compacted"]);
+
+export function laneForKind(kind: string): TrajectoryLane {
+  if (kind === "tool") return "tools";
+  if (MODEL_KINDS.has(kind)) return "model";
+  if (INPUT_KINDS.has(kind)) return "input";
+  return "input";
+}
+
+export function kindLabelFor(kind: string): TrajectoryKindLabel {
+  switch (kind) {
+    case "user":
+      return "USER";
+    case "assistant":
+      return "ASSISTANT";
+    case "tool":
+      return "TOOL";
+    case "context":
+      return "CONTEXT";
+    case "system":
+      return "SYSTEM";
+    case "compacted":
+      return "COMPACTED";
+    default:
+      return "UNKNOWN";
+  }
+}
+
+function titleForEvent(event: TrajectoryEvent): string {
+  if (event.payload.collapsed_summary === true) {
+    return payloadString(event.payload, "content") || event.summary || "";
+  }
+  if (event.kind === "assistant" && event.payload.tool_call_only === true) {
+    return event.summary || "(tool call only)";
+  }
+  if (event.kind === "assistant" && event.request_seq != null) {
+    return `Request #${event.request_seq}`;
+  }
+  if (event.kind === "tool") {
+    const name = event.payload.name;
+    return typeof name === "string" && name ? name : "tool";
+  }
+  if (event.kind === "context") {
+    const label = event.payload.label;
+    return typeof label === "string" && label ? label : "context";
+  }
+  if (event.kind === "system") {
+    const label = event.payload.label;
+    return typeof label === "string" && label ? label : "system";
+  }
+  return event.kind;
+}
+
+function oneLine(text: string): string {
+  return text.replace(/\s+/g, " ").trim();
+}
+
+function payloadString(
+  payload: Record<string, unknown>,
+  key: string,
+): string | null {
+  const value = payload[key];
+  if (typeof value === "string" && value.trim()) return value;
+  return null;
+}
+
+function isMcpTextBlock(
+  value: unknown,
+): value is { type?: string; text?: unknown } {
+  return (
+    typeof value === "object" &&
+    value != null &&
+    ("text" in value || (value as { type?: unknown }).type === "text")
+  );
+}
+
+function prettyIfJson(text: string): string | null {
+  const trimmed = text.trim();
+  if (!trimmed.startsWith("{") && !trimmed.startsWith("[")) return null;
+  try {
+    return JSON.stringify(JSON.parse(trimmed), null, 2);
+  } catch {
+    return null;
+  }
+}
+
+/** Unwrap MCP `[{type,text}]` / JSON strings into the tool's actual return text. */
+export function coerceToolResultText(value: unknown): string | null {
+  if (value == null) return null;
+
+  if (typeof value === "string") {
+    const trimmed = value.trim();
+    if (!trimmed) return null;
+    const withoutEllipsis = trimmed.endsWith("…")
+      ? trimmed.slice(0, -1).trim()
+      : trimmed;
+    if (withoutEllipsis.startsWith("[") || withoutEllipsis.startsWith("{")) {
+      try {
+        const nested = coerceToolResultText(JSON.parse(withoutEllipsis));
+        if (nested) return nested;
+      } catch {
+        const match = /"text"\s*:\s*"((?:\\.|[^"\\])*)/.exec(trimmed);
+        if (match?.[1] != null) {
+          try {
+            return JSON.parse(`"${match[1]}"`) as string;
+          } catch {
+            return match[1]
+              .replace(/\\n/g, "\n")
+              .replace(/\\"/g, '"')
+              .replace(/\\\\/g, "\\");
+          }
+        }
+      }
+    }
+    return prettyIfJson(trimmed) ?? value;
+  }
+
+  if (Array.isArray(value)) {
+    if (value.length > 0 && value.every(isMcpTextBlock)) {
+      const joined = value
+        .map((block) =>
+          typeof block.text === "string"
+            ? block.text
+            : block.text == null
+            ? ""
+            : JSON.stringify(block.text),
+        )
+        .filter((part) => part.length > 0)
+        .join("\n\n");
+      if (!joined) return null;
+      return prettyIfJson(joined) ?? joined;
+    }
+    try {
+      return JSON.stringify(value, null, 2);
+    } catch {
+      return String(value);
+    }
+  }
+
+  if (typeof value === "object") {
+    try {
+      return JSON.stringify(value, null, 2);
+    } catch {
+      return String(value);
+    }
+  }
+
+  if (typeof value === "number" || typeof value === "boolean") {
+    return String(value);
+  }
+  return null;
+}
+
+/** Pretty-print tool args for the Payload inspector tab. */
+export function coerceToolArgsText(value: unknown): string | null {
+  if (value == null) return null;
+  if (typeof value === "string") {
+    const trimmed = value.trim();
+    if (!trimmed) return null;
+    return prettyIfJson(trimmed) ?? value;
+  }
+  try {
+    return JSON.stringify(value, null, 2);
+  } catch {
+    return String(value);
+  }
+}
+
+function formatToolArgs(payload: Record<string, unknown>): string | null {
+  const args = payload.args ?? payload.arguments ?? payload.input;
+  if (args == null) return null;
+  const text = coerceToolArgsText(args);
+  return text ? oneLine(text) : null;
+}
+
+function formatToolResult(payload: Record<string, unknown>): string | null {
+  const text =
+    coerceToolResultText(payload.result) ??
+    coerceToolResultText(payload.output) ??
+    coerceToolResultText(payload.content);
+  return text ? oneLine(text) : null;
+}
+
+function contentForEvent(event: TrajectoryEvent): string {
+  if (event.kind === "tool") {
+    return oneLine(event.summary) || titleForEvent(event);
+  }
+  const content = payloadString(event.payload, "content");
+  if (content) return oneLine(content);
+  return oneLine(event.summary);
+}
+
+export function toLedgerRow(event: TrajectoryEvent): TrajectoryLedgerRow {
+  const toolCallOnly =
+    event.kind === "assistant" && event.payload.tool_call_only === true;
+  const collapsedSummary = event.payload.collapsed_summary === true;
+  const collapsedKind = event.payload.collapsed_summary_kind;
+  const parentId = event.payload.parent_event_id;
+  const row: TrajectoryLedgerRow = {
+    id: event.event_id,
+    kind: event.kind,
+    kindLabel: kindLabelFor(event.kind),
+    title: titleForEvent(event),
+    summary: event.summary,
+    content: contentForEvent(event),
+    toolArgs: event.kind === "tool" ? formatToolArgs(event.payload) : null,
+    toolResult: event.kind === "tool" ? formatToolResult(event.payload) : null,
+    isError: event.is_error,
+  };
+  if (toolCallOnly) {
+    row.toolCallOnly = true;
+  }
+  if (collapsedSummary) {
+    row.collapsedSummary = true;
+    if (collapsedKind === "assistant" || collapsedKind === "turn") {
+      row.collapsedSummaryKind = collapsedKind;
+    }
+    if (typeof parentId === "string" && parentId) {
+      row.collapsedParentId = parentId;
+    }
+  }
+  if (event.request_seq != null) {
+    row.requestSeq = event.request_seq;
+  }
+  return row;
+}
+
+export function filterRows(
+  rows: TrajectoryLedgerRow[],
+  query: string,
+): TrajectoryLedgerRow[] {
+  const needle = query.trim().toLowerCase();
+  if (!needle) return rows;
+  return rows.filter((row) => {
+    return (
+      row.title.toLowerCase().includes(needle) ||
+      row.summary.toLowerCase().includes(needle) ||
+      row.content.toLowerCase().includes(needle) ||
+      row.kind.toLowerCase().includes(needle) ||
+      row.kindLabel.toLowerCase().includes(needle) ||
+      (row.toolArgs?.toLowerCase().includes(needle) ?? false) ||
+      (row.toolResult?.toLowerCase().includes(needle) ?? false)
+    );
+  });
+}
+
+export function collapseTurns(events: TrajectoryEvent[]): TrajectoryEvent[][] {
+  const groups: TrajectoryEvent[][] = [];
+  for (const event of events) {
+    const last = groups[groups.length - 1];
+    if (!last) {
+      groups.push([event]);
+      continue;
+    }
+    const lastTurn =
+      last.find((row) => row.turn_id)?.turn_id ?? last[0]?.turn_id ?? null;
+    if (event.turn_id && lastTurn && event.turn_id === lastTurn) {
+      last.push(event);
+      continue;
+    }
+    if (event.turn_id && lastTurn && event.turn_id !== lastTurn) {
+      groups.push([event]);
+      continue;
+    }
+    // Harness often omits turn_id — fall back to USER boundaries so Turns
+    // collapse still groups a user message with its following context/tools.
+    if (event.kind === "user") {
+      groups.push([event]);
+      continue;
+    }
+    if (event.turn_id && !lastTurn) {
+      groups.push([event]);
+      continue;
+    }
+    last.push(event);
+  }
+  return groups;
+}
+
+/** Fold tool rows under the preceding assistant (DSH “Calls”). Orphan tools drop. */
+export function collapseCalls(events: TrajectoryEvent[]): TrajectoryEvent[][] {
+  const groups: TrajectoryEvent[][] = [];
+  for (const event of events) {
+    const last = groups[groups.length - 1];
+    if (event.kind === "tool") {
+      if (last?.[0]?.kind === "assistant") {
+        last.push(event);
+      }
+      continue;
+    }
+    groups.push([event]);
+  }
+  return groups;
+}
+
+function toolNameOf(event: TrajectoryEvent): string | null {
+  const name = event.payload.name;
+  return typeof name === "string" && name.trim() ? name.trim() : null;
+}
+
+/** Unique tool names in first-seen order (DSH collapsed-call summary). */
+export function uniqueToolNames(tools: readonly TrajectoryEvent[]): string[] {
+  const names: string[] = [];
+  for (const tool of tools) {
+    const name = toolNameOf(tool);
+    if (name && !names.includes(name)) names.push(name);
+  }
+  return names;
+}
+
+/**
+ * DSH assistant-tool summary body (ellipsis is rendered by the ledger):
+ * `5 tool calls · todo_write, bash, glob`
+ */
+export function formatCollapsedToolCalls(
+  count: number,
+  names: readonly string[],
+): string {
+  if (count <= 0) return "";
+  const unit = count === 1 ? "tool call" : "tool calls";
+  const namePart = names.length > 0 ? ` · ${names.join(", ")}` : "";
+  return `${count} ${unit}${namePart}`;
+}
+
+/** DSH turn summary body: `13 steps · 44 tool calls`. */
+export function formatCollapsedTurn(steps: number, toolCalls: number): string {
+  const stepsPart = steps === 1 ? "1 step" : `${steps} steps`;
+  const toolsPart = toolCalls === 1 ? "1 tool call" : `${toolCalls} tool calls`;
+  return `${stepsPart} · ${toolsPart}`;
+}
+
+function collapsedSummaryEvent(
+  head: TrajectoryEvent,
+  summary: string,
+  kind: "assistant" | "turn",
+): TrajectoryEvent {
+  return {
+    event_id: `${head.event_id}__${kind}_summary`,
+    thread_id: head.thread_id,
+    agent_id: head.agent_id,
+    seq: head.seq,
+    ts: head.ts,
+    kind: "assistant",
+    turn_id: head.turn_id,
+    request_seq: head.request_seq,
+    is_error: false,
+    summary,
+    payload: {
+      collapsed_summary: true,
+      collapsed_summary_kind: kind,
+      content: summary,
+      parent_event_id: head.event_id,
+    },
+  };
+}
+
+/**
+ * DSH “Calls”: keep the assistant row, hide following TOOL rows, and insert a
+ * separate summary row (`… N tool calls · names`) with no kind badge.
+ */
+export function collapseCallRows(
+  events: TrajectoryEvent[],
+  formatSummary: (
+    count: number,
+    names: readonly string[],
+  ) => string = formatCollapsedToolCalls,
+  collapsedAssistantIds?: ReadonlySet<string> | null,
+): TrajectoryEvent[] {
+  const out: TrajectoryEvent[] = [];
+  for (let index = 0; index < events.length; index += 1) {
+    const event = events[index];
+    if (event == null) continue;
+    out.push(event);
+    if (event.kind !== "assistant") continue;
+    if (
+      collapsedAssistantIds != null &&
+      !collapsedAssistantIds.has(event.event_id)
+    ) {
+      continue;
+    }
+
+    const tools: TrajectoryEvent[] = [];
+    let cursor = index + 1;
+    while (cursor < events.length && events[cursor]?.kind === "tool") {
+      const tool = events[cursor];
+      if (tool) tools.push(tool);
+      cursor += 1;
+    }
+    if (tools.length === 0) continue;
+
+    out.push(
+      collapsedSummaryEvent(
+        event,
+        formatSummary(tools.length, uniqueToolNames(tools)),
+        "assistant",
+      ),
+    );
+    index = cursor - 1;
+  }
+  return out;
+}
+
+/**
+ * DSH “Turns”: keep the first row of each turn, hide the rest, and insert
+ * `… N steps · M tool calls` as a separate summary row.
+ */
+export function collapseTurnRows(
+  events: TrajectoryEvent[],
+  formatSummary: (
+    steps: number,
+    toolCalls: number,
+  ) => string = formatCollapsedTurn,
+): TrajectoryEvent[] {
+  const out: TrajectoryEvent[] = [];
+  const groups = collapseTurns(events);
+  for (const group of groups) {
+    const head = group[0];
+    if (head == null) continue;
+    if (group.length <= 1) {
+      out.push(head);
+      continue;
+    }
+    const rest = group.slice(1);
+    const toolCalls = rest.filter((event) => event.kind === "tool").length;
+    const requestSeqs = new Set(
+      rest
+        .map((event) => event.request_seq)
+        .filter((value): value is number => value != null),
+    );
+    const steps =
+      requestSeqs.size > 0
+        ? requestSeqs.size
+        : rest.filter((event) => event.kind !== "tool").length;
+    out.push(head);
+    out.push(
+      collapsedSummaryEvent(head, formatSummary(steps, toolCalls), "turn"),
+    );
+  }
+  return out;
+}
+
+/** Assistants that currently own at least one following tool row. */
+export function collapsibleAssistantIds(
+  events: readonly TrajectoryEvent[],
+): string[] {
+  const ids: string[] = [];
+  for (let index = 0; index < events.length; index += 1) {
+    const event = events[index];
+    if (event?.kind === "assistant" && events[index + 1]?.kind === "tool") {
+      ids.push(event.event_id);
+    }
+  }
+  return ids;
+}
+
+/**
+ * Insert a synthetic ASSISTANT “(tool call only)” parent before orphan tool
+ * bursts (DSH parity / historical rows recorded before the service fix).
+ * Skips when an assistant row already precedes the tools.
+ */
+export function ensureToolCallParents(
+  events: readonly TrajectoryEvent[],
+  label = "(tool call only)",
+): TrajectoryEvent[] {
+  const out: TrajectoryEvent[] = [];
+  for (const event of events) {
+    if (event.kind === "tool") {
+      const prev = out[out.length - 1];
+      // One synthetic parent per orphan burst: consecutive tools share it.
+      // Skip when an assistant already owns the burst, or when the previous
+      // row is already a tool under that parent.
+      if (prev == null || (prev.kind !== "assistant" && prev.kind !== "tool")) {
+        out.push({
+          event_id: `${event.event_id}__tool_call_only`,
+          thread_id: event.thread_id,
+          agent_id: event.agent_id,
+          seq: event.seq,
+          ts: event.ts,
+          kind: "assistant",
+          turn_id: event.turn_id,
+          request_seq: event.request_seq,
+          is_error: false,
+          summary: label,
+          payload: { tool_call_only: true, content: "" },
+        });
+      }
+    }
+    out.push(event);
+  }
+  return out;
+}
+
+const METRIC_KEYS: (keyof TrajectoryMetrics)[] = [
+  "turns",
+  "steps",
+  "llm_duration_ms",
+  "tool_duration_ms",
+  "ttft_avg_ms",
+  "tok_per_s",
+  "cache_hit_ratio",
+  "input_tokens",
+  "output_tokens",
+  "cache_read_tokens",
+];
+
+export interface VisibleMetric {
+  key: keyof TrajectoryMetrics;
+  value: number;
+}
+
+export function formatDurationMs(milliseconds: number): string {
+  if (!Number.isFinite(milliseconds) || milliseconds < 0) return "—";
+  if (milliseconds < 1000) return `${Math.round(milliseconds)}ms`;
+  if (milliseconds < 60_000) {
+    const seconds = milliseconds / 1000;
+    return `${seconds < 10 ? seconds.toFixed(1) : Math.round(seconds)}s`;
+  }
+  const minutes = Math.floor(milliseconds / 60_000);
+  const seconds = Math.round((milliseconds % 60_000) / 1000);
+  return `${minutes}m${String(seconds).padStart(2, "0")}s`;
+}
+
+export function visibleMetrics(metrics: TrajectoryMetrics): VisibleMetric[] {
+  const entries: VisibleMetric[] = [];
+  for (const key of METRIC_KEYS) {
+    const value = metrics[key];
+    if (value != null) {
+      entries.push({ key, value });
+    }
+  }
+  return entries;
+}
+
+export type { TrajectoryEvent, TrajectoryKind, TrajectoryMetrics };
diff --git a/dashboard/src/pages/Chat/utils/trajectoryTimeline.test.ts b/dashboard/src/pages/Chat/utils/trajectoryTimeline.test.ts
new file mode 100644
index 00000000..133c55d4
--- /dev/null
+++ b/dashboard/src/pages/Chat/utils/trajectoryTimeline.test.ts
@@ -0,0 +1,316 @@
+import { describe, expect, it } from "vitest";
+import type { TrajectoryEvent } from "../../../api/modules/trajectory";
+import {
+  deriveSwimlaneSpans,
+  orderedRange,
+  trajectoryFocusEventIds,
+  zoomDomain,
+  type SwimlaneSpan,
+} from "./trajectoryTimeline";
+
+function event(
+  overrides: Partial<TrajectoryEvent> &
+    Pick<TrajectoryEvent, "event_id" | "kind">,
+): TrajectoryEvent {
+  return {
+    thread_id: "T1",
+    agent_id: "A1",
+    seq: 1,
+    ts: 1,
+    turn_id: null,
+    request_seq: null,
+    is_error: false,
+    summary: "",
+    payload: {},
+    ...overrides,
+  };
+}
+
+describe("deriveSwimlaneSpans", () => {
+  it("returns no spans for an empty event list", () => {
+    expect(deriveSwimlaneSpans([], "sequence")).toEqual([]);
+  });
+
+  it("emits one discrete span per event in sequence mode (no lane merge)", () => {
+    const spans = deriveSwimlaneSpans(
+      [
+        event({ event_id: "u", kind: "user" }),
+        event({ event_id: "a", kind: "assistant" }),
+        event({ event_id: "t1", kind: "tool" }),
+        event({ event_id: "t2", kind: "tool" }),
+        event({ event_id: "c", kind: "context" }),
+      ],
+      "sequence",
+    );
+    expect(
+      spans.map((span) => ({
+        lane: span.lane,
+        kind: span.kind,
+        eventIds: span.eventIds,
+        start: span.start,
+        end: span.end,
+      })),
+    ).toEqual([
+      {
+        lane: "input",
+        kind: "user",
+        eventIds: ["u"],
+        start: 0,
+        end: 1,
+      },
+      {
+        lane: "model",
+        kind: "assistant",
+        eventIds: ["a"],
+        start: 1,
+        end: 2,
+      },
+      {
+        lane: "tools",
+        kind: "tool",
+        eventIds: ["t1"],
+        start: 2,
+        end: 3,
+      },
+      {
+        lane: "tools",
+        kind: "tool",
+        eventIds: ["t2"],
+        start: 3,
+        end: 4,
+      },
+      {
+        lane: "input",
+        kind: "context",
+        eventIds: ["c"],
+        start: 4,
+        end: 5,
+      },
+    ]);
+  });
+
+  it("sizes spans from payload durations in duration mode", () => {
+    const spans = deriveSwimlaneSpans(
+      [
+        event({
+          event_id: "a",
+          kind: "assistant",
+          payload: { llm_duration_ms: 100 },
+        }),
+        event({
+          event_id: "t",
+          kind: "tool",
+          payload: { tool_duration_ms: 50 },
+        }),
+      ],
+      "duration",
+    );
+    expect(spans).toHaveLength(2);
+    expect(spans[0]).toMatchObject({
+      lane: "model",
+      eventIds: ["a"],
+      start: 0,
+      end: 100,
+    });
+    expect(spans[1]).toMatchObject({
+      lane: "tools",
+      eventIds: ["t"],
+      start: 100,
+      end: 150,
+    });
+  });
+
+  it("falls back to timestamp gaps in duration mode when payload lacks durations", () => {
+    const spans = deriveSwimlaneSpans(
+      [
+        event({ event_id: "a", kind: "assistant", ts: 1 }),
+        event({ event_id: "t", kind: "tool", ts: 1.5 }),
+        event({ event_id: "u", kind: "user", ts: 2, summary: "hi" }),
+      ],
+      "duration",
+    );
+    // Last event has no successor gap → content-size estimate (user "hi" → 42).
+    expect(
+      spans.map((span) => ({ id: span.id, start: span.start, end: span.end })),
+    ).toEqual([
+      { id: "a", start: 0, end: 500 },
+      { id: "t", start: 500, end: 1000 },
+      { id: "u", start: 1000, end: 1042 },
+    ]);
+  });
+
+  it("ignores sub-50ms timestamp gaps and estimates instead", () => {
+    const spans = deriveSwimlaneSpans(
+      [
+        event({
+          event_id: "a",
+          kind: "assistant",
+          ts: 1,
+          summary: "x".repeat(100),
+        }),
+        event({ event_id: "t", kind: "tool", ts: 1.01, summary: "tool" }),
+      ],
+      "duration",
+    );
+    // 10ms gap is below the floor → estimate, not 10.
+    expect(spans[0]!.end - spans[0]!.start).toBeGreaterThan(10);
+    expect(spans[0]!.end - spans[0]!.start).toBe(120 + 100 * 2);
+  });
+
+  it("estimates duration when timestamps are equal so Duration differs from sequence", () => {
+    const events = [
+      event({ event_id: "u", kind: "user", ts: 100, summary: "hi" }),
+      event({
+        event_id: "a",
+        kind: "assistant",
+        ts: 100,
+        summary: "x".repeat(200),
+      }),
+      event({
+        event_id: "t",
+        kind: "tool",
+        ts: 100,
+        summary: "tool",
+        payload: { name: "read", result: "y".repeat(50) },
+      }),
+    ];
+    const sequence = deriveSwimlaneSpans(events, "sequence");
+    const duration = deriveSwimlaneSpans(events, "duration");
+    expect(sequence.map((s) => s.end - s.start)).toEqual([1, 1, 1]);
+    expect(duration[1]!.end - duration[1]!.start).toBeGreaterThan(
+      duration[0]!.end - duration[0]!.start,
+    );
+    expect(duration.map((s) => s.end - s.start)).not.toEqual([1, 1, 1]);
+  });
+
+  it("estimates duration from payload bulk when ts and duration fields are missing", () => {
+    const spans = deriveSwimlaneSpans(
+      [
+        event({
+          event_id: "u",
+          kind: "user",
+          ts: 0,
+          summary: "hi",
+        }),
+        event({
+          event_id: "a",
+          kind: "assistant",
+          ts: 0,
+          summary: "x".repeat(200),
+        }),
+        event({
+          event_id: "t",
+          kind: "tool",
+          ts: 0,
+          summary: "tool",
+          payload: { name: "read", result: "y".repeat(50) },
+        }),
+      ],
+      "duration",
+    );
+    expect(spans[0]!.end - spans[0]!.start).toBeLessThan(
+      spans[1]!.end - spans[1]!.start,
+    );
+    expect(spans[2]!.end - spans[2]!.start).toBeGreaterThan(
+      spans[0]!.end - spans[0]!.start,
+    );
+    const equal = deriveSwimlaneSpans(
+      [
+        event({ event_id: "u", kind: "user", ts: 0, summary: "hi" }),
+        event({
+          event_id: "a",
+          kind: "assistant",
+          ts: 0,
+          summary: "x".repeat(200),
+        }),
+        event({
+          event_id: "t",
+          kind: "tool",
+          ts: 0,
+          summary: "tool",
+          payload: { name: "read", result: "y".repeat(50) },
+        }),
+      ],
+      "sequence",
+    );
+    expect(equal.every((span) => span.end - span.start === 1)).toBe(true);
+  });
+
+  it("uses timestamps in actual mode and keeps a visible last span", () => {
+    const spans = deriveSwimlaneSpans(
+      [
+        event({ event_id: "u", kind: "user", ts: 10 }),
+        event({ event_id: "a", kind: "assistant", ts: 20 }),
+        event({ event_id: "t", kind: "tool", ts: 25 }),
+      ],
+      "actual",
+    );
+    expect(
+      spans.map((span) => ({
+        lane: span.lane,
+        start: span.start,
+        end: span.end,
+      })),
+    ).toEqual([
+      { lane: "input", start: 10, end: 20 },
+      { lane: "model", start: 20, end: 25 },
+      { lane: "tools", start: 25, end: 26 },
+    ]);
+  });
+});
+
+describe("trajectory timeline domain helpers", () => {
+  it("orderedRange normalizes inverted drags", () => {
+    expect(orderedRange(5, 2)).toEqual({ start: 2, end: 5 });
+  });
+
+  it("trajectoryFocusEventIds includes spans intersecting the range", () => {
+    const spans: SwimlaneSpan[] = [
+      {
+        id: "a",
+        lane: "input",
+        kind: "user",
+        start: 0,
+        end: 1,
+        eventIds: ["a"],
+        isError: false,
+      },
+      {
+        id: "b",
+        lane: "model",
+        kind: "assistant",
+        start: 1,
+        end: 2,
+        eventIds: ["b"],
+        isError: false,
+      },
+      {
+        id: "c",
+        lane: "tools",
+        kind: "tool",
+        start: 2,
+        end: 3,
+        eventIds: ["c"],
+        isError: false,
+      },
+    ];
+    expect([
+      ...trajectoryFocusEventIds(spans, { start: 1.5, end: 2.5 }),
+    ]).toEqual(["b", "c"]);
+  });
+
+  it("zoomDomain shrinks around the anchor and stays inside the full domain", () => {
+    const next = zoomDomain({
+      fullStart: 0,
+      fullEnd: 100,
+      domainStart: 0,
+      domainEnd: 100,
+      anchorFraction: 0.5,
+      zoomFactor: 0.5,
+      minDomain: 10,
+    });
+    expect(next.end - next.start).toBe(50);
+    expect(next.start).toBeGreaterThanOrEqual(0);
+    expect(next.end).toBeLessThanOrEqual(100);
+  });
+});
diff --git a/dashboard/src/pages/Chat/utils/trajectoryTimeline.ts b/dashboard/src/pages/Chat/utils/trajectoryTimeline.ts
new file mode 100644
index 00000000..2370ef34
--- /dev/null
+++ b/dashboard/src/pages/Chat/utils/trajectoryTimeline.ts
@@ -0,0 +1,231 @@
+import type { TrajectoryEvent } from "../../../api/modules/trajectory";
+import { laneForKind, type TrajectoryLane } from "./trajectoryModel";
+
+export type SwimlaneMode = "sequence" | "duration" | "actual";
+
+export interface SwimlaneSpan {
+  id: string;
+  lane: TrajectoryLane;
+  kind: string;
+  start: number;
+  end: number;
+  eventIds: string[];
+  isError: boolean;
+}
+
+export interface TrajectoryTimeRange {
+  start: number;
+  end: number;
+}
+
+export function orderedRange(a: number, b: number): TrajectoryTimeRange {
+  return a <= b ? { start: a, end: b } : { start: b, end: a };
+}
+
+export function clamp(value: number, min: number, max: number): number {
+  return Math.min(max, Math.max(min, value));
+}
+
+export function trajectoryFocusEventIds(
+  spans: readonly SwimlaneSpan[],
+  range: TrajectoryTimeRange,
+): ReadonlySet<string> {
+  const ids = new Set<string>();
+  for (const span of spans) {
+    if (span.start <= range.end && span.end >= range.start) {
+      for (const eventId of span.eventIds) {
+        ids.add(eventId);
+      }
+    }
+  }
+  return ids;
+}
+
+export function zoomDomain(args: {
+  fullStart: number;
+  fullEnd: number;
+  domainStart: number;
+  domainEnd: number;
+  anchorFraction: number;
+  zoomFactor: number;
+  minDomain: number;
+}): TrajectoryTimeRange {
+  const {
+    fullStart,
+    fullEnd,
+    domainStart,
+    domainEnd,
+    anchorFraction,
+    zoomFactor,
+    minDomain,
+  } = args;
+  const fullWidth = fullEnd - fullStart;
+  const currentWidth = domainEnd - domainStart;
+  const nextWidth = clamp(currentWidth * zoomFactor, minDomain, fullWidth);
+  const anchorTime = domainStart + anchorFraction * currentWidth;
+  let start = anchorTime - anchorFraction * nextWidth;
+  let end = start + nextWidth;
+  if (start < fullStart) {
+    start = fullStart;
+    end = fullStart + nextWidth;
+  }
+  if (end > fullEnd) {
+    end = fullEnd;
+    start = fullEnd - nextWidth;
+  }
+  return { start, end };
+}
+
+export function panDomain(args: {
+  fullStart: number;
+  fullEnd: number;
+  domainStart: number;
+  domainEnd: number;
+  deltaFraction: number;
+}): TrajectoryTimeRange {
+  const { fullStart, fullEnd, domainStart, domainEnd, deltaFraction } = args;
+  const domainWidth = domainEnd - domainStart;
+  const delta = deltaFraction * domainWidth;
+  let start = domainStart + delta;
+  let end = domainEnd + delta;
+  if (start < fullStart) {
+    end += fullStart - start;
+    start = fullStart;
+  }
+  if (end > fullEnd) {
+    start -= end - fullEnd;
+    end = fullEnd;
+  }
+  return { start, end };
+}
+
+function clampDuration(value: number, min: number, max: number): number {
+  return Math.min(max, Math.max(min, value));
+}
+
+function payloadSize(value: unknown): number {
+  if (value == null) return 0;
+  if (typeof value === "string") return value.length;
+  try {
+    return JSON.stringify(value).length;
+  } catch {
+    return 0;
+  }
+}
+
+/**
+ * When wall-clock durations were never recorded (legacy rows with ``ts === 0``),
+ * size Duration-mode spans from payload bulk so the toggle is still visible.
+ */
+function estimatedDurationMs(event: TrajectoryEvent): number {
+  const summaryLen = event.summary?.length ?? 0;
+  switch (event.kind) {
+    case "tool": {
+      const size =
+        payloadSize(event.payload.result) +
+        payloadSize(event.payload.args) +
+        summaryLen;
+      return clampDuration(80 + size, 80, 6_000);
+    }
+    case "assistant": {
+      const size =
+        payloadSize(event.payload.content) +
+        payloadSize(event.payload.thinking) +
+        summaryLen;
+      return clampDuration(120 + size * 2, 120, 8_000);
+    }
+    case "context":
+    case "system":
+    case "compacted":
+      return clampDuration(
+        40 + payloadSize(event.payload.content) + summaryLen,
+        40,
+        4_000,
+      );
+    case "user":
+    default:
+      return clampDuration(40 + summaryLen, 40, 2_000);
+  }
+}
+
+function eventDuration(
+  event: TrajectoryEvent,
+  mode: SwimlaneMode,
+  next: TrajectoryEvent | undefined,
+): number {
+  if (mode === "sequence") return 1;
+  if (mode === "duration") {
+    const key = event.kind === "tool" ? "tool_duration_ms" : "llm_duration_ms";
+    const raw = event.payload[key];
+    if (typeof raw === "number" && Number.isFinite(raw) && raw > 0) return raw;
+    // Wall-clock gap between successive events (seconds → ms).
+    // Sub-50ms gaps are typical of burst stamping and look identical to
+    // sequence mode — treat them as missing and estimate from payload bulk.
+    if (next != null && event.ts > 0 && next.ts > event.ts) {
+      const gapMs = (next.ts - event.ts) * 1000;
+      if (gapMs >= 50) return gapMs;
+    }
+    return estimatedDurationMs(event);
+  }
+  return 1;
+}
+
+function actualEnd(events: TrajectoryEvent[], index: number): number {
+  const event = events[index];
+  const start = event?.ts ?? 0;
+  const key = event?.kind === "tool" ? "tool_duration_ms" : "llm_duration_ms";
+  const duration = event?.payload[key];
+  if (
+    typeof duration === "number" &&
+    Number.isFinite(duration) &&
+    duration > 0
+  ) {
+    return start + duration;
+  }
+  const next = events[index + 1];
+  if (next != null && next.ts > start) return next.ts;
+  return start + 1;
+}
+
+/**
+ * Project each ledger event into a discrete three-lane span (DSH-style).
+ * Consecutive same-lane events stay separate blocks — never merged.
+ */
+export function deriveSwimlaneSpans(
+  events: TrajectoryEvent[],
+  mode: SwimlaneMode,
+): SwimlaneSpan[] {
+  if (events.length === 0) return [];
+
+  if (mode === "actual") {
+    return events.map((event, index) => {
+      const start = event.ts;
+      const end = actualEnd(events, index);
+      return {
+        id: event.event_id,
+        lane: laneForKind(event.kind),
+        kind: event.kind,
+        start,
+        end: end > start ? end : start + 1,
+        eventIds: [event.event_id],
+        isError: event.is_error,
+      };
+    });
+  }
+
+  let cursor = 0;
+  return events.map((event, index) => {
+    const start = cursor;
+    const end = start + eventDuration(event, mode, events[index + 1]);
+    cursor = end;
+    return {
+      id: event.event_id,
+      lane: laneForKind(event.kind),
+      kind: event.kind,
+      start,
+      end,
+      eventIds: [event.event_id],
+      isError: event.is_error,
+    };
+  });
+}
diff --git a/dashboard/src/pages/Chat/utils/turnTimeline.test.ts b/dashboard/src/pages/Chat/utils/turnTimeline.test.ts
new file mode 100644
index 00000000..74cd1055
--- /dev/null
+++ b/dashboard/src/pages/Chat/utils/turnTimeline.test.ts
@@ -0,0 +1,187 @@
+import { describe, expect, it } from "vitest";
+import type { ChatMessage } from "../hooks/useChat";
+import { groupConsecutiveAssistantMessages } from "./messageGrouping";
+import {
+  buildTurnTimelineItems,
+  mergeTurnPositions,
+  readElementDirection,
+  resolveActiveTurnId,
+  resolveFollowPinnedTurnId,
+  tickVisualForDistance,
+  truncatePreviewText,
+  visibleTurnWindow,
+} from "./turnTimeline";
+
+function msg(
+  role: ChatMessage["role"],
+  id: string,
+  extra?: Partial<ChatMessage>,
+): ChatMessage {
+  return {
+    id,
+    role,
+    content: extra?.content ?? "",
+    status: "done",
+    timestamp: Date.now(),
+    ...extra,
+  };
+}
+
+const copy = {
+  userFallback: "(empty)",
+  emptyAssistant: "(no reply)",
+  runningAssistant: "(generating)",
+};
+
+describe("truncatePreviewText", () => {
+  it("falls back when empty", () => {
+    expect(truncatePreviewText([], "fallback")).toBe("fallback");
+  });
+
+  it("truncates long text with ellipsis", () => {
+    const long = "a".repeat(300);
+    const out = truncatePreviewText([long], "x", 20);
+    expect(out.endsWith("...")).toBe(true);
+    expect(out.length).toBeLessThanOrEqual(20);
+  });
+
+  it("keeps at most two paragraphs", () => {
+    const out = truncatePreviewText(["one\n\ntwo\n\nthree"], "x", 220, 2);
+    expect(out).toBe("one\ntwo");
+  });
+});
+
+describe("tickVisualForDistance", () => {
+  it("returns idle when no focus", () => {
+    expect(tickVisualForDistance(0, undefined)).toMatchObject({
+      tone: "idle",
+      scaleX: 1,
+    });
+  });
+
+  it("peaks at focus and cascades neighbors", () => {
+    expect(tickVisualForDistance(3, 3).scaleX).toBe(2.6);
+    expect(tickVisualForDistance(2, 3).scaleX).toBe(1.7);
+    expect(tickVisualForDistance(1, 3).scaleX).toBe(1.25);
+    expect(tickVisualForDistance(0, 3).scaleX).toBe(1);
+  });
+});
+
+describe("resolveActiveTurnId", () => {
+  it("picks the visible row closest to the viewport top", () => {
+    const id = resolveActiveTurnId({
+      scrollOffsetPx: 100,
+      viewportHeightPx: 400,
+      positions: [
+        { messageId: "a", start: 0, end: 80 },
+        { messageId: "b", start: 120, end: 200 },
+        { messageId: "c", start: 500, end: 580 },
+      ],
+    });
+    expect(id).toBe("b");
+  });
+
+  it("falls back to the last row above the viewport", () => {
+    const id = resolveActiveTurnId({
+      scrollOffsetPx: 300,
+      viewportHeightPx: 100,
+      positions: [
+        { messageId: "a", start: 0, end: 50 },
+        { messageId: "b", start: 100, end: 150 },
+        { messageId: "c", start: 500, end: 550 },
+      ],
+    });
+    expect(id).toBe("b");
+  });
+});
+
+describe("buildTurnTimelineItems", () => {
+  it("indexes user turns with assistant previews", () => {
+    const messages = [
+      msg("user", "u1", { content: "hello" }),
+      msg("assistant", "a1", { content: "world" }),
+      msg("user", "u2", { content: "again" }),
+      msg("assistant", "a2", { content: "ok", status: "streaming" }),
+    ];
+    const groups = groupConsecutiveAssistantMessages(messages);
+    const items = buildTurnTimelineItems(messages, groups, copy, {
+      isStreaming: true,
+    });
+    expect(items).toHaveLength(2);
+    expect(items[0]).toMatchObject({
+      messageId: "u1",
+      userPreview: "hello",
+      assistantPreview: "world",
+      assistantPreviewKind: "text",
+      isRunning: false,
+    });
+    expect(items[1]).toMatchObject({
+      messageId: "u2",
+      isRunning: true,
+    });
+  });
+});
+
+describe("mergeTurnPositions", () => {
+  it("interpolates missing virtualized turns from neighbors", () => {
+    const merged = mergeTurnPositions({
+      estimatedUnitHeight: 100,
+      turns: [
+        { messageId: "u1", groupIndex: 0 },
+        { messageId: "u2", groupIndex: 2 },
+        { messageId: "u3", groupIndex: 4 },
+      ],
+      measured: [{ messageId: "u1", start: 0, end: 80 }],
+    });
+    expect(merged[0]).toEqual({ messageId: "u1", start: 0, end: 80 });
+    expect(merged[1].start).toBe(200);
+    expect(merged[2].start).toBe(400);
+  });
+});
+
+describe("resolveFollowPinnedTurnId", () => {
+  it("pins to the latest turn while following", () => {
+    expect(
+      resolveFollowPinnedTurnId([{ messageId: "a" }, { messageId: "b" }], {
+        following: true,
+      }),
+    ).toBe("b");
+    expect(
+      resolveFollowPinnedTurnId([{ messageId: "a" }], { following: false }),
+    ).toBeUndefined();
+  });
+});
+
+describe("visibleTurnWindow", () => {
+  it("returns full range when forceFull", () => {
+    expect(
+      visibleTurnWindow({
+        count: 100,
+        scrollTop: 0,
+        viewportHeight: 100,
+        forceFull: true,
+      }),
+    ).toEqual({ start: 0, end: 100 });
+  });
+
+  it("windows ticks with overscan", () => {
+    expect(
+      visibleTurnWindow({
+        count: 100,
+        scrollTop: 140,
+        viewportHeight: 70,
+        rowPx: 14,
+        overscan: 2,
+      }),
+    ).toEqual({ start: 8, end: 17 });
+  });
+});
+
+describe("readElementDirection", () => {
+  it("reads rtl from document dir", () => {
+    document.documentElement.setAttribute("dir", "rtl");
+    expect(readElementDirection(null)).toBe("rtl");
+    document.documentElement.setAttribute("dir", "ltr");
+    expect(readElementDirection(null)).toBe("ltr");
+  });
+});
diff --git a/dashboard/src/pages/Chat/utils/turnTimeline.ts b/dashboard/src/pages/Chat/utils/turnTimeline.ts
new file mode 100644
index 00000000..858a6085
--- /dev/null
+++ b/dashboard/src/pages/Chat/utils/turnTimeline.ts
@@ -0,0 +1,330 @@
+import type { ChatMessage } from "../hooks/useChat";
+import { deriveMessageContent } from "./messageContent";
+import type { MessageGroup } from "./messageGrouping";
+
+export const TURN_TIMELINE_MIN_TURNS = 2;
+export const TURN_TIMELINE_MIN_WIDTH_PX = 864;
+export const TURN_TIMELINE_MAX_PREVIEW_CHARS = 220;
+export const TURN_TIMELINE_MAX_PREVIEW_PARAGRAPHS = 2;
+export const TURN_TIMELINE_ROW_PX = 14;
+/** Window ticks when the rail grows past this many user turns. */
+export const TURN_TIMELINE_VIRTUALIZE_THRESHOLD = 40;
+export const TURN_TIMELINE_RAIL_OVERSCAN = 6;
+export const TURN_TIMELINE_HOVER_OPEN_DELAY_S = 0.12;
+export const TURN_TIMELINE_HOVER_CLOSE_DELAY_S = 0.08;
+
+export interface TurnTimelineItem {
+  messageId: string;
+  groupIndex: number;
+  userPreview: string;
+  assistantPreview: string;
+  assistantPreviewKind: "text" | "empty" | "running";
+  isRunning: boolean;
+}
+
+export interface TurnTickVisual {
+  colorTone: "focus" | "muted";
+  opacity: number;
+  scaleX: number;
+  tone: "peak" | "near" | "mid" | "idle";
+}
+
+export interface TurnTimelinePreviewCopy {
+  userFallback: string;
+  emptyAssistant: string;
+  runningAssistant: string;
+}
+
+function splitPreviewParagraphs(text: string, maxParagraphs: number): string[] {
+  return text
+    .trim()
+    .split(/\n\s*\n/u)
+    .map((part) => part.replace(/\s+/gu, " ").trim())
+    .filter(Boolean)
+    .slice(0, Math.max(1, maxParagraphs));
+}
+
+export function truncatePreviewText(
+  texts: string[],
+  fallback: string,
+  maxChars = TURN_TIMELINE_MAX_PREVIEW_CHARS,
+  maxParagraphs = TURN_TIMELINE_MAX_PREVIEW_PARAGRAPHS,
+): string {
+  const paragraphs = splitPreviewParagraphs(texts.join("\n\n"), maxParagraphs);
+  if (paragraphs.length === 0) return fallback;
+  const joined = paragraphs.join("\n");
+  const limit = Math.max(8, maxChars);
+  if (joined.length <= limit) return joined;
+  return `${joined.slice(0, limit - 3).trimEnd()}...`;
+}
+
+export function tickVisualForDistance(
+  itemIndex: number,
+  visualFocusItemIndex: number | undefined,
+): TurnTickVisual {
+  if (visualFocusItemIndex === undefined) {
+    return { colorTone: "muted", opacity: 0.58, scaleX: 1, tone: "idle" };
+  }
+  const distance = Math.abs(itemIndex - visualFocusItemIndex);
+  if (distance === 0) {
+    return { colorTone: "focus", opacity: 1, scaleX: 2.6, tone: "peak" };
+  }
+  if (distance === 1) {
+    return { colorTone: "muted", opacity: 0.86, scaleX: 1.7, tone: "near" };
+  }
+  if (distance === 2) {
+    return { colorTone: "muted", opacity: 0.72, scaleX: 1.25, tone: "mid" };
+  }
+  return { colorTone: "muted", opacity: 0.58, scaleX: 1, tone: "idle" };
+}
+
+export function resolveActiveTurnId(args: {
+  positions: Array<{ messageId: string; start: number; end: number }>;
+  scrollOffsetPx: number;
+  viewportHeightPx: number;
+}): string | undefined {
+  const { positions, scrollOffsetPx, viewportHeightPx } = args;
+  if (positions.length === 0) return undefined;
+  const viewportStart = Math.max(0, scrollOffsetPx);
+  const viewportEnd = viewportStart + Math.max(1, viewportHeightPx);
+  const normalized = positions
+    .map((row) => {
+      const start = Math.max(0, row.start);
+      return {
+        messageId: row.messageId,
+        start,
+        end: Math.max(start, row.end),
+      };
+    })
+    .sort(
+      (a, b) => a.start - b.start || a.messageId.localeCompare(b.messageId),
+    );
+  const visible = normalized.filter(
+    (row) => row.end >= viewportStart && row.start <= viewportEnd,
+  );
+  if (visible.length > 0) {
+    return visible.reduce((best, row) =>
+      Math.abs(row.start - viewportStart) < Math.abs(best.start - viewportStart)
+        ? row
+        : best,
+    ).messageId;
+  }
+  return (
+    [...normalized].reverse().find((row) => row.start <= viewportStart)
+      ?.messageId ??
+    normalized.find((row) => row.start > viewportStart)?.messageId
+  );
+}
+
+function messageText(message: ChatMessage): string {
+  return deriveMessageContent(message).textContent.trim();
+}
+
+export function buildTurnTimelineItems(
+  messages: ChatMessage[],
+  messageGroups: MessageGroup[],
+  copy: TurnTimelinePreviewCopy,
+  opts?: { isStreaming?: boolean },
+): TurnTimelineItem[] {
+  const groupIndexByMessageId = new Map<string, number>();
+  messageGroups.forEach((group, index) => {
+    for (const msg of group.messages) {
+      groupIndexByMessageId.set(msg.id, index);
+    }
+  });
+
+  const items: TurnTimelineItem[] = [];
+  for (let i = 0; i < messages.length; i++) {
+    const msg = messages[i];
+    if (msg.role !== "user") continue;
+    const groupIndex = groupIndexByMessageId.get(msg.id);
+    if (groupIndex === undefined) continue;
+
+    let assistant: ChatMessage | undefined;
+    for (let j = i + 1; j < messages.length; j++) {
+      const next = messages[j];
+      if (next.role === "user") break;
+      if (next.role === "assistant" && messageText(next)) {
+        assistant = next;
+      }
+    }
+
+    const isLastUser = !messages
+      .slice(i + 1)
+      .some((candidate) => candidate.role === "user");
+    const isRunning = Boolean(
+      opts?.isStreaming &&
+        isLastUser &&
+        (!assistant || assistant.status === "streaming"),
+    );
+
+    let assistantPreviewKind: TurnTimelineItem["assistantPreviewKind"] =
+      "empty";
+    let assistantPreview = copy.emptyAssistant;
+    if (assistant && messageText(assistant)) {
+      assistantPreviewKind = "text";
+      assistantPreview = truncatePreviewText(
+        [messageText(assistant)],
+        copy.emptyAssistant,
+      );
+    } else if (isRunning) {
+      assistantPreviewKind = "running";
+      assistantPreview = copy.runningAssistant;
+    }
+
+    items.push({
+      messageId: msg.id,
+      groupIndex,
+      userPreview: truncatePreviewText([messageText(msg)], copy.userFallback),
+      assistantPreview,
+      assistantPreviewKind,
+      isRunning,
+    });
+  }
+  return items;
+}
+
+export function prefersReducedMotion(): boolean {
+  if (typeof window === "undefined" || !window.matchMedia) return false;
+  return window.matchMedia("(prefers-reduced-motion: reduce)").matches;
+}
+
+export function alignElementToScrollerTop(
+  scroller: HTMLElement,
+  target: HTMLElement,
+  behavior: ScrollBehavior,
+): void {
+  const top =
+    scroller.scrollTop +
+    target.getBoundingClientRect().top -
+    scroller.getBoundingClientRect().top;
+  if (behavior === "auto") {
+    scroller.scrollTop = top;
+    return;
+  }
+  scroller.scrollTo({ top, behavior });
+}
+
+/** Fallback height for virtualized turns that are not mounted yet. */
+export const TURN_TIMELINE_ESTIMATED_UNIT_HEIGHT_PX = 140;
+
+/**
+ * Fill in scroll positions for turns whose DOM nodes are not mounted
+ * (Virtuoso windowing) by interpolating from nearest measured neighbors.
+ */
+export function mergeTurnPositions(args: {
+  turns: Array<{ messageId: string; groupIndex: number }>;
+  measured: Array<{ messageId: string; start: number; end: number }>;
+  estimatedUnitHeight?: number;
+}): Array<{ messageId: string; start: number; end: number }> {
+  const unit = Math.max(
+    1,
+    args.estimatedUnitHeight ?? TURN_TIMELINE_ESTIMATED_UNIT_HEIGHT_PX,
+  );
+  const measuredById = new Map(
+    args.measured.map((row) => [row.messageId, row] as const),
+  );
+  const measuredByGroup = new Map<
+    number,
+    { start: number; end: number; groupIndex: number }
+  >();
+  for (const turn of args.turns) {
+    const known = measuredById.get(turn.messageId);
+    if (!known) continue;
+    measuredByGroup.set(turn.groupIndex, {
+      start: known.start,
+      end: known.end,
+      groupIndex: turn.groupIndex,
+    });
+  }
+
+  return args.turns.map((turn) => {
+    const known = measuredById.get(turn.messageId);
+    if (known) return known;
+
+    let nearest:
+      | { dist: number; start: number; end: number; groupIndex: number }
+      | undefined;
+    for (const candidate of measuredByGroup.values()) {
+      const dist = Math.abs(candidate.groupIndex - turn.groupIndex);
+      if (!nearest || dist < nearest.dist) {
+        nearest = { ...candidate, dist };
+      }
+    }
+
+    if (nearest) {
+      const delta = (turn.groupIndex - nearest.groupIndex) * unit;
+      const start = nearest.start + delta;
+      return {
+        messageId: turn.messageId,
+        start,
+        end: start + unit,
+      };
+    }
+
+    const start = turn.groupIndex * unit;
+    return {
+      messageId: turn.messageId,
+      start,
+      end: start + unit,
+    };
+  });
+}
+
+/** Prefer the latest turn while the list is pinned to the bottom / following. */
+export function resolveFollowPinnedTurnId(
+  turns: Array<{ messageId: string }>,
+  options: { following: boolean },
+): string | undefined {
+  if (!options.following || turns.length === 0) return undefined;
+  return turns[turns.length - 1]?.messageId;
+}
+
+export function resolveFlashTarget(anchor: HTMLElement): HTMLElement {
+  const bubble =
+    anchor.querySelector<HTMLElement>('[class*="userBubble"]') ??
+    anchor.querySelector<HTMLElement>('[class*="messageBubble"]');
+  return bubble ?? anchor;
+}
+
+/** Inclusive-exclusive window of tick indices to mount in the rail. */
+export function visibleTurnWindow(args: {
+  count: number;
+  scrollTop: number;
+  viewportHeight: number;
+  rowPx?: number;
+  overscan?: number;
+  forceFull?: boolean;
+}): { start: number; end: number } {
+  const count = Math.max(0, args.count);
+  if (count === 0) return { start: 0, end: 0 };
+  if (args.forceFull) return { start: 0, end: count };
+  const rowPx = Math.max(1, args.rowPx ?? TURN_TIMELINE_ROW_PX);
+  const overscan = Math.max(0, args.overscan ?? TURN_TIMELINE_RAIL_OVERSCAN);
+  const start = Math.max(0, Math.floor(args.scrollTop / rowPx) - overscan);
+  const end = Math.min(
+    count,
+    Math.ceil((args.scrollTop + Math.max(1, args.viewportHeight)) / rowPx) +
+      overscan,
+  );
+  return { start, end: Math.max(start, end) };
+}
+
+export function readElementDirection(
+  el: Element | null | undefined,
+): "ltr" | "rtl" {
+  if (typeof document === "undefined") return "ltr";
+  const withDir =
+    el && typeof el.closest === "function" ? el.closest("[dir]") : null;
+  const attr = (
+    withDir?.getAttribute("dir") ||
+    document.documentElement.getAttribute("dir") ||
+    ""
+  ).toLowerCase();
+  if (attr === "rtl" || attr === "ltr") return attr;
+  if (typeof getComputedStyle === "function" && el) {
+    const computed = getComputedStyle(el).direction.toLowerCase();
+    if (computed === "rtl") return "rtl";
+  }
+  return "ltr";
+}
diff --git a/dashboard/src/pages/Control/CronJobs/components/JobDetailDrawer.tsx b/dashboard/src/pages/Control/CronJobs/components/JobDetailDrawer.tsx
index cb721d6d..737f79f4 100644
--- a/dashboard/src/pages/Control/CronJobs/components/JobDetailDrawer.tsx
+++ b/dashboard/src/pages/Control/CronJobs/components/JobDetailDrawer.tsx
@@ -111,6 +111,9 @@ export function JobDetailDrawer({
             {job.id}
           </Text>
         </Descriptions.Item>
+        <Descriptions.Item label={t("cronJobs.col.name")}>
+          {job.name || "—"}
+        </Descriptions.Item>
         <Descriptions.Item label={t("common.enabled")}>
           {job.enabled ? (
             <Tag color="success">{t("common.enabled")}</Tag>
diff --git a/dashboard/src/pages/Control/CronJobs/components/JobDrawer.tsx b/dashboard/src/pages/Control/CronJobs/components/JobDrawer.tsx
index 4a03a626..3918e4dd 100644
--- a/dashboard/src/pages/Control/CronJobs/components/JobDrawer.tsx
+++ b/dashboard/src/pages/Control/CronJobs/components/JobDrawer.tsx
@@ -20,7 +20,7 @@ import {
   cronToPreset,
   presetToCron,
 } from "./constants";
-import { CRON_PROMPT_MAX_LEN } from "../constants";
+import { CRON_NAME_MAX_LEN, CRON_PROMPT_MAX_LEN } from "../constants";
 import { channelFromSessionKey } from "../cronDisplay";
 import type { CronJobFormValues } from "../useCronJobs";
 import {
@@ -173,12 +173,18 @@ export function JobDrawer({
       .listInstances()
       .then((instances) => {
         setConnectorOptions(
-          (instances || []).map((i) => ({
-            value: i.mcp_server_name,
-            label: i.display_name?.trim()
-              ? `${i.display_name} (${i.mcp_server_name})`
-              : i.mcp_server_name,
-          })),
+          (instances || [])
+            .filter((i) => i.status === "active" && i.has_credentials)
+            .map((i) => ({
+              value: i.mcp_server_name,
+              label: i.display_name?.trim()
+                ? `${i.display_name}${
+                    i.shared && i.owner_display_name
+                      ? ` · ${i.owner_display_name}`
+                      : ""
+                  } (${i.mcp_server_name})`
+                : i.mcp_server_name,
+            })),
         );
       })
       .catch(() => setConnectorOptions([]))
@@ -220,6 +226,27 @@ export function JobDrawer({
           </Form.Item>
         )}
 
+        <Form.Item
+          name="name"
+          label={t("cronJobs.form.name")}
+          rules={[
+            { required: true, message: t("cronJobs.pleaseInputName") },
+            {
+              max: CRON_NAME_MAX_LEN,
+              message: t("cronJobs.form.nameTooLong", {
+                max: CRON_NAME_MAX_LEN,
+              }),
+            },
+          ]}
+          tooltip={t("cronJobs.form.nameTooltip")}
+        >
+          <Input
+            maxLength={CRON_NAME_MAX_LEN}
+            showCount
+            placeholder={t("cronJobs.jobNamePlaceholder")}
+          />
+        </Form.Item>
+
         <Form.Item
           name="enabled"
           label={t("cronJobs.form.enabled")}
diff --git a/dashboard/src/pages/Control/CronJobs/components/columns.tsx b/dashboard/src/pages/Control/CronJobs/components/columns.tsx
index a95cf3b0..e96ca422 100644
--- a/dashboard/src/pages/Control/CronJobs/components/columns.tsx
+++ b/dashboard/src/pages/Control/CronJobs/components/columns.tsx
@@ -44,7 +44,7 @@ export const createColumns = (
       title: handlers.t("cronJobs.col.id"),
       dataIndex: "id",
       key: "id",
-      width: 120,
+      width: 118,
       fixed: sticky ? "left" : undefined,
       ellipsis: true,
       onHeaderCell: () => ({ style: { paddingLeft: 28 } }),
@@ -111,12 +111,33 @@ export const createColumns = (
         );
       },
     },
+    {
+      title: handlers.t("cronJobs.col.name"),
+      dataIndex: "name",
+      key: "name",
+      width: 180,
+      fixed: sticky ? "left" : undefined,
+      ellipsis: true,
+      render: (name: string, record: CronJob) => {
+        const text = name?.trim() || record.id;
+        return (
+          <Tooltip title={text}>
+            <button
+              type="button"
+              className={styles.nameCellButton}
+              onClick={() => handlers.onDetail(record)}
+            >
+              {text}
+            </button>
+          </Tooltip>
+        );
+      },
+    },
     {
       title: handlers.t("common.enabled"),
       dataIndex: "enabled",
       key: "enabled",
       width: 100,
-      fixed: sticky ? "left" : undefined,
       render: (enabled: boolean) => (
         <span
           style={{
@@ -155,6 +176,7 @@ export const createColumns = (
     {
       title: handlers.t("cronJobs.col.taskType"),
       key: "task_type",
+      width: 180,
       render: (_: unknown, record: CronJob) => {
         const taskType = record.task_type === "text" ? "text" : "agent";
         return (
@@ -169,7 +191,7 @@ export const createColumns = (
     {
       title: handlers.t("cronJobs.col.prompt"),
       key: "prompt",
-      width: 200,
+      width: 240,
       ellipsis: true,
       render: (_: unknown, record: CronJob) => {
         const content = extractPromptFromJob(record);
@@ -252,8 +274,9 @@ export const createColumns = (
     {
       title: handlers.t("cronJobs.action"),
       key: "action",
-      width: 200,
+      width: 220,
       fixed: sticky ? "right" : undefined,
+      className: styles.actionCell,
       render: (_: unknown, record: CronJob) => {
         const menuItems: MenuProps["items"] = [
           {
@@ -272,7 +295,7 @@ export const createColumns = (
         ];
 
         return (
-          <div style={{ display: "flex", gap: 8, alignItems: "center" }}>
+          <div className={styles.tableActionGroup}>
             <Button
               type="link"
               size="small"
diff --git a/dashboard/src/pages/Control/CronJobs/components/constants.ts b/dashboard/src/pages/Control/CronJobs/components/constants.ts
index 7e44538d..c3efad20 100644
--- a/dashboard/src/pages/Control/CronJobs/components/constants.ts
+++ b/dashboard/src/pages/Control/CronJobs/components/constants.ts
@@ -48,6 +48,7 @@ export const DEFAULT_FORM_VALUES = {
 /** Form defaults with server-configured cron timezone. */
 export function buildDefaultFormValues(timezone: string) {
   return {
+    name: "",
     enabled: false,
     schedule: {
       type: "cron" as const,
diff --git a/dashboard/src/pages/Control/CronJobs/constants.ts b/dashboard/src/pages/Control/CronJobs/constants.ts
index 0f34a8a6..bfcf16cb 100644
--- a/dashboard/src/pages/Control/CronJobs/constants.ts
+++ b/dashboard/src/pages/Control/CronJobs/constants.ts
@@ -1,2 +1,4 @@
 /** Keep in sync with ``octop.infra.cron.task_type.CRON_PROMPT_MAX_LEN``. */
 export const CRON_PROMPT_MAX_LEN = 2000;
+/** Keep in sync with ``octop.infra.cron.task_type.CRON_NAME_MAX_LEN``. */
+export const CRON_NAME_MAX_LEN = 80;
diff --git a/dashboard/src/pages/Control/CronJobs/index.module.less b/dashboard/src/pages/Control/CronJobs/index.module.less
index af3916ac..f73bed82 100644
--- a/dashboard/src/pages/Control/CronJobs/index.module.less
+++ b/dashboard/src/pages/Control/CronJobs/index.module.less
@@ -55,6 +55,7 @@
   :global(.ant-table-cell-fix-left),
   :global(.ant-table-cell-fix-right) {
     background: var(--fn-bg-primary, #fff) !important;
+    z-index: 2;
   }
 
   :global(.octop-table-thead .octop-table-cell-fix-left),
@@ -67,11 +68,52 @@
   :global(.octop-table-row:hover > .octop-table-cell-fix-left),
   :global(.octop-table-row:hover > .octop-table-cell-fix-right),
   :global(.ant-table-row:hover > .ant-table-cell-fix-left),
-  :global(.ant-table-row:hover > .ant-table-cell-fix-right) {
-    background: var(--fn-bg-hover, rgba(0, 0, 0, 0.02)) !important;
+  :global(.ant-table-row:hover > .ant-table-cell-fix-right),
+  :global(.octop-table-cell-fix-left.octop-table-cell-row-hover),
+  :global(.octop-table-cell-fix-right.octop-table-cell-row-hover),
+  :global(.ant-table-cell-fix-left.ant-table-cell-row-hover),
+  :global(.ant-table-cell-fix-right.ant-table-cell-row-hover) {
+    background: linear-gradient(
+        var(--fn-bg-hover, rgba(0, 0, 0, 0.02)),
+        var(--fn-bg-hover, rgba(0, 0, 0, 0.02))
+      ),
+      var(--fn-bg-primary, #fff) !important;
+  }
+
+  :global(.octop-table-tbody > tr > td),
+  :global(.ant-table-tbody > tr > td) {
+    overflow: hidden;
   }
 }
 
+.nameCellButton {
+  display: block;
+  max-width: 100%;
+  padding: 0;
+  border: 0;
+  background: transparent;
+  color: var(--fn-text-primary);
+  font: inherit;
+  font-weight: 400;
+  line-height: 1.4;
+  text-align: left;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  cursor: pointer;
+}
+
+.actionCell {
+  overflow: hidden;
+}
+
+.tableActionGroup {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  white-space: nowrap;
+}
+
 .promptCell {
   display: block;
   /* Table runs in `table-layout: auto` (scroll.x = max-content) so columns hug
@@ -213,7 +255,7 @@
 
 .cronCardName {
   font-size: 14px;
-  font-weight: 600;
+  font-weight: 400;
   color: var(--fn-text-primary);
   white-space: nowrap;
   overflow: hidden;
diff --git a/dashboard/src/pages/Control/CronJobs/index.tsx b/dashboard/src/pages/Control/CronJobs/index.tsx
index 546fb27c..614724f1 100644
--- a/dashboard/src/pages/Control/CronJobs/index.tsx
+++ b/dashboard/src/pages/Control/CronJobs/index.tsx
@@ -1,14 +1,5 @@
 import { useState, useEffect } from "react";
-import {
-  Button,
-  Card,
-  Empty,
-  Form,
-  Segmented,
-  Spin,
-  Table,
-  Tooltip,
-} from "antd";
+import { Button, Card, Empty, Form, Segmented, Spin, Tooltip } from "antd";
 import { LayoutGrid, List, RefreshCw } from "lucide-react";
 import type { CronJobSpecOutput } from "../../../api/types";
 import { useTranslation } from "react-i18next";
@@ -26,6 +17,7 @@ import type { CronJobFormValues } from "./useCronJobs";
 import { useCardTableView } from "../../../hooks/useCardTableView";
 import { showConfirmModal } from "../../../utils/confirmModal";
 import { OctopEmptyMascot } from "../../../components/EmptyState";
+import { ResizableTable } from "../../../components/ResizableTable";
 import PageShell from "../../../layouts/PageShell";
 import { useAgent } from "../../../context/AgentContext";
 import styles from "./index.module.less";
@@ -84,7 +76,8 @@ function CronJobsPage() {
   const { isMobile, viewMode, setViewMode, showCardView } =
     useCardTableView("table");
   const navigate = useNavigate();
-  const { activeAgentId } = useAgent();
+  const { activeAgentId, activeAgent } = useAgent();
+  const canManageJobs = activeAgent?.is_owner === true;
   const {
     jobs,
     loading,
@@ -233,9 +226,9 @@ function CronJobsPage() {
     stickyColumns: !isMobile,
   });
 
-  // Until the user picks an agent there is nothing to fetch and no scope
-  // to write to. Mirror the behaviour of the other octop agent-scoped pages.
-  if (!activeAgentId) {
+  // Shared experts are not a task scope. Non-owners should see the same
+  // "pick an agent" empty as if nothing were selected — no shared-expert copy.
+  if (!activeAgentId || !canManageJobs) {
     return (
       <PageShell
         title={t("pageShell.tasks.title")}
@@ -349,13 +342,16 @@ function CronJobsPage() {
               ))}
             </div>
           ) : (
-            <Table
+            <ResizableTable
               className={styles.cronTable}
               columns={columns}
               dataSource={jobs}
               rowKey="id"
               size="middle"
-              scroll={{ x: 1300 }}
+              tableLayout="fixed"
+              scroll={{ x: 1562 }}
+              storageKey="cron-jobs-table-widths"
+              minWidth={72}
               pagination={{
                 pageSize: 10,
                 showSizeChanger: false,
diff --git a/dashboard/src/pages/Control/CronJobs/useCronJobs.ts b/dashboard/src/pages/Control/CronJobs/useCronJobs.ts
index 3c5f2cc1..fc9f71ff 100644
--- a/dashboard/src/pages/Control/CronJobs/useCronJobs.ts
+++ b/dashboard/src/pages/Control/CronJobs/useCronJobs.ts
@@ -17,6 +17,7 @@ type CronJob = CronJobSpecOutput;
 /** Octop-aligned form values for create / edit drawer. */
 export interface CronJobFormValues {
   id?: string;
+  name: string;
   enabled: boolean;
   schedule: {
     type: "cron";
@@ -48,7 +49,7 @@ function fromOctop(row: OctopCronRow, timezone: string): CronJob {
 
   return {
     id: row.id,
-    name: promptLabel(row.prompt, row.id),
+    name: row.name?.trim() || promptLabel(row.prompt, row.id),
     enabled: row.enabled,
     schedule: {
       type: "cron",
@@ -111,6 +112,7 @@ export function jobToFormValues(
   const matchedPreset = cronToPreset(cronExpr);
   return {
     id: job.id,
+    name: job.name || "",
     enabled: Boolean(job.enabled),
     schedule: {
       type: "cron",
@@ -147,11 +149,13 @@ function resolveCronExpression(values: CronJobFormValues): string {
 
 function toOctopCreateBody(values: CronJobFormValues) {
   return {
+    name: (values.name || "").trim(),
     trigger: resolveCronExpression(values),
     prompt: values.prompt.trim(),
     task_type: values.task_type,
     session_key: values.fresh_thread ? null : values.session_key || null,
     fresh_thread: Boolean(values.fresh_thread),
+    enabled: Boolean(values.enabled),
     model: defaultModelFromForm(values.model),
     mcp_servers: values.mcp_servers ?? [],
   };
@@ -166,7 +170,8 @@ function toOctopPatchBody(values: CronJobFormValues) {
 
 export function useCronJobs() {
   const { t } = useTranslation();
-  const { activeAgentId } = useAgent();
+  const { activeAgentId, activeAgent } = useAgent();
+  const canManageJobs = activeAgent?.is_owner === true;
   const [jobs, setJobs] = useState<CronJob[]>([]);
   /** Which agent the currently painted `jobs` belong to (may lag activeAgent). */
   const [jobsOwnerId, setJobsOwnerId] = useState<string | null>(null);
@@ -183,6 +188,8 @@ export function useCronJobs() {
   timezoneRef.current = cronTimezone;
   const activeAgentRef = useRef(activeAgentId);
   activeAgentRef.current = activeAgentId;
+  const canManageRef = useRef(canManageJobs);
+  canManageRef.current = canManageJobs;
   const jobsOwnerRef = useRef<string | null>(null);
   jobsOwnerRef.current = jobsOwnerId;
   /** Per-agent list cache — instant paint when hopping back to an expert. */
@@ -251,7 +258,7 @@ export function useCronJobs() {
   const fetchJobs = useCallback(
     async (opts?: { soft?: boolean }) => {
       const agentId = activeAgentRef.current;
-      if (!agentId) {
+      if (!agentId || !canManageRef.current) {
         setJobs([]);
         setJobsOwnerId(null);
         jobsOwnerRef.current = null;
@@ -314,7 +321,7 @@ export function useCronJobs() {
   // Expert switch: paint cache immediately, revalidate in background.
   useEffect(() => {
     void fetchJobs({ soft: false });
-  }, [activeAgentId, fetchJobs]);
+  }, [activeAgentId, canManageJobs, fetchJobs]);
 
   const createJob = async (values: CronJobFormValues) => {
     if (!activeAgentId) return false;
@@ -339,6 +346,7 @@ export function useCronJobs() {
     const original = jobs.find((j) => j.id === jobId);
     const optimistic = {
       ...original,
+      name: (values.name || "").trim(),
       enabled: values.enabled,
       task_type: values.task_type,
       model: values.model ?? undefined,
diff --git a/dashboard/src/pages/Control/RemoteAndroid/RemotePhoneIdleGuide.tsx b/dashboard/src/pages/Control/RemoteAndroid/RemotePhoneIdleGuide.tsx
index eb535948..c7d3f1f1 100644
--- a/dashboard/src/pages/Control/RemoteAndroid/RemotePhoneIdleGuide.tsx
+++ b/dashboard/src/pages/Control/RemoteAndroid/RemotePhoneIdleGuide.tsx
@@ -100,7 +100,7 @@ export default function RemotePhoneIdleGuide({
           : needsInstall
           ? t(
               "remoteAndroid.needsInstallDesc",
-              "此主机使用容器 Android 后端。可一键拉取并启动容器（需本机已安装 Docker）。",
+              "此主机使用容器 Android 后端。可一键拉取并启动容器；若未安装 Docker 将自动尝试安装（失败时需手动安装）。",
             )
           : needsDevice
           ? t(
@@ -135,13 +135,13 @@ export default function RemotePhoneIdleGuide({
               {
                 label: t(
                   "remoteAndroid.installStep1",
-                  "确认主机已安装并可使用 Docker",
+                  "点击「安装容器」；若主机未安装 Docker 将自动安装",
                 ),
               },
               {
                 label: t(
                   "remoteAndroid.installStep2",
-                  "点击「安装容器」，拉取并启动 Android 容器",
+                  "等待拉取并启动 Android 容器",
                 ),
               },
               {
diff --git a/dashboard/src/pages/Control/RemoteAndroid/index.tsx b/dashboard/src/pages/Control/RemoteAndroid/index.tsx
index ac371efd..41dd7786 100644
--- a/dashboard/src/pages/Control/RemoteAndroid/index.tsx
+++ b/dashboard/src/pages/Control/RemoteAndroid/index.tsx
@@ -1106,7 +1106,7 @@ export default function RemoteAndroidPage({
           )}
           description={t(
             "remoteAndroid.needsInstallDesc",
-            "此主机使用容器 Android 后端。可一键拉取并启动容器（需本机已安装 Docker）。",
+            "此主机使用容器 Android 后端。可一键拉取并启动容器；若未安装 Docker 将自动尝试安装（失败时需手动安装）。",
           )}
           action={
             <Button
diff --git a/dashboard/src/pages/Control/RemoteBrowser/index.module.less b/dashboard/src/pages/Control/RemoteBrowser/index.module.less
index 424f5cbf..8fa2f04c 100644
--- a/dashboard/src/pages/Control/RemoteBrowser/index.module.less
+++ b/dashboard/src/pages/Control/RemoteBrowser/index.module.less
@@ -46,6 +46,15 @@
   justify-content: center;
 }
 
+.setupMascot {
+  display: block;
+  width: 120px;
+  height: 120px;
+  object-fit: contain;
+  user-select: none;
+  -webkit-user-drag: none;
+}
+
 .installProgress {
   display: flex;
   flex-direction: column;
diff --git a/dashboard/src/pages/Control/RemoteBrowser/index.tsx b/dashboard/src/pages/Control/RemoteBrowser/index.tsx
index 4cc38994..524f66b8 100644
--- a/dashboard/src/pages/Control/RemoteBrowser/index.tsx
+++ b/dashboard/src/pages/Control/RemoteBrowser/index.tsx
@@ -23,6 +23,7 @@ import {
 } from "antd";
 
 import {
+  AlertCircle,
   Bot,
   CheckCircle2,
   Copy,
@@ -40,6 +41,7 @@ import { useTranslation } from "react-i18next";
 
 import StreamEdgeControls from "../../../components/StreamEdgeControls/StreamEdgeControls";
 import StreamSetupGuide from "../../../components/StreamSetupGuide/StreamSetupGuide";
+import { OctopEmptyMascot } from "../../../components/EmptyState";
 import PageShell from "../../../layouts/PageShell";
 import BrowserAiPanel from "../../../components/BrowserAiPanel";
 import SkillRecordGuideModal from "../../../components/SkillRecordGuideModal";
@@ -49,7 +51,6 @@ import BrowserViewer, {
 import { useAgent } from "../../../context/AgentContext";
 import { browserApi } from "../../../api/modules/browser";
 import * as chatStore from "../../Chat/hooks/chatStore";
-import type { BrowserSession as HarnessSession } from "../../../api/types/browser";
 import { request } from "../../../api/request";
 import { normalizeUrl } from "../../../utils/normalizeUrl";
 import { clearCanvas } from "../../../utils/browserCanvas";
@@ -75,6 +76,8 @@ import {
 } from "../../../hooks/useViewportMode";
 import { useIsMobile } from "../../../hooks/useIsMobile";
 import { useLandscapeFullscreen } from "../../../hooks/useLandscapeFullscreen";
+import { useCurrentUser } from "../../../hooks/useCurrentUser";
+import { resolveBrowserProfile } from "../../../utils/browserProfile";
 import styles from "./index.module.less";
 
 const { Text } = Typography;
@@ -126,20 +129,15 @@ const BROWSER_AI_PANEL_MAX_WIDTH = 620;
 const BROWSER_AI_PANEL_MIN_HEIGHT = 200;
 const BROWSER_AI_PANEL_MAX_HEIGHT = 520;
 
-function readStoredProfile(): string | null {
-  try {
-    return (
-      localStorage.getItem(PROFILE_STORAGE_KEY) ??
-      localStorage.getItem(LEGACY_SESSION_STORAGE_KEY)
-    );
-  } catch {
-    return null;
-  }
+function profileStorageKey(userId?: number): string {
+  return userId == null
+    ? PROFILE_STORAGE_KEY
+    : `${PROFILE_STORAGE_KEY}:${userId}`;
 }
 
-function persistProfile(profile: string) {
+function persistProfile(profile: string, userId?: number) {
   try {
-    localStorage.setItem(PROFILE_STORAGE_KEY, profile);
+    localStorage.setItem(profileStorageKey(userId), profile);
     localStorage.removeItem(LEGACY_SESSION_STORAGE_KEY);
   } catch {
     /* ignore */
@@ -166,22 +164,6 @@ function setStreamActive(active: boolean) {
   }
 }
 
-function pickProfile(
-  sessions: HarnessSession[],
-  threadFromUrl?: string,
-  stored?: string | null,
-): string {
-  if (threadFromUrl) return threadFromUrl;
-  if (stored && sessions.some((s) => s.session_id === stored)) return stored;
-  if (sessions.length > 0) {
-    const sorted = [...sessions].sort(
-      (a, b) => (b.last_activity_at ?? 0) - (a.last_activity_at ?? 0),
-    );
-    return sorted[0].session_id;
-  }
-  return stored ?? "default";
-}
-
 function tabsFromStream(
   streamTabs: {
     id: number | string;
@@ -312,6 +294,8 @@ export default function RemoteBrowserPage({
   const { t } = useTranslation();
   const { modal, message: antMessage } = App.useApp();
   const isMobile = useIsMobile();
+  const currentUser = useCurrentUser();
+  const browserProfile = resolveBrowserProfile(currentUser?.id);
   const { activeAgent, activeAgentId, agents } = useAgent();
   const [searchParams] = useSearchParams();
   const threadFromUrl =
@@ -470,14 +454,17 @@ export default function RemoteBrowserPage({
     setFrameReady(ready);
   }, []);
 
-  const attachProfile = useCallback((profileId: string, tabs: BrowserTab[]) => {
-    profileIdRef.current = profileId;
-    const view = viewFromProfile(profileId, tabs);
-    setSession(view);
-    persistProfile(profileId);
-    if (urlEditingRef.current) return;
-    if (view.url) setNavUrl(view.url);
-  }, []);
+  const attachProfile = useCallback(
+    (profileId: string, tabs: BrowserTab[]) => {
+      profileIdRef.current = profileId;
+      const view = viewFromProfile(profileId, tabs);
+      setSession(view);
+      persistProfile(profileId, currentUser?.id);
+      if (urlEditingRef.current) return;
+      if (view.url) setNavUrl(view.url);
+    },
+    [currentUser?.id],
+  );
 
   // Shared stream controller — measures the container, resolves the viewport
   // (mobile-aware), opens the WebSocket, and paints frames onto the canvas.
@@ -523,21 +510,20 @@ export default function RemoteBrowserPage({
   }, [t]);
 
   const refreshSessions = useCallback(async (): Promise<string | null> => {
+    if (!browserProfile) return null;
     try {
-      const resp = await browserApi.getSessions();
-      const sessions = resp.ok ? resp.sessions : [];
-      const profile = pickProfile(sessions, threadFromUrl, readStoredProfile());
+      await browserApi.getSessions();
       // Restore stream only when the user left it open, or when deep-linked
       // via ?thread=… — do not auto-open just because Chrome is still alive.
       if (threadFromUrl || readStreamActive()) {
-        startStream(profile, "");
-        return profile;
+        startStream(browserProfile, "");
+        return browserProfile;
       }
       return null;
     } catch {
       return null;
     }
-  }, [startStream, threadFromUrl]);
+  }, [browserProfile, startStream, threadFromUrl]);
 
   useEffect(() => {
     void refreshEnv();
@@ -612,10 +598,10 @@ export default function RemoteBrowserPage({
   const handleUninstall = useCallback(() => {
     if (!envStatus?.playwright_chromium || uninstalling) return;
     modal.confirm({
-      title: t("remoteBrowser.uninstallTitle", "卸载远程浏览器"),
+      title: t("remoteBrowser.uninstallTitle", "卸载内置浏览器"),
       content: t(
         "remoteBrowser.uninstallConfirm",
-        "将关闭 Octop 浏览器会话，并删除通过 Playwright 安装的 Chromium。不会影响本机已有的 Chrome/Chromium。是否继续？",
+        "将关闭当前浏览器窗口，并卸载 Octop 自动安装的浏览器。你电脑上已有的 Chrome 等浏览器不受影响。",
       ),
       okText: t("remoteBrowser.uninstall", "卸载"),
       okButtonProps: { danger: true },
@@ -645,10 +631,7 @@ export default function RemoteBrowserPage({
                 if (removed) {
                   setUninstallLogs([]);
                   antMessage.success(
-                    t(
-                      "remoteBrowser.uninstallSuccess",
-                      "已删除 Playwright Chromium",
-                    ),
+                    t("remoteBrowser.uninstallSuccess", "内置浏览器已卸载"),
                   );
                   resolve();
                   return;
@@ -715,21 +698,16 @@ export default function RemoteBrowserPage({
   }, []);
 
   const createSession = useCallback(async () => {
+    if (!browserProfile) return;
     setCreating(true);
     try {
-      const resp = await browserApi.getSessions();
-      const profile = pickProfile(
-        resp.ok ? resp.sessions : [],
-        threadFromUrl,
-        readStoredProfile(),
-      );
-      startStream(profile, normalizeUrl(navUrl) || DEFAULT_START_URL);
+      startStream(browserProfile, normalizeUrl(navUrl) || DEFAULT_START_URL);
     } catch (err: unknown) {
       showApiError(err, t("remoteBrowser.createSessionFailed"), t);
     } finally {
       setCreating(false);
     }
-  }, [navUrl, startStream, t, threadFromUrl]);
+  }, [browserProfile, navUrl, startStream, t]);
 
   const closeSession = useCallback(() => {
     disconnect();
@@ -738,31 +716,30 @@ export default function RemoteBrowserPage({
     setFrameReady(false);
     setStreamActive(false);
     try {
-      localStorage.removeItem(PROFILE_STORAGE_KEY);
+      localStorage.removeItem(profileStorageKey(currentUser?.id));
     } catch {
       /* ignore */
     }
     clearCanvas(canvasRef.current);
-  }, [disconnect]);
+  }, [currentUser?.id, disconnect]);
 
   const shutdownBrowser = useCallback(() => {
-    const profile = profileIdRef.current || "default";
     modal.confirm({
-      title: t("remoteBrowser.shutdownTitle", "关闭浏览器进程"),
+      title: t("remoteBrowser.shutdownTitle", "关闭浏览器"),
       content: t(
         "remoteBrowser.shutdownConfirm",
-        "将结束本机 Chrome 进程并释放内存。登录状态会保留在磁盘，下次启动仍可复用。是否继续？",
+        "将关闭当前浏览器窗口。已登录的网站下次打开时仍然有效。",
       ),
       okText: t("remoteBrowser.stop", "关闭浏览器"),
       okButtonProps: { danger: true },
       cancelText: t("common.cancel"),
       onOk: async () => {
         try {
-          await browserApi.shutdown(profile);
+          await browserApi.shutdown();
         } catch (err: unknown) {
           showApiError(
             err,
-            t("remoteBrowser.shutdownFailed", "关闭浏览器进程失败"),
+            t("remoteBrowser.shutdownFailed", "关闭浏览器失败"),
             t,
           );
           throw err;
@@ -963,11 +940,8 @@ export default function RemoteBrowserPage({
       /* ignore */
     }
 
-    const profileId = profileIdRef.current || "default";
     try {
       const data = await browserApi.startRecording({
-        profile: profileId,
-        agentProfile: profileId,
         name: `browser-skill-${Date.now()}`,
       });
       if (data.ok) {
@@ -995,7 +969,7 @@ export default function RemoteBrowserPage({
           : t("browser.recordReplay.startFailed", "开始录制失败"),
       );
     }
-  }, [t]);
+  }, [antMessage, t]);
 
   const envReady = Boolean(envStatus?.browsers_ok);
   const showEdgeControls = Boolean(session) && isStreaming && frameReady;
@@ -1139,24 +1113,16 @@ export default function RemoteBrowserPage({
     }
 
     if (envReady) {
-      const harnessOk = envStatus?.harness_browser;
-      const pwOk = envStatus?.playwright;
-      const subTitle =
-        harnessOk && pwOk
-          ? t(
-              "remoteBrowser.envReadyBoth",
-              "harness-browser 与 Playwright 均可用",
-            )
-          : harnessOk
-          ? t("remoteBrowser.envReadyHarness", "harness-browser (CDP) 已就绪")
-          : t("remoteBrowser.envReady", "Playwright 与 Chromium 均可用");
       return (
         <Result
           icon={
             <CheckCircle2 size={40} color="var(--fn-color-success,#52c41a)" />
           }
-          title={t("remoteBrowser.browserAlreadyInstalled", "浏览器已安装")}
-          subTitle={subTitle}
+          title={t("remoteBrowser.browserAlreadyInstalled", "浏览器已就绪")}
+          subTitle={t(
+            "remoteBrowser.envReady",
+            "可以帮你打开网页、填写表单和截图了",
+          )}
           style={{ padding: "8px 0" }}
         />
       );
@@ -1192,13 +1158,14 @@ export default function RemoteBrowserPage({
     }
 
     return (
-      <Alert
-        type="warning"
-        showIcon
-        message={t("remoteBrowser.notInstalled", "Chromium 未安装")}
-        description={
-          envStatus?.error ?? t("remoteBrowser.notInstalledHint", "点击安装")
-        }
+      <Result
+        icon={<AlertCircle size={40} color="var(--fn-color-warning,#faad14)" />}
+        title={t("remoteBrowser.notInstalled", "未检测到可用浏览器")}
+        subTitle={t(
+          "remoteBrowser.notInstalledHint",
+          "Octop 需要浏览器才能帮你自动打开网页、填写表单和截图。点击下方按钮即可自动安装，无需手动配置。",
+        )}
+        style={{ padding: "8px 0" }}
       />
     );
   };
@@ -1339,7 +1306,7 @@ export default function RemoteBrowserPage({
     type: "default" as const,
     title: t(
       "remoteBrowser.checkInstallTip",
-      "检查 Playwright 浏览器是否已安装，未安装则可安装",
+      "检查本机是否已准备好浏览器，未安装时可一键安装",
     ),
   };
 
@@ -1499,11 +1466,16 @@ export default function RemoteBrowserPage({
                   renderViewportUninstallProgress()
                 ) : (
                   <StreamSetupGuide
-                    icon={<Globe size={48} strokeWidth={1.5} />}
+                    icon={
+                      <OctopEmptyMascot
+                        size={120}
+                        className={styles.setupMascot}
+                      />
+                    }
                     title={
                       envReady
                         ? t("remoteBrowser.startBrowserTitle", "启动远程浏览器")
-                        : t("remoteBrowser.setupTitle", "需要配置浏览器环境")
+                        : t("remoteBrowser.setupTitle", "需要安装浏览器")
                     }
                     description={
                       envReady
@@ -1511,10 +1483,9 @@ export default function RemoteBrowserPage({
                             "remoteBrowser.startBrowserDesc",
                             "环境已就绪，按以下步骤开始远程浏览与操控",
                           )
-                        : envStatus?.error ||
-                          t(
+                        : t(
                             "remoteBrowser.setupDesc",
-                            "按以下步骤完成 Playwright / Chromium 环境配置",
+                            "先安装浏览器，即可开始远程浏览和自动操作网页",
                           )
                     }
                     steps={
@@ -1537,7 +1508,7 @@ export default function RemoteBrowserPage({
                             {
                               label: t(
                                 "remoteBrowser.setupStep1",
-                                "点击「检查」，检测 Playwright 与 Chromium 是否可用",
+                                "点击「检查」，确认本机是否已有可用浏览器",
                               ),
                             },
                             {
diff --git a/dashboard/src/pages/Control/TokenUsage/UsageStats.test.tsx b/dashboard/src/pages/Control/TokenUsage/UsageStats.test.tsx
new file mode 100644
index 00000000..4b2f2b71
--- /dev/null
+++ b/dashboard/src/pages/Control/TokenUsage/UsageStats.test.tsx
@@ -0,0 +1,85 @@
+import {
+  afterAll,
+  afterEach,
+  beforeAll,
+  describe,
+  expect,
+  it,
+  vi,
+} from "vitest";
+import { render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { UsageStats, visibleStatCount, type UsageStatItem } from "./UsageStats";
+
+const getComputedStyle = window.getComputedStyle;
+
+beforeAll(() => {
+  vi.spyOn(window, "getComputedStyle").mockImplementation((element) =>
+    getComputedStyle(element),
+  );
+});
+
+afterAll(() => {
+  vi.restoreAllMocks();
+});
+
+afterEach(() => {
+  vi.unstubAllGlobals();
+});
+
+const ITEMS: UsageStatItem[] = [
+  { key: "total", label: "总 tokens", value: "2,788,473" },
+  { key: "input", label: "输入", value: "2,764,158" },
+  { key: "output", label: "输出", value: "24,315" },
+  { key: "cacheRead", label: "缓存输入", value: "2,097,826" },
+  { key: "cacheHit", label: "缓存命中率", value: "76.0%" },
+  { key: "turns", label: "对话轮数", value: 15 },
+  { key: "avg", label: "均值/轮", value: "185,898" },
+];
+
+describe("visibleStatCount", () => {
+  it("fits all seven cards on a wide row", () => {
+    expect(visibleStatCount(1400, 7)).toBe(7);
+  });
+
+  it("keeps a single row and reserves the overflow control on a slightly narrow display", () => {
+    const visible = visibleStatCount(900, 7);
+    expect(visible).toBeGreaterThanOrEqual(1);
+    expect(visible).toBeLessThan(7);
+  });
+});
+
+describe("UsageStats", () => {
+  it("shows every metric in one row on a wide display", () => {
+    render(<UsageStats items={ITEMS} width={1400} />);
+
+    expect(screen.getByText("总 tokens")).toBeInTheDocument();
+    expect(screen.getByText("均值/轮")).toBeInTheDocument();
+    expect(
+      screen.queryByRole("button", { name: "common.viewMore" }),
+    ).not.toBeInTheDocument();
+  });
+
+  it("stays on one row and opens leftover metrics from the overflow icon", async () => {
+    const user = userEvent.setup();
+    render(<UsageStats items={ITEMS} width={900} />);
+
+    expect(screen.getByText("总 tokens")).toBeInTheDocument();
+    expect(screen.queryByText("均值/轮")).not.toBeInTheDocument();
+
+    await user.click(screen.getByRole("button", { name: "common.viewMore" }));
+
+    expect(await screen.findByText("均值/轮")).toBeInTheDocument();
+    expect(screen.getByText("185,898")).toBeInTheDocument();
+  });
+
+  it("does not hide metrics behind overflow on mobile", () => {
+    render(<UsageStats items={ITEMS} width={900} overflowEnabled={false} />);
+
+    expect(screen.getByText("总 tokens")).toBeInTheDocument();
+    expect(screen.getByText("均值/轮")).toBeInTheDocument();
+    expect(
+      screen.queryByRole("button", { name: "common.viewMore" }),
+    ).not.toBeInTheDocument();
+  });
+});
diff --git a/dashboard/src/pages/Control/TokenUsage/UsageStats.tsx b/dashboard/src/pages/Control/TokenUsage/UsageStats.tsx
new file mode 100644
index 00000000..551fce0c
--- /dev/null
+++ b/dashboard/src/pages/Control/TokenUsage/UsageStats.tsx
@@ -0,0 +1,142 @@
+import { useEffect, useRef, useState } from "react";
+import { Popover } from "antd";
+import { MoreVertical } from "lucide-react";
+import { useTranslation } from "react-i18next";
+import styles from "./index.module.less";
+
+export interface UsageStatItem {
+  key: string;
+  label: string;
+  value: string | number;
+}
+
+const STAT_CARD_MIN_PX = 160;
+const STAT_GAP_PX = 12;
+const STAT_MORE_PX = 36;
+
+/** How many metric cards fit in a single row, reserving the ⋮ when needed. */
+export function visibleStatCount(width: number, total: number): number {
+  if (total <= 0) return 0;
+  const maxFit = Math.floor(
+    (width + STAT_GAP_PX) / (STAT_CARD_MIN_PX + STAT_GAP_PX),
+  );
+  if (maxFit >= total) return total;
+  const withMore = Math.floor(
+    (width - STAT_MORE_PX) / (STAT_CARD_MIN_PX + STAT_GAP_PX),
+  );
+  return Math.max(1, Math.min(total - 1, withMore));
+}
+
+function StatBlock({
+  label,
+  value,
+}: {
+  label: string;
+  value: string | number;
+}) {
+  return (
+    <div className={styles.statBlock}>
+      <div className={styles.statLabel}>{label}</div>
+      <div className={styles.statValue}>{value}</div>
+    </div>
+  );
+}
+
+function StatRow({ label, value }: { label: string; value: string | number }) {
+  return (
+    <div className={styles.statsDrawerRow}>
+      <span className={styles.statsDrawerLabel}>{label}</span>
+      <span className={styles.statsDrawerValue}>{value}</span>
+    </div>
+  );
+}
+
+export function UsageStats({
+  items,
+  width: widthProp,
+  overflowEnabled = true,
+}: {
+  items: UsageStatItem[];
+  width?: number;
+  /** Desktop-only: hide overflowing cards behind ⋮. Off on phones. */
+  overflowEnabled?: boolean;
+}) {
+  const { t } = useTranslation();
+  const hostRef = useRef<HTMLDivElement>(null);
+  const [measuredWidth, setMeasuredWidth] = useState<number | null>(null);
+
+  useEffect(() => {
+    if (widthProp !== undefined || !overflowEnabled) return;
+    const el = hostRef.current;
+    if (!el || typeof ResizeObserver === "undefined") return;
+    const apply = (width: number) => {
+      if (width > 0) setMeasuredWidth(width);
+    };
+    apply(el.clientWidth);
+    const ro = new ResizeObserver((entries) => {
+      const width = entries[0]?.contentRect.width;
+      if (width === undefined) return;
+      apply(width);
+    });
+    ro.observe(el);
+    return () => ro.disconnect();
+  }, [widthProp, overflowEnabled]);
+
+  const width = widthProp ?? measuredWidth ?? Number.POSITIVE_INFINITY;
+  const visible = overflowEnabled
+    ? visibleStatCount(width, items.length)
+    : items.length;
+  const shown = items.slice(0, visible);
+  const overflow = overflowEnabled ? items.slice(visible) : [];
+
+  return (
+    <div ref={hostRef} className={styles.statsHost}>
+      <div className={styles.statsRow}>
+        <div
+          className={
+            overflowEnabled ? styles.statsGrid : styles.statsGridMobile
+          }
+          style={
+            overflowEnabled
+              ? {
+                  gridTemplateColumns: `repeat(${Math.max(
+                    shown.length,
+                    1,
+                  )}, minmax(160px, 1fr))`,
+                }
+              : undefined
+          }
+        >
+          {shown.map((item) => (
+            <StatBlock key={item.key} label={item.label} value={item.value} />
+          ))}
+        </div>
+        {overflow.length > 0 ? (
+          <Popover
+            trigger="click"
+            placement="bottomRight"
+            content={
+              <div className={styles.statsDrawerList}>
+                {overflow.map((item) => (
+                  <StatRow
+                    key={item.key}
+                    label={item.label}
+                    value={item.value}
+                  />
+                ))}
+              </div>
+            }
+          >
+            <button
+              type="button"
+              className={styles.statsMoreIcon}
+              aria-label={t("common.viewMore")}
+            >
+              <MoreVertical size={18} strokeWidth={2} aria-hidden />
+            </button>
+          </Popover>
+        ) : null}
+      </div>
+    </div>
+  );
+}
diff --git a/dashboard/src/pages/Control/TokenUsage/index.module.less b/dashboard/src/pages/Control/TokenUsage/index.module.less
index 4ef6f8a7..10e45d37 100644
--- a/dashboard/src/pages/Control/TokenUsage/index.module.less
+++ b/dashboard/src/pages/Control/TokenUsage/index.module.less
@@ -90,14 +90,87 @@
   box-sizing: border-box;
 }
 
+.statsHost {
+  width: 100%;
+  flex-shrink: 0;
+}
+
+.statsRow {
+  display: flex;
+  flex-wrap: nowrap;
+  gap: 12px;
+  align-items: stretch;
+}
+
 .statsGrid {
   display: grid;
   gap: 12px;
-  flex-shrink: 0;
+  flex: 1 1 auto;
+  min-width: 0;
+  grid-auto-flow: column;
+  grid-template-rows: auto;
+  grid-template-columns: repeat(7, minmax(160px, 1fr));
+}
+
+.statsGridMobile {
+  display: grid;
+  gap: 12px;
+  flex: 1 1 auto;
+  min-width: 0;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+}
+
+.statsMoreIcon {
+  flex: 0 0 36px;
+  width: 36px;
+  padding: 0;
+  border: 1px solid var(--fn-border-secondary);
+  border-radius: 6px;
+  background: var(--fn-bg-secondary);
+  color: var(--fn-text-secondary);
+  cursor: pointer;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.statsMoreIcon:hover {
+  color: var(--fn-text-primary);
+  border-color: var(--fn-border-primary);
+}
+
+.statsDrawerList {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.statsDrawerRow {
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between;
+  gap: 12px;
+  padding: 12px 14px;
+  background: var(--fn-bg-secondary);
+  border: 1px solid var(--fn-border-secondary);
+  border-radius: 6px;
+}
+
+.statsDrawerLabel {
+  font-size: 13px;
+  color: var(--fn-text-tertiary);
+}
+
+.statsDrawerValue {
+  font-size: 16px;
+  font-weight: 600;
+  font-variant-numeric: tabular-nums;
+  color: var(--fn-text-primary);
+  text-align: right;
 }
 
 .statBlock {
-  flex: 1;
+  min-width: 0;
   padding: 12px 16px;
   background: var(--fn-bg-secondary);
   border-radius: 6px;
@@ -109,12 +182,17 @@
   color: var(--fn-text-tertiary);
   text-transform: uppercase;
   letter-spacing: 0.04em;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .statValue {
   font-size: 22px;
   font-weight: 600;
   margin-top: 4px;
+  font-variant-numeric: tabular-nums;
+  white-space: nowrap;
 }
 
 .pieGrid,
diff --git a/dashboard/src/pages/Control/TokenUsage/index.tsx b/dashboard/src/pages/Control/TokenUsage/index.tsx
index 09f86885..c85d6c4b 100644
--- a/dashboard/src/pages/Control/TokenUsage/index.tsx
+++ b/dashboard/src/pages/Control/TokenUsage/index.tsx
@@ -25,6 +25,7 @@ import {
 import { useTranslation } from "react-i18next";
 import PageShell from "../../../layouts/PageShell";
 import { useIsMobile } from "../../../hooks/useIsMobile";
+import { UsageStats, type UsageStatItem } from "./UsageStats";
 import { useUserRole } from "../../../hooks/useUserRole";
 import { request } from "../../../api/request";
 import { useAgent } from "../../../context/AgentContext";
@@ -222,19 +223,43 @@ function UsageBarChart({
   );
 }
 
-function StatBlock({
-  label,
-  value,
-}: {
-  label: string;
-  value: string | number;
-}) {
-  return (
-    <div className={styles.statBlock}>
-      <div className={styles.statLabel}>{label}</div>
-      <div className={styles.statValue}>{value}</div>
-    </div>
-  );
+function usageStatItems(
+  totals: UsageSummary,
+  t: (key: string) => string,
+): UsageStatItem[] {
+  return [
+    {
+      key: "total",
+      label: t("tokenUsage.totalTokens"),
+      value: formatNumber(totals.total_tokens),
+    },
+    {
+      key: "input",
+      label: t("tokenUsage.input"),
+      value: formatNumber(totals.input_tokens),
+    },
+    {
+      key: "output",
+      label: t("tokenUsage.output"),
+      value: formatNumber(totals.output_tokens),
+    },
+    {
+      key: "cacheRead",
+      label: t("tokenUsage.cacheRead"),
+      value: formatNumber(totals.cache_read_tokens),
+    },
+    {
+      key: "cacheHit",
+      label: t("tokenUsage.cacheHit"),
+      value: `${totals.cache_hit_percent.toFixed(1)}%`,
+    },
+    { key: "turns", label: t("tokenUsage.turns"), value: totals.turns },
+    {
+      key: "avg",
+      label: t("tokenUsage.avgPerTurn"),
+      value: formatNumber(totals.avg_per_turn),
+    },
+  ];
 }
 
 function bucketColumnTitle(
@@ -492,40 +517,10 @@ function SummaryView({
 
   return (
     <div className={styles.summaryBody}>
-      <div
-        className={styles.statsGrid}
-        style={{
-          gridTemplateColumns: isMobile
-            ? "repeat(2, minmax(0, 1fr))"
-            : "repeat(7, minmax(0, 1fr))",
-        }}
-      >
-        <StatBlock
-          label={t("tokenUsage.totalTokens")}
-          value={formatNumber(totals.total_tokens)}
-        />
-        <StatBlock
-          label={t("tokenUsage.input")}
-          value={formatNumber(totals.input_tokens)}
-        />
-        <StatBlock
-          label={t("tokenUsage.output")}
-          value={formatNumber(totals.output_tokens)}
-        />
-        <StatBlock
-          label={t("tokenUsage.cacheRead")}
-          value={formatNumber(totals.cache_read_tokens)}
-        />
-        <StatBlock
-          label={t("tokenUsage.cacheHit")}
-          value={`${totals.cache_hit_percent.toFixed(1)}%`}
-        />
-        <StatBlock label={t("tokenUsage.turns")} value={totals.turns} />
-        <StatBlock
-          label={t("tokenUsage.avgPerTurn")}
-          value={formatNumber(totals.avg_per_turn)}
-        />
-      </div>
+      <UsageStats
+        items={usageStatItems(totals, t)}
+        overflowEnabled={!isMobile}
+      />
 
       <div
         className={styles.pieGrid}
@@ -618,40 +613,10 @@ function DimensionView({
 
   return (
     <div className={styles.summaryBody}>
-      <div
-        className={styles.statsGrid}
-        style={{
-          gridTemplateColumns: isMobile
-            ? "repeat(2, minmax(0, 1fr))"
-            : "repeat(7, minmax(0, 1fr))",
-        }}
-      >
-        <StatBlock
-          label={t("tokenUsage.totalTokens")}
-          value={formatNumber(totals.total_tokens)}
-        />
-        <StatBlock
-          label={t("tokenUsage.input")}
-          value={formatNumber(totals.input_tokens)}
-        />
-        <StatBlock
-          label={t("tokenUsage.output")}
-          value={formatNumber(totals.output_tokens)}
-        />
-        <StatBlock
-          label={t("tokenUsage.cacheRead")}
-          value={formatNumber(totals.cache_read_tokens)}
-        />
-        <StatBlock
-          label={t("tokenUsage.cacheHit")}
-          value={`${totals.cache_hit_percent.toFixed(1)}%`}
-        />
-        <StatBlock label={t("tokenUsage.turns")} value={totals.turns} />
-        <StatBlock
-          label={t("tokenUsage.avgPerTurn")}
-          value={formatNumber(totals.avg_per_turn)}
-        />
-      </div>
+      <UsageStats
+        items={usageStatItems(totals, t)}
+        overflowEnabled={!isMobile}
+      />
 
       {granularity !== "by_day" && pieData.length > 0 && (
         <div
diff --git a/dashboard/src/pages/Experts/components/AgentTrajectoryField.tsx b/dashboard/src/pages/Experts/components/AgentTrajectoryField.tsx
new file mode 100644
index 00000000..1df8a1b6
--- /dev/null
+++ b/dashboard/src/pages/Experts/components/AgentTrajectoryField.tsx
@@ -0,0 +1,21 @@
+import { Form, Switch } from "antd";
+import { useTranslation } from "react-i18next";
+
+export default function AgentTrajectoryField({
+  disabled = false,
+}: {
+  disabled?: boolean;
+}) {
+  const { t } = useTranslation();
+
+  return (
+    <Form.Item
+      label={t("agentConfig.enableTrajectory")}
+      name="enable_trajectory"
+      valuePropName="checked"
+      tooltip={t("agentConfig.enableTrajectoryTooltip")}
+    >
+      <Switch disabled={disabled} />
+    </Form.Item>
+  );
+}
diff --git a/dashboard/src/pages/Experts/components/CreateFromExpertDrawer.tsx b/dashboard/src/pages/Experts/components/CreateFromExpertDrawer.tsx
index 1e558cb3..ca209f3a 100644
--- a/dashboard/src/pages/Experts/components/CreateFromExpertDrawer.tsx
+++ b/dashboard/src/pages/Experts/components/CreateFromExpertDrawer.tsx
@@ -18,6 +18,7 @@ import { skillPackagesApi } from "../../../api/modules/skillPackages";
 import type { SkillPackage } from "../../../api/types/skillPackage";
 import { AgentAdvancedConfigFields } from "../../../components/AgentAdvancedConfigFields";
 import ExpertColorPicker from "../../../components/ExpertColorPicker";
+import AgentTrajectoryField from "./AgentTrajectoryField";
 import { apiErrorMessage } from "../../../utils/apiError";
 import {
   expertPaletteColor,
@@ -160,6 +161,7 @@ export default function CreateFromExpertDrawer({
       composite_default: string;
       root_dir?: string;
       skill_package_ids?: string[];
+      enable_trajectory?: boolean;
     } & AgentRuntimeFormValues
   >();
   const [submitting, setSubmitting] = useState(false);
@@ -218,6 +220,7 @@ export default function CreateFromExpertDrawer({
       backend_choice: DEFAULT_BACKEND,
       composite_default: DEFAULT_BACKEND,
       skill_package_ids: [],
+      enable_trajectory: true,
     });
 
     if (source.kind === "market") {
@@ -332,6 +335,7 @@ export default function CreateFromExpertDrawer({
           : colorPalette,
         ...(welcomeText ? { welcome_message: welcomeText } : {}),
         ...buildAgentRuntimeRequest(values),
+        enable_trajectory: values.enable_trajectory === true,
       };
 
       let body: { agent_id: string; name: string };
@@ -572,6 +576,7 @@ export default function CreateFromExpertDrawer({
           onRemovePathMapping={removePathMapping}
           onUpdatePathMapping={updatePathMapping}
         />
+        <AgentTrajectoryField />
 
         <Form.Item
           name="skill_package_ids"
diff --git a/dashboard/src/pages/Experts/components/EditAgentDrawer.tsx b/dashboard/src/pages/Experts/components/EditAgentDrawer.tsx
index 8112b577..509026f8 100644
--- a/dashboard/src/pages/Experts/components/EditAgentDrawer.tsx
+++ b/dashboard/src/pages/Experts/components/EditAgentDrawer.tsx
@@ -20,6 +20,7 @@ import { MoreHorizontal } from "lucide-react";
 import { request } from "../../../api/request";
 import { AgentAdvancedConfigFields } from "../../../components/AgentAdvancedConfigFields";
 import ExpertColorPicker from "../../../components/ExpertColorPicker";
+import AgentTrajectoryField from "./AgentTrajectoryField";
 import { workspaceApi } from "../../../api/modules/workspace";
 import { skillPackagesApi } from "../../../api/modules/skillPackages";
 import { apiErrorMessage, isNotFoundApiError } from "../../../utils/apiError";
@@ -133,6 +134,7 @@ interface EditFormValues {
   temperature?: number;
   top_p?: number;
   max_tokens?: number;
+  enable_trajectory?: boolean;
 }
 
 interface EditAgentDrawerProps {
@@ -300,6 +302,7 @@ function EditAgentDrawerBody({
           composite_default: parsedBackend.compositeDefault,
           root_dir: parsedBackend.rootDir,
           ...readAgentRuntimeFormValues(ag),
+          enable_trajectory: cfg.enable_trajectory !== false,
         });
         setLoading(false);
 
@@ -395,6 +398,7 @@ function EditAgentDrawerBody({
       const nextConfig = omitAgentRuntimeConfig({
         ...agentConfig,
         backend: backendSpec,
+        enable_trajectory: values.enable_trajectory === true,
       });
       delete nextConfig.color;
       delete nextConfig.icon_name;
@@ -794,6 +798,7 @@ function EditAgentDrawerBody({
                 onRemovePathMapping={removePathMapping}
                 onUpdatePathMapping={updatePathMapping}
               />
+              <AgentTrajectoryField />
               {!skillPackagesSupported ? (
                 <Alert
                   type="info"
diff --git a/dashboard/src/pages/Experts/components/PublishedExpertCard.tsx b/dashboard/src/pages/Experts/components/PublishedExpertCard.tsx
index 527d9e37..e4f6294b 100644
--- a/dashboard/src/pages/Experts/components/PublishedExpertCard.tsx
+++ b/dashboard/src/pages/Experts/components/PublishedExpertCard.tsx
@@ -2,7 +2,7 @@ import { memo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { App, Dropdown } from "antd";
 import { MoreHorizontal } from "lucide-react";
-import { iconForName } from "./iconForName";
+import { ExpertIcon } from "./iconForName";
 import {
   publishedExpertsApi,
   type PublishedExpert,
@@ -62,7 +62,11 @@ export const PublishedExpertCard = memo(function PublishedExpertCard({
           className={styles.agentCardIcon}
           style={{ color: accent, background: `${accent}18` }}
         >
-          {iconForName(expert.icon_name, 20)}
+          <ExpertIcon
+            iconUrl={expert.icon_url}
+            iconName={expert.icon_name}
+            size={expert.icon_url ? 28 : 20}
+          />
         </div>
         <div className={styles.agentCardTitleBlock}>
           <div className={styles.agentCardName}>{expert.name}</div>
diff --git a/dashboard/src/pages/Experts/index.module.less b/dashboard/src/pages/Experts/index.module.less
index 243b8199..04ce664b 100644
--- a/dashboard/src/pages/Experts/index.module.less
+++ b/dashboard/src/pages/Experts/index.module.less
@@ -394,6 +394,7 @@
   align-items: center;
   justify-content: center;
   flex-shrink: 0;
+  overflow: hidden;
 }
 
 .agentCardTitleBlock {
diff --git a/dashboard/src/pages/KnowledgeBases/index.module.less b/dashboard/src/pages/KnowledgeBases/index.module.less
index 61be538b..c9a9f575 100644
--- a/dashboard/src/pages/KnowledgeBases/index.module.less
+++ b/dashboard/src/pages/KnowledgeBases/index.module.less
@@ -17,6 +17,15 @@
   line-height: 1.5;
 }
 
+.ocrSettings {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  margin-top: 16px;
+  padding-top: 16px;
+  border-top: 1px solid var(--fn-border-secondary);
+}
+
 .onnxReadiness {
   display: flex;
   flex-direction: column;
@@ -918,6 +927,17 @@
   margin: 0 0 12px;
 }
 
+.uploadProgress {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+  margin: 0 0 12px;
+}
+
+.uploadProgressLabel {
+  font-size: 12px;
+}
+
 .featureBackend {
   display: flex;
   flex-wrap: wrap;
diff --git a/dashboard/src/pages/KnowledgeBases/index.tsx b/dashboard/src/pages/KnowledgeBases/index.tsx
index 027cf322..1cde6d3f 100644
--- a/dashboard/src/pages/KnowledgeBases/index.tsx
+++ b/dashboard/src/pages/KnowledgeBases/index.tsx
@@ -101,7 +101,9 @@ type BaseFormValues = {
 type DocsViewMode = "card" | "table";
 const DOCS_VIEW_STORAGE_KEY = "octop:knowledge-bases-docs-view";
 
-const SUPPORTED_DOCUMENT_TYPES = ".md,.txt,.pdf,.docx,.pptx";
+const BASE_DOCUMENT_TYPES =
+  ".md,.markdown,.txt,.rst,.html,.htm,.json,.jsonl,.yaml,.yml,.csv,.tsv,.pdf,.docx,.pptx,.xls,.xlsx,.xlsm";
+const OCR_DOCUMENT_TYPES = ".png,.jpg,.jpeg,.webp";
 
 function loadDocsViewMode(): DocsViewMode {
   const stored = localStorage.getItem(DOCS_VIEW_STORAGE_KEY);
@@ -275,12 +277,24 @@ export default function KnowledgeBasesPage() {
   } | null>(null);
   const [onnxProbing, setOnnxProbing] = useState(false);
   const [featureEnabledDraft, setFeatureEnabledDraft] = useState(false);
+  const [featureSaving, setFeatureSaving] = useState(false);
   const [featureModel, setFeatureModel] = useState<string>();
   const [featureBackend, setFeatureBackend] = useState<"onnx" | "remote">(
     "onnx",
   );
   const [featureProviderId, setFeatureProviderId] = useState<string>();
   const [featureOptionsLoading, setFeatureOptionsLoading] = useState(false);
+  const [ocrEnabledDraft, setOcrEnabledDraft] = useState(false);
+  const [ocrBackend, setOcrBackend] = useState<"onnx" | "remote">("onnx");
+  const [ocrModel, setOcrModel] = useState<string>();
+  const [ocrProviderId, setOcrProviderId] = useState<string>();
+  const [ocrRemoteProviders, setOcrRemoteProviders] = useState<
+    {
+      provider_id: string;
+      provider_name: string;
+      models: { id: string; name: string }[];
+    }[]
+  >([]);
   const [onnxExpanded, setOnnxExpanded] = useState(false);
   const [onnxExpanding, setOnnxExpanding] = useState(false);
   const onnxExpandedRef = useRef(false);
@@ -302,6 +316,12 @@ export default function KnowledgeBasesPage() {
   const [baseForm] = Form.useForm<BaseFormValues>();
   const [defaultOpenChecked, setDefaultOpenChecked] = useState(false);
   const [sharedChecked, setSharedChecked] = useState(false);
+  const [uploadState, setUploadState] = useState<{
+    filename: string;
+    index: number;
+    total: number;
+    percent: number;
+  } | null>(null);
   const uploadRef = useRef<HTMLInputElement>(null);
   const detailRequestGate = useRef(createDetailRequestGate());
   const {
@@ -324,6 +344,9 @@ export default function KnowledgeBasesPage() {
   );
   const canWriteSelected = canManageSelected;
   const usable = Boolean(capability?.usable);
+  const supportedDocumentTypes = capability?.ocr?.usable
+    ? `${BASE_DOCUMENT_TYPES},${OCR_DOCUMENT_TYPES}`
+    : BASE_DOCUMENT_TYPES;
   const limits = capability?.limits ?? DEFAULT_KNOWLEDGE_LIMITS;
   const ownedBaseCount = user
     ? bases.filter((base) => base.owner_user_id === user.id).length
@@ -368,6 +391,10 @@ export default function KnowledgeBasesPage() {
       setFeatureBackend(nextCapability.backend);
       setFeatureProviderId(nextCapability.provider_id || undefined);
       setFeatureEnabledDraft(Boolean(nextCapability.feature_enabled));
+      setOcrEnabledDraft(Boolean(nextCapability.ocr?.enabled));
+      setOcrBackend(nextCapability.ocr?.backend ?? "onnx");
+      setOcrModel(nextCapability.ocr?.model || "rapidocr");
+      setOcrProviderId(nextCapability.ocr?.provider_id || undefined);
     } catch (error) {
       message.error(apiErrorMessage(error, t("knowledgeBases.loadFailed"), t));
     }
@@ -404,6 +431,17 @@ export default function KnowledgeBasesPage() {
     [t],
   );
 
+  const loadOcrOptions = useCallback(async () => {
+    try {
+      const options = await knowledgeBasesApi.getOcrOptions();
+      setOcrRemoteProviders(options.remote);
+      return options;
+    } catch (error) {
+      message.error(apiErrorMessage(error, t("knowledgeBases.loadFailed"), t));
+      return undefined;
+    }
+  }, [t]);
+
   const stopOnnxDownloadWatch = useCallback(() => {
     if (onnxDownloadTimer.current) {
       clearInterval(onnxDownloadTimer.current);
@@ -694,6 +732,7 @@ export default function KnowledgeBasesPage() {
 
   const saveFeature = async (confirmed = false) => {
     if (!featureEnabledDraft) {
+      setFeatureSaving(true);
       try {
         setCapability(await knowledgeBasesApi.setFeature({ enabled: false }));
         setFeatureModalOpen(false);
@@ -702,12 +741,21 @@ export default function KnowledgeBasesPage() {
         message.error(
           apiErrorMessage(error, t("knowledgeBases.featureSaveFailed"), t),
         );
+      } finally {
+        setFeatureSaving(false);
       }
       return;
     }
     if (!featureModel || (featureBackend === "remote" && !featureProviderId)) {
       return;
     }
+    if (
+      ocrEnabledDraft &&
+      ocrBackend === "remote" &&
+      (!ocrProviderId || !ocrModel)
+    ) {
+      return;
+    }
     if (
       featureBackend === "onnx" &&
       !catalog.find((model) => model.id === featureModel)?.downloaded
@@ -721,7 +769,13 @@ export default function KnowledgeBasesPage() {
       (capability.backend !== featureBackend ||
         capability.selected_model !== featureModel ||
         capability.provider_id !==
-          (featureBackend === "remote" ? featureProviderId : ""))
+          (featureBackend === "remote" ? featureProviderId : "") ||
+        capability.ocr?.enabled !== ocrEnabledDraft ||
+        capability.ocr?.backend !== ocrBackend ||
+        (ocrEnabledDraft &&
+          ocrBackend === "remote" &&
+          (capability.ocr?.model !== ocrModel ||
+            capability.ocr?.provider_id !== ocrProviderId)))
     ) {
       modal.confirm({
         title: t("knowledgeBases.rebuildConfirmTitle"),
@@ -732,12 +786,17 @@ export default function KnowledgeBasesPage() {
       });
       return;
     }
+    setFeatureSaving(true);
     try {
       const next = await knowledgeBasesApi.setFeature({
         enabled: true,
         backend: featureBackend,
         model: featureModel,
         provider_id: featureBackend === "remote" ? featureProviderId : "",
+        ocr_enabled: ocrEnabledDraft,
+        ocr_backend: ocrBackend,
+        ocr_model: ocrBackend === "remote" ? ocrModel : "rapidocr",
+        ocr_provider_id: ocrBackend === "remote" ? ocrProviderId : "",
       });
       setCapability(next);
       setFeatureModalOpen(false);
@@ -746,6 +805,8 @@ export default function KnowledgeBasesPage() {
       message.error(
         apiErrorMessage(error, t("knowledgeBases.featureSaveFailed"), t),
       );
+    } finally {
+      setFeatureSaving(false);
     }
   };
 
@@ -758,6 +819,10 @@ export default function KnowledgeBasesPage() {
     setFeatureBackend(selectedBackend);
     setFeatureModel(selectedModel);
     setFeatureProviderId(capability?.provider_id || undefined);
+    setOcrEnabledDraft(Boolean(capability?.ocr?.enabled));
+    setOcrBackend(capability?.ocr?.backend ?? "onnx");
+    setOcrModel(capability?.ocr?.model || "rapidocr");
+    setOcrProviderId(capability?.ocr?.provider_id || undefined);
     setFeatureModalOpen(true);
     void (async () => {
       const options = await loadEmbeddingOptions(false);
@@ -769,6 +834,7 @@ export default function KnowledgeBasesPage() {
         await loadEmbeddingOptions(true);
       }
     })();
+    void loadOcrOptions();
     void knowledgeBasesApi.getOnnxDownloadStatus().then((state) => {
       if (state.status === "downloading" || state.status === "loading") {
         const modelId = state.model_name;
@@ -837,12 +903,28 @@ export default function KnowledgeBasesPage() {
       return;
     }
     try {
-      for (const file of chosen) {
+      for (const [index, file] of chosen.entries()) {
+        setUploadState({
+          filename: file.name,
+          index: index + 1,
+          total: chosen.length,
+          percent: 0,
+        });
         await knowledgeBasesApi.uploadDocument(
           selected.id,
           file,
           joinKnowledgePath(currentFolder, file.name),
+          (percent) =>
+            setUploadState((current) =>
+              current && current.filename === file.name
+                ? { ...current, percent }
+                : current,
+            ),
         );
+        // Show each finished file while the remaining ones still upload.
+        if (index < chosen.length - 1) {
+          void loadDetail(selected.id, { silent: true });
+        }
       }
       await loadDetail(selected.id);
       await loadBases();
@@ -852,6 +934,7 @@ export default function KnowledgeBasesPage() {
         apiErrorMessage(error, t("knowledgeBases.uploadFailed"), t),
       );
     } finally {
+      setUploadState(null);
       if (uploadRef.current) uploadRef.current.value = "";
     }
   };
@@ -1520,7 +1603,7 @@ export default function KnowledgeBasesPage() {
                           className={styles.fileInput}
                           type="file"
                           multiple
-                          accept={SUPPORTED_DOCUMENT_TYPES}
+                          accept={supportedDocumentTypes}
                           onChange={(event) =>
                             void uploadDocuments(event.target.files)
                           }
@@ -1549,7 +1632,8 @@ export default function KnowledgeBasesPage() {
                           <Button
                             type="primary"
                             icon={<FileUp size={14} />}
-                            disabled={isAtDocumentLimit}
+                            loading={Boolean(uploadState)}
+                            disabled={isAtDocumentLimit || Boolean(uploadState)}
                             onClick={() => uploadRef.current?.click()}
                           >
                             {t("knowledgeBases.upload")}
@@ -1603,14 +1687,42 @@ export default function KnowledgeBasesPage() {
                           type="secondary"
                           className={styles.uploadHint}
                         >
-                          {t("knowledgeBases.uploadHint", {
-                            sizeMb: Math.round(
-                              limits.max_document_bytes / (1024 * 1024),
-                            ),
-                          })}
+                          {t(
+                            capability?.ocr?.usable
+                              ? "knowledgeBases.uploadHintOcr"
+                              : "knowledgeBases.uploadHint",
+                            {
+                              sizeMb: Math.round(
+                                limits.max_document_bytes / (1024 * 1024),
+                              ),
+                            },
+                          )}
                         </Typography.Text>
                       ) : null}
                     </div>
+                    {uploadState ? (
+                      <div className={styles.uploadProgress} aria-live="polite">
+                        <Typography.Text
+                          className={styles.uploadProgressLabel}
+                          ellipsis={{ tooltip: uploadState.filename }}
+                        >
+                          {uploadState.total > 1
+                            ? t("knowledgeBases.uploadingMany", {
+                                name: uploadState.filename,
+                                index: uploadState.index,
+                                total: uploadState.total,
+                              })
+                            : t("knowledgeBases.uploading", {
+                                name: uploadState.filename,
+                              })}
+                        </Typography.Text>
+                        <Progress
+                          percent={uploadState.percent}
+                          size="small"
+                          status="active"
+                        />
+                      </div>
+                    ) : null}
                     {isAtDocumentLimit ? (
                       <Alert
                         className={styles.limitAlert}
@@ -2004,6 +2116,9 @@ export default function KnowledgeBasesPage() {
         title={t("knowledgeBases.settingsTitle")}
         placement="right"
         width={isMobile ? "100%" : 520}
+        // Below antd's default dialog layer (1000) so confirm/progress modals
+        // opened from inside this drawer always stack above it.
+        zIndex={990}
         open={featureModalOpen}
         onClose={() => setFeatureModalOpen(false)}
         destroyOnHidden
@@ -2014,10 +2129,14 @@ export default function KnowledgeBasesPage() {
             </Button>
             <Button
               type="primary"
+              loading={featureSaving}
               disabled={
                 featureEnabledDraft
                   ? !featureModel ||
                     (featureBackend === "remote" && !featureProviderId) ||
+                    (ocrEnabledDraft &&
+                      ocrBackend === "remote" &&
+                      (!ocrProviderId || !ocrModel)) ||
                     (featureBackend === "onnx" &&
                       !catalog.find((model) => model.id === featureModel)
                         ?.downloaded) ||
@@ -2252,6 +2371,95 @@ export default function KnowledgeBasesPage() {
               <Typography.Link onClick={() => navigate("/admin/models")}>
                 {t("knowledgeBases.manageModels")}
               </Typography.Link>
+              <div className={styles.ocrSettings}>
+                <div className={styles.formOptionRow}>
+                  <div className={styles.formOptionCopy}>
+                    <span className={styles.switchLabel}>
+                      {t("knowledgeBases.ocrTitle")}
+                    </span>
+                    <span className={styles.formOptionHint}>
+                      {t("knowledgeBases.ocrDescription")}
+                    </span>
+                  </div>
+                  <Switch
+                    size="small"
+                    checked={ocrEnabledDraft}
+                    onChange={setOcrEnabledDraft}
+                  />
+                </div>
+                {ocrEnabledDraft ? (
+                  <div className={styles.featureFields}>
+                    <Radio.Group
+                      className={styles.featureBackend}
+                      value={ocrBackend}
+                      onChange={(event) => {
+                        const backend = event.target.value as "onnx" | "remote";
+                        setOcrBackend(backend);
+                        setOcrModel(
+                          backend === "onnx" ? "rapidocr" : undefined,
+                        );
+                        setOcrProviderId(undefined);
+                      }}
+                    >
+                      <Radio value="onnx">{t("knowledgeBases.ocrLocal")}</Radio>
+                      <Radio value="remote">
+                        {t("knowledgeBases.ocrRemote")}
+                      </Radio>
+                    </Radio.Group>
+                    {ocrBackend === "onnx" ? (
+                      <div
+                        className={`${styles.onnxModelItem} ${styles.onnxModelItemActive}`}
+                      >
+                        <div className={styles.onnxModelInfo}>
+                          <span className={styles.onnxModelName}>
+                            RapidOCR (ONNX)
+                          </span>
+                          <span className={styles.onnxModelMeta}>
+                            {t("knowledgeBases.ocrLocalHint")}
+                          </span>
+                        </div>
+                      </div>
+                    ) : (
+                      <>
+                        <Alert
+                          type="warning"
+                          showIcon
+                          message={t("knowledgeBases.ocrRemotePrivacy")}
+                        />
+                        <Select
+                          value={ocrProviderId}
+                          onChange={(id) => {
+                            setOcrProviderId(id);
+                            setOcrModel(undefined);
+                          }}
+                          placeholder={t("knowledgeBases.selectProvider")}
+                          options={ocrRemoteProviders.map((provider) => ({
+                            value: provider.provider_id,
+                            label: provider.provider_name,
+                          }))}
+                          notFoundContent={t("knowledgeBases.ocrNoProviders")}
+                        />
+                        <Select
+                          value={ocrModel}
+                          onChange={setOcrModel}
+                          placeholder={t("knowledgeBases.ocrSelectModel")}
+                          options={(
+                            ocrRemoteProviders.find(
+                              (provider) =>
+                                provider.provider_id === ocrProviderId,
+                            )?.models ?? []
+                          ).map((model) => ({
+                            value: model.id,
+                            label: model.name,
+                          }))}
+                          disabled={!ocrProviderId}
+                          notFoundContent={t("knowledgeBases.ocrNoModels")}
+                        />
+                      </>
+                    )}
+                  </div>
+                ) : null}
+              </div>
             </div>
           </Spin>
         ) : null}
@@ -2262,7 +2470,7 @@ export default function KnowledgeBasesPage() {
         onCancel={dismissDownloadProgressToBackground}
         closable
         maskClosable
-        destroyOnClose={false}
+        destroyOnHidden={false}
         footer={
           <Button onClick={dismissDownloadProgressToBackground}>
             {t("models.localDownloadContinueBackground")}
diff --git a/dashboard/src/pages/Settings/AdvancedSettings/index.tsx b/dashboard/src/pages/Settings/AdvancedSettings/index.tsx
index 9cfd1fba..16b849e2 100644
--- a/dashboard/src/pages/Settings/AdvancedSettings/index.tsx
+++ b/dashboard/src/pages/Settings/AdvancedSettings/index.tsx
@@ -1,17 +1,8 @@
 import type { ReactNode } from "react";
 import { useTranslation } from "react-i18next";
-import {
-  Archive,
-  Lock,
-  Mic2,
-  RefreshCw,
-  Search,
-  Variable,
-  Activity,
-} from "lucide-react";
+import { Navigate, useSearchParams } from "react-router-dom";
+import { Archive, Lock, RefreshCw, Variable, Activity } from "lucide-react";
 import EnvironmentsPage from "../Environments";
-import SearchConfigPage from "../SearchConfig";
-import { VoiceSettingsPanel } from "../Voice";
 import { ObservabilitySettingsPanel } from "../Observability";
 import BackupRestorePanel from "../BackupRestore";
 import { HttpsSettingsPanel } from "../HttpsSettings";
@@ -23,14 +14,7 @@ import ForbiddenPage from "../../../components/ForbiddenPage";
 import { useGatedSearchTabs } from "../../../hooks/useGatedSearchTabs";
 import { ADVANCED_TAB_PERMISSIONS } from "../../../utils/permissions";
 
-type TabKey =
-  | "env-vars"
-  | "search"
-  | "voice"
-  | "observability"
-  | "backup"
-  | "https"
-  | "updates";
+type TabKey = "env-vars" | "observability" | "backup" | "https" | "updates";
 
 const TABS: { key: TabKey; labelKey: string; icon: ReactNode }[] = [
   {
@@ -38,8 +22,6 @@ const TABS: { key: TabKey; labelKey: string; icon: ReactNode }[] = [
     labelKey: "nav.environments",
     icon: <Variable size={15} />,
   },
-  { key: "search", labelKey: "nav.search", icon: <Search size={15} /> },
-  { key: "voice", labelKey: "nav.voice", icon: <Mic2 size={15} /> },
   {
     key: "observability",
     labelKey: "nav.observability",
@@ -56,8 +38,6 @@ const TABS: { key: TabKey; labelKey: string; icon: ReactNode }[] = [
 
 function parseTab(raw: string | null): TabKey {
   if (
-    raw === "search" ||
-    raw === "voice" ||
     raw === "observability" ||
     raw === "backup" ||
     raw === "https" ||
@@ -70,6 +50,7 @@ function parseTab(raw: string | null): TabKey {
 
 export default function AdvancedSettingsPage() {
   const { t } = useTranslation();
+  const [searchParams] = useSearchParams();
   const { allowedTabs, activeTab, forbidden, selectTab } = useGatedSearchTabs({
     tabs: TABS,
     tabPermissions: ADVANCED_TAB_PERMISSIONS,
@@ -77,16 +58,17 @@ export default function AdvancedSettingsPage() {
     querylessKey: "env-vars",
   });
 
+  const moved = searchParams.get("tab");
+  if (moved === "voice" || moved === "search") {
+    return <Navigate to={`/admin/models?tab=${moved}`} replace />;
+  }
+
   if (forbidden) return <ForbiddenPage />;
 
   const renderTab = () => {
     switch (activeTab) {
       case "env-vars":
         return <EnvironmentsPage />;
-      case "search":
-        return <SearchConfigPage />;
-      case "voice":
-        return <VoiceSettingsPanel />;
       case "observability":
         return <ObservabilitySettingsPanel />;
       case "backup":
diff --git a/dashboard/src/pages/Settings/BackupRestore/index.module.less b/dashboard/src/pages/Settings/BackupRestore/index.module.less
index 10bdf009..be11d18a 100644
--- a/dashboard/src/pages/Settings/BackupRestore/index.module.less
+++ b/dashboard/src/pages/Settings/BackupRestore/index.module.less
@@ -41,6 +41,13 @@
   width: 100%;
 }
 
+.autoContentOptions {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  align-items: flex-start;
+}
+
 .autoHint {
   font-size: 12px;
   color: var(--fn-text-secondary);
@@ -103,6 +110,20 @@
   margin-top: 12px;
 }
 
+.contentOptions {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  margin-top: 16px;
+}
+
+.optionHint {
+  padding-left: 24px;
+  font-size: 12px;
+  color: var(--fn-text-secondary);
+  line-height: 1.4;
+}
+
 .dirPath {
   display: inline-block;
   margin-top: 8px;
@@ -176,6 +197,20 @@
   margin-bottom: 10px;
 }
 
+.contentTags {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 6px;
+  margin-bottom: 10px;
+}
+
+.restoreNote {
+  margin: 0 0 12px;
+  font-size: 13px;
+  color: var(--fn-text-secondary);
+  line-height: 1.5;
+}
+
 .backupCardActions {
   display: grid;
   grid-template-columns: repeat(3, minmax(0, 1fr));
diff --git a/dashboard/src/pages/Settings/BackupRestore/index.tsx b/dashboard/src/pages/Settings/BackupRestore/index.tsx
index d12172a9..d9d5eb7c 100644
--- a/dashboard/src/pages/Settings/BackupRestore/index.tsx
+++ b/dashboard/src/pages/Settings/BackupRestore/index.tsx
@@ -12,6 +12,7 @@ import {
   Select,
   Spin,
   Switch,
+  Tag,
   Table,
   Upload,
 } from "antd";
@@ -61,6 +62,22 @@ function triggerDownload(blob: Blob, filename: string) {
   URL.revokeObjectURL(a.href);
 }
 
+function BackupContentsTags({ row }: { row: BackupFileItem }) {
+  const { t } = useTranslation();
+  return (
+    <div className={styles.contentTags}>
+      {row.includes_config ? <Tag>{t("backup.tagConfig")}</Tag> : null}
+      {row.includes_workspaces ? <Tag>{t("backup.tagWorkspaces")}</Tag> : null}
+      {row.includes_skill_packages ? (
+        <Tag>{t("backup.tagSkillPackages")}</Tag>
+      ) : null}
+      {row.includes_plugins ? <Tag>{t("backup.tagPlugins")}</Tag> : null}
+      {row.includes_knowledge ? <Tag>{t("backup.tagKnowledge")}</Tag> : null}
+      {row.includes_chats ? <Tag>{t("backup.tagChatsYes")}</Tag> : null}
+    </div>
+  );
+}
+
 function formatSize(bytes: number): string {
   if (bytes < 1024) return `${bytes} B`;
   if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
@@ -112,6 +129,7 @@ function BackupFileCard({
           {formatServerIsoDateTime(row.modified_at, timeZone)}
         </span>
       </div>
+      <BackupContentsTags row={row} />
       <div className={styles.backupCardActions}>
         <Button
           size="small"
@@ -170,6 +188,13 @@ export default function BackupRestorePanel() {
   const [items, setItems] = useState<BackupFileItem[]>([]);
   const [dir, setDir] = useState("");
   const [loading, setLoading] = useState(false);
+  const [createOpen, setCreateOpen] = useState(false);
+  const [includeConfig, setIncludeConfig] = useState(true);
+  const [includeWorkspaces, setIncludeWorkspaces] = useState(true);
+  const [includeSkillPackages, setIncludeSkillPackages] = useState(true);
+  const [includePlugins, setIncludePlugins] = useState(true);
+  const [includeKnowledge, setIncludeKnowledge] = useState(true);
+  const [includeChats, setIncludeChats] = useState(false);
   const [restoreOpen, setRestoreOpen] = useState(false);
   const [restoreConfig, setRestoreConfig] = useState(true);
   const [pendingRestore, setPendingRestore] = useState<BackupFileItem | null>(
@@ -181,6 +206,13 @@ export default function BackupRestorePanel() {
   const [autoSchedule, setAutoSchedule] = useState(SCHEDULE_DAILY);
   const [schedulePreset, setSchedulePreset] = useState<string>(SCHEDULE_DAILY);
   const [autoRetention, setAutoRetention] = useState(7);
+  const [autoIncludeConfig, setAutoIncludeConfig] = useState(true);
+  const [autoIncludeWorkspaces, setAutoIncludeWorkspaces] = useState(true);
+  const [autoIncludeSkillPackages, setAutoIncludeSkillPackages] =
+    useState(true);
+  const [autoIncludePlugins, setAutoIncludePlugins] = useState(true);
+  const [autoIncludeKnowledge, setAutoIncludeKnowledge] = useState(true);
+  const [autoIncludeChats, setAutoIncludeChats] = useState(false);
   const [autoScheduled, setAutoScheduled] = useState(false);
   const [autoLoading, setAutoLoading] = useState(false);
   const [autoSaving, setAutoSaving] = useState(false);
@@ -195,6 +227,12 @@ export default function BackupRestorePanel() {
     setAutoEnabled(data.auto_enabled);
     setAutoSchedule(data.schedule);
     setAutoRetention(data.retention_count);
+    setAutoIncludeConfig(data.include_config);
+    setAutoIncludeWorkspaces(data.include_workspaces);
+    setAutoIncludeSkillPackages(data.include_skill_packages);
+    setAutoIncludePlugins(data.include_plugins);
+    setAutoIncludeKnowledge(data.include_knowledge);
+    setAutoIncludeChats(data.include_chats);
     setAutoScheduled(Boolean(data.scheduled));
     setSchedulePreset(
       PRESET_SCHEDULES.has(data.schedule) ? data.schedule : "custom",
@@ -261,7 +299,15 @@ export default function BackupRestorePanel() {
   }, [restoring, restoreTarget]);
 
   const onCreate = async () => {
-    await createBackup();
+    const ok = await createBackup({
+      include_config: includeConfig,
+      include_workspaces: includeWorkspaces,
+      include_skill_packages: includeSkillPackages,
+      include_plugins: includePlugins,
+      include_knowledge: includeKnowledge,
+      include_chats: includeChats,
+    });
+    if (ok) setCreateOpen(false);
   };
 
   const onSaveAuto = async () => {
@@ -271,6 +317,12 @@ export default function BackupRestorePanel() {
         auto_enabled: autoEnabled,
         schedule: autoSchedule.trim() || SCHEDULE_DAILY,
         retention_count: autoRetention,
+        include_config: autoIncludeConfig,
+        include_workspaces: autoIncludeWorkspaces,
+        include_skill_packages: autoIncludeSkillPackages,
+        include_plugins: autoIncludePlugins,
+        include_knowledge: autoIncludeKnowledge,
+        include_chats: autoIncludeChats,
       });
       applyAutoSettings(data);
       message.success(t("backup.autoSaveSuccess"));
@@ -352,6 +404,14 @@ export default function BackupRestorePanel() {
       width: 160,
       render: (v: string) => formatServerIsoDateTime(v, serverTimezone),
     },
+    {
+      title: t("backup.colContents"),
+      key: "contents",
+      width: 220,
+      render: (_: unknown, row: BackupFileItem) => (
+        <BackupContentsTags row={row} />
+      ),
+    },
     {
       title: t("backup.colActions"),
       key: "actions",
@@ -376,6 +436,7 @@ export default function BackupRestorePanel() {
             disabled={busy}
             onClick={() => {
               setPendingRestore(row);
+              setRestoreConfig(row.includes_config !== false);
               setRestoreOpen(true);
             }}
           >
@@ -422,7 +483,7 @@ export default function BackupRestorePanel() {
             icon={<Plus size={14} />}
             loading={creating}
             disabled={busy && !creating}
-            onClick={() => void onCreate()}
+            onClick={() => setCreateOpen(true)}
           >
             {creating ? t("backup.creating") : t("backup.createButton")}
           </Button>
@@ -497,6 +558,7 @@ export default function BackupRestorePanel() {
                     onDownload={onDownload}
                     onRestore={(item) => {
                       setPendingRestore(item);
+                      setRestoreConfig(item.includes_config !== false);
                       setRestoreOpen(true);
                     }}
                     onDelete={onDelete}
@@ -614,6 +676,58 @@ export default function BackupRestorePanel() {
                 }
               />
             </label>
+            <div className={styles.autoRow}>
+              <span>{t("backup.autoContent")}</span>
+              <div className={styles.autoContentOptions}>
+                <Checkbox checked disabled>
+                  {t("backup.includeDatabase")}
+                </Checkbox>
+                <Checkbox
+                  checked={autoIncludeConfig}
+                  disabled={busy}
+                  onChange={(e) => setAutoIncludeConfig(e.target.checked)}
+                >
+                  {t("backup.includeConfig")}
+                </Checkbox>
+                <Checkbox
+                  checked={autoIncludeWorkspaces}
+                  disabled={busy}
+                  onChange={(e) => setAutoIncludeWorkspaces(e.target.checked)}
+                >
+                  {t("backup.includeWorkspaces")}
+                </Checkbox>
+                <Checkbox
+                  checked={autoIncludeSkillPackages}
+                  disabled={busy}
+                  onChange={(e) =>
+                    setAutoIncludeSkillPackages(e.target.checked)
+                  }
+                >
+                  {t("backup.includeSkillPackages")}
+                </Checkbox>
+                <Checkbox
+                  checked={autoIncludePlugins}
+                  disabled={busy}
+                  onChange={(e) => setAutoIncludePlugins(e.target.checked)}
+                >
+                  {t("backup.includePlugins")}
+                </Checkbox>
+                <Checkbox
+                  checked={autoIncludeKnowledge}
+                  disabled={busy}
+                  onChange={(e) => setAutoIncludeKnowledge(e.target.checked)}
+                >
+                  {t("backup.includeKnowledge")}
+                </Checkbox>
+                <Checkbox
+                  checked={autoIncludeChats}
+                  disabled={busy}
+                  onChange={(e) => setAutoIncludeChats(e.target.checked)}
+                >
+                  {t("backup.includeChats")}
+                </Checkbox>
+              </div>
+            </div>
             <div className={styles.autoStatus}>
               {autoScheduled
                 ? t("backup.autoScheduled")
@@ -640,6 +754,72 @@ export default function BackupRestorePanel() {
         </Spin>
       </section>
 
+      <Modal
+        title={t("backup.createModalTitle")}
+        open={createOpen}
+        onCancel={() => {
+          if (!creating) setCreateOpen(false);
+        }}
+        onOk={() => void onCreate()}
+        okText={creating ? t("backup.creating") : t("backup.createButton")}
+        cancelText={t("common.cancel")}
+        confirmLoading={creating}
+        okButtonProps={{ disabled: busy && !creating }}
+        cancelButtonProps={{ disabled: creating }}
+      >
+        <p>{t("backup.createModalDesc")}</p>
+        <div className={styles.contentOptions}>
+          <Checkbox checked disabled>
+            {t("backup.includeDatabase")}
+          </Checkbox>
+          <Checkbox
+            checked={includeConfig}
+            disabled={creating}
+            onChange={(e) => setIncludeConfig(e.target.checked)}
+          >
+            {t("backup.includeConfig")}
+          </Checkbox>
+          <Checkbox
+            checked={includeWorkspaces}
+            disabled={creating}
+            onChange={(e) => setIncludeWorkspaces(e.target.checked)}
+          >
+            {t("backup.includeWorkspaces")}
+          </Checkbox>
+          <Checkbox
+            checked={includeSkillPackages}
+            disabled={creating}
+            onChange={(e) => setIncludeSkillPackages(e.target.checked)}
+          >
+            {t("backup.includeSkillPackages")}
+          </Checkbox>
+          <Checkbox
+            checked={includePlugins}
+            disabled={creating}
+            onChange={(e) => setIncludePlugins(e.target.checked)}
+          >
+            {t("backup.includePlugins")}
+          </Checkbox>
+          <Checkbox
+            checked={includeKnowledge}
+            disabled={creating}
+            onChange={(e) => setIncludeKnowledge(e.target.checked)}
+          >
+            {t("backup.includeKnowledge")}
+          </Checkbox>
+          <Checkbox
+            checked={includeChats}
+            disabled={creating}
+            onChange={(e) => setIncludeChats(e.target.checked)}
+          >
+            {t("backup.includeChats")}
+          </Checkbox>
+          <span className={styles.optionHint}>
+            {t("backup.includeChatsHint")}
+          </span>
+        </div>
+      </Modal>
+
       <Modal
         title={t("backup.importConfirmTitle")}
         open={restoreOpen}
@@ -661,15 +841,37 @@ export default function BackupRestorePanel() {
             name: pendingRestore?.name ?? restoreTarget ?? "",
           })}
         </p>
+        {pendingRestore?.includes_chats === false ? (
+          <p className={styles.restoreNote}>{t("backup.restoreKeepChats")}</p>
+        ) : null}
+        {pendingRestore?.includes_workspaces === false ? (
+          <p className={styles.restoreNote}>
+            {t("backup.restoreNoWorkspaces")}
+          </p>
+        ) : null}
+        {pendingRestore?.includes_skill_packages === false ? (
+          <p className={styles.restoreNote}>
+            {t("backup.restoreNoSkillPackages")}
+          </p>
+        ) : null}
+        {pendingRestore?.includes_plugins === false ? (
+          <p className={styles.restoreNote}>{t("backup.restoreNoPlugins")}</p>
+        ) : null}
+        {pendingRestore?.includes_knowledge === false ? (
+          <p className={styles.restoreNote}>{t("backup.restoreNoKnowledge")}</p>
+        ) : null}
         <div className={styles.checkboxRow}>
           <Checkbox
             checked={restoreConfig}
-            disabled={restoring}
+            disabled={restoring || pendingRestore?.includes_config === false}
             onChange={(e) => setRestoreConfig(e.target.checked)}
           >
             {t("backup.restoreConfig")}
           </Checkbox>
         </div>
+        {pendingRestore?.includes_config === false ? (
+          <p className={styles.restoreNote}>{t("backup.restoreNoConfig")}</p>
+        ) : null}
       </Modal>
     </>
   );
diff --git a/dashboard/src/pages/Settings/Models/components/modals/ProviderConfigModal.tsx b/dashboard/src/pages/Settings/Models/components/modals/ProviderConfigModal.tsx
index 4a3d0ec9..41ac7db3 100644
--- a/dashboard/src/pages/Settings/Models/components/modals/ProviderConfigModal.tsx
+++ b/dashboard/src/pages/Settings/Models/components/modals/ProviderConfigModal.tsx
@@ -1076,7 +1076,7 @@ export function ProviderConfigModal({
         onCancel={dismissDownloadProgressToBackground}
         closable
         maskClosable
-        destroyOnClose={false}
+        destroyOnHidden={false}
         footer={
           <Button onClick={dismissDownloadProgressToBackground}>
             {t("models.localDownloadContinueBackground")}
diff --git a/dashboard/src/pages/Settings/Models/index.tsx b/dashboard/src/pages/Settings/Models/index.tsx
index d602d73d..6aa191a9 100644
--- a/dashboard/src/pages/Settings/Models/index.tsx
+++ b/dashboard/src/pages/Settings/Models/index.tsx
@@ -11,7 +11,14 @@
  */
 import { useMemo, useState } from "react";
 import { Button, Divider, Empty, Space, Tabs, Typography } from "antd";
-import { Images, MessageSquareText, Plus, RefreshCw } from "lucide-react";
+import {
+  Images,
+  MessageSquareText,
+  Mic2,
+  Plus,
+  RefreshCw,
+  Search,
+} from "lucide-react";
 import { useTranslation } from "react-i18next";
 import { useSearchParams } from "react-router-dom";
 import PageShell from "../../../layouts/PageShell";
@@ -31,6 +38,30 @@ import {
 } from "./components";
 import styles from "./index.module.less";
 import { MediaGenerationSettingsPanel } from "../MediaGeneration";
+import { VoiceSettingsPanel } from "../Voice";
+import { SearchSettingsPanel } from "../SearchConfig";
+
+type ModelCategory = "chat" | "generation" | "voice" | "search";
+
+function resolveModelCategory(
+  requestedTab: string | null,
+  canChat: boolean,
+  canProviders: boolean,
+  canVoice: boolean,
+  canSearch: boolean,
+): ModelCategory {
+  if (requestedTab === "generation" && canProviders) return "generation";
+  if (requestedTab === "voice" && canVoice) return "voice";
+  if (requestedTab === "search" && canSearch) return "search";
+  if ((requestedTab === "chat" || requestedTab === null) && canChat) {
+    return "chat";
+  }
+  if (canChat) return "chat";
+  if (canVoice) return "voice";
+  if (canSearch) return "search";
+  if (canProviders) return "generation";
+  return "chat";
+}
 
 const { Title } = Typography;
 
@@ -40,6 +71,9 @@ export default function ModelsPage() {
   const canProviders = userCan(user, "providers");
   const canOllama = userCan(user, "ollama_models");
   const canOnnx = userCan(user, "onnx_models");
+  const canVoice = userCan(user, "voice");
+  const canSearch = userCan(user, "search");
+  const canChat = canProviders || canOllama || canOnnx;
   const {
     providers,
     presets,
@@ -53,14 +87,18 @@ export default function ModelsPage() {
   const [hoveredCard, setHoveredCard] = useState<string | null>(null);
   const [addOpen, setAddOpen] = useState(false);
   const [searchParams, setSearchParams] = useSearchParams();
-  const modelCategory =
-    canProviders && searchParams.get("tab") === "generation"
-      ? "generation"
-      : "chat";
+  const modelCategory = resolveModelCategory(
+    searchParams.get("tab"),
+    canChat,
+    canProviders,
+    canVoice,
+    canSearch,
+  );
   const setModelCategory = (next: string) => {
     const updated = new URLSearchParams(searchParams);
-    if (next === "generation") updated.set("tab", "generation");
-    else updated.delete("tab");
+    if (next === "generation" || next === "voice" || next === "search") {
+      updated.set("tab", next);
+    } else updated.delete("tab");
     setSearchParams(updated, { replace: true });
   };
 
@@ -159,15 +197,19 @@ export default function ModelsPage() {
         activeKey={modelCategory}
         onChange={setModelCategory}
         items={[
-          {
-            key: "chat",
-            label: (
-              <Space size={6}>
-                <MessageSquareText size={15} />
-                {t("models.chatModelsTab")}
-              </Space>
-            ),
-          },
+          ...(canChat
+            ? [
+                {
+                  key: "chat",
+                  label: (
+                    <Space size={6}>
+                      <MessageSquareText size={15} />
+                      {t("models.chatModelsTab")}
+                    </Space>
+                  ),
+                },
+              ]
+            : []),
           ...(canProviders
             ? [
                 {
@@ -181,10 +223,40 @@ export default function ModelsPage() {
                 },
               ]
             : []),
+          ...(canVoice
+            ? [
+                {
+                  key: "voice",
+                  label: (
+                    <Space size={6}>
+                      <Mic2 size={15} />
+                      {t("models.voiceModelsTab")}
+                    </Space>
+                  ),
+                },
+              ]
+            : []),
+          ...(canSearch
+            ? [
+                {
+                  key: "search",
+                  label: (
+                    <Space size={6}>
+                      <Search size={15} />
+                      {t("models.searchModelsTab")}
+                    </Space>
+                  ),
+                },
+              ]
+            : []),
         ]}
       />
       {modelCategory === "generation" ? (
         <MediaGenerationSettingsPanel />
+      ) : modelCategory === "voice" ? (
+        <VoiceSettingsPanel />
+      ) : modelCategory === "search" ? (
+        <SearchSettingsPanel />
       ) : loading ? (
         <LoadingState message={t("models.loadingProviders")} />
       ) : error ? (
diff --git a/dashboard/src/pages/Settings/SearchConfig/index.module.less b/dashboard/src/pages/Settings/SearchConfig/index.module.less
index 3e2aa267..c67769ad 100644
--- a/dashboard/src/pages/Settings/SearchConfig/index.module.less
+++ b/dashboard/src/pages/Settings/SearchConfig/index.module.less
@@ -252,16 +252,18 @@
   padding: 48px 0;
 }
 
-.modalHint {
-  margin: 0 0 16px;
+.drawerHint {
+  margin-bottom: 16px;
+  padding: 10px 12px;
+  border-radius: var(--fn-radius-md);
+  background: var(--fn-surface-sunken);
+  color: var(--fn-text-tertiary);
   font-size: 13px;
-  line-height: 1.55;
-  color: var(--fn-text-secondary);
+  line-height: 1.5;
 }
 
-.modalActions {
+.drawerFooter {
   display: flex;
-  flex-wrap: wrap;
+  justify-content: flex-end;
   gap: 8px;
-  margin-top: 4px;
 }
diff --git a/dashboard/src/pages/Settings/SearchConfig/index.tsx b/dashboard/src/pages/Settings/SearchConfig/index.tsx
index 07a425a3..3b1972d4 100644
--- a/dashboard/src/pages/Settings/SearchConfig/index.tsx
+++ b/dashboard/src/pages/Settings/SearchConfig/index.tsx
@@ -1,13 +1,13 @@
 import { useEffect, useState, useCallback } from "react";
-import { App, Button, Form, Input, Typography, Spin, Modal } from "antd";
+import { App, Button, Drawer, Form, Input, Typography, Spin } from "antd";
 
 import {
+  Activity,
   Check,
   CheckCircle,
   Search,
   Settings2,
   Trash2,
-  Zap,
 } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import { envsApi } from "../../../api/modules/env";
@@ -67,7 +67,7 @@ function searchProviderLogo(providerId: string): string {
   return getProviderLogo(providerId) ?? customProviderLogo;
 }
 
-interface ConfigureModalProps {
+interface ConfigureDrawerProps {
   provider: SearchProvider;
   envVars: Record<string, string>;
   open: boolean;
@@ -75,13 +75,13 @@ interface ConfigureModalProps {
   onSaved: () => void;
 }
 
-function ConfigureModal({
+function ConfigureDrawer({
   provider,
   envVars,
   open,
   onClose,
   onSaved,
-}: ConfigureModalProps) {
+}: ConfigureDrawerProps) {
   const { t } = useTranslation();
   const { modal, message } = App.useApp();
   const [form] = Form.useForm();
@@ -120,7 +120,7 @@ function ConfigureModal({
     }
   };
 
-  const handleTest = async () => {
+  const handleProbe = async () => {
     try {
       setTesting(true);
       const values = (await form.validateFields()) as Record<string, string>;
@@ -183,23 +183,37 @@ function ConfigureModal({
     });
   };
 
-  const modalTitle = provider.configured
-    ? `${t("common.edit")} — ${provider.name}`
-    : `${t("advancedSettings.search.configure")} — ${provider.name}`;
-
   return (
-    <Modal
-      title={modalTitle}
+    <Drawer
+      title={t("advancedSettings.search.configureTitle", {
+        name: provider.name,
+      })}
       open={open}
-      onCancel={onClose}
-      onOk={() => void handleSave()}
-      confirmLoading={saving}
-      okText={t("common.save")}
-      cancelText={t("common.cancel")}
-      destroyOnClose
-      width={480}
+      onClose={onClose}
+      width={440}
+      placement="right"
+      destroyOnHidden
+      footer={
+        <div className={styles.drawerFooter}>
+          <Button onClick={onClose}>{t("common.cancel")}</Button>
+          <Button
+            icon={<Activity size={14} />}
+            loading={testing}
+            onClick={() => void handleProbe()}
+          >
+            {t("advancedSettings.search.probe")}
+          </Button>
+          <Button
+            type="primary"
+            loading={saving}
+            onClick={() => void handleSave()}
+          >
+            {t("common.save")}
+          </Button>
+        </div>
+      }
     >
-      <p className={styles.modalHint}>{t(provider.descriptionKey)}</p>
+      <div className={styles.drawerHint}>{t(provider.descriptionKey)}</div>
       <Form form={form} layout="vertical" requiredMark={false}>
         {provider.required_keys.map((key) => (
           <Form.Item
@@ -229,6 +243,14 @@ function ConfigureModal({
                     </>
                   ) : null}
                 </span>
+              ) : provider.docs_url && key === provider.required_keys[0] ? (
+                <a
+                  href={provider.docs_url}
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >
+                  {t("setupWizard.search.getApiKey")}
+                </a>
               ) : undefined
             }
           >
@@ -239,35 +261,17 @@ function ConfigureModal({
           </Form.Item>
         ))}
       </Form>
-
-      <div className={styles.modalActions}>
+      {provider.configured ? (
         <Button
-          icon={<Zap size={14} />}
-          loading={testing}
-          onClick={() => void handleTest()}
+          danger
+          icon={<Trash2 size={14} />}
+          loading={revoking}
+          onClick={handleRevoke}
         >
-          {t("setupWizard.search.test")}
+          {t("setupWizard.search.revoke")}
         </Button>
-        {provider.docs_url ? (
-          <Button
-            type="link"
-            onClick={() => window.open(provider.docs_url, "_blank")}
-          >
-            {t("setupWizard.search.docs")}
-          </Button>
-        ) : null}
-        {provider.configured ? (
-          <Button
-            danger
-            icon={<Trash2 size={14} />}
-            loading={revoking}
-            onClick={handleRevoke}
-          >
-            {t("setupWizard.search.revoke")}
-          </Button>
-        ) : null}
-      </div>
-    </Modal>
+      ) : null}
+    </Drawer>
   );
 }
 
@@ -327,7 +331,7 @@ export default function SearchConfigPage() {
     <>
       <TabPanelHeader
         icon={<Search size={22} />}
-        title={t("nav.search")}
+        title={t("models.searchModelsTab")}
         description={t("advancedSettings.search.desc")}
       />
 
@@ -457,7 +461,7 @@ export default function SearchConfigPage() {
       </Text>
 
       {editing ? (
-        <ConfigureModal
+        <ConfigureDrawer
           provider={editing}
           envVars={envVars}
           open
@@ -468,3 +472,5 @@ export default function SearchConfigPage() {
     </>
   );
 }
+
+export { SearchConfigPage as SearchSettingsPanel };
diff --git a/dashboard/src/pages/Settings/Voice/index.module.less b/dashboard/src/pages/Settings/Voice/index.module.less
index 83d0dc1b..db8f92a0 100644
--- a/dashboard/src/pages/Settings/Voice/index.module.less
+++ b/dashboard/src/pages/Settings/Voice/index.module.less
@@ -209,3 +209,19 @@
   margin: 24px 0 20px !important;
   border-color: var(--fn-border-primary) !important;
 }
+
+.drawerHint {
+  margin-bottom: 16px;
+  padding: 10px 12px;
+  border-radius: var(--fn-radius-md);
+  background: var(--fn-surface-sunken);
+  color: var(--fn-text-tertiary);
+  font-size: 13px;
+  line-height: 1.5;
+}
+
+.drawerFooter {
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+}
diff --git a/dashboard/src/pages/Settings/Voice/index.tsx b/dashboard/src/pages/Settings/Voice/index.tsx
index 79d47215..470a7842 100644
--- a/dashboard/src/pages/Settings/Voice/index.tsx
+++ b/dashboard/src/pages/Settings/Voice/index.tsx
@@ -1,12 +1,13 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
-import { Button, Divider, Modal, Space, Typography, Input, Select } from "antd";
+import { Button, Divider, Drawer, Form, Input, Select, Typography } from "antd";
 import { message } from "@/utils/antdMessage";
 
-import { Mic2, RefreshCw, Check, Settings2 } from "lucide-react";
+import { Activity, Mic2, Check, Settings2 } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import {
   voiceApi,
   type VoicePreset,
+  type VoiceProviderInput,
   type VoiceProviderRow,
 } from "../../../api/modules/voice";
 import { customProviderLogo, getProviderLogo } from "../../../assets/providers";
@@ -25,7 +26,7 @@ interface ConfigureState {
   existing?: VoiceProviderRow;
 }
 
-/** Voice provider settings panel — embeddable in Advanced Settings tab. */
+/** Voice provider settings panel — embeddable in the Models page tab. */
 export function VoiceSettingsPanel() {
   const { t } = useTranslation();
   const [presets, setPresets] = useState<VoicePreset[]>([]);
@@ -41,6 +42,7 @@ export function VoiceSettingsPanel() {
   );
   const [mimoVoiceId, setMimoVoiceId] = useState("冰糖");
   const [saving, setSaving] = useState(false);
+  const [probing, setProbing] = useState(false);
 
   const fetchAll = useCallback(async () => {
     setLoading(true);
@@ -103,47 +105,88 @@ export function VoiceSettingsPanel() {
     setMimoVoiceId(String(extra.voice_id ?? "冰糖"));
   };
 
+  const buildProviderPayload = (): VoiceProviderInput | null => {
+    if (!configure) return null;
+    const { preset } = configure;
+    let extra: Record<string, unknown>;
+    let baseUrl: string | null = null;
+    if (preset.kind === "tencent") {
+      extra = {
+        secret_id: secretId,
+        secret_key: secretKey,
+        region: "ap-guangzhou",
+      };
+    } else if (preset.kind === "edge") {
+      extra = { voice_id: "zh-CN-XiaoxiaoNeural" };
+    } else if (preset.kind === "mimo") {
+      baseUrl =
+        mimoEndpoint === "tokenplan"
+          ? "https://token-plan-cn.xiaomimimo.com/v1"
+          : "https://api.xiaomimimo.com/v1";
+      extra = {
+        endpoint_type: mimoEndpoint,
+        voice_id: preset.capability === "tts" ? mimoVoiceId : undefined,
+      };
+    } else {
+      extra = { model: preset.kind === "openai" ? "whisper-1" : undefined };
+    }
+    return {
+      name: preset.id,
+      kind: preset.kind,
+      capability: preset.capability,
+      base_url: baseUrl,
+      api_key:
+        preset.kind === "tencent"
+          ? secretId && secretKey
+            ? `${secretId}:${secretKey}`
+            : null
+          : apiKey || null,
+      extra_json: JSON.stringify(extra),
+    };
+  };
+
+  const validateCredentials = () => {
+    if (!configure?.preset.requires_key) return true;
+    const complete =
+      configure.preset.kind === "tencent"
+        ? Boolean(secretId.trim() && secretKey.trim())
+        : Boolean(apiKey.trim());
+    if (!complete) message.warning(t("voice.credentialsRequired"));
+    return complete;
+  };
+
+  const handleProbe = async () => {
+    const payload = buildProviderPayload();
+    if (!payload || !validateCredentials() || !configure) return;
+    const modes: ("stt" | "tts")[] =
+      configure.preset.capability === "both"
+        ? ["stt", "tts"]
+        : [configure.preset.capability];
+    setProbing(true);
+    try {
+      for (const mode of modes) {
+        const result = await voiceApi.testConfiguration({ ...payload, mode });
+        if (!result.ok) {
+          message.error(result.error || t("voice.probeFailed"));
+          return;
+        }
+      }
+      message.success(t("voice.probeSuccess"));
+    } catch (err) {
+      message.error(
+        err instanceof Error ? err.message : t("voice.probeFailed"),
+      );
+    } finally {
+      setProbing(false);
+    }
+  };
+
   const handleSaveProvider = async () => {
-    if (!configure) return;
+    const payload = buildProviderPayload();
+    if (!configure || !payload || !validateCredentials()) return;
     setSaving(true);
     try {
       const { preset, existing } = configure;
-      let extra: Record<string, unknown>;
-      let baseUrl: string | null = null;
-      if (preset.kind === "tencent") {
-        extra = {
-          secret_id: secretId,
-          secret_key: secretKey,
-          region: "ap-guangzhou",
-        };
-      } else if (preset.kind === "edge") {
-        extra = { voice_id: "zh-CN-XiaoxiaoNeural" };
-      } else if (preset.kind === "mimo") {
-        const mimoBase =
-          mimoEndpoint === "tokenplan"
-            ? "https://token-plan-cn.xiaomimimo.com/v1"
-            : "https://api.xiaomimimo.com/v1";
-        baseUrl = mimoBase;
-        extra = {
-          endpoint_type: mimoEndpoint,
-          voice_id: preset.capability === "tts" ? mimoVoiceId : undefined,
-        };
-      } else {
-        extra = { model: preset.kind === "openai" ? "whisper-1" : undefined };
-      }
-      const payload = {
-        name: preset.id,
-        kind: preset.kind,
-        capability: preset.capability,
-        base_url: baseUrl,
-        api_key:
-          preset.kind === "tencent"
-            ? secretId && secretKey
-              ? `${secretId}:${secretKey}`
-              : null
-            : apiKey || null,
-        extra_json: JSON.stringify(extra),
-      };
       if (existing) {
         await voiceApi.patchProvider(existing.id, payload);
       } else {
@@ -301,16 +344,8 @@ export function VoiceSettingsPanel() {
     <>
       <TabPanelHeader
         icon={<Mic2 size={22} />}
-        title={t("nav.voice")}
-        description={t("pageShell.voice.subtitle")}
-        actions={
-          <Button
-            icon={<RefreshCw size={14} />}
-            onClick={() => void fetchAll()}
-          >
-            {t("common.refresh")}
-          </Button>
-        }
+        title={t("models.voiceModelsTab")}
+        description={t("voice.description")}
       />
 
       {loading ? (
@@ -335,102 +370,129 @@ export function VoiceSettingsPanel() {
         </>
       )}
 
-      <Modal
-        title={
-          configure ? `${t("voice.configure")} — ${configure.preset.name}` : ""
-        }
+      <Drawer
+        title={t("voice.configureTitle", {
+          name: configure?.preset.name ?? "",
+        })}
         open={!!configure}
-        onCancel={() => setConfigure(null)}
-        onOk={() => void handleSaveProvider()}
-        confirmLoading={saving}
-        okText={t("common.save")}
+        onClose={() => setConfigure(null)}
+        width={440}
+        placement="right"
+        destroyOnHidden
+        footer={
+          <div className={styles.drawerFooter}>
+            <Button onClick={() => setConfigure(null)}>
+              {t("common.cancel")}
+            </Button>
+            <Button
+              icon={<Activity size={14} />}
+              loading={probing}
+              onClick={() => void handleProbe()}
+            >
+              {t("voice.probe")}
+            </Button>
+            <Button
+              type="primary"
+              loading={saving}
+              onClick={() => void handleSaveProvider()}
+            >
+              {t("common.save")}
+            </Button>
+          </div>
+        }
       >
-        {configure?.preset.kind === "tencent" && (
-          <Space direction="vertical" style={{ width: "100%" }}>
-            <Text type="secondary">{t("voice.tencentHint")}</Text>
-            <Input
-              placeholder="SecretId"
-              value={secretId}
-              onChange={(e) => setSecretId(e.target.value)}
-            />
-            <Input.Password
-              placeholder="SecretKey"
-              value={secretKey}
-              onChange={(e) => setSecretKey(e.target.value)}
-            />
-          </Space>
-        )}
-        {configure?.preset.kind === "openai" && (
-          <Space direction="vertical" style={{ width: "100%" }}>
-            <Text type="secondary">{t("voice.openaiHint")}</Text>
-            <Input.Password
-              placeholder="API Key"
-              value={apiKey}
-              onChange={(e) => setApiKey(e.target.value)}
-            />
-            <Select
-              style={{ width: "100%" }}
-              defaultValue="https://api.openai.com/v1"
-              disabled
-              options={[
-                { value: "https://api.openai.com/v1", label: "OpenAI API" },
-              ]}
-            />
-          </Space>
-        )}
-        {configure?.preset.kind === "mimo" && (
-          <Space direction="vertical" style={{ width: "100%" }}>
-            <Text type="secondary">{t("voice.mimoHint")}</Text>
-            <div>
-              <div style={{ fontSize: 12, marginBottom: 4 }}>
-                {t("voice.mimoEndpoint")}
-              </div>
-              <Select
-                style={{ width: "100%" }}
-                value={mimoEndpoint}
-                onChange={(v) => setMimoEndpoint(v)}
-                options={[
-                  {
-                    value: "payg",
-                    label: t("voice.mimoEndpointPayg"),
-                  },
-                  {
-                    value: "tokenplan",
-                    label: t("voice.mimoEndpointTokenplan"),
-                  },
-                ]}
-              />
-            </div>
-            <Input.Password
-              placeholder="API Key (sk-... / tp-...)"
-              value={apiKey}
-              onChange={(e) => setApiKey(e.target.value)}
-            />
-            {configure.preset.capability === "tts" && (
-              <div>
-                <div style={{ fontSize: 12, marginBottom: 4 }}>
-                  {t("voice.mimoVoice")}
-                </div>
+        <Form layout="vertical">
+          {configure?.preset.kind === "tencent" && (
+            <>
+              <div className={styles.drawerHint}>{t("voice.tencentHint")}</div>
+              <Form.Item label="SecretId" required>
+                <Input
+                  placeholder="SecretId"
+                  value={secretId}
+                  onChange={(e) => setSecretId(e.target.value)}
+                />
+              </Form.Item>
+              <Form.Item label="SecretKey" required>
+                <Input.Password
+                  placeholder="SecretKey"
+                  value={secretKey}
+                  onChange={(e) => setSecretKey(e.target.value)}
+                />
+              </Form.Item>
+            </>
+          )}
+          {configure?.preset.kind === "openai" && (
+            <>
+              <div className={styles.drawerHint}>{t("voice.openaiHint")}</div>
+              <Form.Item label="API Key" required>
+                <Input.Password
+                  placeholder="API Key"
+                  value={apiKey}
+                  onChange={(e) => setApiKey(e.target.value)}
+                />
+              </Form.Item>
+              <Form.Item label={t("voice.mimoEndpoint")}>
                 <Select
-                  style={{ width: "100%" }}
-                  value={mimoVoiceId}
-                  onChange={(v) => setMimoVoiceId(v)}
+                  value="https://api.openai.com/v1"
+                  disabled
                   options={[
-                    { value: "冰糖", label: "冰糖 (中文·女)" },
-                    { value: "茉莉", label: "茉莉 (中文·女)" },
-                    { value: "苏打", label: "苏打 (中文·男)" },
-                    { value: "白桦", label: "白桦 (中文·男)" },
-                    { value: "Mia", label: "Mia (EN·Female)" },
-                    { value: "Chloe", label: "Chloe (EN·Female)" },
-                    { value: "Milo", label: "Milo (EN·Male)" },
-                    { value: "Dean", label: "Dean (EN·Male)" },
+                    {
+                      value: "https://api.openai.com/v1",
+                      label: "OpenAI API",
+                    },
                   ]}
                 />
-              </div>
-            )}
-          </Space>
-        )}
-      </Modal>
+              </Form.Item>
+            </>
+          )}
+          {configure?.preset.kind === "mimo" && (
+            <>
+              <div className={styles.drawerHint}>{t("voice.mimoHint")}</div>
+              <Form.Item label={t("voice.mimoEndpoint")} required>
+                <Select
+                  value={mimoEndpoint}
+                  onChange={(v) => setMimoEndpoint(v)}
+                  options={[
+                    {
+                      value: "payg",
+                      label: t("voice.mimoEndpointPayg"),
+                    },
+                    {
+                      value: "tokenplan",
+                      label: t("voice.mimoEndpointTokenplan"),
+                    },
+                  ]}
+                />
+              </Form.Item>
+              <Form.Item label="API Key" required>
+                <Input.Password
+                  placeholder="API Key (sk-... / tp-...)"
+                  value={apiKey}
+                  onChange={(e) => setApiKey(e.target.value)}
+                />
+              </Form.Item>
+              {configure.preset.capability === "tts" && (
+                <Form.Item label={t("voice.mimoVoice")}>
+                  <Select
+                    value={mimoVoiceId}
+                    onChange={(v) => setMimoVoiceId(v)}
+                    options={[
+                      { value: "冰糖", label: "冰糖 (中文·女)" },
+                      { value: "茉莉", label: "茉莉 (中文·女)" },
+                      { value: "苏打", label: "苏打 (中文·男)" },
+                      { value: "白桦", label: "白桦 (中文·男)" },
+                      { value: "Mia", label: "Mia (EN·Female)" },
+                      { value: "Chloe", label: "Chloe (EN·Female)" },
+                      { value: "Milo", label: "Milo (EN·Male)" },
+                      { value: "Dean", label: "Dean (EN·Male)" },
+                    ]}
+                  />
+                </Form.Item>
+              )}
+            </>
+          )}
+        </Form>
+      </Drawer>
     </>
   );
 }
diff --git a/dashboard/src/routes/controlAdminPath.test.ts b/dashboard/src/routes/controlAdminPath.test.ts
index bc62fafe..e7f5f682 100644
--- a/dashboard/src/routes/controlAdminPath.test.ts
+++ b/dashboard/src/routes/controlAdminPath.test.ts
@@ -5,7 +5,7 @@ import {
   pathPermissionKeys,
   PERM,
 } from "../utils/permissions";
-import { isWorkbenchPath } from "./index";
+import { isWorkbenchPath, resolveSelectedKey, routeConfigs } from "./index";
 
 describe("pathPermissionKeys", () => {
   it("matches workbench and legacy aliases", () => {
@@ -44,6 +44,16 @@ describe("pathPermissionKeys", () => {
     expect(NAV_PERMISSIONS["admin-advanced"]).toEqual(PERM.advancedPage);
   });
 
+  it("keeps voice and search on models page, not advanced", () => {
+    expect(pathPermissionKeys("/admin/models")).toEqual([...PERM.modelsPage]);
+    expect(pathPermissionKeys("/admin/voice")).toEqual([...PERM.modelsPage]);
+    expect([...PERM.modelsPage]).toContain("voice");
+    expect([...PERM.modelsPage]).toContain("search");
+    expect([...PERM.advancedPage]).not.toContain("voice");
+    expect([...PERM.advancedPage]).not.toContain("search");
+    expect(NAV_PERMISSIONS.models).toEqual(PERM.modelsPage);
+  });
+
   it("does not gate common pages", () => {
     expect(pathPermissionKeys("/chat")).toBeNull();
     expect(pathPermissionKeys("/experts")).toBeNull();
@@ -101,3 +111,13 @@ describe("pathPermissionKeys", () => {
     ).toBe(false);
   });
 });
+
+describe("unknown dashboard paths", () => {
+  it("do not highlight a sidebar item", () => {
+    expect(resolveSelectedKey("/does-not-exist")).toBe("");
+  });
+
+  it("are caught by the not-found route", () => {
+    expect(routeConfigs.some((rc) => rc.path === "*")).toBe(true);
+  });
+});
diff --git a/dashboard/src/routes/index.tsx b/dashboard/src/routes/index.tsx
index 19667568..9c18d72a 100644
--- a/dashboard/src/routes/index.tsx
+++ b/dashboard/src/routes/index.tsx
@@ -31,6 +31,7 @@ const AgentConfigPage = lazy(() => import("../pages/Agent/Config"));
 
 // Misc
 const PwaDebugPage = lazy(() => import("../pages/PwaDebug"));
+const NotFoundPage = lazy(() => import("../components/NotFoundPage"));
 
 function RedirectPreserveSearch({ to }: { to: string }) {
   const location = useLocation();
@@ -56,6 +57,7 @@ export const pathToKey: Record<string, string> = {
   "/personalization": "personalization",
   "/personalization/skills": "personalization",
   "/personalization/tools": "personalization",
+  "/personalization/plugins": "personalization",
   "/personalization/subagents": "personalization",
   "/personalization/channels": "channels",
   "/personalization/mbti": "personalization",
@@ -136,7 +138,7 @@ export function resolveSelectedKey(pathname: string): string {
   if (pathname.startsWith("/workbench/")) return "workbench";
   if (pathname.startsWith("/remote-desktop/")) return "remote-desktop";
   if (pathname.startsWith("/personalization/")) return "personalization";
-  return "chat";
+  return "";
 }
 
 export const routeConfigs: RouteConfig[] = [
@@ -228,7 +230,7 @@ export const routeConfigs: RouteConfig[] = [
   { path: "/admin/security", element: <AdminSecurityPage /> },
   {
     path: "/admin/voice",
-    element: <Navigate to="/admin/advanced?tab=voice" replace />,
+    element: <Navigate to="/admin/models?tab=voice" replace />,
   },
   {
     path: "/admin/updates",
@@ -277,4 +279,5 @@ export const routeConfigs: RouteConfig[] = [
   // Misc
   { path: "/pwa-debug", element: <PwaDebugPage /> },
   { path: "/", element: <Navigate to="/chat" replace /> },
+  { path: "*", element: <NotFoundPage /> },
 ];
diff --git a/dashboard/src/styles/layout.css b/dashboard/src/styles/layout.css
index e144e89d..dcb3b78a 100644
--- a/dashboard/src/styles/layout.css
+++ b/dashboard/src/styles/layout.css
@@ -33,6 +33,27 @@ html[data-octop-desktop-chrome] [data-octop-no-drag] {
   --wails-draggable: no-drag;
 }
 
+/* Right-edge overlays sit under the frameless caption buttons unless inset. */
+html[data-octop-desktop-chrome] [data-octop-chrome-end-pad] {
+  padding-inline-end: max(
+    12px,
+    var(--window-controls-inset-end, 0px)
+  ) !important;
+}
+
+html[data-octop-desktop-chrome] .octop-drawer-right .octop-drawer-header,
+html[data-octop-desktop-chrome] .ant-drawer-right .ant-drawer-header {
+  padding-inline-end: max(
+    24px,
+    var(--window-controls-inset-end, 0px)
+  ) !important;
+}
+
+html[data-octop-desktop-chrome] .octop-drawer-right .octop-drawer-close,
+html[data-octop-desktop-chrome] .ant-drawer-right .ant-drawer-close {
+  inset-inline-end: var(--window-controls-inset-end, 0px) !important;
+}
+
 #root {
   height: 100%;
   overflow: hidden;
diff --git a/dashboard/src/styles/spin-override.css b/dashboard/src/styles/spin-override.css
new file mode 100644
index 00000000..ac5a889c
--- /dev/null
+++ b/dashboard/src/styles/spin-override.css
@@ -0,0 +1,39 @@
+/**
+ * Layout contract for the global antd Spin indicator (OctopSpinner).
+ * antd sizes and positions its default dot from the `dotSize` token, so every
+ * geometry rule it derives (box, nested-pattern centering, tip gap) has to be
+ * restated from one size variable per Spin size.
+ */
+
+.octop-spin {
+  --octop-spinner-size: 24px;
+  --octop-spinner-ring-width: 2.5px;
+}
+
+.octop-spin-lg {
+  --octop-spinner-size: 48px;
+  --octop-spinner-ring-width: 4px;
+}
+
+.octop-spin-sm {
+  --octop-spinner-size: 18px;
+  --octop-spinner-ring-width: 2px;
+}
+
+.octop-spin .octop-spin-dot {
+  width: var(--octop-spinner-size) !important;
+  height: var(--octop-spinner-size) !important;
+}
+
+.octop-spin-nested-loading .octop-spin .octop-spin-dot {
+  margin: calc(var(--octop-spinner-size) / -2) !important;
+}
+
+/* With a tip, lift the ring and drop the text below it. */
+.octop-spin-nested-loading .octop-spin-show-text .octop-spin-dot {
+  margin-top: calc(var(--octop-spinner-size) / -2 - 12px) !important;
+}
+
+.octop-spin-nested-loading .octop-spin-show-text .octop-spin-text {
+  padding-top: calc(var(--octop-spinner-size) / 2 - 4px) !important;
+}
diff --git a/dashboard/src/utils/browserProfile.ts b/dashboard/src/utils/browserProfile.ts
index bb169db1..f771f3c7 100644
--- a/dashboard/src/utils/browserProfile.ts
+++ b/dashboard/src/utils/browserProfile.ts
@@ -1,22 +1,10 @@
 /**
- * Single source of truth for the harness browser profile identifier.
+ * Harness browser profile for one Octop user.
  *
- * All conversations currently map to one shared "default" profile so the
- * headed chat browser stays consistent with headless/standalone usage (instead
- * of spawning a per-conversation ``thr_*`` profile). The chat status bubble
- * and the chat browser panel must both derive the profile from here rather
- * than hardcoding "default" on independent paths.
+ * Shared across that user's agents and conversations. The backend also
+ * derives this from the authenticated user and ignores client-supplied names.
+ * A leftover on-disk ``default`` profile is not reused.
  */
-
-export const DEFAULT_BROWSER_PROFILE = "default";
-
-/**
- * Resolve the browser profile for a conversation.
- *
- * Currently always the shared default profile; the conversation id is accepted
- * (and ignored) so per-conversation profiles can be introduced later without
- * touching every caller.
- */
-export function resolveBrowserProfile(): string {
-  return DEFAULT_BROWSER_PROFILE;
+export function resolveBrowserProfile(userId?: number | null): string | null {
+  return userId == null || userId <= 0 ? null : `user-${userId}`;
 }
diff --git a/dashboard/src/utils/desktopChrome.test.ts b/dashboard/src/utils/desktopChrome.test.ts
index 69bafef2..0603e191 100644
--- a/dashboard/src/utils/desktopChrome.test.ts
+++ b/dashboard/src/utils/desktopChrome.test.ts
@@ -1,6 +1,10 @@
+import { readFileSync } from "node:fs";
+import { resolve } from "node:path";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import {
   applyDesktopChrome,
+  CHROME_END_PAD_ATTR,
+  chromeEndPadValue,
   emitDesktopWindowAction,
   installDesktopWindowDrag,
   isDesktopShell,
@@ -8,7 +12,10 @@ import {
   shouldArmDesktopDrag,
   titleRowEndPadding,
   WINDOW_CONTROLS_INSET,
+  WINDOW_CONTROLS_SPACER_ATTR,
+  windowControlsEndSpacerPx,
   DESKTOP_DRAG_REGION_CLASS,
+  DOCK_WINDOW_CONTROLS_PAD_PX,
 } from "./desktopChrome";
 
 describe("desktopChrome", () => {
@@ -49,13 +56,47 @@ describe("desktopChrome", () => {
     ).toBe("windows");
   });
 
-  it("reserves a trailing inset only for the title row", () => {
+  it("reserves a trailing inset for the title row and right-edge overlays", () => {
     expect(WINDOW_CONTROLS_INSET.mac).toBeGreaterThan(0);
     expect(WINDOW_CONTROLS_INSET.windows).toBeGreaterThan(
       WINDOW_CONTROLS_INSET.mac,
     );
     expect(titleRowEndPadding(32)).toContain("--window-controls-inset-end");
     expect(titleRowEndPadding(32)).toContain("32px");
+    expect(CHROME_END_PAD_ATTR).toBe("data-octop-chrome-end-pad");
+    expect(WINDOW_CONTROLS_SPACER_ATTR).toBe(
+      "data-octop-window-controls-spacer",
+    );
+    expect(chromeEndPadValue(12)).toContain("--window-controls-inset-end");
+    expect(chromeEndPadValue(12)).toContain("12px");
+    expect(windowControlsEndSpacerPx("mac", true)).toBe(
+      WINDOW_CONTROLS_INSET.mac,
+    );
+    expect(windowControlsEndSpacerPx("windows", true)).toBe(
+      WINDOW_CONTROLS_INSET.windows,
+    );
+    expect(windowControlsEndSpacerPx("mac", true, 12)).toBe(
+      WINDOW_CONTROLS_INSET.mac - 12,
+    );
+    expect(
+      windowControlsEndSpacerPx("mac", true, DOCK_WINDOW_CONTROLS_PAD_PX),
+    ).toBe(WINDOW_CONTROLS_INSET.mac - DOCK_WINDOW_CONTROLS_PAD_PX);
+    expect(windowControlsEndSpacerPx("windows", true, 12)).toBe(
+      WINDOW_CONTROLS_INSET.windows - 12,
+    );
+    expect(windowControlsEndSpacerPx("mac", false)).toBe(0);
+    expect(windowControlsEndSpacerPx(null, true)).toBe(0);
+  });
+
+  it("pads right-edge overlays away from frameless window controls", () => {
+    const css = readFileSync(
+      resolve(__dirname, "../styles/layout.css"),
+      "utf8",
+    );
+    expect(css).toContain("[data-octop-chrome-end-pad]");
+    expect(css).not.toContain("[data-dock-panel]");
+    expect(css).toContain(".octop-drawer-right");
+    expect(css).toMatch(/padding-inline-end:\s*max\(/);
   });
 
   it("exports a stable class for Wails title-bar dragging", () => {
diff --git a/dashboard/src/utils/desktopChrome.ts b/dashboard/src/utils/desktopChrome.ts
index d1333800..e4611504 100644
--- a/dashboard/src/utils/desktopChrome.ts
+++ b/dashboard/src/utils/desktopChrome.ts
@@ -12,6 +12,34 @@ export const WINDOW_CONTROLS_INSET: Record<DesktopChromeStyle, number> = {
   windows: 138,
 };
 
+/** Right-edge overlay chrome (dock toolbar, etc.) to keep clear of caption buttons. */
+export const CHROME_END_PAD_ATTR = "data-octop-chrome-end-pad";
+export const WINDOW_CONTROLS_SPACER_ATTR = "data-octop-window-controls-spacer";
+
+/**
+ * Dock toolbar already has 12px end padding. Subtract that plus 6px so the
+ * ⋮ / close group sits a few pixels closer to the caption buttons than the
+ * personalization title row.
+ */
+export const DOCK_WINDOW_CONTROLS_PAD_PX = 18;
+
+const INSET_VAR = "--window-controls-inset-end";
+
+/** Inline padding so CSS-module `padding` shorthands cannot clobber the inset. */
+export function chromeEndPadValue(minPx = 12): string {
+  return `max(${minPx}px, var(${INSET_VAR}, 0px))`;
+}
+
+/** Pixel width of a flex spacer that clears overlay caption buttons. */
+export function windowControlsEndSpacerPx(
+  chrome: DesktopChromeStyle | null,
+  panelTouchesWindowEnd: boolean,
+  existingEndPadPx = 0,
+): number {
+  if (!chrome || !panelTouchesWindowEnd) return 0;
+  return Math.max(0, WINDOW_CONTROLS_INSET[chrome] - existingEndPadPx);
+}
+
 /** Marks shell chrome that Wails should treat as a window-drag region. */
 export const DESKTOP_DRAG_REGION_CLASS = "octop-desktop-drag";
 export const DESKTOP_NO_DRAG_CLASS = "octop-desktop-no-drag";
@@ -20,8 +48,6 @@ export const DESKTOP_TITLEBAR_DRAG_HEIGHT = 32;
 const NO_DRAG_SELECTOR =
   'button, a, input, textarea, select, [role="button"], [role="menuitem"], [data-octop-no-drag], .octop-desktop-no-drag';
 
-const INSET_VAR = "--window-controls-inset-end";
-
 export function isDesktopShell(
   win: Pick<DesktopWindow, "_wails"> = window as DesktopWindow,
 ): boolean {
diff --git a/dashboard/src/utils/permissions.ts b/dashboard/src/utils/permissions.ts
index 6d6d9ece..2ce167c1 100644
--- a/dashboard/src/utils/permissions.ts
+++ b/dashboard/src/utils/permissions.ts
@@ -21,19 +21,11 @@ export const PERM = {
   desktop: ["desktop"],
   mobile: ["mobile"],
   usersPage: ["users", "sso"],
-  modelsPage: ["providers", "ollama_models", "onnx_models"],
+  modelsPage: ["providers", "ollama_models", "onnx_models", "voice", "search"],
   storage: ["storage_backends"],
   plugins: ["plugins"],
   securityPage: ["security", "admin_console"],
-  advancedPage: [
-    "voice",
-    "update",
-    "envs",
-    "tls",
-    "observability",
-    "backup",
-    "search",
-  ],
+  advancedPage: ["update", "envs", "tls", "observability", "backup"],
 } as const satisfies Record<string, readonly string[]>;
 
 /** Sidebar item key → permission keys. Shared with path guards. */
@@ -63,8 +55,6 @@ export const USERS_TAB_PERMISSIONS = {
 
 export const ADVANCED_TAB_PERMISSIONS = {
   "env-vars": "envs",
-  search: "search",
-  voice: "voice",
   observability: "observability",
   backup: "backup",
   https: "tls",
@@ -132,7 +122,11 @@ export function pathPermissionKeys(pathname: string): PermissionKeys | null {
   if (pathname.startsWith("/admin/users") || pathname === "/admin/sso") {
     return PERM.usersPage;
   }
-  if (pathname.startsWith("/admin/models") || pathname === "/models") {
+  if (
+    pathname.startsWith("/admin/models") ||
+    pathname === "/models" ||
+    pathname.startsWith("/admin/voice")
+  ) {
     return PERM.modelsPage;
   }
   if (pathname.startsWith("/admin/backend")) {
@@ -153,7 +147,6 @@ export function pathPermissionKeys(pathname: string): PermissionKeys | null {
   }
   if (
     pathname.startsWith("/admin/advanced") ||
-    pathname.startsWith("/admin/voice") ||
     pathname.startsWith("/admin/updates")
   ) {
     return PERM.advancedPage;
diff --git a/dashboard/src/utils/toolMediaBlocks.test.ts b/dashboard/src/utils/toolMediaBlocks.test.ts
index 368819b8..2596c4a7 100644
--- a/dashboard/src/utils/toolMediaBlocks.test.ts
+++ b/dashboard/src/utils/toolMediaBlocks.test.ts
@@ -93,6 +93,12 @@ describe("needsAuthBlobFetch", () => {
   it("requires auth for uploaded expert avatars", () => {
     expect(needsAuthBlobFetch("/api/agents/agt_1/avatar")).toBe(true);
     expect(needsAuthBlobFetch("/api/agents/agt_1/avatar?v=9")).toBe(true);
+    expect(needsAuthBlobFetch("/api/experts/published/pexp_1/avatar")).toBe(
+      true,
+    );
+    expect(needsAuthBlobFetch("/api/experts/published/pexp_1/avatar?v=9")).toBe(
+      true,
+    );
     expect(needsAuthBlobFetch("https://cdn.example.com/icon.png")).toBe(false);
   });
 });
diff --git a/dashboard/src/utils/toolMediaBlocks.ts b/dashboard/src/utils/toolMediaBlocks.ts
index aeecff7d..af979655 100644
--- a/dashboard/src/utils/toolMediaBlocks.ts
+++ b/dashboard/src/utils/toolMediaBlocks.ts
@@ -31,6 +31,7 @@ export function needsAuthBlobFetch(url: string): boolean {
     : url.split("?")[0];
   if (path === "/api/workspace/media") return true;
   if (/^\/api\/agents\/[^/]+\/avatar$/.test(path)) return true;
+  if (/^\/api\/experts\/published\/[^/]+\/avatar$/.test(path)) return true;
   if (/^\/api\/agents\/[^/]+\/media\/preview$/.test(path)) return true;
   if (/^\/api\/agents\/[^/]+\/workspace\/download$/.test(path)) return true;
   return false;
diff --git a/dashboard/vite.config.ts b/dashboard/vite.config.ts
index 55349a5b..c34d8fc5 100644
--- a/dashboard/vite.config.ts
+++ b/dashboard/vite.config.ts
@@ -315,6 +315,9 @@ export default defineConfig(({ mode }) => {
         "/api": {
           target: `http://127.0.0.1:${apiPort}`,
           changeOrigin: true,
+          // Preserve the browser-facing origin so OAuth callbacks do not point
+          // at the proxy target (127.0.0.1:8088).
+          xfwd: true,
           // Only proxy API websockets — do not steal Vite's HMR upgrade on `/`.
           ws: true,
         },
diff --git a/desktop/README.md b/desktop/README.md
index dfb93ea2..5f41dde7 100644
--- a/desktop/README.md
+++ b/desktop/README.md
@@ -38,12 +38,14 @@ the final native package:
 
 ```bash
 desktop/package-release.sh
-# Reuse an existing desktop/portable/release/Octop-<plat>.zip:
+# Reuse an existing desktop/portable/release/Octop-portable-<plat>-<version>.zip:
 desktop/package-release.sh darwin-arm64 --reuse-portable
 ```
 
 Wails requires native packaging, so all six variants are produced by the CI
 matrix on macOS, Linux, and Windows runners rather than cross-compiled locally.
+Windows packaging also needs [NSIS](https://nsis.sourceforge.io/) (`makensis`)
+so the `.exe` is an installer rather than a portable single-file binary.
 
 ## Build the Wails shell
 
@@ -56,8 +58,8 @@ go install github.com/wailsapp/wails/v3/cmd/wails3@v3.0.0-beta.13
 cd desktop/src
 go mod tidy
 wails3 build            # development binary under desktop/src/bin/
-wails3 task package ARCH=arm64 \
-  PORTABLE_ZIP=../portable/release/Octop-darwin-arm64.zip
+wails3 task package ARCH=arm64 VERSION=<version> \
+  PORTABLE_ZIP=../portable/release/Octop-portable-darwin-arm64-<version>.zip
 ```
 
 Dev against an already-running Octop (skips the bundled green zip):
@@ -71,11 +73,18 @@ Without `OCTOP_DESKTOP_URL`, first launch uses `~/.octop/portable/` if valid,
 otherwise extracts the matching zip shipped with the desktop package (embedded
 in the Windows and Linux binaries, under `Contents/Resources` on macOS). The
 Wails shell never downloads Octop. For local runtime debugging, set
-`OCTOP_DESKTOP_PORTABLE_ZIP=/absolute/path/Octop-<plat>.zip`.
+`OCTOP_DESKTOP_PORTABLE_ZIP=/absolute/path/Octop-portable-<plat>-<version>.zip`.
 
-Desktop outputs are native GUI packages: `Octop-Desktop-<plat>.dmg` (macOS),
-`Octop-Desktop-<plat>.exe` (Windows), and `Octop-Desktop-<plat>.tar` (Linux).
-The Linux tar contains only the GUI binary; it has no separate portable zip or
+GitHub Release names follow `Octop-<kind>-<os>-<arch>-<version>.<ext>`:
+
+- Desktop GUI: `Octop-desktop-<plat>-<version>.dmg` (macOS; open and drag
+  `Octop.app` into Applications), `.exe` (Windows NSIS installer — copies
+  into `Program Files\Octop` and creates Start Menu + desktop shortcuts),
+  `.tar.gz` (Linux)
+- Green runtime zip: `Octop-portable-<plat>-<version>.zip`
+- PyPI wheels stay `octop-<version>-py3-none-any.whl` (PEP 427)
+
+The Linux tar.gz contains only the GUI binary; it has no separate portable zip or
 server terminal process. Runtime upgrades remain owned by Octop:
 the shell sets `OCTOP_GREEN_PACKAGES`, so `octop update` upgrades the extracted
 `packages/` directory through Octop's existing `--target` logic.
diff --git a/desktop/package-release.sh b/desktop/package-release.sh
index 7d3e99ea..3d8e16d9 100755
--- a/desktop/package-release.sh
+++ b/desktop/package-release.sh
@@ -22,7 +22,7 @@ Platforms:
   windows-arm64 windows-amd64
 
 The platform defaults to the current native host. --reuse-portable skips
-rebuilding desktop/portable/release/Octop-<platform>.zip when it already exists.
+rebuilding desktop/portable/release/Octop-portable-<platform>-<version>.zip when it already exists.
 EOF
 }
 
@@ -59,9 +59,14 @@ if ! command -v wails3 >/dev/null 2>&1; then
   echo "wails3 is required: go install github.com/wailsapp/wails/v3/cmd/wails3@v3.0.0-beta.13" >&2
   exit 1
 fi
+if [[ "$plat" == windows-* ]] && ! command -v makensis >/dev/null 2>&1; then
+  echo "makensis is required for the Windows installer: choco install nsis" >&2
+  exit 1
+fi
 
 arch="${plat##*-}"
-portable_zip="${REPO_ROOT}/desktop/portable/release/Octop-${plat}.zip"
+ver="$(octop_version)"
+portable_zip="${REPO_ROOT}/desktop/portable/release/$(portable_zip_basename "$plat")"
 
 echo "[desktop-release] platform=${plat}"
 echo "[desktop-release] building Dashboard"
@@ -99,14 +104,10 @@ PYTHONNOUSERSITE=1 "$portable_python" \
 echo "[desktop-release] packaging Wails application"
 (
   cd "${REPO_ROOT}/desktop/src"
-  wails3 task package "ARCH=${arch}" "PORTABLE_ZIP=${portable_zip}"
+  wails3 task package "ARCH=${arch}" "PORTABLE_ZIP=${portable_zip}" "VERSION=${ver}"
 )
 
-case "$plat" in
-  darwin-*) output="${REPO_ROOT}/desktop/src/bin/Octop-Desktop-${plat}.dmg" ;;
-  windows-*) output="${REPO_ROOT}/desktop/src/bin/Octop-Desktop-${plat}.exe" ;;
-  linux-*) output="${REPO_ROOT}/desktop/src/bin/Octop-Desktop-${plat}.tar" ;;
-esac
+output="${REPO_ROOT}/desktop/src/bin/$(desktop_pkg_basename "$plat")"
 if [[ ! -s "$output" ]]; then
   echo "desktop release was not created: ${output}" >&2
   exit 1
diff --git a/desktop/portable/AGENT_ELECTRON_INTEGRATION.md b/desktop/portable/AGENT_ELECTRON_INTEGRATION.md
index 103f2ceb..2fdee543 100644
--- a/desktop/portable/AGENT_ELECTRON_INTEGRATION.md
+++ b/desktop/portable/AGENT_ELECTRON_INTEGRATION.md
@@ -9,7 +9,7 @@ path (no system Python, no `PYTHONPATH=packages`).
 CI / `make -f desktop/portable/Makefile green` produces:
 
 ```
-desktop/portable/release/Octop-<plat>.zip
+desktop/portable/release/Octop-portable-<plat>-<version>.zip
 ```
 
 Platforms: `darwin-arm64` `darwin-amd64` `linux-amd64` `linux-arm64`
diff --git a/desktop/portable/README.md b/desktop/portable/README.md
index b5027136..eb76aa6c 100644
--- a/desktop/portable/README.md
+++ b/desktop/portable/README.md
@@ -29,6 +29,8 @@ make -f desktop/portable/Makefile green
 
 ## 产物布局
 
+公开文件名：`Octop-portable-<plat>-<version>.zip`。zip 内目录仍是：
+
 ```
 Octop-<plat>/
   runtime/       # python-build-standalone
@@ -112,5 +114,5 @@ Actions 使用 GitHub 上游 PBS（`PBS_BASE_URL`），本机构建默认 npmmir
 
 ## Electron 壳
 
-壳只消费 `Octop-<plat>.zip`，不要把绿包编进 asar。步骤见
+壳只消费 `Octop-portable-<plat>-<version>.zip`（zip 内仍是 `Octop-<plat>/`），不要把绿包编进 asar。步骤见
 [`AGENT_ELECTRON_INTEGRATION.md`](AGENT_ELECTRON_INTEGRATION.md)。
diff --git a/desktop/portable/_common.sh b/desktop/portable/_common.sh
index 8106052f..8963b9fe 100644
--- a/desktop/portable/_common.sh
+++ b/desktop/portable/_common.sh
@@ -23,6 +23,33 @@ ALL_PLATS=(
   windows-arm64
 )
 
+# Public GitHub Release names: Octop-<kind>-<os>-<arch>-<version>.<ext>
+# Zip payload directory stays Octop-<plat>/ (the desktop unzip strips the first
+# path component). PyPI wheels keep the PEP 427 name and are not renamed here.
+octop_version() {
+  sed -nE 's/^version[[:space:]]*=[[:space:]]*"([^"]+)".*/\1/p' \
+    "${REPO_ROOT}/pyproject.toml" | head -1
+}
+
+portable_zip_basename() {
+  echo "Octop-portable-${1}-$(octop_version).zip"
+}
+
+desktop_pkg_basename() {
+  local plat="$1"
+  local ver
+  ver="$(octop_version)"
+  case "$plat" in
+    darwin-*) echo "Octop-desktop-${plat}-${ver}.dmg" ;;
+    windows-*) echo "Octop-desktop-${plat}-${ver}.exe" ;;
+    linux-*) echo "Octop-desktop-${plat}-${ver}.tar.gz" ;;
+    *)
+      echo "unknown platform: ${plat}" >&2
+      return 1
+      ;;
+  esac
+}
+
 # Map GitHub Actions RUNNER_ARCH (X64/ARM64/...) → green arch suffix.
 runner_arch_to_green() {
   case "$(printf '%s' "${1:-}" | tr '[:lower:]' '[:upper:]')" in
diff --git a/desktop/portable/package.sh b/desktop/portable/package.sh
index 190a6136..f78c9546 100755
--- a/desktop/portable/package.sh
+++ b/desktop/portable/package.sh
@@ -16,6 +16,8 @@
 #     packages/    site-packages (uv --target, relocatable)
 #     start.sh / start.bat
 #     README.txt
+#
+# Public filename is Octop-portable-<plat>-<version>.zip (see portable_zip_basename).
 set -euo pipefail
 
 REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
@@ -83,7 +85,7 @@ assemble_one() {
   local runtime="${GREEN_RUNTIMES}/${plat}"
   local wheel_dir="${GREEN_WHEELS}/${plat}"
   local staging="${GREEN_RELEASE}/Octop-${plat}"
-  local zip_path="${GREEN_RELEASE}/Octop-${plat}.zip"
+  local zip_path="${GREEN_RELEASE}/$(portable_zip_basename "$plat")"
   local pyplat
 
   if ! pyplat="$(uv_platform "$plat")"; then
@@ -254,10 +256,13 @@ assemble_one() {
 
   rm -f "$zip_path"
   echo "[package] ${plat}: zipping → ${zip_path}"
+  local zip_name zip_stem
+  zip_name="$(basename "$zip_path")"
+  zip_stem="${zip_name%.zip}"
   (
     cd "$GREEN_RELEASE"
     if command -v zip >/dev/null 2>&1; then
-      zip -qry "Octop-${plat}.zip" "Octop-${plat}"
+      zip -qry "$zip_name" "Octop-${plat}"
     else
       # Windows runners often have `python` but not `python3` / `zip`.
       py=""
@@ -270,7 +275,7 @@ assemble_one() {
         echo "[package] need zip or python to create archive" >&2
         exit 1
       fi
-      "$py" -c "import shutil; shutil.make_archive('Octop-${plat}', 'zip', '.', 'Octop-${plat}')"
+      "$py" -c "import shutil; shutil.make_archive('${zip_stem}', 'zip', '.', 'Octop-${plat}')"
     fi
   )
   echo "[package] wrote ${zip_path}"
diff --git a/desktop/portable/templates/launch.py b/desktop/portable/templates/launch.py
index 5e172cb8..60b25deb 100644
--- a/desktop/portable/templates/launch.py
+++ b/desktop/portable/templates/launch.py
@@ -4,8 +4,10 @@
 ``site.addsitedir`` loads those hooks. On Windows we also expose
 ``pywin32_system32`` DLLs so ``import pywintypes`` works.
 """
+
 from __future__ import annotations
 
+import contextlib
 import os
 import runpy
 import site
@@ -43,10 +45,8 @@ def _bootstrap() -> Path:
             # Python 3.8+: prefer explicit DLL search path.
             add_dll = getattr(os, "add_dll_directory", None)
             if add_dll is not None:
-                try:
+                with contextlib.suppress(OSError):
                     add_dll(dll_s)
-                except OSError:
-                    pass
     return root
 
 
diff --git a/desktop/portable/verify_imports.py b/desktop/portable/verify_imports.py
index f2c46f51..7f08cf8c 100755
--- a/desktop/portable/verify_imports.py
+++ b/desktop/portable/verify_imports.py
@@ -7,6 +7,7 @@
     --requirements desktop/portable/requirements-<plat>.txt \\
     [--overrides desktop/portable/overrides-<plat>.txt]
 """
+
 from __future__ import annotations
 
 import argparse
@@ -17,9 +18,7 @@
 import sys
 from pathlib import Path
 
-_REQ_RE = re.compile(
-    r"^(?P<name>[A-Za-z0-9][A-Za-z0-9._-]*)(?:\s*==\s*(?P<ver>[^\s;#]+))?"
-)
+_REQ_RE = re.compile(r"^(?P<name>[A-Za-z0-9][A-Za-z0-9._-]*)(?:\s*==\s*(?P<ver>[^\s;#]+))?")
 
 # Import names that have historically drifted across lock/install environments.
 _SMOKE_IMPORTS = (
diff --git a/desktop/src/.gitignore b/desktop/src/.gitignore
index 734c8808..c51fe70d 100644
--- a/desktop/src/.gitignore
+++ b/desktop/src/.gitignore
@@ -5,4 +5,7 @@ bundled/portable.zip
 build/windows/*.syso
 build/darwin/icons.icns
 build/windows/icon.ico
+build/windows/info.generated.json
+build/windows/wails.exe.generated.manifest
+build/windows/nsis/MicrosoftEdgeWebview2Setup.exe
 build/linux/icon.png
diff --git a/desktop/src/assets/index.html b/desktop/src/assets/index.html
index 455b2ab2..daf9d50d 100644
--- a/desktop/src/assets/index.html
+++ b/desktop/src/assets/index.html
@@ -16,6 +16,10 @@
       );
       if (new URLSearchParams(location.search).get("settings") === "1") {
         document.documentElement.dataset.mode = "settings";
+        document.documentElement.style.setProperty(
+          "--window-controls-inset-end",
+          "36px",
+        );
       }
     </script>
     <script type="module" src="/wails/runtime.js"></script>
@@ -87,6 +91,9 @@
       }
       html[data-mode="settings"] .wrap {
         max-width: none;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
         padding: 44px 20px 28px;
       }
       html[data-mode="settings"] #title {
@@ -97,6 +104,7 @@
       }
       html[data-mode="settings"] .actions {
         margin-top: 14px;
+        flex-shrink: 0;
       }
       .ctrl-mac {
         gap: 8px;
@@ -306,28 +314,29 @@
       }
       .loading {
         min-height: 100vh;
-        display: grid;
-        place-content: center;
-        justify-items: center;
-        text-align: center;
-        background:
-          radial-gradient(
-            1200px 420px at 50% 110%,
-            var(--brand-soft) 0%,
-            transparent 62%
-          ),
-          var(--bg-layout);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: var(--bg-layout);
         padding: 56px 24px 40px;
+        box-sizing: border-box;
       }
-      .loading-stage {
+      .loading-card {
         display: flex;
         flex-direction: column;
         align-items: center;
-        width: min(360px, 100%);
+        gap: 14px;
+        width: min(100%, 420px);
+        padding: 36px 32px 32px;
+        background: var(--bg-primary);
+        border: 1px solid var(--border);
+        border-radius: 14px;
+        box-shadow: 0 4px 24px rgba(0, 0, 0, 0.06);
+        text-align: center;
       }
       .loading img {
-        width: 148px;
-        aspect-ratio: 352 / 320;
+        width: 120px;
+        aspect-ratio: 1;
         height: auto;
         object-fit: contain;
         background: transparent;
@@ -342,54 +351,64 @@
         transform: scale(0.94);
       }
       .loading-brand {
-        margin: 10px 0 0;
-        font-size: 22px;
-        font-weight: 650;
-        letter-spacing: -0.03em;
+        margin: 0;
+        font-size: 17px;
+        font-weight: 600;
+        line-height: 1.4;
+        letter-spacing: -0.02em;
         color: var(--text-primary);
       }
-      .spinner {
-        width: 18px;
-        height: 18px;
-        margin-top: 18px;
-        border: 2px solid var(--brand-soft);
-        border-top-color: var(--brand);
-        border-radius: 50%;
-        animation: spin 0.8s linear infinite;
+      .loading-hint {
+        margin: 0;
+        font-size: 13px;
+        line-height: 1.6;
+        color: var(--text-tertiary);
+      }
+      .loading.is-error .loading-hint {
+        display: none;
+      }
+      .loading-footer {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        gap: 10px;
+        width: 100%;
+        margin-top: 4px;
+      }
+      .loading-bar {
+        width: 100%;
+        height: 4px;
+        overflow: hidden;
+        border-radius: 999px;
+        background: var(--brand-soft);
+      }
+      .loading-bar-fill {
+        display: block;
+        width: 36%;
+        height: 100%;
+        border-radius: 999px;
+        background: var(--brand);
+        animation: loading-slide 1.2s ease-in-out infinite;
       }
       .loading-status {
-        margin: 16px 0 0;
-        max-width: 28em;
-        padding: 10px 14px;
-        border-radius: 10px;
-        background: var(--bg-primary);
-        border: 1px solid var(--border);
-        box-shadow: var(--shadow);
+        margin: 0;
+        width: 100%;
         color: var(--text-secondary);
         font-size: 13px;
         line-height: 1.55;
       }
-      .loading.is-error .spinner {
+      .loading.is-error .loading-bar {
         display: none;
       }
       .loading.is-error .loading-status {
-        border-color: #fecaca;
-        background: #fef2f2;
         color: #991b1b;
       }
-      .loading-hint {
-        max-width: 280px;
-        margin: 10px 0 0;
-        color: var(--text-tertiary);
-        font-size: 12px;
-        line-height: 1.5;
-      }
-      .loading.is-error .loading-hint {
-        display: none;
-      }
-      @keyframes spin {
-        to {
-          transform: rotate(360deg);
+      @keyframes loading-slide {
+        0% {
+          transform: translateX(-120%);
+        }
+        100% {
+          transform: translateX(320%);
         }
       }
       .hidden {
@@ -465,7 +484,7 @@
     </div>
 
     <div class="loading" id="loading-panel">
-      <div class="loading-stage">
+      <div class="loading-card">
         <img
           id="mascot"
           src="/octop-mascot-peek.webp"
@@ -473,11 +492,15 @@
           draggable="false"
         />
         <p class="loading-brand" id="loading-brand">Octop</p>
-        <div class="spinner" aria-hidden="true"></div>
-        <p class="loading-status" id="status">正在启动，请稍候…</p>
         <p class="loading-hint" id="loading-hint">
           正在检查运行环境，可能需要几分钟。
         </p>
+        <div class="loading-footer">
+          <div class="loading-bar" role="progressbar" aria-hidden="true">
+            <span class="loading-bar-fill"></span>
+          </div>
+          <p class="loading-status" id="status">正在启动，请稍候…</p>
+        </div>
       </div>
     </div>
 
@@ -543,7 +566,7 @@ <h1 id="title">Octop 设置</h1>
 
       const copy = {
         zh: {
-          statusWait: "正在启动…",
+          statusWait: "正在启动，请稍候…",
           loadingHint: "正在检查运行环境，可能需要几分钟。",
           title: "Octop 设置",
           subtitle: "桌面端偏好",
@@ -563,7 +586,7 @@ <h1 id="title">Octop 设置</h1>
           winClose: "关闭",
         },
         en: {
-          statusWait: "Starting…",
+          statusWait: "Starting, please wait…",
           loadingHint: "Checking the runtime. This may take a few minutes.",
           title: "Octop Settings",
           subtitle: "Desktop preferences",
diff --git a/desktop/src/build/config.yml b/desktop/src/build/config.yml
index b328236e..0ded6e82 100644
--- a/desktop/src/build/config.yml
+++ b/desktop/src/build/config.yml
@@ -1,11 +1,13 @@
 # This file contains the configuration for this project.
 # When you update `info`, run `wails3 task common:update:build-assets` to refresh generated assets.
+# `info.version` is a fallback for local `wails3 generate`; release packaging stamps
+# pyproject.toml's version onto the .app / exe / NSIS metadata.
 version: "3"
 
 info:
   companyName: "Octop"
   productName: "Octop"
-  productIdentifier: "com.octop.desktop"
+  productIdentifier: "com.tencent.octop"
   description: "Octop desktop shell"
   copyright: "(c) 2026, Octop"
   comments: "Wails v3 + green portable"
diff --git a/desktop/src/build/darwin/Info.dev.plist b/desktop/src/build/darwin/Info.dev.plist
index 1b2364b5..15853910 100644
--- a/desktop/src/build/darwin/Info.dev.plist
+++ b/desktop/src/build/darwin/Info.dev.plist
@@ -9,7 +9,7 @@
         <key>CFBundleExecutable</key>
         <string>Octop</string>
         <key>CFBundleIdentifier</key>
-        <string>com.octop.desktop</string>
+        <string>com.tencent.octop</string>
         <key>CFBundleVersion</key>
         <string>0.9.26.dev</string>
         <key>CFBundleGetInfoString</key>
diff --git a/desktop/src/build/darwin/Info.plist b/desktop/src/build/darwin/Info.plist
index 8a5ceba3..5da447cb 100644
--- a/desktop/src/build/darwin/Info.plist
+++ b/desktop/src/build/darwin/Info.plist
@@ -9,7 +9,7 @@
         <key>CFBundleExecutable</key>
         <string>Octop</string>
         <key>CFBundleIdentifier</key>
-        <string>com.octop.desktop</string>
+        <string>com.tencent.octop</string>
         <key>CFBundleVersion</key>
         <string>0.9.26</string>
         <key>CFBundleGetInfoString</key>
diff --git a/desktop/src/build/darwin/Taskfile.yml b/desktop/src/build/darwin/Taskfile.yml
index 8810ad0f..a9d69adb 100644
--- a/desktop/src/build/darwin/Taskfile.yml
+++ b/desktop/src/build/darwin/Taskfile.yml
@@ -26,23 +26,111 @@ tasks:
       PRODUCTION: '{{.PRODUCTION | default "false"}}'
 
   package:
-    summary: Packages a production .app into an uncompressed DMG
+    summary: Packages a production .app into a drag-to-Applications DMG
     deps:
       - task: build
         vars:
           PRODUCTION: "true"
     cmds:
       - task: create:app:bundle
-      - rm -rf {{.DMG_ROOT}} {{.ARCHIVE}} {{.BIN_DIR}}/{{.APP_NAME}}-Desktop-darwin-{{.ARCH}}.zip
-      - mkdir -p {{.DMG_ROOT}}
-      - ditto {{.BIN_DIR}}/{{.APP_NAME}}.app {{.DMG_ROOT}}/{{.APP_NAME}}.app
-      - hdiutil create -volname {{.APP_NAME}} -srcfolder {{.DMG_ROOT}} -ov -format UDRO {{.ARCHIVE}}
-      - rm -rf {{.DMG_ROOT}}
+        vars:
+          PORTABLE_ZIP: "{{.PORTABLE_ZIP}}"
+          ARCH: "{{.ARCH}}"
+          VERSION: "{{.VERSION}}"
+      - rm -f {{.ARCHIVE}} {{.BIN_DIR}}/{{.APP_NAME}}-Desktop-darwin-{{.ARCH}}.zip {{.BIN_DIR}}/{{.APP_NAME}}-Desktop-darwin-{{.ARCH}}.dmg
+      - |
+        set -euo pipefail
+        app_path="{{.BIN_DIR}}/{{.APP_NAME}}.app"
+        output="{{.ARCHIVE}}"
+        volname="{{.APP_NAME}}"
+        app_name="{{.APP_NAME}}.app"
+        work="$(mktemp -d "${TMPDIR:-/tmp}/octop-dmg.XXXXXX")"
+        staging="${work}/root"
+        rw_dmg="${work}/rw.dmg"
+        device=""
+        # hdiutil detach exits 16 while the volume is still busy (Spotlight, Finder).
+        detach_device() {
+          local dev="$1" i
+          for i in 1 2 3 4 5; do
+            if hdiutil detach "$dev" -quiet >/dev/null 2>&1; then
+              return 0
+            fi
+            sleep 3
+          done
+          hdiutil detach "$dev" -force -quiet >/dev/null 2>&1
+        }
+        cleanup() {
+          if [[ -n "$device" ]]; then
+            detach_device "$device" || true
+          fi
+          rm -rf "$work"
+        }
+        trap cleanup EXIT
+        mkdir -p "${staging}/.background"
+        ditto "$app_path" "${staging}/${app_name}"
+        ln -s /Applications "${staging}/Applications"
+        # Finder renders a background picture at its DPI-derived point size, so
+        # 1200x800 @144dpi lands exactly on the 600x400pt container window.
+        sips -s format png -z 800 1200 -s dpiWidth 144 -s dpiHeight 144 \
+          build/darwin/dmg-background.jpeg --out "${staging}/.background/background.png" >/dev/null
+        if [[ -d "/Volumes/${volname}" ]]; then
+          hdiutil detach "/Volumes/${volname}" -quiet >/dev/null 2>&1 || \
+            hdiutil detach "/Volumes/${volname}" -force -quiet >/dev/null 2>&1 || true
+        fi
+        hdiutil create -volname "$volname" -srcfolder "$staging" -ov -format UDRW "$rw_dmg" >/dev/null
+        attach_out="$(hdiutil attach -readwrite -noverify -noautoopen "$rw_dmg" || true)"
+        device="$(awk '/^\/dev\// { print $1; exit }' <<<"$attach_out")"
+        mount_point="$(awk -F'\t' '/\/Volumes\// { print $NF; exit }' <<<"$attach_out")"
+        if [[ -z "$device" || ! -d "$mount_point" ]]; then
+          echo "warning: could not mount writable DMG; writing a plain image" >&2
+          hdiutil create -volname "$volname" -srcfolder "$staging" -ov -format UDRO "$output"
+          exit 0
+        fi
+        osascript - "$volname" "$app_name" <<'APPLESCRIPT' || \
+          echo "warning: could not set Finder icon layout; Applications drop link is still present" >&2
+        on run argv
+          set volName to item 1 of argv
+          set appName to item 2 of argv
+          tell application "Finder"
+            tell disk volName
+              open
+              set current view of container window to icon view
+              set toolbar visible of container window to false
+              set statusbar visible of container window to false
+              set the bounds of container window to {200, 120, 800, 552}
+              set viewOptions to the icon view options of container window
+              set arrangement of viewOptions to not arranged
+              set icon size of viewOptions to 128
+              try
+                set background picture of viewOptions to file ".background:background.png"
+              end try
+              set position of item appName of container window to {154, 237}
+              set position of item "Applications" of container window to {454, 237}
+              close
+              open
+              update without registering applications
+              delay 1
+            end tell
+          end tell
+        end run
+        APPLESCRIPT
+        sync
+        if ! detach_device "$device"; then
+          echo "warning: could not detach ${device}; writing a plain image" >&2
+          device=""
+          hdiutil create -volname "$volname" -srcfolder "$staging" -ov -format UDRO "$output" >/dev/null
+          test -s "$output"
+          exit 0
+        fi
+        device=""
+        rm -f "$output"
+        hdiutil convert "$rw_dmg" -ov -format UDRO -o "$output" >/dev/null
+        test -s "$output"
     vars:
       ARCH: "{{.ARCH | default ARCH}}"
-      PORTABLE_ZIP: '{{.PORTABLE_ZIP | default (printf "../portable/release/Octop-darwin-%s.zip" .ARCH)}}'
-      DMG_ROOT: '{{.BIN_DIR}}/dmg-darwin-{{.ARCH}}'
-      ARCHIVE: '{{.BIN_DIR}}/{{.APP_NAME}}-Desktop-darwin-{{.ARCH}}.dmg'
+      VERSION: '{{.VERSION | default "dev"}}'
+      PORTABLE_ZIP: '{{.PORTABLE_ZIP | default (printf "../portable/release/Octop-portable-darwin-%s-%s.zip" .ARCH .VERSION)}}'
+      ARCHIVE: '{{.BIN_DIR}}/{{.APP_NAME}}-desktop-darwin-{{.ARCH}}-{{.VERSION}}.dmg'
 
   create:app:bundle:
     summary: Creates an .app bundle
@@ -50,10 +138,14 @@ tasks:
       - test -f {{.PORTABLE_ZIP}}
       - mkdir -p {{.BIN_DIR}}/{{.APP_NAME}}.app/Contents/{MacOS,Resources}
       - cp build/darwin/icons.icns {{.BIN_DIR}}/{{.APP_NAME}}.app/Contents/Resources
-      - cp {{.PORTABLE_ZIP}} {{.BIN_DIR}}/{{.APP_NAME}}.app/Contents/Resources/
+      # Stable name inside the signed .app; GitHub Release uses the versioned portable zip.
+      - cp {{.PORTABLE_ZIP}} {{.BIN_DIR}}/{{.APP_NAME}}.app/Contents/Resources/Octop-darwin-{{.ARCH}}.zip
       - cp {{.BIN_DIR}}/{{.APP_NAME}} {{.BIN_DIR}}/{{.APP_NAME}}.app/Contents/MacOS
       - cp build/darwin/Info.plist {{.BIN_DIR}}/{{.APP_NAME}}.app/Contents
+      - python3 build/stamp_version.py plist {{.BIN_DIR}}/{{.APP_NAME}}.app/Contents/Info.plist "{{.VERSION}}"
       - codesign --force --deep --sign - {{.BIN_DIR}}/{{.APP_NAME}}.app
+    vars:
+      VERSION: '{{.VERSION | default "dev"}}'
 
   run:
     cmds:
diff --git a/desktop/src/build/darwin/dmg-background.jpeg b/desktop/src/build/darwin/dmg-background.jpeg
new file mode 100644
index 00000000..7159d428
Binary files /dev/null and b/desktop/src/build/darwin/dmg-background.jpeg differ
diff --git a/desktop/src/build/linux/Taskfile.yml b/desktop/src/build/linux/Taskfile.yml
index b320de20..f3369d7f 100644
--- a/desktop/src/build/linux/Taskfile.yml
+++ b/desktop/src/build/linux/Taskfile.yml
@@ -30,11 +30,12 @@ tasks:
         vars:
           PRODUCTION: "true"
       - rm -f {{.ARCHIVE}} bundled/portable.zip
-      - tar -C {{.BIN_DIR}} -cf {{.ARCHIVE}} {{.APP_NAME}}
+      - tar -C {{.BIN_DIR}} -czf {{.ARCHIVE}} {{.APP_NAME}}
     vars:
       ARCH: "{{.ARCH | default ARCH}}"
-      PORTABLE_ZIP: '{{.PORTABLE_ZIP | default (printf "../portable/release/Octop-linux-%s.zip" .ARCH)}}'
-      ARCHIVE: '{{.BIN_DIR}}/{{.APP_NAME}}-Desktop-linux-{{.ARCH}}.tar'
+      VERSION: '{{.VERSION | default "dev"}}'
+      PORTABLE_ZIP: '{{.PORTABLE_ZIP | default (printf "../portable/release/Octop-portable-linux-%s-%s.zip" .ARCH .VERSION)}}'
+      ARCHIVE: '{{.BIN_DIR}}/{{.APP_NAME}}-desktop-linux-{{.ARCH}}-{{.VERSION}}.tar.gz'
 
   stage:portable:
     summary: Copies the matching green zip for go:embed
@@ -43,7 +44,7 @@ tasks:
       - mkdir -p bundled
       - cp {{.PORTABLE_ZIP}} bundled/portable.zip
     vars:
-      PORTABLE_ZIP: '{{.PORTABLE_ZIP | default (printf "../portable/release/Octop-linux-%s.zip" (.ARCH | default ARCH))}}'
+      PORTABLE_ZIP: '{{.PORTABLE_ZIP | default (printf "../portable/release/Octop-portable-linux-%s-%s.zip" (.ARCH | default ARCH) (.VERSION | default "dev"))}}'
 
   run:
     cmds:
diff --git a/desktop/src/build/stamp_version.py b/desktop/src/build/stamp_version.py
new file mode 100644
index 00000000..8f0f1cf0
--- /dev/null
+++ b/desktop/src/build/stamp_version.py
@@ -0,0 +1,101 @@
+#!/usr/bin/env python3
+"""Stamp the Octop version into Wails desktop metadata copies."""
+
+from __future__ import annotations
+
+import argparse
+import json
+import plistlib
+import re
+import shutil
+import sys
+from pathlib import Path
+
+_MANIFEST_IDENTITY = re.compile(
+    r'(<assemblyIdentity\b[^>]*\bname="com\.tencent\.octop"[^>]*\bversion=")[^"]+(")',
+    re.IGNORECASE,
+)
+
+
+def should_stamp(version: str) -> bool:
+    """Skip placeholders that are not a product version (NSIS needs x.y.z)."""
+    return bool(version) and version != "dev"
+
+
+def four_part_version(version: str) -> str | None:
+    """Windows assemblyIdentity requires four numeric components."""
+    parts = version.split(".")
+    if not parts or not all(p.isdigit() for p in parts):
+        return None
+    while len(parts) < 4:
+        parts.append("0")
+    return ".".join(parts[:4])
+
+
+def stamp_plist(path: Path, version: str) -> None:
+    if not should_stamp(version):
+        return
+    data = plistlib.loads(path.read_bytes())
+    data["CFBundleVersion"] = version
+    data["CFBundleShortVersionString"] = version
+    path.write_bytes(plistlib.dumps(data))
+
+
+def stamp_info_json(src: Path, dest: Path, version: str) -> None:
+    dest.parent.mkdir(parents=True, exist_ok=True)
+    if src.resolve() != dest.resolve():
+        shutil.copyfile(src, dest)
+    if not should_stamp(version):
+        return
+    data = json.loads(dest.read_text(encoding="utf-8"))
+    data["fixed"]["file_version"] = version
+    data["info"]["0000"]["ProductVersion"] = version
+    dest.write_text(json.dumps(data, indent=4) + "\n", encoding="utf-8")
+
+
+def stamp_manifest(src: Path, dest: Path, version: str) -> None:
+    dest.parent.mkdir(parents=True, exist_ok=True)
+    if src.resolve() != dest.resolve():
+        shutil.copyfile(src, dest)
+    if not should_stamp(version):
+        return
+    dotted = four_part_version(version)
+    if dotted is None:
+        return
+    text = dest.read_text(encoding="utf-8")
+    updated, n = _MANIFEST_IDENTITY.subn(rf"\g<1>{dotted}\2", text, count=1)
+    if n != 1:
+        raise SystemExit(f"octop assemblyIdentity not found in {dest}")
+    dest.write_text(updated, encoding="utf-8")
+
+
+def main(argv: list[str] | None = None) -> int:
+    parser = argparse.ArgumentParser(description=__doc__)
+    sub = parser.add_subparsers(dest="cmd", required=True)
+
+    plist_p = sub.add_parser("plist", help="Set CFBundleVersion keys on a copied Info.plist")
+    plist_p.add_argument("path", type=Path)
+    plist_p.add_argument("version")
+
+    json_p = sub.add_parser("json", help="Copy windows/info.json and set file/product version")
+    json_p.add_argument("src", type=Path)
+    json_p.add_argument("dest", type=Path)
+    json_p.add_argument("version")
+
+    man_p = sub.add_parser("manifest", help="Copy wails.exe.manifest and set assembly version")
+    man_p.add_argument("src", type=Path)
+    man_p.add_argument("dest", type=Path)
+    man_p.add_argument("version")
+
+    args = parser.parse_args(argv)
+    if args.cmd == "plist":
+        stamp_plist(args.path, args.version)
+    elif args.cmd == "json":
+        stamp_info_json(args.src, args.dest, args.version)
+    else:
+        stamp_manifest(args.src, args.dest, args.version)
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/desktop/src/build/windows/Taskfile.yml b/desktop/src/build/windows/Taskfile.yml
index 47aec85f..64a562c4 100644
--- a/desktop/src/build/windows/Taskfile.yml
+++ b/desktop/src/build/windows/Taskfile.yml
@@ -14,6 +14,7 @@ tasks:
       - task: generate:syso
         vars:
           ARCH: "{{.ARCH}}"
+          VERSION: "{{.VERSION}}"
       - go build {{.BUILD_FLAGS}} -o "{{.BIN_DIR}}/{{.APP_NAME}}.exe"
       - cmd: powershell Remove-item *.syso
         platforms: [windows]
@@ -21,6 +22,7 @@ tasks:
         platforms: [linux, darwin]
     vars:
       BUILD_FLAGS: '{{if eq .PRODUCTION "true"}}-tags production -trimpath -buildvcs=false -ldflags="-w -s -H windowsgui"{{else}}-buildvcs=false -gcflags=all="-l"{{end}}'
+      VERSION: '{{.VERSION | default "dev"}}'
     env:
       GOOS: windows
       CGO_ENABLED: "0"
@@ -36,10 +38,10 @@ tasks:
           New-Item -ItemType Directory -Force bundled | Out-Null;
           Copy-Item -Force '{{.PORTABLE_ZIP}}' 'bundled/portable.zip'"
     vars:
-      PORTABLE_ZIP: '{{.PORTABLE_ZIP | default (printf "../portable/release/Octop-windows-%s.zip" (.ARCH | default ARCH))}}'
+      PORTABLE_ZIP: '{{.PORTABLE_ZIP | default (printf "../portable/release/Octop-portable-windows-%s-%s.zip" (.ARCH | default ARCH) (.VERSION | default "dev"))}}'
 
   package:
-    summary: Packages a single production exe with the portable runtime embedded
+    summary: Packages an NSIS installer with the portable runtime embedded
     cmds:
       - task: stage:portable
         vars:
@@ -49,17 +51,47 @@ tasks:
         vars:
           PRODUCTION: "true"
           ARCH: "{{.ARCH}}"
+          VERSION: "{{.VERSION}}"
+      - task: create:nsis:installer
+        vars:
+          ARCH: "{{.ARCH}}"
+          VERSION: "{{.VERSION}}"
       - cmd: >-
           powershell -NoProfile -Command
-          "Remove-Item -Force '{{.ARCHIVE}}' -ErrorAction SilentlyContinue;
-          Remove-Item -Force '{{.BIN_DIR}}/{{.APP_NAME}}-Desktop-windows-{{.ARCH}}.zip' -ErrorAction SilentlyContinue;
+          "Remove-Item -Force '{{.BIN_DIR}}/{{.APP_NAME}}-Desktop-windows-{{.ARCH}}.zip' -ErrorAction SilentlyContinue;
+          Remove-Item -Force '{{.BIN_DIR}}/{{.APP_NAME}}-Desktop-windows-{{.ARCH}}.exe' -ErrorAction SilentlyContinue;
           Remove-Item -Recurse -Force '{{.BIN_DIR}}/{{.APP_NAME}}-Desktop-windows-{{.ARCH}}' -ErrorAction SilentlyContinue;
-          Copy-Item '{{.BIN_DIR}}/{{.APP_NAME}}.exe' '{{.ARCHIVE}}';
           Remove-Item -Force 'bundled/portable.zip' -ErrorAction SilentlyContinue"
     vars:
       ARCH: "{{.ARCH | default ARCH}}"
-      PORTABLE_ZIP: '{{.PORTABLE_ZIP | default (printf "../portable/release/Octop-windows-%s.zip" .ARCH)}}'
-      ARCHIVE: '{{.BIN_DIR}}/{{.APP_NAME}}-Desktop-windows-{{.ARCH}}.exe'
+      VERSION: '{{.VERSION | default "dev"}}'
+      PORTABLE_ZIP: '{{.PORTABLE_ZIP | default (printf "../portable/release/Octop-portable-windows-%s-%s.zip" .ARCH .VERSION)}}'
+      ARCHIVE: '{{.BIN_DIR}}/{{.APP_NAME}}-desktop-windows-{{.ARCH}}-{{.VERSION}}.exe'
+
+  create:nsis:installer:
+    summary: Wraps Octop.exe in an NSIS installer (Program Files + shortcuts)
+    dir: build/windows/nsis
+    preconditions:
+      - sh: makensis -VERSION
+        msg: "makensis is required. Install NSIS (choco install nsis) and ensure it is on PATH."
+    cmds:
+      - wails3 generate webview2bootstrapper -dir "{{.ROOT_DIR}}/build/windows/nsis"
+      - cmd: >-
+          powershell -NoProfile -Command
+          "Remove-Item -Force '{{.ROOT_DIR}}/{{.ARCHIVE}}' -ErrorAction SilentlyContinue;
+          New-Item -ItemType Directory -Force '{{.ROOT_DIR}}/{{.BIN_DIR}}' | Out-Null"
+      - |
+        {{if eq OS "windows"}}
+        makensis {{.VERSION_NSIS_DEFINE}}-DARG_WAILS_{{.ARG_FLAG}}_BINARY="{{.ROOT_DIR}}\{{.BIN_DIR}}\{{.APP_NAME}}.exe" -DINSTALLER_OUTFILE="{{.ROOT_DIR}}\{{.ARCHIVE}}" project.nsi
+        {{else}}
+        makensis {{.VERSION_NSIS_DEFINE}}-DARG_WAILS_{{.ARG_FLAG}}_BINARY="{{.ROOT_DIR}}/{{.BIN_DIR}}/{{.APP_NAME}}.exe" -DINSTALLER_OUTFILE="{{.ROOT_DIR}}/{{.ARCHIVE}}" project.nsi
+        {{end}}
+    vars:
+      ARCH: '{{.ARCH | default ARCH}}'
+      VERSION: '{{.VERSION | default "dev"}}'
+      VERSION_NSIS_DEFINE: '{{if and .VERSION (ne .VERSION "dev")}}-DINFO_PRODUCTVERSION="{{.VERSION}}" {{end}}'
+      ARG_FLAG: '{{if eq (.ARCH | default ARCH) "amd64"}}AMD64{{else}}ARM64{{end}}'
+      ARCHIVE: '{{.BIN_DIR}}/{{.APP_NAME}}-desktop-windows-{{.ARCH}}-{{.VERSION}}.exe'
 
   run:
     cmds:
@@ -69,6 +101,15 @@ tasks:
     summary: Generates Windows .syso (linked from module root)
     dir: build
     cmds:
-      - wails3 generate syso -arch {{.ARCH}} -icon windows/icon.ico -manifest windows/wails.exe.manifest -info windows/info.json -out ../wails_windows_{{.ARCH}}.syso
+      - cmd: python stamp_version.py json windows/info.json windows/info.generated.json "{{.VERSION}}"
+        platforms: [windows]
+      - cmd: python3 stamp_version.py json windows/info.json windows/info.generated.json "{{.VERSION}}"
+        platforms: [linux, darwin]
+      - cmd: python stamp_version.py manifest windows/wails.exe.manifest windows/wails.exe.generated.manifest "{{.VERSION}}"
+        platforms: [windows]
+      - cmd: python3 stamp_version.py manifest windows/wails.exe.manifest windows/wails.exe.generated.manifest "{{.VERSION}}"
+        platforms: [linux, darwin]
+      - wails3 generate syso -arch {{.ARCH}} -icon windows/icon.ico -manifest windows/wails.exe.generated.manifest -info windows/info.generated.json -out ../wails_windows_{{.ARCH}}.syso
     vars:
       ARCH: "{{.ARCH | default ARCH}}"
+      VERSION: '{{.VERSION | default "dev"}}'
diff --git a/desktop/src/build/windows/nsis/project.nsi b/desktop/src/build/windows/nsis/project.nsi
new file mode 100644
index 00000000..7b36b862
--- /dev/null
+++ b/desktop/src/build/windows/nsis/project.nsi
@@ -0,0 +1,95 @@
+Unicode true
+
+# Octop desktop NSIS installer.
+# Built by `wails3 task package` on a Windows runner:
+#   makensis -DARG_WAILS_AMD64_BINARY=..\..\..\bin\Octop.exe project.nsi
+#   makensis -DARG_WAILS_ARM64_BINARY=..\..\..\bin\Octop.exe project.nsi
+
+!include "wails_tools.nsh"
+
+SetCompressor /SOLID lzma
+
+# The version information for this two must consist of 4 parts
+VIProductVersion "${INFO_PRODUCTVERSION}.0"
+VIFileVersion    "${INFO_PRODUCTVERSION}.0"
+
+VIAddVersionKey "CompanyName"     "${INFO_COMPANYNAME}"
+VIAddVersionKey "FileDescription" "${INFO_PRODUCTNAME} Installer"
+VIAddVersionKey "ProductVersion"  "${INFO_PRODUCTVERSION}"
+VIAddVersionKey "FileVersion"     "${INFO_PRODUCTVERSION}"
+VIAddVersionKey "LegalCopyright"  "${INFO_COPYRIGHT}"
+VIAddVersionKey "ProductName"     "${INFO_PRODUCTNAME}"
+
+ManifestDPIAware true
+
+!include "MUI.nsh"
+
+!define MUI_ICON "..\icon.ico"
+!define MUI_UNICON "..\icon.ico"
+!define MUI_FINISHPAGE_NOAUTOCLOSE
+!define MUI_ABORTWARNING
+!define MUI_FINISHPAGE_RUN "$INSTDIR\${PRODUCT_EXECUTABLE}"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_INSTFILES
+
+!insertmacro MUI_LANGUAGE "SimpChinese"
+!insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_RESERVEFILE_LANGDLL
+
+Name "${INFO_PRODUCTNAME}"
+!ifndef INSTALLER_OUTFILE
+    !define INSTALLER_OUTFILE "..\..\..\bin\${INFO_PROJECTNAME}-desktop-windows-${ARCH}-${INFO_PRODUCTVERSION}.exe"
+!endif
+OutFile "${INSTALLER_OUTFILE}"
+!if "${WAILS_INSTALL_SCOPE}" == "user"
+    InstallDir "$LOCALAPPDATA\Programs\${INFO_PRODUCTNAME}"
+!else
+    InstallDir "$PROGRAMFILES64\${INFO_PRODUCTNAME}"
+!endif
+ShowInstDetails show
+
+Function .onInit
+    IfSilent skipLang
+    !insertmacro MUI_LANGDLL_DISPLAY
+    skipLang:
+    !insertmacro wails.checkArchitecture
+FunctionEnd
+
+Section
+    !insertmacro wails.setShellContext
+
+    !insertmacro wails.webview2runtime
+
+    SetOutPath $INSTDIR
+
+    !insertmacro wails.files
+
+    CreateShortcut "$SMPROGRAMS\${INFO_PRODUCTNAME}.lnk" "$INSTDIR\${PRODUCT_EXECUTABLE}"
+    CreateShortcut "$DESKTOP\${INFO_PRODUCTNAME}.lnk" "$INSTDIR\${PRODUCT_EXECUTABLE}"
+
+    !insertmacro wails.associateFiles
+    !insertmacro wails.associateCustomProtocols
+
+    !insertmacro wails.writeUninstaller
+SectionEnd
+
+Section "uninstall"
+    !insertmacro wails.setShellContext
+
+    RMDir /r "$AppData\${PRODUCT_EXECUTABLE}"
+
+    RMDir /r $INSTDIR
+
+    Delete "$SMPROGRAMS\${INFO_PRODUCTNAME}.lnk"
+    Delete "$DESKTOP\${INFO_PRODUCTNAME}.lnk"
+
+    !insertmacro wails.unassociateFiles
+    !insertmacro wails.unassociateCustomProtocols
+
+    !insertmacro wails.deleteUninstaller
+SectionEnd
diff --git a/desktop/src/build/windows/nsis/wails_tools.nsh b/desktop/src/build/windows/nsis/wails_tools.nsh
new file mode 100644
index 00000000..5212bfaf
--- /dev/null
+++ b/desktop/src/build/windows/nsis/wails_tools.nsh
@@ -0,0 +1,220 @@
+# Shared NSIS helpers for the Octop desktop installer.
+# INFO_PRODUCTVERSION fallback for a local makensis without -D.
+# Release packaging passes -DINFO_PRODUCTVERSION from pyproject.toml.
+
+!include "x64.nsh"
+!include "WinVer.nsh"
+!include "FileFunc.nsh"
+
+!ifndef INFO_PROJECTNAME
+    !define INFO_PROJECTNAME "Octop"
+!endif
+!ifndef INFO_COMPANYNAME
+    !define INFO_COMPANYNAME "Octop"
+!endif
+!ifndef INFO_PRODUCTNAME
+    !define INFO_PRODUCTNAME "Octop"
+!endif
+!ifndef INFO_PRODUCTVERSION
+    !define INFO_PRODUCTVERSION "0.9.31"
+!endif
+!ifndef INFO_COPYRIGHT
+    !define INFO_COPYRIGHT "(c) 2026, Octop"
+!endif
+!ifndef PRODUCT_EXECUTABLE
+    !define PRODUCT_EXECUTABLE "${INFO_PROJECTNAME}.exe"
+!endif
+!ifndef UNINST_KEY_NAME
+    !define UNINST_KEY_NAME "${INFO_COMPANYNAME}${INFO_PRODUCTNAME}"
+!endif
+!define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINST_KEY_NAME}"
+
+!ifndef WAILS_INSTALL_SCOPE
+    !define WAILS_INSTALL_SCOPE "machine"
+!endif
+
+!ifndef REQUEST_EXECUTION_LEVEL
+    !if "${WAILS_INSTALL_SCOPE}" == "user"
+        !define REQUEST_EXECUTION_LEVEL "user"
+    !else
+        !define REQUEST_EXECUTION_LEVEL "admin"
+    !endif
+!endif
+
+RequestExecutionLevel "${REQUEST_EXECUTION_LEVEL}"
+
+!ifdef ARG_WAILS_AMD64_BINARY
+    !define SUPPORTS_AMD64
+!endif
+
+!ifdef ARG_WAILS_ARM64_BINARY
+    !define SUPPORTS_ARM64
+!endif
+
+!ifdef SUPPORTS_AMD64
+    !ifdef SUPPORTS_ARM64
+        !define ARCH "amd64_arm64"
+    !else
+        !define ARCH "amd64"
+    !endif
+!else
+    !ifdef SUPPORTS_ARM64
+        !define ARCH "arm64"
+    !else
+        !error "Undefined ARCH, please provide ARG_WAILS_AMD64_BINARY or ARG_WAILS_ARM64_BINARY"
+    !endif
+!endif
+
+!macro wails.checkArchitecture
+    !ifndef WAILS_WIN10_REQUIRED
+        !define WAILS_WIN10_REQUIRED "This product is only supported on Windows 10 (Server 2016) and later."
+    !endif
+
+    !ifndef WAILS_ARCHITECTURE_NOT_SUPPORTED
+        !define WAILS_ARCHITECTURE_NOT_SUPPORTED "This product can't be installed on the current Windows architecture. Supports: ${ARCH}"
+    !endif
+
+    ${If} ${AtLeastWin10}
+        !ifdef SUPPORTS_AMD64
+            ${if} ${IsNativeAMD64}
+                Goto ok
+            ${EndIf}
+        !endif
+
+        !ifdef SUPPORTS_ARM64
+            ${if} ${IsNativeARM64}
+                Goto ok
+            ${EndIf}
+        !endif
+
+        IfSilent silentArch notSilentArch
+        silentArch:
+            SetErrorLevel 65
+            Abort
+        notSilentArch:
+            MessageBox MB_OK "${WAILS_ARCHITECTURE_NOT_SUPPORTED}"
+            Quit
+    ${else}
+        IfSilent silentWin notSilentWin
+        silentWin:
+            SetErrorLevel 64
+            Abort
+        notSilentWin:
+            MessageBox MB_OK "${WAILS_WIN10_REQUIRED}"
+            Quit
+    ${EndIf}
+
+    ok:
+!macroend
+
+!macro wails.files
+    !ifdef SUPPORTS_AMD64
+        ${if} ${IsNativeAMD64}
+            File "/oname=${PRODUCT_EXECUTABLE}" "${ARG_WAILS_AMD64_BINARY}"
+        ${EndIf}
+    !endif
+
+    !ifdef SUPPORTS_ARM64
+        ${if} ${IsNativeARM64}
+            File "/oname=${PRODUCT_EXECUTABLE}" "${ARG_WAILS_ARM64_BINARY}"
+        ${EndIf}
+    !endif
+!macroend
+
+!macro wails.writeUninstaller
+    WriteUninstaller "$INSTDIR\uninstall.exe"
+
+    SetRegView 64
+    !if "${WAILS_INSTALL_SCOPE}" == "user"
+        WriteRegStr HKCU "${UNINST_KEY}" "Publisher" "${INFO_COMPANYNAME}"
+        WriteRegStr HKCU "${UNINST_KEY}" "DisplayName" "${INFO_PRODUCTNAME}"
+        WriteRegStr HKCU "${UNINST_KEY}" "DisplayVersion" "${INFO_PRODUCTVERSION}"
+        WriteRegStr HKCU "${UNINST_KEY}" "DisplayIcon" "$INSTDIR\${PRODUCT_EXECUTABLE}"
+        WriteRegStr HKCU "${UNINST_KEY}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
+        WriteRegStr HKCU "${UNINST_KEY}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"
+
+        ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+        IntFmt $0 "0x%08X" $0
+        WriteRegDWORD HKCU "${UNINST_KEY}" "EstimatedSize" "$0"
+    !else
+        WriteRegStr HKLM "${UNINST_KEY}" "Publisher" "${INFO_COMPANYNAME}"
+        WriteRegStr HKLM "${UNINST_KEY}" "DisplayName" "${INFO_PRODUCTNAME}"
+        WriteRegStr HKLM "${UNINST_KEY}" "DisplayVersion" "${INFO_PRODUCTVERSION}"
+        WriteRegStr HKLM "${UNINST_KEY}" "DisplayIcon" "$INSTDIR\${PRODUCT_EXECUTABLE}"
+        WriteRegStr HKLM "${UNINST_KEY}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
+        WriteRegStr HKLM "${UNINST_KEY}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"
+
+        ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+        IntFmt $0 "0x%08X" $0
+        WriteRegDWORD HKLM "${UNINST_KEY}" "EstimatedSize" "$0"
+    !endif
+!macroend
+
+!macro wails.deleteUninstaller
+    Delete "$INSTDIR\uninstall.exe"
+
+    SetRegView 64
+    !if "${WAILS_INSTALL_SCOPE}" == "user"
+        DeleteRegKey HKCU "${UNINST_KEY}"
+    !else
+        DeleteRegKey HKLM "${UNINST_KEY}"
+    !endif
+!macroend
+
+!macro wails.setShellContext
+    ${If} ${REQUEST_EXECUTION_LEVEL} == "admin"
+        SetShellVarContext all
+    ${else}
+        SetShellVarContext current
+    ${EndIf}
+!macroend
+
+# Install webview2 by launching the bootstrapper
+# See https://docs.microsoft.com/en-us/microsoft-edge/webview2/concepts/distribution#online-only-deployment
+!macro wails.webview2runtime
+    !ifndef WAILS_INSTALL_WEBVIEW_DETAILPRINT
+        !define WAILS_INSTALL_WEBVIEW_DETAILPRINT "Installing: WebView2 Runtime"
+    !endif
+
+    SetRegView 64
+    ReadRegStr $0 HKLM "SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" "pv"
+    ${If} $0 != ""
+        Goto ok
+    ${EndIf}
+
+    ${If} ${REQUEST_EXECUTION_LEVEL} == "user"
+        ReadRegStr $0 HKCU "Software\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" "pv"
+        ${If} $0 != ""
+            Goto ok
+        ${EndIf}
+    ${EndIf}
+
+    SetDetailsPrint both
+    DetailPrint "${WAILS_INSTALL_WEBVIEW_DETAILPRINT}"
+    SetDetailsPrint listonly
+
+    InitPluginsDir
+    CreateDirectory "$pluginsdir\webview2bootstrapper"
+    SetOutPath "$pluginsdir\webview2bootstrapper"
+    File "MicrosoftEdgeWebview2Setup.exe"
+    ExecWait '"$pluginsdir\webview2bootstrapper\MicrosoftEdgeWebview2Setup.exe" /silent /install'
+
+    SetDetailsPrint both
+    ok:
+!macroend
+
+!macro wails.associateFiles
+    ; No file associations
+!macroend
+
+!macro wails.unassociateFiles
+    ; No file associations
+!macroend
+
+!macro wails.associateCustomProtocols
+    ; No custom protocols
+!macroend
+
+!macro wails.unassociateCustomProtocols
+    ; No custom protocols
+!macroend
diff --git a/desktop/src/build/windows/wails.exe.manifest b/desktop/src/build/windows/wails.exe.manifest
index 3ff7dde8..a2adb2ee 100644
--- a/desktop/src/build/windows/wails.exe.manifest
+++ b/desktop/src/build/windows/wails.exe.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-    <assemblyIdentity type="win32" name="com.octop.desktop" version="0.9.26.0" processorArchitecture="*"/>
+    <assemblyIdentity type="win32" name="com.tencent.octop" version="0.9.26.0" processorArchitecture="*"/>
     <dependency>
         <dependentAssembly>
             <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
diff --git a/desktop/src/download.go b/desktop/src/download.go
index 9f2a9182..72abf55d 100644
--- a/desktop/src/download.go
+++ b/desktop/src/download.go
@@ -10,6 +10,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"runtime"
+	"sort"
 	"strings"
 	"time"
 )
@@ -70,7 +71,6 @@ func extractPortable(root string) error {
 }
 
 func bundledPortableZip() (string, error) {
-	name := fmt.Sprintf("Octop-%s.zip", greenPlat())
 	if override := os.Getenv("OCTOP_DESKTOP_PORTABLE_ZIP"); override != "" {
 		if _, err := os.Stat(override); err != nil {
 			return "", fmt.Errorf("bundled portable package: %w", err)
@@ -82,17 +82,25 @@ func bundledPortableZip() (string, error) {
 		return "", err
 	}
 	dir := filepath.Dir(exe)
-	candidates := []string{
-		filepath.Join(dir, name),
-		filepath.Join(dir, "..", "Resources", name),
+	plat := greenPlat()
+	legacy := fmt.Sprintf("Octop-%s.zip", plat)
+	searchDirs := []string{
+		dir,
+		filepath.Join(dir, "..", "Resources"),
 	}
-	for _, candidate := range candidates {
-		candidate = filepath.Clean(candidate)
-		if _, err := os.Stat(candidate); err == nil {
-			return candidate, nil
+	for _, search := range searchDirs {
+		search = filepath.Clean(search)
+		legacyPath := filepath.Join(search, legacy)
+		if _, err := os.Stat(legacyPath); err == nil {
+			return legacyPath, nil
+		}
+		matches, _ := filepath.Glob(filepath.Join(search, "Octop-portable-"+plat+"-*.zip"))
+		if len(matches) > 0 {
+			sort.Strings(matches)
+			return matches[len(matches)-1], nil
 		}
 	}
-	return "", fmt.Errorf("bundled portable package %s not found beside application", name)
+	return "", fmt.Errorf("bundled portable package %s not found beside application", legacy)
 }
 
 func unzipGreen(zipPath, dest string) error {
diff --git a/desktop/src/embed_portable.go b/desktop/src/embed_portable.go
index fd3d7b0a..14e96168 100644
--- a/desktop/src/embed_portable.go
+++ b/desktop/src/embed_portable.go
@@ -2,6 +2,7 @@
 
 package main
 
-// Development builds look for Octop-<plat>.zip beside the executable. macOS
-// production keeps the zip in the signed .app Resources directory.
+// Development builds look for Octop-<plat>.zip or Octop-portable-<plat>-*.zip
+// beside the executable. macOS production copies the zip into Resources as
+// Octop-<plat>.zip.
 var embeddedPortable []byte
diff --git a/desktop/src/main.go b/desktop/src/main.go
index 1e33c5c0..62056fb0 100644
--- a/desktop/src/main.go
+++ b/desktop/src/main.go
@@ -344,7 +344,7 @@ func main() {
 	settingsWin := app.Window.NewWithOptions(application.WebviewWindowOptions{
 		Title:            "Octop 设置",
 		Width:            settingsWindowWidth,
-		Height:           settingsWindowHeight,
+		Height:           settingsWindowOuterHeight(),
 		URL:              "/?settings=1",
 		Hidden:           true,
 		Frameless:        true,
diff --git a/desktop/src/settings_window.go b/desktop/src/settings_window.go
index cbe23488..a216eb62 100644
--- a/desktop/src/settings_window.go
+++ b/desktop/src/settings_window.go
@@ -1,6 +1,18 @@
 package main
 
+import "runtime"
+
 const (
 	settingsWindowWidth  = 400
 	settingsWindowHeight = 460
+	// Windows DWM frameless decorations shrink the WebView2 client area, which
+	// clips the 28px bottom gap used on macOS.
+	settingsWindowWindowsExtraHeight = 24
 )
+
+func settingsWindowOuterHeight() int {
+	if runtime.GOOS == "windows" {
+		return settingsWindowHeight + settingsWindowWindowsExtraHeight
+	}
+	return settingsWindowHeight
+}
diff --git a/desktop/src/window_chrome_test.go b/desktop/src/window_chrome_test.go
index 843fbc98..eb7eaa68 100644
--- a/desktop/src/window_chrome_test.go
+++ b/desktop/src/window_chrome_test.go
@@ -55,6 +55,57 @@ func TestSplashHTMLHasFramelessWindowControls(t *testing.T) {
 	}
 }
 
+func TestSplashLoadingCardWrapsProgressAndStatus(t *testing.T) {
+	html, err := os.ReadFile("assets/index.html")
+	if err != nil {
+		t.Fatal(err)
+	}
+	body := string(html)
+	for _, needle := range []string{
+		`class="loading-card"`,
+		`class="loading-footer"`,
+		`class="loading-bar"`,
+		`id="status"`,
+		`.loading-card {`,
+		`border-radius: 14px`,
+		`box-shadow: 0 4px 24px rgba(0, 0, 0, 0.06)`,
+	} {
+		if !strings.Contains(body, needle) {
+			t.Fatalf("splash HTML missing %q", needle)
+		}
+	}
+	cardAt := strings.Index(body, `class="loading-card"`)
+	footerAt := strings.Index(body, `class="loading-footer"`)
+	barAt := strings.Index(body, `class="loading-bar"`)
+	statusAt := strings.Index(body, `id="status"`)
+	if cardAt < 0 || footerAt < cardAt || barAt < footerAt || statusAt < barAt {
+		t.Fatal("progress bar and status must sit at the bottom of the loading card")
+	}
+	if strings.Contains(body, `class="spinner"`) || strings.Contains(body, `.spinner {`) {
+		t.Fatal("splash should use a progress bar, not a circular spinner")
+	}
+	statusCSS := cssRule(body, ".loading-status")
+	if statusCSS == "" {
+		t.Fatal("missing .loading-status rule")
+	}
+	if strings.Contains(statusCSS, "border:") {
+		t.Fatal("status text must not have its own bordered box")
+	}
+}
+
+func cssRule(html, selector string) string {
+	start := strings.Index(html, selector+" {")
+	if start < 0 {
+		return ""
+	}
+	rest := html[start:]
+	end := strings.Index(rest, "}")
+	if end < 0 {
+		return ""
+	}
+	return rest[:end+1]
+}
+
 func TestSettingsHTMLFitsWithoutScrollbar(t *testing.T) {
 	html, err := os.ReadFile("assets/index.html")
 	if err != nil {
@@ -75,6 +126,16 @@ func TestSettingsHTMLFitsWithoutScrollbar(t *testing.T) {
 	if !strings.Contains(body, `padding: 44px 20px 28px`) {
 		t.Fatal("settings wrap must keep a 28px bottom gap, matching the visual side inset")
 	}
+	wrapRule := cssRule(body, `html[data-mode="settings"] .wrap`)
+	if wrapRule == "" {
+		t.Fatal("missing settings wrap rule")
+	}
+	if !strings.Contains(wrapRule, "height: 100%") {
+		t.Fatal("settings wrap must fill the window so the 28px bottom gap is not clipped")
+	}
+	if !strings.Contains(wrapRule, "display: flex") {
+		t.Fatal("settings wrap must be a column so action buttons sit above the bottom padding")
+	}
 	if !strings.Contains(body, `.glyph`) || !strings.Contains(body, `translateY(-0.5px)`) {
 		t.Fatal("traffic-light glyphs must be optically centered in the lights")
 	}
@@ -97,4 +158,10 @@ func TestSettingsWindowSizeFitsContent(t *testing.T) {
 	if settingsWindowHeight < 456 {
 		t.Fatalf("settings height %d clips the bottom padding", settingsWindowHeight)
 	}
+	if settingsWindowWindowsExtraHeight < 16 {
+		t.Fatal("Windows settings window needs extra height so DWM frame does not eat the 28px bottom gap")
+	}
+	if settingsWindowOuterHeight() < settingsWindowHeight {
+		t.Fatal("outer height must be at least the content height")
+	}
 }
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0238c1de..285d40f4 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -125,7 +125,6 @@ RUN --mount=type=cache,target=/root/.cache/uv \
         if [ -n "$PIP_TRUSTED_HOST" ]; then export UV_INSECURE_HOST="$PIP_TRUSTED_HOST"; fi; \
     fi \
     && uv sync --frozen --no-dev --extra browser \
-    && PLAYWRIGHT_BROWSERS_PATH=/root/.cache/ms-playwright playwright install --with-deps chromium \
     && apt-get update && apt-get install -y --no-install-recommends fonts-noto-cjk \
     && apt-get purge -y --auto-remove build-essential \
     && rm -rf /var/lib/apt/lists/* /tmp/*
diff --git a/docker/README.md b/docker/README.md
index 43196b07..f1d2f26c 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -58,7 +58,7 @@ bash docker/docker_build.sh
 |----------|---------|-------------|
 | `HOME` | `/data` | Must be `/data` so `~/.octop` maps to the data volume |
 | `OCTOP_PORT` | `8088` | HTTP listen port |
-| `OCTOP_DEFAULT_PASSWORD` | `Octop123` | Initial admin password (≥8 chars, letters + digits) |
+| `OCTOP_DEFAULT_PASSWORD` | `Octop123` | First-run admin password (≥8 chars, letters + digits) |
 | `OCTOP_ADMIN_USERNAME` | `admin` | Initial admin username |
 | `OCTOP_DATABASE_URL` | — | PostgreSQL DSN (or other `OCTOP_DATABASE_*`; see [configuration.md](../docs/configuration.md)) |
 | `OCTOP_DATABASE_DRIVER` | — | `sqlite` \| `postgresql` when overriding defaults via env |
diff --git a/docker/README_CN.md b/docker/README_CN.md
index f4b4da54..7ed593f8 100644
--- a/docker/README_CN.md
+++ b/docker/README_CN.md
@@ -26,7 +26,7 @@
 docker compose -f docker/docker-compose.yml up -d --build
 ```
 
-访问 `http://localhost:8088`，默认账号 `admin` / `Octop123`（仅首次初始化生效，请立即修改）。密码须 ≥8 位且同时包含字母和数字。后续计划改为首次启动随机生成密码，并仅写入 `credential.txt`。
+访问 `http://localhost:8088`。默认凭据：`admin` / `Octop123`（仅在首次初始化时生效，请立即修改密码）。密码须 ≥8 位且同时包含字母和数字。后续版本可能改为首次启动随机生成并仅写入 `credential.txt`。
 
 **方式二：构建脚本**
 
diff --git a/docs/api.md b/docs/api.md
index 9484f1e9..6e99efc8 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -119,6 +119,16 @@ because each request is a one-shot continuation.
 | `DELETE` | `/agents/{id}/chat/sessions/{thread_id}` | owner | `204` (archives the active row) |
 | `GET`    | `/agents/{id}/chat/sessions/{thread_id}/history` | owner | paginated message history; `turn_active` tells a reconnecting client whether to re-`subscribe` over the chat WebSocket |
 
+### Trajectory ledger
+
+| Method | Path | Auth | Notes |
+|--------|------|------|-------|
+| `GET` | `/agents/{id}/threads/{thread_id}/trajectory` | owner | paginated event summaries; use `before_seq` for older rows |
+| `GET` | `/agents/{id}/threads/{thread_id}/trajectory/events/{event_id}` | owner | full event payload |
+| `GET` | `/agents/{id}/threads/{thread_id}/trajectory/metrics` | owner | aggregated turn, timing, and token metrics |
+| `GET` | `/agents/{id}/threads/{thread_id}/trajectory/stream` | owner | live SSE events; resume with `after_seq` or `Last-Event-ID` |
+| `GET` | `/agents/{id}/threads/{thread_id}/trajectory/export` | owner | full ledger download as JSONL (default) or JSON |
+
 ## Channels
 
 | Method | Path | Auth | Notes |
@@ -143,19 +153,20 @@ because each request is a one-shot continuation.
 | `GET`    | `/settings/timezone` | user | process-level `{timezone}` from `default_timezone` |
 | `GET`    | `/settings/upload` | user | `{max_upload_mb, max_upload_bytes}` from `max_upload_mb` |
 | `GET`    | `/cron/settings` | user | compat alias of `/settings/timezone` |
-| `GET`    | `/agents/{aid}/cron` | owner | list of cron rows |
-| `POST`   | `/agents/{aid}/cron` | owner | body `{trigger, prompt, session_key?, fresh_thread?, model?, task_type?}` → `201` |
-| `GET`    | `/agents/{aid}/cron/{cid}` | owner | cron row |
-| `PATCH`  | `/agents/{aid}/cron/{cid}` | owner | body subset → updated row |
-| `DELETE` | `/agents/{aid}/cron/{cid}` | owner | `204` |
-| `POST`   | `/agents/{aid}/cron/{cid}/run-now` | owner | `204` (fire immediately, off-schedule) |
+| `GET`    | `/agents/{aid}/cron` | owner only | list cron rows; non-owners (including admin) get `[]` |
+| `POST`   | `/agents/{aid}/cron` | owner only | body `{name?, trigger, prompt, session_key?, fresh_thread?, enabled?, model?, task_type?}` → `201` |
+| `GET`    | `/agents/{aid}/cron/{cid}` | owner only | cron row |
+| `PATCH`  | `/agents/{aid}/cron/{cid}` | owner only | body subset → updated row |
+| `DELETE` | `/agents/{aid}/cron/{cid}` | owner only | `204` |
+| `POST`   | `/agents/{aid}/cron/{cid}/run-now` | owner only | `204` (fire immediately, off-schedule) |
 
 `task_type` is `"text"` (push prompt directly to the session) or
 `"agent"` (run the prompt through the LLM and push the reply).
 Default: `"agent"`. `trigger` accepts cron expressions
 (`"0 9 * * *"`) plus the `interval:N` / `date:ISO8601` aliases
 documented in `infra/cron/trigger.py`. `prompt` must be non-empty and
-≤ 2000 characters.
+≤ 2000 characters. `name` is an optional display label; when omitted,
+the server derives one from `prompt`.
 
 ## Providers
 
@@ -363,8 +374,8 @@ endpoint (public, mounted directly in `api/app.py`).
 |--------|------|------|-------|
 | `WS`/`POST`/`GET`/… | `/agents/{aid}/terminal` | owner | AI-assisted remote PTY |
 | `GET` | `/agents/{aid}/terminal/context` | owner | recent terminal context for the AI helper |
-| `WS`/`POST`/`GET`/… | `/browser/...` | user | remote Playwright sessions, screenshots, live streams |
-| `POST` | `/browser/shutdown` | user | stop the local Chrome process for a harness profile (`?profile=`) |
+| `WS`/`POST`/`GET`/… | `/browser/...` | user | harness-browser sessions, live stream, record/replay |
+| `POST` | `/browser/shutdown` | user | stop the current user's Octop-managed Chrome |
 | `POST` | `/agents/{aid}/upload` | user | multipart upload → `{workspace}/inbound/` |
 | `POST` | `/agents/{aid}/files/access-urls` | user | refresh inbound media URLs (signed) |
 | `GET`  | `/agents/{aid}/files/{path}` | owner | read an inbound file |
diff --git a/docs/configuration.md b/docs/configuration.md
index af547517..89a2ed16 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -132,6 +132,9 @@ Each variable, when set, takes precedence over the matching key in
 | `OCTOP_BIND_HOST` | string | `127.0.0.1` | Listen address (use `0.0.0.0` for LAN access) |
 | `OCTOP_PORT` | int | `8088` | Listen port |
 | `OCTOP_LOG_LEVEL` | string | `info` | One of `debug` `info` `warning` `error` |
+| `OCTOP_LOG_RETENTION_DAYS` | int | `14` | Keep rotated `octop.log.YYYY-MM-DD` files for this many days |
+| `OCTOP_LOG_MAX_BYTES` | int | `104857600` (100 MiB) | Roll the active log when it exceeds this size (in addition to daily rotation) |
+| `OCTOP_LOG_COMPRESS` | bool | `true` | logrotate-style `compress` + `delaycompress`: gzip prior rotated plains on the next cycle (`octop.log.YYYY-MM-DD.gz`); the newest rotated file stays uncompressed until then |
 | `OCTOP_ACCESS_TOKEN_TTL` | int (seconds) | `86400` | JWT access-token lifetime |
 | `OCTOP_LOGIN_MAX_ATTEMPTS` | int | `5` | Failed-login attempts before lockout |
 | `OCTOP_LOGIN_LOCKOUT_SECONDS` | int | `900` | Lockout duration after `OCTOP_LOGIN_MAX_ATTEMPTS` failures |
diff --git a/fnos/README.md b/fnos/README.md
index 43e10827..39f36ea6 100644
--- a/fnos/README.md
+++ b/fnos/README.md
@@ -2,16 +2,16 @@
 
 本目录包含将 [TencentCloud/Octop](https://github.com/TencentCloud/Octop) 打包为飞牛 fnOS `.fpk` 安装包所需的全部文件，并附带自动同步上游 + 自动构建的 GitHub Actions。
 
-## First use (initial account)
+## 首次使用（初始账号）
 
-After install, open the app (Docker: `http://<device-ip>:8088`, native: `http://<device-ip>:8089`) and sign in with the **initial admin account**:
+安装完成后打开应用（Docker 版：`http://<设备IP>:8088`，本地版：`http://<设备IP>:8089`），使用**初始管理员账号**登录：
 
-| Field | Value |
-|-------|-------|
-| Username | `admin` |
-| Password | `Octop123` |
+| 字段 | 值 |
+|------|-----|
+| 用户名 | `admin` |
+| 密码 | `Octop123` |
 
-> The password is a fixed initial value (same as the official Docker image default). **Change it right after first login** via the avatar menu → "Change password". If `OCTOP_ADMIN_USERNAME` / `OCTOP_DEFAULT_PASSWORD` were customized via env during install, those take precedence.
+> 该密码是固定初始值（与官方 Docker 镜像默认一致），并非随机生成。**首次登录后请立即在头像菜单 →「修改密码」中更换**。若安装时通过环境变量自定义了 `OCTOP_ADMIN_USERNAME` / `OCTOP_DEFAULT_PASSWORD`，则以自定义值为准。
 
 ## 两种安装包
 
@@ -20,12 +20,12 @@ After install, open the app (Docker: `http://<device-ip>:8088`, native: `http://
 | 版本 | 包名 | 体积 | 运行方式 | 依赖 |
 |------|------|------|----------|------|
 | **Docker 版** | `octop-<ver>.fpk` | ~8 KB | 飞牛自动从 GHCR 拉取 `ghcr.io/tencentcloud/octop:latest` 镜像运行 | 宿主需有 Docker 运行时 |
-| **本地版（非 Docker）** | `octop-native-<ver>.fpk` | ~560 MB | 自带 Python 3.12 运行时 + 前端 + 全部附加组件 + Chromium，原生运行在飞牛主机 | 无需 Docker |
+| **本地版（非 Docker）** | `octop-native-<ver>.fpk` | ~560 MB | 自带 Python 3.12 运行时 + 前端 + 核心依赖，原生运行在飞牛主机 | 无需 Docker |
 
-- **Docker 版**实现为 FnOS `docker-project`：包体只含 `docker-compose.yaml` 与向导配置，运行时由飞牛从 GHCR 拉取镜像。镜像已内置全部附加组件（`browser` 浏览器自动化 + `desktop` 桌面控制）与前端。
-- **本地版**实现为 FnOS 原生 `app`：包内自带独立 Python 3.12 运行时、Octop 全部依赖、前端构建产物、Playwright Chromium，以及 `data-share` 共享数据目录，直接以进程方式运行，不依赖 Docker。
+- **Docker 版**实现为 FnOS `docker-project`：包体只含 `docker-compose.yaml` 与向导配置，运行时由飞牛从 GHCR 拉取镜像。镜像已内置 `desktop` 桌面控制与前端；Playwright Chromium 不预装，可在控制台按需安装。
+- **本地版**实现为 FnOS 原生 `app`：包内自带独立 Python 3.12 运行时、Octop 核心依赖、前端构建产物，以及 `data-share` 共享数据目录，直接以进程方式运行，不依赖 Docker。
 
-> 两款包都在滚动发布 **`fnos-latest`**：<https://github.com/TencentCloud/Octop/releases/tag/fnos-latest>
+> 两款包随正式版一起挂在 **`v*` GitHub Release** 上（例如 [v0.9.31](https://github.com/TencentCloud/Octop/releases/latest)）：`Octop-fnos-docker-<ver>.fpk` / `Octop-fnos-native-<ver>.fpk`。
 
 ## 目录结构
 
@@ -48,12 +48,12 @@ fnos/
 │   │   └── ui/
 │   │       ├── config                # 桌面图标入口
 │   │       └── images/icon-{64,256}.png
-│   └── Dockerfile          # 从仓库源码构建镜像，安装全部附加组件（browser + desktop）
+│   └── Dockerfile          # 从仓库源码构建镜像，安装 desktop extra（不预装 Chromium）
 └── native/                 # 本地版（非 Docker 的 FnOS 原生 app）
     ├── manifest            # platform=all + 原生 app 元信息
     ├── cmd/                # 生命周期脚本（main / install_callback / config_callback）
     ├── config/
-    │   ├── privilege       # 权限声明（root，用于补装 Chromium 系统库）
+    │   ├── privilege       # 权限声明（root，用于 sudo / 远程桌面等）
     │   └── resource        # data-share + usr-local-linker
     ├── app/
     │   ├── bin/octop       # 启动器（用自带 Python 运行时启动 octop init/run）
@@ -66,14 +66,14 @@ fnos/
 1. **发版链路**：`v*` tag → `release.yml`（PyPI + GitHub Release）与 `docker-publish.yml`（GHCR / Hub）并行；Release 成功后自动 `workflow_dispatch` 本工作流。
 2. **镜像复用**：不再重新 build 镜像；`ensure-image` 轮询等待 `ghcr.io/tencentcloud/octop:{version}`（由 docker-publish 推送）。Docker 版 `.fpk` 仅打包 compose，运行时拉取该镜像。
 3. **Wheel 复用**：Native 版优先从同版本 GitHub Release（`v*`）下载 `octop-*.whl`；若缺失再回退源码构建前端 + wheel。
-4. **安装包构建**：`fpk` / `native` job 用 `scripts/build-fpk.sh` 打包，产物按版本号发布为 `Octop-fnos-docker-<ver>.fpk` / `Octop-fnos-native-<ver>.fpk`（Release tag `fnos-<ver>`）。
+4. **安装包构建**：`fpk` / `native` job 用 `scripts/build-fpk.sh` 打包，产物 `Octop-fnos-docker-<ver>.fpk` / `Octop-fnos-native-<ver>.fpk` 挂到同一个 `v*` GitHub Release（与 wheel、桌面包并列）。
 
 ## 本地构建 .fpk（无需 Docker）
 
 ```bash
-bash scripts/build-fpk.sh            # 仅 Docker 版  → dist/octop-<version>.fpk
+bash scripts/build-fpk.sh            # 仅 Docker 版  → dist/Octop-fnos-docker-<version>.fpk
 bash scripts/build-fpk.sh docker     # 仅 Docker 版
-bash scripts/build-fpk.sh native     # 仅本地版      → dist/octop-native-<version>.fpk
+bash scripts/build-fpk.sh native     # 仅本地版      → dist/Octop-fnos-native-<version>.fpk
 ```
 
 `.fpk` 为「双层 gzip tar」：外层含 `app.tgz / cmd / config / wizard / ICON.PNG / ICON_256.PNG / LICENSE / manifest`，内层 `app.tgz` 含 `app/` 内容。
@@ -81,10 +81,10 @@ bash scripts/build-fpk.sh native     # 仅本地版      → dist/octop-native-<
 ## 在飞牛上安装
 
 1. 飞牛「应用中心 → 设置 → 手动安装应用」选择对应 `.fpk`：
-   - 想用 Docker 跑、主机已装 Docker → 选 `octop-<version>.fpk`
-   - 不想依赖 Docker、希望自带运行时原生运行 → 选 `octop-native-<version>.fpk`
+   - 想用 Docker 跑、主机已装 Docker → 选 `Octop-fnos-docker-<version>.fpk`
+   - 不想依赖 Docker、希望自带运行时原生运行 → 选 `Octop-fnos-native-<version>.fpk`
 2. 安装向导中设置管理员账号/密码、日志级别、LLM 密钥（可选）。
 3. 安装完成后桌面出现「Octop AI 助手」图标，浏览器打开 `http://<设备IP>:8088`。
-4. Docker 版镜像首次会从 GHCR `ghcr.io/tencentcloud/octop:latest` 拉取；请确保该包为 Public（首次推送后可在 GitHub Packages 设置）。本地版无需联网拉镜像，首次启动会按需要补装 Chromium 系统库（需 root 权限，已尽力处理）。
+4. Docker 版镜像首次会从 GHCR `ghcr.io/tencentcloud/octop:latest` 拉取；请确保该包为 Public（首次推送后可在 GitHub Packages 设置）。本地版无需联网拉镜像。Playwright Chromium 不预装，需要远程浏览器时在控制台按需安装。
 
-> 服务端口固定为 `8088`（飞牛端口映射与桌面图标均据此）。附加组件（browser 浏览器自动化 + desktop 桌面控制）已在镜像中默认安装。
+> 服务端口固定为 `8088`（飞牛端口映射与桌面图标均据此）。`desktop` 桌面控制已在镜像中默认安装。
diff --git a/fnos/docker/Dockerfile b/fnos/docker/Dockerfile
index 4de37b74..b9cfd716 100644
--- a/fnos/docker/Dockerfile
+++ b/fnos/docker/Dockerfile
@@ -2,9 +2,9 @@
 # =============================================================================
 # Octop — FnOS 专用构建（基于仓库源码，安装全部附加组件）
 #
-# 与上游 docker/Dockerfile 一致，但显式安装全部 extras：
-#   - browser  （Playwright 浏览器自动化，已进核心依赖）
+# 与上游 docker/Dockerfile 一致，但显式安装 desktop extra：
 #   - desktop  （mss / pynput / pillow，桌面控制附加组件）
+# Playwright Chromium 不再预装，浏览器自动化可在控制台按需安装。
 #
 # 构建上下文必须为仓库根目录（fnpack / CI 中以仓库根为 context）：
 #   docker build -f fnos/docker/Dockerfile -t ghcr.io/tencentcloud/octop:latest .
@@ -82,7 +82,7 @@ COPY --from=frontend-builder /build/src/octop/dashboard/ ./src/octop/dashboard/
 COPY docker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 RUN chmod +x /usr/local/bin/docker-entrypoint.sh
 
-# 安装项目 + 全部附加组件（browser 已在核心依赖，desktop 显式加入）
+# 安装项目 + desktop 附加组件（Playwright Chromium 不预装，控制台可按需下载）
 # UV_INDEX_URL 首选阿里云镜像加速；UV_DEFAULT_INDEX 保留 PyPI 作为兜底，
 # 避免新发布的包（如 orcakit-harness-agent 0.9.16）尚未同步到镜像时构建失败。
 RUN --mount=type=cache,target=/root/.cache/uv \
@@ -91,8 +91,6 @@ RUN --mount=type=cache,target=/root/.cache/uv \
        UV_INDEX_URL=https://mirrors.aliyun.com/pypi/simple \
        UV_INSECURE_HOST=mirrors.aliyun.com \
        uv pip install --python /app/.venv ".[desktop]" \
-    && PLAYWRIGHT_BROWSERS_PATH=/root/.cache/ms-playwright \
-       /app/.venv/bin/python -m playwright install --with-deps chromium \
     && apt-get update && apt-get install -y --no-install-recommends fonts-noto-cjk \
     && apt-get purge -y --auto-remove build-essential \
     && rm -rf /var/lib/apt/lists/* /tmp/*
diff --git a/pyproject.toml b/pyproject.toml
index 6fa1522b..b6d02b21 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "octop"
-version = "0.9.31"
+version = "0.9.32"
 description = "Smarter self-hosted AI assistant for multiple users and agents, built on harness-agent"
 readme = "README.md"
 license = { text = "MIT" }
@@ -21,9 +21,10 @@ dependencies = [
     "apscheduler>=3.10,<4",
     "argon2-cffi>=23.1",
     "pyjwt>=2.8",
-    "orcakit-harness-agent[all]>=1.0.2",
-    "harness-memory>=0.9.7",
-    "harness-gateway>=0.9.3",
+    "orcakit-harness-agent[all]>=1.0.4",
+    "harness-memory>=0.9.9",
+    "harness-gateway>=0.9.5",
+    "lark-oapi>=1.5.5",
     "cryptography>=41",
     "scalar-fastapi>=1.0",
     "edge-tts>=6.1",
@@ -32,7 +33,7 @@ dependencies = [
     "acme>=5.6.0",
     "josepy>=2.2.0",
     "boto3>=1.40.61",
-    "harness-browser>=0.7.7",
+    "harness-browser>=0.7.8",
     "playwright>=1.40",
     "psycopg[binary]>=3.2",
     "langgraph-checkpoint-postgres>=2.0",
@@ -42,6 +43,8 @@ dependencies = [
     "python-docx>=1.2.0",
     "python-pptx>=1.0",
     "pypinyin>=0.53",
+    "openpyxl>=3.1",
+    "xlrd>=2.0.1",
 ]
 
 [project.optional-dependencies]
@@ -57,6 +60,7 @@ dev = [
     "ruff>=0.4",
     "mypy>=1.10",
     "build>=1.0",
+    "xlwt>=1.3",
 ]
 # Kept for backward compatibility; playwright is now a core dependency.
 browser = [
@@ -66,6 +70,11 @@ browser = [
 desktop = ["mss>=9.0", "pynput>=1.7"]
 # Local ONNX / fastembed embedding models (Models admin local tab).
 local-embedding = ["fastembed>=0.4", "huggingface_hub>=0.20"]
+knowledge-ocr = [
+    "rapidocr>=3.4,<4",
+    "onnxruntime>=1.17",
+    "pymupdf>=1.24",
+]
 
 [dependency-groups]
 # PEP 735 dev group — installed by default on `uv sync`. Mirrors the
@@ -80,6 +89,7 @@ dev = [
     "ruff>=0.4",
     "mypy>=1.10",
     "build>=1.0",
+    "xlwt>=1.3",
 ]
 
 [project.scripts]
diff --git a/scripts/README.md b/scripts/README.md
index 066a1310..72997813 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -52,9 +52,9 @@ Windows PowerShell 等价参数：`-Version`、`-FromSource`、`-SourceDir`、`-
 | `OCTOP_HOME` | 安装根目录，默认 `~/.octop` |
 | `OCTOP_REPO` | `--from-source` 无本地目录时的 git 克隆地址 |
 | `OCTOP_PYPI_MIRROR` | PyPI 镜像（与 `--mirror` 等效） |
-| `PLAYWRIGHT_DOWNLOAD_HOST` | Playwright 浏览器下载镜像（`browser` 附加组件） |
+| `PLAYWRIGHT_DOWNLOAD_HOST` | Playwright 浏览器下载镜像（仅 `--extras browser`） |
 
-安装脚本会优先复用系统已安装的 **Chrome / Chromium**（GUI 系统常见，如 macOS / Windows / Linux 桌面）：检测到后直接跳过体积较大的 Playwright 自带 Chromium 下载。如需强制使用 Playwright 自带版本，可手动运行 `python -m playwright install chromium`。
+默认不下载 Playwright Chromium。需要远程浏览器自动化时加 `--extras browser`，或安装后在控制台 / `python -m playwright install chromium` 按需安装。若系统已有 Chrome / Chromium，即使加了 `--extras browser` 也会跳过下载。
 
 安装完成后：
 
@@ -87,7 +87,7 @@ powershell -File scripts/wheel_build.ps1
 
 ## 平台说明
 
-- **macOS / Linux**：`install.sh` 支持自动安装 uv、创建 venv、可选 Playwright 系统依赖（`browser` extra）。检测到系统已装 Chrome/Chromium 时会跳过 Playwright Chromium 下载。
+- **macOS / Linux**：`install.sh` 支持自动安装 uv、创建 venv；Playwright Chromium 仅在 `--extras browser` 时下载（系统已有 Chrome 则跳过）。
 - **Windows**：使用 `install.ps1` 或 `install.bat`；PTY 终端、飞书 bot creator 等非阻塞 stdout 等功能在 Windows 上受限（见下方兼容性分析）。
 
 完整跨平台兼容性分析见项目文档或 PR 说明。
diff --git a/scripts/install-octop.sh b/scripts/install-octop.sh
index 282c84d1..abeef490 100644
--- a/scripts/install-octop.sh
+++ b/scripts/install-octop.sh
@@ -84,13 +84,14 @@ Options:
   --version <VER>       Install a specific version (e.g. 0.1.0) [PyPI only]
   --from-source [DIR]   Install from source; clones the git repo if DIR is omitted
   --from-pypi           Install from PyPI (default)
-  --extras <EXTRAS>     Extra optional components (e.g. desktop); browser/playwright always installed
+  --extras <EXTRAS>     Extra optional components (e.g. desktop, browser)
   --mirror <URL>        Use a specific PyPI mirror (e.g. https://mirrors.aliyun.com/pypi/simple)
   -h, --help            Show this help
 
-Note: if Chrome/Chromium is already installed (common on macOS/Windows or
-  Linux desktops), the installer reuses it and skips the large bundled
-  Chromium download.
+Note: Playwright Chromium is not downloaded by default. Pass
+  --extras browser to install it, or install later from the dashboard.
+  If a system Chrome/Chromium already exists, that download is skipped
+  even with --extras browser.
 
 Environment variables:
   OCTOP_HOME              Install directory (default: ~/.octop)
@@ -104,10 +105,8 @@ Environment variables:
 
 Details:
   Everything is installed into an isolated virtualenv (~/.octop/venv), so the
-  system Python is untouched. Playwright dependencies are installed by
-  default; if a system Chrome/Chromium is detected, the bundled Chromium
-  download is skipped and the system browser is used instead:
-  1. Playwright Chromium browser and Python package (skipped if a system browser exists)
+  system Python is untouched. Playwright Chromium is opt-in (--extras browser):
+  1. Playwright Chromium browser (skipped if a system browser exists)
   2. System libraries (Linux: apt/dnf/yum/pacman/zypper; only needed for Chromium)
   3. CJK fonts for rendering Chinese web pages
 EOF
@@ -564,7 +563,7 @@ fi
 _ensure_old_glibc_build_toolchain
 
 # ── 步骤 3: 安装 Octop ───────────────────────────────────────────────────────
-# browser/playwright 为默认安装内容；其它 --extras 追加合并
+# playwright Python 包已是核心依赖；Chromium 浏览器仅在 --extras browser 时下载。
 _merge_install_extras() {
     local result="browser"
     if [ -n "$EXTRAS" ]; then
@@ -877,8 +876,22 @@ if p:
     return 1
 }
 
-# 默认安装 Playwright 系统依赖和 Chromium，但检测到系统浏览器时跳过下载。
-if "$OCTOP_VENV/bin/python" -c "import playwright" 2>/dev/null; then
+# Playwright Chromium is opt-in (--extras browser).
+_WANT_PW_CHROMIUM=0
+if [ -n "$EXTRAS" ]; then
+    _old_ifs="$IFS"
+    IFS=','
+    for _part in $EXTRAS; do
+        [ "$_part" = "browser" ] && _WANT_PW_CHROMIUM=1
+    done
+    IFS="$_old_ifs"
+fi
+
+if [ "$_WANT_PW_CHROMIUM" != 1 ]; then
+    info "Skipping Playwright Chromium download."
+    info "For remote-browser automation, re-run with --extras browser, use the dashboard, or:"
+    info "  $OCTOP_VENV/bin/python -m playwright install chromium"
+elif "$OCTOP_VENV/bin/python" -c "import playwright" 2>/dev/null; then
     _SYSTEM_CHROME="$(_detect_system_chrome || true)"
     if [ -n "$_SYSTEM_CHROME" ]; then
         info "Detected system Chrome/Chromium: $_SYSTEM_CHROME"
@@ -1093,4 +1106,4 @@ printf "  ${BOLD}octop service start${RESET}  # Install and run in the backgroun
 printf "  ${BOLD}open http://127.0.0.1:8088${RESET}\n"
 echo ""
 printf "Upgrade: re-run this installer. Cleanup: ${BOLD}octop clean${RESET}\n"
-printf "Playwright reinstall: ${BOLD}$OCTOP_VENV/bin/python -m playwright install chromium${RESET}\n"
+printf "Playwright Chromium (optional): ${BOLD}$OCTOP_VENV/bin/python -m playwright install chromium${RESET}\n"
diff --git a/scripts/install.bat b/scripts/install.bat
index 459ceb97..8c500688 100644
--- a/scripts/install.bat
+++ b/scripts/install.bat
@@ -35,11 +35,11 @@ echo Usage: install.bat [OPTIONS]
 echo   -Version ^<VER^>     Install specific version
 echo   -FromSource        Install from source
 echo   -SourceDir ^<DIR^>   Local source directory
-echo   -Extras ^<EXTRAS^>  Extra components (e.g. desktop); browser/playwright always installed
+echo   -Extras ^<EXTRAS^>  Extra components (e.g. desktop, browser)
 echo   -UvPath ^<PATH^>     Pre-installed uv.exe
 echo.
-echo   Note: if a system Chrome/Chromium is installed (common on GUI systems like
-echo         Windows / macOS), the bundled Playwright Chromium download is skipped.
+echo   Note: Playwright Chromium is not downloaded by default. Pass -Extras browser
+echo         to install it, or install later from the dashboard.
 exit /b 0
 
 :done_args
@@ -117,6 +117,13 @@ if "%CONSOLE_AVAILABLE%"=="0" (
     if "!_UI!"=="yes" set "CONSOLE_AVAILABLE=1"
 )
 
+echo ",%ARG_EXTRAS%," | findstr /i /c:",browser," >nul
+if errorlevel 1 (
+    echo [octop] Skipping Playwright Chromium download.
+    echo [octop] For remote-browser automation, re-run with -Extras browser, use the dashboard, or:
+    echo [octop]   "%VENV_PYTHON%" -m playwright install chromium
+    goto :after_browser
+)
 call :detect_chrome
 if defined OCTOP_SYSTEM_CHROME (
     echo [octop] Found system Chrome/Chromium: %OCTOP_SYSTEM_CHROME%
diff --git a/scripts/install.ps1 b/scripts/install.ps1
index c8a80a19..48c4cb1c 100644
--- a/scripts/install.ps1
+++ b/scripts/install.ps1
@@ -36,12 +36,13 @@ Options:
   -Version <VER>        Install a specific version (e.g. 0.1.0)
   -FromSource           Install from source (requires git, or use -SourceDir)
   -SourceDir <DIR>      Local source directory (used with -FromSource)
-  -Extras <EXTRAS>      Extra optional components (e.g. desktop); browser/playwright is always installed
+  -Extras <EXTRAS>      Extra optional components (e.g. desktop, browser)
   -UvPath <PATH>        Path to a pre-installed uv.exe
   -Help                 Show this help
 
-Note: if a system Chrome/Chromium is already installed (common on GUI systems
-like Windows / macOS), the bundled Playwright Chromium download is skipped.
+Note: Playwright Chromium is not downloaded by default. Pass -Extras browser
+to install it, or install later from the dashboard. If a system Chrome already
+exists, that download is skipped even with -Extras browser.
 
 Environment:
   OCTOP_HOME            Installation directory (default: ~/.octop)
@@ -276,18 +277,30 @@ function Find-SystemChrome {
     return $null
 }
 
-$systemChrome = Find-SystemChrome
-if ($systemChrome) {
-    Write-Info "Found system Chrome/Chromium: $systemChrome"
-    Write-Info "Using system browser; skipping Playwright Chromium download."
-    Write-Info "To use Playwright's bundled Chromium instead, run: $VenvPython -m playwright install chromium"
+$wantPlaywrightChromium = $false
+if ($Extras) {
+    foreach ($p in ($Extras -split ",")) {
+        if ($p.Trim() -eq "browser") { $wantPlaywrightChromium = $true }
+    }
+}
+if (-not $wantPlaywrightChromium) {
+    Write-Info "Skipping Playwright Chromium download."
+    Write-Info "For remote-browser automation, re-run with -Extras browser, use the dashboard, or:"
+    Write-Info "  $VenvPython -m playwright install chromium"
 } else {
-    Write-Info "Installing Playwright Chromium browser..."
-    & $VenvPython -m playwright install chromium 2>$null
-    if ($LASTEXITCODE -eq 0) {
-        Write-Info "Playwright Chromium installed"
+    $systemChrome = Find-SystemChrome
+    if ($systemChrome) {
+        Write-Info "Found system Chrome/Chromium: $systemChrome"
+        Write-Info "Using system browser; skipping Playwright Chromium download."
+        Write-Info "To use Playwright's bundled Chromium instead, run: $VenvPython -m playwright install chromium"
     } else {
-        Write-Warn "Playwright install failed. Run later: $VenvPython -m playwright install chromium"
+        Write-Info "Installing Playwright Chromium browser..."
+        & $VenvPython -m playwright install chromium 2>$null
+        if ($LASTEXITCODE -eq 0) {
+            Write-Info "Playwright Chromium installed"
+        } else {
+            Write-Warn "Playwright install failed. Run later: $VenvPython -m playwright install chromium"
+        }
     }
 }
 
diff --git a/scripts/install.sh b/scripts/install.sh
index 943a93bc..e98e5249 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -84,13 +84,14 @@ Options:
   --version <VER>       Install a specific version (e.g. 0.1.0) [PyPI only]
   --from-source [DIR]   Install from source; clones the git repo if DIR is omitted
   --from-pypi           Install from PyPI (default)
-  --extras <EXTRAS>     Extra optional components (e.g. desktop); browser/playwright always installed
+  --extras <EXTRAS>     Extra optional components (e.g. desktop, browser)
   --mirror <URL>        Use a specific PyPI mirror (e.g. https://mirrors.cloud.tencent.com/pypi/simple)
   -h, --help            Show this help
 
-Note: if Chrome/Chromium is already installed (common on macOS/Windows or
-  Linux desktops), the installer reuses it and skips the large bundled
-  Chromium download.
+Note: Playwright Chromium is not downloaded by default. Pass
+  --extras browser to install it, or install later from the dashboard.
+  If a system Chrome/Chromium already exists, that download is skipped
+  even with --extras browser.
 
 Environment variables:
   OCTOP_HOME              Install directory (default: ~/.octop)
@@ -104,10 +105,8 @@ Environment variables:
 
 Details:
   Everything is installed into an isolated virtualenv (~/.octop/venv), so the
-  system Python is untouched. Playwright dependencies are installed by
-  default; if a system Chrome/Chromium is detected, the bundled Chromium
-  download is skipped and the system browser is used instead:
-  1. Playwright Chromium browser and Python package (skipped if a system browser exists)
+  system Python is untouched. Playwright Chromium is opt-in (--extras browser):
+  1. Playwright Chromium browser (skipped if a system browser exists)
   2. System libraries (Linux: apt/dnf/yum/pacman/zypper; only needed for Chromium)
   3. CJK fonts for rendering Chinese web pages
 EOF
@@ -564,7 +563,7 @@ fi
 _ensure_old_glibc_build_toolchain
 
 # ── 步骤 3: 安装 Octop ───────────────────────────────────────────────────────
-# browser/playwright 为默认安装内容；其它 --extras 追加合并
+# playwright Python 包已是核心依赖；Chromium 浏览器仅在 --extras browser 时下载。
 _merge_install_extras() {
     local result="browser"
     if [ -n "$EXTRAS" ]; then
@@ -912,8 +911,22 @@ if p:
     return 1
 }
 
-# 默认安装 Playwright 系统依赖和 Chromium，但检测到系统浏览器时跳过下载。
-if "$OCTOP_VENV/bin/python" -c "import playwright" 2>/dev/null; then
+# Playwright Chromium is opt-in (--extras browser).
+_WANT_PW_CHROMIUM=0
+if [ -n "$EXTRAS" ]; then
+    _old_ifs="$IFS"
+    IFS=','
+    for _part in $EXTRAS; do
+        [ "$_part" = "browser" ] && _WANT_PW_CHROMIUM=1
+    done
+    IFS="$_old_ifs"
+fi
+
+if [ "$_WANT_PW_CHROMIUM" != 1 ]; then
+    info "Skipping Playwright Chromium download."
+    info "For remote-browser automation, re-run with --extras browser, use the dashboard, or:"
+    info "  $OCTOP_VENV/bin/python -m playwright install chromium"
+elif "$OCTOP_VENV/bin/python" -c "import playwright" 2>/dev/null; then
     _SYSTEM_CHROME="$(_detect_system_chrome || true)"
     if [ -n "$_SYSTEM_CHROME" ]; then
         info "Detected system Chrome/Chromium: $_SYSTEM_CHROME"
@@ -1138,4 +1151,4 @@ printf "  ${BOLD}octop service start${RESET}  # Install and run in the backgroun
 printf "  ${BOLD}open http://127.0.0.1:8088${RESET}\n"
 echo ""
 printf "Upgrade: re-run this installer. Cleanup: ${BOLD}octop clean${RESET}\n"
-printf "Playwright reinstall: ${BOLD}$OCTOP_VENV/bin/python -m playwright install chromium${RESET}\n"
+printf "Playwright Chromium (optional): ${BOLD}$OCTOP_VENV/bin/python -m playwright install chromium${RESET}\n"
diff --git a/scripts/release_download_links.py b/scripts/release_download_links.py
new file mode 100644
index 00000000..77b7e9d1
--- /dev/null
+++ b/scripts/release_download_links.py
@@ -0,0 +1,105 @@
+"""Build GitHub Release download-section markdown from a version tag.
+
+Same pattern as clash-verge-rev: interpolate TAG / VERSION into a fixed
+filename table. Do not scrape the assets list.
+
+    python3 scripts/release_download_links.py 0.9.31
+    python3 scripts/release_download_links.py v0.9.31
+"""
+
+from __future__ import annotations
+
+import argparse
+import sys
+
+GITHUB_REPO = "TencentCloud/Octop"
+DOWNLOAD_BASE = f"https://github.com/{GITHUB_REPO}/releases/download"
+
+
+def split_tag(raw: str) -> tuple[str, str]:
+    """Return ``(tag, version)`` — tag always has a leading ``v``."""
+    text = raw.strip()
+    if not text:
+        raise ValueError("version is empty")
+    version = text[1:] if text.startswith("v") else text
+    return f"v{version}", version
+
+
+def asset_url(tag: str, filename: str) -> str:
+    return f"{DOWNLOAD_BASE}/{tag}/{filename}"
+
+
+def md_link(label: str, tag: str, filename: str) -> str:
+    return f"[{label}]({asset_url(tag, filename)})"
+
+
+def desktop_name(os_name: str, arch: str, version: str, ext: str) -> str:
+    return f"Octop-desktop-{os_name}-{arch}-{version}.{ext}"
+
+
+def portable_name(os_name: str, arch: str, version: str) -> str:
+    return f"Octop-portable-{os_name}-{arch}-{version}.zip"
+
+
+def render_download_section(raw_version: str) -> str:
+    tag, version = split_tag(raw_version)
+    win64 = md_link("64-bit (Recommended)", tag, desktop_name("windows", "amd64", version, "exe"))
+    win_arm = md_link("ARM64", tag, desktop_name("windows", "arm64", version, "exe"))
+    win64_zip = md_link("64-bit", tag, portable_name("windows", "amd64", version))
+    win_arm_zip = md_link("ARM64", tag, portable_name("windows", "arm64", version))
+    mac_arm = md_link("Apple Silicon", tag, desktop_name("darwin", "arm64", version, "dmg"))
+    mac_intel = md_link("Intel", tag, desktop_name("darwin", "amd64", version, "dmg"))
+    mac_arm_zip = md_link("Apple Silicon", tag, portable_name("darwin", "arm64", version))
+    mac_intel_zip = md_link("Intel", tag, portable_name("darwin", "amd64", version))
+    linux64 = md_link("64-bit", tag, desktop_name("linux", "amd64", version, "tar.gz"))
+    linux_arm = md_link("ARM64", tag, desktop_name("linux", "arm64", version, "tar.gz"))
+    linux64_zip = md_link("64-bit", tag, portable_name("linux", "amd64", version))
+    linux_arm_zip = md_link("ARM64", tag, portable_name("linux", "arm64", version))
+    fnos_docker = md_link("Docker", tag, f"Octop-fnos-docker-{version}.fpk")
+    fnos_native = md_link("Native", tag, f"Octop-fnos-native-{version}.fpk")
+    return "\n".join(
+        [
+            "",
+            "## Downloads",
+            "",
+            "### Windows",
+            "",
+            "#### Desktop installer (Recommended)",
+            f"- {win64} | {win_arm}",
+            "",
+            "#### Portable",
+            f"- {win64_zip} | {win_arm_zip}",
+            "",
+            "### macOS",
+            "",
+            "#### Desktop installer (Recommended)",
+            f"- {mac_arm} | {mac_intel}",
+            "",
+            "#### Portable",
+            f"- {mac_arm_zip} | {mac_intel_zip}",
+            "",
+            "### Linux",
+            "",
+            "#### Desktop installer (Recommended)",
+            f"- {linux64} | {linux_arm}",
+            "",
+            "#### Portable",
+            f"- {linux64_zip} | {linux_arm_zip}",
+            "",
+            "### fnOS NAS",
+            f"- {fnos_docker} | {fnos_native}",
+            "",
+        ]
+    )
+
+
+def main(argv: list[str] | None = None) -> int:
+    parser = argparse.ArgumentParser(description="Print Octop GitHub Release download markdown.")
+    parser.add_argument("version", help="Package version, with or without a leading v")
+    args = parser.parse_args(argv)
+    sys.stdout.write(render_download_section(args.version))
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/src/octop/__init__.py b/src/octop/__init__.py
index b6ecd974..e579980e 100644
--- a/src/octop/__init__.py
+++ b/src/octop/__init__.py
@@ -2,4 +2,4 @@
 
 from __future__ import annotations
 
-__version__ = "0.9.31"
+__version__ = "0.9.32"
diff --git a/src/octop/api/openapi_meta.py b/src/octop/api/openapi_meta.py
index 72b87c38..873ee064 100644
--- a/src/octop/api/openapi_meta.py
+++ b/src/octop/api/openapi_meta.py
@@ -65,7 +65,7 @@
     },
     {
         "name": "chat",
-        "description": "Dashboard chat: WebSocket streaming, threads, conversation history, and text-push toasts.",
+        "description": "Dashboard chat: WebSocket streaming, threads, conversation history, trajectory ledger, and text-push toasts.",
     },
     {
         "name": "slash",
@@ -141,7 +141,7 @@
     {"name": "update", "description": "In-place server update checks and apply flow."},
     {
         "name": "browser",
-        "description": "Remote browser sessions: navigate, screenshot, live stream.",
+        "description": "Remote browser: env/install, harness sessions, live stream, record/replay.",
     },
     {
         "name": "mobile",
diff --git a/src/octop/api/routers/agent_tools.py b/src/octop/api/routers/agent_tools.py
index af48e827..904c8b49 100644
--- a/src/octop/api/routers/agent_tools.py
+++ b/src/octop/api/routers/agent_tools.py
@@ -60,67 +60,9 @@ class ToolSettingPatchBody(BaseModel):
     plugin_id: str | None = None
 
 
-def _plugin_manager(server: OctopServer) -> Any:
-    mgr = server.plugin_manager
-    if mgr is None:
-        raise OctopError(ErrorCode.INTERNAL_ERROR, "plugin manager not initialized")
-    return mgr
-
-
-def _plugin_tool_label(name: str, locale: str) -> str:
-    """Use i18n label when present; otherwise keep the raw tool name."""
-    labeled = tool_display_name(name, locale)
-    return labeled if labeled != name else name
-
-
-def _list_plugin_tool_items(
-    server: OctopServer,
-    agent_cfg: dict[str, Any],
-    *,
-    locale: str,
-) -> list[ToolSettingsItem]:
-    mgr = _plugin_manager(server)
-    raw_plugins = agent_cfg.get("plugins")
-    plugins_cfg: dict[str, Any] = raw_plugins if isinstance(raw_plugins, dict) else {}
-    items: list[ToolSettingsItem] = []
-    for plugin in mgr.list_installed():
-        if plugin.get("error"):
-            continue
-        plugin_id = str(plugin["id"])
-        globally_on = plugin.get("enabled", True) is not False
-        for tool in plugin.get("tools") or []:
-            name = str(tool["name"])
-            tool_cfg: dict[str, Any] = {}
-            plugin_entry = plugins_cfg.get(plugin_id)
-            if isinstance(plugin_entry, dict):
-                tools_map = plugin_entry.get("tools")
-                if isinstance(tools_map, dict):
-                    raw_tool = tools_map.get(name)
-                    if isinstance(raw_tool, dict):
-                        tool_cfg = raw_tool
-            desc = tool.get("description")
-            enabled = bool(tool_cfg.get("enabled")) if tool_cfg and "enabled" in tool_cfg else True
-            items.append(
-                ToolSettingsItem(
-                    name=name,
-                    source="plugin",
-                    category="plugin",
-                    label=_plugin_tool_label(name, locale),
-                    description=(
-                        str(desc).strip() if isinstance(desc, str) and desc.strip() else None
-                    ),
-                    enabled=enabled,
-                    disableable=True,
-                    available=globally_on,
-                    plugin_id=plugin_id,
-                )
-            )
-    return items
-
-
 @router.get(
     "/{agent_id}/tool-settings",
-    summary="List built-in and plugin tools with enable state",
+    summary="List built-in tools with enable state",
     response_model=ToolSettingsResponse,
 )
 async def get_tool_settings(
@@ -160,7 +102,6 @@ async def get_tool_settings(
                 plugin_id=None,
             )
         )
-    tools.extend(_list_plugin_tool_items(server, agent_cfg, locale=locale))
     return ToolSettingsResponse(tools=tools)
 
 
diff --git a/src/octop/api/routers/backup.py b/src/octop/api/routers/backup.py
index 905427d1..f4bbb5fb 100644
--- a/src/octop/api/routers/backup.py
+++ b/src/octop/api/routers/backup.py
@@ -51,6 +51,21 @@ class AutoBackupSettingsBody(BaseModel):
     auto_enabled: bool = False
     schedule: str = Field(default="cron:0 4 * * *", min_length=1)
     retention_count: int = Field(default=7, ge=1, le=365)
+    include_config: bool = True
+    include_workspaces: bool = True
+    include_skill_packages: bool = True
+    include_plugins: bool = True
+    include_knowledge: bool = True
+    include_chats: bool = False
+
+
+class CreateBackupBody(BaseModel):
+    include_config: bool = True
+    include_workspaces: bool = True
+    include_skill_packages: bool = True
+    include_plugins: bool = True
+    include_knowledge: bool = True
+    include_chats: bool = False
 
 
 def _agent_rows(server: Any) -> list[Any]:
@@ -69,6 +84,12 @@ def _auto_settings_payload(server: Any) -> dict[str, Any]:
         "auto_enabled": backup.auto_enabled,
         "schedule": backup.schedule,
         "retention_count": backup.retention_count,
+        "include_config": backup.include_config,
+        "include_workspaces": backup.include_workspaces,
+        "include_skill_packages": backup.include_skill_packages,
+        "include_plugins": backup.include_plugins,
+        "include_knowledge": backup.include_knowledge,
+        "include_chats": backup.include_chats,
         "scheduled": scheduled,
     }
 
@@ -83,6 +104,7 @@ def _create_and_store_manual_backup(
     agent_rows: list[Any],
     pool: DatabasePool,
     db_config: DatabaseConfig,
+    options: CreateBackupBody,
 ) -> BackupFileInfo:
     """Sync create + place for ``asyncio.to_thread`` (keeps the event loop free)."""
     with tempfile.TemporaryDirectory() as tmp:
@@ -93,6 +115,12 @@ def _create_and_store_manual_backup(
             pool=pool,
             db_config=db_config,
             dest=tmp_path,
+            include_config=options.include_config,
+            include_workspaces=options.include_workspaces,
+            include_skill_packages=options.include_skill_packages,
+            include_plugins=options.include_plugins,
+            include_knowledge=options.include_knowledge,
+            include_chats=options.include_chats,
         )
         return place_backup_file(paths, filename, tmp_path)
 
@@ -124,6 +152,7 @@ def _create_ephemeral_backup(
     agent_rows: list[Any],
     pool: DatabasePool,
     db_config: DatabaseConfig,
+    options: CreateBackupBody,
 ) -> tuple[Path, str]:
     """Write a backup to a temp file; caller must delete after the response is sent."""
     fd, name = tempfile.mkstemp(prefix="octop-export-", suffix=".tar.gz")
@@ -136,6 +165,12 @@ def _create_ephemeral_backup(
             pool=pool,
             db_config=db_config,
             dest=tmp_path,
+            include_config=options.include_config,
+            include_workspaces=options.include_workspaces,
+            include_skill_packages=options.include_skill_packages,
+            include_plugins=options.include_plugins,
+            include_knowledge=options.include_knowledge,
+            include_chats=options.include_chats,
         )
     except Exception:
         tmp_path.unlink(missing_ok=True)
@@ -235,11 +270,13 @@ async def run_auto_backup_now(
 
 @router.post("/backup/create", summary="Create backup and save to backups dir")
 async def create_backup(
+    body: CreateBackupBody | None = None,
     _: Any = Depends(require_permission("backup")),
     server: Any = Depends(get_server),
 ) -> dict[str, Any]:
-    """Create a full backup archive and persist it under ``backups_dir``."""
+    """Create a selected-content backup and persist it under ``backups_dir``."""
     assert server.services is not None
+    options = body or CreateBackupBody()
     _raise_if_backup_busy()
     async with hold_backup_lock("create"):
         entry = await asyncio.to_thread(
@@ -248,6 +285,7 @@ async def create_backup(
             agent_rows=_agent_rows(server),
             pool=server.services.db,
             db_config=server.services.config.database,
+            options=options,
         )
     return {"ok": True, "item": entry.to_dict()}
 
@@ -330,11 +368,17 @@ async def remove_backup_file(
 
 @router.get(
     "/backup/export",
-    summary="Download full system backup (ephemeral)",
+    summary="Download selected system backup (ephemeral)",
     response_class=FileResponse,
 )
 async def export_backup(
     background_tasks: BackgroundTasks,
+    include_config: bool = Query(default=True),
+    include_workspaces: bool = Query(default=True),
+    include_skill_packages: bool = Query(default=True),
+    include_plugins: bool = Query(default=True),
+    include_knowledge: bool = Query(default=True),
+    include_chats: bool = Query(default=False),
     _: Any = Depends(require_permission("backup")),
     server: Any = Depends(get_server),
 ) -> FileResponse:
@@ -348,6 +392,14 @@ async def export_backup(
             agent_rows=_agent_rows(server),
             pool=server.services.db,
             db_config=server.services.config.database,
+            options=CreateBackupBody(
+                include_config=include_config,
+                include_workspaces=include_workspaces,
+                include_skill_packages=include_skill_packages,
+                include_plugins=include_plugins,
+                include_knowledge=include_knowledge,
+                include_chats=include_chats,
+            ),
         )
     background_tasks.add_task(_unlink_quiet, tmp_path)
     return FileResponse(
diff --git a/src/octop/api/routers/browser/__init__.py b/src/octop/api/routers/browser/__init__.py
index cf572c0c..61fa8c4b 100644
--- a/src/octop/api/routers/browser/__init__.py
+++ b/src/octop/api/routers/browser/__init__.py
@@ -1,17 +1,17 @@
-"""Browser routers — Playwright sessions, harness-browser, and WS screencast."""
+"""Browser routers — env/install, harness-browser, record/replay, WS screencast."""
 
 from __future__ import annotations
 
 from fastapi import APIRouter
 
+from octop.api.routers.browser.env import router as env_router
 from octop.api.routers.browser.harness import router as harness_router
 from octop.api.routers.browser.record_replay import router as record_replay_router
-from octop.api.routers.browser.sessions import router as sessions_router
 from octop.api.routers.browser.stream import router as stream_router
 from octop.api.routers.browser.uninstall import router as uninstall_router
 
 router = APIRouter()
-router.include_router(sessions_router)
+router.include_router(env_router)
 router.include_router(harness_router)
 router.include_router(record_replay_router)
 router.include_router(stream_router)
diff --git a/src/octop/api/routers/browser/env.py b/src/octop/api/routers/browser/env.py
new file mode 100644
index 00000000..62dc02f4
--- /dev/null
+++ b/src/octop/api/routers/browser/env.py
@@ -0,0 +1,174 @@
+"""Browser environment probe and Chromium install (SSE).
+
+Live sessions are harness-browser (see ``harness.py`` / ``stream.py``), not
+in-process Playwright.
+
+  GET    /api/browser/env-status  → { playwright, browsers_ok, harness_browser, … }
+  POST   /api/browser/install     → SSE Playwright Chromium install (or reuse system Chrome)
+"""
+
+from __future__ import annotations
+
+import json
+from collections.abc import AsyncGenerator
+from typing import Any
+
+from fastapi import APIRouter, Depends
+from fastapi.responses import StreamingResponse
+
+from octop.api.deps import current_user, require_permission
+
+router = APIRouter()
+
+
+def _probe_env() -> dict[str, Any]:
+    """Cheap synchronous probe of browser environment availability.
+
+    Requirements:
+      1. Detect system Chrome/Chromium **or** Playwright-managed Chromium
+         via the same ``find_chrome`` path used at launch time.
+      2. ``browsers_ok`` means launch can use that binary (screenshot stream).
+      3. Install (elsewhere) downloads Playwright Chromium only when missing.
+      4. ``playwright_chromium`` flags whether *our* install exists (uninstall
+         target); never implies deleting the user's system browser.
+
+    ``verify_chromium`` is install-time only (see ``POST /browser/install``).
+    """
+    out: dict[str, Any] = {
+        "playwright": False,
+        "browsers_ok": False,
+        "harness_browser": False,
+        "playwright_chromium": False,
+        "chrome_path": None,
+        "chrome_source": None,  # "system" | "playwright" | None
+        "error": None,
+    }
+
+    from octop.infra.browser.setup import (  # noqa: PLC0415
+        chrome_source_for_path,
+        playwright_chromium_installed,
+    )
+
+    out["playwright_chromium"] = playwright_chromium_installed()
+
+    try:
+        from harness_browser import BrowserSession  # noqa: F401, PLC0415
+        from harness_browser.cdp.launcher import find_chrome  # noqa: PLC0415
+
+        out["harness_browser"] = True
+        chrome = find_chrome()
+        if chrome:
+            out["browsers_ok"] = True
+            out["chrome_path"] = chrome
+            out["chrome_source"] = chrome_source_for_path(chrome)
+        else:
+            out["error"] = (
+                "Chrome/Chromium not found. Install Google Chrome, or run "
+                "POST /api/browser/install to download Playwright Chromium."
+            )
+    except ImportError:
+        pass
+
+    try:
+        import playwright  # noqa: F401, PLC0415
+
+        out["playwright"] = True
+    except ImportError as exc:
+        if not out["harness_browser"]:
+            out["error"] = (
+                f"playwright not installed: {exc}. Install octop[browser] extras or harness-browser."
+            )
+        return out
+
+    if not out["browsers_ok"] and not out.get("error"):
+        out["error"] = (
+            "Chrome/Chromium not found. Install Google Chrome, or run "
+            "POST /api/browser/install to download Playwright Chromium."
+        )
+    return out
+
+
+@router.get("/browser/env-status")
+async def env_status(_: Any = Depends(current_user)) -> dict[str, Any]:
+    return _probe_env()
+
+
+def _verify_browser_binary(exe: str) -> tuple[bool, str]:
+    """Install-time check: binary exists and responds to ``--version``."""
+    import subprocess  # noqa: PLC0415
+
+    try:
+        result = subprocess.run(
+            [exe, "--version"],
+            capture_output=True,
+            text=True,
+            timeout=10,
+            check=False,
+        )
+    except subprocess.TimeoutExpired:
+        return False, f"Browser verification timed out: {exe}"
+    except OSError as exc:
+        return False, f"Browser verification failed: {exc}"
+
+    if result.returncode == 0:
+        version = (result.stdout or result.stderr or "").strip() or exe
+        return True, version
+    detail = (result.stderr or result.stdout or "").strip()
+    return False, f"Browser exited with code {result.returncode}: {detail}"
+
+
+@router.post("/browser/install")
+async def install(_: Any = Depends(require_permission("browser"))) -> StreamingResponse:
+    """Stream Chromium install progress as SSE.
+
+    Each event is a JSON line conforming to ``harness_browser.InstallEvent``:
+      ``{"log": "..."}``                              — progress line
+      ``{"done": true, "success": true}``             — finished OK
+      ``{"done": true, "success": false, "error": "..."}``  — failed
+
+    If a system Chrome/Chromium is already resolvable via ``find_chrome``,
+    verify it with ``--version`` and short-circuit (no Playwright download).
+    Otherwise delegate to ``install_chromium_stream`` (which runs its own
+    ``verify_chromium`` after download).
+
+    Returns ``text/event-stream``; the client reads until ``done`` appears.
+    """
+
+    async def _event_stream() -> AsyncGenerator[str, None]:
+        try:
+            from harness_browser.cdp.launcher import find_chrome  # noqa: PLC0415
+
+            chrome = find_chrome()
+            if chrome:
+                yield ("data: " + json.dumps({"log": f"Found browser: {chrome}"}) + "\n\n")
+                yield ("data: " + json.dumps({"log": "Verifying installation ..."}) + "\n\n")
+                ok, msg = _verify_browser_binary(chrome)
+                if ok:
+                    yield "data: " + json.dumps({"log": msg}) + "\n\n"
+                    yield ("data: " + json.dumps({"done": True, "success": True}) + "\n\n")
+                    return
+                yield (
+                    "data: "
+                    + json.dumps(
+                        {
+                            "log": (
+                                f"System browser not usable ({msg}); "
+                                "falling back to Playwright Chromium download ..."
+                            )
+                        }
+                    )
+                    + "\n\n"
+                )
+
+            from harness_browser import install_chromium_stream  # noqa: PLC0415
+
+            async for event in install_chromium_stream():
+                yield f"data: {json.dumps(event)}\n\n"
+        except Exception as exc:  # pragma: no cover
+            yield f"data: {json.dumps({'done': True, 'success': False, 'error': str(exc)})}\n\n"
+
+    return StreamingResponse(
+        _event_stream(),
+        media_type="text/event-stream",
+        headers={"Cache-Control": "no-cache", "X-Accel-Buffering": "no"},
+    )
diff --git a/src/octop/api/routers/browser/harness.py b/src/octop/api/routers/browser/harness.py
index 0569858e..a992fbc5 100644
--- a/src/octop/api/routers/browser/harness.py
+++ b/src/octop/api/routers/browser/harness.py
@@ -9,11 +9,12 @@
 from pathlib import Path
 from typing import Any
 
-from fastapi import APIRouter, Depends, Query
+from fastapi import APIRouter, Depends
 from pydantic import BaseModel
 
 from octop.api.deps import current_user
 from octop.infra.errors import ErrorCode, OctopError
+from octop.infra.utils.browser_media import user_browser_profile
 
 logger = logging.getLogger(__name__)
 
@@ -70,14 +71,12 @@ async def resolve_harness_session(
 ) -> Any | None:
     """Return a live :class:`harness_browser.BrowserSession` for ``profile_hint``.
 
-    Resolution order:
-      1. Exact profile name when present in the in-process registry
-      2. ``default`` when the hint is ``auto`` / empty / unknown
-      3. Any profile already registered (agent may have started Chrome)
-      4. Create (launch-or-attach) for the resolved profile name — only when
-         ``create=True`` (screencast / interactive clients). Listen-only
-         dashboard hooks pass ``create=False`` so a status WebSocket cannot
-         spawn Chrome just to watch for session updates.
+    *profile_hint* must be a concrete profile name (``user-<id>``). Empty /
+    ``auto`` never falls back to another user's session or to ``default``.
+
+    When ``create=True`` (screencast / interactive clients) a missing live
+    session is launched. Listen-only dashboard hooks pass ``create=False``
+    so a status WebSocket cannot spawn Chrome just to watch for updates.
 
     Cached entries are health-checked before reuse — a dead/stale session
     (e.g. browser crashed) is evicted and replaced with a freshly launched
@@ -96,32 +95,28 @@ async def resolve_harness_session(
         ) from exc
 
     hint = (profile_hint or "").strip()
-    candidates: list[str] = []
-    if hint and hint not in {"auto"}:
-        candidates.append(hint)
-    if "default" not in candidates:
-        candidates.append("default")
-    candidates.extend(k for k in _registry if k not in candidates)
-
-    for name in candidates:
-        cached = _registry.get(name)
-        if cached is None:
-            continue
+    if not hint or hint == "auto":
+        if not create:
+            return None
+        raise OctopError(ErrorCode.SLASH_BAD_ARGS, "browser profile is required")
+
+    cached = _registry.get(hint)
+    if cached is not None:
         if await _is_session_alive(cached):
             return cached
         logger.warning(
             "harness session %r is dead (stale CDP connection); discarding%s",
-            name,
+            hint,
             " and relaunching" if create else "",
         )
-        _registry.pop(name, None)
+        _registry.pop(hint, None)
         with contextlib.suppress(Exception):
             await cached.close()
 
     if not create:
         return None
 
-    profile = candidates[0] if candidates else "default"
+    profile = hint
     harness_settings = None
     if server is not None and agent_id:
         from octop.api.common.agent_workspace import (  # noqa: PLC0415
@@ -261,7 +256,7 @@ async def harness_list_tabs(sess: Any) -> list[dict[str, Any]]:
     return tabs
 
 
-async def harness_sessions_payload(conversation_id: str | None = None) -> dict[str, Any]:
+async def harness_sessions_payload(profile_name: str) -> dict[str, Any]:
     """Shape expected by the dashboard ``BrowserSessionsResponse`` type."""
     try:
         from harness_browser.tool_interface import _registry
@@ -271,7 +266,7 @@ async def harness_sessions_payload(conversation_id: str | None = None) -> dict[s
     now = int(time.time() * 1000)
     sessions: list[dict[str, Any]] = []
     for profile, sess in list(_registry.items()):
-        if conversation_id and profile not in {conversation_id, "default"}:
+        if profile != profile_name:
             continue
         url = await harness_page_url(sess)
         sessions.append(
@@ -295,19 +290,16 @@ async def harness_sessions_payload(conversation_id: str | None = None) -> dict[s
 
 
 @router.get("/browser/harness-sessions")
-async def list_harness_sessions(
-    conversation_id: str | None = Query(default=None),
-    _: Any = Depends(current_user),
-) -> dict[str, Any]:
-    """List live harness-browser profiles (agent ``browser_use`` sessions)."""
-    return await harness_sessions_payload(conversation_id)
+async def list_harness_sessions(user: Any = Depends(current_user)) -> dict[str, Any]:
+    """List the current user's live harness-browser profile."""
+    return await harness_sessions_payload(user_browser_profile(user.id))
 
 
 @router.post("/browser/sessions/{session_id}/handoff")
 async def handoff(
     session_id: str,
     body: HandoffBody,
-    _: Any = Depends(current_user),
+    user: Any = Depends(current_user),
 ) -> dict[str, Any]:
     """Switch control of a browser session between the agent and the user.
 
@@ -316,14 +308,17 @@ async def handoff(
     session and reflected in ``harness-sessions`` and the WS screencast so a
     takeover survives dashboard reloads and reconnects.
     """
+    profile = user_browser_profile(user.id)
+    if session_id not in {"", "auto"} and session_id != profile:
+        logger.debug("handoff path %r ignored; using %r", session_id, profile)
     target = body.target
     if target not in ("agent", "user"):
         raise OctopError(ErrorCode.SLASH_BAD_ARGS, "target must be 'agent' or 'user'")
-    _CONTROL_OWNERS[session_id] = target
+    _CONTROL_OWNERS[profile] = target
 
-    payload = await harness_sessions_payload(conversation_id=session_id)
+    payload = await harness_sessions_payload(profile)
     session = next(
-        (s for s in payload.get("sessions", []) if s["session_id"] == session_id),
+        (s for s in payload.get("sessions", []) if s["session_id"] == profile),
         None,
     )
     if session is None:
@@ -331,9 +326,9 @@ async def handoff(
         # still flip its local control-owner state.
         now = int(time.time() * 1000)
         session = {
-            "session_id": session_id,
-            "profile_name": session_id,
-            "conversation_id": session_id,
+            "session_id": profile,
+            "profile_name": profile,
+            "conversation_id": profile,
             "channel_source": "dashboard",
             "state": "idle",
             "control_owner": target,
@@ -348,16 +343,10 @@ async def handoff(
     "/browser/shutdown",
     summary="Stop the local Chrome process for a harness-browser profile",
 )
-async def shutdown_browser(
-    profile: str | None = Query(
-        default=None,
-        description="Profile name. Defaults to the live session, then 'default'.",
-    ),
-    _: Any = Depends(current_user),
-) -> dict[str, Any]:
-    """Terminate Octop-managed Chrome for ``profile``. Cookies stay on disk."""
+async def shutdown_browser(user: Any = Depends(current_user)) -> dict[str, Any]:
+    """Terminate the current user's Octop-managed Chrome. Cookies stay on disk."""
     try:
-        from harness_browser.tool_interface import _registry, browser_tool
+        from harness_browser.tool_interface import browser_tool
     except ImportError as exc:
         raise OctopError(
             ErrorCode.INTERNAL_ERROR,
@@ -365,9 +354,7 @@ async def shutdown_browser(
             status=503,
         ) from exc
 
-    hint = (profile or "").strip()
-    if not hint or hint == "auto":
-        hint = next(iter(_registry), "default")
+    hint = user_browser_profile(user.id)
 
     result = await browser_tool(action="close_session", profile=hint, kill=True)
     _CONTROL_OWNERS.pop(hint, None)
diff --git a/src/octop/api/routers/browser/record_replay.py b/src/octop/api/routers/browser/record_replay.py
index 21f359e2..e906e5a9 100644
--- a/src/octop/api/routers/browser/record_replay.py
+++ b/src/octop/api/routers/browser/record_replay.py
@@ -9,13 +9,12 @@
 
 from octop.api.deps import current_user
 from octop.infra.errors import ErrorCode, OctopError
+from octop.infra.utils.browser_media import user_browser_profile
 
 router = APIRouter()
 
 
 class RecordStartBody(BaseModel):
-    profile: str = "default"
-    agent_profile: str | None = Field(default=None, alias="agentProfile")
     name: str | None = None
     privacy: str = "mask-sensitive"
 
@@ -36,7 +35,6 @@ class RecordStopAndGenerateSkillBody(BaseModel):
 
 class ReplayBody(BaseModel):
     recording_id: str = Field(alias="recordingId")
-    profile: str = "default"
     inputs: dict[str, str] = Field(default_factory=dict)
 
 
@@ -87,21 +85,47 @@ async def run_replay_recording(
     return await ReplayRunner().run(recording_id, profile=profile, inputs=inputs)
 
 
-def _latest_recording_id() -> str | None:
+def _latest_recording_id(profile: str) -> str | None:
     try:
         from harness_browser.record.store import RecordingStore
     except ImportError:
         return None
-    recordings = RecordingStore().list_recordings()
+    recordings = [
+        manifest for manifest in RecordingStore().list_recordings() if manifest.profile == profile
+    ]
     if not recordings:
         return None
     latest = max(recordings, key=lambda m: m.created_at)
     return latest.recording_id
 
 
-def _effective_profile(profile: str | None, agent_profile: str | None = None) -> str:
-    chosen = (agent_profile or profile or "default").strip()
-    return chosen or "default"
+def _require_owned_recording(recording_id: str, profile: str) -> Any:
+    try:
+        from harness_browser.record.store import RecordingStore
+    except ImportError as exc:
+        raise OctopError(
+            ErrorCode.INTERNAL_ERROR,
+            "harness-browser record/replay is not installed",
+            status=503,
+        ) from exc
+    try:
+        manifest = RecordingStore().read_manifest(recording_id)
+    except FileNotFoundError as exc:
+        raise OctopError(ErrorCode.NOT_FOUND, "recording not found") from exc
+    except Exception as exc:
+        raise OctopError(ErrorCode.NOT_FOUND, "recording not found") from exc
+    if str(getattr(manifest, "profile", "") or "") != profile:
+        raise OctopError(ErrorCode.NOT_FOUND, "recording not found")
+    return manifest
+
+
+def _active_for_profile(data: dict[str, Any], profile: str) -> Any:
+    active = data.get("active")
+    if not isinstance(active, dict):
+        return None
+    if str(active.get("profile") or "") != profile:
+        return None
+    return active
 
 
 def _raise_if_not_ok(data: dict[str, Any], *, status: int = 500) -> None:
@@ -116,26 +140,28 @@ def _raise_if_not_ok(data: dict[str, Any], *, status: int = 500) -> None:
 
 
 @router.get("/browser/record-replay/status")
-async def record_status(_: Any = Depends(current_user)) -> dict[str, Any]:
+async def record_status(user: Any = Depends(current_user)) -> dict[str, Any]:
+    profile = user_browser_profile(user.id)
     try:
         data = await send_record_request({"command": "status"})
     except Exception:
         data = {"ok": True, "active": None}
-    data["latestRecordingId"] = _latest_recording_id()
+    data["active"] = _active_for_profile(data, profile)
+    data["latestRecordingId"] = _latest_recording_id(profile)
     return data
 
 
 @router.post("/browser/record-replay/start")
 async def record_start(
     body: RecordStartBody,
-    _: Any = Depends(current_user),
+    user: Any = Depends(current_user),
 ) -> dict[str, Any]:
     daemon = await ensure_record_daemon()
     _raise_if_not_ok(daemon, status=503)
     data = await send_record_request(
         {
             "command": "start",
-            "profile": _effective_profile(body.profile, body.agent_profile),
+            "profile": user_browser_profile(user.id),
             "name": body.name,
             "privacy": body.privacy or "mask-sensitive",
             "screenshots": "off",
@@ -148,12 +174,23 @@ async def record_start(
 @router.post("/browser/record-replay/stop")
 async def record_stop(
     body: RecordStopBody,
-    _: Any = Depends(current_user),
+    user: Any = Depends(current_user),
 ) -> dict[str, Any]:
+    profile = user_browser_profile(user.id)
+    recording_id = body.recording_id
+    if recording_id:
+        _require_owned_recording(recording_id, profile)
+    else:
+        try:
+            status = await send_record_request({"command": "status"})
+        except Exception:
+            status = {}
+        if _active_for_profile(status if isinstance(status, dict) else {}, profile) is None:
+            raise OctopError(ErrorCode.NOT_FOUND, "recording not found")
     data = await send_record_request(
         {
             "command": "stop",
-            "recording_id": body.recording_id,
+            "recording_id": recording_id,
             "generate_steps": body.generate_steps,
             "name": body.name,
         }
@@ -165,7 +202,7 @@ async def record_stop(
 @router.post("/browser/record-replay/stop-and-generate-skill")
 async def record_stop_and_generate_skill(
     body: RecordStopAndGenerateSkillBody,
-    _: Any = Depends(current_user),
+    user: Any = Depends(current_user),
 ) -> dict[str, Any]:
     """Stop recording, generate steps + skill draft, and return the skill content.
 
@@ -173,6 +210,18 @@ async def record_stop_and_generate_skill(
     generate-skill into a single call, returning the generated skill markdown
     content so the frontend can display it for user confirmation.
     """
+    profile = user_browser_profile(user.id)
+    recording_id = body.recording_id
+    if recording_id:
+        _require_owned_recording(recording_id, profile)
+    else:
+        try:
+            status = await send_record_request({"command": "status"})
+        except Exception:
+            status = {}
+        if _active_for_profile(status if isinstance(status, dict) else {}, profile) is None:
+            raise OctopError(ErrorCode.NOT_FOUND, "recording not found")
+
     # 1) Stop the recording
     data = await send_record_request(
         {
@@ -187,6 +236,7 @@ async def record_stop_and_generate_skill(
     recording_id = data.get("recordingId") or body.recording_id
     if not recording_id:
         return {**data, "skillContent": None, "skillName": None}
+    _require_owned_recording(str(recording_id), profile)
 
     # 2) Generate skill from the recording
     await send_record_request(
@@ -232,35 +282,23 @@ async def record_stop_and_generate_skill(
 @router.post("/browser/record-replay/skill-content")
 async def get_skill_content(
     body: SkillContentBody,
-    _: Any = Depends(current_user),
+    user: Any = Depends(current_user),
 ) -> dict[str, Any]:
     """Read the generated skill content (draft.skill.md) for a given recording."""
     skill_content = None
     skill_name = None
     skill_exists = False
-
-    try:
-        from harness_browser.record.store import RecordingStore
-
-        store = RecordingStore()
-        manifest = store.read_manifest(body.recording_id)
-        if manifest is not None:
-            import pathlib
-
-            rec_dir = pathlib.Path(store.recordings_dir) / body.recording_id
-            skill_path = rec_dir / "draft.skill.md"
-            if skill_path.exists():
-                skill_content = skill_path.read_text(encoding="utf-8")
-                skill_exists = True
-                skill_name = manifest.target.title.strip() or body.recording_id
-    except ImportError as exc:
-        raise OctopError(
-            ErrorCode.INTERNAL_ERROR,
-            "harness-browser record/replay is not installed",
-            status=503,
-        ) from exc
-    except Exception as exc:
-        raise OctopError(ErrorCode.INTERNAL_ERROR, str(exc)) from exc
+    profile = user_browser_profile(user.id)
+    manifest = _require_owned_recording(body.recording_id, profile)
+    from harness_browser.record.store import RecordingStore
+
+    store = RecordingStore()
+    rec_dir = store.recording_dir(body.recording_id)
+    skill_path = rec_dir / "draft.skill.md"
+    if skill_path.exists():
+        skill_content = skill_path.read_text(encoding="utf-8")
+        skill_exists = True
+        skill_name = manifest.target.title.strip() or body.recording_id
 
     return {
         "ok": True,
@@ -274,11 +312,13 @@ async def get_skill_content(
 @router.post("/browser/record-replay/replay")
 async def replay_recording(
     body: ReplayBody,
-    _: Any = Depends(current_user),
+    user: Any = Depends(current_user),
 ) -> dict[str, Any]:
+    profile = user_browser_profile(user.id)
+    _require_owned_recording(body.recording_id, profile)
     data = await run_replay_recording(
         body.recording_id,
-        profile=body.profile or "default",
+        profile=profile,
         inputs=body.inputs,
     )
     return data
diff --git a/src/octop/api/routers/browser/sessions.py b/src/octop/api/routers/browser/sessions.py
deleted file mode 100644
index 2d411fb3..00000000
--- a/src/octop/api/routers/browser/sessions.py
+++ /dev/null
@@ -1,704 +0,0 @@
-"""Remote browser router — Playwright-backed sessions (P1.5).
-
-Surface (intentionally lean — finnie's full router has handoff /
-multi-tab control / SSE install progress; we cap to what the dashboard
-actually drives in the octop MVP):
-
-  GET    /api/browser/env-status                  → { playwright, browsers_ok, error? }
-  POST   /api/browser/install                     → run ``playwright install chromium``
-                                                    inline (fire-and-forget; returns 202)
-  GET    /api/browser/sessions                    → list active sessions
-  POST   /api/browser/sessions                    → create + return id
-  DELETE /api/browser/sessions/{id}               → close
-  POST   /api/browser/sessions/{id}/goto          → navigate
-  GET    /api/browser/sessions/{id}/screenshot    → PNG body
-
-All endpoints require an authenticated user; cross-user isolation is
-in-memory (sessions are keyed by ``(user_id, session_id)``). Playwright
-is an optional dependency — endpoints return a structured 503 if the
-``playwright`` import or ``chromium`` browser binary is missing.
-"""
-
-from __future__ import annotations
-
-import asyncio
-import contextlib
-import json
-import logging
-import uuid
-from collections.abc import AsyncGenerator
-from pathlib import Path
-from typing import Any
-
-from fastapi import APIRouter, Depends
-from fastapi.responses import Response, StreamingResponse
-from pydantic import BaseModel
-
-from octop.api.deps import current_user, get_server, require_permission
-from octop.infra.errors import ErrorCode, OctopError
-from octop.infra.server import OctopServer
-
-logger = logging.getLogger(__name__)
-
-router = APIRouter()
-
-_CHROMIUM_ARGS = [
-    "--no-sandbox",
-    "--disable-dev-shm-usage",
-    "--disable-gpu",
-    "--disable-setuid-sandbox",
-    "--restore-last-session",
-]
-
-
-# --- module-level state (process-wide) -------------------------------------
-
-
-class _Session:
-    """Browser session: one browser context, one or more pages (tabs)."""
-
-    def __init__(
-        self,
-        playwright: Any,
-        browser: Any,
-        context: Any,
-        owner_id: int,
-    ) -> None:
-        self.id = uuid.uuid4().hex[:12]
-        self.playwright = playwright
-        self.browser = browser
-        self.context = context
-        self.pages: list[Any] = []  # ordered list of open pages
-        self.active_idx: int = 0  # index of currently active page
-        self.owner_id = owner_id
-        self._lock = asyncio.Lock()
-
-    @property
-    def page(self) -> Any:
-        """Currently active page."""
-        return self.pages[self.active_idx]
-
-    @property
-    def url(self) -> str:
-        try:
-            return str(self.page.url)
-        except Exception:
-            return "about:blank"
-
-    def _track_page(self, page: Any) -> None:
-        """Wire lifecycle hooks for a Playwright page."""
-
-        def _on_close() -> None:
-            asyncio.create_task(self._on_page_closed(page))
-
-        with contextlib.suppress(Exception):
-            page.on("close", _on_close)
-
-    async def _on_page_closed(self, page: Any) -> None:
-        async with self._lock:
-            if page not in self.pages:
-                return
-            idx = self.pages.index(page)
-            self.pages.pop(idx)
-            if not self.pages:
-                return
-            if self.active_idx >= len(self.pages):
-                self.active_idx = len(self.pages) - 1
-            elif idx < self.active_idx:
-                self.active_idx = max(0, self.active_idx - 1)
-
-    async def _on_new_page(self, page: Any) -> None:
-        """Track a page opened by the browser (popup / new tab)."""
-        async with self._lock:
-            if page.is_closed() or page in self.pages:
-                return
-            self._track_page(page)
-            self.pages.append(page)
-
-    def _wire_context(self) -> None:
-        self.context.on("page", lambda page: asyncio.create_task(self._on_new_page(page)))
-
-    async def sync_pages(self) -> None:
-        """Reconcile tracked pages with the live browser context."""
-        async with self._lock:
-            live = [p for p in self.context.pages if not p.is_closed()]
-            if not live:
-                raise OctopError(ErrorCode.NOT_FOUND, "browser session ended — all tabs closed")
-            seen: set[int] = set()
-            merged: list[Any] = []
-            for p in self.pages:
-                if not p.is_closed() and p in live:
-                    merged.append(p)
-                    seen.add(id(p))
-            for p in live:
-                if id(p) not in seen:
-                    self._track_page(p)
-                    merged.append(p)
-            self.pages = merged
-            if self.active_idx >= len(self.pages):
-                self.active_idx = len(self.pages) - 1
-            elif self.pages[self.active_idx].is_closed():
-                self.active_idx = 0
-
-    async def tab_list(self) -> list[dict[str, Any]]:
-        """Serializable list of tabs for the API response."""
-        await self.sync_pages()
-        tabs: list[dict[str, Any]] = []
-        for i, p in enumerate(self.pages):
-            title = ""
-            url = "about:blank"
-            with contextlib.suppress(Exception):
-                url = str(p.url)
-                title = await p.title()
-            tabs.append(
-                {
-                    "idx": i,
-                    "url": url,
-                    "title": title,
-                    "active": i == self.active_idx,
-                }
-            )
-        return tabs
-
-    async def ensure_page(self) -> Any:
-        await self.sync_pages()
-        page = self.page
-        if page.is_closed():
-            raise OctopError(ErrorCode.NOT_FOUND, "active tab was closed")
-        return page
-
-    async def close(self) -> None:
-        with contextlib.suppress(Exception):
-            await self.context.close()
-        with contextlib.suppress(Exception):
-            await self.playwright.stop()
-
-
-_sessions: dict[str, _Session] = {}
-_session_lock = asyncio.Lock()
-
-
-def _user_profile_dir(home: Path, user_id: int) -> Path:
-    d = home / "browser-profiles" / str(user_id)
-    d.mkdir(parents=True, exist_ok=True)
-    return d
-
-
-def _get_session(user_id: int, session_id: str) -> _Session:
-    s = _sessions.get(session_id)
-    if s is None or s.owner_id != user_id:
-        raise OctopError(ErrorCode.NOT_FOUND, "session not found")
-    return s
-
-
-async def _session_response(sess: _Session) -> dict[str, Any]:
-    tabs = await sess.tab_list()
-    return {"id": sess.id, "url": sess.url, "tabs": tabs}
-
-
-async def _mouse_click(
-    sess: _Session,
-    page: Any,
-    x: float,
-    y: float,
-    *,
-    button: str = "left",
-    click_count: int = 1,
-) -> None:
-    """Click at (x, y); switch to a new tab only when one actually opens."""
-    before = len(sess.pages)
-    await page.mouse.move(x, y)
-    await page.mouse.click(x, y, button=button, click_count=click_count)
-    # Popup tabs arrive via context "page" event — brief yield before reconcile.
-    await asyncio.sleep(0.05)
-    await sess.sync_pages()
-    if len(sess.pages) > before:
-        sess.active_idx = len(sess.pages) - 1
-
-
-# --- env probe -------------------------------------------------------------
-
-
-def _probe_env() -> dict[str, Any]:
-    """Cheap synchronous probe of browser environment availability.
-
-    Requirements:
-      1. Detect system Chrome/Chromium **or** Playwright-managed Chromium
-         via the same ``find_chrome`` path used at launch time.
-      2. ``browsers_ok`` means launch can use that binary (screenshot stream).
-      3. Install (elsewhere) downloads Playwright Chromium only when missing.
-      4. ``playwright_chromium`` flags whether *our* install exists (uninstall
-         target); never implies deleting the user's system browser.
-
-    ``verify_chromium`` is install-time only (see ``POST /browser/install``).
-    """
-    out: dict[str, Any] = {
-        "playwright": False,
-        "browsers_ok": False,
-        "harness_browser": False,
-        "playwright_chromium": False,
-        "chrome_path": None,
-        "chrome_source": None,  # "system" | "playwright" | None
-        "error": None,
-    }
-
-    from octop.infra.browser.setup import (  # noqa: PLC0415
-        chrome_source_for_path,
-        playwright_chromium_installed,
-    )
-
-    out["playwright_chromium"] = playwright_chromium_installed()
-
-    try:
-        from harness_browser import BrowserSession  # noqa: F401, PLC0415
-        from harness_browser.cdp.launcher import find_chrome  # noqa: PLC0415
-
-        out["harness_browser"] = True
-        chrome = find_chrome()
-        if chrome:
-            out["browsers_ok"] = True
-            out["chrome_path"] = chrome
-            out["chrome_source"] = chrome_source_for_path(chrome)
-        else:
-            out["error"] = (
-                "Chrome/Chromium not found. Install Google Chrome, or run "
-                "POST /api/browser/install to download Playwright Chromium."
-            )
-    except ImportError:
-        pass
-
-    try:
-        import playwright  # noqa: F401, PLC0415
-
-        out["playwright"] = True
-    except ImportError as exc:
-        if not out["harness_browser"]:
-            out["error"] = (
-                f"playwright not installed: {exc}. Install octop[browser] extras or harness-browser."
-            )
-        return out
-
-    if not out["browsers_ok"] and not out.get("error"):
-        out["error"] = (
-            "Chrome/Chromium not found. Install Google Chrome, or run "
-            "POST /api/browser/install to download Playwright Chromium."
-        )
-    return out
-
-
-@router.get("/browser/env-status")
-async def env_status(_: Any = Depends(current_user)) -> dict[str, Any]:
-    return _probe_env()
-
-
-# --- install ---------------------------------------------------------------
-
-
-def _verify_browser_binary(exe: str) -> tuple[bool, str]:
-    """Install-time check: binary exists and responds to ``--version``."""
-    import subprocess  # noqa: PLC0415
-
-    try:
-        result = subprocess.run(
-            [exe, "--version"],
-            capture_output=True,
-            text=True,
-            timeout=10,
-            check=False,
-        )
-    except subprocess.TimeoutExpired:
-        return False, f"Browser verification timed out: {exe}"
-    except OSError as exc:
-        return False, f"Browser verification failed: {exc}"
-
-    if result.returncode == 0:
-        version = (result.stdout or result.stderr or "").strip() or exe
-        return True, version
-    detail = (result.stderr or result.stdout or "").strip()
-    return False, f"Browser exited with code {result.returncode}: {detail}"
-
-
-@router.post("/browser/install")
-async def install(_: Any = Depends(require_permission("browser"))) -> StreamingResponse:
-    """Stream Chromium install progress as SSE.
-
-    Each event is a JSON line conforming to ``harness_browser.InstallEvent``:
-      ``{"log": "..."}``                              — progress line
-      ``{"done": true, "success": true}``             — finished OK
-      ``{"done": true, "success": false, "error": "..."}``  — failed
-
-    If a system Chrome/Chromium is already resolvable via ``find_chrome``,
-    verify it with ``--version`` and short-circuit (no Playwright download).
-    Otherwise delegate to ``install_chromium_stream`` (which runs its own
-    ``verify_chromium`` after download).
-
-    Returns ``text/event-stream``; the client reads until ``done`` appears.
-    """
-
-    async def _event_stream() -> AsyncGenerator[str, None]:
-        try:
-            from harness_browser.cdp.launcher import find_chrome  # noqa: PLC0415
-
-            chrome = find_chrome()
-            if chrome:
-                yield ("data: " + json.dumps({"log": f"Found browser: {chrome}"}) + "\n\n")
-                yield ("data: " + json.dumps({"log": "Verifying installation ..."}) + "\n\n")
-                ok, msg = _verify_browser_binary(chrome)
-                if ok:
-                    yield "data: " + json.dumps({"log": msg}) + "\n\n"
-                    yield ("data: " + json.dumps({"done": True, "success": True}) + "\n\n")
-                    return
-                yield (
-                    "data: "
-                    + json.dumps(
-                        {
-                            "log": (
-                                f"System browser not usable ({msg}); "
-                                "falling back to Playwright Chromium download ..."
-                            )
-                        }
-                    )
-                    + "\n\n"
-                )
-
-            from harness_browser import install_chromium_stream  # noqa: PLC0415
-
-            async for event in install_chromium_stream():
-                yield f"data: {json.dumps(event)}\n\n"
-        except Exception as exc:  # pragma: no cover
-            yield f"data: {json.dumps({'done': True, 'success': False, 'error': str(exc)})}\n\n"
-
-    return StreamingResponse(
-        _event_stream(),
-        media_type="text/event-stream",
-        headers={"Cache-Control": "no-cache", "X-Accel-Buffering": "no"},
-    )
-
-
-# --- sessions --------------------------------------------------------------
-
-
-class GotoBody(BaseModel):
-    url: str
-    wait_until: str = "load"  # load / domcontentloaded / networkidle
-
-
-class ActionBody(BaseModel):
-    """A single user interaction event to execute on the page."""
-
-    type: str
-    """Event type: click | dblclick | mousedown | mouseup | mousemove | type | scroll |
-    keydown | keyup | navigate | goback | goforward | reload"""
-
-    x: float | None = None
-    y: float | None = None
-    button: str = "left"  # for mouse events: left | middle | right
-    delta_x: float = 0.0  # for scroll
-    delta_y: float = 0.0  # for scroll
-    text: str | None = None  # for type / key events
-    key: str | None = None  # for keydown / keyup
-    url: str | None = None  # for navigate
-
-
-@router.post("/browser/sessions/{session_id}/action")
-async def action(
-    session_id: str,
-    body: ActionBody,
-    user: Any = Depends(current_user),
-) -> dict[str, Any]:
-    """Execute a single interaction on the session page.
-
-    Supported action types:
-      click / dblclick / mousedown / mouseup / mousemove — mouse at (x, y)
-      type               — insert text (body.text)
-      scroll             — scroll at (x, y) by (delta_x, delta_y)
-      keydown / keyup    — key press (body.key)
-      navigate           — navigate to body.url
-      goback             — history.back()
-      goforward          — history.forward()
-      reload             — reload page
-
-    Returns ``{id, url}`` with the updated session URL.
-    """
-    sess = _get_session(user.id, session_id)
-    try:
-        page = await sess.ensure_page()
-    except OctopError:
-        raise
-    except Exception as exc:
-        raise OctopError(ErrorCode.NOT_FOUND, f"session unavailable: {exc}") from exc
-    t = body.type
-    try:
-        if t in ("click", "dblclick", "mousedown", "mouseup", "mousemove"):
-            if body.x is None or body.y is None:
-                raise OctopError(ErrorCode.SLASH_BAD_ARGS, "x and y required for mouse action")
-            if t == "click":
-                await _mouse_click(sess, page, body.x, body.y, button=body.button)
-            elif t == "dblclick":
-                await _mouse_click(sess, page, body.x, body.y, button=body.button, click_count=2)
-            elif t == "mousemove":
-                await page.mouse.move(body.x, body.y)
-            else:
-                await page.mouse.move(body.x, body.y)
-                if t == "mousedown":
-                    await page.mouse.down(button=body.button)
-                else:
-                    await page.mouse.up(button=body.button)
-        elif t == "type":
-            if body.text is None:
-                raise OctopError(ErrorCode.SLASH_BAD_ARGS, "text required for type")
-            await page.keyboard.type(body.text)
-        elif t == "scroll":
-            if body.x is None or body.y is None:
-                raise OctopError(ErrorCode.SLASH_BAD_ARGS, "x and y required for scroll")
-            await page.mouse.move(body.x, body.y)
-            # Drag-scroll sends small per-frame deltas; amplify for visible movement.
-            await page.mouse.wheel(body.delta_x * 2.5, body.delta_y * 2.5)
-        elif t == "keydown":
-            if body.key is None:
-                raise OctopError(ErrorCode.SLASH_BAD_ARGS, "key required for keydown")
-            await page.keyboard.down(body.key)
-        elif t == "keyup":
-            if body.key is None:
-                raise OctopError(ErrorCode.SLASH_BAD_ARGS, "key required for keyup")
-            await page.keyboard.up(body.key)
-        elif t == "navigate":
-            if body.url is None:
-                raise OctopError(ErrorCode.SLASH_BAD_ARGS, "url required for navigate")
-            await page.goto(body.url, wait_until="domcontentloaded", timeout=30_000)
-        elif t == "goback":
-            await page.go_back(wait_until="domcontentloaded", timeout=15_000)
-        elif t == "goforward":
-            await page.go_forward(wait_until="domcontentloaded", timeout=15_000)
-        elif t == "reload":
-            await page.reload(wait_until="domcontentloaded", timeout=30_000)
-        else:
-            raise OctopError(ErrorCode.SLASH_BAD_ARGS, f"unknown action type: {t!r}")
-        if t in ("navigate", "goback", "goforward", "reload"):
-            await sess.sync_pages()
-    except OctopError:
-        raise
-    except Exception as exc:
-        msg = str(exc)
-        if "has been closed" in msg or "Target page" in msg:
-            with contextlib.suppress(Exception):
-                await sess.sync_pages()
-            raise OctopError(ErrorCode.NOT_FOUND, f"tab closed: {msg}") from exc
-        raise OctopError(ErrorCode.INTERNAL_ERROR, f"action failed: {exc}") from exc
-    return await _session_response(sess)
-
-
-@router.get("/browser/sessions/{session_id}")
-async def get_session(
-    session_id: str,
-    user: Any = Depends(current_user),
-) -> dict[str, Any]:
-    sess = _get_session(user.id, session_id)
-    try:
-        return await _session_response(sess)
-    except OctopError:
-        raise
-    except Exception as exc:
-        raise OctopError(ErrorCode.NOT_FOUND, f"session unavailable: {exc}") from exc
-
-
-@router.get("/browser/sessions")
-async def list_sessions(user: Any = Depends(current_user)) -> list[dict[str, Any]]:
-    out: list[dict[str, Any]] = []
-    for s in _sessions.values():
-        if s.owner_id != user.id:
-            continue
-        with contextlib.suppress(Exception):
-            out.append(await _session_response(s))
-    return out
-
-
-class CreateSessionBody(BaseModel):
-    width: int = 0
-    height: int = 0
-
-
-@router.post("/browser/sessions", status_code=201)
-async def create_session(
-    body: CreateSessionBody = CreateSessionBody(),
-    user: Any = Depends(current_user),
-    server: OctopServer = Depends(get_server),
-) -> dict[str, Any]:
-    env = _probe_env()
-    if not env["playwright"] or not env["browsers_ok"]:
-        # 503: the *dependency* is missing, not the request itself.
-        reason = env["error"] or "browser environment not ready"
-        raise OctopError(
-            ErrorCode.INTERNAL_ERROR,
-            reason,
-            status=503,
-            details={"error": reason},
-        )
-
-    from playwright.async_api import async_playwright  # noqa: PLC0415
-
-    async with _session_lock:
-        # Reuse an existing live session for this user instead of spawning another.
-        for sid, existing in list(_sessions.items()):
-            if existing.owner_id != user.id:
-                continue
-            try:
-                return await _session_response(existing)
-            except OctopError:
-                _sessions.pop(sid, None)
-                with contextlib.suppress(Exception):
-                    await existing.close()
-
-        profile_dir = _user_profile_dir(server.paths.root, user.id)
-        pw = await async_playwright().start()
-        try:
-            launch_kwargs: dict[str, Any] = {
-                "headless": True,
-                "args": list(_CHROMIUM_ARGS),
-            }
-            if body.width > 0 and body.height > 0:
-                launch_kwargs["viewport"] = {"width": body.width, "height": body.height}
-            context = await pw.chromium.launch_persistent_context(
-                str(profile_dir),
-                **launch_kwargs,
-            )
-        except Exception as exc:
-            await pw.stop()
-            raise OctopError(
-                ErrorCode.INTERNAL_ERROR,
-                f"browser launch failed: {exc}",
-                status=500,
-            ) from exc
-        sess = _Session(pw, context.browser, context, owner_id=user.id)
-        sess._wire_context()
-        await sess.sync_pages()
-        if not sess.pages:
-            page = await context.new_page()
-            sess._track_page(page)
-            sess.pages.append(page)
-        _sessions[sess.id] = sess
-    return await _session_response(sess)
-
-
-@router.delete("/browser/sessions/{session_id}", status_code=204)
-async def close_session(
-    session_id: str,
-    user: Any = Depends(current_user),
-) -> None:
-    sess = _get_session(user.id, session_id)
-    async with _session_lock:
-        _sessions.pop(sess.id, None)
-    await sess.close()
-
-
-class NewTabBody(BaseModel):
-    url: str | None = None
-
-
-@router.post("/browser/sessions/{session_id}/tabs", status_code=201)
-async def new_tab(
-    session_id: str,
-    body: NewTabBody = NewTabBody(),
-    user: Any = Depends(current_user),
-) -> dict[str, Any]:
-    """Open a new tab and optionally navigate to ``body.url``."""
-    sess = _get_session(user.id, session_id)
-    page = await sess.context.new_page()
-    warning: str | None = None
-    if body.url:
-        try:
-            await page.goto(body.url, wait_until="domcontentloaded", timeout=30_000)
-        except Exception as exc:
-            # Tab restoration is best-effort. A stale local file URL or a page
-            # that can no longer be reached should not make "Start session"
-            # fail with a 500; keep the browser session alive and report the
-            # failed tab as a warning to the caller.
-            warning = f"failed to open tab {body.url!r}: {exc}"
-            logger.warning("remote browser tab open failed: %s", warning)
-            with contextlib.suppress(Exception):
-                await page.close()
-    # Page is tracked by context.on("page") — only reconcile and switch.
-    await sess.sync_pages()
-    if not page.is_closed():
-        with contextlib.suppress(ValueError):
-            sess.active_idx = sess.pages.index(page)
-    resp = await _session_response(sess)
-    if warning:
-        resp["warning"] = warning
-    return resp
-
-
-@router.delete("/browser/sessions/{session_id}/tabs/{tab_idx}", status_code=200)
-async def close_tab(
-    session_id: str,
-    tab_idx: int,
-    user: Any = Depends(current_user),
-) -> dict[str, Any]:
-    """Close a tab by index. Cannot close the last tab."""
-    sess = _get_session(user.id, session_id)
-    await sess.sync_pages()
-    if len(sess.pages) <= 1:
-        raise OctopError(ErrorCode.SLASH_BAD_ARGS, "cannot close the last tab")
-    if tab_idx < 0 or tab_idx >= len(sess.pages):
-        raise OctopError(ErrorCode.NOT_FOUND, "tab index out of range")
-    page = sess.pages.pop(tab_idx)
-    with contextlib.suppress(Exception):
-        await page.close()
-    # Adjust active_idx if needed
-    if sess.active_idx >= len(sess.pages):
-        sess.active_idx = len(sess.pages) - 1
-    return await _session_response(sess)
-
-
-@router.post("/browser/sessions/{session_id}/tabs/{tab_idx}/switch")
-async def switch_tab(
-    session_id: str,
-    tab_idx: int,
-    user: Any = Depends(current_user),
-) -> dict[str, Any]:
-    """Switch active tab by index."""
-    sess = _get_session(user.id, session_id)
-    await sess.sync_pages()
-    if tab_idx < 0 or tab_idx >= len(sess.pages):
-        raise OctopError(ErrorCode.NOT_FOUND, "tab index out of range")
-    sess.active_idx = tab_idx
-    return await _session_response(sess)
-
-
-@router.post("/browser/sessions/{session_id}/goto")
-async def goto(
-    session_id: str,
-    body: GotoBody,
-    user: Any = Depends(current_user),
-) -> dict[str, Any]:
-    sess = _get_session(user.id, session_id)
-    try:
-        page = await sess.ensure_page()
-        await page.goto(body.url, wait_until=body.wait_until, timeout=30_000)
-    except OctopError:
-        raise
-    except Exception as exc:
-        raise OctopError(ErrorCode.NOT_FOUND, f"navigation failed: {exc}") from exc
-    resp = await _session_response(sess)
-    with contextlib.suppress(Exception):
-        resp["title"] = await sess.page.title()
-    return resp
-
-
-@router.get("/browser/sessions/{session_id}/screenshot")
-async def screenshot(
-    session_id: str,
-    user: Any = Depends(current_user),
-) -> Response:
-    sess = _get_session(user.id, session_id)
-    try:
-        page = await sess.ensure_page()
-        png = await page.screenshot(type="png", full_page=False)
-    except OctopError:
-        raise
-    except Exception as exc:
-        msg = str(exc)
-        if "has been closed" in msg or "Target page" in msg:
-            raise OctopError(ErrorCode.NOT_FOUND, f"tab closed: {msg}") from exc
-        raise OctopError(ErrorCode.NOT_FOUND, f"screenshot failed: {exc}") from exc
-    return Response(content=png, media_type="image/png")
diff --git a/src/octop/api/routers/browser/stream.py b/src/octop/api/routers/browser/stream.py
index 3413744d..f8c3b4ad 100644
--- a/src/octop/api/routers/browser/stream.py
+++ b/src/octop/api/routers/browser/stream.py
@@ -46,6 +46,7 @@
     harness_page_url,
     resolve_harness_session,
 )
+from octop.infra.utils.browser_media import user_browser_profile
 
 logger = logging.getLogger(__name__)
 
@@ -335,14 +336,14 @@ async def browser_stream_ws(
         await websocket.close(code=4001, reason="missing token")
         return
     try:
-        resolve_user_from_token(server, token)
+        user = resolve_user_from_token(server, token)
     except Exception as exc:
         await websocket.close(code=4001, reason=f"auth failed: {exc}")
         return
 
     await websocket.accept()
     sess: Any | None = None
-    profile = "default"
+    profile = user_browser_profile(user.id)
     stream_task: asyncio.Task[None] | None = None
     listen = bool(listen_only)
 
@@ -354,14 +355,11 @@ async def browser_stream_ws(
             await _send_json(websocket, {"type": "error", "message": "expected start message"})
             return
 
-        profile_hint = str(start_msg.get("session_id") or "auto")
-        profile = profile_hint if profile_hint not in {"", "auto"} else "default"
-
         if listen:
             # Status-only clients (chat browser badge) must not spawn Chrome.
             stream_task = asyncio.create_task(_listen_state_loop(websocket, profile))
         else:
-            sess = await resolve_harness_session(profile_hint)
+            sess = await resolve_harness_session(profile)
             assert sess is not None  # create=True always returns or raises
 
             start_url = _normalize_nav_url(str(start_msg.get("url") or ""))
diff --git a/src/octop/api/routers/channels.py b/src/octop/api/routers/channels.py
index 4867aab5..93de511b 100644
--- a/src/octop/api/routers/channels.py
+++ b/src/octop/api/routers/channels.py
@@ -22,6 +22,7 @@
 from octop.api.common.agent import require_agent_owner_row
 from octop.api.deps import get_server, require_permission
 from octop.infra.errors import ErrorCode, OctopError
+from octop.infra.gateway.bot_creators.feishu_runner import extract_feishu_credentials
 from octop.infra.gateway.channels import dingtalk_registration, qr_bind
 from octop.infra.gateway.gateway import ChannelKind
 from octop.infra.utils.locale import DEFAULT_LOCALE, resolve_request_locale
@@ -808,19 +809,6 @@ async def feishu_bot_creator_start(
     if greeting:
         _sanitize_subprocess_arg(greeting, "greeting")
 
-    profile_dir = _safe_profile_directory(target_platform)
-    await _pkill_chrome_profile(profile_dir)
-
-    # Remove stale Chrome singleton lock files
-    for lock_name in ("SingletonLock", "SingletonCookie", "SingletonSocket"):
-        lock_path = profile_dir / lock_name
-        try:
-            await asyncio.to_thread(lock_path.unlink)
-        except FileNotFoundError:
-            pass
-        except OSError as exc:
-            logger.warning("Failed to remove stale %s: %s", lock_name, exc)
-
     script_path = _bot_creator_script("feishu_bot_creator.py")
 
     cmd = [sys.executable, script_path, "create", "--platform", target_platform]
@@ -888,26 +876,12 @@ async def feishu_bot_creator_poll(
         if finished:
             status = "finished" if return_code == 0 else "failed"
 
-        qr_token = None
-        app_id = None
-        app_secret = None
-        for ev in state["lines"]:
-            if ev.get("action") == "show_qrcode":
-                content = ev.get("content", "")
-                try:
-                    qr_data = json.loads(content) if isinstance(content, str) else content
-                    qr_token = qr_data.get("qrlogin", {}).get("token")
-                except (json.JSONDecodeError, AttributeError):
-                    pass
-            if ev.get("action") == "finish" and ev.get("level") == "success":
-                data = ev.get("data", {})
-                app_id = data.get("app_id")
-                app_secret = data.get("app_secret")
+        qr_url, app_id, app_secret = extract_feishu_credentials(state["lines"])
 
         return {
             "status": status,
             "events": new_lines,
-            "qr_token": qr_token,
+            "qr_url": qr_url,
             "app_id": app_id,
             "app_secret": app_secret,
             "return_code": return_code,
diff --git a/src/octop/api/routers/chat/__init__.py b/src/octop/api/routers/chat/__init__.py
index a745d091..c5b06006 100644
--- a/src/octop/api/routers/chat/__init__.py
+++ b/src/octop/api/routers/chat/__init__.py
@@ -7,11 +7,13 @@
 from octop.api.routers.chat.history import router as history_router
 from octop.api.routers.chat.notify_ws import router as notify_ws_router
 from octop.api.routers.chat.routes import router as routes_router
+from octop.api.routers.chat.trajectory import router as trajectory_router
 from octop.api.routers.chat.ws import router as ws_router
 
 router = APIRouter()
 router.include_router(routes_router)
 router.include_router(history_router)
+router.include_router(trajectory_router)
 router.include_router(ws_router)
 router.include_router(notify_ws_router)
 
diff --git a/src/octop/api/routers/chat/history.py b/src/octop/api/routers/chat/history.py
index 35ed58fa..ac0c04d4 100644
--- a/src/octop/api/routers/chat/history.py
+++ b/src/octop/api/routers/chat/history.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import logging
 from pathlib import Path
 from typing import Any
 
@@ -24,9 +25,11 @@
 from octop.infra.errors import ErrorCode, OctopError
 from octop.infra.gateway.hitl.coordinator import pending_hitl_payload
 from octop.infra.gateway.threads import ThreadRegistry, thread_row_has_messages
+from octop.infra.trajectory.service import TrajectoryService
 from octop.infra.utils.locale import resolve_request_locale
 
 router = APIRouter()
+logger = logging.getLogger(__name__)
 
 
 def _agent_is_busy(server: Any, agent_id: str) -> bool:
@@ -491,3 +494,10 @@ async def delete_thread(
     _require_thread(server, agent_id, thread_id, user, as_user)
     await server.app_runtime.agent_registry.delete_thread_checkpoint(agent_id, thread_id)
     server.app_runtime.gateway.thread_registry.delete_thread(thread_id)
+    runtime = getattr(server, "app_runtime", None)
+    trajectory = getattr(runtime, "trajectory_service", None) if runtime is not None else None
+    if isinstance(trajectory, TrajectoryService):
+        try:
+            trajectory.delete_for_thread(thread_id)
+        except Exception:
+            logger.exception("trajectory cascade delete failed thread=%s", thread_id)
diff --git a/src/octop/api/routers/chat/notify_ws.py b/src/octop/api/routers/chat/notify_ws.py
index 2b3f9cec..39d2df36 100644
--- a/src/octop/api/routers/chat/notify_ws.py
+++ b/src/octop/api/routers/chat/notify_ws.py
@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import asyncio
 import contextlib
 import json
 import logging
@@ -46,20 +45,13 @@ async def dashboard_notifications_ws(
     connection_id = uuid.uuid4().hex
     await websocket.accept()
 
-    # Harness/gateway workers run on the server loop; this handler may run on
-    # another (e.g. Starlette TestClient). Marshal frames onto the socket loop.
-    ws_loop = asyncio.get_running_loop()
-
-    async def _emit_frame(frame: dict[str, Any]) -> None:
+    async def send_frame(frame: dict[str, Any]) -> None:
         if websocket.application_state != WebSocketState.CONNECTED:
             return
         await websocket.send_text(
             json.dumps(frame, ensure_ascii=False, default=json_chunk_default),
         )
 
-    async def send_frame(frame: dict[str, Any]) -> None:
-        await asyncio.wrap_future(asyncio.run_coroutine_threadsafe(_emit_frame(frame), ws_loop))
-
     hub.register(connection_id, send_frame, user_id=user.id)
 
     try:
diff --git a/src/octop/api/routers/chat/trajectory.py b/src/octop/api/routers/chat/trajectory.py
new file mode 100644
index 00000000..c6916982
--- /dev/null
+++ b/src/octop/api/routers/chat/trajectory.py
@@ -0,0 +1,400 @@
+"""Thread trajectory REST APIs (history, detail, metrics, export, live SSE)."""
+
+from __future__ import annotations
+
+import asyncio
+import contextlib
+import json
+import logging
+import time
+from collections.abc import AsyncIterator, Iterator
+from dataclasses import asdict
+from datetime import UTC, datetime
+from typing import Any, Literal
+
+from fastapi import APIRouter, Depends, Query, Request
+from fastapi.responses import JSONResponse, StreamingResponse
+from pydantic import BaseModel, Field
+
+from octop.api.common.content_disposition import content_disposition
+from octop.api.deps import current_user, get_server
+from octop.api.routers.chat.history import _require_thread
+from octop.api.routers.chat.sse import format_sse
+from octop.infra.errors import ErrorCode, OctopError
+from octop.infra.trajectory.live import TrajectoryLiveBus
+from octop.infra.trajectory.service import TrajectoryService
+from octop.infra.trajectory.settings import TRAJECTORY_SSE_REPLAY_MAX
+from octop.infra.trajectory.types import TrajectoryEvent
+
+router = APIRouter()
+logger = logging.getLogger(__name__)
+
+TRAJECTORY_DEFAULT_LIMIT = 100
+TRAJECTORY_MAX_LIMIT = 200
+TRAJECTORY_SSE_HEARTBEAT_S = 15.0
+TRAJECTORY_METRICS_PUSH_INTERVAL_S = 1.0
+_SSE_HEADERS = {"Cache-Control": "no-cache", "X-Accel-Buffering": "no"}
+_LIST_OMIT_PAYLOAD_KEYS = frozenset({"content", "text", "thinking"})
+# Keep tool ``args`` / ``result`` on the list endpoint so the ledger can render
+# ``name{args} → result`` without a detail fetch. Clip oversized values so a
+# single huge tool output cannot bloat the history page.
+_LIST_MAX_TOOL_FIELD_CHARS = 2_000
+_LIST_MAX_SUMMARY_CHARS = 240
+_LIST_CLIP_PAYLOAD_KEYS = frozenset({"args", "result"})
+
+
+class TrajectoryEventOut(BaseModel):
+    event_id: str
+    thread_id: str
+    agent_id: str
+    seq: int
+    ts: float
+    kind: str
+    turn_id: str | None = None
+    request_seq: int | None = None
+    is_error: bool
+    summary: str
+    payload: dict[str, Any] = Field(default_factory=dict)
+
+
+class TrajectoryHistoryOut(BaseModel):
+    thread_id: str
+    events: list[TrajectoryEventOut]
+    next_before_seq: int | None = None
+    has_more: bool = False
+
+
+class TrajectoryMetricsOut(BaseModel):
+    turns: int
+    steps: int
+    llm_duration_ms: float | None = None
+    tool_duration_ms: float | None = None
+    ttft_avg_ms: float | None = None
+    tok_per_s: float | None = None
+    cache_hit_ratio: float | None = None
+    input_tokens: int | None = None
+    output_tokens: int | None = None
+    cache_read_tokens: int | None = None
+
+
+def _clamp_limit(limit: int) -> int:
+    return max(1, min(limit, TRAJECTORY_MAX_LIMIT))
+
+
+def _parse_kinds(raw: str | None) -> list[str] | None:
+    if raw is None:
+        return None
+    if not raw.strip():
+        return []
+    return [part.strip() for part in raw.split(",") if part.strip()]
+
+
+def _trajectory_service(server: Any) -> TrajectoryService:
+    runtime = getattr(server, "app_runtime", None)
+    service = getattr(runtime, "trajectory_service", None) if runtime is not None else None
+    if not isinstance(service, TrajectoryService):
+        raise OctopError(ErrorCode.INTERNAL_ERROR, "trajectory service unavailable")
+    return service
+
+
+def _clip_list_payload_value(value: Any) -> Any:
+    if isinstance(value, str):
+        if len(value) <= _LIST_MAX_TOOL_FIELD_CHARS:
+            return value
+        return value[:_LIST_MAX_TOOL_FIELD_CHARS] + "…"
+    if isinstance(value, (dict, list)):
+        raw = json.dumps(value, ensure_ascii=False, default=str)
+        if len(raw) <= _LIST_MAX_TOOL_FIELD_CHARS:
+            return value
+        return raw[:_LIST_MAX_TOOL_FIELD_CHARS] + "…"
+    return value
+
+
+def _summarize_event(event: TrajectoryEvent) -> dict[str, Any]:
+    """List-view projection: drop message bodies; keep clipped tool args/result."""
+    data = asdict(event)
+    summary = str(data.get("summary") or "")
+    if len(summary) > _LIST_MAX_SUMMARY_CHARS:
+        data["summary"] = summary[: _LIST_MAX_SUMMARY_CHARS - 1].rstrip() + "…"
+    payload = data.get("payload")
+    if not isinstance(payload, dict):
+        data["payload"] = {}
+        return data
+    summarized: dict[str, Any] = {}
+    for key, value in payload.items():
+        if key in _LIST_OMIT_PAYLOAD_KEYS:
+            continue
+        if key in _LIST_CLIP_PAYLOAD_KEYS:
+            summarized[key] = _clip_list_payload_value(value)
+        else:
+            summarized[key] = value
+    data["payload"] = summarized
+    return data
+
+
+def _jsonl_lines(service: TrajectoryService, thread_id: str) -> Iterator[str]:
+    for line in service.export_jsonl(thread_id):
+        yield line + "\n"
+
+
+def _live_bus(service: TrajectoryService) -> TrajectoryLiveBus:
+    return service._bus  # noqa: SLF001
+
+
+def _resume_after_seq(after_seq: int | None, last_event_id: str | None) -> int | None:
+    header_seq: int | None = None
+    raw = last_event_id.strip() if last_event_id is not None else ""
+    with contextlib.suppress(ValueError):
+        header_seq = int(raw) if raw else None
+    if after_seq is None:
+        return header_seq
+    if header_seq is None:
+        return after_seq
+    return max(after_seq, header_seq)
+
+
+def _sse_named(event: str, data: Any, *, sse_id: int | None = None) -> str:
+    frame = format_sse(event, data)
+    if sse_id is None:
+        return frame
+    return f"id: {sse_id}\n{frame}"
+
+
+async def _metrics_frame(
+    service: TrajectoryService,
+    thread_id: str,
+    *,
+    refresh: bool,
+) -> str:
+    metrics = await asyncio.to_thread(service.metrics, thread_id, refresh=refresh)
+    return format_sse("metrics", asdict(metrics))
+
+
+def _client_event_payload(message: dict[str, Any]) -> dict[str, Any]:
+    outgoing = dict(message)
+    outgoing.pop("_final", None)
+    return outgoing
+
+
+async def _iter_trajectory_sse(
+    *,
+    request: Request,
+    service: TrajectoryService,
+    thread_id: str,
+    after_seq: int | None,
+) -> AsyncIterator[str]:
+    bus = _live_bus(service)
+    queue = bus.subscribe(thread_id)
+    last_seq = _resume_after_seq(after_seq, request.headers.get("last-event-id"))
+    try:
+        if last_seq is not None:
+            replay = await asyncio.to_thread(
+                service.list_from_seq,
+                thread_id,
+                from_seq=last_seq,
+                limit=TRAJECTORY_SSE_REPLAY_MAX,
+            )
+            for event in replay:
+                payload = asdict(event)
+                event_seq = event.seq
+                # Re-emit ``seq == after_seq`` so a same-seq tool upsert that
+                # landed between REST history and this subscribe still reaches
+                # the browser (clients upsert by event_id). Newer seqs follow.
+                yield _sse_named("event", payload, sse_id=event_seq)
+                if event_seq > last_seq:
+                    last_seq = event_seq
+        yield await _metrics_frame(service, thread_id, refresh=True)
+        last_metrics_at = time.monotonic()
+        while True:
+            if await request.is_disconnected():
+                break
+            try:
+                message = await asyncio.wait_for(queue.get(), timeout=TRAJECTORY_SSE_HEARTBEAT_S)
+            except TimeoutError:
+                yield format_sse("heartbeat", {})
+                continue
+            seq = message.get("seq") if isinstance(message, dict) else None
+            # Same-seq upserts (tool args→result) must reach the browser; only
+            # drop strictly older frames that can appear after a replay race.
+            if isinstance(seq, int) and last_seq is not None and seq < last_seq:
+                continue
+            outgoing = _client_event_payload(message) if isinstance(message, dict) else message
+            yield _sse_named("event", outgoing, sse_id=seq if isinstance(seq, int) else None)
+            if isinstance(seq, int):
+                last_seq = seq
+            force_metrics = isinstance(message, dict) and message.get("_final") is True
+            now = time.monotonic()
+            if force_metrics or now - last_metrics_at >= TRAJECTORY_METRICS_PUSH_INTERVAL_S:
+                yield await _metrics_frame(service, thread_id, refresh=force_metrics)
+                last_metrics_at = now
+    except asyncio.CancelledError:
+        raise
+    except Exception:
+        logger.exception("trajectory SSE failed thread=%s", thread_id)
+        yield format_sse("error", {"message": "trajectory stream failed"})
+    finally:
+        bus.unsubscribe(thread_id, queue)
+
+
+@router.get(
+    "/agents/{agent_id}/threads/{thread_id}/trajectory",
+    summary="Thread trajectory history",
+    response_model=TrajectoryHistoryOut,
+)
+async def get_thread_trajectory(
+    agent_id: str,
+    thread_id: str,
+    limit: int = TRAJECTORY_DEFAULT_LIMIT,
+    before_seq: int | None = Query(
+        default=None, description="Load events with seq less than this."
+    ),
+    kinds: str | None = Query(default=None, description="Comma-separated event kinds to include."),
+    as_user: int | None = None,
+    user: Any = Depends(current_user),
+    server: Any = Depends(get_server),
+) -> TrajectoryHistoryOut:
+    """Return a page of trajectory events for a thread (newest page by default).
+
+    List payloads omit message bodies (``content`` / ``text`` / ``thinking``) but
+    include clipped tool ``args`` / ``result`` for ledger rendering. Use the
+    event detail endpoint for full payloads.
+    """
+    _require_thread(server, agent_id, thread_id, user, as_user)
+    page_limit = _clamp_limit(limit)
+    parsed_kinds = _parse_kinds(kinds)
+    service = _trajectory_service(server)
+
+    def _list() -> list[TrajectoryEvent]:
+        return service.list_events(
+            thread_id,
+            before_seq=before_seq,
+            limit=page_limit + 1,
+            kinds=parsed_kinds,
+        )
+
+    events = await asyncio.to_thread(_list)
+    has_more = len(events) > page_limit
+    page = events[1:] if has_more else events
+    return TrajectoryHistoryOut(
+        thread_id=thread_id,
+        events=[TrajectoryEventOut.model_validate(_summarize_event(event)) for event in page],
+        next_before_seq=page[0].seq if has_more and page else None,
+        has_more=has_more,
+    )
+
+
+@router.get(
+    "/agents/{agent_id}/threads/{thread_id}/trajectory/events/{event_id}",
+    summary="Trajectory event detail",
+    response_model=TrajectoryEventOut,
+)
+async def get_trajectory_event(
+    agent_id: str,
+    thread_id: str,
+    event_id: str,
+    as_user: int | None = None,
+    user: Any = Depends(current_user),
+    server: Any = Depends(get_server),
+) -> TrajectoryEventOut:
+    """Return one trajectory event with its full payload."""
+    _require_thread(server, agent_id, thread_id, user, as_user)
+    event = _trajectory_service(server).get_event(event_id)
+    if event is None or event.thread_id != thread_id or event.agent_id != agent_id:
+        raise OctopError(ErrorCode.NOT_FOUND, f"event {event_id!r} not found")
+    return TrajectoryEventOut.model_validate(asdict(event))
+
+
+@router.get(
+    "/agents/{agent_id}/threads/{thread_id}/trajectory/metrics",
+    summary="Thread trajectory metrics",
+    response_model=TrajectoryMetricsOut,
+)
+async def get_trajectory_metrics(
+    agent_id: str,
+    thread_id: str,
+    as_user: int | None = None,
+    user: Any = Depends(current_user),
+    server: Any = Depends(get_server),
+) -> TrajectoryMetricsOut:
+    """Return aggregated session metrics for a thread's trajectory ledger."""
+    _require_thread(server, agent_id, thread_id, user, as_user)
+    service = _trajectory_service(server)
+    metrics = await asyncio.to_thread(service.metrics, thread_id)
+    return TrajectoryMetricsOut.model_validate(asdict(metrics))
+
+
+@router.get(
+    "/agents/{agent_id}/threads/{thread_id}/trajectory/stream",
+    summary="Live trajectory SSE stream",
+    response_model=None,
+)
+async def stream_thread_trajectory(
+    agent_id: str,
+    thread_id: str,
+    request: Request,
+    after_seq: int | None = Query(
+        default=None, description="Replay events with seq greater than this, then follow live."
+    ),
+    as_user: int | None = None,
+    user: Any = Depends(current_user),
+    server: Any = Depends(get_server),
+) -> StreamingResponse:
+    """Subscribe to live trajectory events for a thread.
+
+    Emits SSE ``event``, ``metrics``, and ``heartbeat`` frames. Resume with
+    ``after_seq`` or the ``Last-Event-ID`` header (seq). Disconnect unsubscribes.
+    """
+    _require_thread(server, agent_id, thread_id, user, as_user)
+    service = _trajectory_service(server)
+
+    async def gen() -> AsyncIterator[str]:
+        async for frame in _iter_trajectory_sse(
+            request=request,
+            service=service,
+            thread_id=thread_id,
+            after_seq=after_seq,
+        ):
+            yield frame
+
+    return StreamingResponse(
+        gen(),
+        media_type="text/event-stream",
+        headers=_SSE_HEADERS,
+    )
+
+
+@router.get(
+    "/agents/{agent_id}/threads/{thread_id}/trajectory/export",
+    summary="Export thread trajectory",
+    response_model=None,
+)
+async def export_thread_trajectory(
+    agent_id: str,
+    thread_id: str,
+    format: Literal["jsonl", "json"] = Query(  # noqa: A002
+        default="jsonl",
+        description="Download format. Default is JSON Lines with full payloads.",
+    ),
+    as_user: int | None = None,
+    user: Any = Depends(current_user),
+    server: Any = Depends(get_server),
+) -> StreamingResponse | JSONResponse:
+    """Download the full trajectory ledger. Default ``jsonl``; ``json`` returns an array."""
+    _require_thread(server, agent_id, thread_id, user, as_user)
+    service = _trajectory_service(server)
+    stamp = datetime.now(UTC).strftime("%Y%m%d-%H%M%S")
+    if format == "json":
+        filename = f"trajectory-{thread_id}-{stamp}.json"
+        payload = await asyncio.to_thread(
+            lambda: [json.loads(line) for line in service.export_jsonl(thread_id)]
+        )
+        return JSONResponse(
+            payload,
+            headers={"Content-Disposition": content_disposition(filename)},
+        )
+    filename = f"trajectory-{thread_id}-{stamp}.jsonl"
+    return StreamingResponse(
+        _jsonl_lines(service, thread_id),
+        media_type="application/x-ndjson",
+        headers={"Content-Disposition": content_disposition(filename)},
+    )
diff --git a/src/octop/api/routers/chat/ws.py b/src/octop/api/routers/chat/ws.py
index 02fcb790..910c3fda 100644
--- a/src/octop/api/routers/chat/ws.py
+++ b/src/octop/api/routers/chat/ws.py
@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import asyncio
 import contextlib
 import json
 import logging
@@ -68,22 +67,13 @@ async def dashboard_chat_ws(
     connection_id = uuid.uuid4().hex
     await websocket.accept()
 
-    # The harness/gateway workers run on the server event loop, but this
-    # handler may run on a different loop (e.g. starlette's TestClient portal).
-    # Marshal outbound frames onto the loop that owns this WebSocket so
-    # cross-loop sends don't deadlock.
-    ws_loop = asyncio.get_running_loop()
-
-    async def _emit_frame(frame: dict[str, Any]) -> None:
+    async def send_frame(frame: dict[str, Any]) -> None:
         if websocket.application_state != WebSocketState.CONNECTED:
             return
         await websocket.send_text(
             json.dumps(frame, ensure_ascii=False, default=json_chunk_default),
         )
 
-    async def send_frame(frame: dict[str, Any]) -> None:
-        await asyncio.wrap_future(asyncio.run_coroutine_threadsafe(_emit_frame(frame), ws_loop))
-
     hub.register(connection_id, send_frame)
 
     try:
diff --git a/src/octop/api/routers/connectors.py b/src/octop/api/routers/connectors.py
index 6c2412ec..6980f2a1 100644
--- a/src/octop/api/routers/connectors.py
+++ b/src/octop/api/routers/connectors.py
@@ -37,7 +37,7 @@
     build_instance_config_json,
     read_default_open,
 )
-from octop.infra.connectors.gateway.cli_dirs import cleanup_creds_cli_dirs, cleanup_keys_for_creds
+from octop.infra.connectors.gateway.cli_dirs import cleanup_creds_cli_dirs
 from octop.infra.connectors.gateway.cli_install import (
     cli_install_status,
     get_cli_install_spec,
@@ -64,7 +64,7 @@
     probe_connector,
     probe_custom_mcp_server,
 )
-from octop.infra.connectors.service import ConnectorService
+from octop.infra.connectors.service import ConnectorNameTakenError, ConnectorService
 from octop.infra.db.repos.connectors import ConnectorRepo
 from octop.infra.errors import ErrorCode, OctopError
 from octop.infra.utils.locale import resolve_request_locale
@@ -78,7 +78,9 @@
 class CreateInstanceBody(BaseModel):
     kind: str
     display_name: str
+    description: str | None = Field(default=None, max_length=500)
     credentials: dict[str, Any] = Field(default_factory=dict)
+    shared: bool = False
     default_open: bool = Field(
         default=False,
         description=(
@@ -91,6 +93,10 @@ class CreateInstanceBody(BaseModel):
 
 class PatchInstanceBody(BaseModel):
     status: str | None = None
+    display_name: str | None = None
+    description: str | None = Field(default=None, max_length=500)
+    credentials: dict[str, Any] | None = None
+    shared: bool | None = None
     default_open: bool | None = Field(
         default=None,
         description=(
@@ -146,11 +152,12 @@ class CustomMcpPutBody(BaseModel):
 class CustomMcpServerPatchBody(BaseModel):
     enabled: bool | None = None
     default_open: bool | None = None
+    shared: bool | None = None
 
     @model_validator(mode="after")
     def _require_one_field(self) -> CustomMcpServerPatchBody:
-        if self.enabled is None and self.default_open is None:
-            raise ValueError("provide enabled and/or default_open")
+        if self.enabled is None and self.default_open is None and self.shared is None:
+            raise ValueError("provide enabled, default_open and/or shared")
         return self
 
 
@@ -273,10 +280,13 @@ def _instance_to_dict(inst: Any) -> dict[str, Any]:
         "instance_id": inst.instance_id,
         "kind": inst.kind,
         "display_name": inst.display_name,
+        "description": config.get("description"),
         "status": inst.status,
         "mcp_server_name": inst.mcp_server_name,
         "has_credentials": inst.has_credentials,
         "default_open": read_default_open(config),
+        "shared": bool(inst.shared),
+        "owner_user_id": inst.user_id,
         "created_at": inst.created_at,
         "updated_at": inst.updated_at,
     }
@@ -404,18 +414,63 @@ def _credentials_preview(kind: str, creds: dict[str, Any]) -> dict[str, Any]:
     return preview
 
 
-def _schedule_connector_reload(server: Any, user_id: int) -> None:
+def _schedule_connector_reload(server: Any, user_id: int, *, all_users: bool = False) -> None:
     assert server.app_runtime is not None
 
     async def _run() -> None:
         try:
-            await server.app_runtime.agent_registry.reload_connectors_for_user(user_id)
+            if all_users:
+                await server.app_runtime.agent_registry.reload_all()
+            else:
+                await server.app_runtime.agent_registry.reload_connectors_for_user(user_id)
         except Exception:
             logger.exception("background connector reload failed for user %s", user_id)
 
     asyncio.create_task(_run())
 
 
+def _can_manage_connector(inst: Any, user: Any) -> bool:
+    return bool(inst.user_id == user.id or user.role == "admin")
+
+
+def _assert_can_manage_connector(inst: Any, user: Any) -> None:
+    if not _can_manage_connector(inst, user):
+        raise OctopError(ErrorCode.FORBIDDEN, "not your connector instance")
+
+
+def _raise_name_taken(name: str) -> None:
+    raise OctopError(
+        ErrorCode.CONNECTOR_NAME_TAKEN,
+        f"connector name {name!r} is already in use",
+    )
+
+
+def _custom_name_exists(svc: ConnectorService, user_id: int, name: str) -> bool:
+    return any(
+        item["display_name"] == name
+        for item in svc.list_instances_for_api(user_id)
+        if item["kind"] == CUSTOM_MCP_KIND and int(item.get("owner_user_id") or user_id) == user_id
+    )
+
+
+def _resolve_custom_target(
+    instance_id: str,
+    *,
+    user: Any,
+    server: Any,
+) -> tuple[int, str] | None:
+    raw = parse_synthetic_instance_id(instance_id)
+    if raw is None:
+        return None
+    parent_id, separator, server_name = raw.partition(":")
+    if separator:
+        parent = server.services.repos.connector_repo.get(parent_id)
+        if parent is not None and is_custom_mcp_kind(parent.kind):
+            _assert_can_manage_connector(parent, user)
+            return parent.user_id, server_name
+    return user.id, raw
+
+
 def _is_public_http_uri(uri: str) -> bool:
     parsed = urlparse(uri)
     host = (parsed.hostname or "").lower()
@@ -451,7 +506,16 @@ async def list_instances(
     server: Any = Depends(get_server),
 ) -> list[dict[str, Any]]:
     """List the current user's connected accounts (custom MCP expanded per server)."""
-    return _connector_service(server).list_instances_for_api(user.id)
+    rows = _connector_service(server).list_instances_for_api(user.id)
+    for item in rows:
+        owner_id = int(item.get("owner_user_id") or user.id)
+        owner = server.services.user_repo.get(owner_id)
+        item["owner_username"] = owner.username if owner is not None else None
+        item["owner_display_name"] = (
+            owner.display_name or owner.username if owner is not None else None
+        )
+        item["can_manage"] = owner_id == user.id or user.role == "admin"
+    return rows
 
 
 @router.get("/connectors/custom-mcp", summary="Get custom MCP servers")
@@ -474,6 +538,8 @@ async def put_custom_mcp(
     svc = _connector_service(server)
     try:
         servers = svc.put_custom_servers(user.id, body.servers)
+    except ConnectorNameTakenError as exc:
+        _raise_name_taken(str(exc))
     except ValueError as exc:
         raise OctopError(ErrorCode.CONNECTOR_INVALID_CREDENTIALS, str(exc)) from exc
     server.services.audit_repo.write(
@@ -482,7 +548,13 @@ async def put_custom_mcp(
         target=CUSTOM_MCP_KIND,
         payload=str(len(servers)),
     )
-    _schedule_connector_reload(server, user.id)
+    _schedule_connector_reload(
+        server,
+        user.id,
+        all_users=any(
+            isinstance(spec, dict) and spec.get("shared") is True for spec in servers.values()
+        ),
+    )
     return {"servers": redact_servers_for_api(servers)}
 
 
@@ -504,6 +576,7 @@ async def patch_custom_mcp_server(
             server_name,
             enabled=body.enabled,
             default_open=body.default_open,
+            shared=body.shared,
         )
     except KeyError as exc:
         raise OctopError(
@@ -511,7 +584,7 @@ async def patch_custom_mcp_server(
         ) from exc
     except ValueError as exc:
         raise OctopError(ErrorCode.CONNECTOR_INVALID_CREDENTIALS, str(exc)) from exc
-    _schedule_connector_reload(server, user.id)
+    _schedule_connector_reload(server, user.id, all_users=body.shared is not None)
     return {"servers": redact_servers_for_api(servers)}
 
 
@@ -562,8 +635,7 @@ async def get_instance(
     inst = repo.get(instance_id)
     if inst is None:
         raise OctopError(ErrorCode.CONNECTOR_NOT_FOUND, f"instance {instance_id!r} not found")
-    if inst.user_id != user.id:
-        raise OctopError(ErrorCode.FORBIDDEN, "not your connector instance")
+    _assert_can_manage_connector(inst, user)
 
     data = _instance_to_dict(inst)
     config: dict[str, Any] = {}
@@ -593,7 +665,7 @@ async def create_instance(
     user: Any = Depends(current_user),
     server: Any = Depends(get_server),
 ) -> dict[str, Any]:
-    """Connect a third-party account. Replaces any existing instance of the same kind."""
+    """Connect a third-party account as a new named instance."""
     if is_custom_mcp_kind(body.kind):
         raise OctopError(
             ErrorCode.CONNECTOR_KIND_UNSUPPORTED,
@@ -607,15 +679,15 @@ async def create_instance(
 
     repo = server.services.repos.connector_repo
     svc = _connector_service(server)
+    display_name = body.display_name.strip()
+    if not display_name:
+        raise OctopError(ErrorCode.CONNECTOR_INVALID_CREDENTIALS, "display_name is required")
+    description = body.description.strip() if body.description is not None else entry.description
+    if not description:
+        raise OctopError(ErrorCode.CONNECTOR_INVALID_CREDENTIALS, "description is required")
+    if repo.name_exists(user.id, display_name) or _custom_name_exists(svc, user.id, display_name):
+        _raise_name_taken(display_name)
     cred_input = dict(body.credentials)
-    old_cli_creds: dict[str, Any] | None = None
-    for old in repo.list_by_user(user.id):
-        if old.kind == body.kind:
-            if old.has_credentials:
-                old_cli_creds = svc.decrypt(old.instance_id)
-                cred_input = _merge_credentials(old_cli_creds, cred_input)
-            repo.delete(old.instance_id)
-            break
 
     try:
         cred_payload = await _prepare_credentials(
@@ -629,19 +701,18 @@ async def create_instance(
         ) from exc
 
     instance_id = new_ulid()
-    if body.kind in ("feishu-cli", "wecom-cli") and old_cli_creds:
-        keep = cleanup_keys_for_creds(body.kind, {**cred_payload, "instance_id": instance_id})
-        cleanup_creds_cli_dirs(body.kind, old_cli_creds, keep=keep)
     repo.create(
         instance_id=instance_id,
         user_id=user.id,
         kind=body.kind,
-        display_name=body.display_name.strip(),
+        display_name=display_name,
         mcp_server_name=mcp_server_name(body.kind, instance_id),
+        shared=body.shared,
         config_json=build_instance_config_json(
             kind=body.kind,
             default_open=bool(body.default_open),
             email=cred_payload.get("email"),
+            description=description,
         ),
     )
     svc.encrypt_and_store(instance_id=instance_id, payload=cred_payload)
@@ -653,7 +724,7 @@ async def create_instance(
     )
     inst = repo.get(instance_id)
     assert inst is not None
-    _schedule_connector_reload(server, user.id)
+    _schedule_connector_reload(server, user.id, all_users=body.shared)
     return _instance_to_dict(inst)
 
 
@@ -664,11 +735,12 @@ async def patch_instance(
     user: Any = Depends(current_user),
     server: Any = Depends(get_server),
 ) -> dict[str, Any]:
-    """Enable/disable a connector or update default_open without deleting credentials."""
-    synthetic_name = parse_synthetic_instance_id(instance_id)
-    if synthetic_name is not None:
+    """Edit a connector instance without replacing its identity."""
+    custom_target = _resolve_custom_target(instance_id, user=user, server=server)
+    if custom_target is not None:
+        custom_user_id, synthetic_name = custom_target
         svc = _connector_service(server)
-        if body.status is None and body.default_open is None:
+        if body.status is None and body.default_open is None and body.shared is None:
             raise OctopError(
                 ErrorCode.CONNECTOR_INVALID_CREDENTIALS,
                 "status or default_open is required",
@@ -682,21 +754,23 @@ async def patch_instance(
                         "status must be active or disabled",
                     )
                 svc.patch_custom_server_enabled(
-                    user.id, synthetic_name, enabled=(status == "active")
+                    custom_user_id, synthetic_name, enabled=(status == "active")
                 )
             if body.default_open is not None:
                 svc.patch_custom_server_default_open(
-                    user.id, synthetic_name, default_open=bool(body.default_open)
+                    custom_user_id, synthetic_name, default_open=bool(body.default_open)
                 )
+            if body.shared is not None:
+                svc.patch_custom_server(custom_user_id, synthetic_name, shared=body.shared)
         except KeyError as exc:
             raise OctopError(
                 ErrorCode.CONNECTOR_NOT_FOUND, f"instance {instance_id!r} not found"
             ) from exc
         except ValueError as exc:
             raise OctopError(ErrorCode.CONNECTOR_INVALID_CREDENTIALS, str(exc)) from exc
-        _schedule_connector_reload(server, user.id)
-        for item in svc.list_instances_for_api(user.id):
-            if item["instance_id"] == instance_id:
+        _schedule_connector_reload(server, custom_user_id, all_users=True)
+        for item in svc.list_instances_for_api(custom_user_id):
+            if item["instance_id"] in {instance_id, f"custom:{synthetic_name}"}:
                 return item
         raise OctopError(ErrorCode.CONNECTOR_NOT_FOUND, f"instance {instance_id!r} not found")
 
@@ -704,18 +778,48 @@ async def patch_instance(
     inst = repo.get(instance_id)
     if inst is None:
         raise OctopError(ErrorCode.CONNECTOR_NOT_FOUND, f"instance {instance_id!r} not found")
-    if inst.user_id != user.id:
-        raise OctopError(ErrorCode.FORBIDDEN, "not your connector instance")
+    _assert_can_manage_connector(inst, user)
     if is_custom_mcp_kind(inst.kind):
         raise OctopError(
             ErrorCode.CONNECTOR_KIND_UNSUPPORTED,
             "use PATCH /connectors/custom-mcp/servers/{name} for custom MCP servers",
         )
-    if body.status is None and body.default_open is None:
+    if (
+        body.status is None
+        and body.default_open is None
+        and body.display_name is None
+        and body.description is None
+        and body.credentials is None
+        and body.shared is None
+    ):
         raise OctopError(
             ErrorCode.CONNECTOR_INVALID_CREDENTIALS,
             "status or default_open is required",
         )
+    if body.display_name is not None:
+        display_name = body.display_name.strip()
+        if not display_name:
+            raise OctopError(ErrorCode.CONNECTOR_INVALID_CREDENTIALS, "display_name is required")
+        svc = _connector_service(server)
+        if repo.name_exists(
+            inst.user_id, display_name, exclude_instance_id=instance_id
+        ) or _custom_name_exists(svc, inst.user_id, display_name):
+            _raise_name_taken(display_name)
+        repo.update_metadata(instance_id, display_name=display_name)
+    if body.shared is not None:
+        repo.update_metadata(instance_id, shared=body.shared)
+    if body.credentials is not None:
+        svc = _connector_service(server)
+        merged = _merge_credentials(svc.decrypt(instance_id), body.credentials)
+        try:
+            prepared = await _prepare_credentials(inst.kind, merged, server.services.settings_repo)
+        except ValueError as exc:
+            raise OctopError(
+                ErrorCode.CONNECTOR_INVALID_CREDENTIALS,
+                str(exc),
+                details={"reason": str(exc)},
+            ) from exc
+        svc.encrypt_and_store(instance_id=instance_id, payload=prepared)
     if body.status is not None:
         status = body.status.strip()
         if status not in ("active", "disabled"):
@@ -723,18 +827,31 @@ async def patch_instance(
                 ErrorCode.CONNECTOR_INVALID_CREDENTIALS, "status must be active or disabled"
             )
         repo.update_status(instance_id, status)
-    if body.default_open is not None:
+    if body.default_open is not None or body.description is not None:
         config = dict(ConnectorRepo.parse_config_json(inst))
-        if body.default_open:
-            config["default_open"] = True
-        else:
-            config.pop("default_open", None)
+        if body.default_open is not None:
+            if body.default_open:
+                config["default_open"] = True
+            else:
+                config.pop("default_open", None)
+        if body.description is not None:
+            description = body.description.strip()
+            if not description:
+                raise OctopError(
+                    ErrorCode.CONNECTOR_INVALID_CREDENTIALS,
+                    "description is required",
+                )
+            config["description"] = description
         repo.update_config_json(
             instance_id, json.dumps(config, ensure_ascii=False) if config else None
         )
     inst = repo.get(instance_id)
     assert inst is not None
-    _schedule_connector_reload(server, user.id)
+    _schedule_connector_reload(
+        server,
+        inst.user_id,
+        all_users=inst.shared or body.shared is True or body.shared is False,
+    )
     return _instance_to_dict(inst)
 
 
@@ -745,15 +862,16 @@ async def delete_instance(
     server: Any = Depends(get_server),
 ) -> None:
     """Disconnect and delete stored credentials for a connector instance."""
-    synthetic_name = parse_synthetic_instance_id(instance_id)
-    if synthetic_name is not None:
+    custom_target = _resolve_custom_target(instance_id, user=user, server=server)
+    if custom_target is not None:
+        custom_user_id, synthetic_name = custom_target
         svc = _connector_service(server)
-        servers = dict(svc.get_custom_servers(user.id))
+        servers = dict(svc.get_custom_servers(custom_user_id))
         if synthetic_name not in servers:
             raise OctopError(ErrorCode.CONNECTOR_NOT_FOUND, f"instance {instance_id!r} not found")
         del servers[synthetic_name]
         try:
-            svc.put_custom_servers(user.id, servers)
+            svc.put_custom_servers(custom_user_id, servers)
         except ValueError as exc:
             raise OctopError(ErrorCode.CONNECTOR_INVALID_CREDENTIALS, str(exc)) from exc
         server.services.audit_repo.write(
@@ -762,15 +880,14 @@ async def delete_instance(
             target=synthetic_name,
             payload=CUSTOM_MCP_KIND,
         )
-        _schedule_connector_reload(server, user.id)
+        _schedule_connector_reload(server, custom_user_id, all_users=True)
         return
 
     repo = server.services.repos.connector_repo
     inst = repo.get(instance_id)
     if inst is None:
         raise OctopError(ErrorCode.CONNECTOR_NOT_FOUND, f"instance {instance_id!r} not found")
-    if inst.user_id != user.id:
-        raise OctopError(ErrorCode.FORBIDDEN, "not your connector instance")
+    _assert_can_manage_connector(inst, user)
     user_id = inst.user_id
     cli_creds: dict[str, Any] | None = None
     if inst.kind in ("feishu-cli", "wecom-cli") and inst.has_credentials:
@@ -783,7 +900,7 @@ async def delete_instance(
     repo.delete(instance_id)
     if cli_creds is not None:
         cleanup_creds_cli_dirs(inst.kind, cli_creds)
-    _schedule_connector_reload(server, user_id)
+    _schedule_connector_reload(server, user_id, all_users=inst.shared)
     server.services.audit_repo.write(
         actor=user.username,
         action="connector.instance.delete",
@@ -798,10 +915,11 @@ async def test_instance(
     server: Any = Depends(get_server),
 ) -> dict[str, Any]:
     """Probe the connector with stored credentials and return success or error details."""
-    synthetic_name = parse_synthetic_instance_id(instance_id)
-    if synthetic_name is not None:
+    custom_target = _resolve_custom_target(instance_id, user=user, server=server)
+    if custom_target is not None:
+        custom_user_id, synthetic_name = custom_target
         svc = _connector_service(server)
-        saved = svc.get_custom_servers(user.id)
+        saved = svc.get_custom_servers(custom_user_id)
         raw = saved.get(synthetic_name)
         if not isinstance(raw, dict):
             raise OctopError(ErrorCode.CONNECTOR_NOT_FOUND, f"instance {instance_id!r} not found")
@@ -811,8 +929,7 @@ async def test_instance(
     inst = repo.get(instance_id)
     if inst is None:
         raise OctopError(ErrorCode.CONNECTOR_NOT_FOUND, f"instance {instance_id!r} not found")
-    if inst.user_id != user.id:
-        raise OctopError(ErrorCode.FORBIDDEN, "not your connector instance")
+    _assert_can_manage_connector(inst, user)
 
     entry = get_catalog_entry(inst.kind)
     if entry is None:
diff --git a/src/octop/api/routers/cron.py b/src/octop/api/routers/cron.py
index 3f78e710..2b70838c 100644
--- a/src/octop/api/routers/cron.py
+++ b/src/octop/api/routers/cron.py
@@ -7,9 +7,13 @@
 from fastapi import APIRouter, Depends
 from pydantic import BaseModel, Field
 
-from octop.api.common.agent import require_agent_owner_row
+from octop.api.common.agent import require_agent_row, user_owns_agent
 from octop.api.deps import current_user, get_server
-from octop.infra.cron.task_type import normalize_cron_task_type, require_cron_prompt
+from octop.infra.cron.task_type import (
+    normalize_cron_task_type,
+    require_cron_name,
+    require_cron_prompt,
+)
 from octop.infra.cron.trigger import build_trigger
 from octop.infra.errors import ErrorCode, OctopError
 from octop.infra.utils.ulid import new_cron_id
@@ -18,16 +22,19 @@
 
 
 class CronCreateBody(BaseModel):
+    name: str | None = None
     trigger: str
     prompt: str
     session_key: str | None = None
     fresh_thread: bool = False
+    enabled: bool = True
     model: str | None = None
     task_type: str = "text"
     mcp_servers: list[str] = Field(default_factory=list)
 
 
 class CronPatchBody(BaseModel):
+    name: str | None = None
     trigger: str | None = None
     prompt: str | None = None
     session_key: str | None = None
@@ -43,6 +50,19 @@ def _get_cron_manager(server: Any) -> Any:
     return server.app_runtime.cron_manager
 
 
+def _user_may_manage_agent_cron(*, agent_row: Any, user: Any) -> bool:
+    return user_owns_agent(agent_row, user)
+
+
+def _assert_cron_manage(
+    *, agent_id: str, agent_row: Any, user: Any, row: Any | None = None
+) -> None:
+    if row is not None and row.agent_id != agent_id:
+        raise OctopError(ErrorCode.NOT_FOUND, "cron job not found")
+    if not _user_may_manage_agent_cron(agent_row=agent_row, user=user):
+        raise OctopError(ErrorCode.FORBIDDEN, "cron job not accessible to user")
+
+
 @router.get("/cron/settings", summary="Cron server settings")
 async def cron_settings(
     user: Any = Depends(current_user),
@@ -59,7 +79,9 @@ async def list_cron(
     server: Any = Depends(get_server),
 ) -> list[dict[str, Any]]:
     """List scheduled jobs for an agent."""
-    require_agent_owner_row(agent_id, user=user, as_user=None, server=server)
+    agent_row = require_agent_row(agent_id, user=user, as_user=None, server=server)
+    if not _user_may_manage_agent_cron(agent_row=agent_row, user=user):
+        return []
     return [
         r.to_public_dict(include_agent=True)
         for r in _get_cron_manager(server).list_by_agent(agent_id)
@@ -77,18 +99,23 @@ async def create_cron(
     from octop.api.common.validators import validate_chat_mcp_servers  # noqa: PLC0415
     from octop.infra.cron.manager import CronCreateSpec  # noqa: PLC0415
 
-    require_agent_owner_row(agent_id, user=user, as_user=None, server=server)
+    agent_row = require_agent_row(agent_id, user=user, as_user=None, server=server)
+    _assert_cron_manage(agent_id=agent_id, agent_row=agent_row, user=user)
+    prompt = require_cron_prompt(body.prompt)
+    cron_id = new_cron_id()
     mcp_servers = (
         await validate_chat_mcp_servers(server, user_id=user.id, names=body.mcp_servers) or []
     )
     spec = CronCreateSpec(
-        cron_id=new_cron_id(),
+        cron_id=cron_id,
         agent_id=agent_id,
         user_id=user.id,
+        name=require_cron_name(body.name, prompt=prompt, cron_id=cron_id),
         trigger=body.trigger,
-        prompt=require_cron_prompt(body.prompt),
+        prompt=prompt,
         session_key=body.session_key,
         fresh_thread=body.fresh_thread,
+        enabled=body.enabled,
         model=(body.model or "").strip() or None,
         task_type=normalize_cron_task_type(body.task_type),
         mcp_servers=mcp_servers,
@@ -106,10 +133,11 @@ async def get_cron(
     server: Any = Depends(get_server),
 ) -> dict[str, Any]:
     """Return one scheduled job by id."""
-    require_agent_owner_row(agent_id, user=user, as_user=None, server=server)
+    agent_row = require_agent_row(agent_id, user=user, as_user=None, server=server)
     row = _get_cron_manager(server).get(cron_id)
-    if row is None or row.agent_id != agent_id:
+    if row is None:
         raise OctopError(ErrorCode.NOT_FOUND, "cron job not found")
+    _assert_cron_manage(agent_id=agent_id, agent_row=agent_row, user=user, row=row)
     return cast(dict[str, Any], row.to_public_dict(include_agent=True))
 
 
@@ -125,14 +153,16 @@ async def patch_cron(
     from octop.api.common.validators import validate_chat_mcp_servers  # noqa: PLC0415
     from octop.infra.db.repos._base import UNSET  # noqa: PLC0415
 
-    require_agent_owner_row(agent_id, user=user, as_user=None, server=server)
+    agent_row = require_agent_row(agent_id, user=user, as_user=None, server=server)
     mgr = _get_cron_manager(server)
     existing = mgr.get(cron_id)
-    if existing is None or existing.agent_id != agent_id:
+    if existing is None:
         raise OctopError(ErrorCode.NOT_FOUND, "cron job not found")
+    _assert_cron_manage(agent_id=agent_id, agent_row=agent_row, user=user, row=existing)
     if body.trigger is not None:
         build_trigger(body.trigger)
     patch_fields = body.model_dump(exclude_unset=True)
+    prompt = require_cron_prompt(body.prompt) if body.prompt is not None else None
     mcp_arg: object = UNSET
     if "mcp_servers" in patch_fields:
         mcp_arg = await validate_chat_mcp_servers(
@@ -141,7 +171,12 @@ async def patch_cron(
     row = await mgr.update(
         cron_id,
         trigger=body.trigger,
-        prompt=require_cron_prompt(body.prompt) if body.prompt is not None else None,
+        name=(
+            require_cron_name(body.name, prompt=prompt or existing.prompt, cron_id=cron_id)
+            if "name" in patch_fields
+            else None
+        ),
+        prompt=prompt,
         session_key=body.session_key,
         fresh_thread=body.fresh_thread,
         enabled=int(body.enabled) if body.enabled is not None else None,
@@ -160,11 +195,12 @@ async def delete_cron(
     server: Any = Depends(get_server),
 ) -> None:
     """Remove a scheduled job."""
-    require_agent_owner_row(agent_id, user=user, as_user=None, server=server)
+    agent_row = require_agent_row(agent_id, user=user, as_user=None, server=server)
     mgr = _get_cron_manager(server)
     existing = mgr.get(cron_id)
-    if existing is None or existing.agent_id != agent_id:
+    if existing is None:
         raise OctopError(ErrorCode.NOT_FOUND, "cron job not found")
+    _assert_cron_manage(agent_id=agent_id, agent_row=agent_row, user=user, row=existing)
     await mgr.delete(cron_id)
 
 
@@ -176,9 +212,10 @@ async def run_now(
     server: Any = Depends(get_server),
 ) -> None:
     """Trigger an immediate one-off run without waiting for the schedule."""
-    require_agent_owner_row(agent_id, user=user, as_user=None, server=server)
+    agent_row = require_agent_row(agent_id, user=user, as_user=None, server=server)
     mgr = _get_cron_manager(server)
     existing = mgr.get(cron_id)
-    if existing is None or existing.agent_id != agent_id:
+    if existing is None:
         raise OctopError(ErrorCode.NOT_FOUND, "cron job not found")
+    _assert_cron_manage(agent_id=agent_id, agent_row=agent_row, user=user, row=existing)
     await mgr.run_now(cron_id)
diff --git a/src/octop/api/routers/experts.py b/src/octop/api/routers/experts.py
index dd345b51..79e20cf1 100644
--- a/src/octop/api/routers/experts.py
+++ b/src/octop/api/routers/experts.py
@@ -21,6 +21,10 @@
 from octop.api.common.agent_runtime import AgentRuntimeFields, runtime_field_updates
 from octop.api.common.validators import assert_user_backend_root_dirs
 from octop.api.deps import current_user, get_server
+from octop.infra.agents.avatar import (
+    display_published_expert_icon_url,
+    read_snapshot_avatar,
+)
 from octop.infra.agents.experts.catalog import (
     MANIFEST_FILENAME,
     build_create_spec_from_expert,
@@ -59,6 +63,7 @@
     fetch_skillset,
 )
 from octop.infra.errors import ErrorCode, OctopError
+from octop.infra.trajectory.settings import apply_enable_trajectory
 from octop.infra.utils.locale import resolve_user_locale
 
 router = APIRouter()
@@ -89,6 +94,7 @@ class FromExpertBody(AgentRuntimeFields):
         description="Optional custom agent id; auto-generated when omitted",
     )
     welcome_message: str | None = None
+    enable_trajectory: bool = True
 
 
 class PublishExpertBody(BaseModel):
@@ -122,6 +128,7 @@ class InstallPublishedExpertBody(AgentRuntimeFields):
         description="Optional custom agent id; auto-generated when omitted",
     )
     welcome_message: str | None = None
+    enable_trajectory: bool = True
 
 
 class LocalizedTextResponse(BaseModel):
@@ -282,6 +289,7 @@ def _published_creator_username(server: Any, created_by: str) -> str | None:
 
 
 def _published_summary_dict(row: Any, server: Any) -> dict[str, Any]:
+    snapshot_dir = _published_snapshot_dir(server, row.id)
     return {
         "id": row.id,
         "slug": row.slug,
@@ -291,6 +299,11 @@ def _published_summary_dict(row: Any, server: Any) -> dict[str, Any]:
         "creator_username": _published_creator_username(server, row.created_by),
         "source_agent_id": row.source_agent_id,
         "icon_name": row.icon_name or None,
+        "icon_url": display_published_expert_icon_url(
+            expert_id=row.id,
+            snapshot_dir=snapshot_dir,
+            updated_at=row.updated_at,
+        ),
         "color": row.color or None,
         "created_at": row.created_at,
         "updated_at": row.updated_at,
@@ -314,6 +327,24 @@ async def list_published_experts(
     ]
 
 
+@router.get(
+    "/experts/published/{expert_id}/avatar",
+    summary="Fetch published expert avatar",
+)
+async def get_published_expert_avatar(
+    expert_id: str,
+    _: Any = Depends(current_user),
+    server: Any = Depends(get_server),
+) -> Response:
+    """Return the avatar bytes baked into the published snapshot, if any."""
+    row = _require_published_expert(server, expert_id)
+    found = read_snapshot_avatar(_published_snapshot_dir(server, row.id))
+    if found is None:
+        raise OctopError(ErrorCode.NOT_FOUND, "avatar not uploaded")
+    data, media_type = found
+    return Response(content=data, media_type=media_type)
+
+
 @router.get("/experts/published/{expert_id}", summary="Get published expert template detail")
 async def get_published_expert(
     expert_id: str,
@@ -468,6 +499,7 @@ async def install_published_expert(
             agent_id=body.agent_id,
             welcome_message=body.welcome_message,
             runtime_config=runtime_field_updates(body, exclude_unset=True),
+            enable_trajectory=body.enable_trajectory,
         ),
     )
 
@@ -558,6 +590,7 @@ async def install_expert_hub_item(
                 agent_id=body.agent_id,
                 welcome_message=body.welcome_message,
                 skill_package_ids=package_ids,
+                enable_trajectory=body.enable_trajectory,
                 **runtime_field_updates(body, exclude_unset=False),
             ),
         )
@@ -627,6 +660,7 @@ async def create_agent_from_expert(
         config_extra["providers"] = list(body.providers)
     if body.backend:
         config_extra["backend"] = body.backend
+    apply_enable_trajectory(config_extra, body.enable_trajectory)
 
     locale = resolve_user_locale(
         user_repo=server.services.user_repo,
diff --git a/src/octop/api/routers/knowledge_bases.py b/src/octop/api/routers/knowledge_bases.py
index dc24ec00..ec33a386 100644
--- a/src/octop/api/routers/knowledge_bases.py
+++ b/src/octop/api/routers/knowledge_bases.py
@@ -12,7 +12,12 @@
 from octop.api.common.upload_limit import read_upload_capped
 from octop.api.deps import current_user, get_server, require_permission
 from octop.config import DEFAULT_MAX_UPLOAD_MB, MAX_MAX_UPLOAD_MB, upload_mb_to_bytes
-from octop.infra.agents.providers.model_flags import is_embedding_model, is_onnx_local_provider
+from octop.infra.agents.providers.model_flags import (
+    is_chat_eligible_model,
+    is_embedding_model,
+    is_onnx_local_provider,
+    is_vision_model,
+)
 from octop.infra.agents.providers.onnx_catalog import (
     ONNX_PRESET_MODEL_IDS,
     list_onnx_catalog_models,
@@ -34,6 +39,12 @@
     set_feature_enabled,
 )
 from octop.infra.knowledge.jobs import enqueue_index_document, reindex_all_documents
+from octop.infra.knowledge.ocr import (
+    ensure_ocr_deps_async,
+    get_ocr_capability,
+    set_ocr_settings,
+    validate_ocr_settings,
+)
 from octop.infra.knowledge.service import (
     MAX_BASES_PER_OWNER,
     MAX_DOCS_PER_KB,
@@ -57,6 +68,13 @@ class FeatureBody(BaseModel):
     )
     backend: str | None = Field(default=None, pattern="^(onnx|remote)$")
     provider_id: str | None = None
+    ocr_enabled: bool | None = Field(
+        default=None,
+        description="Whether OCR is enabled for images and scanned PDFs.",
+    )
+    ocr_backend: str | None = Field(default=None, pattern="^(onnx|remote)$")
+    ocr_model: str | None = None
+    ocr_provider_id: str | None = None
 
 
 class OnnxDownloadBody(BaseModel):
@@ -200,6 +218,8 @@ def _map_knowledge_error(
         return OctopError.localized(ErrorCode.KNOWLEDGE_BASE_LIMIT, locale)
     if "unsupported knowledge document content type" in text:
         return OctopError.localized(ErrorCode.KNOWLEDGE_UNSUPPORTED_TYPE, locale)
+    if "knowledge ocr" in text:
+        return OctopError.localized(ErrorCode.KNOWLEDGE_PREREQUISITES_FAILED, locale)
     if "unique constraint" in text or "duplicate key" in text or "already exists" in text:
         return OctopError.localized(ErrorCode.KNOWLEDGE_NAME_TAKEN, locale)
     if "invalid knowledge document name" in text:
@@ -250,6 +270,9 @@ def _require_usable(server: OctopServer, request: Request) -> None:
 def _capability_payload(server: OctopServer) -> dict[str, Any]:
     assert server.services is not None
     payload = get_capability(server.services.settings_repo.get, server.services.provider_repo)
+    payload["ocr"] = get_ocr_capability(
+        server.services.settings_repo.get, server.services.provider_repo
+    )
     payload["limits"] = {
         "max_bases_per_owner": MAX_BASES_PER_OWNER,
         "max_docs_per_kb": MAX_DOCS_PER_KB,
@@ -302,6 +325,37 @@ async def embedding_options(
     }
 
 
+@router.get("/ocr-options", summary="List knowledge OCR backend options")
+async def ocr_options(
+    server: OctopServer = Depends(get_server),
+    _admin: User = Depends(require_permission("knowledge_settings")),
+) -> dict[str, Any]:
+    assert server.services is not None
+    remote = []
+    for provider in server.services.provider_repo.list_all():
+        if not provider.enabled or not provider.api_key or not provider.base_url:
+            continue
+        models = [
+            {"id": str(model["id"]), "name": str(model.get("name") or model["id"])}
+            for model in provider.get_models()
+            if str(model.get("id") or "").strip()
+            and is_chat_eligible_model(
+                model,
+                provider_name=provider.name,
+                provider_api_key=provider.api_key,
+            )
+            and is_vision_model(model)
+        ]
+        if models:
+            remote.append(
+                {"provider_id": str(provider.id), "provider_name": provider.name, "models": models}
+            )
+    return {
+        "local": {"id": "rapidocr", "name": "RapidOCR (ONNX)"},
+        "remote": remote,
+    }
+
+
 @router.put("/feature", summary="Enable or disable knowledge bases")
 async def put_feature(
     body: FeatureBody,
@@ -311,6 +365,9 @@ async def put_feature(
 ) -> dict[str, Any]:
     assert server.services is not None
     previous = get_capability(server.services.settings_repo.get, server.services.provider_repo)
+    previous_ocr = get_ocr_capability(
+        server.services.settings_repo.get, server.services.provider_repo
+    )
     selected_backend = (body.backend or "onnx").strip().lower()
     if body.enabled and selected_backend == "onnx":
         try:
@@ -319,6 +376,24 @@ async def put_feature(
             raise _map_knowledge_error(
                 exc, locale=resolve_request_locale(request), server=server
             ) from exc
+    if body.ocr_enabled:
+        try:
+            await ensure_ocr_deps_async(backend=(body.ocr_backend or "onnx").strip().lower())
+            validate_ocr_settings(
+                enabled=True,
+                backend=body.ocr_backend,
+                model=body.ocr_model,
+                provider_id=body.ocr_provider_id,
+                provider_repo=server.services.provider_repo,
+            )
+        except RuntimeError as exc:
+            raise _map_knowledge_error(
+                exc, locale=resolve_request_locale(request), server=server
+            ) from exc
+        except ValueError as exc:
+            raise _map_knowledge_error(
+                exc, locale=resolve_request_locale(request), server=server
+            ) from exc
     try:
         set_feature_enabled(
             server.services.settings_repo.get,
@@ -329,6 +404,15 @@ async def put_feature(
             provider_id=body.provider_id,
             provider_repo=server.services.provider_repo,
         )
+        if body.ocr_enabled is not None:
+            set_ocr_settings(
+                server.services.settings_repo.set,
+                enabled=body.ocr_enabled,
+                backend=body.ocr_backend,
+                model=body.ocr_model,
+                provider_id=body.ocr_provider_id,
+                provider_repo=server.services.provider_repo,
+            )
     except (RuntimeError, ValueError) as exc:
         raise _map_knowledge_error(
             exc, locale=resolve_request_locale(request), server=server
@@ -339,11 +423,16 @@ async def put_feature(
         if selected_model:
             with suppress(RuntimeError, ValueError):
                 _enable_onnx_service(server, selected_model)
+    ocr_changed = any(
+        previous_ocr.get(key) != capability["ocr"].get(key)
+        for key in ("enabled", "backend", "model", "provider_id")
+    )
     if body.enabled and (
         not previous["feature_enabled"]
         or previous["selected_model"] != capability["selected_model"]
         or previous["backend"] != capability["backend"]
         or previous["provider_id"] != capability["provider_id"]
+        or ocr_changed
     ):
         reindex_all_documents(server.services, capability["selected_model"])
     return capability
diff --git a/src/octop/api/routers/plugins.py b/src/octop/api/routers/plugins.py
index 18344aad..bece8f85 100644
--- a/src/octop/api/routers/plugins.py
+++ b/src/octop/api/routers/plugins.py
@@ -13,7 +13,11 @@
 
 from octop.api.common.agent import assert_agent_owner as _assert_agent_owner
 from octop.api.deps import current_user, get_server, require_permission
-from octop.infra.agents.plugin_tool_defaults import merge_plugins_tool_settings
+from octop.infra.agents.plugin_tool_defaults import (
+    agent_plugin_enabled,
+    merge_plugins_enabled_settings,
+    merge_plugins_tool_settings,
+)
 from octop.infra.agents.plugins.manager import PluginManager
 from octop.infra.errors import ErrorCode, OctopError
 from octop.infra.server import OctopServer
@@ -51,6 +55,38 @@ class AgentPluginToolsPatch(BaseModel):
     plugins: dict[str, dict[str, Any]]
 
 
+class PluginToolMeta(BaseModel):
+    name: str
+    description: str | None = None
+    config_fields: list[dict[str, Any]] = Field(default_factory=list)
+
+
+class AgentPluginItem(BaseModel):
+    id: str
+    version: str | None = None
+    name: str | None = None
+    kind: str | None = None
+    description: str | None = None
+    icon: str | None = None
+    loaded: bool = False
+    global_enabled: bool = True
+    agent_enabled: bool = True
+    enabled: bool = True
+    tools: list[PluginToolMeta] = Field(default_factory=list)
+
+
+class AgentPluginsResponse(BaseModel):
+    plugins: list[AgentPluginItem]
+
+
+class AgentPluginEnabledPatch(BaseModel):
+    enabled: bool
+
+
+class AgentPluginsPatch(BaseModel):
+    plugins: dict[str, AgentPluginEnabledPatch]
+
+
 def _plugin_manager(server: OctopServer) -> PluginManager:
     mgr = server.plugin_manager
     if mgr is None:
@@ -63,13 +99,7 @@ async def list_plugins(
     server: OctopServer = Depends(get_server),
     _user: Any = Depends(current_user),
 ) -> list[dict[str, Any]]:
-    mgr = _plugin_manager(server)
-    # CLI installs only write to disk; pick them up when the admin list is opened.
-    newly = mgr.load_missing(install_deps=False)
-    if newly and server.app_runtime is not None:
-        await server.app_runtime.agent_registry.reload_all()
-    items: list[dict[str, Any]] = mgr.list_installed()
-    return items
+    return _plugin_manager(server).list_installed()
 
 
 @router.post("/reload", summary="Reload plugins from disk (admin)")
@@ -230,6 +260,101 @@ async def get_plugin_ui_asset(
     )
 
 
+def _agent_row_and_config(
+    server: OctopServer,
+    agent_id: str,
+    user: Any,
+) -> tuple[Any, dict[str, Any]]:
+    runtime = server.app_runtime
+    assert runtime is not None
+    registry = runtime.agent_registry
+    row = registry.get_row(agent_id)
+    if row is None:
+        raise OctopError(ErrorCode.AGENT_NOT_FOUND, f"agent {agent_id!r} not found")
+    _assert_agent_owner(row, user)
+    return row, registry.get_config(agent_id)
+
+
+def _agent_plugins_response(
+    server: OctopServer,
+    agent_cfg: dict[str, Any],
+) -> AgentPluginsResponse:
+    raw_plugins = agent_cfg.get("plugins")
+    plugins_cfg = raw_plugins if isinstance(raw_plugins, dict) else {}
+    items: list[AgentPluginItem] = []
+    for plugin in _plugin_manager(server).list_installed():
+        if plugin.get("error"):
+            continue
+        plugin_id = str(plugin["id"])
+        global_enabled = plugin.get("enabled", True) is not False
+        per_agent_enabled = agent_plugin_enabled(plugins_cfg, plugin_id)
+        items.append(
+            AgentPluginItem(
+                id=plugin_id,
+                version=plugin.get("version"),
+                name=plugin.get("name"),
+                kind=plugin.get("kind"),
+                description=plugin.get("description"),
+                icon=plugin.get("icon"),
+                loaded=bool(plugin.get("loaded")),
+                global_enabled=global_enabled,
+                agent_enabled=per_agent_enabled,
+                enabled=global_enabled and per_agent_enabled,
+                tools=[PluginToolMeta.model_validate(tool) for tool in plugin.get("tools") or []],
+            )
+        )
+    return AgentPluginsResponse(plugins=items)
+
+
+@router.get(
+    "/agents/{agent_id}",
+    summary="List installed plugins for an agent",
+    response_model=AgentPluginsResponse,
+)
+async def list_agent_plugins(
+    agent_id: str,
+    server: OctopServer = Depends(get_server),
+    user: Any = Depends(current_user),
+) -> AgentPluginsResponse:
+    """List global and per-agent plugin state. Missing agent switches default on."""
+    _, cfg = _agent_row_and_config(server, agent_id, user)
+    return _agent_plugins_response(server, cfg)
+
+
+@router.patch(
+    "/agents/{agent_id}",
+    summary="Update agent plugin enablement",
+    response_model=AgentPluginsResponse,
+)
+async def patch_agent_plugins(
+    agent_id: str,
+    body: AgentPluginsPatch,
+    server: OctopServer = Depends(get_server),
+    user: Any = Depends(current_user),
+) -> AgentPluginsResponse:
+    """Merge plugin switches, preserve tool settings, and reload only this agent."""
+    _, cfg = _agent_row_and_config(server, agent_id, user)
+    installed = {
+        str(item["id"])
+        for item in _plugin_manager(server).list_installed()
+        if not item.get("error")
+    }
+    unknown = sorted(set(body.plugins) - installed)
+    if unknown:
+        raise OctopError(ErrorCode.NOT_FOUND, f"plugin {unknown[0]!r} not found")
+
+    runtime = server.app_runtime
+    assert runtime is not None
+    registry = runtime.agent_registry
+    merged = merge_plugins_enabled_settings(
+        cfg.get("plugins"),
+        {plugin_id: patch.enabled for plugin_id, patch in body.plugins.items()},
+    )
+    await registry.persist_plugin_tools_config(agent_id, merged)
+    await registry.reload(agent_id)
+    return _agent_plugins_response(server, registry.get_config(agent_id))
+
+
 @router.get("/agents/{agent_id}/tools", summary="List plugin tools for an agent")
 async def list_agent_plugin_tools(
     agent_id: str,
diff --git a/src/octop/api/routers/preferences.py b/src/octop/api/routers/preferences.py
index 6bfdec91..cec040f6 100644
--- a/src/octop/api/routers/preferences.py
+++ b/src/octop/api/routers/preferences.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
+import json
 from typing import Any, Self
+from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
 
 from fastapi import APIRouter, Depends
 from pydantic import BaseModel, Field, model_validator
@@ -11,10 +13,12 @@
 from octop.infra.errors import ErrorCode, OctopError
 from octop.infra.users.preferences import (
     MAX_REMOTE_BROWSER_BOOKMARKS,
+    PREFERENCES_KEY_TIMEZONE,
     ModelReasoningPreference,
     get_model_reasoning_from_json,
     get_preferred_model_from_json,
     get_remote_browser_bookmarks_from_json,
+    parse_preferences_json,
 )
 from octop.infra.utils.locale import normalize_locale
 
@@ -45,6 +49,7 @@ class PreferencesResponse(BaseModel):
         default_factory=dict,
         description="Per-model reasoning defaults for this user.",
     )
+    timezone: str | None = Field(default=None, description="Preferred IANA timezone.")
 
 
 class PatchPreferencesBody(BaseModel):
@@ -55,11 +60,12 @@ class PatchPreferencesBody(BaseModel):
     )
     preferred_model: str | None = None
     model_reasoning: dict[str, ModelReasoningPreferenceModel] | None = None
+    timezone: str | None = None
 
     @model_validator(mode="after")
     def at_least_one_field(self) -> Self:
         if not self.model_fields_set.intersection(
-            {"locale", "remote_browser_bookmarks", "preferred_model", "model_reasoning"}
+            {"locale", "remote_browser_bookmarks", "preferred_model", "model_reasoning", "timezone"}
         ):
             raise ValueError("at least one preference field is required")
         if (
@@ -90,6 +96,7 @@ def _response(row: Any) -> PreferencesResponse:
             ref: ModelReasoningPreferenceModel(mode=pref.mode, effort=pref.effort)
             for ref, pref in get_model_reasoning_from_json(raw).items()
         },
+        timezone=parse_preferences_json(raw).get(PREFERENCES_KEY_TIMEZONE),
     )
 
 
@@ -136,5 +143,24 @@ async def patch_preferences(
             preferred_model=preferred,
             model_reasoning=reasoning,
         )
+    if "timezone" in body.model_fields_set:
+        raw_timezone = body.timezone
+        row = server.services.user_repo.get(user.id)
+        data = parse_preferences_json(row.preferences_json if row else None)
+        if raw_timezone is not None:
+            trimmed = raw_timezone.strip()
+            if not trimmed:
+                raise OctopError(ErrorCode.SLASH_BAD_ARGS, "timezone cannot be empty")
+            try:
+                ZoneInfo(trimmed)
+            except ZoneInfoNotFoundError:
+                raise OctopError(
+                    ErrorCode.SLASH_BAD_ARGS,
+                    "timezone must be a valid IANA timezone",
+                ) from None
+            data[PREFERENCES_KEY_TIMEZONE] = trimmed
+        else:
+            data.pop(PREFERENCES_KEY_TIMEZONE, None)
+        server.services.user_repo.set_preferences_json(user.id, json.dumps(data))
     row = server.services.user_repo.get(user.id)
     return _response(row)
diff --git a/src/octop/api/routers/storage_backends.py b/src/octop/api/routers/storage_backends.py
index 119573d3..41b303e1 100644
--- a/src/octop/api/routers/storage_backends.py
+++ b/src/octop/api/routers/storage_backends.py
@@ -8,13 +8,23 @@
 from pydantic import BaseModel
 
 from octop.api.deps import current_user, get_server, require_permission
-from octop.infra.backend.adapter import row_to_backend_spec
-from octop.infra.backend.docker_spec import docker_spec_previewable
+from octop.infra.backend.adapter import row_to_backend_spec, storage_spec_previewable
 from octop.infra.errors import ErrorCode, OctopError
 
 admin_router = APIRouter()
 
 
+def _ensure_opensandbox_sdk(kind: str) -> None:
+    if kind != "opensandbox":
+        return
+    from octop.infra.backend.opensandbox_deps import ensure_opensandbox_deps
+
+    try:
+        ensure_opensandbox_deps(allow_install=True)
+    except RuntimeError as exc:
+        raise OctopError(ErrorCode.STORAGE_BACKEND_DEPS_FAILED, str(exc)) from exc
+
+
 class StorageBackendCreateBody(BaseModel):
     name: str
     kind: str
@@ -71,7 +81,7 @@ def _row_to_dict(r: Any) -> dict[str, Any]:
         "config_json": r.config_json,
         "note": r.note,
         "enabled": bool(r.enabled),
-        "previewable": docker_spec_previewable(spec) if spec is not None else False,
+        "previewable": storage_spec_previewable(spec) if spec is not None else False,
         "created_at": r.created_at,
         "updated_at": r.updated_at,
     }
@@ -93,6 +103,7 @@ async def create_storage_backend(
 ) -> dict[str, Any]:
     if server.services.storage_backend_repo.get_by_name(body.name) is not None:
         raise OctopError(ErrorCode.STORAGE_BACKEND_NAME_TAKEN, f"name {body.name!r} already exists")
+    _ensure_opensandbox_sdk((body.kind or "").lower())
     bid = server.services.storage_backend_repo.create(
         name=body.name,
         kind=body.kind,
@@ -117,6 +128,9 @@ async def patch_storage_backend(
     row = server.services.storage_backend_repo.get(backend_id)
     if row is None:
         raise OctopError(ErrorCode.NOT_FOUND, "storage backend not found")
+    next_kind = (body.kind or row.kind or "").lower()
+    if body.enabled is True:
+        _ensure_opensandbox_sdk(next_kind)
     server.services.storage_backend_repo.update(
         backend_id,
         kind=body.kind,
diff --git a/src/octop/api/routers/voice.py b/src/octop/api/routers/voice.py
index d0a1340b..f8dd08a7 100644
--- a/src/octop/api/routers/voice.py
+++ b/src/octop/api/routers/voice.py
@@ -75,6 +75,10 @@ class VoiceTestBody(BaseModel):
     mode: Literal["stt", "tts"] = "tts"
 
 
+class VoiceConfigurationTestBody(VoiceProviderCreateBody):
+    mode: Literal["stt", "tts"] = "tts"
+
+
 @router.get("/presets")
 async def list_voice_presets(_: Any = Depends(current_user)) -> list[dict[str, Any]]:
     return load_voice_presets()
@@ -233,3 +237,20 @@ async def admin_test_voice_provider(
     server: Any = Depends(get_server),
 ) -> dict[str, Any]:
     return await _voice_manager(server).test_provider(provider_id, mode=body.mode)
+
+
+@admin_router.post("/test-configuration")
+async def admin_test_voice_configuration(
+    body: VoiceConfigurationTestBody,
+    _: Any = Depends(require_permission("voice")),
+    server: Any = Depends(get_server),
+) -> dict[str, Any]:
+    return await _voice_manager(server).test_configuration(
+        name=body.name,
+        kind=body.kind,
+        capability=body.capability,
+        base_url=body.base_url,
+        api_key=body.api_key,
+        extra_json=body.extra_json,
+        mode=body.mode,
+    )
diff --git a/src/octop/cli/commands/backup.py b/src/octop/cli/commands/backup.py
index f706bb85..b90ddb40 100644
--- a/src/octop/cli/commands/backup.py
+++ b/src/octop/cli/commands/backup.py
@@ -33,8 +33,23 @@ def backup() -> None:
 @click.option(
     "--home", type=click.Path(path_type=Path), default=None, help="Octop home (default ~/.octop)."
 )
-def create(output: Path | None, home: Path | None) -> None:
-    """Create a full backup archive."""
+@click.option("--no-config", is_flag=True, help="Do not include config.json / env.")
+@click.option("--no-workspaces", is_flag=True, help="Do not include agent workspaces.")
+@click.option("--no-skill-packages", is_flag=True, help="Do not include global skill packages.")
+@click.option("--no-plugins", is_flag=True, help="Do not include installed plugins.")
+@click.option("--no-knowledge", is_flag=True, help="Do not include knowledge base files.")
+@click.option("--include-chats", is_flag=True, help="Include chat history (omitted by default).")
+def create(
+    output: Path | None,
+    home: Path | None,
+    no_config: bool,
+    no_workspaces: bool,
+    no_skill_packages: bool,
+    no_plugins: bool,
+    no_knowledge: bool,
+    include_chats: bool,
+) -> None:
+    """Create a selected-content backup archive."""
     paths = _paths(home)
     config = load_config(paths.config)
     db = open_database(config, paths)
@@ -50,6 +65,12 @@ def create(output: Path | None, home: Path | None) -> None:
                 pool=db,
                 db_config=config.database,
                 dest=tmp_path,
+                include_config=not no_config,
+                include_workspaces=not no_workspaces,
+                include_skill_packages=not no_skill_packages,
+                include_plugins=not no_plugins,
+                include_knowledge=not no_knowledge,
+                include_chats=include_chats,
             )
             if output is None:
                 entry = place_backup_file(paths, suggested, tmp_path)
@@ -83,6 +104,12 @@ def auto_status(home: Path | None) -> None:
     click.echo(f"auto_enabled: {backup_cfg.auto_enabled}")
     click.echo(f"schedule: {backup_cfg.schedule}")
     click.echo(f"retention_count: {backup_cfg.retention_count}")
+    click.echo(f"include_config: {backup_cfg.include_config}")
+    click.echo(f"include_workspaces: {backup_cfg.include_workspaces}")
+    click.echo(f"include_skill_packages: {backup_cfg.include_skill_packages}")
+    click.echo(f"include_plugins: {backup_cfg.include_plugins}")
+    click.echo(f"include_knowledge: {backup_cfg.include_knowledge}")
+    click.echo(f"include_chats: {backup_cfg.include_chats}")
     click.echo("note: the scheduler only runs inside an active `octop run` process")
 
 
@@ -105,6 +132,12 @@ def auto_run(home: Path | None) -> None:
             pool=db,
             db_config=config.database,
             retention_count=config.backup.retention_count,
+            include_config=config.backup.include_config,
+            include_workspaces=config.backup.include_workspaces,
+            include_skill_packages=config.backup.include_skill_packages,
+            include_plugins=config.backup.include_plugins,
+            include_knowledge=config.backup.include_knowledge,
+            include_chats=config.backup.include_chats,
         )
     finally:
         db.close()
diff --git a/src/octop/cli/commands/channel.py b/src/octop/cli/commands/channel.py
index 043c2718..f9dc1a81 100644
--- a/src/octop/cli/commands/channel.py
+++ b/src/octop/cli/commands/channel.py
@@ -521,7 +521,7 @@ def feishu_setup(
     dry_run: bool,
     retries: int,
 ) -> None:
-    """Run Feishu bot-creator (browser QR) and save app credentials."""
+    """Run Feishu scan-to-create (lark-oapi QR) and save app credentials."""
     from octop.cli.support.feishu_creator import dry_run_feishu_setup, run_feishu_bot_creator
     from octop.cli.support.offline_ops import create_channel_offline, patch_channel_offline
     from octop.infra.errors import OctopError
diff --git a/src/octop/cli/support/feishu_creator.py b/src/octop/cli/support/feishu_creator.py
index 51da2341..55a5d3f6 100644
--- a/src/octop/cli/support/feishu_creator.py
+++ b/src/octop/cli/support/feishu_creator.py
@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import contextlib
-import json
 import time
 from typing import Any
 
@@ -18,15 +17,15 @@
 
 
 def dry_run_feishu_setup(*, agent_id: str, platform: str, channel_id: str | None) -> None:
-    """Print what ``feishu-setup`` would do without starting the browser flow."""
+    """Print what ``feishu-setup`` would do without starting the scan-to-create flow."""
     click.echo("Dry run — no subprocess or channel writes.")
     click.echo(f"  agent:      {agent_id}")
     click.echo(f"  platform:   {platform}")
     click.echo(f"  channel_id: {channel_id or '(create new feishu channel)'}")
     click.echo("  steps:")
-    click.echo("    1. Start feishu_bot_creator.py subprocess")
+    click.echo("    1. Start feishu_bot_creator.py subprocess (lark-oapi register_app)")
     click.echo("    2. Poll stdout until app_id + app_secret")
-    click.echo("    3. Render QR in terminal when qr_token appears")
+    click.echo("    3. Render QR in terminal when qr_url appears")
     click.echo("    4. Stop subprocess")
     click.echo("    5. PATCH or POST channel with app_id / app_secret")
 
@@ -51,9 +50,9 @@ def run_feishu_bot_creator(
                 message = ev.get("message") or ev.get("step") or ""
                 if message and level in ("info", "success", ""):
                     click.echo(f"  {message}")
-            qr_token = poll.get("qr_token")
-            if qr_token and not shown_qr:
-                render_qrcode_terminal(json.dumps({"qrlogin": {"token": qr_token}}))
+            qr_url = poll.get("qr_url")
+            if qr_url and not shown_qr:
+                render_qrcode_terminal(str(qr_url))
                 shown_qr = True
             app_id = poll.get("app_id") or app_id
             app_secret = poll.get("app_secret") or app_secret
diff --git a/src/octop/cli/support/offline_ops.py b/src/octop/cli/support/offline_ops.py
index c0eb7d18..6a0c7017 100644
--- a/src/octop/cli/support/offline_ops.py
+++ b/src/octop/cli/support/offline_ops.py
@@ -548,4 +548,8 @@ def delete_thread_offline(agent_id: str, thread_id: str, *, home: Path | None =
         row = svc.thread_repo.get(thread_id)
         if row is None or row.agent_id != agent_id:
             raise OctopError(ErrorCode.AGENT_NOT_FOUND, f"thread {thread_id!r} not found")
+        try:
+            svc.trajectory_event_repo.delete_for_thread(thread_id)
+        except Exception:
+            logger.exception("trajectory cascade delete failed thread=%s", thread_id)
         svc.thread_repo.delete(thread_id)
diff --git a/src/octop/config.py b/src/octop/config.py
index a3e0c5e1..5a0a961f 100644
--- a/src/octop/config.py
+++ b/src/octop/config.py
@@ -5,7 +5,7 @@
 import json
 import logging
 import os
-from dataclasses import asdict, dataclass, field
+from dataclasses import asdict, dataclass, field, replace
 from pathlib import Path
 from typing import Any
 from urllib.parse import quote_plus, urlparse
@@ -95,6 +95,12 @@ class BackupConfig:
     auto_enabled: bool = False
     schedule: str = "cron:0 4 * * *"
     retention_count: int = 7
+    include_config: bool = True
+    include_workspaces: bool = True
+    include_skill_packages: bool = True
+    include_plugins: bool = True
+    include_knowledge: bool = True
+    include_chats: bool = False
 
 
 _VALID_MOBILE_BACKENDS = frozenset({"physical", "redroid", "emulator", "none"})
@@ -219,6 +225,14 @@ def _parse_backup_section(raw: object) -> BackupConfig:
         auto_enabled=bool(raw.get("auto_enabled", defaults.auto_enabled)),
         schedule=schedule,
         retention_count=retention,
+        include_config=bool(raw.get("include_config", defaults.include_config)),
+        include_workspaces=bool(raw.get("include_workspaces", defaults.include_workspaces)),
+        include_skill_packages=bool(
+            raw.get("include_skill_packages", defaults.include_skill_packages)
+        ),
+        include_plugins=bool(raw.get("include_plugins", defaults.include_plugins)),
+        include_knowledge=bool(raw.get("include_knowledge", defaults.include_knowledge)),
+        include_chats=bool(raw.get("include_chats", defaults.include_chats)),
     )
 
 
@@ -483,18 +497,13 @@ def load_config(path: Path) -> OctopConfig:
 
     backup = _parse_backup_section(raw.get("backup"))
     if v := os.environ.get("OCTOP_BACKUP_AUTO_ENABLED"):
-        backup = BackupConfig(
+        backup = replace(
+            backup,
             auto_enabled=_coerce_bool("OCTOP_BACKUP_AUTO_ENABLED", v, backup.auto_enabled),
-            schedule=backup.schedule,
-            retention_count=backup.retention_count,
         )
     if v := os.environ.get("OCTOP_BACKUP_SCHEDULE"):
         schedule = v.strip() or backup.schedule
-        backup = BackupConfig(
-            auto_enabled=backup.auto_enabled,
-            schedule=schedule,
-            retention_count=backup.retention_count,
-        )
+        backup = replace(backup, schedule=schedule)
     if v := os.environ.get("OCTOP_BACKUP_RETENTION_COUNT"):
         retention = _coerce_int("OCTOP_BACKUP_RETENTION_COUNT", v, backup.retention_count)
         if retention < 1:
@@ -503,10 +512,44 @@ def load_config(path: Path) -> OctopConfig:
                 backup.retention_count,
             )
             retention = backup.retention_count
-        backup = BackupConfig(
-            auto_enabled=backup.auto_enabled,
-            schedule=backup.schedule,
-            retention_count=retention,
+        backup = replace(backup, retention_count=retention)
+    if v := os.environ.get("OCTOP_BACKUP_INCLUDE_CONFIG"):
+        backup = replace(
+            backup,
+            include_config=_coerce_bool("OCTOP_BACKUP_INCLUDE_CONFIG", v, backup.include_config),
+        )
+    if v := os.environ.get("OCTOP_BACKUP_INCLUDE_WORKSPACES"):
+        backup = replace(
+            backup,
+            include_workspaces=_coerce_bool(
+                "OCTOP_BACKUP_INCLUDE_WORKSPACES", v, backup.include_workspaces
+            ),
+        )
+    if v := os.environ.get("OCTOP_BACKUP_INCLUDE_SKILL_PACKAGES"):
+        backup = replace(
+            backup,
+            include_skill_packages=_coerce_bool(
+                "OCTOP_BACKUP_INCLUDE_SKILL_PACKAGES",
+                v,
+                backup.include_skill_packages,
+            ),
+        )
+    if v := os.environ.get("OCTOP_BACKUP_INCLUDE_PLUGINS"):
+        backup = replace(
+            backup,
+            include_plugins=_coerce_bool("OCTOP_BACKUP_INCLUDE_PLUGINS", v, backup.include_plugins),
+        )
+    if v := os.environ.get("OCTOP_BACKUP_INCLUDE_KNOWLEDGE"):
+        backup = replace(
+            backup,
+            include_knowledge=_coerce_bool(
+                "OCTOP_BACKUP_INCLUDE_KNOWLEDGE", v, backup.include_knowledge
+            ),
+        )
+    if v := os.environ.get("OCTOP_BACKUP_INCLUDE_CHATS"):
+        backup = replace(
+            backup,
+            include_chats=_coerce_bool("OCTOP_BACKUP_INCLUDE_CHATS", v, backup.include_chats),
         )
 
     return OctopConfig(
diff --git a/src/octop/i18n/en.json b/src/octop/i18n/en.json
index 6c7c12ea..bfc59a0a 100644
--- a/src/octop/i18n/en.json
+++ b/src/octop/i18n/en.json
@@ -312,6 +312,7 @@
     "SETUP_REQUIRED": "Initial setup is required.",
     "DATABASE_NOT_EMPTY": "The target database already has users. Use an empty database, or log in with the existing admin.",
     "BACKUP_DRIVER_MISMATCH": "This backup was made with a different database engine (SQLite vs PostgreSQL). Switch the runtime to match the backup, or create a new backup on the current engine. Cross-engine restore is not supported.",
+    "BACKUP_SCHEMA_INCOMPATIBLE": "This backup uses database schema version {archive_schema_version}, which cannot be restored by this Octop version (maximum supported: {runtime_schema_version}).",
     "BACKUP_IN_PROGRESS": "A backup or restore is already in progress. Try again shortly.",
     "FORBIDDEN": "Permission denied.",
     "NOT_FOUND": "Not found.",
@@ -338,10 +339,12 @@
     "PROVIDER_LOCAL_PROTECTED": "Local runtime providers cannot be deleted.",
     "STORAGE_BACKEND_NAME_TAKEN": "Storage backend name is already in use.",
     "STORAGE_BACKEND_REFERENCED": "Storage backend is in use and cannot be removed.",
+    "STORAGE_BACKEND_DEPS_FAILED": "Could not install optional components for this storage backend. Check network access and retry.",
     "CHANNEL_KIND_UNSUPPORTED": "Unsupported channel type.",
     "CHANNEL_INVALID_CREDENTIALS": "Invalid channel credentials.",
     "CHANNEL_NAME_TAKEN": "This channel name is already in use. Please choose another.",
     "CONNECTOR_NOT_FOUND": "Connector not found.",
+    "CONNECTOR_NAME_TAKEN": "This connector name is already in use. Please choose another.",
     "CONNECTOR_INVALID_CREDENTIALS": "Invalid connector credentials.",
     "CONNECTOR_OAUTH_HTTPS_REQUIRED": "Octop is currently being accessed over public HTTP, but Notion OAuth callbacks require HTTPS. Use HTTPS, or access Octop locally through localhost or 127.0.0.1.",
     "CONNECTOR_KIND_UNSUPPORTED": "Unsupported connector type.",
@@ -558,6 +561,11 @@
     "fork_title_suffix": " (fork)",
     "fork_default_title": "Forked chat"
   },
+  "cron": {
+    "history": {
+      "executed": "Task {cron_id}: {name} executed."
+    }
+  },
   "agents": {
     "state": {
       "running": "Running",
@@ -614,6 +622,31 @@
     "error_script_missing": "Mobile install script is missing from the Octop package.",
     "error_docker_missing": "Docker is required to install the Android container backend.",
     "error_command_failed": "Command failed (exit {exit_code}).",
+    "docker_missing_auto_install": "Docker is not installed. Trying to install it automatically (official get.docker.com script, source picked by latency race)…",
+    "docker_auto_install_ok": "Docker installed successfully.",
+    "docker_auto_install_failed": "Automatic Docker install failed.",
+    "docker_source_official": "Latency race: official download.docker.com is the fastest; using the official install source.",
+    "docker_source_selected": "Latency race: fastest source is {source} ({delay}s); it will be passed to the official install script via DOWNLOAD_URL.",
+    "docker_source_fallback": "Could not measure source latency; running the official install script with its default source.",
+    "docker_install_log_start": "Running the bundled official Docker install script…",
+    "docker_install_script_failed": "Docker install script failed (exit {exit_code}).",
+    "docker_install_script_missing": "The bundled Docker install script is missing from the Octop package.",
+    "docker_install_spawn_failed": "Could not start the Docker install script: {error}",
+    "docker_install_stalled": "The Docker install script produced no output for too long and was stopped. Check the network or package manager state, then retry.",
+    "docker_hint_unsupported_distro": "This Linux distribution is not supported by the Docker install script. Install Docker manually, see https://docs.docker.com/engine/install/",
+    "docker_hint_no_root": "The install script needs root or passwordless sudo. Grant it, or install Docker manually.",
+    "docker_hint_already_installed": "An existing Docker was detected by the script. If it is broken, uninstall it first, then retry.",
+    "docker_hint_network": "The install script could not download packages (network / curl / DNS). Check connectivity or configure a proxy, then retry.",
+    "docker_hint_pkg_manager": "The system package manager failed (lock held, broken index, or interrupted step). Resolve it (e.g. sudo apt clean && sudo apt update), then retry.",
+    "docker_hint_gpg_key": "The Docker repository GPG key could not be fetched or verified. Check the network / mirror, then retry.",
+    "docker_hint_disk_full": "Not enough disk space to install Docker. Free up space and retry.",
+    "docker_mirror_reachable": "Tencent Cloud registry mirror is reachable; configuring it as a registry mirror.",
+    "docker_mirror_unreachable": "Tencent Cloud registry mirror is unreachable; keeping the default registry.",
+    "docker_mirror_skipped": "Registry mirror is already configured (or daemon.json is unreadable); leaving it unchanged.",
+    "docker_mirror_configured": "Registry mirror written to /etc/docker/daemon.json (previous file backed up as daemon.json.backup).",
+    "docker_restart_ok": "Docker daemon restarted.",
+    "docker_restart_ready": "Docker daemon is up and responding.",
+    "docker_restart_failed": "Failed to restart Docker (no systemd/service manager, or the service did not come back). The mirror config takes effect after the next Docker restart — start it manually if needed (systemctl restart docker or service docker restart).",
     "handoff_message": "Please complete this step on the device: {reason}",
     "handoff_default": "manual action required on the device"
   }
diff --git a/src/octop/i18n/zh.json b/src/octop/i18n/zh.json
index 7379fab7..4fbaf172 100644
--- a/src/octop/i18n/zh.json
+++ b/src/octop/i18n/zh.json
@@ -312,6 +312,7 @@
     "SETUP_REQUIRED": "需要完成初始设置。",
     "DATABASE_NOT_EMPTY": "目标数据库已有用户。请改用空库，或直接登录现有管理员账户。",
     "BACKUP_DRIVER_MISMATCH": "该备份与当前数据库引擎不一致（SQLite 与 PostgreSQL 不能互恢）。请将运行时切回备份所用引擎后再恢复，或在当前引擎上重新备份。暂不支持跨引擎恢复。",
+    "BACKUP_SCHEMA_INCOMPATIBLE": "该备份使用数据库结构版本 {archive_schema_version}，当前 Octop 版本无法恢复（最高支持版本：{runtime_schema_version}）。",
     "BACKUP_IN_PROGRESS": "已有备份或恢复任务正在进行，请稍后再试。",
     "FORBIDDEN": "没有权限。",
     "NOT_FOUND": "未找到。",
@@ -338,10 +339,12 @@
     "PROVIDER_LOCAL_PROTECTED": "本地提供商无法删除。",
     "STORAGE_BACKEND_NAME_TAKEN": "存储后端名称已被占用。",
     "STORAGE_BACKEND_REFERENCED": "存储后端正在使用中，无法删除。",
+    "STORAGE_BACKEND_DEPS_FAILED": "无法安装此后端所需的可选组件。请检查网络后重试。",
     "CHANNEL_KIND_UNSUPPORTED": "不支持的通道类型。",
     "CHANNEL_INVALID_CREDENTIALS": "通道凭证无效。",
     "CHANNEL_NAME_TAKEN": "该通道名称已被使用，请换一个名称。",
     "CONNECTOR_NOT_FOUND": "未找到连接器。",
+    "CONNECTOR_NAME_TAKEN": "该连接器名称已被使用，请换一个名称。",
     "CONNECTOR_INVALID_CREDENTIALS": "连接器凭证无效。",
     "CONNECTOR_OAUTH_HTTPS_REQUIRED": "当前通过公网 HTTP 访问 Octop，Notion 授权回调地址需要 HTTPS。请改用 HTTPS，或通过 localhost、127.0.0.1 在本机访问 Octop。",
     "CONNECTOR_KIND_UNSUPPORTED": "不支持的连接器类型。",
@@ -367,7 +370,7 @@
     "SKILL_ALREADY_EXISTS": "技能 {name} 已存在，如需覆盖请启用 overwrite。",
     "SKILL_PACKAGE_NOT_FOUND": "未找到技能包。",
     "SKILL_PACKAGE_NAME_TAKEN": "技能包 {name} 已存在。",
-    "SKILL_PACKAGE_BACKEND_UNSUPPORTED": "技能包目前仅支持「本地完整环境（文件系统+指令执行）」或「本地文件系统（不能执行指令）」，且存储根目录须为 /（POSIX）或 Agent 工作区根目录（Windows 默认）。",
+    "SKILL_PACKAGE_BACKEND_UNSUPPORTED": "技能包目前仅支持「本地完整环境（文件系统+指令执行）」或「本地文件系统（不能执行指令）」，且存储根目录须为 /（POSIX）或专家的工作区根目录（Windows 默认）。",
     "PUBLISHED_EXPERT_SLUG_TAKEN": "已存在发布专家 slug：{slug}。",
     "PUBLISHED_EXPERT_ALREADY_EXISTS": "该专家已发布为「{name}」，请改为刷新已发布模板。",
     "OIDC_BAD_REQUEST": "OIDC 请求无效：{detail}",
@@ -558,6 +561,11 @@
     "fork_title_suffix": "（分叉）",
     "fork_default_title": "分叉对话"
   },
+  "cron": {
+    "history": {
+      "executed": "任务{cron_id} :{name} 执行."
+    }
+  },
   "agents": {
     "state": {
       "running": "运行中",
@@ -614,6 +622,31 @@
     "error_script_missing": "Octop 包中缺少移动设备安装脚本。",
     "error_docker_missing": "安装 Android 容器后端需要 Docker。",
     "error_command_failed": "命令失败（退出码 {exit_code}）。",
+    "docker_missing_auto_install": "未检测到 Docker，正在尝试自动安装（官方 get.docker.com 脚本，按延迟测速选择安装源）…",
+    "docker_auto_install_ok": "Docker 安装成功。",
+    "docker_auto_install_failed": "Docker 自动安装失败。",
+    "docker_source_official": "测速完成：官方源 download.docker.com 延迟最低，使用官方安装源。",
+    "docker_source_selected": "测速完成：延迟最低的源是 {source}（{delay} 秒），将通过 DOWNLOAD_URL 传给官方安装脚本。",
+    "docker_source_fallback": "无法测速各安装源，将直接使用官方安装脚本的默认源。",
+    "docker_install_log_start": "正在运行内置的官方 Docker 安装脚本…",
+    "docker_install_script_failed": "Docker 安装脚本执行失败（退出码 {exit_code}）。",
+    "docker_install_script_missing": "Octop 包中缺少内置的 Docker 安装脚本。",
+    "docker_install_spawn_failed": "无法启动 Docker 安装脚本：{error}",
+    "docker_install_stalled": "Docker 安装脚本长时间无输出，已停止。请检查网络或包管理器状态后重试。",
+    "docker_hint_unsupported_distro": "当前 Linux 发行版不受 Docker 安装脚本支持，请参考 https://docs.docker.com/engine/install/ 手动安装。",
+    "docker_hint_no_root": "安装脚本需要 root 或免密 sudo 权限。请授权后重试，或手动安装 Docker。",
+    "docker_hint_already_installed": "脚本检测到主机已有 Docker。若其已损坏，请先卸载后重试。",
+    "docker_hint_network": "安装脚本无法下载软件包（网络 / curl / DNS 问题）。请检查网络或配置代理后重试。",
+    "docker_hint_pkg_manager": "系统包管理器执行失败（锁被占用、索引损坏或步骤中断）。请处理后重试（如 sudo apt clean && sudo apt update）。",
+    "docker_hint_gpg_key": "无法获取或校验 Docker 仓库的 GPG 密钥。请检查网络 / 镜像源后重试。",
+    "docker_hint_disk_full": "磁盘空间不足，无法安装 Docker。请清理空间后重试。",
+    "docker_mirror_reachable": "腾讯云镜像加速可达，将配置为 registry mirror。",
+    "docker_mirror_unreachable": "腾讯云镜像加速不可达，保持默认 registry 配置。",
+    "docker_mirror_skipped": "registry-mirrors 已配置（或 daemon.json 无法读取），保持不变。",
+    "docker_mirror_configured": "镜像加速已写入 /etc/docker/daemon.json（原文件已备份为 daemon.json.backup）。",
+    "docker_restart_ok": "Docker 守护进程已重启。",
+    "docker_restart_ready": "Docker 守护进程已就绪并正常响应。",
+    "docker_restart_failed": "Docker 重启失败（可能无 systemd/service 管理器，或服务未能恢复）。镜像加速配置将在下次 Docker 重启后生效——必要时请手动启动（systemctl restart docker 或 service docker restart）。",
     "handoff_message": "请在设备上完成此步骤：{reason}",
     "handoff_default": "需要在设备上手动操作"
   }
diff --git a/src/octop/infra/agents/avatar.py b/src/octop/infra/agents/avatar.py
index 3c736f0d..e8ccbe85 100644
--- a/src/octop/infra/agents/avatar.py
+++ b/src/octop/infra/agents/avatar.py
@@ -43,6 +43,10 @@ def agent_avatar_api_path(agent_id: str) -> str:
     return f"/api/agents/{agent_id}/avatar"
 
 
+def published_expert_avatar_api_path(expert_id: str) -> str:
+    return f"/api/experts/published/{expert_id}/avatar"
+
+
 def display_agent_icon_url(
     *,
     agent_id: str,
@@ -129,6 +133,39 @@ async def copy_workspace_avatar_to_dir(workspace: WorkspaceAvatarIO, dest: Path)
     return rel
 
 
+def read_snapshot_avatar(snapshot_dir: Path) -> tuple[bytes, str] | None:
+    """Load ``.octop/avatar.*`` (or legacy root ``avatar.*``) from a published snapshot."""
+    for relpath in _ALL_AVATAR_RELPATHS:
+        path = snapshot_dir.joinpath(*PurePosixPath(relpath).parts)
+        if not path.is_file():
+            continue
+        try:
+            data = path.read_bytes()
+        except OSError:
+            continue
+        if not data:
+            continue
+        media_type = sniff_image_media_type(data[:16]) or "application/octet-stream"
+        return data, media_type
+    return None
+
+
+def display_published_expert_icon_url(
+    *,
+    expert_id: str,
+    snapshot_dir: Path,
+    updated_at: str | int | None = None,
+) -> str | None:
+    """Public ``icon_url`` when the published snapshot contains an avatar file."""
+    if read_snapshot_avatar(snapshot_dir) is None:
+        return None
+    local = published_expert_avatar_api_path(expert_id)
+    version = str(updated_at or "").strip()
+    if not version:
+        return local
+    return f"{local}?v={version}"
+
+
 async def bind_workspace_avatar_icon_url(
     registry: Any,
     agent_id: str,
diff --git a/src/octop/infra/agents/experts/library/ai-coding-coach/skills/cheatsheet/SKILL.md b/src/octop/infra/agents/experts/library/ai-coding-coach/skills/cheatsheet/SKILL.md
index 21f75c7c..407ee87e 100644
--- a/src/octop/infra/agents/experts/library/ai-coding-coach/skills/cheatsheet/SKILL.md
+++ b/src/octop/infra/agents/experts/library/ai-coding-coach/skills/cheatsheet/SKILL.md
@@ -1,6 +1,15 @@
 ---
 name: cheatsheet
 description: AI 编程工具速查与 60+ 技巧清单——覆盖 Claude Code / Cursor / Codex / Copilot / Aider 等的能力矩阵、核心命令与高频技巧分类。供编程导师在选型与排障时引用。
+metadata:
+  octop:
+    emoji: "📋"
+    label:
+      zh: "AI 编程速查"
+      en: "AI Coding Cheatsheet"
+    summary:
+      zh: "对照主流 AI 编程工具的能力矩阵、命令与高频技巧。"
+      en: "Compare AI coding tools, commands, and high-frequency techniques."
 ---
 
 # AI 编程工具速查与技巧清单
diff --git a/src/octop/infra/agents/experts/library/ai-safety-guardian/skills/security-guide/SKILL.md b/src/octop/infra/agents/experts/library/ai-safety-guardian/skills/security-guide/SKILL.md
index 3c9979f0..917b0761 100644
--- a/src/octop/infra/agents/experts/library/ai-safety-guardian/skills/security-guide/SKILL.md
+++ b/src/octop/infra/agents/experts/library/ai-safety-guardian/skills/security-guide/SKILL.md
@@ -1,6 +1,15 @@
 ---
 name: security-guide
 description: AI 工具安全部署与合规体检的 6 步清单，覆盖 shellward 8 层防御与中文合规（PIPL/等保2.0/数据出境/生成式AI标识）。
+metadata:
+  octop:
+    emoji: "🛡️"
+    label:
+      zh: "安全合规体检"
+      en: "Security Guide"
+    summary:
+      zh: "按 6 步检查 AI 工具部署、命令拦截与中文合规。"
+      en: "Run a 6-step AI deployment, command-block, and compliance checkup."
 ---
 
 # AI 安全部署与合规体检清单
diff --git a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/clinical-q-and-a/SKILL.md b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/clinical-q-and-a/SKILL.md
index a8e5fa04..304612ea 100644
--- a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/clinical-q-and-a/SKILL.md
+++ b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/clinical-q-and-a/SKILL.md
@@ -1,6 +1,15 @@
 ---
 name: clinical-q-and-a
 description: 快速回答普通教育性医学问题与常见误区。默认用一份国内现行权威指南/共识完成轻量核验并立即作答；不用于个体诊疗、处方剂量、精确推荐定位、药品高风险事实、医保监管或跨版本比较。
+metadata:
+  octop:
+    emoji: "💬"
+    label:
+      zh: "医学问答"
+      en: "Clinical Q&A"
+    summary:
+      zh: "用一份权威正文快速澄清教育性医学问题与常见误区。"
+      en: "Answer educational medical questions from one authoritative source."
 ---
 
 # 普通医学问答快路径
diff --git a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/doctor-registration/SKILL.md b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/doctor-registration/SKILL.md
index 89f0e04f..9f7093f2 100644
--- a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/doctor-registration/SKILL.md
+++ b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/doctor-registration/SKILL.md
@@ -1,6 +1,15 @@
 ---
 name: doctor-registration
 description: 当医生提供或更新称谓、地区、医院、科室、职称这5项登记信息，变更科室/地区/职称，或要求停用、删除订阅数据时使用。本技能只管登记的写入/更新/清除；登记完成后的订阅任务创建由 subscription-setup skill 负责。不启用诊断、治疗、疾病SOP、急诊行动卡、个体患者建议、药物剂量、HIS决策支持或医保报销结论能力。
+metadata:
+  octop:
+    emoji: "🪪"
+    label:
+      zh: "医生登记"
+      en: "Doctor Registration"
+    summary:
+      zh: "登记或更新称谓、地区、医院、科室与职称五项信息。"
+      en: "Register or update title, region, hospital, department, and rank."
 ---
 
 # 医生登记、更新与停用
diff --git a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/exam-material-recommendation/SKILL.md b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/exam-material-recommendation/SKILL.md
index b8b3806f..95a1c96c 100644
--- a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/exam-material-recommendation/SKILL.md
+++ b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/exam-material-recommendation/SKILL.md
@@ -1,6 +1,15 @@
 ---
 name: exam-material-recommendation
 description: 根据医生自述的考试或岗位目标（副高、中级、规培、执业医师等）推荐学习材料、教材与学习顺序，并按目标动态调整学习内容。必须以官方考试大纲为准，不得断言考试范围或承诺通过结果，也不得输出个体诊疗内容。
+metadata:
+  octop:
+    emoji: "📚"
+    label:
+      zh: "备考材料推荐"
+      en: "Exam Material Recommendation"
+    summary:
+      zh: "按考试或岗位目标推荐教材与学习顺序，以官方大纲为准。"
+      en: "Recommend study materials and order from official exam outlines."
 ---
 
 # 备考与岗位导向的学习材料推荐
diff --git a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/guideline-learning-diagnosis/SKILL.md b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/guideline-learning-diagnosis/SKILL.md
index 059921ef..dc033704 100644
--- a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/guideline-learning-diagnosis/SKILL.md
+++ b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/guideline-learning-diagnosis/SKILL.md
@@ -5,6 +5,15 @@ description: >-
   做教育性小测，或学习指南中的诊断标准、鉴别框架和流程关系时使用。
   本技能只做学习诊断与诊断标准教学，不对具体患者作疾病诊断、治疗、处方、剂量、
   急诊处置或医保报销判断。
+metadata:
+  octop:
+    emoji: "🧩"
+    label:
+      zh: "学习诊断"
+      en: "Learning Diagnosis"
+    summary:
+      zh: "评估指南掌握情况，讲解诊断标准，不做个体诊疗。"
+      en: "Assess guideline mastery and teach diagnostic criteria, not cases."
 ---
 
 # 指南学习诊断与诊断标准学习
diff --git a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/guideline-learning/SKILL.md b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/guideline-learning/SKILL.md
index 8d8b894d..07d1fbf8 100644
--- a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/guideline-learning/SKILL.md
+++ b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/guideline-learning/SKILL.md
@@ -1,6 +1,15 @@
 ---
 name: guideline-learning
 description: 指南学习流程约束。判断请求类型→读取状态→按流程创建轨道/预览/投递/排查迁移；操作命令与细则见 references/learning-operations.md。选题用权威信源，输出前经 output-format 校验。不生成诊疗/处方/急诊SOP/个体患者建议。
+metadata:
+  octop:
+    emoji: "📘"
+    label:
+      zh: "指南学习"
+      en: "Guideline Learning"
+    summary:
+      zh: "按轨道创建、预览与投递权威指南学习内容。"
+      en: "Create, preview, and deliver guideline learning tracks."
 ---
 
 # 指南学习流程
diff --git a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/guideline-section-expansion/SKILL.md b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/guideline-section-expansion/SKILL.md
index 01c05ccc..b02a4c1d 100644
--- a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/guideline-section-expansion/SKILL.md
+++ b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/guideline-section-expansion/SKILL.md
@@ -1,6 +1,15 @@
 ---
 name: guideline-section-expansion
 description: 把已核验的权威指南按原文结构逐节展开讲解，并给出原文定位，帮医生读懂原文；也可把指南整理为学习路径图（学习顺序）。不得生成诊疗方案、床旁处置步骤、疾病 SOP、急诊行动卡、个体患者建议或药物剂量说明。
+metadata:
+  octop:
+    emoji: "📑"
+    label:
+      zh: "章节展开"
+      en: "Section Expansion"
+    summary:
+      zh: "按原文结构展开指南章节，或整理学习路径图。"
+      en: "Expand verified guideline sections or build a learning pathway."
 ---
 
 # 指南章节展开与学习路径图
diff --git a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/guideline-update-reminder/SKILL.md b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/guideline-update-reminder/SKILL.md
index e82dd029..5c9f79cc 100644
--- a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/guideline-update-reminder/SKILL.md
+++ b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/guideline-update-reminder/SKILL.md
@@ -1,6 +1,15 @@
 ---
 name: guideline-update-reminder
 description: 为基层医生学习小助手生成专业指南更新提醒。适用于每3天一次或按需输出与医生科室、亚专业、职称深度和基层场景相关的指南、共识、规范、临床路径或质控标准更新。只提供学习提醒和权威信源，不输出临床行动、疾病SOP、个体患者建议、药物剂量或院内流程变更。
+metadata:
+  octop:
+    emoji: "🔔"
+    label:
+      zh: "指南更新提醒"
+      en: "Guideline Update Reminder"
+    summary:
+      zh: "按科室与基层场景提醒相关指南、共识与规范更新。"
+      en: "Remind doctors of relevant guideline and consensus updates."
 ---
 
 # 专业指南更新提醒
diff --git a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/insurance-policy-learning/SKILL.md b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/insurance-policy-learning/SKILL.md
index b3dc6d0b..63696364 100644
--- a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/insurance-policy-learning/SKILL.md
+++ b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/insurance-policy-learning/SKILL.md
@@ -1,6 +1,15 @@
 ---
 name: insurance-policy-learning
 description: 为基层医生学习小助手生成地区医保政策学习内容。支持每周二、周五或按需的最新变化摘要，也支持近一年／指定区间的重点政策回顾学习。只输出政策原文摘要、待本地确认事项和权威信源，不输出报销结论、支付比例、HIS提醒、病历要求或医院执行承诺。
+metadata:
+  octop:
+    emoji: "🏥"
+    label:
+      zh: "医保政策学习"
+      en: "Insurance Policy Learning"
+    summary:
+      zh: "摘要地区医保正式文件变化，并标明待本地确认事项。"
+      en: "Summarize local insurance policy changes for learning, not claims."
 ---
 
 # 地区医保政策学习
diff --git a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/intent-routing/SKILL.md b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/intent-routing/SKILL.md
index fbbe41e0..43b6885e 100644
--- a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/intent-routing/SKILL.md
+++ b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/intent-routing/SKILL.md
@@ -1,6 +1,15 @@
 ---
 name: intent-routing
 description: 请求入口的意图识别与技能路由。按渐进式判断意图：先通用任务（直接做）、再高风险临床（拒绝）、再区分纯信源核验与医学学习、最后登记/订阅。纯信源核验先走 source-verify；原始路径受限时再进入 medical-source-failover。医学学习才调对应 skill + output-format 校验。
+metadata:
+  octop:
+    emoji: "🧭"
+    label:
+      zh: "意图路由"
+      en: "Intent Routing"
+    summary:
+      zh: "识别通用任务、高风险临床、信源核验与医学学习并分发。"
+      en: "Route general, clinical, source-verify, and learning requests."
 ---
 
 # 意图识别与路由
diff --git a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/medical-source-failover/SKILL.md b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/medical-source-failover/SKILL.md
index e1a9b626..b25d1e51 100644
--- a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/medical-source-failover/SKILL.md
+++ b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/medical-source-failover/SKILL.md
@@ -1,6 +1,15 @@
 ---
 name: medical-source-failover
 description: Route retrieval of Chinese medical guidelines, consensus statements, regulatory documents, drug information, safety notices, standards, and public-health materials through authoritative originals and verified fallback copies. Use when a canonical medical source is blocked, slow, unavailable, moved, paywalled, or difficult to parse, or when designing and auditing domestic medical-source fallback rules. Do not treat secondary summaries or reposts as independent clinical evidence.
+metadata:
+  octop:
+    emoji: "🛟"
+    label:
+      zh: "信源熔断降级"
+      en: "Medical Source Failover"
+    summary:
+      zh: "原文受阻时按可信路径降级访问，不降低证据标准。"
+      en: "Failover blocked originals without lowering evidence standards."
 ---
 
 # Medical Source Failover
diff --git a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/output-format/SKILL.md b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/output-format/SKILL.md
index c4af3b7d..08be101d 100644
--- a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/output-format/SKILL.md
+++ b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/output-format/SKILL.md
@@ -1,6 +1,15 @@
 ---
 name: output-format
 description: 结构化医学学习产物的统一格式校验。四条硬格式与 validate_output.py 单次标准输入流程。指南章节、路径图、诊断、备考、医保、更新和每日单元使用；普通医学问答走 clinical-q-and-a 的轻量自检，通用任务不套用。
+metadata:
+  octop:
+    emoji: "✅"
+    label:
+      zh: "输出格式校验"
+      en: "Output Format Check"
+    summary:
+      zh: "校验结构化医学学习产物的硬格式后再发出。"
+      en: "Validate structured medical learning output before sending."
 ---
 
 # 医学安全域输出格式校验
diff --git a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/source-verify/SKILL.md b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/source-verify/SKILL.md
index 019d18ba..5c0165e2 100644
--- a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/source-verify/SKILL.md
+++ b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/source-verify/SKILL.md
@@ -1,6 +1,15 @@
 ---
 name: source-verify
 description: 医学信源快速或完整核验。普通教育性医学问答用单一权威正文快速核验；最新版本、精确推荐、高风险药品、医保监管或跨版本请求升级为完整核验。只整理学习依据，不生成诊疗、处方、急诊处置、医保报销结论或HIS执行建议。
+metadata:
+  octop:
+    emoji: "🔍"
+    label:
+      zh: "信源核验"
+      en: "Source Verify"
+    summary:
+      zh: "核验医学权威原文、版本时效与修订替代关系。"
+      en: "Verify authoritative medical sources, versions, and replacements."
 ---
 
 # 统一信源核验
diff --git a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/subscription-setup/SKILL.md b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/subscription-setup/SKILL.md
index 7ee3e32c..f4b984fb 100644
--- a/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/subscription-setup/SKILL.md
+++ b/src/octop/infra/agents/experts/library/clinical-learning-subscription/skills/subscription-setup/SKILL.md
@@ -1,6 +1,15 @@
 ---
 name: subscription-setup
 description: 学习订阅任务创建与启用。医生完成 5 项登记后，按用户选择创建订阅任务（每日指南连续学习/专业指南更新提醒/地区医保政策变化学习）。平台 cronjob_create 自动绑定当前会话通道投递，无需微信绑定门禁。先查重再创建，回执如实写已启用。
+metadata:
+  octop:
+    emoji: "📅"
+    label:
+      zh: "学习订阅"
+      en: "Learning Subscription"
+    summary:
+      zh: "登记完成后创建每日指南、更新提醒与医保政策订阅。"
+      en: "Create guideline, update, and insurance learning subscriptions."
 ---
 
 # 学习订阅任务创建
diff --git a/src/octop/infra/agents/experts/library/cvm-ai-doctor/skills/cvm-ai-doctor/SKILL.md b/src/octop/infra/agents/experts/library/cvm-ai-doctor/skills/cvm-ai-doctor/SKILL.md
index e88b2918..951ff59c 100644
--- a/src/octop/infra/agents/experts/library/cvm-ai-doctor/skills/cvm-ai-doctor/SKILL.md
+++ b/src/octop/infra/agents/experts/library/cvm-ai-doctor/skills/cvm-ai-doctor/SKILL.md
@@ -1,7 +1,19 @@
 ---
 name: cvm-ai-doctor
 description: CVM 实例健康诊断,采用智能快速/深度检查模式。涵盖性能和使用问题专业检查、诊断、和修复。支持服务器、PC、虚拟机、容器场景，支持 Linux/macOS/Windows。
-metadata: {"openclaw": {"requires": {"bins": ["bash", "ps"]}, "os": ["linux", "darwin", "windows"]}}
+metadata:
+  openclaw:
+    requires:
+      bins: ["bash", "ps"]
+    os: ["linux", "darwin", "windows"]
+  octop:
+    emoji: "🩺"
+    label:
+      zh: "CVM AI 诊断"
+      en: "CVM AI Doctor"
+    summary:
+      zh: "快速分诊后再深度检查 CPU、内存、磁盘与网络问题。"
+      en: "Triage then deeply diagnose CPU, memory, disk, and network issues."
 ---
 
 # CVM AI Doctor 技能
diff --git a/src/octop/infra/agents/experts/library/cvm-cluster-doctor/skills/tencentcloud-infra/SKILL.md b/src/octop/infra/agents/experts/library/cvm-cluster-doctor/skills/tencentcloud-infra/SKILL.md
index 3318daf7..93625999 100644
--- a/src/octop/infra/agents/experts/library/cvm-cluster-doctor/skills/tencentcloud-infra/SKILL.md
+++ b/src/octop/infra/agents/experts/library/cvm-cluster-doctor/skills/tencentcloud-infra/SKILL.md
@@ -24,6 +24,14 @@ metadata:
         "lighthouse-openclaw-setup",
         "lighthouse-app-deploy"
       ]
+    },
+    "octop": {
+      "emoji": "☁️",
+      "label": { "zh": "腾讯云基础设施", "en": "Tencent Cloud Infra" },
+      "summary": {
+        "zh": "用 tccli 管理轻量服务器、CVM、网络、证书与监控。",
+        "en": "Manage Lighthouse, CVM, networking, certificates, and monitoring with tccli."
+      }
     }
   }
 ---
diff --git a/src/octop/infra/agents/experts/library/general-assistant/skills/octop-assistant/SKILL.md b/src/octop/infra/agents/experts/library/general-assistant/skills/octop-assistant/SKILL.md
index 06a556b4..1a1f786b 100644
--- a/src/octop/infra/agents/experts/library/general-assistant/skills/octop-assistant/SKILL.md
+++ b/src/octop/infra/agents/experts/library/general-assistant/skills/octop-assistant/SKILL.md
@@ -1,5 +1,5 @@
 ---
-name: octop_assistant
+name: octop-assistant
 description: >-
   帮助用户配置和管理 Octop 自身。当用户提出以下类型的问题时使用此 skill：
   配置或切换 LLM 模型与 Provider；添加或管理 IM 通道（飞书、企业微信、QQ 等）；
diff --git a/src/octop/infra/agents/experts/library/karpathy-knowledge-base/skills/llm-wiki/SKILL.md b/src/octop/infra/agents/experts/library/karpathy-knowledge-base/skills/llm-wiki/SKILL.md
index 49762dc7..d9cbf4e2 100644
--- a/src/octop/infra/agents/experts/library/karpathy-knowledge-base/skills/llm-wiki/SKILL.md
+++ b/src/octop/infra/agents/experts/library/karpathy-knowledge-base/skills/llm-wiki/SKILL.md
@@ -1,6 +1,15 @@
 ---
 name: llm-wiki
 description: Build, ingest, query, and lint a persistent Markdown knowledge base using the Karpathy LLM Wiki pattern. Use for adding sources, maintaining interlinked wiki pages, answering from the knowledge base, filing durable research, or checking contradictions and index health. Do not use it to persist ordinary chat or unverified personal data.
+metadata:
+  octop:
+    emoji: "🗂️"
+    label:
+      zh: "LLM Wiki"
+      en: "LLM Wiki"
+    summary:
+      zh: "摄取来源、维护互链 Wiki，并据此回答与核验知识库。"
+      en: "Ingest sources, maintain a linked wiki, and answer from the knowledge base."
 ---
 
 # LLM Wiki
diff --git a/src/octop/infra/agents/experts/library/meituan-living-assistant/skills/meituan-deals/SKILL.md b/src/octop/infra/agents/experts/library/meituan-living-assistant/skills/meituan-deals/SKILL.md
index 7cde9f46..aaed470c 100644
--- a/src/octop/infra/agents/experts/library/meituan-living-assistant/skills/meituan-deals/SKILL.md
+++ b/src/octop/infra/agents/experts/library/meituan-living-assistant/skills/meituan-deals/SKILL.md
@@ -10,6 +10,12 @@ metadata:
   octop:
     emoji: "🍜"
     requires: {}
+    label:
+      zh: "美团优惠"
+      en: "Meituan Deals"
+    summary:
+      zh: "领取美团优惠券，搜索附近团购并协助下单。"
+      en: "Claim Meituan coupons, search nearby deals, and help place orders."
 ---
 
 # 美团生活助手 — 领券下单找我
diff --git a/src/octop/infra/agents/experts/library/news-trend/skills/daily-hot-news/SKILL.md b/src/octop/infra/agents/experts/library/news-trend/skills/daily-hot-news/SKILL.md
index 2f07e44a..c61d7588 100644
--- a/src/octop/infra/agents/experts/library/news-trend/skills/daily-hot-news/SKILL.md
+++ b/src/octop/infra/agents/experts/library/news-trend/skills/daily-hot-news/SKILL.md
@@ -1,6 +1,15 @@
 ---
 name: daily-hot-news
 description: 获取热点新闻、热搜、早报、金价、汇率，以及论坛帖子、科技资讯等内容。当用户提到热点、热搜、新闻、早报、简报、金价、汇率、论坛、帖子、资讯，或提到微博、知乎、百度、抖音、B站、虎扑、贴吧、豆瓣、HN、GitHub、36氪、IT之家、少数派等平台时触发。即使用户只是随口问"今天有什么新鲜事"或"最近怎么样"，也应使用此 skill。
+metadata:
+  octop:
+    emoji: "🔥"
+    label:
+      zh: "每日热点"
+      en: "Daily Hot News"
+    summary:
+      zh: "汇总热搜、早报、金价汇率与科技资讯，生成个性化简报。"
+      en: "Collect hot searches, briefings, and tech news into a personalized digest."
 ---
 
 # 每日热点新闻播报
diff --git a/src/octop/infra/agents/experts/library/office-automation/skills/docx/SKILL.md b/src/octop/infra/agents/experts/library/office-automation/skills/docx/SKILL.md
index 56c7ffd3..33ef6f74 100644
--- a/src/octop/infra/agents/experts/library/office-automation/skills/docx/SKILL.md
+++ b/src/octop/infra/agents/experts/library/office-automation/skills/docx/SKILL.md
@@ -4,6 +4,14 @@ description: "当用户需要创建、读取、编辑或处理 Word 文档（.do
 license: Proprietary. LICENSE.txt has complete terms
 metadata:
   builtin_skill_version: "1.1"
+  octop:
+    emoji: "📝"
+    label:
+      zh: "Word 文档"
+      en: "Word Documents"
+    summary:
+      zh: "创建、读取、编辑或整理专业 .docx 文档。"
+      en: "Create, read, edit, or format professional .docx documents."
 ---
 
 > **重要:** 所有 `scripts/` 路径均相对于本技能目录。
diff --git a/src/octop/infra/agents/experts/library/office-automation/skills/file_reader/SKILL.md b/src/octop/infra/agents/experts/library/office-automation/skills/file_reader/SKILL.md
index 25aed92c..e9f4c287 100644
--- a/src/octop/infra/agents/experts/library/office-automation/skills/file_reader/SKILL.md
+++ b/src/octop/infra/agents/experts/library/office-automation/skills/file_reader/SKILL.md
@@ -6,6 +6,14 @@ metadata:
   qwenpaw:
     emoji: "📄"
     requires: {}
+  octop:
+    emoji: "📖"
+    label:
+      zh: "文件读取"
+      en: "File Reader"
+    summary:
+      zh: "读取并总结本地文本文件，不处理 PDF 与 Office。"
+      en: "Read and summarize local text files, not PDF or Office."
 ---
 # 文件读取工具箱
 
diff --git a/src/octop/infra/agents/experts/library/office-automation/skills/news/SKILL.md b/src/octop/infra/agents/experts/library/office-automation/skills/news/SKILL.md
index 8bdcab4c..f5ab1680 100644
--- a/src/octop/infra/agents/experts/library/office-automation/skills/news/SKILL.md
+++ b/src/octop/infra/agents/experts/library/office-automation/skills/news/SKILL.md
@@ -6,6 +6,14 @@ metadata:
   qwenpaw:
     emoji: "📰"
     requires: {}
+  octop:
+    emoji: "📰"
+    label:
+      zh: "新闻速览"
+      en: "News Digest"
+    summary:
+      zh: "按政治、财经、科技等分类抓取并总结最新新闻。"
+      en: "Fetch and summarize latest news by category."
 ---
 
 # 新闻参考
diff --git a/src/octop/infra/agents/experts/library/office-automation/skills/pdf/SKILL.md b/src/octop/infra/agents/experts/library/office-automation/skills/pdf/SKILL.md
index 06cf2348..2cfd222c 100644
--- a/src/octop/infra/agents/experts/library/office-automation/skills/pdf/SKILL.md
+++ b/src/octop/infra/agents/experts/library/office-automation/skills/pdf/SKILL.md
@@ -4,6 +4,14 @@ description: 当用户需要对PDF文件进行任何操作时，请使用此技
 license: Proprietary. LICENSE.txt has complete terms
 metadata:
   builtin_skill_version: "1.1"
+  octop:
+    emoji: "📄"
+    label:
+      zh: "PDF 处理"
+      en: "PDF Tools"
+    summary:
+      zh: "读取、合并、拆分、填写表单或 OCR 处理 PDF。"
+      en: "Read, merge, split, fill forms, or OCR PDFs."
 ---
 
 > **重要：** 所有 `scripts/` 路径均相对于此技能目录。
diff --git a/src/octop/infra/agents/experts/library/office-automation/skills/pptx/SKILL.md b/src/octop/infra/agents/experts/library/office-automation/skills/pptx/SKILL.md
index 0c8af7ac..e495172d 100644
--- a/src/octop/infra/agents/experts/library/office-automation/skills/pptx/SKILL.md
+++ b/src/octop/infra/agents/experts/library/office-automation/skills/pptx/SKILL.md
@@ -4,6 +4,14 @@ description: "当涉及到 .pptx 文件的任何操作时使用此技能——
 license: Proprietary. LICENSE.txt has complete terms
 metadata:
   builtin_skill_version: "1.1"
+  octop:
+    emoji: "📽️"
+    label:
+      zh: "PPT 演示"
+      en: "Presentations"
+    summary:
+      zh: "创建、读取、编辑或拆分 .pptx 演示文稿。"
+      en: "Create, read, edit, or split .pptx presentations."
 ---
 
 > **重要：** 所有 `scripts/` 路径都相对于此技能目录。
diff --git a/src/octop/infra/agents/experts/library/office-automation/skills/xlsx/SKILL.md b/src/octop/infra/agents/experts/library/office-automation/skills/xlsx/SKILL.md
index f59cf26f..24c4fa6c 100644
--- a/src/octop/infra/agents/experts/library/office-automation/skills/xlsx/SKILL.md
+++ b/src/octop/infra/agents/experts/library/office-automation/skills/xlsx/SKILL.md
@@ -4,6 +4,14 @@ description: "当电子表格文件是主要输入或输出时使用此技能。
 license: Proprietary. LICENSE.txt has complete terms
 metadata:
   builtin_skill_version: "1.1"
+  octop:
+    emoji: "📊"
+    label:
+      zh: "Excel 表格"
+      en: "Spreadsheets"
+    summary:
+      zh: "创建、读取、编辑或清理 .xlsx、.csv 等电子表格。"
+      en: "Create, read, edit, or clean .xlsx, .csv, and related spreadsheets."
 ---
 
 > **重要说明：** 所有 `scripts/` 路径均相对于此技能目录。
diff --git a/src/octop/infra/agents/experts/library/stock-assistant/skills/stock-info/SKILL.md b/src/octop/infra/agents/experts/library/stock-assistant/skills/stock-info/SKILL.md
index ecd31a65..31ed01ee 100644
--- a/src/octop/infra/agents/experts/library/stock-assistant/skills/stock-info/SKILL.md
+++ b/src/octop/infra/agents/experts/library/stock-assistant/skills/stock-info/SKILL.md
@@ -1,6 +1,15 @@
 ---
 name: akshare-data
 description: 使用 akshare-cli 获取中国及全球金融市场数据（1090+ 个函数）。覆盖股票、基金、期货、债券、外汇、宏观经济、指数、期权、新闻等全领域。当用户需要以下任何一种数据时触发此 skill：股票行情、历史K线、实时报价、涨停跌停池、龙虎榜、板块资金流向、基金/ETF净值、期货行情、债券/可转债、外汇汇率、宏观经济指标（GDP/CPI/PMI）、指数数据、期权数据、财经新闻。关键词触发：akshare、股票、行情、K线、基金、期货、外汇、宏观、国债、可转债、涨停、龙虎榜、板块、资金流向、stock data、market data、financial data、A股、港股、美股。即使用户只是随口提到"看看某个股票"或"最近市场怎么样"，也应触发。
+metadata:
+  octop:
+    emoji: "📈"
+    label:
+      zh: "金融行情"
+      en: "Market Data"
+    summary:
+      zh: "用 akshare-cli 查询股票、基金、期货、宏观与财经新闻。"
+      en: "Fetch stocks, funds, futures, macro, and financial news via akshare-cli."
 ---
 
 # AKShare 金融数据获取
diff --git a/src/octop/infra/agents/experts/library/superpowers-methodology/skills/engineering-workflow/SKILL.md b/src/octop/infra/agents/experts/library/superpowers-methodology/skills/engineering-workflow/SKILL.md
index ae9e2b96..0a7ac67b 100644
--- a/src/octop/infra/agents/experts/library/superpowers-methodology/skills/engineering-workflow/SKILL.md
+++ b/src/octop/infra/agents/experts/library/superpowers-methodology/skills/engineering-workflow/SKILL.md
@@ -1,6 +1,15 @@
 ---
 name: engineering-workflow
 description: 可靠工程工作流的执行细则——探索→计划→TDD→系统化调试→代码审查→完成前验证。供方法论教练在开发任务中逐步引导。
+metadata:
+  octop:
+    emoji: "🛠️"
+    label:
+      zh: "工程工作流"
+      en: "Engineering Workflow"
+    summary:
+      zh: "按探索、计划、TDD、调试、审查与验证逐步推进开发。"
+      en: "Guide development through explore, plan, TDD, debug, review, and verify."
 ---
 
 # 可靠工程工作流（执行细则）
diff --git a/src/octop/infra/agents/experts/library/tencentcloud-api/skills/tcapi/SKILL.md b/src/octop/infra/agents/experts/library/tencentcloud-api/skills/tcapi/SKILL.md
index 48fd53de..11fd6c3d 100644
--- a/src/octop/infra/agents/experts/library/tencentcloud-api/skills/tcapi/SKILL.md
+++ b/src/octop/infra/agents/experts/library/tencentcloud-api/skills/tcapi/SKILL.md
@@ -2,6 +2,15 @@
 name: tcapi
 display_name: 腾讯云 API 助手
 description: Skill to call Cloud API for Tencent Cloud (腾讯云). Used for cloud automation or resource management. 当用户需要查询、创建、管理腾讯云资源，或执行云 API 自动化操作时触发。优先使用 Octop 自带 venv 中的 tccli，凭证支持全自动 OAuth 登录。
+metadata:
+  octop:
+    emoji: "☁️"
+    label:
+      zh: "腾讯云 API"
+      en: "Tencent Cloud API"
+    summary:
+      zh: "用 tccli 查询与管理腾讯云资源，支持 OAuth 登录。"
+      en: "Query and manage Tencent Cloud resources with tccli and OAuth."
 version: 1.0.0
 tags: [tccli, cloud-api, tencent-cloud, automation]
 keywords: [腾讯云, tccli, cloud api, 云资源, 云管理, 自动化运维]
diff --git a/src/octop/infra/agents/experts/library/wechat-ops/skills/publisher-multi-platform/SKILL.md b/src/octop/infra/agents/experts/library/wechat-ops/skills/publisher-multi-platform/SKILL.md
index d6e4e13b..c2dcd476 100644
--- a/src/octop/infra/agents/experts/library/wechat-ops/skills/publisher-multi-platform/SKILL.md
+++ b/src/octop/infra/agents/experts/library/wechat-ops/skills/publisher-multi-platform/SKILL.md
@@ -9,6 +9,16 @@ metadata:
         "requires": { "bins": ["node", "npx", "python3"] },
         "primaryEnv": "WECHAT_APP_ID",
       },
+    "octop":
+      {
+        "emoji": "✍️",
+        "label": { "zh": "一文多发", "en": "Multi-Platform Publisher" },
+        "summary":
+          {
+            "zh": "把一篇 Markdown 同步发布到内容运营平台与社交平台。",
+            "en": "Publish one Markdown article to content and social platforms.",
+          },
+      },
   }
 ---
 
diff --git a/src/octop/infra/agents/experts/market_creation.py b/src/octop/infra/agents/experts/market_creation.py
index 01dd2435..57e24532 100644
--- a/src/octop/infra/agents/experts/market_creation.py
+++ b/src/octop/infra/agents/experts/market_creation.py
@@ -20,6 +20,7 @@
     install_skillset_template,
 )
 from octop.infra.errors import ErrorCode, OctopError
+from octop.infra.trajectory.settings import apply_enable_trajectory
 from octop.infra.utils.locale import resolve_user_locale
 
 logger = logging.getLogger(__name__)
@@ -54,6 +55,7 @@ class SkillHubMarketAgentCreateOptions:
     temperature: float | None = None
     top_p: float | None = None
     max_tokens: int | None = None
+    enable_trajectory: bool = True
 
 
 @dataclass(frozen=True)
@@ -282,6 +284,7 @@ async def create_agent_from_skillhub_skillset(
         config_extra["providers"] = list(options.providers)
     if options.backend:
         config_extra["backend"] = options.backend
+    apply_enable_trajectory(config_extra, options.enable_trajectory)
 
     locale = resolve_user_locale(
         user_repo=server.services.user_repo,
diff --git a/src/octop/infra/agents/experts/published_creation.py b/src/octop/infra/agents/experts/published_creation.py
index ded3b4cf..fdd330de 100644
--- a/src/octop/infra/agents/experts/published_creation.py
+++ b/src/octop/infra/agents/experts/published_creation.py
@@ -27,6 +27,7 @@
 from octop.infra.agents.manager import AgentCreateSpec
 from octop.infra.db.repos.published_experts import PublishedExpertRow
 from octop.infra.errors import ErrorCode, OctopError
+from octop.infra.trajectory.settings import apply_enable_trajectory
 from octop.infra.users.identity import User
 from octop.infra.utils.ulid import new_ulid
 
@@ -44,6 +45,7 @@ class PublishedExpertInstallOptions:
     icon_url: str | None = None
     welcome_message: str | None = None
     runtime_config: dict[str, Any] | None = None
+    enable_trajectory: bool = True
 
 
 def _snapshot_dir(services: Any, expert_id: str) -> Path:
@@ -305,6 +307,7 @@ async def install_published_expert(
         config_extra["providers"] = list(options.providers)
     if options.backend:
         config_extra["backend"] = options.backend
+    apply_enable_trajectory(config_extra, options.enable_trajectory)
 
     async def seed_snapshot(created_row: Any, workspace: Any) -> None:
         await seed_expert_directory(expert_dir=snapshot_dir, workspace=workspace)
diff --git a/src/octop/infra/agents/manager.py b/src/octop/infra/agents/manager.py
index 08505dc4..b1d0766f 100644
--- a/src/octop/infra/agents/manager.py
+++ b/src/octop/infra/agents/manager.py
@@ -53,6 +53,7 @@
 )
 from octop.infra.connectors.builder import (
     build_mcp_server_configs_for_user,
+    gateway_mcp_server_names,
     inject_missing_gateway_tools,
 )
 from octop.infra.connectors.service import ConnectorService
@@ -71,6 +72,7 @@
     from octop.infra.cron.manager import CronManager
     from octop.infra.db.repos.agents import AgentRow
     from octop.infra.db.services import RepoBundle
+    from octop.infra.proactive.scheduler import ProactiveCareScheduler
     from octop.infra.utils.paths import PathLayout
 
 logger = logging.getLogger(__name__)
@@ -333,6 +335,7 @@ def __init__(
         self._expert_catalog = expert_catalog
         self._plugin_manager = plugin_manager
         self._cron_manager: CronManager | None = None
+        self._proactive_scheduler: ProactiveCareScheduler | None = None
         self._team_processor: Any | None = None
         self._harness_manager: HarnessAgentManager | None = None
         self._lock = asyncio.Lock()
@@ -403,6 +406,10 @@ def set_cron_manager(self, cron_manager: CronManager) -> None:
         """Attach the process-wide CronManager (must be set before boot())."""
         self._cron_manager = cron_manager
 
+    def set_proactive_scheduler(self, scheduler: ProactiveCareScheduler) -> None:
+        """Attach the process-wide proactive-care scheduler (optional; used after create/delete)."""
+        self._proactive_scheduler = scheduler
+
     def set_team_processor(self, team_processor: Any | None) -> None:
         """Attach harness TeamProcessor (GlobalProcessor); required before boot()."""
         self._team_processor = team_processor
@@ -573,12 +580,16 @@ async def create(
             else:
                 agent = await self._start_agent(row, init_workspace=True)
                 if agent is not None and spec.template_name:
+                    if self._spec_is_opensandbox(self._backend_spec_for_row(row)):
+                        await self._seed_expert_template(row, spec.template_name)
                     reload = getattr(agent, "reload_subagents", None)
                     if callable(reload):
                         await asyncio.to_thread(reload)
             self._repos.audit_repo.write(
                 actor=ACTOR_SYSTEM, action="agent.create", target=agent_id, payload=spec.name
             )
+            if self._proactive_scheduler is not None:
+                self._proactive_scheduler.ensure_scheduled(agent_id)
             return row
 
     def _preserve_system_files_path(self, agent_id: str, cfg: dict[str, Any]) -> dict[str, Any]:
@@ -678,6 +689,8 @@ async def delete(self, agent_id: str) -> None:
         except OSError:
             logger.exception("rmtree failed for %s; agent removed from DB anyway", workspace_dir)
         self._repos.agent_repo.delete(agent_id)
+        if self._proactive_scheduler is not None:
+            self._proactive_scheduler.cancel(agent_id)
         self._repos.audit_repo.write(actor=ACTOR_SYSTEM, action="agent.delete", target=agent_id)
 
     async def start(self, agent_id: str) -> None:
@@ -1134,7 +1147,7 @@ async def reload_connectors(
         self._connector_user_override[agent_id] = uid
         try:
             svc = self._connector_svc
-            for inst in self._repos.connector_repo.list_by_user(uid):
+            for inst in self._repos.connector_repo.list_visible(uid):
                 if inst.status != "active":
                     continue
                 await svc.ensure_fresh_credentials(inst.instance_id, inst.kind)
@@ -1167,11 +1180,10 @@ def invalidate_mcp_tool_cache(self, user_id: int | None = None) -> None:
 
     def mcp_server_labels_for_user(self, user_id: int) -> dict[str, str]:
         labels: dict[str, str] = {}
-        for inst in self._repos.connector_repo.list_by_user(user_id):
-            name = inst.mcp_server_name
-            labels[name] = (inst.display_name or name).strip() or name
-        for name in self._connector_svc.custom_harness_configs(user_id):
-            labels.setdefault(name, name)
+        for inst in self._connector_svc.list_instances_for_api(user_id):
+            name = str(inst["mcp_server_name"])
+            display_name = str(inst.get("display_name") or name)
+            labels[name] = display_name.strip() or name
         return labels
 
     def resolve_tool_display_name_for_chat(
@@ -1352,6 +1364,23 @@ async def prepare_chat_mcp(
                         continue
                 agent.config.mcp_server_configs[name] = dict(spec)
 
+        gateway_missing: list[str] = []
+        if builtin_missing and uid is not None:
+            gateway_names = gateway_mcp_server_names(
+                connector_repo=self._repos.connector_repo,
+                user_id=uid,
+            )
+            gateway_missing = [n for n in builtin_missing if n in gateway_names]
+            builtin_missing = [n for n in builtin_missing if n not in gateway_names]
+
+        if gateway_missing and uid is not None:
+            await self._attach_gateway_tools(
+                agent,
+                agent_id=agent_id,
+                user_id=uid,
+                server_names=gateway_missing,
+            )
+
         if builtin_missing:
             logger.info(
                 "Reloading agent %s MCP tools (builtin_missing=%s)",
@@ -1434,6 +1463,43 @@ async def prepare_chat_mcp(
             )
         return still_missing
 
+    async def _attach_gateway_tools(
+        self,
+        agent: HarnessAgent,
+        *,
+        agent_id: str,
+        user_id: int,
+        server_names: list[str],
+    ) -> None:
+        """Add gateway connector tools to the running agent without rebuilding it.
+
+        A rebuild would drop the harness instance (and with it the checkpointer
+        pool an in-flight turn still writes to) only to run the very same
+        in-process injection at the end of ``_post_start_agent``.
+        """
+        repo = self._repos.connector_repo
+        for inst in repo.list_visible(user_id):
+            if inst.status != "active" or inst.mcp_server_name not in server_names:
+                continue
+            try:
+                await self._connector_svc.ensure_fresh_credentials(inst.instance_id, inst.kind)
+            except Exception:
+                logger.exception(
+                    "prepare_chat_mcp agent=%s: credential refresh failed for %s",
+                    agent_id,
+                    inst.mcp_server_name,
+                )
+        inject_missing_gateway_tools(
+            agent,
+            svc=self._connector_svc,
+            connector_repo=repo,
+            user_id=user_id,
+            agent_id=agent_id,
+            mcp_server_configs=agent.config.mcp_server_configs,
+        )
+        for name in server_names:
+            agent.config.mcp_server_configs.setdefault(name, {})
+
     # ------------------------------------------------------------------
     # Settings persistence — push global policy into harness runtime
     # ------------------------------------------------------------------
@@ -2018,7 +2084,12 @@ async def _post_start_agent(
                 exc_info=True,
             )
         if self._plugin_manager is not None:
-            await asyncio.to_thread(self._plugin_manager.sync_skills_to_workspace, ws)
+            agent_plugins = self.get_config(row.agent_id).get("plugins")
+            await asyncio.to_thread(
+                self._plugin_manager.sync_skills_to_workspace,
+                ws,
+                agent_plugins=agent_plugins,
+            )
 
         # Patch config when bootstrap finishes, but defer graph recompile until
         # the in-flight turn has fully drained (sync _init_graph mid-stream segfaults).
@@ -2103,6 +2174,10 @@ def _owner_username(self, row: AgentRow) -> str | None:
             return None
         return owner.username or None
 
+    @staticmethod
+    def _spec_is_opensandbox(spec: Any) -> bool:
+        return isinstance(spec, dict) and str(spec.get("type") or "").lower() == "opensandbox"
+
     def _prepare_docker_backend(self, backend: Any, row: AgentRow) -> Any:
         """Inject Octop docker defaults (prefix / agent_id / username) without overwrite."""
         if not isinstance(backend, dict) or backend.get("type") != "docker":
@@ -2122,12 +2197,14 @@ def _backend_workspace_for_row(
         *,
         cfg: dict[str, Any] | None = None,
         workspace_dir: Path | None = None,
+        allow_ephemeral_remote: bool = False,
     ) -> Any:
         """Resolve :class:`BackendWorkspace` for *row* without a running harness agent."""
         from harness_agent.backends import resolve_backend  # noqa: PLC0415
         from harness_agent.backends.workspace import BackendWorkspace  # noqa: PLC0415
 
         from octop.infra.agents.workspace_dir import system_files_path_from_config  # noqa: PLC0415
+        from octop.infra.backend.opensandbox_deps import ensure_opensandbox_deps  # noqa: PLC0415
 
         if cfg is None:
             cfg = self._agent_config_dict(row)
@@ -2137,6 +2214,15 @@ def _backend_workspace_for_row(
             self._backend_spec_for_row(row, cfg=cfg, workspace_dir=workspace_dir),
             row,
         )
+        if self._spec_is_opensandbox(backend) and not allow_ephemeral_remote:
+            # Stopped-agent / seed fallback: do not create a throwaway remote sandbox.
+            backend = {
+                "type": "filesystem",
+                "root_dir": str(workspace_dir),
+                "virtual_mode": True,
+            }
+        elif self._spec_is_opensandbox(backend):
+            ensure_opensandbox_deps(allow_install=True)
         return BackendWorkspace(
             resolve_backend(backend, workspace_dir=workspace_dir),
             workspace_dir,
@@ -2171,7 +2257,23 @@ async def _seed_expert_template(self, row: AgentRow, template_name: str) -> None
         if not expert.files and not (expert_dir / MANIFEST_FILENAME).is_file():
             return
 
-        workspace = self._backend_workspace_for_row(row)
+        if self._spec_is_opensandbox(self._backend_spec_for_row(row)):
+            if self._harness_manager is None:
+                logger.info(
+                    "Agent %s: skip expert template seed until runtime (ephemeral OpenSandbox)",
+                    row.agent_id,
+                )
+                return
+            try:
+                workspace = self._harness_manager.get_agent(row.agent_id).agent.workspace
+            except KeyError:
+                logger.info(
+                    "Agent %s: skip expert template seed until runtime (ephemeral OpenSandbox)",
+                    row.agent_id,
+                )
+                return
+        else:
+            workspace = self._backend_workspace_for_row(row)
         try:
             count = await seed_expert_directory(
                 expert_dir=expert_dir,
@@ -2338,7 +2440,12 @@ def _build_harness_config(self, row: AgentRow) -> HarnessAgentConfig:
             cfg = self._agent_config_dict(row)
 
         backend = self._backend_spec_for_row(row, cfg=cfg, workspace_dir=workspace_dir)
-        ws = self._backend_workspace_for_row(row, cfg=cfg, workspace_dir=workspace_dir)
+        ws = self._backend_workspace_for_row(
+            row,
+            cfg=cfg,
+            workspace_dir=workspace_dir,
+            allow_ephemeral_remote=self._spec_is_opensandbox(backend),
+        )
 
         cron_tools: list[Any] | None = None
         if self._cron_manager is not None:
@@ -2371,6 +2478,7 @@ def _build_harness_config(self, row: AgentRow) -> HarnessAgentConfig:
         from harness_agent.plugins import PluginRegistry, build_plugin_tools  # noqa: PLC0415
 
         from octop.infra.agents.plugin_tool_defaults import (  # noqa: PLC0415
+            agent_plugin_enabled,
             expand_plugin_tools_default_on,
         )
 
@@ -2378,16 +2486,20 @@ def _build_harness_config(self, row: AgentRow) -> HarnessAgentConfig:
             self._plugin_manager.global_enabled_map() if self._plugin_manager is not None else {}
         )
         registered = [(reg.plugin_id, reg.name) for reg in PluginRegistry().all_tools()]
-        # Mount every globally-enabled plugin tool; per-agent ``enabled: false``
-        # is enforced via ``tools_disabled`` so toggles can hot-sync without reload.
+        agent_plugins = cfg.get("plugins")
+        agent_plugins_map = agent_plugins if isinstance(agent_plugins, dict) else {}
+        effective_plugins = dict(global_plugins)
+        for plugin in PluginRegistry().list_plugins():
+            if not agent_plugin_enabled(agent_plugins_map, plugin.manifest.id):
+                effective_plugins[plugin.manifest.id] = False
         mount_plugins = expand_plugin_tools_default_on(
-            None,
+            agent_plugins_map,
             registered_tools=registered,
-            global_plugins=global_plugins,
+            global_plugins=effective_plugins,
         )
         plugin_tools = build_plugin_tools(
             agent_plugins=mount_plugins,
-            global_plugins=global_plugins,
+            global_plugins=effective_plugins,
         )
         # Plugin authors may register tools with non-ASCII (e.g. Chinese) names,
         # which strict LLM tool-name APIs reject. Rewrite them to legal names
@@ -2410,12 +2522,15 @@ def _build_harness_config(self, row: AgentRow) -> HarnessAgentConfig:
             for tool in plugin_tools
             if (label := extract_original_plugin_label(str(getattr(tool, "description", "") or "")))
         }
-        plugin_middleware = PluginRegistry().build_middleware_chain(global_enabled=global_plugins)
+        plugin_middleware = PluginRegistry().build_middleware_chain(
+            global_enabled=effective_plugins
+        )
         global_policy = self._security.harness_policy()
         agent_override = cfg.get("security") if isinstance(cfg.get("security"), dict) else None
         policy = SecurityPolicy.merge(global_policy, agent_override)
 
         from octop.infra.agents.middleware.binary_read_guard import BinaryReadGuardMiddleware
+        from octop.infra.agents.middleware.browser_profile import BrowserProfileMiddleware
         from octop.infra.agents.middleware.reasoning import ReasoningRequestMiddleware
         from octop.infra.agents.middleware.thread_artifacts import ThreadArtifactsMiddleware
         from octop.infra.agents.middleware.workspace_image import (
@@ -2431,6 +2546,7 @@ def _build_harness_config(self, row: AgentRow) -> HarnessAgentConfig:
             *plugin_middleware,
             ReasoningRequestMiddleware(),
             KnowledgeSearchHintMiddleware(),
+            BrowserProfileMiddleware(),
             BinaryReadGuardMiddleware(),
             WorkspaceImageMaterializeMiddleware(workspace=ws),
             ThreadArtifactsMiddleware(
@@ -2505,6 +2621,17 @@ def _build_harness_config(self, row: AgentRow) -> HarnessAgentConfig:
             else []
         )
         skill_dirs = configured_skill_dirs + package_skill_dirs
+        plugin_skills_disabled: set[str] = set()
+        if self._plugin_manager is not None:
+            for plugin_item in self._plugin_manager.list_installed():
+                plugin_id = str(plugin_item.get("id") or "")
+                if plugin_id and (
+                    plugin_item.get("enabled", True) is False
+                    or not agent_plugin_enabled(agent_plugins_map, plugin_id)
+                ):
+                    plugin_skills_disabled.update(
+                        self._plugin_manager.plugin_skill_names(plugin_id)
+                    )
 
         from octop.infra.agents.execute_env import inject_agent_execute_env  # noqa: PLC0415
 
@@ -2515,6 +2642,9 @@ def _build_harness_config(self, row: AgentRow) -> HarnessAgentConfig:
             workspace_dir=workspace_dir,
             cfg=cfg,
         )
+        # OpenSandbox.create is not idempotent — reuse the instance already
+        # wrapped by ``ws`` so start does not spawn a second remote sandbox.
+        harness_backend: Any = ws.backend if self._spec_is_opensandbox(backend) else backend
 
         harness_cfg = HarnessAgentConfig(
             name=_memory_namespace(row.agent_id),
@@ -2531,14 +2661,14 @@ def _build_harness_config(self, row: AgentRow) -> HarnessAgentConfig:
             ),
             system_prompt=system_prompt,
             memory=memory,
-            backend=backend,  # resolved spec; harness re-resolves to a runtime instance
+            backend=harness_backend,  # spec, or live OpenSandbox instance
             mcp_server_configs=mcp_server_configs,
             tools=merged_tools or None,
             middleware=agent_middleware or None,
             bootstrap_enabled=True,
             acp_runners=acp_config.runners,
             acp_delegate_enabled=bool(acp_raw.get("tool_enabled", False)),
-            skills_disabled=frozenset(skills_disabled_set(cfg)),
+            skills_disabled=frozenset(skills_disabled_set(cfg) | plugin_skills_disabled),
             skills_dir=skill_dirs or None,
             default_timezone=self._config.default_timezone,
             log_dir=str(self.paths.logs_dir),
diff --git a/src/octop/infra/agents/middleware/browser_profile.py b/src/octop/infra/agents/middleware/browser_profile.py
new file mode 100644
index 00000000..ecf3b35b
--- /dev/null
+++ b/src/octop/infra/agents/middleware/browser_profile.py
@@ -0,0 +1,71 @@
+"""Force browser tool calls onto the current user's isolated profile."""
+
+from __future__ import annotations
+
+import logging
+from collections.abc import Awaitable, Callable
+from typing import Any
+
+from langchain.agents.middleware import AgentMiddleware
+from langchain_core.messages import ToolMessage
+from langgraph.config import get_config
+from langgraph.prebuilt.tool_node import ToolCallRequest
+from langgraph.types import Command
+
+from octop.infra.utils.browser_media import parse_octop_user_id, user_browser_profile
+
+logger = logging.getLogger(__name__)
+
+_BROWSER_TOOL = "browser_use"
+_MISSING_USER = (
+    "browser_use blocked: the current turn has no Octop user id, "
+    "so a browser profile cannot be isolated."
+)
+
+
+def _bind_browser_profile(request: ToolCallRequest) -> ToolCallRequest | ToolMessage:
+    tool_call = request.tool_call
+    if str(tool_call.get("name") or "") != _BROWSER_TOOL:
+        return request
+
+    configurable = dict(get_config().get("configurable") or {})
+    user_id = parse_octop_user_id(configurable.get("user"))
+    if user_id is None:
+        logger.warning("browser_use blocked: configurable.user is missing or invalid")
+        return ToolMessage(
+            content=_MISSING_USER,
+            tool_call_id=str(tool_call.get("id") or ""),
+            status="error",
+        )
+
+    raw_args = tool_call.get("args")
+    args = dict(raw_args) if isinstance(raw_args, dict) else {}
+    args["profile"] = user_browser_profile(user_id)
+    return request.override(tool_call={**tool_call, "args": args})
+
+
+class BrowserProfileMiddleware(AgentMiddleware[Any, Any]):
+    """Prevent model-selected profiles from crossing Octop user boundaries."""
+
+    def wrap_tool_call(
+        self,
+        request: ToolCallRequest,
+        handler: Callable[[ToolCallRequest], ToolMessage | Command[Any]],
+    ) -> ToolMessage | Command[Any]:
+        bound = _bind_browser_profile(request)
+        if isinstance(bound, ToolMessage):
+            return bound
+        return handler(bound)
+
+    async def awrap_tool_call(
+        self,
+        request: ToolCallRequest,
+        handler: Callable[[ToolCallRequest], Awaitable[ToolMessage | Command[Any]]],
+    ) -> ToolMessage | Command[Any]:
+        bound = _bind_browser_profile(request)
+        if isinstance(bound, ToolMessage):
+            return bound
+        return await handler(bound)
+
+
+__all__ = ["BrowserProfileMiddleware"]
diff --git a/src/octop/infra/agents/plugin_tool_defaults.py b/src/octop/infra/agents/plugin_tool_defaults.py
index f6736805..ff483d02 100644
--- a/src/octop/infra/agents/plugin_tool_defaults.py
+++ b/src/octop/infra/agents/plugin_tool_defaults.py
@@ -14,6 +14,30 @@
 from typing import Any
 
 
+def agent_plugin_enabled(agent_plugins: object, plugin_id: str) -> bool:
+    """Return the per-agent plugin switch; missing values remain default-on."""
+    if not isinstance(agent_plugins, dict):
+        return True
+    entry = agent_plugins.get(plugin_id)
+    if not isinstance(entry, dict) or "enabled" not in entry:
+        return True
+    return bool(entry.get("enabled"))
+
+
+def merge_plugins_enabled_settings(
+    existing: object,
+    incoming: dict[str, bool],
+) -> dict[str, Any]:
+    """Merge plugin-level switches without dropping per-tool configuration."""
+    out: dict[str, Any] = dict(existing) if isinstance(existing, dict) else {}
+    for plugin_id, enabled in incoming.items():
+        entry = out.get(plugin_id)
+        plugin_out = dict(entry) if isinstance(entry, dict) else {}
+        plugin_out["enabled"] = bool(enabled)
+        out[str(plugin_id)] = plugin_out
+    return out
+
+
 def merge_plugins_tool_settings(
     existing: object,
     incoming: dict[str, dict[str, Any]],
@@ -74,6 +98,8 @@ def expand_plugin_tools_default_on(
     for plugin_id, tool_name in registered_tools:
         if global_plugins.get(plugin_id) is False:
             continue
+        if not agent_plugin_enabled(out, plugin_id):
+            continue
         plugin_entry = out.get(plugin_id)
         if not isinstance(plugin_entry, dict):
             plugin_entry = {"tools": {}}
diff --git a/src/octop/infra/agents/plugins/manager.py b/src/octop/infra/agents/plugins/manager.py
index a14501a2..56596498 100644
--- a/src/octop/infra/agents/plugins/manager.py
+++ b/src/octop/infra/agents/plugins/manager.py
@@ -184,6 +184,7 @@ def __init__(self, *, plugins_dir: Path, config_path: Path) -> None:
         # Last-known tool metadata so Admin / Experts can still list tools after
         # a global disable unloads the plugin from the process registry.
         self._tool_catalog: dict[str, list[dict[str, Any]]] = {}
+        self._skill_catalog: dict[str, set[str]] = {}
 
     @property
     def plugins_dir(self) -> Path:
@@ -292,6 +293,12 @@ def list_installed(self) -> list[dict[str, Any]]:
                     for t in loaded.tools
                 ]
                 self._tool_catalog[manifest.id] = tools_meta
+                if loaded.skills_dir is not None:
+                    self._skill_catalog[manifest.id] = {
+                        path.name
+                        for path in loaded.skills_dir.iterdir()
+                        if path.is_dir() and (path / "SKILL.md").is_file()
+                    }
             else:
                 tools_meta = list(self._tool_catalog.get(manifest.id) or [])
             out.append(
@@ -347,6 +354,12 @@ def set_enabled(self, plugin_id: str, enabled: bool) -> dict[str, Any]:
                     }
                     for t in loaded.tools
                 ]
+                if loaded.skills_dir is not None:
+                    self._skill_catalog[plugin_id] = {
+                        path.name
+                        for path in loaded.skills_dir.iterdir()
+                        if path.is_dir() and (path / "SKILL.md").is_file()
+                    }
             unload_plugin(plugin_id)
 
         for item in self.list_installed():
@@ -509,13 +522,34 @@ def install_url(self, url: str, *, force: bool = False) -> LoadedPlugin:
     def uninstall(self, plugin_id: str) -> None:
         unload_plugin(plugin_id)
         self._tool_catalog.pop(plugin_id, None)
+        self._skill_catalog.pop(plugin_id, None)
         dest = self._plugins_dir / plugin_id
         if dest.is_dir():
             shutil.rmtree(dest)
 
-    def sync_skills_to_workspace(self, workspace: Any) -> None:
+    def plugin_skill_names(self, plugin_id: str) -> set[str]:
+        """Return skill directory names registered by one loaded plugin."""
+        plugin = PluginRegistry().get(plugin_id)
+        if plugin is None or plugin.skills_dir is None:
+            return set(self._skill_catalog.get(plugin_id) or ())
+        names = {
+            path.name
+            for path in plugin.skills_dir.iterdir()
+            if path.is_dir() and (path / "SKILL.md").is_file()
+        }
+        self._skill_catalog[plugin_id] = names
+        return set(names)
+
+    def sync_skills_to_workspace(
+        self,
+        workspace: Any,
+        *,
+        agent_plugins: object = None,
+    ) -> None:
         from harness_agent.backends.workspace import BackendWorkspace
 
+        from octop.infra.agents.plugin_tool_defaults import agent_plugin_enabled
+
         if not isinstance(workspace, BackendWorkspace):
             return
         enabled = self.global_enabled_map()
@@ -523,6 +557,8 @@ def sync_skills_to_workspace(self, workspace: Any) -> None:
         for plugin in PluginRegistry().list_plugins():
             if enabled.get(plugin.manifest.id) is False:
                 continue
+            if not agent_plugin_enabled(agent_plugins, plugin.manifest.id):
+                continue
             if plugin.skills_dir is None:
                 continue
             for skill_dir in plugin.skills_dir.iterdir():
diff --git a/src/octop/infra/agents/providers/model_flags.py b/src/octop/infra/agents/providers/model_flags.py
index 9c0f2a0f..e654abab 100644
--- a/src/octop/infra/agents/providers/model_flags.py
+++ b/src/octop/infra/agents/providers/model_flags.py
@@ -91,6 +91,28 @@ def is_embedding_model(
     return is_onnx_local_provider(provider_name, provider_api_key=provider_api_key)
 
 
+def is_vision_model(model: dict[str, Any]) -> bool:
+    """True when a model entry declares or conventionally supports image input."""
+    model_id = str(model.get("id") or "").strip().lower()
+    raw_input = model.get("input")
+    if isinstance(raw_input, list) and any(
+        str(modality).strip().lower() == "image" for modality in raw_input
+    ):
+        return True
+    return any(
+        hint in model_id
+        for hint in (
+            "-vl",
+            "vision",
+            "-image",
+            "gpt-4o",
+            "gpt-4.1",
+            "claude-3",
+            "gemini",
+        )
+    )
+
+
 def is_chat_eligible_model(
     model: dict[str, Any],
     *,
diff --git a/src/octop/infra/agents/providers/onnx_download.py b/src/octop/infra/agents/providers/onnx_download.py
index 4aee3987..28ed6582 100644
--- a/src/octop/infra/agents/providers/onnx_download.py
+++ b/src/octop/infra/agents/providers/onnx_download.py
@@ -1,9 +1,13 @@
-"""Race Hugging Face and hf-mirror, then download from the winner."""
+"""Race COS, Hugging Face, and hf-mirror, then download from the winner."""
 
 from __future__ import annotations
 
+import json
 import logging
 import os
+import shutil
+import sys
+import tempfile
 import time
 from collections.abc import Callable
 from concurrent.futures import FIRST_COMPLETED, Future, ThreadPoolExecutor, wait
@@ -20,6 +24,12 @@
 
 HF_ENDPOINT_OFFICIAL = "https://huggingface.co"
 HF_ENDPOINT_MIRROR = "https://hf-mirror.com"
+# Public COS bucket; objects live under /models/embedding/{model_id}/.
+COS_ENDPOINT_DEFAULT = "https://octop-1258344699.cos.ap-guangzhou.myqcloud.com"
+COS_PREFIX = "models/embedding"
+COS_MANIFEST_NAME = "files.json"
+COS_REVISION = "cos-mirror"
+_COS_BASE_ENV = "OCTOP_ONNX_COS_BASE"
 
 _PROBE_TIMEOUT_S = 4.0
 _USER_AGENT = "octop-onnx-download"
@@ -29,20 +39,29 @@
     "tokenizer_config.json",
     "special_tokens_map.json",
     "preprocessor_config.json",
+    "vocab.txt",
+    "vocab.json",
+    "merges.txt",
+    "sentencepiece.bpe.model",
     "*.onnx",
+    "*.onnx_data",
     "onnx/*.onnx",
+    "onnx/*.onnx_data",
     "onnx/*.json",
 )
+# Extra ONNX variants in upstream repos; COS trees keep the primary weights only.
+_COS_SKIP_ONNX_NAMES = frozenset({"model_fp16.onnx", "model_quantized.onnx", "model_int8.onnx"})
 
 
 @dataclass(frozen=True)
 class DownloadCandidate:
-    """One Hugging Face endpoint that can be probed and then fetched."""
+    """One endpoint that can be probed and then fetched."""
 
     kind: str
     probe_url: str
     hf_endpoint: str
     hf_repo: str
+    model_name: str = ""
 
 
 ProbeFn = Callable[[str, float], float]
@@ -53,28 +72,59 @@ class DownloadCandidate:
 def _hf_repo_id(model_name: str) -> str:
     """Resolve the Hugging Face repo: catalog ``hf_source``, else the model id."""
     meta = get_onnx_model_meta(model_name)
-    hf_repo = meta.get("hf_source")
-    if not isinstance(hf_repo, str) or not hf_repo.strip():
-        hf_repo = model_name
-    return hf_repo.strip()
+    hf_source = meta.get("hf_source")
+    if not isinstance(hf_source, str) or not hf_source.strip():
+        return model_name.strip()
+    return hf_source.strip()
+
+
+def cos_base_url() -> str:
+    """Public COS origin; override with ``OCTOP_ONNX_COS_BASE`` for a private bucket."""
+    return os.environ.get(_COS_BASE_ENV, COS_ENDPOINT_DEFAULT).rstrip("/")
+
+
+def cos_object_key(model_name: str, rel_path: str = "") -> str:
+    """Return the COS object key under ``/models/embedding/{model_id}/``."""
+    prefix = f"{COS_PREFIX}/{model_name.strip().strip('/')}"
+    rel = rel_path.replace("\\", "/").lstrip("/")
+    return f"{prefix}/{rel}" if rel else prefix
+
+
+def cos_file_url(model_name: str, rel_path: str) -> str:
+    """HTTPS URL for one COS object in the embedding tree."""
+    return f"{cos_base_url()}/{cos_object_key(model_name, rel_path)}"
+
+
+def cos_local_model_dir(dest_root: Path, model_name: str) -> Path:
+    """Local directory that mirrors ``/models/embedding/{model_id}/``."""
+    return dest_root / COS_PREFIX / model_name.strip().strip("/")
 
 
 def build_download_candidates(model_name: str) -> list[DownloadCandidate]:
-    """Build official HF + hf-mirror candidates; URLs are inferred from the repo id."""
+    """Build COS + official HF + hf-mirror candidates."""
     hf_repo = _hf_repo_id(model_name)
     probe_file = "config.json"
     return [
+        DownloadCandidate(
+            kind="cos",
+            probe_url=cos_file_url(model_name, probe_file),
+            hf_endpoint="",
+            hf_repo=hf_repo,
+            model_name=model_name,
+        ),
         DownloadCandidate(
             kind="hf",
             probe_url=f"{HF_ENDPOINT_OFFICIAL}/{hf_repo}/resolve/main/{probe_file}",
             hf_endpoint=HF_ENDPOINT_OFFICIAL,
             hf_repo=hf_repo,
+            model_name=model_name,
         ),
         DownloadCandidate(
             kind="hf-mirror",
             probe_url=f"{HF_ENDPOINT_MIRROR}/{hf_repo}/resolve/main/{probe_file}",
             hf_endpoint=HF_ENDPOINT_MIRROR,
             hf_repo=hf_repo,
+            model_name=model_name,
         ),
     ]
 
@@ -133,7 +183,7 @@ def race_download_sources(
     """
     if not candidates:
         return []
-    pool = ThreadPoolExecutor(max_workers=min(len(candidates), 2))
+    pool = ThreadPoolExecutor(max_workers=min(len(candidates), 3))
     try:
         futures = {pool.submit(probe, cand.probe_url, timeout_s): cand for cand in candidates}
         result = _first_probe_success(futures)
@@ -165,7 +215,7 @@ def download_model_raced(
     errors: list[str] = []
     for cand in ordered:
         try:
-            _download_hf_snapshot(cand, cache_dir, on_progress=on_progress)
+            _download_candidate(cand, cache_dir, on_progress=on_progress)
             logger.info("ONNX model %s downloaded from %s", model_name, cand.kind)
             return cand.kind
         except Exception as exc:
@@ -175,6 +225,18 @@ def download_model_raced(
     raise RuntimeError(f"All embedding download sources failed: {detail}")
 
 
+def _download_candidate(
+    cand: DownloadCandidate,
+    cache_dir: Path,
+    *,
+    on_progress: SnapshotProgressFn | None = None,
+) -> None:
+    if cand.kind == "cos":
+        _download_cos_snapshot(cand, cache_dir, on_progress=on_progress)
+        return
+    _download_hf_snapshot(cand, cache_dir, on_progress=on_progress)
+
+
 def _progress_tqdm(on_progress: SnapshotProgressFn) -> type[Any] | None:
     """tqdm subclass that forwards n/total; bars themselves go to redirected stderr."""
     try:
@@ -193,12 +255,24 @@ def update(self, n: float | None = 1) -> Any:
     return ProgressTqdm
 
 
+_HF_HUB_DISABLE_XET = "HF_HUB_DISABLE_XET"
+
+
+def _disable_hf_xet() -> None:
+    """Force HTTP snapshots; Xet CAS 401s or is unreachable via hf-mirror."""
+    os.environ[_HF_HUB_DISABLE_XET] = "1"
+    constants = sys.modules.get("huggingface_hub.constants")
+    if constants is not None and hasattr(constants, _HF_HUB_DISABLE_XET):
+        setattr(constants, _HF_HUB_DISABLE_XET, True)
+
+
 def _download_hf_snapshot(
     cand: DownloadCandidate,
     cache_dir: Path,
     *,
     on_progress: SnapshotProgressFn | None = None,
 ) -> None:
+    _disable_hf_xet()
     try:
         from huggingface_hub import snapshot_download
     except ImportError as exc:
@@ -217,3 +291,167 @@ def _download_hf_snapshot(
             allow_patterns=list(_HF_ALLOW_PATTERNS),
             tqdm_class=tqdm_cls,
         )
+
+
+def _safe_rel_path(raw: str) -> str:
+    """Reject empty, absolute, or parent-escaping object paths."""
+    rel = raw.replace("\\", "/").strip().lstrip("/")
+    if not rel or rel.startswith("../") or "/../" in f"/{rel}/" or rel == "..":
+        raise ValueError(f"unsafe COS object path: {raw!r}")
+    return rel
+
+
+def _manifest_files(payload: object) -> list[str]:
+    raw_files: object
+    if isinstance(payload, list):
+        raw_files = payload
+    elif isinstance(payload, dict):
+        raw_files = payload.get("files")
+    else:
+        raise ValueError("COS manifest must be an object or a file list")
+    if not isinstance(raw_files, list) or not raw_files:
+        raise ValueError("COS manifest has no files")
+    files: list[str] = []
+    for item in raw_files:
+        if isinstance(item, str):
+            files.append(_safe_rel_path(item))
+            continue
+        if isinstance(item, dict):
+            path = item.get("path")
+            if isinstance(path, str) and path.strip():
+                files.append(_safe_rel_path(path))
+                continue
+        raise ValueError(f"invalid COS manifest entry: {item!r}")
+    return files
+
+
+def write_cos_manifest(model_dir: Path, *, model_id: str, hf_repo: str) -> Path:
+    """Write ``files.json`` listing every file under *model_dir* except the manifest."""
+    files = sorted(
+        path.relative_to(model_dir).as_posix()
+        for path in model_dir.rglob("*")
+        if path.is_file() and path.name != COS_MANIFEST_NAME
+    )
+    payload = {"model_id": model_id, "hf_repo": hf_repo, "files": files}
+    dest = model_dir / COS_MANIFEST_NAME
+    dest.write_text(json.dumps(payload, indent=2, ensure_ascii=False) + "\n", encoding="utf-8")
+    return dest
+
+
+def hf_cache_snapshot_dir(cache_dir: Path, hf_repo: str, *, revision: str = COS_REVISION) -> Path:
+    """Create a Hugging Face cache snapshot that ``huggingface_hub`` will reuse."""
+    repo_dir = cache_dir / ("models--" + hf_repo.replace("/", "--"))
+    refs = repo_dir / "refs"
+    refs.mkdir(parents=True, exist_ok=True)
+    (refs / "main").write_text(revision + "\n", encoding="utf-8")
+    dest = repo_dir / "snapshots" / revision
+    dest.mkdir(parents=True, exist_ok=True)
+    return dest
+
+
+def _download_http_file(
+    client: httpx.Client,
+    url: str,
+    dest: Path,
+    *,
+    on_progress: SnapshotProgressFn | None,
+    downloaded_so_far: int,
+    total: int | None,
+) -> int:
+    dest.parent.mkdir(parents=True, exist_ok=True)
+    tmp = dest.with_name(dest.name + ".part")
+    written = 0
+    with client.stream("GET", url) as response:
+        response.raise_for_status()
+        with tmp.open("wb") as handle:
+            for chunk in response.iter_bytes(64 * 1024):
+                handle.write(chunk)
+                written += len(chunk)
+                if on_progress is not None:
+                    on_progress(downloaded_so_far + written, total, dest.name)
+    tmp.replace(dest)
+    return written
+
+
+def _download_cos_snapshot(
+    cand: DownloadCandidate,
+    cache_dir: Path,
+    *,
+    on_progress: SnapshotProgressFn | None = None,
+) -> None:
+    model_name = cand.model_name or cand.hf_repo
+    if not model_name:
+        raise RuntimeError("COS download is missing a model id")
+    logger.info("ONNX COS snapshot %s via %s", model_name, cand.kind)
+    timeout = httpx.Timeout(120.0, connect=10.0)
+    with httpx.Client(
+        timeout=timeout,
+        follow_redirects=True,
+        headers={"User-Agent": _USER_AGENT},
+    ) as client:
+        manifest = client.get(cos_file_url(model_name, COS_MANIFEST_NAME))
+        manifest.raise_for_status()
+        files = _manifest_files(manifest.json())
+        dest = hf_cache_snapshot_dir(cache_dir, cand.hf_repo or model_name)
+        downloaded = 0
+        for rel in files:
+            written = _download_http_file(
+                client,
+                cos_file_url(model_name, rel),
+                dest / rel,
+                on_progress=on_progress,
+                downloaded_so_far=downloaded,
+                total=None,
+            )
+            downloaded += written
+    if not any(dest.rglob("*.onnx")):
+        raise RuntimeError(f"COS snapshot for {model_name} has no ONNX weights")
+
+
+def export_model_tree_for_cos(
+    model_name: str,
+    dest_root: Path,
+    *,
+    hf_endpoint: str = HF_ENDPOINT_MIRROR,
+    on_progress: SnapshotProgressFn | None = None,
+) -> Path:
+    """Download *model_name* and write the COS object tree under *dest_root*.
+
+    Layout: ``{dest_root}/models/embedding/{model_id}/…`` plus ``files.json``.
+    """
+    _disable_hf_xet()
+    try:
+        from huggingface_hub import snapshot_download
+    except ImportError as exc:
+        raise RuntimeError("huggingface_hub is required to stage COS model trees") from exc
+    hf_repo = _hf_repo_id(model_name)
+    dest = cos_local_model_dir(dest_root, model_name)
+    tqdm_cls = _progress_tqdm(on_progress) if on_progress is not None else None
+    with tempfile.TemporaryDirectory(prefix="octop-onnx-cos-") as tmp:
+        snapshot = Path(
+            snapshot_download(
+                repo_id=hf_repo,
+                cache_dir=tmp,
+                endpoint=hf_endpoint,
+                allow_patterns=list(_HF_ALLOW_PATTERNS),
+                ignore_patterns=[f"**/{name}" for name in _COS_SKIP_ONNX_NAMES],
+                tqdm_class=tqdm_cls,
+            )
+        )
+        if dest.exists():
+            shutil.rmtree(dest)
+        dest.mkdir(parents=True, exist_ok=True)
+        for path in snapshot.rglob("*"):
+            if not path.is_file():
+                continue
+            rel = path.relative_to(snapshot)
+            if rel.as_posix().startswith("."):
+                continue
+            if path.name in _COS_SKIP_ONNX_NAMES:
+                continue
+            target = dest / rel
+            target.parent.mkdir(parents=True, exist_ok=True)
+            shutil.copy2(path, target)
+    write_cos_manifest(dest, model_id=model_name, hf_repo=hf_repo)
+    logger.info("Staged COS tree for %s at %s", model_name, dest)
+    return dest
diff --git a/src/octop/infra/agents/providers/store.py b/src/octop/infra/agents/providers/store.py
index b3e60b28..aeec44ae 100644
--- a/src/octop/infra/agents/providers/store.py
+++ b/src/octop/infra/agents/providers/store.py
@@ -8,7 +8,7 @@
 
 from harness_agent.config import ModelConfig, ProviderConfig
 
-from octop.infra.agents.providers.model_flags import is_chat_eligible_model
+from octop.infra.agents.providers.model_flags import is_chat_eligible_model, is_vision_model
 from octop.infra.agents.providers.reasoning import reasoning_capability
 
 if TYPE_CHECKING:
@@ -48,10 +48,7 @@ def _infer_model_input_modalities(
 
 
 def _model_dict_supports_image(model: dict[str, Any]) -> bool:
-    model_id = str(model.get("id") or "")
-    raw = model.get("input")
-    explicit = list(raw) if isinstance(raw, list) else None
-    return "image" in _infer_model_input_modalities(model_id, explicit)
+    return is_vision_model(model)
 
 
 def enabled_model_refs(
diff --git a/src/octop/infra/agents/tool_catalog.py b/src/octop/infra/agents/tool_catalog.py
index 9a9bd7ab..d6b46826 100644
--- a/src/octop/infra/agents/tool_catalog.py
+++ b/src/octop/infra/agents/tool_catalog.py
@@ -133,6 +133,17 @@ def plugin_tool_explicitly_disabled(
     return not bool(tool_cfg.get("enabled"))
 
 
+def agent_plugin_enabled(cfg: Mapping[str, Any], plugin_id: str) -> bool:
+    """Whether a plugin is enabled for this agent (missing switch defaults on)."""
+    raw_plugins = cfg.get("plugins")
+    if not isinstance(raw_plugins, dict):
+        return True
+    plugin_entry = raw_plugins.get(plugin_id)
+    if not isinstance(plugin_entry, dict) or "enabled" not in plugin_entry:
+        return True
+    return bool(plugin_entry.get("enabled"))
+
+
 def plugin_tools_disabled_names(
     cfg: Mapping[str, Any],
     *,
@@ -145,7 +156,11 @@ def plugin_tools_disabled_names(
     for plugin_id, tool_name in registered_tools:
         if global_plugins.get(plugin_id) is False:
             continue
-        if plugin_tool_explicitly_disabled(cfg, plugin_id=plugin_id, tool_name=tool_name):
+        if not agent_plugin_enabled(cfg, plugin_id) or plugin_tool_explicitly_disabled(
+            cfg,
+            plugin_id=plugin_id,
+            tool_name=tool_name,
+        ):
             out.add(tool_name)
     return out
 
@@ -200,6 +215,7 @@ def builtin_tool_available(
     "BUILTIN_TOOL_CATALOG",
     "BuiltinToolEntry",
     "CRITICAL_TOOLS",
+    "agent_plugin_enabled",
     "builtin_tool_available",
     "effective_tools_disabled",
     "normalize_tools_disabled",
diff --git a/src/octop/infra/backend/adapter.py b/src/octop/infra/backend/adapter.py
index 12e45327..1b19d6b8 100644
--- a/src/octop/infra/backend/adapter.py
+++ b/src/octop/infra/backend/adapter.py
@@ -9,8 +9,21 @@
 
 _OBJECT_KINDS = frozenset({"cos", "s3", "oss", "obs", "custom"})
 _AGENT_RESOLVABLE_KINDS = frozenset(
-    {"cos", "s3", "oss", "obs", "custom", "filesystem", "shell", "postgres", "docker"}
+    {
+        "cos",
+        "s3",
+        "oss",
+        "obs",
+        "custom",
+        "filesystem",
+        "shell",
+        "postgres",
+        "docker",
+        "opensandbox",
+    }
 )
+_OPENSANDBOX_PROTOCOLS = frozenset({"http", "https"})
+_DEFAULT_OPENSANDBOX_IMAGE = "python:3.12"
 
 
 def storage_backend_kind_agent_resolvable(kind: str) -> bool:
@@ -136,4 +149,37 @@ def row_to_backend_spec(row: BackendRow) -> dict[str, Any] | None:
         apply_docker_cfg_keys(spec, cfg)
         return spec
 
+    if kind == "opensandbox":
+        image = cfg.get("image") or row.bucket or _DEFAULT_OPENSANDBOX_IMAGE
+        spec = {"type": "opensandbox", "image": str(image)}
+        api_key = row.secret_key or cfg.get("api_key")
+        if api_key:
+            spec["api_key"] = api_key
+        domain = row.endpoint or cfg.get("domain")
+        if domain:
+            spec["domain"] = str(domain)
+        protocol = str(row.region or cfg.get("protocol") or "http").strip().lower()
+        spec["protocol"] = protocol if protocol in _OPENSANDBOX_PROTOCOLS else "http"
+        for key in ("timeout", "command_timeout", "use_server_proxy"):
+            if key in cfg:
+                spec[key] = cfg[key]
+        return spec
+
     return None
+
+
+def storage_spec_previewable(spec: Any) -> bool:
+    """Whether Admin storage UI may browse this backend's files.
+
+    OpenSandbox is an agent-lifecycle remote sandbox (create on start, destroy
+    on stop), so it is not browseable unless ``previewable`` is set.
+    """
+    if not isinstance(spec, dict):
+        return True
+    if str(spec.get("type") or "").lower() == "opensandbox":
+        if "previewable" in spec:
+            return bool(spec["previewable"])
+        return False
+    from octop.infra.backend.docker_spec import docker_spec_previewable
+
+    return docker_spec_previewable(spec)
diff --git a/src/octop/infra/backend/opensandbox_deps.py b/src/octop/infra/backend/opensandbox_deps.py
new file mode 100644
index 00000000..ab3e6242
--- /dev/null
+++ b/src/octop/infra/backend/opensandbox_deps.py
@@ -0,0 +1,37 @@
+"""On-demand install of the official ``opensandbox`` SDK."""
+
+from __future__ import annotations
+
+import importlib.util
+
+from octop.infra.utils.runtime_packages import PackageInstallSpec, install_packages
+
+_OPENSANDBOX_SPEC = PackageInstallSpec(packages=("opensandbox>=0.1.16,<0.2",))
+
+
+def opensandbox_sdk_available() -> bool:
+    return importlib.util.find_spec("opensandbox") is not None
+
+
+def ensure_opensandbox_deps(*, allow_install: bool = True) -> str:
+    """Ensure the OpenSandbox SDK can be imported.
+
+    Admin enable / probe / agent start pass ``allow_install=True``. Returns
+    ``\"ready\"`` or ``\"installed\"``.
+    """
+    if opensandbox_sdk_available():
+        return "ready"
+    if not allow_install:
+        raise RuntimeError(
+            "OpenSandbox SDK is not installed. Enable this backend to install it automatically."
+        )
+    outcome = install_packages(
+        _OPENSANDBOX_SPEC,
+        is_satisfied=opensandbox_sdk_available,
+        import_modules=("opensandbox",),
+    )
+    if not opensandbox_sdk_available():
+        raise RuntimeError(
+            "OpenSandbox SDK was installed but could not be loaded. Restart the server and try again."
+        )
+    return outcome
diff --git a/src/octop/infra/backend/probe.py b/src/octop/infra/backend/probe.py
index bc72ea03..7442864e 100644
--- a/src/octop/infra/backend/probe.py
+++ b/src/octop/infra/backend/probe.py
@@ -77,6 +77,9 @@ def probe_storage_backend(row: BackendRow) -> dict[str, Any]:
     if kind == "docker":
         return _probe_docker(row)
 
+    if kind == "opensandbox":
+        return _probe_opensandbox(row)
+
     spec = row_to_backend_spec(row)
     if spec is None:
         return {"ok": False, "message": "configuration incomplete"}
@@ -212,3 +215,21 @@ def _probe_docker(row: BackendRow) -> dict[str, Any]:
                     with contextlib.suppress(Exception):
                         close()
         shutil.rmtree(workspace, ignore_errors=True)
+
+
+def _probe_opensandbox(row: BackendRow) -> dict[str, Any]:
+    """Install the SDK if needed, then run harness write→read and destroy the sandbox."""
+    from octop.infra.backend.opensandbox_deps import ensure_opensandbox_deps
+
+    try:
+        ensure_opensandbox_deps(allow_install=True)
+    except RuntimeError as exc:
+        return {"ok": False, "message": str(exc)}
+
+    spec = row_to_backend_spec(row)
+    if spec is None:
+        return {"ok": False, "message": "configuration incomplete"}
+    result = probe_backend(spec)
+    if result.get("ok"):
+        result["message_key"] = "opensandbox_probe_ok"
+    return result
diff --git a/src/octop/infra/backend/resolver.py b/src/octop/infra/backend/resolver.py
index a34c6ab3..75494713 100644
--- a/src/octop/infra/backend/resolver.py
+++ b/src/octop/infra/backend/resolver.py
@@ -173,13 +173,11 @@ def backend_spec_supports_execution(spec: Any) -> bool:
     if spec is None:
         return True
     if isinstance(spec, str):
-        return spec in {"local_shell", "docker"}
+        return spec in {"local_shell", "docker", "opensandbox"}
     if not isinstance(spec, dict):
         return False
     kind = spec.get("type")
-    if kind == "local_shell":
-        return True
-    if kind == "docker":
+    if kind in {"local_shell", "docker", "opensandbox"}:
         return True
     if kind == "composite":
         if backend_spec_supports_execution(spec.get("default")):
diff --git a/src/octop/infra/backup/auto.py b/src/octop/infra/backup/auto.py
index 2f4c2aff..960869d9 100644
--- a/src/octop/infra/backup/auto.py
+++ b/src/octop/infra/backup/auto.py
@@ -108,6 +108,12 @@ def persist_backup_config(config_path: Path, backup: BackupConfig) -> OctopConfi
         "auto_enabled": backup.auto_enabled,
         "schedule": backup.schedule,
         "retention_count": backup.retention_count,
+        "include_config": backup.include_config,
+        "include_workspaces": backup.include_workspaces,
+        "include_skill_packages": backup.include_skill_packages,
+        "include_plugins": backup.include_plugins,
+        "include_knowledge": backup.include_knowledge,
+        "include_chats": backup.include_chats,
     }
     _atomic_write_json(config_path, raw)
     return load_config(config_path)
@@ -131,6 +137,14 @@ def backup_config_from_payload(payload: dict[str, Any]) -> BackupConfig:
         auto_enabled=bool(payload.get("auto_enabled", defaults.auto_enabled)),
         schedule=schedule,
         retention_count=retention,
+        include_config=bool(payload.get("include_config", defaults.include_config)),
+        include_workspaces=bool(payload.get("include_workspaces", defaults.include_workspaces)),
+        include_skill_packages=bool(
+            payload.get("include_skill_packages", defaults.include_skill_packages)
+        ),
+        include_plugins=bool(payload.get("include_plugins", defaults.include_plugins)),
+        include_knowledge=bool(payload.get("include_knowledge", defaults.include_knowledge)),
+        include_chats=bool(payload.get("include_chats", defaults.include_chats)),
     )
 
 
@@ -141,8 +155,14 @@ def create_and_store_auto_backup(
     pool: DatabasePool,
     db_config: DatabaseConfig,
     retention_count: int,
+    include_config: bool = True,
+    include_workspaces: bool = True,
+    include_skill_packages: bool = True,
+    include_plugins: bool = True,
+    include_knowledge: bool = True,
+    include_chats: bool = False,
 ) -> tuple[BackupFileInfo, list[str]]:
-    """Create a full system backup with the auto filename prefix and prune."""
+    """Create a selected-content system backup with the auto prefix and prune."""
     with tempfile.TemporaryDirectory() as tmp:
         tmp_path = Path(tmp) / "backup.tar.gz"
         suggested = create_system_backup(
@@ -151,6 +171,12 @@ def create_and_store_auto_backup(
             pool=pool,
             db_config=db_config,
             dest=tmp_path,
+            include_config=include_config,
+            include_workspaces=include_workspaces,
+            include_skill_packages=include_skill_packages,
+            include_plugins=include_plugins,
+            include_knowledge=include_knowledge,
+            include_chats=include_chats,
         )
         filename = to_auto_backup_filename(suggested)
         entry = place_backup_file(paths, filename, tmp_path)
@@ -183,6 +209,12 @@ async def run_auto_backup(server: OctopServer) -> BackupFileInfo | None:
                 pool=server.services.db,
                 db_config=server.services.config.database,
                 retention_count=retention,
+                include_config=config.backup.include_config,
+                include_workspaces=config.backup.include_workspaces,
+                include_skill_packages=config.backup.include_skill_packages,
+                include_plugins=config.backup.include_plugins,
+                include_knowledge=config.backup.include_knowledge,
+                include_chats=config.backup.include_chats,
             )
         except Exception as exc:
             logger.exception("auto backup failed")
diff --git a/src/octop/infra/backup/chats.py b/src/octop/infra/backup/chats.py
new file mode 100644
index 00000000..28fa7ff8
--- /dev/null
+++ b/src/octop/infra/backup/chats.py
@@ -0,0 +1,381 @@
+"""Chat-history tables and workspace paths excluded from default backups."""
+
+from __future__ import annotations
+
+import sqlite3
+from pathlib import Path
+from typing import Any
+
+from octop.infra.agents.workspace_dir import DEFAULT_SYSTEM_FILES_PATH
+from octop.infra.backup.snapshot import _patch_channel_metadata, _rewrite_session_key
+from octop.infra.db.pool import DatabasePool
+
+# Child-first for DELETE; reverse for INSERT.
+CHAT_TABLES_CHILD_FIRST = (
+    "trajectory_events",
+    "thread_messages",
+    "thread_history_projection",
+    "threads",
+    "sessions",
+)
+CHAT_TABLES_PARENT_FIRST = tuple(reversed(CHAT_TABLES_CHILD_FIRST))
+
+_CHAT_DIR_NAMES = frozenset({"sessions", "conversation_history"})
+_CHAT_FILE_NAMES = frozenset(
+    {
+        "checkpoints.sqlite",
+        "checkpoints.sqlite-wal",
+        "checkpoints.sqlite-shm",
+        "memory.sqlite",
+        "memory.sqlite-wal",
+        "memory.sqlite-shm",
+    }
+)
+_USERS_SPOOL_TABLE = "_users"
+
+
+def is_chat_workspace_rel(rel: Path, *, system_files_path: str = "") -> bool:
+    """Return True when *rel* is session logs / checkpoints / offloaded history.
+
+    When *system_files_path* is empty, skip both workspace-root chat dirs
+    (legacy layout) and ``.octop/`` (current default).
+    """
+    prefixes = (
+        (system_files_path,) if system_files_path.strip() else ("", DEFAULT_SYSTEM_FILES_PATH)
+    )
+    return any(_matches_chat_under_prefix(rel, prefix) for prefix in prefixes)
+
+
+def _matches_chat_under_prefix(rel: Path, prefix: str) -> bool:
+    parts = rel.parts
+    prefix_parts = Path(prefix).parts if prefix else ()
+    if prefix_parts:
+        if parts[: len(prefix_parts)] != prefix_parts:
+            return False
+        rest = parts[len(prefix_parts) :]
+    else:
+        rest = parts
+    if not rest:
+        return False
+    if rest[0] in _CHAT_DIR_NAMES:
+        return True
+    return len(rest) == 1 and rest[0] in _CHAT_FILE_NAMES
+
+
+def strip_chat_tables_from_sqlite_file(path: Path) -> None:
+    """Empty chat tables in a SQLite snapshot and reclaim pages with VACUUM."""
+    conn = sqlite3.connect(path)
+    try:
+        conn.execute("PRAGMA foreign_keys = OFF")
+        existing = {
+            str(row[0])
+            for row in conn.execute(
+                "SELECT name FROM sqlite_master WHERE type = 'table'"
+            ).fetchall()
+        }
+        for table in CHAT_TABLES_CHILD_FIRST:
+            if table in existing:
+                conn.execute(f"DELETE FROM {table}")
+        if "sqlite_sequence" in existing:
+            placeholders = ", ".join("?" for _ in CHAT_TABLES_CHILD_FIRST)
+            conn.execute(
+                f"DELETE FROM sqlite_sequence WHERE name IN ({placeholders})",
+                CHAT_TABLES_CHILD_FIRST,
+            )
+        conn.commit()
+        conn.execute("VACUUM")
+    finally:
+        conn.close()
+
+
+def capture_chat_tables(pool: DatabasePool, dest: Path) -> Path:
+    """Stream live chat rows into a temporary SQLite spool file."""
+    dest.parent.mkdir(parents=True, exist_ok=True)
+    spool = sqlite3.connect(dest)
+    try:
+        with pool.connect() as conn:
+            _spool_users(conn, spool, dialect=pool.dialect)
+            for table in CHAT_TABLES_PARENT_FIRST:
+                if not _table_exists(conn, table, dialect=pool.dialect):
+                    continue
+                cursor = conn.execute(f"SELECT * FROM {table}")
+                columns = _cursor_columns(cursor)
+                if not columns:
+                    continue
+                quoted_columns = ", ".join(f'"{_quote_identifier(col)}" BLOB' for col in columns)
+                spool.execute(f'CREATE TABLE "{table}" ({quoted_columns})')
+                placeholders = ", ".join("?" for _ in columns)
+                while rows := cursor.fetchmany(500):
+                    spool.executemany(
+                        f'INSERT INTO "{table}" VALUES ({placeholders})',
+                        [tuple(row[col] for col in columns) for row in rows],
+                    )
+        spool.commit()
+    finally:
+        spool.close()
+    return dest
+
+
+def restore_preserved_chats(pool: DatabasePool, spool_path: Path) -> tuple[int, int]:
+    """Replace restored chat tables with rows streamed from *spool_path*.
+
+    ``user_id`` is remapped by username when the restored ``users`` table uses
+    different integer ids. Rows whose agent or user cannot be resolved are
+    skipped. Returns ``(inserted, skipped)``.
+    """
+    inserted = 0
+    skipped = 0
+    dialect = pool.dialect
+    spool = sqlite3.connect(spool_path)
+    try:
+        old_id_to_name = _load_spooled_users(spool)
+        with pool.transaction() as conn:
+            agent_ids = _id_set(conn, "agents", "agent_id", dialect=dialect)
+            new_name_to_id = _load_live_usernames(conn, dialect=dialect)
+
+            for table in CHAT_TABLES_CHILD_FIRST:
+                if _table_exists(conn, table, dialect=dialect):
+                    conn.execute(f"DELETE FROM {table}")
+
+            kept_threads: set[str] = set()
+            for table in CHAT_TABLES_PARENT_FIRST:
+                columns = _spool_columns(spool, table)
+                if not columns or not _table_exists(conn, table, dialect=dialect):
+                    continue
+                col_index = {name: i for i, name in enumerate(columns)}
+                placeholders = ", ".join("?" for _ in columns)
+                col_sql = ", ".join(columns)
+                insert_sql = f"INSERT INTO {table}({col_sql}) VALUES ({placeholders})"
+                cursor = spool.execute(f'SELECT * FROM "{table}"')
+                while rows := cursor.fetchmany(500):
+                    batch: list[tuple[object, ...]] = []
+                    for row in rows:
+                        mapped = _remap_chat_row(
+                            table,
+                            tuple(row),
+                            col_index,
+                            agent_ids=agent_ids,
+                            old_id_to_name=old_id_to_name,
+                            new_name_to_id=new_name_to_id,
+                            kept_threads=kept_threads,
+                        )
+                        if mapped is None:
+                            skipped += 1
+                            continue
+                        batch.append(mapped)
+                        if table == "threads" and "thread_id" in col_index:
+                            kept_threads.add(str(mapped[col_index["thread_id"]]))
+                    if batch:
+                        conn.executemany(insert_sql, batch)
+                        inserted += len(batch)
+                _sync_chat_id_sequence(conn, table, dialect=dialect)
+    finally:
+        spool.close()
+    return inserted, skipped
+
+
+def _spool_users(src: Any, spool: sqlite3.Connection, *, dialect: str) -> None:
+    if not _table_exists(src, "users", dialect=dialect):
+        return
+    spool.execute(f'CREATE TABLE "{_USERS_SPOOL_TABLE}" (id BLOB, username BLOB)')
+    rows = src.execute("SELECT id, username FROM users").fetchall()
+    if rows:
+        spool.executemany(
+            f'INSERT INTO "{_USERS_SPOOL_TABLE}" VALUES (?, ?)',
+            [(row[0], row[1]) for row in rows],
+        )
+
+
+def _cursor_columns(cursor: Any) -> list[str]:
+    description = cursor.description or ()
+    columns: list[str] = []
+    for item in description:
+        name = getattr(item, "name", None)
+        columns.append(str(name if name is not None else item[0]))
+    return columns
+
+
+def _quote_identifier(value: str) -> str:
+    return value.replace('"', '""')
+
+
+def _spool_columns(conn: sqlite3.Connection, table: str) -> list[str]:
+    exists = conn.execute(
+        "SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = ?",
+        (table,),
+    ).fetchone()
+    if exists is None:
+        return []
+    return [str(row[1]) for row in conn.execute(f'PRAGMA table_info("{table}")').fetchall()]
+
+
+def _table_exists(conn: Any, table: str, *, dialect: str) -> bool:
+    if dialect == "postgresql":
+        row = conn.execute(
+            "SELECT 1 FROM information_schema.tables "
+            "WHERE table_schema = current_schema() AND table_name = ?",
+            (table,),
+        ).fetchone()
+        return row is not None
+    row = conn.execute(
+        "SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = ?",
+        (table,),
+    ).fetchone()
+    return row is not None
+
+
+def _column_exists(conn: Any, table: str, column: str, *, dialect: str) -> bool:
+    if dialect == "postgresql":
+        row = conn.execute(
+            "SELECT 1 FROM information_schema.columns "
+            "WHERE table_schema = current_schema() AND table_name = ? AND column_name = ?",
+            (table, column),
+        ).fetchone()
+        return row is not None
+    rows = conn.execute(f"PRAGMA table_info({table})").fetchall()
+    return any(str(r[1]) == column for r in rows)
+
+
+def _id_set(conn: Any, table: str, column: str, *, dialect: str) -> set[object]:
+    if not _table_exists(conn, table, dialect=dialect):
+        return set()
+    rows = conn.execute(f"SELECT {column} FROM {table}").fetchall()
+    return {row[0] for row in rows}
+
+
+def _load_spooled_users(spool: sqlite3.Connection) -> dict[int, str]:
+    if not _spool_columns(spool, _USERS_SPOOL_TABLE):
+        return {}
+    out: dict[int, str] = {}
+    for row in spool.execute(f'SELECT id, username FROM "{_USERS_SPOOL_TABLE}"').fetchall():
+        try:
+            out[int(row[0])] = str(row[1])
+        except (TypeError, ValueError):
+            continue
+    return out
+
+
+def _load_live_usernames(conn: Any, *, dialect: str) -> dict[str, int]:
+    if not _table_exists(conn, "users", dialect=dialect):
+        return {}
+    out: dict[str, int] = {}
+    for row in conn.execute("SELECT id, username FROM users").fetchall():
+        try:
+            out[str(row[1])] = int(row[0])
+        except (TypeError, ValueError):
+            continue
+    return out
+
+
+def _map_user_id(
+    old_uid: object,
+    old_id_to_name: dict[int, str],
+    new_name_to_id: dict[str, int],
+) -> int | None:
+    try:
+        old = int(str(old_uid))
+    except (TypeError, ValueError):
+        return None
+    name = old_id_to_name.get(old)
+    if name and name in new_name_to_id:
+        return new_name_to_id[name]
+    return None
+
+
+def _remap_chat_row(
+    table: str,
+    row: tuple[object, ...],
+    col_index: dict[str, int],
+    *,
+    agent_ids: set[object],
+    old_id_to_name: dict[int, str],
+    new_name_to_id: dict[str, int],
+    kept_threads: set[str],
+) -> tuple[object, ...] | None:
+    if "agent_id" in col_index and row[col_index["agent_id"]] not in agent_ids:
+        return None
+    values = list(row)
+    old_uid: int | None = None
+    new_uid: int | None = None
+    if "user_id" in col_index:
+        old_raw = values[col_index["user_id"]]
+        try:
+            old_uid = int(str(old_raw))
+        except (TypeError, ValueError):
+            return None
+        new_uid = _map_user_id(old_uid, old_id_to_name, new_name_to_id)
+        if new_uid is None:
+            return None
+        values[col_index["user_id"]] = new_uid
+        if old_uid != new_uid:
+            _apply_user_id_rewrite(table, values, col_index, old_uid=old_uid, new_uid=new_uid)
+    if (
+        table in ("trajectory_events", "thread_messages", "thread_history_projection")
+        and "thread_id" in col_index
+        and str(values[col_index["thread_id"]]) not in kept_threads
+    ):
+        return None
+    return tuple(values)
+
+
+def _apply_user_id_rewrite(
+    table: str,
+    values: list[object],
+    col_index: dict[str, int],
+    *,
+    old_uid: int,
+    new_uid: int,
+) -> None:
+    if "session_key" in col_index and values[col_index["session_key"]] is not None:
+        values[col_index["session_key"]] = _rewrite_session_key(
+            str(values[col_index["session_key"]]),
+            old_uid=old_uid,
+            new_uid=new_uid,
+        )
+    if table == "sessions" and "channel_subject_id" in col_index:
+        subject = values[col_index["channel_subject_id"]]
+        if subject is not None and str(subject) == str(old_uid):
+            values[col_index["channel_subject_id"]] = str(new_uid)
+    if table == "sessions" and "channel_metadata" in col_index:
+        patched = _patch_channel_metadata(
+            values[col_index["channel_metadata"]],
+            old_uid=old_uid,
+            new_uid=new_uid,
+        )
+        if patched is not None:
+            values[col_index["channel_metadata"]] = patched
+
+
+def _sync_chat_id_sequence(conn: Any, table: str, *, dialect: str) -> None:
+    if not _column_exists(conn, table, "id", dialect=dialect):
+        return
+    if dialect == "postgresql":
+        conn.execute(
+            f"SELECT setval(pg_get_serial_sequence('{table}', 'id'), "
+            f"COALESCE(MAX(id), 1), MAX(id) IS NOT NULL) FROM {table}"
+        )
+        return
+    row = conn.execute(f"SELECT MAX(id) FROM {table}").fetchone()
+    max_id = row[0] if row is not None else None
+    seq_exists = conn.execute(
+        "SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'sqlite_sequence'"
+    ).fetchone()
+    if seq_exists is None:
+        return
+    if max_id is None:
+        conn.execute("DELETE FROM sqlite_sequence WHERE name = ?", (table,))
+        return
+    current = conn.execute(
+        "SELECT seq FROM sqlite_sequence WHERE name = ?",
+        (table,),
+    ).fetchone()
+    if current is None:
+        conn.execute(
+            "INSERT INTO sqlite_sequence(name, seq) VALUES (?, ?)",
+            (table, int(max_id)),
+        )
+    else:
+        conn.execute(
+            "UPDATE sqlite_sequence SET seq = ? WHERE name = ?",
+            (int(max_id), table),
+        )
diff --git a/src/octop/infra/backup/manifest.py b/src/octop/infra/backup/manifest.py
index d15c1371..6f53fe62 100644
--- a/src/octop/infra/backup/manifest.py
+++ b/src/octop/infra/backup/manifest.py
@@ -29,6 +29,10 @@ class BackupManifest:
     agents: list[AgentBackupEntry] = field(default_factory=list)
     includes_config: bool = True
     includes_env: bool = False
+    includes_skill_packages: bool = True
+    includes_plugins: bool = False
+    includes_knowledge: bool = False
+    includes_chats: bool = True
 
     def to_json(self) -> str:
         payload: dict[str, Any] = {
@@ -42,6 +46,10 @@ def to_json(self) -> str:
             "database_dump_format": self.database_dump_format,
             "includes_config": self.includes_config,
             "includes_env": self.includes_env,
+            "includes_skill_packages": self.includes_skill_packages,
+            "includes_plugins": self.includes_plugins,
+            "includes_knowledge": self.includes_knowledge,
+            "includes_chats": self.includes_chats,
             "agents": [asdict(a) for a in self.agents],
         }
         return json.dumps(payload, indent=2, ensure_ascii=False)
@@ -70,6 +78,17 @@ def from_dict(cls, data: dict[str, Any]) -> BackupManifest:
             agents=agents,
             includes_config=bool(data.get("includes_config", True)),
             includes_env=bool(data.get("includes_env", False)),
+            includes_skill_packages=bool(data.get("includes_skill_packages", True)),
+            # Older archives never packed ~/.octop/plugins; missing key means omit on restore.
+            includes_plugins=(
+                bool(data["includes_plugins"]) if "includes_plugins" in data else False
+            ),
+            # Older archives never packed ~/.octop/knowledge.
+            includes_knowledge=(
+                bool(data["includes_knowledge"]) if "includes_knowledge" in data else False
+            ),
+            # Legacy archives dumped the full database; missing key means chats are present.
+            includes_chats=bool(data["includes_chats"]) if "includes_chats" in data else True,
         )
 
     @classmethod
diff --git a/src/octop/infra/backup/pg_dump.py b/src/octop/infra/backup/pg_dump.py
index da819bab..6eae7895 100644
--- a/src/octop/infra/backup/pg_dump.py
+++ b/src/octop/infra/backup/pg_dump.py
@@ -4,6 +4,7 @@
 
 import shutil
 import subprocess
+from collections.abc import Sequence
 from pathlib import Path
 
 from octop.infra.errors import ErrorCode, OctopError
@@ -19,11 +20,19 @@ def _require_tool(name: str) -> str:
     return path
 
 
-def dump_postgres(conninfo: str, dest: Path) -> None:
+def dump_postgres(
+    conninfo: str,
+    dest: Path,
+    *,
+    exclude_table_data: Sequence[str] = (),
+) -> None:
     pg_dump = _require_tool("pg_dump")
     dest.parent.mkdir(parents=True, exist_ok=True)
+    cmd = [pg_dump, "-Fc", "-f", str(dest), "--dbname", conninfo]
+    for table in exclude_table_data:
+        cmd.extend(["--exclude-table-data", table])
     proc = subprocess.run(
-        [pg_dump, "-Fc", "-f", str(dest), "--dbname", conninfo],
+        cmd,
         capture_output=True,
         text=True,
         check=False,
diff --git a/src/octop/infra/backup/store.py b/src/octop/infra/backup/store.py
index 21f4e5a6..1053acc4 100644
--- a/src/octop/infra/backup/store.py
+++ b/src/octop/infra/backup/store.py
@@ -2,12 +2,16 @@
 
 from __future__ import annotations
 
+import json
 import re
 import shutil
+import tarfile
 from dataclasses import dataclass
 from datetime import UTC, datetime
 from pathlib import Path
+from typing import Any
 
+from octop.infra.backup.manifest import BackupManifest
 from octop.infra.errors import ErrorCode, OctopError
 from octop.infra.utils.paths import PathLayout
 
@@ -45,13 +49,25 @@ class BackupFileInfo:
     size: int
     modified_at: str
     created_at: str
-
-    def to_dict(self) -> dict[str, str | int]:
+    includes_config: bool = True
+    includes_workspaces: bool = True
+    includes_skill_packages: bool = True
+    includes_plugins: bool = True
+    includes_knowledge: bool = True
+    includes_chats: bool = True
+
+    def to_dict(self) -> dict[str, str | int | bool]:
         return {
             "name": self.name,
             "size": self.size,
             "modified_at": self.modified_at,
             "created_at": self.created_at,
+            "includes_config": self.includes_config,
+            "includes_workspaces": self.includes_workspaces,
+            "includes_skill_packages": self.includes_skill_packages,
+            "includes_plugins": self.includes_plugins,
+            "includes_knowledge": self.includes_knowledge,
+            "includes_chats": self.includes_chats,
         }
 
 
@@ -87,11 +103,66 @@ def backup_file_info(path: Path) -> BackupFileInfo:
     stat = path.stat()
     modified = _iso_utc_from_timestamp(stat.st_mtime)
     created = resolve_backup_created_at(path.name, path, mtime=stat.st_mtime)
+    contents = peek_backup_contents(path)
     return BackupFileInfo(
         name=path.name,
         size=stat.st_size,
         modified_at=modified,
         created_at=created,
+        includes_config=contents.includes_config,
+        includes_workspaces=contents.includes_workspaces,
+        includes_skill_packages=contents.includes_skill_packages,
+        includes_plugins=contents.includes_plugins,
+        includes_knowledge=contents.includes_knowledge,
+        includes_chats=contents.includes_chats,
+    )
+
+
+@dataclass(frozen=True)
+class BackupContentFlags:
+    includes_config: bool = True
+    includes_workspaces: bool = True
+    includes_skill_packages: bool = True
+    includes_plugins: bool = True
+    includes_knowledge: bool = True
+    includes_chats: bool = True
+
+
+_FULL_CONTENTS = BackupContentFlags()
+
+
+def peek_backup_contents(path: Path) -> BackupContentFlags:
+    """Read ``manifest.json`` from an archive.
+
+    Unreadable archives default to all-included. Legacy archives that omit
+    ``includes_plugins`` / ``includes_knowledge`` keep those live directories
+    on restore.
+    """
+    try:
+        with tarfile.open(path, mode="r:*") as tf:
+            member = tf.extractfile("manifest.json")
+            if member is None:
+                return _FULL_CONTENTS
+            raw: Any = json.loads(member.read().decode("utf-8"))
+        if not isinstance(raw, dict):
+            return _FULL_CONTENTS
+        manifest = BackupManifest.from_dict(raw)
+    except (
+        OSError,
+        tarfile.TarError,
+        json.JSONDecodeError,
+        UnicodeDecodeError,
+        ValueError,
+        TypeError,
+    ):
+        return _FULL_CONTENTS
+    return BackupContentFlags(
+        includes_config=bool(manifest.includes_config or manifest.includes_env),
+        includes_workspaces=any(entry.workspace_included for entry in manifest.agents),
+        includes_skill_packages=bool(manifest.includes_skill_packages),
+        includes_plugins=bool(manifest.includes_plugins),
+        includes_knowledge=bool(manifest.includes_knowledge),
+        includes_chats=bool(manifest.includes_chats),
     )
 
 
diff --git a/src/octop/infra/backup/system_archive.py b/src/octop/infra/backup/system_archive.py
index 53a87904..7b4d3a2a 100644
--- a/src/octop/infra/backup/system_archive.py
+++ b/src/octop/infra/backup/system_archive.py
@@ -14,7 +14,17 @@
 
 from octop import __version__
 from octop.config import DatabaseConfig
-from octop.infra.agents.workspace_dir import workspace_dir_from_config_json
+from octop.infra.agents.workspace_dir import (
+    system_files_path_from_config,
+    workspace_dir_from_config_json,
+)
+from octop.infra.backup.chats import (
+    CHAT_TABLES_CHILD_FIRST,
+    capture_chat_tables,
+    is_chat_workspace_rel,
+    restore_preserved_chats,
+    strip_chat_tables_from_sqlite_file,
+)
 from octop.infra.backup.manifest import MANIFEST_VERSION, AgentBackupEntry, BackupManifest
 from octop.infra.backup.pg_dump import dump_postgres, restore_postgres
 from octop.infra.backup.snapshot import (
@@ -28,7 +38,7 @@
     snapshot_sqlite_file,
     upsert_users_into_pool,
 )
-from octop.infra.db.migrate import _current_version, run_migrations
+from octop.infra.db.migrate import _current_version, _max_discovered_version, run_migrations
 from octop.infra.db.pool import DatabasePool, SqlitePool
 from octop.infra.db.repos.agents import AgentRepo
 from octop.infra.db.repos.secrets import SecretRepo
@@ -40,6 +50,8 @@
 _DB_DIR = "db"
 _WORKSPACES_DIR = "workspaces"
 _SKILL_PACKAGES_DIR = "skill-packages"
+_PLUGINS_DIR = "plugins"
+_KNOWLEDGE_DIR = "knowledge"
 _MANIFEST_NAME = "manifest.json"
 _SQLITE_DB_ARC = f"{_DB_DIR}/octop.db"
 _PG_DUMP_ARC = f"{_DB_DIR}/octop.dump"
@@ -74,22 +86,54 @@ def suggested_backup_filename() -> str:
     return f"octop-backup-{_timestamp()}.tar.gz"
 
 
-def _should_skip_path(rel: Path) -> bool:
-    return any(part in _SKIP_DIR_NAMES for part in rel.parts)
+def _should_skip_path(
+    rel: Path,
+    *,
+    skip_chats: bool,
+    system_files_path: str = "",
+) -> bool:
+    if any(part in _SKIP_DIR_NAMES for part in rel.parts):
+        return True
+    return skip_chats and is_chat_workspace_rel(
+        rel,
+        system_files_path=system_files_path,
+    )
 
 
-def _add_dir(tf: tarfile.TarFile, src: Path, arc_root: str) -> None:
+def _add_dir(
+    tf: tarfile.TarFile,
+    src: Path,
+    arc_root: str,
+    *,
+    skip_chats: bool,
+    system_files_path: str = "",
+) -> None:
     if not src.is_dir():
         return
     for path in sorted(src.rglob("*")):
         if not path.is_file():
             continue
         rel = path.relative_to(src)
-        if _should_skip_path(rel):
+        if _should_skip_path(
+            rel,
+            skip_chats=skip_chats,
+            system_files_path=system_files_path,
+        ):
             continue
         tf.add(path, arcname=f"{arc_root}/{rel.as_posix()}")
 
 
+def _system_files_path_from_row(row: Any) -> str:
+    raw = getattr(row, "config_json", None)
+    if not isinstance(raw, str) or not raw.strip():
+        return ""
+    try:
+        parsed = json.loads(raw)
+    except (TypeError, ValueError, json.JSONDecodeError):
+        return ""
+    return system_files_path_from_config(parsed if isinstance(parsed, dict) else None)
+
+
 def _build_manifest(
     *,
     paths: PathLayout,
@@ -99,6 +143,12 @@ def _build_manifest(
     database_driver: str,
     database_dump_format: str,
     env_path: Path,
+    include_config: bool,
+    include_workspaces: bool,
+    include_skill_packages: bool,
+    include_plugins: bool,
+    include_knowledge: bool,
+    include_chats: bool,
 ) -> BackupManifest:
     try:
         schema_version = _current_version(pool)
@@ -108,7 +158,7 @@ def _build_manifest(
         AgentBackupEntry(
             agent_id=str(row.agent_id),
             name=str(row.name),
-            workspace_included=True,
+            workspace_included=include_workspaces,
         )
         for row in agent_rows
     ]
@@ -122,8 +172,12 @@ def _build_manifest(
         database_driver=database_driver,
         database_dump_format=database_dump_format,
         agents=agents,
-        includes_config=paths.config.is_file(),
-        includes_env=env_path.is_file(),
+        includes_config=include_config and paths.config.is_file(),
+        includes_env=include_config and env_path.is_file(),
+        includes_skill_packages=include_skill_packages,
+        includes_plugins=include_plugins,
+        includes_knowledge=include_knowledge,
+        includes_chats=include_chats,
     )
 
 
@@ -134,9 +188,21 @@ def create_system_backup(
     pool: DatabasePool,
     db_config: DatabaseConfig,
     dest: Path,
+    include_config: bool = True,
+    include_workspaces: bool = True,
+    include_skill_packages: bool = True,
+    include_plugins: bool = True,
+    include_knowledge: bool = True,
+    include_chats: bool = False,
 ) -> str:
     """Write a ``.tar.gz`` archive to *dest* (streamed to disk).
 
+    Configuration, agent workspaces, skill packages, plugins, and knowledge
+    files can be omitted independently. ``include_chats`` defaults to False
+    because thread/session history usually dominates archive size. Restore
+    keeps live chats and omitted directories when the manifest says they were
+    not packed.
+
     Returns the suggested basename (``octop-backup-….tar.gz``). Callers that
     need a different name should rename/move *dest* afterward.
     """
@@ -162,6 +228,12 @@ def create_system_backup(
         database_driver=database_driver,
         database_dump_format=database_dump_format,
         env_path=env_path,
+        include_config=include_config,
+        include_workspaces=include_workspaces,
+        include_skill_packages=include_skill_packages,
+        include_plugins=include_plugins,
+        include_knowledge=include_knowledge,
+        include_chats=include_chats,
     )
     filename = suggested_backup_filename()
     dest = Path(dest)
@@ -173,19 +245,25 @@ def create_system_backup(
             root = Path(tmp)
             db_dest = root / db_arc
             if pool.dialect == "postgresql":
-                dump_postgres(db_config.postgresql_conninfo(), db_dest)
+                dump_postgres(
+                    db_config.postgresql_conninfo(),
+                    db_dest,
+                    exclude_table_data=() if include_chats else CHAT_TABLES_CHILD_FIRST,
+                )
             else:
                 assert isinstance(pool, SqlitePool)
                 snapshot_sqlite_file(pool.path, db_dest)
+                if not include_chats:
+                    strip_chat_tables_from_sqlite_file(db_dest)
 
             manifest_path = root / _MANIFEST_NAME
             manifest_path.write_text(manifest.to_json(), encoding="utf-8")
 
-            if paths.config.is_file():
+            if include_config and paths.config.is_file():
                 cfg_dir = root / _CONFIG_DIR
                 cfg_dir.mkdir(parents=True, exist_ok=True)
                 shutil.copy2(paths.config, cfg_dir / "config.json")
-            if env_path.is_file():
+            if include_config and env_path.is_file():
                 cfg_dir = root / _CONFIG_DIR
                 cfg_dir.mkdir(parents=True, exist_ok=True)
                 shutil.copy2(env_path, cfg_dir / "env")
@@ -193,23 +271,49 @@ def create_system_backup(
             with tarfile.open(partial, mode="w:gz") as tf:
                 tf.add(manifest_path, arcname=_MANIFEST_NAME)
                 tf.add(db_dest, arcname=db_arc)
-                if paths.config.is_file():
+                if include_config and paths.config.is_file():
                     tf.add(
                         root / _CONFIG_DIR / "config.json",
                         arcname=f"{_CONFIG_DIR}/config.json",
                     )
-                if env_path.is_file():
+                if include_config and env_path.is_file():
                     tf.add(root / _CONFIG_DIR / "env", arcname=f"{_CONFIG_DIR}/env")
-                for row in agent_rows:
-                    ws = workspace_dir_from_config_json(
-                        getattr(row, "config_json", None),
-                        paths=paths,
-                        agent_id=str(row.agent_id),
+                if include_workspaces:
+                    for row in agent_rows:
+                        ws = workspace_dir_from_config_json(
+                            getattr(row, "config_json", None),
+                            paths=paths,
+                            agent_id=str(row.agent_id),
+                        )
+                        if ws.is_dir():
+                            _add_dir(
+                                tf,
+                                ws,
+                                f"{_WORKSPACES_DIR}/{row.agent_id}",
+                                skip_chats=not include_chats,
+                                system_files_path=_system_files_path_from_row(row),
+                            )
+                if include_skill_packages and paths.skill_packages_dir.is_dir():
+                    _add_dir(
+                        tf,
+                        paths.skill_packages_dir,
+                        _SKILL_PACKAGES_DIR,
+                        skip_chats=False,
+                    )
+                if include_plugins and paths.plugins_dir.is_dir():
+                    _add_dir(
+                        tf,
+                        paths.plugins_dir,
+                        _PLUGINS_DIR,
+                        skip_chats=False,
+                    )
+                if include_knowledge and paths.knowledge_dir.is_dir():
+                    _add_dir(
+                        tf,
+                        paths.knowledge_dir,
+                        _KNOWLEDGE_DIR,
+                        skip_chats=False,
                     )
-                    if ws.is_dir():
-                        _add_dir(tf, ws, f"{_WORKSPACES_DIR}/{row.agent_id}")
-                if paths.skill_packages_dir.is_dir():
-                    _add_dir(tf, paths.skill_packages_dir, _SKILL_PACKAGES_DIR)
 
         partial.replace(dest)
     except Exception:
@@ -268,6 +372,24 @@ def _iter_extracted_files(root: Path, prefix: str) -> list[tuple[str, Path]]:
     return out
 
 
+def _replace_tree_from_archive(extracted: Path, dest: Path, arc_name: str) -> int:
+    """Replace *dest* with files packed under *arc_name* in the extracted archive."""
+    if dest.exists():
+        shutil.rmtree(dest)
+    dest.mkdir(parents=True, exist_ok=True)
+    count = 0
+    prefix = f"{arc_name}/"
+    for rel, src_file in _iter_extracted_files(extracted, arc_name):
+        rest = rel[len(prefix) :]
+        if not rest:
+            continue
+        out = dest / rest
+        out.parent.mkdir(parents=True, exist_ok=True)
+        shutil.copy2(src_file, out)
+        count += 1
+    return count
+
+
 def restore_system_backup(
     source: Path | bytes,
     *,
@@ -317,10 +439,29 @@ def restore_system_backup(
                 details={"archive_driver": archive_driver, "runtime_driver": pool.dialect},
             )
 
+        runtime_schema_version = _max_discovered_version(pool.dialect)
+        if manifest.schema_version > runtime_schema_version:
+            details = {
+                "archive_schema_version": manifest.schema_version,
+                "runtime_schema_version": runtime_schema_version,
+            }
+            raise OctopError(
+                ErrorCode.BACKUP_SCHEMA_INCOMPATIBLE,
+                f"backup schema version {manifest.schema_version} is newer than "
+                f"the maximum supported version {runtime_schema_version}",
+                details=details,
+            )
+
         db_path = extracted / manifest.db_file
         if not db_path.is_file():
             raise OctopError(ErrorCode.SLASH_BAD_ARGS, "backup archive missing database file")
 
+        saved_chats = (
+            capture_chat_tables(pool, Path(tmp) / "preserved-chats.sqlite")
+            if not manifest.includes_chats
+            else None
+        )
+
         # Capture current login credentials before overwriting the DB (only when needed).
         saved_users: list[tuple[object, ...]] = []
         saved_jwt: bytes | None = None
@@ -351,6 +492,23 @@ def restore_system_backup(
             else:
                 raise OctopError(ErrorCode.INTERNAL_ERROR, "sqlite restore requires SqlitePool")
 
+        # Upgrade the restored database before any current-version repository or
+        # preservation helper queries it. This keeps old backups usable after
+        # tables gain required columns or are rebuilt by later migrations.
+        try:
+            run_migrations(pool)
+        except Exception as exc:
+            details = {
+                "archive_schema_version": manifest.schema_version,
+                "runtime_schema_version": runtime_schema_version,
+            }
+            raise OctopError(
+                ErrorCode.BACKUP_SCHEMA_INCOMPATIBLE,
+                f"failed to upgrade backup schema version {manifest.schema_version} "
+                f"to {runtime_schema_version}: {exc}",
+                details=details,
+            ) from exc
+
         if restore_config:
             cfg_path = extracted / _CONFIG_DIR / "config.json"
             if cfg_path.is_file():
@@ -383,6 +541,7 @@ def restore_system_backup(
         prefix = f"{_WORKSPACES_DIR}/"
         agent_repo = AgentRepo(pool)
         workspace_by_agent: dict[str, Path] = {}
+        system_path_by_agent: dict[str, str] = {}
         for rel, src_file in _iter_extracted_files(extracted, _WORKSPACES_DIR):
             file_rel = rel[len(prefix) :]
             if "/" not in file_rel:
@@ -392,38 +551,53 @@ def restore_system_backup(
                 continue
             dest_root = workspace_by_agent.get(agent_id)
             if dest_root is None:
-                row = agent_repo.get(agent_id)
+                agent_row = agent_repo.get(agent_id)
                 dest_root = workspace_dir_from_config_json(
-                    None if row is None else row.config_json,
+                    None if agent_row is None else agent_row.config_json,
                     paths=paths,
                     agent_id=agent_id,
                 )
                 workspace_by_agent[agent_id] = dest_root
+                system_path_by_agent[agent_id] = (
+                    _system_files_path_from_row(agent_row) if agent_row is not None else ""
+                )
             dest = dest_root / rest
+            if not manifest.includes_chats and is_chat_workspace_rel(
+                Path(rest),
+                system_files_path=system_path_by_agent.get(agent_id, ""),
+            ):
+                continue
             dest.parent.mkdir(parents=True, exist_ok=True)
             shutil.copy2(src_file, dest)
             restored_workspaces += 1
 
-        # Replace skill-package files wholesale so leftover package dirs cannot
-        # outlive a restored database that no longer references them.
-        if paths.skill_packages_dir.exists():
-            shutil.rmtree(paths.skill_packages_dir)
-        paths.skill_packages_dir.mkdir(parents=True, exist_ok=True)
         restored_skill_package_files = 0
-        skill_packages_prefix = f"{_SKILL_PACKAGES_DIR}/"
-        for rel, src_file in _iter_extracted_files(extracted, _SKILL_PACKAGES_DIR):
-            rest = rel[len(skill_packages_prefix) :]
-            if not rest:
-                continue
-            dest = paths.skill_packages_dir / rest
-            dest.parent.mkdir(parents=True, exist_ok=True)
-            shutil.copy2(src_file, dest)
-            restored_skill_package_files += 1
+        if manifest.includes_skill_packages:
+            restored_skill_package_files = _replace_tree_from_archive(
+                extracted,
+                paths.skill_packages_dir,
+                _SKILL_PACKAGES_DIR,
+            )
+
+        restored_plugin_files = 0
+        if manifest.includes_plugins:
+            restored_plugin_files = _replace_tree_from_archive(
+                extracted,
+                paths.plugins_dir,
+                _PLUGINS_DIR,
+            )
+
+        restored_knowledge_files = 0
+        if manifest.includes_knowledge:
+            restored_knowledge_files = _replace_tree_from_archive(
+                extracted,
+                paths.knowledge_dir,
+                _KNOWLEDGE_DIR,
+            )
 
-        # LightClaw migration exports (and older Octop backups) may ship schema v1
-        # without columns added in later migrations (e.g. cron_jobs.mcp_servers).
-        # API restore keeps the process alive, so re-apply migrations on the live pool.
-        run_migrations(pool)
+        preserved_chat_rows, skipped_chat_rows = (
+            restore_preserved_chats(pool, saved_chats) if saved_chats is not None else (0, 0)
+        )
         schema_version = _current_version(pool)
 
     result: dict[str, Any] = {
@@ -432,7 +606,12 @@ def restore_system_backup(
         "agents": len(manifest.agents),
         "workspace_files": restored_workspaces,
         "skill_package_files": restored_skill_package_files,
+        "plugin_files": restored_plugin_files,
+        "knowledge_files": restored_knowledge_files,
         "restore_config": restore_config,
+        "chats_restored": manifest.includes_chats,
+        "preserved_chat_rows": preserved_chat_rows,
+        "skipped_chat_rows": skipped_chat_rows,
         "users_preserved": effective_preserve_users,
         "jwt_preserved": bool(saved_jwt is not None and effective_preserve_users),
         "database_driver": archive_driver,
diff --git a/src/octop/infra/connectors/builder.py b/src/octop/infra/connectors/builder.py
index a7521c8e..476155d0 100644
--- a/src/octop/infra/connectors/builder.py
+++ b/src/octop/infra/connectors/builder.py
@@ -441,7 +441,7 @@ def _iter_active_connectors(
     connector_repo: Any,
     user_id: int,
 ) -> Any:
-    for inst in connector_repo.list_by_user(user_id):
+    for inst in connector_repo.list_visible(user_id):
         if inst.status != "active":
             continue
         entry = get_catalog_entry(inst.kind)
@@ -476,7 +476,7 @@ def build_mcp_server_configs_for_user(
             agent_id,
             agent_user_id,
             user_id,
-            len(connector_repo.list_by_user(user_id)),
+            len(connector_repo.list_visible(user_id)),
         )
     for inst, entry, creds in _iter_active_connectors(svc, connector_repo, user_id):
         try:
@@ -529,6 +529,23 @@ def build_mcp_server_configs_for_user(
     return configs
 
 
+def gateway_mcp_server_names(*, connector_repo: Any, user_id: int) -> set[str]:
+    """MCP server names of *user_id*'s active gateway-mode connector instances.
+
+    Gateway connectors carry no HTTP transport: their tools are built in-process
+    from stored credentials, so callers can attach them to a live agent instead
+    of rebuilding it.
+    """
+    names: set[str] = set()
+    for inst in connector_repo.list_visible(user_id):
+        if inst.status != "active":
+            continue
+        entry = get_catalog_entry(inst.kind)
+        if entry is not None and entry.mcp_mode == "gateway":
+            names.add(inst.mcp_server_name)
+    return names
+
+
 def inject_missing_gateway_tools(
     agent: Any,
     *,
@@ -564,7 +581,7 @@ def inject_missing_gateway_tools(
     if not extra:
         gateway_names = [
             inst.mcp_server_name
-            for inst in connector_repo.list_by_user(user_id)
+            for inst in connector_repo.list_visible(user_id)
             if inst.status == "active"
             and (entry := get_catalog_entry(inst.kind)) is not None
             and entry.mcp_mode == "gateway"
diff --git a/src/octop/infra/connectors/custom_mcp.py b/src/octop/infra/connectors/custom_mcp.py
index 7ffb4385..5d8e3aad 100644
--- a/src/octop/infra/connectors/custom_mcp.py
+++ b/src/octop/infra/connectors/custom_mcp.py
@@ -12,7 +12,7 @@
 CUSTOM_MCP_DISPLAY_NAME = "自定义 MCP"
 
 _SERVER_NAME_RE = re.compile(r"^[A-Za-z0-9_-]+$")
-_META_KEYS = frozenset({"enabled", "display_name", "default_open"})
+_META_KEYS = frozenset({"enabled", "display_name", "default_open", "shared"})
 _OAUTH_KEY = "oauth"
 _SECRET_KEYS = frozenset({_OAUTH_KEY})
 _HARNESS_STRIP_KEYS = _META_KEYS | _SECRET_KEYS
@@ -30,6 +30,14 @@ def synthetic_instance_id(server_name: str) -> str:
     return f"custom:{server_name}"
 
 
+def shared_synthetic_instance_id(parent_instance_id: str, server_name: str) -> str:
+    return f"custom:{parent_instance_id}:{server_name}"
+
+
+def shared_mcp_server_name(parent_instance_id: str, server_name: str) -> str:
+    return f"custom__{parent_instance_id}__{server_name}"
+
+
 def parse_synthetic_instance_id(instance_id: str) -> str | None:
     if not instance_id.startswith("custom:"):
         return None
@@ -145,6 +153,8 @@ def normalize_server_spec(name: str, raw: Any) -> dict[str, Any]:
     spec: dict[str, Any] = {"transport": transport, "enabled": enabled}
     if raw.get("default_open") is True:
         spec["default_open"] = True
+    if raw.get("shared") is True:
+        spec["shared"] = True
 
     display_name = str(raw.get("display_name") or "").strip()
     if display_name:
@@ -362,6 +372,7 @@ def expand_custom_instances(
     *,
     parent: Any,
     servers: dict[str, Any],
+    shared_view: bool = False,
 ) -> list[dict[str, Any]]:
     """Build list-API dicts for each custom server (independent status)."""
     items: list[dict[str, Any]] = []
@@ -369,15 +380,25 @@ def expand_custom_instances(
         if not isinstance(spec, dict):
             continue
         enabled = server_enabled(spec)
+        if shared_view and spec.get("shared") is not True:
+            continue
         items.append(
             {
-                "instance_id": synthetic_instance_id(name),
+                "instance_id": (
+                    shared_synthetic_instance_id(parent.instance_id, name)
+                    if shared_view
+                    else synthetic_instance_id(name)
+                ),
                 "kind": CUSTOM_MCP_KIND,
                 "display_name": server_display_name(name, spec),
                 "status": "active" if enabled else "disabled",
-                "mcp_server_name": name,
+                "mcp_server_name": (
+                    shared_mcp_server_name(parent.instance_id, name) if shared_view else name
+                ),
                 "has_credentials": True,
                 "default_open": spec.get("default_open") is True,
+                "shared": spec.get("shared") is True,
+                "owner_user_id": parent.user_id,
                 "created_at": parent.created_at,
                 "updated_at": parent.updated_at,
             }
diff --git a/src/octop/infra/connectors/default_open.py b/src/octop/infra/connectors/default_open.py
index e0a3a9a0..5fa817c9 100644
--- a/src/octop/infra/connectors/default_open.py
+++ b/src/octop/infra/connectors/default_open.py
@@ -18,11 +18,14 @@ def build_instance_config_json(
     kind: str,
     default_open: bool = False,
     email: Any = None,
+    description: str | None = None,
 ) -> str | None:
     """Build ``connectors.config_json`` payload; None when empty."""
     config: dict[str, Any] = {}
     if kind == "qq-mail" and email:
         config["email"] = email
+    if description:
+        config["description"] = description
     if default_open:
         config["default_open"] = True
     if not config:
diff --git a/src/octop/infra/connectors/service.py b/src/octop/infra/connectors/service.py
index a012e7e4..bcc006c4 100644
--- a/src/octop/infra/connectors/service.py
+++ b/src/octop/infra/connectors/service.py
@@ -27,6 +27,7 @@
     redact_servers_for_api,
     server_enabled,
     set_oauth_required_in_spec,
+    shared_mcp_server_name,
     validate_servers_map,
     wrap_servers,
 )
@@ -49,6 +50,10 @@
 _OAUTH_REFRESH_SKEW_SEC = 120
 
 
+class ConnectorNameTakenError(ValueError):
+    """Raised when a connector display name is already owned by the user."""
+
+
 def list_user_connector_instances(
     repo: ConnectorRepo,
     user_id: int,
@@ -166,6 +171,14 @@ def _save_custom_servers(self, user_id: int, servers: dict[str, Any]) -> dict[st
             servers,
             reserved_names=self.reserved_builtin_mcp_names(user_id),
         )
+        display_names: set[str] = set()
+        for name, spec in normalized.items():
+            display_name = (
+                str(spec.get("display_name") or "").strip() if isinstance(spec, dict) else ""
+            ) or name
+            if display_name in display_names or self._repo.name_exists(user_id, display_name):
+                raise ConnectorNameTakenError(display_name)
+            display_names.add(display_name)
         row = self._repo.get_by_user_kind(user_id, CUSTOM_MCP_KIND)
         if not normalized:
             if row is not None:
@@ -267,6 +280,7 @@ def patch_custom_server(
         *,
         enabled: bool | None = None,
         default_open: bool | None = None,
+        shared: bool | None = None,
     ) -> dict[str, Any]:
         servers = dict(self.get_custom_servers(user_id))
         if server_name not in servers:
@@ -281,6 +295,11 @@ def patch_custom_server(
                 spec["default_open"] = True
             else:
                 spec.pop("default_open", None)
+        if shared is not None:
+            if shared:
+                spec["shared"] = True
+            else:
+                spec.pop("shared", None)
         servers[server_name] = spec
         return self.put_custom_servers(user_id, servers)
 
@@ -311,18 +330,22 @@ def list_instances_for_api(self, user_id: int) -> list[dict[str, Any]]:
         """Built-in rows + expanded custom servers (hide parent custom-mcp row)."""
         out: list[dict[str, Any]] = []
         custom_row = self._repo.get_by_user_kind(user_id, CUSTOM_MCP_KIND)
-        for inst in self._repo.list_by_user(user_id):
+        for inst in self._repo.list_visible(user_id):
             if is_custom_mcp_kind(inst.kind):
                 continue
+            config = ConnectorRepo.parse_config_json(inst)
             out.append(
                 {
                     "instance_id": inst.instance_id,
                     "kind": inst.kind,
                     "display_name": inst.display_name,
+                    "description": config.get("description"),
                     "status": inst.status,
                     "mcp_server_name": inst.mcp_server_name,
                     "has_credentials": inst.has_credentials,
-                    "default_open": read_default_open(ConnectorRepo.parse_config_json(inst)),
+                    "default_open": read_default_open(config),
+                    "shared": inst.shared,
+                    "owner_user_id": inst.user_id,
                     "created_at": inst.created_at,
                     "updated_at": inst.updated_at,
                 }
@@ -334,11 +357,24 @@ def list_instances_for_api(self, user_id: int) -> list[dict[str, Any]]:
                     servers=extract_servers(self.decrypt(custom_row.instance_id)),
                 )
             )
+        for parent in self._repo.list_by_kind(CUSTOM_MCP_KIND):
+            if parent.user_id == user_id or not parent.has_credentials:
+                continue
+            out.extend(
+                expand_custom_instances(
+                    parent=parent,
+                    servers=extract_servers(self.decrypt(parent.instance_id)),
+                    shared_view=True,
+                )
+            )
+        for item in out:
+            item.setdefault("owner_user_id", user_id)
+            item.setdefault("shared", False)
         return out
 
     def list_active_mcp_server_names(self, user_id: int) -> list[str]:
         names: list[str] = []
-        for inst in self._repo.list_by_user(user_id):
+        for inst in self._repo.list_visible(user_id):
             if is_custom_mcp_kind(inst.kind):
                 continue
             if inst.status != "active" or not inst.has_credentials:
@@ -347,6 +383,12 @@ def list_active_mcp_server_names(self, user_id: int) -> list[str]:
         for name, spec in self.get_custom_servers(user_id).items():
             if isinstance(spec, dict) and server_enabled(spec):
                 names.append(name)
+        for parent in self._repo.list_by_kind(CUSTOM_MCP_KIND):
+            if parent.user_id == user_id or not parent.has_credentials:
+                continue
+            for name, spec in extract_servers(self.decrypt(parent.instance_id)).items():
+                if isinstance(spec, dict) and spec.get("shared") is True and server_enabled(spec):
+                    names.append(shared_mcp_server_name(parent.instance_id, name))
         return sorted(names)
 
     def list_default_open_mcp_server_names(self, user_id: int) -> list[str]:
@@ -393,11 +435,26 @@ def validate_mcp_servers_for_user(self, user_id: int, names: list[str]) -> list[
         return list(names)
 
     def custom_harness_configs(self, user_id: int) -> dict[str, Any]:
-        return enabled_harness_configs(self.get_custom_servers(user_id))
+        configs = enabled_harness_configs(self.get_custom_servers(user_id))
+        for parent in self._repo.list_by_kind(CUSTOM_MCP_KIND):
+            if parent.user_id == user_id or not parent.has_credentials:
+                continue
+            servers = extract_servers(self.decrypt(parent.instance_id))
+            for name, spec in servers.items():
+                if (
+                    not isinstance(spec, dict)
+                    or spec.get("shared") is not True
+                    or not server_enabled(spec)
+                ):
+                    continue
+                built = enabled_harness_configs({name: spec}).get(name)
+                if built is not None:
+                    configs[shared_mcp_server_name(parent.instance_id, name)] = built
+        return configs
 
     async def mcp_configs_for_user(self, user_id: int) -> dict[str, Any]:
         configs: dict[str, Any] = {}
-        for inst in self._repo.list_by_user(user_id):
+        for inst in self._repo.list_visible(user_id):
             if inst.status != "active":
                 continue
             if is_custom_mcp_kind(inst.kind):
@@ -415,6 +472,14 @@ async def mcp_configs_for_user(self, user_id: int) -> dict[str, Any]:
                 config=self._config,
             )
         await self.ensure_fresh_custom_servers(user_id)
+        for parent in self._repo.list_by_kind(CUSTOM_MCP_KIND):
+            if parent.user_id == user_id or not parent.has_credentials:
+                continue
+            servers = extract_servers(self.decrypt(parent.instance_id))
+            if any(
+                isinstance(spec, dict) and spec.get("shared") is True for spec in servers.values()
+            ):
+                await self.ensure_fresh_custom_servers(parent.user_id)
         configs.update(self.custom_harness_configs(user_id))
         return configs
 
diff --git a/src/octop/infra/cron/delivery.py b/src/octop/infra/cron/delivery.py
new file mode 100644
index 00000000..2c183ea1
--- /dev/null
+++ b/src/octop/infra/cron/delivery.py
@@ -0,0 +1,282 @@
+"""Cron delivery orchestration, separate from channel transport."""
+
+from __future__ import annotations
+
+import logging
+from dataclasses import dataclass
+from typing import TYPE_CHECKING, Any
+
+from langchain_core.messages import AIMessage, HumanMessage
+
+from octop.i18n import tr
+from octop.infra.cron.task_type import CronTaskType, normalize_cron_task_type
+from octop.infra.gateway.process import build_harness_request
+from octop.infra.gateway.process.history_projection import TurnHistoryTracker, message_inputs
+from octop.infra.gateway.process.message_keys import COMPOSER_CTX_KEY, build_composer_context
+from octop.infra.gateway.process.usage_record import UsageTracker, record_turn_usage
+from octop.infra.gateway.threads import ThreadRegistry
+from octop.infra.utils.llm_text import strip_thinking
+from octop.infra.utils.locale import resolve_user_locale
+from octop.infra.utils.ulid import new_ulid
+
+if TYPE_CHECKING:
+    from octop.infra.agents.manager import AgentManager
+    from octop.infra.db.repos.sessions import SessionRow
+    from octop.infra.db.repos.thread_messages import ThreadMessageInput
+    from octop.infra.db.services import RepoBundle
+    from octop.infra.gateway.gateway import Gateway
+
+logger = logging.getLogger(__name__)
+
+
+@dataclass(frozen=True)
+class CronDeliveryCommand:
+    """Immutable inputs for one scheduled delivery attempt."""
+
+    cron_id: str
+    cron_name: str
+    agent_id: str
+    user_id: int
+    session_key: str
+    prompt: str
+    fresh_thread: bool
+    task_type: CronTaskType
+    model: str | None
+    mcp_servers: tuple[str, ...]
+
+
+class CronDeliveryService:
+    """Persist canonical cron turns and deliver their visible output."""
+
+    def __init__(
+        self,
+        *,
+        gateway: Gateway,
+        agent_manager: AgentManager,
+        repos: RepoBundle,
+    ) -> None:
+        self._gateway = gateway
+        self._agent_manager = agent_manager
+        self._repos = repos
+
+    def replace_repos(self, repos: RepoBundle) -> None:
+        """Retarget projection and locale lookups after a control-plane swap."""
+        self._repos = repos
+
+    async def deliver(self, command: CronDeliveryCommand) -> None:
+        """Run one delivery under the target channel session lock."""
+
+        async def _locked() -> None:
+            if command.fresh_thread:
+                await self._gateway.thread_registry.reset_by_session_key(command.session_key)
+            session = self._gateway.require_session(command.agent_id, command.session_key)
+            if session.user_id != command.user_id:
+                raise ValueError(
+                    f"session {command.session_key!r} does not belong to user {command.user_id!r}"
+                )
+            if command.task_type == "text":
+                await self._deliver_text(command, session)
+            else:
+                await self._deliver_agent(command, session)
+
+        await self._gateway.run_in_session(
+            command.agent_id,
+            command.session_key,
+            _locked,
+        )
+
+    async def _deliver_text(
+        self,
+        command: CronDeliveryCommand,
+        session: SessionRow,
+    ) -> None:
+        projected: list[ThreadMessageInput] = []
+        title_source = command.prompt
+        if session.channel_type == ThreadRegistry.CHANNEL_DASHBOARD:
+            delivery_id = new_ulid()
+            locale = resolve_user_locale(
+                user_repo=self._repos.user_repo,
+                user_id=session.user_id,
+                channel_type=session.channel_type,
+            )
+            human_text = tr(
+                "cron.history.executed",
+                locale,
+                cron_id=command.cron_id,
+                name=command.cron_name,
+            )
+            title_source = human_text
+            canonical = [
+                HumanMessage(
+                    content=human_text,
+                    id=f"cron:{delivery_id}:human",
+                ),
+                AIMessage(
+                    content=command.prompt,
+                    id=f"cron:{delivery_id}:assistant",
+                ),
+            ]
+            harness = self._agent_manager.get_agent(command.agent_id)
+            appended = await harness.aappend_messages(session.thread_id, canonical)
+            projected = message_inputs(appended, dedupe_missing_ids=True)
+
+        self._project_best_effort(session.thread_id, projected)
+        await self._gateway.push_session_text(
+            session,
+            command.prompt,
+            title_source=title_source,
+        )
+        await self._notify_best_effort(session, command.agent_id, command.prompt)
+
+    async def _deliver_agent(
+        self,
+        command: CronDeliveryCommand,
+        session: SessionRow,
+    ) -> None:
+        request = await self._build_agent_request(command, session)
+        tracker = TurnHistoryTracker.from_request(request)
+        usage = UsageTracker()
+        parts: list[str] = []
+        interaction_required = False
+        async for chunk in self._agent_manager.stream(command.agent_id, request):
+            tracker.observe(chunk)
+            usage.observe(chunk)
+            if chunk.get("type") in ("token", "delta"):
+                parts.append(str(chunk.get("content") or chunk.get("text") or ""))
+            elif chunk.get("type") == "hitl_required":
+                interaction_required = True
+        if interaction_required:
+            raise RuntimeError("cron agent run requires user interaction")
+
+        outbound = strip_thinking("".join(parts)).strip()
+        if not outbound:
+            raise RuntimeError("cron agent run produced no visible response")
+        self._project_best_effort(session.thread_id, tracker.inputs)
+        if usage.usage is not None:
+            record_turn_usage(
+                self._repos.usage_repo,
+                agent_id=command.agent_id,
+                user_id=session.user_id,
+                thread_id=session.thread_id,
+                usage=usage.usage,
+                source="cron",
+            )
+        await self._gateway.push_session_text(
+            session,
+            outbound,
+            title_source=command.prompt,
+        )
+        await self._notify_best_effort(session, command.agent_id, outbound)
+
+    async def _build_agent_request(
+        self,
+        command: CronDeliveryCommand,
+        session: SessionRow,
+    ) -> dict[str, Any]:
+        servers = [name.strip() for name in command.mcp_servers if name.strip()]
+        if servers:
+            servers = (
+                self._agent_manager.merge_turn_mcp_servers(
+                    session.user_id,
+                    servers,
+                    apply_defaults=False,
+                )
+                or []
+            )
+        else:
+            servers = (
+                self._agent_manager.merge_turn_mcp_servers(
+                    session.user_id,
+                    None,
+                    apply_defaults=True,
+                )
+                or []
+            )
+        if servers:
+            failed = await self._agent_manager.prepare_chat_mcp(
+                command.agent_id,
+                servers,
+                connector_user_id=session.user_id,
+            )
+            if failed:
+                raise RuntimeError(f"mcp load failed: {', '.join(failed)}")
+
+        row = self._agent_manager.get_row(command.agent_id)
+        default_model = (row.default_model if row is not None else None) or None
+        composer = build_composer_context(
+            mcp_servers=servers or None,
+            skills=None,
+            target_agent_ids=None,
+            model_ref=command.model,
+            default_model=default_model,
+        )
+        message_kwargs = {COMPOSER_CTX_KEY: composer} if composer else None
+        request = build_harness_request(
+            thread_id=session.thread_id,
+            user_id=session.user_id,
+            agent_id=command.agent_id,
+            session_key=command.session_key,
+            source=session.channel_type,
+            text=command.prompt,
+            model=command.model,
+            message_kwargs=message_kwargs,
+        )
+        if servers:
+            request["mcp_servers"] = servers
+        return request
+
+    def _project_best_effort(
+        self,
+        thread_id: str,
+        messages: list[ThreadMessageInput],
+    ) -> None:
+        if not messages:
+            return
+        try:
+            self._repos.thread_message_repo.append_if_ready(thread_id, messages)
+        except Exception:
+            logger.warning(
+                "failed to append cron history projection for thread=%s",
+                thread_id,
+                exc_info=True,
+            )
+
+    async def _notify_best_effort(
+        self,
+        session: SessionRow,
+        agent_id: str,
+        text: str,
+    ) -> None:
+        if session.channel_type != ThreadRegistry.CHANNEL_DASHBOARD:
+            return
+        try:
+            await self._gateway.notify_dashboard_push(session, agent_id, text)
+        except Exception:
+            logger.warning(
+                "failed to send cron dashboard notification for thread=%s",
+                session.thread_id,
+                exc_info=True,
+            )
+
+
+def command_from_row(row: Any) -> CronDeliveryCommand:
+    """Build a delivery command from a persisted cron row."""
+    return CronDeliveryCommand(
+        cron_id=str(row.cron_id),
+        cron_name=str(row.name),
+        agent_id=str(row.agent_id),
+        user_id=int(row.user_id),
+        session_key=str(row.session_key),
+        prompt=str(row.prompt),
+        fresh_thread=bool(row.fresh_thread),
+        task_type=normalize_cron_task_type(str(row.task_type)),
+        model=str(row.model) if row.model else None,
+        mcp_servers=tuple(str(name) for name in row.mcp_servers),
+    )
+
+
+__all__ = [
+    "CronDeliveryCommand",
+    "CronDeliveryService",
+    "command_from_row",
+]
diff --git a/src/octop/infra/cron/job.py b/src/octop/infra/cron/job.py
index 3a1055d5..5a75adfd 100644
--- a/src/octop/infra/cron/job.py
+++ b/src/octop/infra/cron/job.py
@@ -1,4 +1,4 @@
-"""CronJob — APScheduler callable; triggers via Gateway.push_text_from_session()."""
+"""CronJob — APScheduler callable with status and audit bookkeeping."""
 
 from __future__ import annotations
 
@@ -6,13 +6,14 @@
 import time
 from typing import TYPE_CHECKING
 
+from octop.infra.cron.delivery import CronDeliveryCommand
 from octop.infra.cron.task_type import normalize_cron_task_type
 from octop.infra.db.repos.audit import ACTOR_SYSTEM
 
 if TYPE_CHECKING:
+    from octop.infra.cron.delivery import CronDeliveryService
     from octop.infra.db.repos.audit import AuditRepo
     from octop.infra.db.repos.cron import CronJobRepo, CronJobRow
-    from octop.infra.gateway.gateway import Gateway
 
 logger = logging.getLogger(__name__)
 
@@ -22,6 +23,7 @@ def __init__(
         self,
         *,
         cron_id: str,
+        name: str,
         agent_id: str,
         prompt: str,
         fresh_thread: bool,
@@ -29,11 +31,13 @@ def __init__(
         model: str | None,
         task_type: str,
         mcp_servers: list[str] | None,
-        gateway: Gateway,
+        user_id: int,
+        delivery_service: CronDeliveryService,
         cron_repo: CronJobRepo,
         audit_repo: AuditRepo,
     ) -> None:
         self._cron_id = cron_id
+        self._name = name
         self._agent_id = agent_id
         self._prompt = prompt
         self._fresh_thread = fresh_thread
@@ -41,7 +45,8 @@ def __init__(
         self._model = model
         self._task_type = normalize_cron_task_type(task_type)
         self._mcp_servers = list(mcp_servers or [])
-        self._gateway = gateway
+        self._user_id = user_id
+        self._delivery_service = delivery_service
         self._cron_repo = cron_repo
         self._audit_repo = audit_repo
 
@@ -50,12 +55,13 @@ def from_row(
         cls,
         row: CronJobRow,
         *,
-        gateway: Gateway,
+        delivery_service: CronDeliveryService,
         cron_repo: CronJobRepo,
         audit_repo: AuditRepo,
     ) -> CronJob:
         return cls(
             cron_id=row.cron_id,
+            name=row.name,
             agent_id=row.agent_id,
             prompt=row.prompt,
             fresh_thread=bool(row.fresh_thread),
@@ -63,7 +69,8 @@ def from_row(
             model=row.model,
             task_type=row.task_type,
             mcp_servers=list(row.mcp_servers),
-            gateway=gateway,
+            user_id=row.user_id,
+            delivery_service=delivery_service,
             cron_repo=cron_repo,
             audit_repo=audit_repo,
         )
@@ -73,30 +80,21 @@ async def run(self) -> None:
 
         METRICS.inc("cron_runs_total")
         ts = int(time.time())
-        session = self._gateway.thread_registry.get_session(self._session_key)
-        if session is None:
-            METRICS.inc("cron_errors_total")
-            err = f"session not found: {self._session_key}"
-            logger.error("cron job %s: %s", self._cron_id, err)
-            self._cron_repo.set_run_status(self._cron_id, ts=ts, status="error", error=err)
-            self._audit_repo.write(
-                actor=ACTOR_SYSTEM,
-                action="cron.run_failed",
-                target=self._cron_id,
-                payload=err,
-            )
-            return
 
         try:
-            if self._fresh_thread:
-                await self._gateway.thread_registry.reset_by_session_key(self._session_key)
-            await self._gateway.push_text_from_session(
-                self._agent_id,
-                self._session_key,
-                self._prompt,
-                task_type=self._task_type,
-                model=self._model,
-                mcp_servers=self._mcp_servers or None,
+            await self._delivery_service.deliver(
+                CronDeliveryCommand(
+                    cron_id=self._cron_id,
+                    cron_name=self._name,
+                    agent_id=self._agent_id,
+                    user_id=self._user_id,
+                    session_key=self._session_key,
+                    prompt=self._prompt,
+                    fresh_thread=self._fresh_thread,
+                    task_type=self._task_type,
+                    model=self._model,
+                    mcp_servers=tuple(self._mcp_servers),
+                )
             )
         except Exception as exc:
             METRICS.inc("cron_errors_total")
diff --git a/src/octop/infra/cron/manager.py b/src/octop/infra/cron/manager.py
index 59ee4474..45e3b420 100644
--- a/src/octop/infra/cron/manager.py
+++ b/src/octop/infra/cron/manager.py
@@ -9,6 +9,7 @@
 
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 
+from octop.infra.cron.delivery import CronDeliveryService
 from octop.infra.cron.job import CronJob
 from octop.infra.cron.trigger import build_trigger
 from octop.infra.db.repos.audit import ACTOR_SYSTEM
@@ -20,7 +21,7 @@
     from octop.infra.db.services import RepoBundle
     from octop.infra.gateway.gateway import Gateway
 
-from octop.infra.cron.task_type import normalize_cron_task_type
+from octop.infra.cron.task_type import normalize_cron_task_type, require_cron_name
 from octop.infra.db.repos._base import UNSET
 
 logger = logging.getLogger(__name__)
@@ -35,6 +36,7 @@ class CronCreateSpec:
     user_id: int
     trigger: str
     prompt: str
+    name: str | None = None
     session_key: str | None = None
     fresh_thread: bool = False
     model: str | None = None
@@ -52,10 +54,12 @@ def __init__(
         self,
         *,
         gateway: Gateway,
+        delivery_service: CronDeliveryService,
         repos: RepoBundle,
         timezone: str = "Asia/Shanghai",
     ) -> None:
         self._gateway = gateway
+        self._delivery_service = delivery_service
         self._repos = repos
         self._timezone = timezone
         self._scheduler: AsyncIOScheduler = AsyncIOScheduler(timezone=timezone)
@@ -66,6 +70,7 @@ def __init__(
     def replace_repos(self, repos: RepoBundle) -> None:
         """Point cron persistence at a rebound control-plane pool."""
         self._repos = repos
+        self._delivery_service.replace_repos(repos)
 
     async def boot(self) -> None:
         self._scheduler.start()
@@ -115,6 +120,7 @@ async def create(self, spec: CronCreateSpec | None = None, **kwargs: Any) -> Cro
                 cron_id=spec.cron_id,
                 agent_id=spec.agent_id,
                 user_id=spec.user_id,
+                name=require_cron_name(spec.name, prompt=spec.prompt, cron_id=spec.cron_id),
                 trigger=spec.trigger,
                 prompt=spec.prompt,
                 session_key=session_key,
@@ -122,6 +128,7 @@ async def create(self, spec: CronCreateSpec | None = None, **kwargs: Any) -> Cro
                 model=(spec.model or "").strip() or None,
                 task_type=normalize_cron_task_type(spec.task_type),
                 mcp_servers=list(spec.mcp_servers or []),
+                enabled=spec.enabled,
             )
             row = self._repos.cron_repo.get(spec.cron_id)
             assert row is not None
@@ -139,8 +146,18 @@ async def create(self, spec: CronCreateSpec | None = None, **kwargs: Any) -> Cro
     def get(self, cron_id: str) -> CronJobRow | None:
         return self._repos.cron_repo.get(cron_id)
 
-    def list_by_agent(self, agent_id: str, *, include_disabled: bool = True) -> list[CronJobRow]:
-        return self._repos.cron_repo.list_by_agent(agent_id, include_disabled=include_disabled)
+    def list_by_agent(
+        self,
+        agent_id: str,
+        *,
+        include_disabled: bool = True,
+        user_id: int | None = None,
+    ) -> list[CronJobRow]:
+        return self._repos.cron_repo.list_by_agent(
+            agent_id,
+            include_disabled=include_disabled,
+            user_id=user_id,
+        )
 
     def list_all(self, *, include_disabled: bool = True) -> list[CronJobRow]:
         return self._repos.cron_repo.list_all(include_disabled=include_disabled)
@@ -150,6 +167,7 @@ async def update(
         cron_id: str,
         *,
         trigger: str | None = None,
+        name: str | None = None,
         prompt: str | None = None,
         session_key: str | None = None,
         fresh_thread: bool | None = None,
@@ -167,6 +185,7 @@ async def update(
                 raise OctopError(ErrorCode.NOT_FOUND, f"cron job {cron_id!r} not found")
             repo_kwargs: dict[str, Any] = {
                 "trigger": trigger,
+                "name": name,
                 "prompt": prompt,
                 "session_key": session_key,
                 "fresh_thread": fresh_thread,
@@ -209,7 +228,7 @@ async def run_now(self, cron_id: str) -> None:
     def _make_job(self, row: Any) -> CronJob:
         return CronJob.from_row(
             row,
-            gateway=self._gateway,
+            delivery_service=self._delivery_service,
             cron_repo=self._repos.cron_repo,
             audit_repo=self._repos.audit_repo,
         )
@@ -251,6 +270,11 @@ async def _ensure_session(self, session_key: str, *, agent_id: str, user_id: int
                     f"not {agent_id!r}"
                 )
                 raise ValueError(msg)
+            if existing.user_id != user_id:
+                msg = (
+                    f"session {session_key!r} belongs to user {existing.user_id!r}, not {user_id!r}"
+                )
+                raise ValueError(msg)
             return
         parts = session_key.split(":", 3)
         channel_type = parts[1] if len(parts) >= 2 else "cron"
diff --git a/src/octop/infra/cron/task_type.py b/src/octop/infra/cron/task_type.py
index 4ee1dfe4..b4081b48 100644
--- a/src/octop/infra/cron/task_type.py
+++ b/src/octop/infra/cron/task_type.py
@@ -7,6 +7,7 @@
 CronTaskType = Literal["text", "agent"]
 DEFAULT_CRON_TASK_TYPE: CronTaskType = "agent"
 CRON_PROMPT_MAX_LEN = 2000
+CRON_NAME_MAX_LEN = 80
 _CRON_TASK_TYPES = frozenset({"text", "agent"})
 
 
@@ -32,3 +33,19 @@ def require_cron_prompt(prompt: str) -> str:
     if len(text) > CRON_PROMPT_MAX_LEN:
         raise ValueError(f"prompt must be at most {CRON_PROMPT_MAX_LEN} characters")
     return text
+
+
+def default_cron_name(prompt: str, cron_id: str) -> str:
+    """Build a readable fallback name from the prompt or id."""
+    text = " ".join(prompt.strip().split())
+    if not text:
+        return cron_id
+    return text[:40]
+
+
+def require_cron_name(name: str | None, *, prompt: str, cron_id: str) -> str:
+    """Validate cron display name and fill a stable fallback when omitted."""
+    text = (name or "").strip() or default_cron_name(prompt, cron_id)
+    if len(text) > CRON_NAME_MAX_LEN:
+        raise ValueError(f"name must be at most {CRON_NAME_MAX_LEN} characters")
+    return text
diff --git a/src/octop/infra/cron/tools.py b/src/octop/infra/cron/tools.py
index e4a2b740..a4a12af7 100644
--- a/src/octop/infra/cron/tools.py
+++ b/src/octop/infra/cron/tools.py
@@ -11,6 +11,7 @@
 
 from octop.infra.cron.manager import CronCreateSpec
 from octop.infra.cron.task_type import (
+    require_cron_name,
     require_cron_prompt,
     require_cron_task_type,
 )
@@ -64,9 +65,20 @@ def _tool_ctx() -> tuple[str, int, str]:
     return str(agent_id), user_id, str(session_key)
 
 
+def _user_owns_agent(mgr: CronManager, agent_id: str, user_id: int) -> bool:
+    row = mgr._repos.agent_repo.get(agent_id)
+    return row is not None and row.user_id == user_id
+
+
+def _require_agent_owner(mgr: CronManager, agent_id: str, user_id: int) -> None:
+    if not _user_owns_agent(mgr, agent_id, user_id):
+        raise ValueError("cron jobs can only be managed by the expert owner")
+
+
 def _get_owned(mgr: CronManager, cron_id: str, agent_id: str, user_id: int) -> CronJobRow:
+    _require_agent_owner(mgr, agent_id, user_id)
     row = mgr.get(cron_id)
-    if row is None or row.agent_id != agent_id or row.user_id != user_id:
+    if row is None or row.agent_id != agent_id:
         raise ValueError(f"cron job not found: {cron_id}")
     return row
 
@@ -86,11 +98,9 @@ def build_cronjob_tools(cron_manager: CronManager) -> list[StructuredTool]:
     async def cronjob_list(include_disabled: bool = True) -> str:
         try:
             agent_id, user_id, _session_key = _tool_ctx()
-            rows = [
-                r
-                for r in mgr.list_by_agent(agent_id, include_disabled=include_disabled)
-                if r.user_id == user_id
-            ]
+            if not _user_owns_agent(mgr, agent_id, user_id):
+                return _ok([])
+            rows = mgr.list_by_agent(agent_id, include_disabled=include_disabled)
             return _ok([r.to_public_dict() for r in rows])
         except Exception as exc:
             return _err(exc)
@@ -117,6 +127,10 @@ async def cronjob_create(
                 ),
             ),
         ],
+        name: Annotated[
+            str | None,
+            Field(description="Optional display name for this cron job."),
+        ] = None,
         fresh_thread: Annotated[
             bool,
             Field(description="If true, reset conversation context before each agent run."),
@@ -132,12 +146,16 @@ async def cronjob_create(
     ) -> str:
         try:
             agent_id, user_id, session_key = _tool_ctx()
+            _require_agent_owner(mgr, agent_id, user_id)
+            cron_id = new_cron_id()
+            cleaned_prompt = require_cron_prompt(prompt)
             spec = CronCreateSpec(
-                cron_id=new_cron_id(),
+                cron_id=cron_id,
                 agent_id=agent_id,
                 user_id=user_id,
+                name=require_cron_name(name, prompt=cleaned_prompt, cron_id=cron_id),
                 trigger=trigger,
-                prompt=require_cron_prompt(prompt),
+                prompt=cleaned_prompt,
                 fresh_thread=fresh_thread,
                 session_key=session_key,
                 enabled=enabled,
@@ -150,6 +168,7 @@ async def cronjob_create(
 
     async def cronjob_update(
         cron_id: str,
+        name: Annotated[str | None, Field(description="New display name.")] = None,
         trigger: Annotated[str | None, Field(description=f"New schedule. {_TRIGGER_HELP}")] = None,
         prompt: Annotated[
             str | None,
@@ -161,11 +180,21 @@ async def cronjob_update(
     ) -> str:
         try:
             agent_id, user_id, _session_key = _tool_ctx()
-            _get_owned(mgr, cron_id, agent_id, user_id)
+            existing = _get_owned(mgr, cron_id, agent_id, user_id)
+            cleaned_prompt = require_cron_prompt(prompt) if prompt is not None else None
             row = await mgr.update(
                 cron_id,
+                name=(
+                    require_cron_name(
+                        name,
+                        prompt=cleaned_prompt or existing.prompt,
+                        cron_id=cron_id,
+                    )
+                    if name is not None
+                    else None
+                ),
                 trigger=trigger,
-                prompt=require_cron_prompt(prompt) if prompt is not None else None,
+                prompt=cleaned_prompt,
                 fresh_thread=fresh_thread,
                 enabled=int(enabled) if enabled is not None else None,
                 task_type=require_cron_task_type(task_type) if task_type is not None else None,
diff --git a/src/octop/infra/db/migrate.py b/src/octop/infra/db/migrate.py
index 0343dc42..7af3e8b2 100644
--- a/src/octop/infra/db/migrate.py
+++ b/src/octop/infra/db/migrate.py
@@ -143,6 +143,24 @@ def _ensure_agent_profile_columns(db: DatabasePool) -> None:
     _collapse_legacy_agent_welcome_columns(db)
 
 
+def _ensure_cron_jobs_schema(db: DatabasePool) -> None:
+    if not _table_exists(db, "cron_jobs"):
+        return
+    _ensure_column(db, "cron_jobs", "name", "TEXT NOT NULL DEFAULT ''")
+    _ensure_column(
+        db,
+        "cron_jobs",
+        "task_type",
+        "TEXT NOT NULL DEFAULT 'agent' CHECK (task_type IN ('text', 'agent'))",
+    )
+    _ensure_column(
+        db,
+        "cron_jobs",
+        "mcp_servers",
+        "TEXT NOT NULL DEFAULT '[]'",
+    )
+
+
 def _collapse_legacy_agent_welcome_columns(db: DatabasePool) -> None:
     """Fold welcome_message_zh/en into a single instance-owned welcome_message."""
     if not _table_exists(db, "agents"):
@@ -913,6 +931,244 @@ def _ensure_thread_message_projection_schema(db: DatabasePool) -> None:
         )
 
 
+def _ensure_trajectory_events_schema(db: DatabasePool) -> None:
+    """Create trajectory_events (schema v12) and ensure thread_id ON DELETE CASCADE."""
+    if not _table_exists(db, "threads"):
+        return
+    if db.dialect == "postgresql":
+        _ensure_trajectory_events_postgresql(db)
+        return
+    if not _table_exists(db, "trajectory_events"):
+        with db.connect() as conn:
+            conn.executescript(
+                """
+                CREATE TABLE IF NOT EXISTS trajectory_events (
+                  id INTEGER PRIMARY KEY AUTOINCREMENT,
+                  event_id TEXT NOT NULL UNIQUE,
+                  agent_id TEXT NOT NULL,
+                  thread_id TEXT NOT NULL REFERENCES threads(thread_id) ON DELETE CASCADE,
+                  seq INTEGER NOT NULL,
+                  ts REAL NOT NULL,
+                  kind TEXT NOT NULL,
+                  turn_id TEXT,
+                  request_seq INTEGER,
+                  is_error INTEGER NOT NULL DEFAULT 0,
+                  summary TEXT NOT NULL DEFAULT '',
+                  payload_json TEXT NOT NULL DEFAULT '{}',
+                  UNIQUE (thread_id, seq)
+                );
+                CREATE INDEX IF NOT EXISTS idx_trajectory_events_thread_seq
+                  ON trajectory_events (thread_id, seq);
+                """
+            )
+        return
+    if _sqlite_references_threads(db, "trajectory_events"):
+        return
+    with db.transaction() as conn:
+        conn.execute("ALTER TABLE trajectory_events RENAME TO trajectory_events_legacy")
+        conn.execute(
+            """
+            CREATE TABLE trajectory_events (
+              id INTEGER PRIMARY KEY AUTOINCREMENT,
+              event_id TEXT NOT NULL UNIQUE,
+              agent_id TEXT NOT NULL,
+              thread_id TEXT NOT NULL REFERENCES threads(thread_id) ON DELETE CASCADE,
+              seq INTEGER NOT NULL,
+              ts REAL NOT NULL,
+              kind TEXT NOT NULL,
+              turn_id TEXT,
+              request_seq INTEGER,
+              is_error INTEGER NOT NULL DEFAULT 0,
+              summary TEXT NOT NULL DEFAULT '',
+              payload_json TEXT NOT NULL DEFAULT '{}',
+              UNIQUE (thread_id, seq)
+            )
+            """
+        )
+        conn.execute(
+            """
+            INSERT INTO trajectory_events(
+              event_id, agent_id, thread_id, seq, ts, kind, turn_id,
+              request_seq, is_error, summary, payload_json
+            )
+            SELECT
+              event_id, agent_id, thread_id, seq, ts, kind, turn_id,
+              request_seq, is_error, summary, payload_json
+            FROM trajectory_events_legacy
+            WHERE thread_id IN (SELECT thread_id FROM threads)
+            """
+        )
+        conn.execute("DROP TABLE trajectory_events_legacy")
+        conn.execute(
+            "CREATE INDEX IF NOT EXISTS idx_trajectory_events_thread_seq "
+            "ON trajectory_events (thread_id, seq)"
+        )
+
+
+def _ensure_trajectory_events_postgresql(db: DatabasePool) -> None:
+    with db.connect() as conn, conn.transaction():
+        conn.execute(
+            """
+            CREATE TABLE IF NOT EXISTS trajectory_events (
+              id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+              event_id TEXT NOT NULL UNIQUE,
+              agent_id TEXT NOT NULL,
+              thread_id TEXT NOT NULL REFERENCES threads(thread_id) ON DELETE CASCADE,
+              seq BIGINT NOT NULL,
+              ts DOUBLE PRECISION NOT NULL,
+              kind TEXT NOT NULL,
+              turn_id TEXT,
+              request_seq BIGINT,
+              is_error INTEGER NOT NULL DEFAULT 0,
+              summary TEXT NOT NULL DEFAULT '',
+              payload_json TEXT NOT NULL DEFAULT '{}',
+              UNIQUE (thread_id, seq)
+            )
+            """
+        )
+        conn.execute(
+            "CREATE INDEX IF NOT EXISTS idx_trajectory_events_thread_seq "
+            "ON trajectory_events(thread_id, seq)"
+        )
+        conn.execute(
+            """
+            DO $$
+            BEGIN
+              IF NOT EXISTS (
+                SELECT 1 FROM pg_constraint
+                WHERE conname = 'trajectory_events_thread_id_fkey'
+              ) THEN
+                ALTER TABLE trajectory_events
+                  ADD CONSTRAINT trajectory_events_thread_id_fkey
+                  FOREIGN KEY (thread_id)
+                  REFERENCES threads(thread_id) ON DELETE CASCADE;
+              END IF;
+            END $$
+            """
+        )
+
+
+def _ensure_connectors_v13_schema(db: DatabasePool) -> None:
+    """Ensure connectors supports multiple named instances and sharing."""
+    if not _table_exists(db, "connectors"):
+        return
+    if db.dialect == "postgresql":
+        with db.connect() as conn, conn.transaction():
+            conn.execute(
+                "ALTER TABLE connectors DROP CONSTRAINT IF EXISTS connectors_user_id_kind_key"
+            )
+            conn.execute(
+                "ALTER TABLE connectors ADD COLUMN IF NOT EXISTS shared INTEGER NOT NULL DEFAULT 0"
+            )
+            conn.execute(
+                """
+                WITH ranked AS (
+                  SELECT id, display_name, instance_id,
+                         ROW_NUMBER() OVER (
+                           PARTITION BY user_id, display_name ORDER BY id
+                         ) AS duplicate_number
+                  FROM connectors
+                  WHERE kind <> 'custom-mcp'
+                )
+                UPDATE connectors AS c
+                SET display_name = ranked.display_name || ' (' ||
+                    right(ranked.instance_id, 6) || ')'
+                FROM ranked
+                WHERE c.id = ranked.id AND ranked.duplicate_number > 1
+                """
+            )
+            conn.execute(
+                "CREATE INDEX IF NOT EXISTS idx_connectors_shared "
+                "ON connectors(shared) WHERE shared = 1"
+            )
+            conn.execute(
+                "CREATE UNIQUE INDEX IF NOT EXISTS idx_connectors_user_display_name "
+                "ON connectors(user_id, display_name) WHERE kind <> 'custom-mcp'"
+            )
+        return
+
+    if "shared" in _table_columns(db, "connectors"):
+        with db.connect() as conn:
+            conn.execute(
+                "CREATE INDEX IF NOT EXISTS idx_connectors_shared "
+                "ON connectors(shared) WHERE shared = 1"
+            )
+            conn.execute(
+                "CREATE UNIQUE INDEX IF NOT EXISTS idx_connectors_user_display_name "
+                "ON connectors(user_id, display_name) WHERE kind <> 'custom-mcp'"
+            )
+        return
+
+    with db.connect() as conn:
+        conn.execute("PRAGMA foreign_keys = OFF")
+        try:
+            conn.execute("BEGIN")
+            conn.execute("ALTER TABLE connectors RENAME TO connectors_legacy")
+            conn.execute(
+                """
+                CREATE TABLE connectors (
+                  id                    INTEGER PRIMARY KEY AUTOINCREMENT,
+                  instance_id           TEXT NOT NULL UNIQUE,
+                  user_id               INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+                  kind                  TEXT NOT NULL,
+                  display_name          TEXT NOT NULL,
+                  status                TEXT NOT NULL DEFAULT 'active',
+                  shared                INTEGER NOT NULL DEFAULT 0,
+                  mcp_server_name       TEXT NOT NULL UNIQUE,
+                  credential_blob       BLOB,
+                  credential_expires_at INTEGER,
+                  credential_rotated_at INTEGER,
+                  config_json           TEXT,
+                  created_at            INTEGER NOT NULL,
+                  updated_at            INTEGER NOT NULL
+                )
+                """
+            )
+            conn.execute(
+                """
+                INSERT INTO connectors(
+                  id, instance_id, user_id, kind, display_name, status, shared,
+                  mcp_server_name, credential_blob, credential_expires_at,
+                  credential_rotated_at, config_json, created_at, updated_at
+                )
+                SELECT
+                  id, instance_id, user_id, kind,
+                  CASE
+                    WHEN kind = 'custom-mcp' THEN display_name
+                    WHEN ROW_NUMBER() OVER (
+                      PARTITION BY user_id, display_name ORDER BY id
+                    ) = 1 THEN display_name
+                    ELSE display_name || ' (' || substr(instance_id, -6) || ')'
+                  END,
+                  status, 0, mcp_server_name, credential_blob, credential_expires_at,
+                  credential_rotated_at, config_json, created_at, updated_at
+                FROM connectors_legacy
+                """
+            )
+            conn.execute("DROP TABLE connectors_legacy")
+            conn.execute("CREATE INDEX idx_connectors_user ON connectors(user_id)")
+            conn.execute(
+                "CREATE INDEX idx_connectors_shared ON connectors(shared) WHERE shared = 1"
+            )
+            conn.execute(
+                "CREATE UNIQUE INDEX idx_connectors_user_display_name "
+                "ON connectors(user_id, display_name) WHERE kind <> 'custom-mcp'"
+            )
+            conn.execute("COMMIT")
+        except Exception:
+            if conn.in_transaction:
+                conn.execute("ROLLBACK")
+            raise
+        finally:
+            conn.execute("PRAGMA foreign_keys = ON")
+
+
+def _sqlite_references_threads(db: DatabasePool, table: str) -> bool:
+    with db.connect() as conn:
+        rows = conn.execute(f"PRAGMA foreign_key_list({table})").fetchall()
+    return any(str(row["table"]) == "threads" for row in rows)
+
+
 def _repair_legacy_schema(db: DatabasePool) -> None:
     """Idempotent compatibility repairs for local databases from old builds."""
     if _table_exists(db, "users"):
@@ -926,19 +1182,7 @@ def _repair_legacy_schema(db: DatabasePool) -> None:
         # Pre-squash DBs may already report version ≥6; reconcile can clamp to 6
         # without applying 006_user_permissions.sql — ensure the column here.
         _ensure_column(db, "users", "permissions", "TEXT NOT NULL DEFAULT '[]'")
-    if _table_exists(db, "cron_jobs"):
-        _ensure_column(
-            db,
-            "cron_jobs",
-            "task_type",
-            "TEXT NOT NULL DEFAULT 'agent' CHECK (task_type IN ('text', 'agent'))",
-        )
-        _ensure_column(
-            db,
-            "cron_jobs",
-            "mcp_servers",
-            "TEXT NOT NULL DEFAULT '[]'",
-        )
+    _ensure_cron_jobs_schema(db)
     if _table_exists(db, "threads"):
         _ensure_column(db, "threads", "model_ref", "TEXT")
         _ensure_column(db, "threads", "reasoning_mode", "TEXT")
@@ -996,6 +1240,12 @@ def _reconcile_pre_squash_schema_version(db: DatabasePool) -> None:
                 _ensure_user_invites_schema(db)
             if max_version >= 10:
                 _ensure_thread_message_projection_schema(db)
+            if max_version >= 11:
+                _ensure_cron_jobs_schema(db)
+            if max_version >= 12:
+                _ensure_trajectory_events_schema(db)
+            if max_version >= 13:
+                _ensure_connectors_v13_schema(db)
             with db.connect() as conn:
                 conn.execute("UPDATE _schema_version SET version = %s", (max_version,))
             return
@@ -1025,6 +1275,12 @@ def _reconcile_pre_squash_schema_version(db: DatabasePool) -> None:
         _ensure_user_invites_schema(db)
     if max_version >= 10:
         _ensure_thread_message_projection_schema(db)
+    if max_version >= 11:
+        _ensure_cron_jobs_schema(db)
+    if max_version >= 12:
+        _ensure_trajectory_events_schema(db)
+    if max_version >= 13:
+        _ensure_connectors_v13_schema(db)
     with db.connect() as conn:
         conn.execute("UPDATE _schema_version SET version = ?", (max_version,))
 
@@ -1052,10 +1308,13 @@ def _apply_sqlite_migration(db: DatabasePool, version: int, path: Path) -> None:
     (idempotent); PostgreSQL runs the ``.pg.sql`` file then the same helpers
     as a no-op safety net. ``config_json`` profile keys are backfilled in
     Python either way.
-        Version 8 adds cache-aware usage buckets and model call counts.
-        Version 9 adds one-time ``user_invites`` codes.
-        Version 10 adds the dashboard thread-message projection when the legacy
-        database actually contains conversation tables.
+    Version 8 adds cache-aware usage buckets and model call counts.
+    Version 9 adds one-time ``user_invites`` codes.
+    Version 10 adds the dashboard thread-message projection when the legacy
+    database actually contains conversation tables.
+    Version 11 adds cron job display names.
+    Version 12 adds the append-only chat trajectory event ledger.
+    Version 13 adds multi-instance and shared connectors.
     """
     if version == 2:
         if _table_exists(db, "cron_jobs"):
@@ -1134,6 +1393,22 @@ def _apply_sqlite_migration(db: DatabasePool, version: int, path: Path) -> None:
         with db.connect() as conn:
             conn.execute("UPDATE _schema_version SET version = ?", (version,))
         return
+    if version == 11:
+        _ensure_cron_jobs_schema(db)
+        with db.connect() as conn:
+            conn.execute("UPDATE _schema_version SET version = ?", (version,))
+        return
+    if version == 12:
+        _ensure_trajectory_events_schema(db)
+        with db.connect() as conn:
+            conn.execute("UPDATE _schema_version SET version = ?", (version,))
+        return
+    if version == 13 and not _table_exists(db, "connectors"):
+        # Very old/partial installs may contain only ``users``. There are no
+        # connector rows to rebuild, so only advance the migration watermark.
+        with db.connect() as conn:
+            conn.execute("UPDATE _schema_version SET version = ?", (version,))
+        return
     sql = path.read_text(encoding="utf-8")
     with db.connect() as conn:
         conn.executescript(sql)
@@ -1168,3 +1443,6 @@ def run_migrations(db: DatabasePool) -> None:
     _ensure_usage_cache_schema(db)
     _ensure_user_invites_schema(db)
     _ensure_thread_message_projection_schema(db)
+    _ensure_cron_jobs_schema(db)
+    _ensure_trajectory_events_schema(db)
+    _ensure_connectors_v13_schema(db)
diff --git a/src/octop/infra/db/migrations/011_cron_job_names.pg.sql b/src/octop/infra/db/migrations/011_cron_job_names.pg.sql
new file mode 100644
index 00000000..cddbb60f
--- /dev/null
+++ b/src/octop/infra/db/migrations/011_cron_job_names.pg.sql
@@ -0,0 +1,5 @@
+-- Schema v11: cron job display names.
+
+ALTER TABLE cron_jobs ADD COLUMN IF NOT EXISTS name TEXT NOT NULL DEFAULT '';
+
+UPDATE _schema_version SET version = 11;
diff --git a/src/octop/infra/db/migrations/011_cron_job_names.sql b/src/octop/infra/db/migrations/011_cron_job_names.sql
new file mode 100644
index 00000000..cd1cbbe4
--- /dev/null
+++ b/src/octop/infra/db/migrations/011_cron_job_names.sql
@@ -0,0 +1,7 @@
+-- Schema v11: cron job display names.
+-- SQLite applies this via migrate.py::_ensure_cron_jobs_schema so the upgrade
+-- remains idempotent for databases repaired ahead of the version watermark.
+
+ALTER TABLE cron_jobs ADD COLUMN name TEXT NOT NULL DEFAULT '';
+
+UPDATE _schema_version SET version = 11;
diff --git a/src/octop/infra/db/migrations/012_trajectory_events.pg.sql b/src/octop/infra/db/migrations/012_trajectory_events.pg.sql
new file mode 100644
index 00000000..c2dc1a3b
--- /dev/null
+++ b/src/octop/infra/db/migrations/012_trajectory_events.pg.sql
@@ -0,0 +1,22 @@
+-- Schema v12: append-only chat trajectory event log.
+
+CREATE TABLE IF NOT EXISTS trajectory_events (
+  id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+  event_id TEXT NOT NULL UNIQUE,
+  agent_id TEXT NOT NULL,
+  thread_id TEXT NOT NULL REFERENCES threads(thread_id) ON DELETE CASCADE,
+  seq BIGINT NOT NULL,
+  ts DOUBLE PRECISION NOT NULL,
+  kind TEXT NOT NULL,
+  turn_id TEXT,
+  request_seq BIGINT,
+  is_error INTEGER NOT NULL DEFAULT 0,
+  summary TEXT NOT NULL DEFAULT '',
+  payload_json TEXT NOT NULL DEFAULT '{}',
+  UNIQUE (thread_id, seq)
+);
+
+CREATE INDEX IF NOT EXISTS idx_trajectory_events_thread_seq
+  ON trajectory_events (thread_id, seq);
+
+UPDATE _schema_version SET version = 12;
diff --git a/src/octop/infra/db/migrations/012_trajectory_events.sql b/src/octop/infra/db/migrations/012_trajectory_events.sql
new file mode 100644
index 00000000..4ae7f69e
--- /dev/null
+++ b/src/octop/infra/db/migrations/012_trajectory_events.sql
@@ -0,0 +1,22 @@
+-- Schema v12: append-only chat trajectory event log.
+
+CREATE TABLE IF NOT EXISTS trajectory_events (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  event_id TEXT NOT NULL UNIQUE,
+  agent_id TEXT NOT NULL,
+  thread_id TEXT NOT NULL REFERENCES threads(thread_id) ON DELETE CASCADE,
+  seq INTEGER NOT NULL,
+  ts REAL NOT NULL,
+  kind TEXT NOT NULL,
+  turn_id TEXT,
+  request_seq INTEGER,
+  is_error INTEGER NOT NULL DEFAULT 0,
+  summary TEXT NOT NULL DEFAULT '',
+  payload_json TEXT NOT NULL DEFAULT '{}',
+  UNIQUE (thread_id, seq)
+);
+
+CREATE INDEX IF NOT EXISTS idx_trajectory_events_thread_seq
+  ON trajectory_events (thread_id, seq);
+
+UPDATE _schema_version SET version = 12;
diff --git a/src/octop/infra/db/migrations/013_connector_instances.pg.sql b/src/octop/infra/db/migrations/013_connector_instances.pg.sql
new file mode 100644
index 00000000..9167d8a8
--- /dev/null
+++ b/src/octop/infra/db/migrations/013_connector_instances.pg.sql
@@ -0,0 +1,23 @@
+-- Schema v13: multi-instance and shared connectors.
+
+ALTER TABLE connectors DROP CONSTRAINT connectors_user_id_kind_key;
+ALTER TABLE connectors ADD COLUMN shared INTEGER NOT NULL DEFAULT 0;
+
+WITH ranked AS (
+  SELECT id, display_name, instance_id,
+         ROW_NUMBER() OVER (
+           PARTITION BY user_id, display_name ORDER BY id
+         ) AS duplicate_number
+  FROM connectors
+  WHERE kind <> 'custom-mcp'
+)
+UPDATE connectors AS c
+SET display_name = ranked.display_name || ' (' || right(ranked.instance_id, 6) || ')'
+FROM ranked
+WHERE c.id = ranked.id AND ranked.duplicate_number > 1;
+
+CREATE INDEX idx_connectors_shared ON connectors(shared) WHERE shared = 1;
+CREATE UNIQUE INDEX idx_connectors_user_display_name
+  ON connectors(user_id, display_name) WHERE kind <> 'custom-mcp';
+
+UPDATE _schema_version SET version = 13;
diff --git a/src/octop/infra/db/migrations/013_connector_instances.sql b/src/octop/infra/db/migrations/013_connector_instances.sql
new file mode 100644
index 00000000..82ecb45a
--- /dev/null
+++ b/src/octop/infra/db/migrations/013_connector_instances.sql
@@ -0,0 +1,52 @@
+-- Schema v13: multi-instance and shared connectors.
+
+PRAGMA foreign_keys = OFF;
+
+ALTER TABLE connectors RENAME TO connectors_legacy;
+
+CREATE TABLE connectors (
+  id                    INTEGER PRIMARY KEY AUTOINCREMENT,
+  instance_id           TEXT NOT NULL UNIQUE,
+  user_id               INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+  kind                  TEXT NOT NULL,
+  display_name          TEXT NOT NULL,
+  status                TEXT NOT NULL DEFAULT 'active',
+  shared                INTEGER NOT NULL DEFAULT 0,
+  mcp_server_name       TEXT NOT NULL UNIQUE,
+  credential_blob       BLOB,
+  credential_expires_at INTEGER,
+  credential_rotated_at INTEGER,
+  config_json           TEXT,
+  created_at            INTEGER NOT NULL,
+  updated_at            INTEGER NOT NULL
+);
+
+INSERT INTO connectors(
+  id, instance_id, user_id, kind, display_name, status, shared,
+  mcp_server_name, credential_blob, credential_expires_at,
+  credential_rotated_at, config_json, created_at, updated_at
+)
+SELECT
+  id, instance_id, user_id, kind,
+  CASE
+    WHEN kind = 'custom-mcp' THEN display_name
+    WHEN ROW_NUMBER() OVER (
+      PARTITION BY user_id, display_name ORDER BY id
+    ) = 1 THEN display_name
+    ELSE display_name || ' (' || substr(instance_id, -6) || ')'
+  END,
+  status, 0,
+  mcp_server_name, credential_blob, credential_expires_at,
+  credential_rotated_at, config_json, created_at, updated_at
+FROM connectors_legacy;
+
+DROP TABLE connectors_legacy;
+
+CREATE INDEX idx_connectors_user ON connectors(user_id);
+CREATE INDEX idx_connectors_shared ON connectors(shared) WHERE shared = 1;
+CREATE UNIQUE INDEX idx_connectors_user_display_name
+  ON connectors(user_id, display_name) WHERE kind <> 'custom-mcp';
+
+PRAGMA foreign_keys = ON;
+
+UPDATE _schema_version SET version = 13;
diff --git a/src/octop/infra/db/repos/connectors.py b/src/octop/infra/db/repos/connectors.py
index a892661a..5091e778 100644
--- a/src/octop/infra/db/repos/connectors.py
+++ b/src/octop/infra/db/repos/connectors.py
@@ -1,4 +1,4 @@
-"""Connector database access — one row per (user, kind)."""
+"""Connector database access."""
 
 from __future__ import annotations
 
@@ -6,7 +6,7 @@
 from dataclasses import dataclass
 
 from octop.infra.db.pool import DatabasePool
-from octop.infra.db.repos._base import DbRow, map_rows, now_ts
+from octop.infra.db.repos._base import DbRow, bool_int, map_rows, now_ts
 
 
 @dataclass(frozen=True)
@@ -17,6 +17,7 @@ class ConnectorRow:
     kind: str
     display_name: str
     status: str
+    shared: bool
     mcp_server_name: str
     credential_blob: bytes | None
     credential_expires_at: int | None
@@ -35,6 +36,7 @@ def from_row(cls, r: DbRow) -> ConnectorRow:
             kind=r["kind"],
             display_name=r["display_name"],
             status=r["status"],
+            shared=bool(r["shared"]),
             mcp_server_name=r["mcp_server_name"],
             credential_blob=bytes(blob) if blob is not None else None,
             credential_expires_at=r["credential_expires_at"],
@@ -87,19 +89,21 @@ def create(
         display_name: str,
         mcp_server_name: str,
         config_json: str | None = None,
+        shared: bool = False,
     ) -> str:
         ts = now_ts()
         with self._db.transaction() as conn:
             conn.execute(
                 "INSERT INTO connectors("
-                "instance_id, user_id, kind, display_name, status, mcp_server_name, "
+                "instance_id, user_id, kind, display_name, status, shared, mcp_server_name, "
                 "config_json, created_at, updated_at"
-                ") VALUES (?, ?, ?, ?, 'active', ?, ?, ?, ?)",
+                ") VALUES (?, ?, ?, ?, 'active', ?, ?, ?, ?, ?)",
                 (
                     instance_id,
                     user_id,
                     kind,
                     display_name,
+                    bool_int(shared),
                     mcp_server_name,
                     config_json,
                     ts,
@@ -131,6 +135,42 @@ def list_by_user(self, user_id: int) -> list[ConnectorRow]:
             ).fetchall()
         return map_rows(rows, ConnectorRow)
 
+    def list_visible(self, user_id: int) -> list[ConnectorRow]:
+        with self._db.connect() as conn:
+            rows = conn.execute(
+                "SELECT * FROM connectors "
+                "WHERE user_id = ? OR shared = 1 "
+                "ORDER BY display_name, instance_id",
+                (user_id,),
+            ).fetchall()
+        return map_rows(rows, ConnectorRow)
+
+    def list_by_kind(self, kind: str) -> list[ConnectorRow]:
+        with self._db.connect() as conn:
+            rows = conn.execute(
+                "SELECT * FROM connectors WHERE kind = ? ORDER BY id",
+                (kind,),
+            ).fetchall()
+        return map_rows(rows, ConnectorRow)
+
+    def name_exists(
+        self,
+        user_id: int,
+        display_name: str,
+        *,
+        exclude_instance_id: str | None = None,
+    ) -> bool:
+        sql = (
+            "SELECT 1 FROM connectors "
+            "WHERE user_id = ? AND display_name = ? AND kind <> 'custom-mcp'"
+        )
+        params: list[object] = [user_id, display_name]
+        if exclude_instance_id is not None:
+            sql += " AND instance_id <> ?"
+            params.append(exclude_instance_id)
+        with self._db.connect() as conn:
+            return conn.execute(sql, tuple(params)).fetchone() is not None
+
     def update_status(self, instance_id: str, status: str) -> None:
         with self._db.transaction() as conn:
             conn.execute(
@@ -145,6 +185,31 @@ def update_config_json(self, instance_id: str, config_json: str | None) -> None:
                 (config_json, now_ts(), instance_id),
             )
 
+    def update_metadata(
+        self,
+        instance_id: str,
+        *,
+        display_name: str | None = None,
+        shared: bool | None = None,
+    ) -> None:
+        updates: list[str] = []
+        params: list[object] = []
+        if display_name is not None:
+            updates.append("display_name = ?")
+            params.append(display_name)
+        if shared is not None:
+            updates.append("shared = ?")
+            params.append(bool_int(shared))
+        if not updates:
+            return
+        updates.append("updated_at = ?")
+        params.extend((now_ts(), instance_id))
+        with self._db.transaction() as conn:
+            conn.execute(
+                f"UPDATE connectors SET {', '.join(updates)} WHERE instance_id = ?",
+                tuple(params),
+            )
+
     def upsert_credentials(
         self,
         *,
diff --git a/src/octop/infra/db/repos/cron.py b/src/octop/infra/db/repos/cron.py
index 3e9aa43d..0af5cb65 100644
--- a/src/octop/infra/db/repos/cron.py
+++ b/src/octop/infra/db/repos/cron.py
@@ -9,6 +9,7 @@
 from octop.infra.cron.task_type import (
     DEFAULT_CRON_TASK_TYPE,
     CronTaskType,
+    default_cron_name,
     normalize_cron_task_type,
     require_cron_task_type,
 )
@@ -51,10 +52,20 @@ def _decode_mcp_servers(raw: Any) -> list[str]:
     return [str(n).strip() for n in parsed if str(n).strip()]
 
 
+def _optional_str(r: DbRow, key: str) -> str | None:
+    try:
+        value = r[key]
+    except (KeyError, IndexError):
+        return None
+    text = str(value).strip() if value else ""
+    return text or None
+
+
 @dataclass(frozen=True)
 class CronJobRow:
     id: int
     cron_id: str
+    name: str
     agent_id: str
     user_id: int
     trigger: str
@@ -76,6 +87,7 @@ def from_row(cls, r: DbRow) -> CronJobRow:
         return cls(
             id=r["id"],
             cron_id=r["cron_id"],
+            name=_optional_str(r, "name") or default_cron_name(r["prompt"], r["cron_id"]),
             agent_id=r["agent_id"],
             user_id=r["user_id"],
             trigger=r["schedule_spec"],
@@ -96,6 +108,7 @@ def from_row(cls, r: DbRow) -> CronJobRow:
     def to_public_dict(self, *, include_agent: bool = False) -> dict[str, Any]:
         out: dict[str, Any] = {
             "id": self.cron_id,
+            "name": self.name,
             "trigger": self.trigger,
             "prompt": self.prompt,
             "session_key": self.session_key,
@@ -130,16 +143,19 @@ def create(
         model: str | None = None,
         task_type: CronTaskType = DEFAULT_CRON_TASK_TYPE,
         mcp_servers: list[str] | None = None,
+        enabled: bool = True,
+        name: str | None = None,
     ) -> str:
         ts = now_ts()
         with self._db.transaction() as conn:
             conn.execute(
-                "INSERT INTO cron_jobs(cron_id, agent_id, user_id, schedule_spec, prompt, "
+                "INSERT INTO cron_jobs(cron_id, name, agent_id, user_id, schedule_spec, prompt, "
                 "session_key, model, fresh_thread, task_type, mcp_servers, enabled, "
                 "created_at, updated_at) "
-                "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?)",
+                "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
                 (
                     cron_id,
+                    (name or "").strip() or default_cron_name(prompt, cron_id),
                     agent_id,
                     user_id,
                     trigger,
@@ -149,6 +165,7 @@ def create(
                     bool_int(fresh_thread),
                     task_type,
                     _encode_mcp_servers(mcp_servers),
+                    bool_int(enabled),
                     ts,
                     ts,
                 ),
@@ -160,13 +177,23 @@ def get(self, cron_id: str) -> CronJobRow | None:
             r = conn.execute("SELECT * FROM cron_jobs WHERE cron_id = ?", (cron_id,)).fetchone()
         return CronJobRow.from_row(r) if r else None
 
-    def list_by_agent(self, agent_id: str, *, include_disabled: bool = True) -> list[CronJobRow]:
+    def list_by_agent(
+        self,
+        agent_id: str,
+        *,
+        include_disabled: bool = True,
+        user_id: int | None = None,
+    ) -> list[CronJobRow]:
         sql = "SELECT * FROM cron_jobs WHERE agent_id = ?"
+        params: list[object] = [agent_id]
+        if user_id is not None:
+            sql += " AND user_id = ?"
+            params.append(user_id)
         if not include_disabled:
             sql += " AND enabled = 1"
         sql += " ORDER BY created_at DESC"
         with self._db.connect() as conn:
-            rows = conn.execute(sql, (agent_id,)).fetchall()
+            rows = conn.execute(sql, params).fetchall()
         return map_rows(rows, CronJobRow)
 
     def list_all(self, *, include_disabled: bool = True) -> list[CronJobRow]:
@@ -198,6 +225,7 @@ def update(
         cron_id: str,
         *,
         trigger: str | None = None,
+        name: str | None = None,
         prompt: str | None = None,
         session_key: str | None = None,
         fresh_thread: bool | None = None,
@@ -209,6 +237,7 @@ def update(
         fields, params = partial_updates(
             [
                 ("schedule_spec", trigger),
+                ("name", name),
                 ("prompt", prompt),
                 ("session_key", session_key),
                 ("task_type", task_type),
diff --git a/src/octop/infra/db/repos/proactive_care_config.py b/src/octop/infra/db/repos/proactive_care_config.py
index 3214d1ca..c54a6945 100644
--- a/src/octop/infra/db/repos/proactive_care_config.py
+++ b/src/octop/infra/db/repos/proactive_care_config.py
@@ -92,25 +92,36 @@ def upsert(self, config: ProactiveCareConfig) -> None:
             )
 
     def list_enabled(self) -> list[ProactiveCareConfig]:
-        """List the configurations of all agents that have proactive care push enabled.
+        """List proactive-care configs for every enabled agent that should be scheduled.
+
+        Agents without a ``proactive_care_config`` row use the same defaults as
+        ``get()`` (enabled=True). An explicit ``enabled=0`` row opts out.
+        Disabled agents (``agents.enabled = 0``) are excluded.
 
         Returns:
             The list of enabled ProactiveCareConfig.
         """
         with self._db.connect() as conn:
             rows = conn.execute(
-                "SELECT agent_id, enabled, active_hours_start, active_hours_end, "
-                "min_interval_hours, max_interval_hours "
-                "FROM proactive_care_config WHERE enabled = 1",
+                "SELECT a.agent_id, c.enabled, c.active_hours_start, "
+                "c.active_hours_end, c.min_interval_hours, c.max_interval_hours "
+                "FROM agents a "
+                "LEFT JOIN proactive_care_config c ON c.agent_id = a.agent_id "
+                "WHERE a.enabled = 1 AND (c.agent_id IS NULL OR c.enabled = 1)",
             ).fetchall()
-        return [
-            ProactiveCareConfig(
-                agent_id=row[0],
-                enabled=bool(row[1]),
-                active_hours_start=row[2],
-                active_hours_end=row[3],
-                min_interval_hours=row[4],
-                max_interval_hours=row[5],
-            )
-            for row in rows
-        ]
+        configs: list[ProactiveCareConfig] = []
+        for row in rows:
+            if row[1] is None:
+                configs.append(ProactiveCareConfig(agent_id=row[0]))
+            else:
+                configs.append(
+                    ProactiveCareConfig(
+                        agent_id=row[0],
+                        enabled=bool(row[1]),
+                        active_hours_start=row[2],
+                        active_hours_end=row[3],
+                        min_interval_hours=row[4],
+                        max_interval_hours=row[5],
+                    )
+                )
+        return configs
diff --git a/src/octop/infra/db/repos/trajectory_events.py b/src/octop/infra/db/repos/trajectory_events.py
new file mode 100644
index 00000000..91835fb6
--- /dev/null
+++ b/src/octop/infra/db/repos/trajectory_events.py
@@ -0,0 +1,194 @@
+"""Append-only chat trajectory event log."""
+
+from __future__ import annotations
+
+import json
+from collections.abc import Iterator
+from typing import Any, cast
+
+from octop.infra.db.pool import DatabasePool
+from octop.infra.db.repos._base import DbRow, bool_int, sql_in_placeholders
+from octop.infra.trajectory.types import TrajectoryEvent, TrajectoryKind
+
+_SELECT_COLS = (
+    "event_id, agent_id, thread_id, seq, ts, kind, turn_id, "
+    "request_seq, is_error, summary, payload_json"
+)
+
+
+def _event_from_row(row: DbRow) -> TrajectoryEvent:
+    raw = row["payload_json"]
+    loaded: Any = json.loads(str(raw)) if raw else {}
+    payload: dict[str, Any] = loaded if isinstance(loaded, dict) else {}
+    turn_id = row["turn_id"]
+    request_seq = row["request_seq"]
+    return TrajectoryEvent(
+        event_id=str(row["event_id"]),
+        thread_id=str(row["thread_id"]),
+        agent_id=str(row["agent_id"]),
+        seq=int(row["seq"]),
+        ts=float(row["ts"]),
+        kind=cast(TrajectoryKind, str(row["kind"])),
+        turn_id=str(turn_id) if turn_id else None,
+        request_seq=int(request_seq) if request_seq is not None else None,
+        is_error=bool(row["is_error"]),
+        summary=str(row["summary"] or ""),
+        payload=payload,
+    )
+
+
+class TrajectoryEventRepo:
+    def __init__(self, db: DatabasePool) -> None:
+        self._db = db
+
+    def append(self, event: TrajectoryEvent) -> bool:
+        payload_json = json.dumps(event.payload, ensure_ascii=False)
+        with self._db.transaction() as conn:
+            cursor = conn.execute(
+                "INSERT INTO trajectory_events("
+                "event_id, agent_id, thread_id, seq, ts, kind, turn_id, "
+                "request_seq, is_error, summary, payload_json"
+                ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) "
+                "ON CONFLICT DO NOTHING",
+                (
+                    event.event_id,
+                    event.agent_id,
+                    event.thread_id,
+                    event.seq,
+                    event.ts,
+                    event.kind,
+                    event.turn_id,
+                    event.request_seq,
+                    bool_int(event.is_error),
+                    event.summary,
+                    payload_json,
+                ),
+            )
+        return int(cursor.rowcount or 0) > 0
+
+    def upsert(self, event: TrajectoryEvent) -> bool:
+        payload_json = json.dumps(event.payload, ensure_ascii=False)
+        with self._db.transaction() as conn:
+            cursor = conn.execute(
+                "INSERT INTO trajectory_events("
+                "event_id, agent_id, thread_id, seq, ts, kind, turn_id, "
+                "request_seq, is_error, summary, payload_json"
+                ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) "
+                "ON CONFLICT(event_id) DO UPDATE SET "
+                "ts = excluded.ts, "
+                "kind = excluded.kind, "
+                "turn_id = excluded.turn_id, "
+                "request_seq = excluded.request_seq, "
+                "is_error = excluded.is_error, "
+                "summary = excluded.summary, "
+                "payload_json = excluded.payload_json",
+                (
+                    event.event_id,
+                    event.agent_id,
+                    event.thread_id,
+                    event.seq,
+                    event.ts,
+                    event.kind,
+                    event.turn_id,
+                    event.request_seq,
+                    bool_int(event.is_error),
+                    event.summary,
+                    payload_json,
+                ),
+            )
+        return int(cursor.rowcount or 0) > 0
+
+    def list_before(
+        self,
+        thread_id: str,
+        *,
+        before_seq: int | None,
+        limit: int,
+        kinds: list[str] | None,
+    ) -> list[TrajectoryEvent]:
+        if limit <= 0:
+            return []
+        if kinds is not None and not kinds:
+            return []
+        conditions = ["thread_id = ?"]
+        params: list[object] = [thread_id]
+        if before_seq is not None:
+            conditions.append("seq < ?")
+            params.append(before_seq)
+        if kinds is not None:
+            conditions.append(f"kind IN ({sql_in_placeholders(len(kinds))})")
+            params.extend(kinds)
+        params.append(limit)
+        sql = (
+            f"SELECT {_SELECT_COLS} FROM trajectory_events WHERE "
+            + " AND ".join(conditions)
+            + " ORDER BY seq DESC LIMIT ?"
+        )
+        with self._db.connect() as conn:
+            rows = conn.execute(sql, params).fetchall()
+        events = [_event_from_row(row) for row in rows]
+        events.reverse()
+        return events
+
+    def list_from_seq(
+        self,
+        thread_id: str,
+        *,
+        from_seq: int,
+        limit: int,
+    ) -> list[TrajectoryEvent]:
+        if limit <= 0:
+            return []
+        with self._db.connect() as conn:
+            rows = conn.execute(
+                f"SELECT {_SELECT_COLS} FROM trajectory_events "
+                "WHERE thread_id = ? AND seq >= ? ORDER BY seq ASC LIMIT ?",
+                (thread_id, from_seq, limit),
+            ).fetchall()
+        return [_event_from_row(row) for row in rows]
+
+    def prune_older_than_user_turns(self, thread_id: str, keep_user_turns: int) -> int:
+        """Drop events before the Nth-newest USER seq (keeps that user and later)."""
+        if keep_user_turns <= 0:
+            return 0
+        with self._db.transaction() as conn:
+            row = conn.execute(
+                "SELECT seq FROM trajectory_events "
+                "WHERE thread_id = ? AND kind = 'user' "
+                "ORDER BY seq DESC LIMIT 1 OFFSET ?",
+                (thread_id, keep_user_turns - 1),
+            ).fetchone()
+            if row is None:
+                return 0
+            cutoff = int(row["seq"])
+            cursor = conn.execute(
+                "DELETE FROM trajectory_events WHERE thread_id = ? AND seq < ?",
+                (thread_id, cutoff),
+            )
+        return int(cursor.rowcount or 0)
+
+    def get(self, event_id: str) -> TrajectoryEvent | None:
+        with self._db.connect() as conn:
+            row = conn.execute(
+                f"SELECT {_SELECT_COLS} FROM trajectory_events WHERE event_id = ?",
+                (event_id,),
+            ).fetchone()
+        return _event_from_row(row) if row is not None else None
+
+    def delete_for_thread(self, thread_id: str) -> int:
+        with self._db.transaction() as conn:
+            cursor = conn.execute(
+                "DELETE FROM trajectory_events WHERE thread_id = ?",
+                (thread_id,),
+            )
+        return int(cursor.rowcount or 0)
+
+    def iter_for_export(self, thread_id: str) -> Iterator[TrajectoryEvent]:
+        with self._db.connect() as conn:
+            rows = conn.execute(
+                f"SELECT {_SELECT_COLS} FROM trajectory_events "
+                "WHERE thread_id = ? ORDER BY seq ASC",
+                (thread_id,),
+            ).fetchall()
+        for row in rows:
+            yield _event_from_row(row)
diff --git a/src/octop/infra/db/services.py b/src/octop/infra/db/services.py
index 11c587e8..4b7da90e 100644
--- a/src/octop/infra/db/services.py
+++ b/src/octop/infra/db/services.py
@@ -25,6 +25,7 @@
 from octop.infra.db.repos.sso import SsoRepo
 from octop.infra.db.repos.thread_messages import ThreadMessageRepo
 from octop.infra.db.repos.threads import ThreadRepo
+from octop.infra.db.repos.trajectory_events import TrajectoryEventRepo
 from octop.infra.db.repos.usage import UsageRepo
 from octop.infra.db.repos.users import UserRepo
 from octop.infra.db.repos.voice_providers import VoiceProviderRepo
@@ -44,6 +45,7 @@ class RepoBundle:
     session_repo: SessionRepo
     thread_repo: ThreadRepo
     thread_message_repo: ThreadMessageRepo
+    trajectory_event_repo: TrajectoryEventRepo
     secret_repo: SecretRepo
     audit_repo: AuditRepo
     usage_repo: UsageRepo
@@ -71,6 +73,7 @@ def from_pool(cls, db: DatabasePool) -> RepoBundle:
             session_repo=SessionRepo(db),
             thread_repo=ThreadRepo(db),
             thread_message_repo=ThreadMessageRepo(db),
+            trajectory_event_repo=TrajectoryEventRepo(db),
             secret_repo=SecretRepo(db),
             audit_repo=AuditRepo(db),
             usage_repo=UsageRepo(db),
@@ -133,6 +136,10 @@ def thread_repo(self) -> ThreadRepo:
     def thread_message_repo(self) -> ThreadMessageRepo:
         return self.repos.thread_message_repo
 
+    @property
+    def trajectory_event_repo(self) -> TrajectoryEventRepo:
+        return self.repos.trajectory_event_repo
+
     @property
     def secret_repo(self) -> SecretRepo:
         return self.repos.secret_repo
diff --git a/src/octop/infra/errors.py b/src/octop/infra/errors.py
index 95e3d05f..94b16e58 100644
--- a/src/octop/infra/errors.py
+++ b/src/octop/infra/errors.py
@@ -16,6 +16,7 @@ class ErrorCode(StrEnum):
     SETUP_REQUIRED = "SETUP_REQUIRED"
     DATABASE_NOT_EMPTY = "DATABASE_NOT_EMPTY"
     BACKUP_DRIVER_MISMATCH = "BACKUP_DRIVER_MISMATCH"
+    BACKUP_SCHEMA_INCOMPATIBLE = "BACKUP_SCHEMA_INCOMPATIBLE"
     BACKUP_IN_PROGRESS = "BACKUP_IN_PROGRESS"
     FORBIDDEN = "FORBIDDEN"
     NOT_FOUND = "NOT_FOUND"
@@ -42,10 +43,12 @@ class ErrorCode(StrEnum):
     PROVIDER_LOCAL_PROTECTED = "PROVIDER_LOCAL_PROTECTED"
     STORAGE_BACKEND_NAME_TAKEN = "STORAGE_BACKEND_NAME_TAKEN"
     STORAGE_BACKEND_REFERENCED = "STORAGE_BACKEND_REFERENCED"
+    STORAGE_BACKEND_DEPS_FAILED = "STORAGE_BACKEND_DEPS_FAILED"
     CHANNEL_KIND_UNSUPPORTED = "CHANNEL_KIND_UNSUPPORTED"
     CHANNEL_INVALID_CREDENTIALS = "CHANNEL_INVALID_CREDENTIALS"
     CHANNEL_NAME_TAKEN = "CHANNEL_NAME_TAKEN"
     CONNECTOR_NOT_FOUND = "CONNECTOR_NOT_FOUND"
+    CONNECTOR_NAME_TAKEN = "CONNECTOR_NAME_TAKEN"
     CONNECTOR_INVALID_CREDENTIALS = "CONNECTOR_INVALID_CREDENTIALS"
     CONNECTOR_OAUTH_HTTPS_REQUIRED = "CONNECTOR_OAUTH_HTTPS_REQUIRED"
     CONNECTOR_KIND_UNSUPPORTED = "CONNECTOR_KIND_UNSUPPORTED"
@@ -107,6 +110,7 @@ class ErrorCode(StrEnum):
     ErrorCode.SETUP_REQUIRED: 409,
     ErrorCode.DATABASE_NOT_EMPTY: 409,
     ErrorCode.BACKUP_DRIVER_MISMATCH: 400,
+    ErrorCode.BACKUP_SCHEMA_INCOMPATIBLE: 400,
     ErrorCode.BACKUP_IN_PROGRESS: 409,
     ErrorCode.FORBIDDEN: 403,
     ErrorCode.NOT_FOUND: 404,
@@ -133,10 +137,12 @@ class ErrorCode(StrEnum):
     ErrorCode.PROVIDER_LOCAL_PROTECTED: 409,
     ErrorCode.STORAGE_BACKEND_NAME_TAKEN: 409,
     ErrorCode.STORAGE_BACKEND_REFERENCED: 409,
+    ErrorCode.STORAGE_BACKEND_DEPS_FAILED: 503,
     ErrorCode.CHANNEL_KIND_UNSUPPORTED: 400,
     ErrorCode.CHANNEL_INVALID_CREDENTIALS: 400,
     ErrorCode.CHANNEL_NAME_TAKEN: 409,
     ErrorCode.CONNECTOR_NOT_FOUND: 404,
+    ErrorCode.CONNECTOR_NAME_TAKEN: 409,
     ErrorCode.CONNECTOR_INVALID_CREDENTIALS: 400,
     ErrorCode.CONNECTOR_OAUTH_HTTPS_REQUIRED: 400,
     ErrorCode.CONNECTOR_KIND_UNSUPPORTED: 400,
diff --git a/src/octop/infra/gateway/bot_creators/feishu_bot_creator.py b/src/octop/infra/gateway/bot_creators/feishu_bot_creator.py
index 35198812..d87247a7 100644
--- a/src/octop/infra/gateway/bot_creators/feishu_bot_creator.py
+++ b/src/octop/infra/gateway/bot_creators/feishu_bot_creator.py
@@ -7,173 +7,79 @@
 # Violators will be held liable under applicable laws.
 #
 # Author: Tencent Lighthouse Team
-"""Feishu / Lark Open Platform — auto-create enterprise bot.
+"""Feishu / Lark Open Platform — scan-to-create app via lark-oapi.
 
-Usage:
-    python -m octop.infra.channels.bot_creators.feishu_bot_creator init
-    python -m octop.infra.channels.bot_creators.feishu_bot_creator create [--platform feishu|lark]
-    python -m octop.infra.channels.bot_creators.feishu_bot_creator cleanup
-
-Migration note (2026-05-22)
----------------------------
-This script previously drove Chrome via ``playwright.sync_api``. It has been
-rewritten on top of ``harness-browser`` (pure CDP) so finnie no longer needs
-Playwright as a runtime dependency for bot creation.
+Uses ``lark_oapi.register_app`` (OAuth 2.0 Device Authorization Grant,
+RFC 8628). Requires ``lark-oapi>=1.5.5``.
 
-Key changes vs. the Playwright version:
-
-* ``BrowserSession.create(profile="octop-feishu-bot")`` replaces
-  ``pw.chromium.connect_over_cdp(...)``. The harness session reuses an
-  existing Chrome on the same profile or launches one as needed.
-* ``page.evaluate`` → ``sess.eval_js``
-* ``page.goto/reload`` → ``sess.navigate / sess.reload``
-* ``page.on("request"/"response")`` → CDP ``Network.*`` event listeners
-* ``page.context.cookies()`` → CDP ``Network.getAllCookies``
-* ``page.request.post/get`` → ``httpx.AsyncClient`` with cookies harvested
-  from CDP — this preserves Feishu's CSRF / cookie-bound API contract while
-  removing the Playwright dependency.
-* The whole top-level dependency bootstrap (``_ensure_pip``,
-  ``_install_system_deps``, ``ensure_playwright_browsers``) is gone — the
-  package's normal install flow already handles ``harness-browser``;
-  Chromium is provided by ``octop install-browsers`` (Playwright's
-  installer is the only thing left from the old stack).
+Usage:
+    python -m octop.infra.gateway.bot_creators.feishu_bot_creator init
+    python -m octop.infra.gateway.bot_creators.feishu_bot_creator create [--platform feishu|lark]
+    python -m octop.infra.gateway.bot_creators.feishu_bot_creator cleanup
 """
 
 from __future__ import annotations
 
-import asyncio
 import contextlib
+import importlib.metadata
 import json
 import os
-import random
 import ssl
 import sys
 import time
-import urllib.error
 import urllib.request
 import uuid
-from typing import Any, cast
+from typing import Any
 
-import httpx
-from harness_browser import BrowserSession
+import lark_oapi as lark
+from lark_oapi.scene.registration.errors import (
+    AppAccessDeniedError,
+    AppExpiredError,
+    RegisterAppError,
+)
 
-# ============================================================
-# Force stdout line-buffered / write-through
-# ============================================================
-if hasattr(sys.stdout, "reconfigure"):
-    sys.stdout.reconfigure(write_through=True)
+_reconfigure = getattr(sys.stdout, "reconfigure", None)
+if callable(_reconfigure):
+    _reconfigure(write_through=True)
 
-
-# ============================================================
-# Platform config (feishu / lark)
-# ============================================================
 PLATFORM = "feishu"
 
 _PLATFORM_CONFIGS = {
     "feishu": {
-        "base_url": "https://open.feishu.cn",
-        "login_url": (
-            "https://accounts.feishu.cn/accounts/page/login"
-            "?app_id=7&no_trap=1"
-            "&redirect_uri=https%3A%2F%2Fopen.feishu.cn%2Fapp"
-        ),
-        "accounts_host": "accounts.feishu.cn",
-        "open_host": "open.feishu.cn",
-        "admin_audit_url": "https://feishu.cn/admin/appCenter/audit",
-        "primary_lang": "zh_cn",
+        "open_base": "https://open.feishu.cn",
+        "accounts_domain": "https://accounts.feishu.cn",
+        "lark_domain": "https://accounts.larksuite.com",
         "default_greeting": "Hi，我是你刚刚使用 Octop 创建的飞书机器人，你现在可以跟我聊天了！",
+        "app_desc": "由 Octop 一键创建的飞书机器人",
         "state_file_prefix": "octop-feishu-bot",
-        "profile_name": "octop-feishu-bot",
-        "qr_default": True,
     },
     "lark": {
-        "base_url": "https://open.larksuite.com",
-        "login_url": (
-            "https://accounts.larksuite.com/accounts/page/login"
-            "?app_id=7&no_trap=1"
-            "&redirect_uri=https%3A%2F%2Fopen.larksuite.com%2F%3Flang%3Dzh-CN"
-        ),
-        "accounts_host": "accounts.larksuite.com",
-        "open_host": "open.larksuite.com",
-        "admin_audit_url": "https://larksuite.com/admin/appCenter/audit",
-        "primary_lang": "en_us",
+        "open_base": "https://open.larksuite.com",
+        "accounts_domain": "https://accounts.larksuite.com",
+        "lark_domain": "https://accounts.larksuite.com",
         "default_greeting": "Hi, I'm the bot you just created with Octop. You can chat with me now!",
+        "app_desc": "Lark bot created by Octop",
         "state_file_prefix": "octop-lark-bot",
-        "profile_name": "octop-lark-bot",
-        "qr_default": False,
     },
 }
 
-
-def _pcfg(key: str) -> Any:
-    return _PLATFORM_CONFIGS[PLATFORM][key]
-
-
-# ============================================================
-# Constants
-# ============================================================
-LOGIN_TIMEOUT = 90
-POLL_INTERVAL = 2
-QR_MAX_RETRIES = 3
-
-DEFAULT_AVATAR_URL = "https://cloudcache.tencent-cloud.com/qcloud/ui/static/other_external_resource/4e9ca8c5-0ce4-44a2-8c7c-4f8f43f9e73a.png"
-
-WEBSOCKET_POLL_INTERVAL = 3
-WEBSOCKET_POLL_TIMEOUT = 90
-
 STATE_DIR = "/tmp"
-
-BOT_PERMISSIONS = [
-    "im:message",
-    "im:message.p2p_msg:readonly",
-    "im:message.group_at_msg:readonly",
-    "im:message:send_as_bot",
-    "im:resource",
-    "im:message.group_msg",
-    "im:message:readonly",
-    "im:message:update",
-    "im:message:recall",
-    "im:message.reactions:read",
-    "contact:user.base:readonly",
-    "contact:contact.base:readonly",
-    "docx:document:readonly",
-    "docx:document",
-    "docx:document.block:convert",
-    "wiki:wiki:readonly",
-    "wiki:wiki",
-    "bitable:app:readonly",
-    "bitable:app",
-    "task:task:read",
-    "task:task:write",
-]
-
-BOT_PERMISSIONS_NEED_AUDIT = [
-    "drive:drive:readonly",
-    "drive:drive",
-]
+MIN_LARK_OAPI = (1, 5, 5)
 
 
-def _gen_bot_name() -> str:
-    if PLATFORM == "lark":
-        return f"Octop Bot-{random.randint(1000, 9999)}"
-    return f"Octop机器人-{random.randint(1000, 9999)}"
+def _pcfg(key: str) -> Any:
+    return _PLATFORM_CONFIGS[PLATFORM][key]
 
 
 def _state_file() -> str:
     return os.path.join(STATE_DIR, f"{_pcfg('state_file_prefix')}-creator-state.json")
 
 
-# ============================================================
-# State file
-# ============================================================
 def _save_state(data: dict[str, Any]) -> None:
     with open(_state_file(), "w") as f:
         json.dump(data, f, ensure_ascii=False)
 
 
-# ============================================================
-# Structured JSON output (stdout)
-# ============================================================
 def _emit(action: str, level: str, step: str, message: str, **extra: Any) -> None:
     record = {
         "action": action,
@@ -202,10 +108,6 @@ def _log_error(step: str, message: str, **extra: Any) -> None:
     _emit("log", "error", step, message, **extra)
 
 
-def _emit_progress(step: str, message: str, current: int, total: int) -> None:
-    _emit("progress", "info", step, message, current=current, total=total)
-
-
 def _emit_finish(message: str, data: dict[str, Any]) -> None:
     _emit("finish", "success", "finish", message, data=data)
 
@@ -214,45 +116,43 @@ def _emit_error(step: str, message: str) -> None:
     _emit("finish", "error", step, message)
 
 
-# ============================================================
-# Avatar / greeting helpers (no browser)
-# ============================================================
-def _download_avatar(avatar_url: str = "") -> str:
-    url = avatar_url or DEFAULT_AVATAR_URL
-    avatar_path = os.path.join(STATE_DIR, f"{_pcfg('state_file_prefix')}-avatar.png")
-    if not avatar_url and os.path.isfile(avatar_path) and os.path.getsize(avatar_path) > 0:
-        _log_info("create_app", f"Using cached avatar: {avatar_path}")
-        return avatar_path
+def _parse_version(raw: str) -> tuple[int, ...]:
+    parts: list[int] = []
+    for chunk in raw.split("."):
+        digits = ""
+        for ch in chunk:
+            if ch.isdigit():
+                digits += ch
+            else:
+                break
+        if digits:
+            parts.append(int(digits))
+    return tuple(parts)
 
-    _log_info("create_app", f"Downloading avatar: {url}")
-    ctx = ssl.create_default_context()
-    ctx.check_hostname = False
-    ctx.verify_mode = ssl.CERT_NONE
-    req = urllib.request.Request(url, headers={"User-Agent": "Mozilla/5.0"})
-    try:
-        with urllib.request.urlopen(req, context=ctx) as resp:
-            data = resp.read()
-        with open(avatar_path, "wb") as f:
-            f.write(data)
-        _log_info("create_app", f"Avatar downloaded: {len(data)} bytes")
-        return avatar_path
-    except Exception as e:
-        _log_warn("create_app", f"Avatar download failed: {e}")
-        return ""
 
+def _lark_oapi_version() -> str:
+    return importlib.metadata.version("lark-oapi")
 
-def _send_greeting(app_id: str, app_secret: str, open_id: str, greeting: str = "") -> None:
-    _log_info("greeting", "Sending initial greeting message")
-    greeting = greeting or _pcfg("default_greeting")
-    base_url = _pcfg("base_url")
 
+def _open_base_for_brand(tenant_brand: str | None) -> str:
+    if tenant_brand == "lark":
+        return str(_PLATFORM_CONFIGS["lark"]["open_base"])
+    if tenant_brand == "feishu":
+        return str(_PLATFORM_CONFIGS["feishu"]["open_base"])
+    return str(_pcfg("open_base"))
+
+
+def _send_greeting(
+    app_id: str, app_secret: str, open_id: str, *, open_base: str, greeting: str
+) -> None:
+    _log_info("greeting", "Sending initial greeting message")
     ctx = ssl.create_default_context()
     ctx.check_hostname = False
     ctx.verify_mode = ssl.CERT_NONE
 
     token_payload = json.dumps({"app_id": app_id, "app_secret": app_secret}).encode()
     token_req = urllib.request.Request(
-        f"{base_url}/open-apis/auth/v3/tenant_access_token/internal",
+        f"{open_base}/open-apis/auth/v3/tenant_access_token/internal",
         data=token_payload,
         headers={"Content-Type": "application/json"},
     )
@@ -274,7 +174,7 @@ def _send_greeting(app_id: str, app_secret: str, open_id: str, greeting: str = "
         }
     ).encode()
     send_req = urllib.request.Request(
-        f"{base_url}/open-apis/im/v1/messages?receive_id_type=open_id",
+        f"{open_base}/open-apis/im/v1/messages?receive_id_type=open_id",
         data=send_payload,
         headers={
             "Content-Type": "application/json",
@@ -288,1135 +188,135 @@ def _send_greeting(app_id: str, app_secret: str, open_id: str, greeting: str = "
         pass
 
 
-# ============================================================
-# Browser helpers — thin wrappers around harness-browser
-# ============================================================
-async def _navigate(sess: BrowserSession, url: str) -> bool:
-    """Navigate, returning True on success."""
-    try:
-        result = await sess.navigate(url)
-        return bool(result.success)
-    except Exception as e:
-        _log_warn("login", f"Navigate failed: {e}")
-        return False
-
-
-async def _eval(sess: BrowserSession, expr: str) -> Any:
-    """Evaluate a JS expression and decode the JSON-encoded result string."""
-    try:
-        result = await sess.eval_js(expr)
-        if not result.success:
-            return None
-        # eval_js returns JSON-encoded string (e.g. '"hello"' or '42').
-        raw = result.content if isinstance(result.content, str) else ""
-        try:
-            return json.loads(raw)
-        except (json.JSONDecodeError, ValueError):
-            return raw
-    except Exception:
-        return None
-
-
-async def _current_url(sess: BrowserSession) -> str:
-    val = await _eval(sess, "location.href")
-    return str(val) if val else ""
-
-
-async def _get_cookies(sess: BrowserSession, urls: list[str] | None = None) -> list[dict[str, Any]]:
-    """Fetch all cookies for the given URLs via CDP Network.getAllCookies.
-
-    Falls back to ``Network.getCookies`` if ``urls`` are specified.
-    """
-    client = sess._internal.client
-    try:
-        if urls:
-            result = await client.send("Network.getCookies", {"urls": urls})
-        else:
-            result = await client.send("Network.getAllCookies")
-        cookies = result.get("cookies") or []
-        return list(cookies)
-    except Exception:
-        return []
-
-
-def _cookie_header(cookies: list[dict[str, Any]]) -> str:
-    return "; ".join(f"{c['name']}={c['value']}" for c in cookies if c.get("name"))
-
-
-# ============================================================
-# Network capture — extract CSRF token from outgoing requests
-# ============================================================
-class _NetworkCapture:
-    """Subscribe to CDP Network events to capture the CSRF token.
-
-    Mirrors the previous Playwright ``page.on("request" / "response")``
-    behaviour. The token is read out of ``X-CSRF-Token`` request headers
-    seen on requests targeting ``open_host``.
-    """
-
-    def __init__(self, sess: BrowserSession, open_host: str) -> None:
-        self._sess = sess
-        self._open_host = open_host
-        self.csrf_token: str | None = None
-        self._on_request_listeners: list[Any] = []
-        self._on_response_listeners: list[Any] = []
-
-    async def install(self) -> None:
-        client = self._sess._internal.client
-        await client.send("Network.enable")
-
-        async def _on_req(params: dict[str, Any]) -> None:
-            req = params.get("request", {}) or {}
-            url = req.get("url", "")
-            if self._open_host not in url:
-                return
-            headers = req.get("headers", {}) or {}
-            for k, v in headers.items():
-                if k.lower() == "x-csrf-token" and v:
-                    self.csrf_token = str(v)
-                    break
-
-        client.on("Network.requestWillBeSent", _on_req)
-
-    def add_response_listener(self, listener: Any) -> None:
-        """Register a callback for ``Network.responseReceived`` events.
-
-        The callback receives the raw CDP params dict.  Use
-        ``remove_response_listener`` for cleanup.
-        """
-        client = self._sess._internal.client
-        client.on("Network.responseReceived", listener)
-        self._on_response_listeners.append(listener)
-
-    def remove_response_listener(self, listener: Any) -> None:
-        client = self._sess._internal.client
-        client.off("Network.responseReceived", listener)
-        if listener in self._on_response_listeners:
-            self._on_response_listeners.remove(listener)
-
-
-async def _fetch_response_body(sess: BrowserSession, request_id: str) -> dict[str, Any] | None:
-    """Pull a response body via CDP and parse it as JSON.
-
-    Used by the QR login poller in lieu of Playwright's ``resp.json()``.
-    """
-    try:
-        client = sess._internal.client
-        result = await client.send("Network.getResponseBody", {"requestId": request_id})
-        body = result.get("body", "")
-        if result.get("base64Encoded"):
-            import base64
-
-            body = base64.b64decode(body).decode("utf-8", errors="replace")
-        return cast(dict[str, Any] | None, json.loads(body))
-    except Exception:
-        return None
-
-
-# ============================================================
-# FeishuBotCreator — pure HTTP API wrapper, no browser interactions
-# ============================================================
-class FeishuBotCreator:
-    """Creates a Feishu/Lark bot by hitting the developer-platform JSON API.
-
-    The class does not use the browser directly; it relies on:
-    * ``capture.csrf_token`` — populated by the ``_NetworkCapture`` listener
-      when the page makes any authenticated request.
-    * ``cookies`` — harvested from CDP and sent verbatim with each request.
-
-    All HTTP traffic is plain ``httpx.AsyncClient`` with the same headers
-    a real browser would send.
-    """
-
-    def __init__(
-        self,
-        sess: BrowserSession,
-        capture: _NetworkCapture,
-    ) -> None:
-        self._sess = sess
-        self._capture = capture
-        self._base_url = _pcfg("base_url")
-        self._api_base = f"{self._base_url}/developers/v1"
-        self._app_page = f"{self._base_url}/app"
-        self.app_id: str | None = None
-        self.app_secret: str | None = None
-        self.version_id: str | None = None
-        self.publish_fail_reason: str = ""
-        self.audit_url: str | None = None
-
-    async def _csrf(self) -> str | None:
-        if self._capture.csrf_token:
-            return self._capture.csrf_token
-        # Try window.csrfToken
-        token = await _eval(self._sess, "window.csrfToken || ''")
-        if token:
-            self._capture.csrf_token = str(token)
-            return self._capture.csrf_token
-        # Try cookies
-        cookies = await _get_cookies(self._sess, [self._base_url])
-        cookie_map = {c["name"]: c["value"] for c in cookies}
-        token = (
-            cookie_map.get("lark_oapi_csrf_token")
-            or cookie_map.get("lgw_csrf_token")
-            or cookie_map.get("swp_csrf_token")
-        )
-        if token:
-            self._capture.csrf_token = token
-        return self._capture.csrf_token
-
-    async def _headers(self, *, with_body: bool = False) -> dict[str, str]:
-        h: dict[str, str] = {"accept": "*/*", "x-timezone-offset": "-480"}
-        if with_body:
-            h.update(
-                {
-                    "content-type": "application/json",
-                    "origin": self._base_url,
-                    "referer": self._app_page,
-                }
-            )
-        csrf = await self._csrf()
-        if csrf:
-            h["x-csrf-token"] = csrf
-        return h
-
-    async def _client(self) -> httpx.AsyncClient:
-        cookies = await _get_cookies(self._sess, [self._base_url])
-        cookie_jar = {c["name"]: c["value"] for c in cookies}
-        return httpx.AsyncClient(
-            cookies=cookie_jar,
-            timeout=30.0,
-            verify=False,
-        )
-
-    async def _post(self, url: str, payload: dict[str, Any]) -> dict[str, Any] | None:
-        try:
-            headers = await self._headers(with_body=True)
-            async with await self._client() as c:
-                resp = await c.post(url, json=payload, headers=headers)
-                return cast(dict[str, Any] | None, resp.json())
-        except Exception as e:
-            _log_warn("api", f"POST {url} failed: {e}")
-            return None
-
-    async def _get(self, url: str) -> dict[str, Any] | None:
-        try:
-            headers = await self._headers()
-            async with await self._client() as c:
-                resp = await c.get(url, headers=headers)
-                return cast(dict[str, Any] | None, resp.json())
-        except Exception as e:
-            _log_warn("api", f"GET {url} failed: {e}")
-            return None
-
-    def _ok(
-        self, body: dict[str, Any] | None, step: str, log_step: str = ""
-    ) -> dict[str, Any] | None:
-        if body is None:
-            return None
-        if body.get("code") != 0:
-            if log_step:
-                _log_error(
-                    log_step, f"{step} failed: code={body.get('code')}, msg={body.get('msg')}"
-                )
-            return None
-        return body
-
-    @staticmethod
-    def _build_multipart(fields: dict[str, Any], files: dict[str, Any]) -> tuple[bytes, str]:
-        boundary = f"----WebKitFormBoundary{uuid.uuid4().hex[:16]}"
-        parts: list[bytes] = []
-        for key, value in fields.items():
-            parts.append(f"--{boundary}\r\n".encode())
-            parts.append(f'Content-Disposition: form-data; name="{key}"\r\n\r\n'.encode())
-            parts.append(f"{value}\r\n".encode())
-        for key, (filename, data, content_type) in files.items():
-            parts.append(f"--{boundary}\r\n".encode())
-            parts.append(
-                f'Content-Disposition: form-data; name="{key}"; filename="{filename}"\r\n'.encode()
-            )
-            parts.append(f"Content-Type: {content_type}\r\n\r\n".encode())
-            parts.append(data)
-            parts.append(b"\r\n")
-        parts.append(f"--{boundary}--\r\n".encode())
-        return b"".join(parts), f"multipart/form-data; boundary={boundary}"
-
-    async def _upload_avatar(self, avatar_path: str) -> str | None:
-        with open(avatar_path, "rb") as f:
-            img_data = f.read()
-
-        csrf = await self._csrf()
-        if not csrf:
-            return None
-
-        cookies = await _get_cookies(self._sess, [self._base_url])
-        cookie_str = _cookie_header(cookies)
-
-        body, content_type = self._build_multipart(
-            fields={
-                "uploadType": "4",
-                "isIsv": "false",
-                "scale": '{"width":240,"height":240}',
-            },
-            files={
-                "file": (str(uuid.uuid4()), img_data, "image/png"),
-            },
-        )
-
-        headers = {
-            "Accept": "*/*",
-            "Content-Type": content_type,
-            "Cookie": cookie_str,
-            "Origin": self._base_url,
-            "Referer": self._app_page,
-            "User-Agent": (
-                "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) "
-                "AppleWebKit/537.36 (KHTML, like Gecko) "
-                "Chrome/145.0.0.0 Safari/537.36"
-            ),
-            "x-csrf-token": csrf,
-            "x-timezone-offset": "-480",
+def _on_qr_code(info: dict[str, Any]) -> None:
+    url = str(info.get("url") or "")
+    expire_in = int(info.get("expire_in") or 0)
+    if not url:
+        return
+    _save_state(
+        {
+            "phase": "create",
+            "qr_url": url,
+            "expire_in": expire_in,
+            "deadline": int(time.time()) + expire_in,
         }
-
-        try:
-            async with httpx.AsyncClient(timeout=60.0, verify=False) as c:
-                resp = await c.post(
-                    f"{self._api_base}/app/upload/image",
-                    content=body,
-                    headers=headers,
-                )
-                result = resp.json()
-        except Exception:
-            return None
-
-        if result.get("code") != 0:
-            return None
-        return cast(str | None, result["data"].get("url", ""))
-
-    # -- Steps --------------------------------------------------------------
-
-    async def step1_create_app(self, name: str, desc: str, avatar_path: str) -> bool:
-        _log_info("create_app", f"Creating enterprise app: {name}")
-        if avatar_path and os.path.isfile(avatar_path):
-            _log_info("create_app", f"Uploading avatar: {os.path.basename(avatar_path)}")
-            avatar_url = await self._upload_avatar(avatar_path) or ""
-        else:
-            avatar_url = ""
-
-        lang = _pcfg("primary_lang")
-        body = await self._post(
-            f"{self._api_base}/app/create",
-            {
-                "appSceneType": 0,
-                "name": name,
-                "desc": desc,
-                "avatar": avatar_url,
-                "i18n": {lang: {"name": name, "description": desc}},
-                "primaryLang": lang,
-            },
-        )
-        if not self._ok(body, "Create app", "create_app"):
-            return False
-        self.app_id = body["data"]["ClientID"]  # type: ignore[index]
-        _log_success("create_app", "App created", app_id=self.app_id)
-        return True
-
-    async def step2_get_credentials(self) -> bool:
-        _log_info("credential", "Getting app credentials")
-        body = await self._get(f"{self._api_base}/secret/{self.app_id}")
-        if not self._ok(body, "Get App Secret", "credential"):
-            return False
-        d = body.get("data", {})  # type: ignore[union-attr]
-        self.app_secret = (
-            d.get("appSecret") or d.get("app_secret") or d.get("secret") or d.get("AppSecret")
-        )
-        if not self.app_secret:
-            _log_error("credential", f"App Secret not found, keys={list(d.keys())}")
-            return False
-        _log_success(
-            "credential", "Credentials obtained", app_id=self.app_id, app_secret=self.app_secret
-        )
-        return True
-
-    async def step3_add_bot(self) -> bool:
-        _log_info("bot_ability", "Enabling bot capability")
-        body = await self._post(f"{self._api_base}/robot/switch/{self.app_id}", {"enable": True})
-        if self._ok(body, "Enable bot", "bot_ability") is not None:
-            _log_success("bot_ability", "Bot capability enabled")
-            return True
-        return False
-
-    async def step4_event_mode(self) -> bool:
-        _log_info("event_mode", "Switching event mode to WebSocket")
-        deadline = time.time() + WEBSOCKET_POLL_TIMEOUT
-        attempt = 0
-        total = WEBSOCKET_POLL_TIMEOUT // WEBSOCKET_POLL_INTERVAL
-        while time.time() < deadline:
-            attempt += 1
-            body = await self._post(
-                f"{self._api_base}/event/switch/{self.app_id}", {"eventMode": 4}
-            )
-            if body and body.get("code") == 10068:
-                _emit_progress(
-                    "event_mode",
-                    "Waiting for WebSocket connection...",
-                    current=attempt,
-                    total=total,
-                )
-                await asyncio.sleep(WEBSOCKET_POLL_INTERVAL)
-                continue
-            if self._ok(body, "Switch event mode → WebSocket(4)", "event_mode") is not None:
-                _log_success("event_mode", "Event mode switched")
-                return True
-            return False
-        _log_error("event_mode", f"WebSocket connection timeout ({WEBSOCKET_POLL_TIMEOUT}s)")
-        return False
-
-    async def step5_add_event(self) -> bool:
-        _log_info("event", "Adding im.message.receive_v1 event")
-        ev = await self._get(f"{self._api_base}/event/{self.app_id}")
-        mode = ev.get("data", {}).get("eventMode", 1) if ev and ev.get("code") == 0 else 1
-        body = await self._post(
-            f"{self._api_base}/event/update/{self.app_id}",
-            {
-                "operation": "add",
-                "events": ["im.message.receive_v1"],
-                "eventMode": mode,
-            },
-        )
-        if not self._ok(body, "Add im.message.receive_v1", "event"):
-            return False
-        verify = await self._get(f"{self._api_base}/event/{self.app_id}")
-        if verify and verify.get("code") == 0:
-            events = verify["data"].get("events", [])
-            if "im.message.receive_v1" in events:
-                _log_success("event", "im.message.receive_v1 added")
-            else:
-                _log_warn("event", f"im.message.receive_v1 not in event list: {events}")
-        return True
-
-    async def step6_callback_mode(self) -> bool:
-        _log_info("callback", "Configuring long connection callback")
-        deadline = time.time() + WEBSOCKET_POLL_TIMEOUT
-        attempt = 0
-        total = WEBSOCKET_POLL_TIMEOUT // WEBSOCKET_POLL_INTERVAL
-        while time.time() < deadline:
-            attempt += 1
-            body = await self._post(
-                f"{self._api_base}/callback/switch/{self.app_id}", {"callbackMode": 4}
-            )
-            if body and body.get("code") == 10068:
-                _emit_progress(
-                    "callback", "Waiting for WebSocket connection...", current=attempt, total=total
-                )
-                await asyncio.sleep(WEBSOCKET_POLL_INTERVAL)
-                continue
-            if self._ok(body, "Switch callback mode → long connection(4)", "callback") is not None:
-                _log_success("callback", "Callback mode switched")
-                return True
-            return False
-        _log_error("callback", f"WebSocket connection timeout ({WEBSOCKET_POLL_TIMEOUT}s)")
-        return False
-
-    async def step7_permissions(self) -> bool:
-        _log_info("basic_perm", "Importing permissions")
-        body = await self._get(f"{self._api_base}/scope/all/{self.app_id}")
-        if not self._ok(body, "Get permission list", "basic_perm"):
-            return False
-        name_to_id: dict[str, str] = {}
-        for s in body.get("data", {}).get("scopes", []):  # type: ignore[union-attr]
-            name = s.get("name") or s.get("scopeName", "")
-            sid = s.get("id", "")
-            if name and sid:
-                name_to_id[name] = str(sid)
-        ids = [name_to_id[n] for n in BOT_PERMISSIONS if n in name_to_id]
-        missing = [n for n in BOT_PERMISSIONS if n not in name_to_id]
-        _log_info("basic_perm", f"Matched {len(ids)}/{len(BOT_PERMISSIONS)} permissions")
-        if missing:
-            _log_warn(
-                "basic_perm",
-                f"{len(missing)} permissions not matched: {json.dumps(missing, ensure_ascii=False)}",
-            )
-        if not ids:
-            _log_error("basic_perm", "No available permission IDs")
-            return False
-        body = await self._post(
-            f"{self._api_base}/scope/update/{self.app_id}",
-            {
-                "clientId": self.app_id,
-                "appScopeIDs": ids,
-                "userScopeIDs": [],
-                "scopeIds": [],
-                "operation": "add",
-            },
-        )
-        if self._ok(body, "Batch add permissions", "basic_perm") is not None:
-            _log_success("basic_perm", "Permissions added")
-            return True
-        return False
-
-    async def _get_scope_name_to_id(self) -> dict[str, str]:
-        body = await self._get(f"{self._api_base}/scope/all/{self.app_id}")
-        if not self._ok(body, "Get permission list", "permission"):
-            return {}
-        name_to_id: dict[str, str] = {}
-        for s in body.get("data", {}).get("scopes", []):  # type: ignore[union-attr]
-            name = s.get("name") or s.get("scopeName", "")
-            sid = s.get("id", "")
-            if name and sid:
-                name_to_id[name] = str(sid)
-        return name_to_id
-
-    async def step_add_audit_permissions(self) -> dict[str, Any]:
-        result: dict[str, Any] = {"added": False, "need_audit": False, "audit_url": None}
-        name_to_id = await self._get_scope_name_to_id()
-        if not name_to_id:
-            _log_error("advanced_perm", "Failed to get permission map")
-            return result
-        ids = [name_to_id[n] for n in BOT_PERMISSIONS_NEED_AUDIT if n in name_to_id]
-        missing = [n for n in BOT_PERMISSIONS_NEED_AUDIT if n not in name_to_id]
-        if missing:
-            _log_warn("advanced_perm", f"Advanced permissions not matched: {missing}")
-        if not ids:
-            result["added"] = True
-            return result
-
-        body = await self._post(
-            f"{self._api_base}/scope/update/{self.app_id}",
-            {
-                "clientId": self.app_id,
-                "appScopeIDs": ids,
-                "userScopeIDs": [],
-                "scopeIds": [],
-                "operation": "add",
-            },
-        )
-        if not self._ok(body, "Add advanced permissions", "permission"):
-            return result
-        result["added"] = True
-
-        audit_url = _pcfg("admin_audit_url")
-        _log_info("advanced_perm", "Publishing advanced permissions...")
-        publish_ok = await self.step8_publish(version="1.0.1", silent=True)
-
-        if not publish_ok:
-            _log_error("advanced_perm", "Advanced permission publish failed")
-            result["need_audit"] = True
-            result["audit_url"] = self.audit_url or audit_url
-            return result
-
-        await asyncio.sleep(2)
-
-        info = await self._get(f"{self._api_base}/app/{self.app_id}")
-        if info and info.get("code") == 0:
-            data = info.get("data", {})
-            audit_version_id = data.get("auditVersionId")
-            audit_status = data.get("auditStatus")
-            is_new_version = audit_version_id and str(audit_version_id) == str(self.version_id)
-            if is_new_version and audit_status == 100:
-                _log_success("advanced_perm", "Advanced permissions published")
-                result["need_audit"] = False
-            else:
-                _log_error("advanced_perm", "Auto-publish advanced permissions failed")
-                result["need_audit"] = True
-                result["audit_url"] = audit_url
-        else:
-            _log_error("advanced_perm", "Auto-publish advanced permissions failed")
-            result["need_audit"] = True
-            result["audit_url"] = audit_url
-
-        return result
-
-    async def step8_publish(self, version: str = "1.0.0", silent: bool = False) -> bool:
-        self.publish_fail_reason = ""
-        self.audit_url = None
-        admin_audit_url = _pcfg("admin_audit_url")
-        changelog = "Initial version" if PLATFORM == "lark" else "初始版本"
-
-        if not silent:
-            _log_info("publish", "Publishing...")
-        body = await self._post(
-            f"{self._api_base}/app_version/create/{self.app_id}",
-            {
-                "clientId": self.app_id,
-                "appVersion": version,
-                "changeLog": changelog,
-                "autoPublish": False,
-                "pcDefaultAbility": "bot",
-                "mobileDefaultAbility": "bot",
-            },
-        )
-        if not self._ok(body, "Create version", "publish"):
-            self.publish_fail_reason = f"Create version failed: code={(body or {}).get('code')}, msg={(body or {}).get('msg')}"
-            return False
-        self.version_id = (
-            body.get("data", {}).get("versionId") or body["data"].get("version_id")  # type: ignore[union-attr,index]
-        )
-        if not self.version_id:
-            _log_error("publish", "Publish failed")
-            self.publish_fail_reason = "Version ID not obtained"
-            return False
-
-        await asyncio.sleep(1)
-        body = await self._post(
-            f"{self._api_base}/publish/commit/{self.app_id}/{self.version_id}", {}
+    )
+    _emit(
+        "show_qrcode",
+        "info",
+        "login",
+        "Please scan to create the Feishu app",
+        content=json.dumps({"url": url, "expire_in": expire_in}, ensure_ascii=False),
+    )
+    _log_info("login", f"QR URL ready (expires in {expire_in}s)")
+
+
+def _on_status_change(info: dict[str, Any]) -> None:
+    status = str(info.get("status") or "")
+    interval = info.get("interval")
+    if status == "slow_down":
+        _log_info("login", f"Polling slowed down (interval={interval}s)")
+    elif status == "domain_switched":
+        _log_info("login", "Switched to Lark accounts domain")
+    elif status == "polling":
+        _log_info("login", "Waiting for scan confirmation...")
+
+
+def register_feishu_app(*, avatar_url: str = "", greeting: str = "") -> dict[str, Any]:
+    """Run ``lark.register_app`` and return finish data (app_id / app_secret / …)."""
+    avatar = avatar_url.strip()
+    greeting_text = greeting.strip() or str(_pcfg("default_greeting"))
+    app_preset: dict[str, Any] = {"desc": str(_pcfg("app_desc"))}
+    if avatar:
+        app_preset["avatar"] = avatar
+    result = lark.register_app(
+        on_qr_code=_on_qr_code,
+        on_status_change=_on_status_change,
+        source="octop",
+        domain=str(_pcfg("accounts_domain")),
+        lark_domain=str(_pcfg("lark_domain")),
+        app_preset=app_preset,
+        create_only=True,
+    )
+    if not isinstance(result, dict):
+        raise RegisterAppError(
+            "missing_credentials", "register_app returned empty client_id/client_secret"
         )
-        if not self._ok(body, "Submit for review", "publish"):
-            self.publish_fail_reason = (
-                f"Submit failed: code={(body or {}).get('code')}, msg={(body or {}).get('msg')}"
-            )
-            return False
-
-        await asyncio.sleep(1)
-        body = await self._post(
-            f"{self._api_base}/publish/release/{self.app_id}/{self.version_id}",
-            {"clientId": self.app_id, "versionId": self.version_id},
+    app_id = str(result.get("client_id") or "")
+    app_secret = str(result.get("client_secret") or "")
+    if not app_id or not app_secret:
+        raise RegisterAppError(
+            "missing_credentials", "register_app returned empty client_id/client_secret"
         )
-        release_code = (body or {}).get("code")
-
-        if release_code == 0:
-            if not silent:
-                _log_success("publish", "Published", version_id=self.version_id)
-            return True
-
-        if release_code == 10002:
-            await asyncio.sleep(1)
-            info = await self._get(f"{self._api_base}/app/{self.app_id}")
-            if info and info.get("code") == 0:
-                app_status = info.get("data", {}).get("appStatus")
-                if app_status == 1:
-                    if not silent:
-                        _log_success("publish", "Published", version_id=self.version_id)
-                    return True
-                self.audit_url = admin_audit_url
-                _log_error("publish", "Auto-publish failed")
-                self.publish_fail_reason = (
-                    f"Admin approval required: appStatus={app_status}, "
-                    f"release code={release_code}, msg={(body or {}).get('msg')}"
-                )
-                return False
-            if not silent:
-                _log_success("publish", "Published", version_id=self.version_id)
-            return True
-
-        if release_code is None:
-            await asyncio.sleep(1)
-            info = await self._get(f"{self._api_base}/app/{self.app_id}")
-            if info and info.get("code") == 0:
-                app_status = info.get("data", {}).get("appStatus")
-                if app_status == 1:
-                    if not silent:
-                        _log_success("publish", "Published", version_id=self.version_id)
-                    return True
 
-        fail_msg = (body or {}).get("msg", "Unknown error")
-        _log_error("publish", f"Publish failed: {fail_msg}")
-        self.publish_fail_reason = f"Publish failed: code={release_code}, msg={fail_msg}"
-        return False
-
-    async def step9_get_owner_open_id(self) -> str | None:
-        _log_info("owner", "Getting app owner open_id")
-        if not self.app_id or not self.app_secret:
-            _log_warn("owner", "Missing app_id or app_secret, skipping")
-            return None
-
-        ctx = ssl.create_default_context()
-        ctx.check_hostname = False
-        ctx.verify_mode = ssl.CERT_NONE
-
-        payload = json.dumps({"app_id": self.app_id, "app_secret": self.app_secret}).encode()
-        req = urllib.request.Request(
-            f"{self._base_url}/open-apis/auth/v3/tenant_access_token/internal",
-            data=payload,
-            headers={"Content-Type": "application/json; charset=utf-8"},
-            method="POST",
-        )
-        try:
-            with urllib.request.urlopen(req, context=ctx) as resp:
-                token_data = json.loads(resp.read())
-        except Exception:
-            _log_error("owner", "Failed to get tenant_access_token")
-            return None
-
-        token = token_data.get("tenant_access_token")
-        if not token:
-            _log_error("owner", "Failed to get tenant_access_token")
-            return None
+    raw_user_info = result.get("user_info")
+    user_info = raw_user_info if isinstance(raw_user_info, dict) else {}
+    open_id = str(user_info.get("open_id") or "")
+    tenant_brand = str(user_info.get("tenant_brand") or PLATFORM)
+    open_base = _open_base_for_brand(tenant_brand)
+    bot_name = str(result.get("app_name") or result.get("name") or "")
+    manage_url = f"{open_base}/app/{app_id}"
 
-        req2 = urllib.request.Request(
-            f"{self._base_url}/open-apis/contact/v3/users?page_size=50&user_id_type=open_id",
-            headers={
-                "Content-Type": "application/json; charset=utf-8",
-                "Authorization": f"Bearer {token}",
-            },
-            method="GET",
-        )
-        try:
-            with urllib.request.urlopen(req2, context=ctx) as resp:
-                user_data = json.loads(resp.read())
-        except Exception:
-            _log_error("owner", "Failed to query user list")
-            return None
-
-        items = user_data.get("data", {}).get("items", [])
-        if not items:
-            _log_error("owner", "User list is empty")
-            return None
+    if open_id:
+        _send_greeting(app_id, app_secret, open_id, open_base=open_base, greeting=greeting_text)
+    else:
+        _log_warn("owner", "open_id not obtained, skipping greeting")
 
-        owner = items[0]
-        open_id = owner.get("open_id", "")
-        name = owner.get("name", "unknown")
-        _log_success("owner", f"User: {name}, open_id: {open_id}")
-        return cast(str | None, open_id)
+    finish = {
+        "app_id": app_id,
+        "app_secret": app_secret,
+        "bot_name": bot_name,
+        "open_id": open_id or None,
+        "manage_url": manage_url,
+        "tenant_brand": tenant_brand,
+    }
+    _save_state({"phase": "done", **finish})
+    return finish
 
 
-# ============================================================
-# Command: init  — verify harness-browser + Chromium are available
-# ============================================================
 def cmd_init() -> None:
-    _log_info("init", "Checking dependencies (harness-browser + Chromium)...")
-
+    _log_info("init", "Checking lark-oapi...")
     try:
-        import harness_browser  # noqa: F401
-    except ImportError:
-        _emit_error("init", "harness-browser not installed. Run `pip install harness-browser`.")
+        version = _lark_oapi_version()
+    except importlib.metadata.PackageNotFoundError:
+        _emit_error("init", "lark-oapi not installed. Run `pip install 'lark-oapi>=1.5.5'`.")
         sys.exit(1)
-
-    from harness_browser.cdp.launcher import find_chrome
-
-    if find_chrome() is None:
-        _emit_error(
-            "init",
-            "Chrome/Chromium not found. Run `octop install-browsers` "
-            "or install Chrome via your system package manager.",
-        )
+    if _parse_version(version) < MIN_LARK_OAPI:
+        _emit_error("init", f"lark-oapi {version} is too old; need >= 1.5.5")
         sys.exit(1)
-
-    _log_success("init", "Dependencies ready")
+    _log_success("init", f"lark-oapi {version} ready")
     sys.exit(0)
 
 
-# ============================================================
-# Command: create
-# ============================================================
-async def _cmd_create(avatar_url: str = "", greeting: str = "") -> None:
-    base_url = _pcfg("base_url")
-    login_url = _pcfg("login_url")
-    open_host = _pcfg("open_host")
-    accounts_host = _pcfg("accounts_host")
-    app_page = f"{base_url}/app"
-    admin_audit_url = _pcfg("admin_audit_url")
+def cmd_create(avatar_url: str = "", greeting: str = "") -> None:
     platform_label = "Lark" if PLATFORM == "lark" else "飞书"
-
-    _log_info("login", "Starting browser, fetching QR code...")
-    _t_qr_total = time.monotonic()
-
-    # ---- Launch harness-browser session ----
-    _t_browser = time.monotonic()
-    sess: BrowserSession
+    _log_info("login", f"Starting {platform_label} scan-to-create flow...")
     try:
-        sess = await BrowserSession.create(
-            profile=_pcfg("profile_name"),
-            mode="auto",
-        )
-    except Exception as exc:
-        _emit_error("login", f"Failed to launch browser: {exc}")
+        finish = register_feishu_app(avatar_url=avatar_url, greeting=greeting)
+    except AppAccessDeniedError as exc:
+        _emit_error("login", f"User denied authorization: {exc.description}")
         sys.exit(1)
-
-    _log_info("login", f"Browser ready ({time.monotonic() - _t_browser:.2f}s)")
-
-    # Bind the CDP client once outside the try blocks below so subsequent
-    # cleanup steps can still reach it even if an earlier mitigation step
-    # fails — otherwise the second ``try`` block would hit ``UnboundLocalError``
-    # when trying to call ``Network.clearBrowserCookies``.
-    _ua_client = sess._internal.client
-
-    # ---- Anti-headless fingerprint mitigation ------------------------------
-    # Feishu's login page returns a stripped-down variant (no QR DOM, no
-    # ``.switch-login-mode-box``) when it detects HeadlessChrome via the
-    # User-Agent or the ``navigator.webdriver`` flag. Override both via CDP
-    # before any navigation so the page renders the standard QR-capable form.
-    try:
-        # Use a desktop Chrome UA matching the current Chromium major version.
-        await _ua_client.send(
-            "Network.setUserAgentOverride",
-            {
-                "userAgent": (
-                    "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 "
-                    "(KHTML, like Gecko) Chrome/145.0.7632.6 Safari/537.36"
-                ),
-                "acceptLanguage": "zh-CN,zh;q=0.9,en;q=0.8",
-                "platform": "Linux x86_64",
-            },
-        )
-        # Hide navigator.webdriver and a few other common automation tells on
-        # every new document so SPA navigations stay clean too.
-        await _ua_client.send(
-            "Page.addScriptToEvaluateOnNewDocument",
-            {
-                "source": (
-                    "Object.defineProperty(navigator, 'webdriver', "
-                    "{get: () => undefined});"
-                    "Object.defineProperty(navigator, 'languages', "
-                    "{get: () => ['zh-CN', 'zh', 'en']});"
-                    "Object.defineProperty(navigator, 'plugins', "
-                    "{get: () => [1, 2, 3, 4, 5]});"
-                ),
-            },
-        )
-        _log_info("login", "Anti-headless fingerprint mitigation applied")
-    except Exception as exc:
-        _log_info("login", f"Anti-headless mitigation skipped ({exc})")
-
-    # ---- Per-run session cleanup -------------------------------------------
-    # ``harness_browser.launch_or_attach`` keeps Chrome alive across runs and
-    # *attaches* on the second start instead of launching a fresh process.
-    # That means cookies / localStorage from the previous QR attempt persist
-    # and cause Feishu to skip the QR form on subsequent runs (e.g. when it
-    # sees an existing ``__tcouv__``/session cookie). Clear them via CDP so
-    # every QR attempt starts from a clean session.
-    try:
-        await _ua_client.send("Network.clearBrowserCookies")
-        await _ua_client.send("Network.clearBrowserCache")
-        _log_info("login", "Session cookies & cache cleared for fresh QR attempt")
-    except Exception as exc:
-        _log_info("login", f"Session cleanup skipped ({exc})")
-
-    capture = _NetworkCapture(sess, open_host)
-    await capture.install()
-
-    async def _cleanup_browser() -> None:
-        with contextlib.suppress(Exception):
-            await sess.close()
-
-    # ---- QR token capture via CDP responseReceived ----
-    state: dict[str, Any] = {"qr_token": None, "qr_token_at": None}
-
-    # Map requestId → url so we can fetch bodies asynchronously when needed.
-    request_url_by_id: dict[str, str] = {}
-
-    async def _on_request_will_be_sent(params: dict[str, Any]) -> None:
-        rid = params.get("requestId", "")
-        url = params.get("request", {}).get("url", "")
-        if rid and url:
-            request_url_by_id[rid] = url
-
-    sess._internal.client.on("Network.requestWillBeSent", _on_request_will_be_sent)
-
-    async def _on_response(params: dict[str, Any]) -> None:
-        rid = params.get("requestId", "")
-        url = request_url_by_id.get(rid) or params.get("response", {}).get("url", "")
-        if "qrlogin/init" in url:
-            body = await _fetch_response_body(sess, rid)
-            if body and body.get("code") == 0:
-                token = body.get("data", {}).get("step_info", {}).get("token")
-                if token:
-                    state["qr_token"] = token
-                    state["qr_token_at"] = time.monotonic()
-                    _log_info(
-                        "login",
-                        f"QR token acquired ({state['qr_token_at'] - _t_qr_total:.2f}s since start)",
-                    )
-
-    capture.add_response_listener(_on_response)
-
-    async def _switch_to_qr_mode() -> None:
-        try:
-            _t_switch = time.monotonic()
-            await asyncio.sleep(2)
-            await _eval(
-                sess,
-                """(() => {
-                    const el = document.querySelector('.switch-login-mode-box');
-                    if (el) el.dispatchEvent(new MouseEvent('click', {bubbles: true, cancelable: true}));
-                    return true;
-                })()""",
-            )
-            await asyncio.sleep(1.5)
-            _log_info("login", f"Switched to QR mode ({time.monotonic() - _t_switch:.2f}s)")
-        except Exception:
-            _log_info("login", "QR mode switch skipped or failed")
-
-    async def _fetch_qr_token() -> bool:
-        state["qr_token"] = None
-        _t_fetch = time.monotonic()
-        _log_info("login", "Navigating to login page...")
-        if not await _navigate(sess, login_url):
-            _log_info("login", f"Login page load failed ({time.monotonic() - _t_fetch:.2f}s)")
-            return False
-        _log_info("login", f"Login page loaded ({time.monotonic() - _t_fetch:.2f}s)")
-        if not _pcfg("qr_default"):
-            await _switch_to_qr_mode()
-        for _ in range(25):
-            if state["qr_token"]:
-                _log_info(
-                    "login", f"QR token ready (first poll) ({time.monotonic() - _t_fetch:.2f}s)"
-                )
-                return True
-            await asyncio.sleep(0.1)
-
-        _log_info("login", "QR token not found in first attempt, reloading page...")
-        try:
-            await sess.reload()
-        except Exception:
-            if not await _navigate(sess, login_url):
-                _log_info("login", f"Reload failed ({time.monotonic() - _t_fetch:.2f}s)")
-                return False
-        if not _pcfg("qr_default"):
-            await _switch_to_qr_mode()
-        for _ in range(25):
-            if state["qr_token"]:
-                _log_info(
-                    "login", f"QR token ready (second poll) ({time.monotonic() - _t_fetch:.2f}s)"
-                )
-                return True
-            await asyncio.sleep(0.2)
-        _log_info("login", f"QR token acquisition failed ({time.monotonic() - _t_fetch:.2f}s)")
-        return False
-
-    async def _poll_qr_login() -> bool:
-        login_state: dict[str, Any] = {"login_ok": False, "scanned": False}
-
-        async def _on_poll_resp(params: dict[str, Any]) -> None:
-            rid = params.get("requestId", "")
-            url = request_url_by_id.get(rid) or params.get("response", {}).get("url", "")
-            if "qrlogin/polling" not in url:
-                return
-            body = await _fetch_response_body(sess, rid)
-            if not body or body.get("code") != 0:
-                return
-            data = body.get("data", {})
-            info = data.get("step_info", {})
-            status = info.get("status")
-            redirect_url = data.get("redirect_url", "")
-            if status == 2 and not login_state["scanned"]:
-                login_state["scanned"] = True
-                _log_info("login", "Scanned, please confirm on phone")
-                _emit_progress("login", "已扫码，请在手机上确认登录", current=0, total=1)
-            if redirect_url:
-                login_state["login_ok"] = True
-
-        capture.add_response_listener(_on_poll_resp)
-        try:
-            poll_deadline = time.time() + LOGIN_TIMEOUT
-            while time.time() < poll_deadline:
-                if login_state["login_ok"]:
-                    break
-                if login_state["scanned"]:
-                    cur = await _current_url(sess)
-                    if open_host in cur and accounts_host not in cur:
-                        login_state["login_ok"] = True
-                        break
-                await asyncio.sleep(0.5)
-        finally:
-            capture.remove_response_listener(_on_poll_resp)
-        return bool(login_state["login_ok"])
-
-    # ---- QR retry loop ----
-    for attempt in range(1, QR_MAX_RETRIES + 1):
-        _log_info("login", f"Fetching QR token (attempt {attempt}/{QR_MAX_RETRIES})...")
-        if not await _fetch_qr_token():
-            if attempt < QR_MAX_RETRIES:
-                _log_warn("login", f"Failed to get QR token, retrying ({attempt}/{QR_MAX_RETRIES})")
-                await asyncio.sleep(2)
-                continue
-            _log_info(
-                "login", f"All QR attempts exhausted ({time.monotonic() - _t_qr_total:.2f}s total)"
-            )
-            await _cleanup_browser()
-            _emit_error("login", "Failed to get QR token")
-            sys.exit(1)
-
-        _log_info(
-            "login",
-            f"QR code ready — total acquisition time: {time.monotonic() - _t_qr_total:.2f}s (attempt {attempt})",
-        )
-
-        qr_content = {"qrlogin": {"token": state["qr_token"]}}
-        _save_state(
-            {
-                "phase": "create",
-                "qr_token": state["qr_token"],
-                "qr_content": json.dumps(qr_content),
-                "deadline": int(time.time()) + LOGIN_TIMEOUT,
-            }
-        )
-        _emit(
-            "show_qrcode",
-            "info",
-            "login",
-            f"Please scan to login {platform_label}",
-            content=json.dumps(qr_content, ensure_ascii=False),
-        )
-        _emit_progress("login", "Waiting for scan...", current=attempt, total=QR_MAX_RETRIES)
-
-        if await _poll_qr_login():
-            break
-
-        if attempt < QR_MAX_RETRIES:
-            _log_warn("login", f"QR expired, refreshing ({attempt}/{QR_MAX_RETRIES})")
-            await asyncio.sleep(1)
-        else:
-            await _cleanup_browser()
-            _emit_error("login", f"{QR_MAX_RETRIES} timeouts, exiting")
-            sys.exit(1)
-
-    # ---- Wait for redirect ----
-    _log_info("login", "Page redirected to open platform, login successful")
-    jump_deadline = time.time() + 15
-    while time.time() < jump_deadline:
-        cur = await _current_url(sess)
-        if open_host in cur and accounts_host not in cur:
-            break
-        await asyncio.sleep(0.5)
-    else:
-        await _navigate(sess, app_page)
-
-    _log_success("login", "Login successful!")
-    _emit_progress("create", "登录成功，正在自动创建机器人，请稍候…", current=0, total=1)
-    await asyncio.sleep(2)
-
-    # ---- Bot creation ----
-    bot_name = _gen_bot_name()
-    bot_desc = bot_name
-    avatar_path = _download_avatar(avatar_url)
-
-    creator = FeishuBotCreator(sess, capture)
-
-    await _navigate(sess, app_page)
-    await asyncio.sleep(2)
-    csrf = await creator._csrf()
-    _log_info("create_app", f"CSRF token: {'obtained' if csrf else 'not obtained, continuing'}")
-
-    if not await creator.step1_create_app(bot_name, bot_desc, avatar_path):
-        await _cleanup_browser()
-        _emit_error("create_app", "Failed to create app")
+    except AppExpiredError as exc:
+        _emit_error("login", f"QR code expired: {exc.description}")
         sys.exit(1)
-
-    if not await creator.step2_get_credentials():
-        await _cleanup_browser()
-        _emit_error("credential", "Failed to get credentials")
+    except RegisterAppError as exc:
+        _emit_error("create_app", f"Failed to create app: {exc.code}: {exc.description}")
         sys.exit(1)
-
-    # orca: credentials are returned via finish event, not written to config
-    _log_info("config", "Credentials ready — octop will handle storage")
-
-    _step_error_messages = {
-        "step3_add_bot": ("bot_ability", "Failed to enable bot capability"),
-        "step4_event_mode": (
-            "event_mode",
-            "Failed to establish long connection, check if octop is running",
-        ),
-        "step5_add_event": ("event", "Failed to add message receive event"),
-        "step6_callback_mode": (
-            "callback",
-            "Failed to configure callback, check if octop is running",
-        ),
-        "step7_permissions": ("basic_perm", "Failed to import permissions"),
-    }
-    steps = [
-        creator.step3_add_bot,
-        creator.step4_event_mode,
-        creator.step5_add_event,
-        creator.step6_callback_mode,
-        creator.step7_permissions,
-    ]
-    for fn in steps:
-        if not await fn():
-            await _cleanup_browser()
-            step_name = fn.__name__
-            err_step, err_msg = _step_error_messages.get(
-                step_name, (step_name, f"{step_name} failed")
-            )
-            _emit_error(err_step, err_msg)
-            sys.exit(1)
-
-    manage_url = f"{base_url}/app/{creator.app_id}"
-    publish_ok = await creator.step8_publish()
-
-    if not publish_ok:
-        await _cleanup_browser()
-        fail_reason = creator.publish_fail_reason or "Publish failed"
-        audit_url = creator.audit_url or admin_audit_url
-        msg_lines = [
-            f"Current user cannot auto-publish {platform_label} bot, please contact admin for approval.",
-            f"Bot name: {bot_name}",
-            f"Manage URL: {manage_url}",
-            f"Approval URL: {audit_url}",
-        ]
-        finish_data = {
-            "app_id": creator.app_id,
-            "app_secret": creator.app_secret,
-            "bot_name": bot_name,
-            "manage_url": manage_url,
-            "audit_url": audit_url,
-            "publish_fail_reason": fail_reason,
-        }
-        _emit("finish", "error", "publish", "\n".join(msg_lines), data=finish_data)
+    except Exception as exc:
+        _emit_error("create_app", f"Failed to create app: {exc}")
         sys.exit(1)
 
-    _log_info("advanced_perm", "Adding advanced permissions...")
-    audit_result = await creator.step_add_audit_permissions()
-    open_id = await creator.step9_get_owner_open_id()
-
-    if open_id:
-        _send_greeting(creator.app_id or "", creator.app_secret or "", open_id, greeting)
-    else:
-        _log_warn("owner", "open_id not obtained, skipping greeting")
-
-    await _cleanup_browser()
-
-    result: dict[str, Any] = {
-        "app_id": creator.app_id,
-        "app_secret": creator.app_secret,
-        "bot_name": bot_name,
-        "version_id": creator.version_id,
-        "open_id": open_id,
-        "manage_url": manage_url,
-    }
-
-    if audit_result.get("need_audit"):
-        audit_url = audit_result.get("audit_url") or admin_audit_url
-        result["audit_url"] = audit_url
-        result["audit_permissions"] = BOT_PERMISSIONS_NEED_AUDIT
-        finish_msg_lines = [
-            f"✅ Bot「{bot_name}」created and published.",
-            f"Manage URL: {manage_url}",
-            "",
-            "⚠️ The following advanced permissions require admin approval:",
-            "   · View, comment and download all files in cloud space",
-            "   · View, comment, edit and manage all files in cloud space",
-            f"Contact admin for approval: {audit_url}",
-        ]
-    else:
-        finish_msg_lines = [
-            f"✅ Bot「{bot_name}」created and published, all permissions active.",
-            f"Manage URL: {manage_url}",
-        ]
-
-    _save_state({"phase": "done", **result})
-    _emit_finish("\n".join(finish_msg_lines), result)
-
-
-def cmd_create(avatar_url: str = "", greeting: str = "") -> None:
-    asyncio.run(_cmd_create(avatar_url=avatar_url, greeting=greeting))
-
-
-# ============================================================
-# Command: cleanup
-# ============================================================
-async def _cmd_cleanup() -> None:
-    """Close any harness session for the bot profile and remove state file."""
-    try:
-        from harness_browser.tool_interface import _registry as _hr
+    bot_name = str(finish.get("bot_name") or "")
+    manage_url = str(finish.get("manage_url") or "")
+    _log_success("create_app", "App created", app_id=finish["app_id"])
+    created = f"Bot「{bot_name}」created" if bot_name else "Bot created"
+    _emit_finish(
+        f"✅ {created}. Manage URL: {manage_url}",
+        finish,
+    )
 
-        sess = _hr.get(_pcfg("profile_name"))
-        if sess is not None:
-            with contextlib.suppress(Exception):
-                await sess.close()
-            _hr.pop(_pcfg("profile_name"), None)
-    except Exception:
-        pass
 
+def cmd_cleanup() -> None:
     sf = _state_file()
     if os.path.isfile(sf):
         with contextlib.suppress(OSError):
@@ -1424,13 +324,6 @@ async def _cmd_cleanup() -> None:
     _log_success("cleanup", "Cleaned up")
 
 
-def cmd_cleanup() -> None:
-    asyncio.run(_cmd_cleanup())
-
-
-# ============================================================
-# Entry point
-# ============================================================
 def main() -> None:
     global PLATFORM
 
@@ -1438,42 +331,34 @@ def main() -> None:
         sys.exit(0)
 
     cmd = sys.argv[1]
-
     if cmd == "init":
         cmd_init()
-    elif cmd == "create":
-        avatar_url = ""
-        greeting = ""
-        args = sys.argv[2:]
-        i = 0
-        while i < len(args):
-            if args[i] == "--avatar-url" and i + 1 < len(args):
-                avatar_url = args[i + 1]
-                i += 2
-            elif args[i] == "--greeting" and i + 1 < len(args):
-                greeting = args[i + 1]
-                i += 2
-            elif args[i] == "--platform" and i + 1 < len(args):
-                p = args[i + 1].lower()
-                if p not in ("feishu", "lark"):
-                    _emit_error("main", f"Unsupported platform: {p}, use feishu or lark")
-                    sys.exit(1)
-                PLATFORM = p
-                i += 2
-            else:
-                i += 1
+        return
+
+    avatar_url = ""
+    greeting = ""
+    args = sys.argv[2:]
+    i = 0
+    while i < len(args):
+        if args[i] == "--avatar-url" and i + 1 < len(args):
+            avatar_url = args[i + 1]
+            i += 2
+        elif args[i] == "--greeting" and i + 1 < len(args):
+            greeting = args[i + 1]
+            i += 2
+        elif args[i] == "--platform" and i + 1 < len(args):
+            p = args[i + 1].lower()
+            if p not in ("feishu", "lark"):
+                _emit_error("main", f"Unsupported platform: {p}, use feishu or lark")
+                sys.exit(1)
+            PLATFORM = p
+            i += 2
+        else:
+            i += 1
+
+    if cmd == "create":
         cmd_create(avatar_url=avatar_url, greeting=greeting)
     elif cmd == "cleanup":
-        args = sys.argv[2:]
-        i = 0
-        while i < len(args):
-            if args[i] == "--platform" and i + 1 < len(args):
-                p = args[i + 1].lower()
-                if p in ("feishu", "lark"):
-                    PLATFORM = p
-                i += 2
-            else:
-                i += 1
         cmd_cleanup()
     else:
         _emit_error("main", f"Unknown command: {cmd}")
diff --git a/src/octop/infra/gateway/bot_creators/feishu_runner.py b/src/octop/infra/gateway/bot_creators/feishu_runner.py
index 146e5846..dedd3b5b 100644
--- a/src/octop/infra/gateway/bot_creators/feishu_runner.py
+++ b/src/octop/infra/gateway/bot_creators/feishu_runner.py
@@ -12,10 +12,6 @@
 from octop.infra.utils.subprocess_io import parse_subprocess_json_lines
 
 ALLOWED_PLATFORMS = frozenset({"feishu", "lark"})
-PROFILE_NAMES = {
-    "feishu": "octop-feishu-bot",
-    "lark": "octop-lark-bot",
-}
 
 
 def bot_creator_script(name: str) -> Path:
@@ -28,37 +24,6 @@ def bot_creator_script(name: str) -> Path:
     return script
 
 
-def resolve_profiles_root() -> Path:
-    """Shared Octop profiles root; honor env overrides when present."""
-    raw = (os.environ.get("BROWSER_USE_PROFILES_DIR") or "").strip()
-    if not raw:
-        raw = (os.environ.get("HARNESS_BROWSER_PROFILES_DIR") or "").strip()
-    if raw and len(raw) <= 2048:
-        return Path(raw).expanduser()
-    from octop.infra.utils.browser_media import octop_browser_profiles_dir  # noqa: PLC0415
-
-    return octop_browser_profiles_dir()
-
-
-def feishu_profile_dir(platform: str) -> Path:
-    if platform not in ALLOWED_PLATFORMS:
-        raise ValueError(f"platform must be one of {sorted(ALLOWED_PLATFORMS)}")
-    root = resolve_profiles_root().resolve()
-    profile = (root / PROFILE_NAMES[platform]).resolve()
-    profile.relative_to(root)
-    return profile
-
-
-def clear_profile_locks(profile_dir: Path) -> None:
-    for lock_name in ("SingletonLock", "SingletonCookie", "SingletonSocket"):
-        try:
-            (profile_dir / lock_name).unlink()
-        except FileNotFoundError:
-            pass
-        except OSError:
-            pass
-
-
 def start_feishu_creator(
     *,
     platform: str,
@@ -67,7 +32,6 @@ def start_feishu_creator(
 ) -> subprocess.Popen[bytes]:
     if platform not in ALLOWED_PLATFORMS:
         raise ValueError(f"platform must be one of {sorted(ALLOWED_PLATFORMS)}")
-    clear_profile_locks(feishu_profile_dir(platform))
     script_path = bot_creator_script("feishu_bot_creator.py")
     cmd = [sys.executable, str(script_path), "create", "--platform", platform]
     if avatar_url:
@@ -84,25 +48,38 @@ def start_feishu_creator(
     )
 
 
+def _qr_url_from_event(ev: dict[str, Any]) -> str | None:
+    content = ev.get("content", "")
+    if isinstance(content, str) and content.startswith("http"):
+        return content
+    try:
+        qr_data = json.loads(content) if isinstance(content, str) else content
+    except (json.JSONDecodeError, TypeError):
+        return None
+    if not isinstance(qr_data, dict):
+        return None
+    url = qr_data.get("url")
+    return str(url) if url else None
+
+
 def extract_feishu_credentials(
     lines: list[dict[str, Any]],
 ) -> tuple[str | None, str | None, str | None]:
-    qr_token = None
+    """Return ``(qr_url, app_id, app_secret)`` from creator stdout events."""
+    qr_url = None
     app_id = None
     app_secret = None
     for ev in lines:
         if ev.get("action") == "show_qrcode":
-            content = ev.get("content", "")
-            try:
-                qr_data = json.loads(content) if isinstance(content, str) else content
-                qr_token = qr_data.get("qrlogin", {}).get("token")
-            except (json.JSONDecodeError, AttributeError):
-                pass
+            parsed = _qr_url_from_event(ev)
+            if parsed:
+                qr_url = parsed
         if ev.get("action") == "finish" and ev.get("level") == "success":
             data = ev.get("data", {})
-            app_id = data.get("app_id")
-            app_secret = data.get("app_secret")
-    return qr_token, app_id, app_secret
+            if isinstance(data, dict):
+                app_id = data.get("app_id")
+                app_secret = data.get("app_secret")
+    return qr_url, app_id, app_secret
 
 
 def poll_feishu_creator(
@@ -127,11 +104,11 @@ def poll_feishu_creator(
     status = "running"
     if finished:
         status = "finished" if return_code == 0 else "failed"
-    qr_token, app_id, app_secret = extract_feishu_credentials(lines)
+    qr_url, app_id, app_secret = extract_feishu_credentials(lines)
     return {
         "status": status,
         "events": new_lines,
-        "qr_token": qr_token,
+        "qr_url": qr_url,
         "app_id": app_id,
         "app_secret": app_secret,
         "return_code": return_code,
diff --git a/src/octop/infra/gateway/cli/cli_channel.py b/src/octop/infra/gateway/cli/cli_channel.py
index 58078df8..0e7c1837 100644
--- a/src/octop/infra/gateway/cli/cli_channel.py
+++ b/src/octop/infra/gateway/cli/cli_channel.py
@@ -129,6 +129,7 @@ async def _send_text(self, subject: ChannelSubject, text: str) -> None:
         conn_id = str(subject.metadata.get(CLI_CONNECTION_META) or "")
         if conn_id and text:
             await self._hub.push(conn_id, {"type": "token", "content": text})
+            await self._hub.push(conn_id, {"type": "done"})
 
     async def _send_content(self, subject: ChannelSubject, parts: list[ContentPart]) -> None:
         text = "\n".join(p.text for p in parts if isinstance(p, TextContent) and p.text)
diff --git a/src/octop/infra/gateway/gateway.py b/src/octop/infra/gateway/gateway.py
index be37465d..16a2067f 100644
--- a/src/octop/infra/gateway/gateway.py
+++ b/src/octop/infra/gateway/gateway.py
@@ -6,6 +6,7 @@
 import json
 import logging
 import time
+from collections.abc import Awaitable, Callable
 from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, Any
 
@@ -15,13 +16,12 @@
 from harness_gateway.models import ChannelSubject
 
 from octop.i18n import channel_probe_incomplete, channel_runtime_reason, tr
-from octop.infra.cron.task_type import CronTaskType, normalize_cron_task_type
 from octop.infra.db.repos.channels import ChannelRow
 from octop.infra.db.repos.sessions import SessionRow
 from octop.infra.errors import ErrorCode, OctopError
 from octop.infra.gateway.cli import CLI_CHANNEL_ID, CliChannel, CliHub
 from octop.infra.gateway.history_backfill import HistoryBackfillQueue
-from octop.infra.gateway.process import build_harness_request, media_backend_for_agent
+from octop.infra.gateway.process import media_backend_for_agent
 from octop.infra.gateway.process.processor import GlobalProcessor
 from octop.infra.gateway.process.response_mode import (
     normalize_channel_response_mode,
@@ -34,7 +34,6 @@
     WebSocketChannel,
     WebSocketHub,
 )
-from octop.infra.utils.llm_text import strip_thinking
 from octop.infra.utils.locale import DEFAULT_LOCALE, Locale
 
 if TYPE_CHECKING:
@@ -102,9 +101,11 @@ def __init__(
         *,
         agent_manager: AgentManager,
         repos: RepoBundle,
+        trajectory_service: Any | None = None,
     ) -> None:
         self._agent_manager = agent_manager
         self._repos = repos
+        self._trajectory_service = trajectory_service
         self._thread_registry = ThreadRegistry(
             session_repo=repos.session_repo,
             thread_repo=repos.thread_repo,
@@ -210,6 +211,7 @@ async def boot(self) -> None:
             usage_repo=self._repos.usage_repo,
             thread_message_repo=self._repos.thread_message_repo,
             gateway=self,
+            trajectory_service=self._trajectory_service,
         )
 
         self._channel_manager = ChannelManager(channels={})
@@ -359,7 +361,8 @@ async def delete_channel(self, channel_id: str) -> None:
         await self._unregister(channel_id)
         self._runtime_status.pop(channel_id, None)
 
-    def _require_session(self, agent_id: str, session_key: str) -> SessionRow:
+    def require_session(self, agent_id: str, session_key: str) -> SessionRow:
+        """Return a session after validating its owning agent."""
         session = self._thread_registry.get_session(session_key)
         if session is None:
             raise ValueError(f"session {session_key!r} not found")
@@ -367,128 +370,97 @@ def _require_session(self, agent_id: str, session_key: str) -> SessionRow:
             raise ValueError(f"session {session_key!r} does not belong to agent {agent_id!r}")
         return session
 
-    def _bump_dashboard_session(self, session: SessionRow, session_key: str, text: str) -> None:
+    def _bump_virtual_session(self, session: SessionRow, text: str) -> None:
         self._thread_registry.touch_last_active(session.thread_id)
         if text:
             self._thread_registry.set_title_if_null(session.thread_id, text)
-        self._thread_registry.increment_unread(session_key)
+        self._thread_registry.increment_unread(session.session_key)
+
+    async def run_in_session(
+        self,
+        agent_id: str,
+        session_key: str,
+        operation: Callable[[], Awaitable[None]],
+    ) -> None:
+        """Serialize a proactive operation with inbound turns for its session."""
+        session = self.require_session(agent_id, session_key)
+        manager = self._require_channel_manager()
+        channel_id = self._channel_id_for_session(session)
+        await manager.run_in_session(channel_id, session_key, operation)
 
     async def push_text_from_session(
         self,
         agent_id: str,
         session_key: str,
         text: str,
+    ) -> None:
+        """Push complete text without running the agent."""
+
+        async def _locked() -> None:
+            session = self.require_session(agent_id, session_key)
+            await self.push_session_text(session, text, title_source=text)
+            if session.channel_type == ThreadRegistry.CHANNEL_DASHBOARD:
+                await self.notify_dashboard_push(session, agent_id, text)
+
+        await self.run_in_session(agent_id, session_key, _locked)
+
+    async def push_session_text(
+        self,
+        session: SessionRow,
+        text: str,
         *,
-        task_type: CronTaskType | str = "agent",
-        model: str | None = None,
-        mcp_servers: list[str] | None = None,
+        title_source: str | None = None,
     ) -> None:
-        """Cron delivery: run agent if needed, then push text (IM channel or dashboard WS)."""
-        session = self._require_session(agent_id, session_key)
-        virtual_stream = session.channel_type in (
+        """Deliver one complete proactive message to a resolved session."""
+        channel_id = self._channel_id_for_session(session)
+        await self.push_text(
+            session.channel_type,
+            channel_id,
+            self._resolve_push_subject(session),
+            text,
+        )
+        if session.channel_type in (
             ThreadRegistry.CHANNEL_DASHBOARD,
             ThreadRegistry.CHANNEL_CLI,
-        )
-        is_text = normalize_cron_task_type(str(task_type)) == "text"
-
-        if is_text:
-            outbound = text
-        else:
-            # Stamp composer chips on this run's HumanMessage only (no history backfill).
-            from octop.infra.gateway.process.message_keys import (  # noqa: PLC0415
-                COMPOSER_CTX_KEY,
-                build_composer_context,
-            )
-
-            servers = [s.strip() for s in (mcp_servers or []) if s and str(s).strip()]
-            # Empty job selection → follow default_open. Explicit picks win as-is.
-            if servers:
-                servers = (
-                    self._agent_manager.merge_turn_mcp_servers(
-                        session.user_id, servers, apply_defaults=False
-                    )
-                    or []
-                )
-            else:
-                servers = (
-                    self._agent_manager.merge_turn_mcp_servers(
-                        session.user_id, None, apply_defaults=True
-                    )
-                    or []
-                )
-            if servers:
-                failed = await self._agent_manager.prepare_chat_mcp(
-                    agent_id,
-                    servers,
-                    connector_user_id=session.user_id,
-                )
-                if failed:
-                    raise OctopError(
-                        ErrorCode.CONNECTOR_MCP_LOAD_FAILED,
-                        f"mcp load failed: {', '.join(failed)}",
-                    )
-            row = self._agent_manager.get_row(agent_id)
-            default_model = (row.default_model if row is not None else None) or None
-            composer = build_composer_context(
-                mcp_servers=servers or None,
-                skills=None,
-                target_agent_ids=None,
-                model_ref=model,
-                default_model=default_model,
-            )
-            message_kwargs = {COMPOSER_CTX_KEY: composer} if composer else None
-            request = build_harness_request(
-                thread_id=session.thread_id,
-                user_id=session.user_id,
-                agent_id=agent_id,
-                session_key=session_key,
-                source=session.channel_type,
-                text=text,
-                model=model,
-                message_kwargs=message_kwargs,
-            )
-            if servers:
-                request["mcp_servers"] = servers
-            parts: list[str] = []
-            async for chunk in self._agent_manager.stream(agent_id, request):
-                if chunk.get("type") in ("token", "delta"):
-                    parts.append(str(chunk.get("content") or chunk.get("text") or ""))
-            outbound = strip_thinking("".join(parts)) or "(empty)"
-
-        if virtual_stream:
-            self._bump_dashboard_session(session, session_key, text)
-            channel_id = (
-                WS_CHANNEL_ID
-                if session.channel_type == ThreadRegistry.CHANNEL_DASHBOARD
-                else CLI_CHANNEL_ID
-            )
-            await self.push_text(
-                session.channel_type,
-                channel_id,
-                self._resolve_push_subject(session),
-                outbound,
-            )
-            if session.channel_type == ThreadRegistry.CHANNEL_DASHBOARD and is_text:
-                await self._notify_dashboard_text_push(session, agent_id, outbound)
-            return
+        ):
+            self._bump_virtual_session(session, title_source or text)
 
+    @staticmethod
+    def _channel_id_for_session(session: SessionRow) -> str:
+        if session.channel_type == ThreadRegistry.CHANNEL_DASHBOARD:
+            return WS_CHANNEL_ID
+        if session.channel_type == ThreadRegistry.CHANNEL_CLI:
+            return CLI_CHANNEL_ID
         if not session.channel_id:
             raise ValueError(
                 f"session is IM ({session.channel_type!r}) but has no channel_id bound"
             )
-        await self.push_text(
-            session.channel_type,
-            session.channel_id,
-            self._resolve_push_subject(session),
-            outbound,
-        )
+        return session.channel_id
 
     def _resolve_push_subject(self, session: SessionRow) -> ChannelSubject:
         """Build ChannelSubject from session; IM routing enrichment is in harness-gateway."""
-        return session.to_channel_subject()
+        subject = session.to_channel_subject()
+        if session.channel_type not in (
+            ThreadRegistry.CHANNEL_DASHBOARD,
+            ThreadRegistry.CHANNEL_CLI,
+        ):
+            return subject
+        metadata = dict(subject.metadata or {})
+        metadata["thread_id"] = session.thread_id
+        return ChannelSubject(
+            subject_id=subject.subject_id,
+            first_seen=subject.first_seen,
+            last_seen=subject.last_seen,
+            display_name=subject.display_name,
+            chat_type=subject.chat_type,
+            metadata=metadata,
+        )
 
-    async def _notify_dashboard_text_push(
-        self, session: SessionRow, agent_id: str, text: str
+    async def notify_dashboard_push(
+        self,
+        session: SessionRow,
+        agent_id: str,
+        text: str,
     ) -> None:
         """Fan out a toast payload to the owner's dashboard notification sockets."""
         if not text.strip():
diff --git a/src/octop/infra/gateway/process/message_keys.py b/src/octop/infra/gateway/process/message_keys.py
index 2d551c2d..8a454dd4 100644
--- a/src/octop/infra/gateway/process/message_keys.py
+++ b/src/octop/infra/gateway/process/message_keys.py
@@ -74,6 +74,8 @@ def resolve_user_id_for_message(
     Dashboard and CLI use numeric ``subject_id`` values as Octop user ids.
     External IM subject ids belong to a platform-specific identity domain and
     may also be numeric, so those sessions always belong to the agent owner.
+    Browser cookies follow this same id (``user-<id>``): IM members of one
+    agent share the owner's profile, they are not isolated from each other.
     """
     if msg.channel_type in (
         ThreadRegistry.CHANNEL_DASHBOARD,
diff --git a/src/octop/infra/gateway/process/processor.py b/src/octop/infra/gateway/process/processor.py
index 146da747..2f04ff57 100644
--- a/src/octop/infra/gateway/process/processor.py
+++ b/src/octop/infra/gateway/process/processor.py
@@ -5,7 +5,7 @@
 import logging
 from collections.abc import AsyncIterator
 from types import SimpleNamespace
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, Literal
 
 from harness_agent.slash import SlashSink, parse_slash
 from harness_agent.teams.inbox import InboxMessage
@@ -18,6 +18,7 @@
 )
 
 from octop.i18n.domains.stream import format_stream_error
+from octop.infra.agents.profile import parse_config_json
 from octop.infra.agents.providers.reasoning import reasoning_request_parameters
 from octop.infra.gateway.hitl.coordinator import (
     HitlAnswerOutcome,
@@ -55,6 +56,7 @@
 from octop.infra.gateway.slash.runner import try_handle_slash
 from octop.infra.knowledge.default_open import merge_knowledge_base_ids
 from octop.infra.knowledge.hint import catalog_for_selected_bases
+from octop.infra.trajectory.settings import agent_trajectory_enabled
 from octop.infra.users.preferences import (
     get_model_reasoning_from_json,
     get_preferred_model_from_json,
@@ -107,6 +109,7 @@ def __init__(
         thread_message_repo: Any | None = None,
         gateway: Any | None = None,
         hitl: HitlChannelCoordinator | None = None,
+        trajectory_service: Any | None = None,
     ) -> None:
         self._agent_manager = agent_manager
         self._thread_registry = thread_registry
@@ -128,6 +131,7 @@ def __init__(
         self._thread_message_repo = thread_message_repo
         self._gateway = gateway
         self._hitl = hitl or HitlChannelCoordinator()
+        self._trajectory_service = trajectory_service
 
     @property
     def hitl_coordinator(self) -> HitlChannelCoordinator:
@@ -137,6 +141,192 @@ def replace_thread_message_repo(self, repo: Any) -> None:
         """Rebind projection writes after a control-plane restore."""
         self._thread_message_repo = repo
 
+    def _agent_trajectory_enabled(self, agent_id: str, row: Any | None = None) -> bool:
+        if self._trajectory_service is None:
+            return False
+        agent_row = row if row is not None else self._agent_repo.get(agent_id)
+        if agent_row is None:
+            return False
+        return agent_trajectory_enabled(parse_config_json(getattr(agent_row, "config_json", None)))
+
+    def _observe_trajectory(
+        self,
+        *,
+        agent_id: str,
+        thread_id: str,
+        chunk: dict[str, Any],
+        enabled: bool | None = None,
+    ) -> None:
+        if enabled is False:
+            return
+        if enabled is None and not self._agent_trajectory_enabled(agent_id):
+            return
+        service = self._trajectory_service
+        if service is None:
+            return
+        try:
+            service.observe_chunk(agent_id, thread_id, chunk)
+        except Exception:
+            logger.exception(
+                "trajectory observe_chunk failed agent=%s thread=%s",
+                agent_id,
+                thread_id,
+            )
+
+    def _finish_trajectory(
+        self,
+        *,
+        thread_id: str,
+        usage: dict[str, Any] | None = None,
+        enabled: bool | None = None,
+    ) -> None:
+        if enabled is False:
+            return
+        service = self._trajectory_service
+        if service is None:
+            return
+        try:
+            service.finish_turn(thread_id, usage)
+        except Exception:
+            logger.exception("trajectory finish_turn failed thread=%s", thread_id)
+
+    async def _observe_turn_start_context(
+        self,
+        *,
+        agent_id: str,
+        thread_id: str,
+        request: dict[str, Any],
+        meta: dict[str, Any],
+        phase: Literal["system", "context"] = "context",
+        trajectory_enabled: bool | None = None,
+    ) -> None:
+        """Emit SYSTEM / CONTEXT from harness injection sources of truth."""
+        if trajectory_enabled is False:
+            return
+        if trajectory_enabled is None and not self._agent_trajectory_enabled(agent_id):
+            return
+        service = self._trajectory_service
+        if service is None:
+            return
+        try:
+            from octop.infra.trajectory.turn_context import (  # noqa: PLC0415
+                build_turn_start_chunks,
+                filter_turn_skill_names,
+            )
+
+            include_system = phase == "system" and not bool(service.has_kind(thread_id, "system"))
+            system_prompt = self._trajectory_system_prompt(agent_id) if phase == "system" else None
+            workspace_files: list[str] = []
+            skills: list[str] | None = None
+            skills_filter_present = False
+            mcp_names: list[str] | None = None
+            if phase == "context":
+                workspace_files = await self._trajectory_workspace_files(agent_id)
+                skills_filter_present = "skills" in request or "skills" in meta
+                turn_skills: list[str] | None = None
+                if "skills" in request and isinstance(request.get("skills"), list):
+                    turn_skills = [str(x) for x in request["skills"]]
+                elif "skills" in meta and isinstance(meta.get("skills"), list):
+                    turn_skills = [str(x) for x in meta["skills"]]
+                enabled = await self._trajectory_enabled_skill_names(agent_id)
+                if enabled is not None:
+                    skills = filter_turn_skill_names(
+                        enabled,
+                        turn_skills=turn_skills,
+                        skills_filter_present=skills_filter_present,
+                    )
+                mcp_names = _mcp_server_names(request.get("mcp_servers"))
+            for chunk in build_turn_start_chunks(
+                include_system=include_system,
+                system_prompt=system_prompt,
+                workspace_files=workspace_files,
+                skills=skills,
+                mcp_servers=mcp_names,
+                skills_filter_present=skills_filter_present,
+            ):
+                self._observe_trajectory(
+                    agent_id=agent_id,
+                    thread_id=thread_id,
+                    chunk=chunk,
+                    enabled=True,
+                )
+        except Exception:
+            logger.exception(
+                "trajectory turn-start context failed agent=%s thread=%s",
+                agent_id,
+                thread_id,
+            )
+
+    def _trajectory_system_prompt(self, agent_id: str) -> str | None:
+        """Live harness config prompt — same string the graph was compiled with."""
+        try:
+            agent = self._agent_manager.get_agent(agent_id)
+            prompt = getattr(getattr(agent, "_config", None), "system_prompt", None)
+            if isinstance(prompt, str) and prompt.strip():
+                return prompt
+        except Exception:
+            logger.debug(
+                "trajectory live system_prompt unavailable agent=%s",
+                agent_id,
+                exc_info=True,
+            )
+        row = self._agent_repo.get(agent_id)
+        if row is not None and isinstance(row.system_prompt, str) and row.system_prompt.strip():
+            return row.system_prompt
+        return None
+
+    async def _trajectory_enabled_skill_names(self, agent_id: str) -> list[dict[str, str]] | None:
+        """Enabled skills from harness catalog (SoT for prompt skill section)."""
+        try:
+            agent = self._agent_manager.get_agent(agent_id)
+            summaries = await agent.list_skill_summaries()
+        except Exception:
+            logger.debug(
+                "trajectory skill catalog unavailable agent=%s",
+                agent_id,
+                exc_info=True,
+            )
+            return None
+        rows: list[dict[str, str]] = []
+        seen: set[str] = set()
+        for row in summaries:
+            if not isinstance(row, dict) or not row.get("enabled", True):
+                continue
+            name = str(row.get("name") or row.get("slug") or "").strip()
+            slug = str(row.get("slug") or "").strip()
+            if not name or name in seen:
+                continue
+            seen.add(name)
+            item = {"name": name}
+            if slug:
+                item["slug"] = slug
+            rows.append(item)
+        return rows
+
+    async def _trajectory_workspace_files(self, agent_id: str) -> list[str]:
+        """Return existing harness memory paths without duplicating their contents."""
+        from octop.infra.trajectory.turn_context import memory_file_order  # noqa: PLC0415
+
+        workspace = harness_workspace_for_agent(self._agent_manager, agent_id)
+        if workspace is None:
+            return []
+        out: list[str] = []
+        for name in memory_file_order():
+            try:
+                exists = await workspace.aexists(name)
+            except Exception:
+                logger.debug(
+                    "trajectory workspace exists failed agent=%s path=%s",
+                    agent_id,
+                    name,
+                    exc_info=True,
+                )
+                continue
+            if not exists:
+                continue
+            out.append(name)
+        return out
+
     # -- TeamProcessor (harness inbox async peer collaboration) ----------------
 
     def compose_followup(
@@ -580,6 +770,7 @@ async def iter_turn_chunks(self, msg: InboundMessage) -> AsyncIterator[dict[str,
             return
 
         agent_row = self._agent_repo.get(agent_id)
+        traj_on = self._agent_trajectory_enabled(agent_id, agent_row)
         user_id = resolve_user_id_for_message(
             msg,
             agent_owner_id=agent_row.user_id if agent_row is not None else None,
@@ -627,6 +818,28 @@ async def iter_turn_chunks(self, msg: InboundMessage) -> AsyncIterator[dict[str,
             thread_id=thread_id,
             meta=meta,
         )
+        await self._observe_turn_start_context(
+            agent_id=agent_id,
+            thread_id=thread_id,
+            request=request,
+            meta=meta,
+            phase="system",
+            trajectory_enabled=traj_on,
+        )
+        self._observe_trajectory(
+            agent_id=agent_id,
+            thread_id=thread_id,
+            chunk={"type": "user", "content": msg.text or "", "source": channel_type},
+            enabled=traj_on,
+        )
+        await self._observe_turn_start_context(
+            agent_id=agent_id,
+            thread_id=thread_id,
+            request=request,
+            meta=meta,
+            phase="context",
+            trajectory_enabled=traj_on,
+        )
 
         stream_ok = False
         harness_workspace = harness_workspace_for_agent(self._agent_manager, agent_id)
@@ -643,6 +856,12 @@ async def iter_turn_chunks(self, msg: InboundMessage) -> AsyncIterator[dict[str,
             async for chunk in self._agent_manager.stream(agent_id, request):
                 usage_tracker.observe(chunk)
                 history_tracker.observe(chunk)
+                self._observe_trajectory(
+                    agent_id=agent_id,
+                    thread_id=thread_id,
+                    chunk=chunk,
+                    enabled=traj_on,
+                )
                 if chunk.get("type") == "hitl_required":
                     request_payload = chunk.get("request")
                     if isinstance(request_payload, dict):
@@ -688,6 +907,8 @@ async def iter_turn_chunks(self, msg: InboundMessage) -> AsyncIterator[dict[str,
         except Exception as exc:
             await self._record_stream_error(user_id=user_id, agent_id=agent_id, exc=exc)
             yield {"type": "error", "message": format_stream_error(exc, locale)}
+        finally:
+            self._finish_trajectory(thread_id=thread_id, usage=usage_tracker.usage, enabled=traj_on)
         if stream_ok:
             self._touch_thread_after_turn(thread_id, msg.text)
             self._record_turn_usage(
@@ -711,6 +932,7 @@ async def iter_hitl_resume_chunks(
         usage_tracker = UsageTracker()
         history_tracker = TurnHistoryTracker()
         completed = False
+        traj_on = self._agent_trajectory_enabled(agent_id)
         try:
             async for chunk in self._agent_manager.resume_hitl(
                 agent_id,
@@ -719,9 +941,16 @@ async def iter_hitl_resume_chunks(
             ):
                 usage_tracker.observe(chunk)
                 history_tracker.observe(chunk)
+                self._observe_trajectory(
+                    agent_id=agent_id,
+                    thread_id=thread_id,
+                    chunk=chunk,
+                    enabled=traj_on,
+                )
                 yield chunk
             completed = True
         finally:
+            self._finish_trajectory(thread_id=thread_id, usage=usage_tracker.usage, enabled=traj_on)
             if completed:
                 self._touch_thread_after_turn(thread_id, None)
                 self._record_turn_usage(
@@ -983,3 +1212,13 @@ def _record_turn_history(
                 thread_id,
                 exc_info=True,
             )
+
+
+def _mcp_server_names(raw: Any) -> list[str] | None:
+    if isinstance(raw, list):
+        names = [str(item).strip() for item in raw if str(item).strip()]
+        return names or None
+    if isinstance(raw, dict):
+        names = [str(key).strip() for key in raw if str(key).strip()]
+        return names or None
+    return None
diff --git a/src/octop/infra/gateway/threads.py b/src/octop/infra/gateway/threads.py
index e2a359cd..2c4911b9 100644
--- a/src/octop/infra/gateway/threads.py
+++ b/src/octop/infra/gateway/threads.py
@@ -57,6 +57,37 @@ def replace_repos(self, *, session_repo: SessionRepo, thread_repo: ThreadRepo) -
         self._sessions = session_repo
         self._threads = thread_repo
 
+    def _refresh_session_if_needed(
+        self,
+        row: SessionRow,
+        *,
+        channel_id: str | None,
+        channel_metadata: dict[str, Any] | None,
+    ) -> None:
+        """Update a live session when inbound channel id or routing metadata changed."""
+        merged_meta = dict(row.channel_metadata or {})
+        if channel_metadata:
+            merged_meta.update(channel_metadata)
+        if channel_id:
+            merged_meta["channel_id"] = channel_id
+        if not (
+            (channel_id and channel_id != row.channel_id)
+            or merged_meta != (row.channel_metadata or {})
+        ):
+            return
+        self._sessions.upsert(
+            session_key=row.session_key,
+            agent_id=row.agent_id,
+            user_id=row.user_id,
+            channel_type=row.channel_type,
+            chat_type=row.chat_type,
+            thread_id=row.thread_id,
+            channel_subject_id=row.channel_subject_id,
+            channel_chat_type=row.channel_chat_type,
+            channel_metadata=merged_meta,
+            channel_id=channel_id or row.channel_id,
+        )
+
     async def get_or_create(
         self,
         *,
@@ -76,53 +107,23 @@ async def get_or_create(
         )
         row = self._sessions.get(session_key)
         if row is not None:
-            merged_meta = dict(row.channel_metadata or {})
-            if channel_metadata:
-                merged_meta.update(channel_metadata)
-            needs_upsert = (channel_id and not row.channel_id) or (
-                channel_metadata and merged_meta != (row.channel_metadata or {})
+            self._refresh_session_if_needed(
+                row, channel_id=channel_id, channel_metadata=channel_metadata
             )
-            if needs_upsert:
-                self._sessions.upsert(
-                    session_key=session_key,
-                    agent_id=row.agent_id,
-                    user_id=row.user_id,
-                    channel_type=row.channel_type,
-                    chat_type=row.chat_type,
-                    thread_id=row.thread_id,
-                    channel_subject_id=row.channel_subject_id,
-                    channel_chat_type=row.channel_chat_type,
-                    channel_metadata=merged_meta,
-                    channel_id=channel_id or row.channel_id,
-                )
             return row.thread_id
         async with self._lock:
             row = self._sessions.get(session_key)
             if row is not None:
-                merged_meta = dict(row.channel_metadata or {})
-                if channel_metadata:
-                    merged_meta.update(channel_metadata)
-                needs_upsert = (channel_id and not row.channel_id) or (
-                    channel_metadata and merged_meta != (row.channel_metadata or {})
+                self._refresh_session_if_needed(
+                    row, channel_id=channel_id, channel_metadata=channel_metadata
                 )
-                if needs_upsert:
-                    self._sessions.upsert(
-                        session_key=session_key,
-                        agent_id=row.agent_id,
-                        user_id=row.user_id,
-                        channel_type=row.channel_type,
-                        chat_type=row.chat_type,
-                        thread_id=row.thread_id,
-                        channel_subject_id=row.channel_subject_id,
-                        channel_chat_type=row.channel_chat_type,
-                        channel_metadata=merged_meta,
-                        channel_id=channel_id or row.channel_id,
-                    )
                 return row.thread_id
             tid = _new_thread_id()
             meta = dict(channel_metadata or {})
             meta.setdefault("channel_type", channel_type)
             meta.setdefault("user_id", user_id)
+            if channel_id:
+                meta["channel_id"] = channel_id
             self._threads.insert(
                 thread_id=tid,
                 agent_id=agent_id,
@@ -161,25 +162,9 @@ async def get_or_create_by_key(
             if row.agent_id != agent_id:
                 msg = f"session {session_key!r} belongs to agent {row.agent_id!r}, not {agent_id!r}"
                 raise ValueError(msg)
-            merged_meta = dict(row.channel_metadata or {})
-            if channel_metadata:
-                merged_meta.update(channel_metadata)
-            needs_upsert = (channel_channel_id and not row.channel_id) or (
-                channel_metadata and merged_meta != (row.channel_metadata or {})
+            self._refresh_session_if_needed(
+                row, channel_id=channel_channel_id, channel_metadata=channel_metadata
             )
-            if needs_upsert:
-                self._sessions.upsert(
-                    session_key=session_key,
-                    agent_id=row.agent_id,
-                    user_id=row.user_id,
-                    channel_type=row.channel_type,
-                    chat_type=row.chat_type,
-                    thread_id=row.thread_id,
-                    channel_subject_id=row.channel_subject_id,
-                    channel_chat_type=row.channel_chat_type,
-                    channel_metadata=merged_meta,
-                    channel_id=channel_channel_id or row.channel_id,
-                )
             return row.thread_id
         parts = session_key.split(":", 3)
         subject_id = parts[2] if len(parts) >= 3 else str(user_id)
@@ -263,6 +248,8 @@ async def reset(
         meta = dict(channel_metadata or {})
         meta.setdefault("channel_type", channel_type)
         meta.setdefault("user_id", user_id)
+        if channel_id:
+            meta["channel_id"] = channel_id
         async with self._lock:
             tid = _new_thread_id()
             self._threads.insert(
diff --git a/src/octop/infra/gateway/ws/ws_channel.py b/src/octop/infra/gateway/ws/ws_channel.py
index 1ccc0ceb..50ed02cf 100644
--- a/src/octop/infra/gateway/ws/ws_channel.py
+++ b/src/octop/infra/gateway/ws/ws_channel.py
@@ -180,10 +180,12 @@ async def _send_text(self, subject: ChannelSubject, text: str) -> None:
         thread_id = str(subject.metadata.get("thread_id") or "").strip()
         if thread_id:
             await self._hub.push_to_thread(thread_id, {"type": "token", "content": text})
+            await self._hub.push_to_thread(thread_id, {"type": "done"})
             return
         conn_id = str(subject.metadata.get("ws_connection_id") or "")
         if conn_id:
             await self._hub.push(conn_id, {"type": "token", "content": text})
+            await self._hub.push(conn_id, {"type": "done"})
 
     async def _send_content(self, subject: ChannelSubject, parts: list[ContentPart]) -> None:
         text = "\n".join(p.text for p in parts if isinstance(p, TextContent) and p.text)
diff --git a/src/octop/infra/knowledge/jobs.py b/src/octop/infra/knowledge/jobs.py
index 2ed0924e..7173c1c1 100644
--- a/src/octop/infra/knowledge/jobs.py
+++ b/src/octop/infra/knowledge/jobs.py
@@ -10,6 +10,7 @@
 from octop.infra.knowledge.files import document_path
 from octop.infra.knowledge.gate import assert_knowledge_usable
 from octop.infra.knowledge.index import KnowledgeIndex
+from octop.infra.knowledge.ocr import optional_ocr_extractor
 from octop.infra.knowledge.params import get_advanced_settings
 from octop.infra.knowledge.parse import parse_document
 
@@ -42,7 +43,8 @@ def process_document(services: Any, kb_id: str, doc_id: str) -> None:
         return
     repo.update_document(doc_id, status="processing", error_message="")
     try:
-        text = parse_document(document_path(kb_id, doc_id, document.filename))
+        path = document_path(kb_id, doc_id, document.filename)
+        text = parse_document(path, ocr=optional_ocr_extractor(services))
         knobs = get_advanced_settings(services.settings_repo.get)
         chunks = chunk_text(text, size=knobs["chunk_size"], overlap=knobs["chunk_overlap"])
         if not (text or "").strip() or not chunks:
diff --git a/src/octop/infra/knowledge/ocr.py b/src/octop/infra/knowledge/ocr.py
new file mode 100644
index 00000000..f1ba8c49
--- /dev/null
+++ b/src/octop/infra/knowledge/ocr.py
@@ -0,0 +1,302 @@
+"""Optional OCR backends for knowledge-base images and scanned PDFs."""
+
+from __future__ import annotations
+
+import asyncio
+import base64
+import json
+import threading
+from collections.abc import Iterator
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Any, Protocol
+
+from langchain_core.messages import HumanMessage
+
+from octop.infra.agents.providers.model_flags import is_chat_eligible_model, is_vision_model
+from octop.infra.agents.providers.probe import build_probe_chat_model
+from octop.infra.utils.llm_text import llm_text_content
+from octop.infra.utils.runtime_packages import PackageInstallSpec, install_packages
+
+OCR_IMAGE_SUFFIXES = frozenset({".png", ".jpg", ".jpeg", ".webp"})
+
+_ENABLED_KEY = "knowledge_ocr_enabled"
+_BACKEND_KEY = "knowledge_ocr_backend"
+_MODEL_KEY = "knowledge_ocr_model"
+_PROVIDER_ID_KEY = "knowledge_ocr_provider_id"
+_LOCAL_PACKAGES = ("rapidocr>=3.4,<4", "onnxruntime>=1.17", "pymupdf>=1.24")
+_LOCAL_SPEC = PackageInstallSpec(packages=_LOCAL_PACKAGES, extra_fallback="knowledge-ocr")
+_PDF_SPEC = PackageInstallSpec(packages=("pymupdf>=1.24",), extra_fallback="knowledge-ocr")
+_OCR_PROMPT = (
+    "Transcribe all visible text in this image exactly. Preserve reading order, headings, "
+    "lists, and table rows. Return only the transcription, without commentary."
+)
+
+_local_engine: Any | None = None
+_local_engine_lock = threading.Lock()
+
+
+class OcrExtractor(Protocol):
+    def __call__(self, path: Path) -> str: ...
+
+
+@dataclass(frozen=True)
+class OcrConfig:
+    enabled: bool
+    backend: str
+    model: str
+    provider_id: str
+
+
+def _as_bool(value: str | None) -> bool:
+    if value is None:
+        return False
+    try:
+        decoded: Any = json.loads(value)
+    except json.JSONDecodeError:
+        decoded = value
+    if isinstance(decoded, bool):
+        return decoded
+    return str(decoded).strip().lower() == "true"
+
+
+def load_ocr_config(settings_get: Any) -> OcrConfig:
+    backend = (settings_get(_BACKEND_KEY) or "onnx").strip().lower()
+    return OcrConfig(
+        enabled=_as_bool(settings_get(_ENABLED_KEY)),
+        backend=backend if backend in {"onnx", "remote"} else "onnx",
+        model=(settings_get(_MODEL_KEY) or "").strip(),
+        provider_id=(settings_get(_PROVIDER_ID_KEY) or "").strip(),
+    )
+
+
+def local_ocr_deps_available() -> bool:
+    try:
+        import pymupdf  # noqa: F401
+        import rapidocr  # noqa: F401
+    except ImportError:
+        return False
+    return True
+
+
+def pdf_ocr_deps_available() -> bool:
+    try:
+        import pymupdf  # noqa: F401
+    except ImportError:
+        return False
+    return True
+
+
+def ensure_ocr_deps(*, backend: str) -> str:
+    if backend == "onnx":
+        if local_ocr_deps_available():
+            return "ready"
+        outcome = install_packages(
+            _LOCAL_SPEC,
+            is_satisfied=local_ocr_deps_available,
+            import_modules=("rapidocr", "onnxruntime", "pymupdf"),
+        )
+        if not local_ocr_deps_available():
+            raise RuntimeError("Local OCR components were installed but could not be loaded")
+        return outcome
+    if pdf_ocr_deps_available():
+        return "ready"
+    outcome = install_packages(
+        _PDF_SPEC,
+        is_satisfied=pdf_ocr_deps_available,
+        import_modules=("pymupdf",),
+    )
+    if not pdf_ocr_deps_available():
+        raise RuntimeError("PDF OCR components were installed but could not be loaded")
+    return outcome
+
+
+async def ensure_ocr_deps_async(*, backend: str) -> str:
+    loop = asyncio.get_running_loop()
+    return await loop.run_in_executor(None, lambda: ensure_ocr_deps(backend=backend))
+
+
+def _provider_for_config(provider_repo: Any, config: OcrConfig) -> Any | None:
+    if provider_repo is None or not config.provider_id.isdigit():
+        return None
+    return provider_repo.get(int(config.provider_id))
+
+
+def _remote_ready(provider: Any | None, model_id: str) -> bool:
+    if not (provider and provider.enabled and provider.api_key and provider.base_url and model_id):
+        return False
+    return any(
+        str(model.get("id") or "").strip() == model_id
+        and is_chat_eligible_model(
+            model,
+            provider_name=provider.name,
+            provider_api_key=provider.api_key,
+        )
+        and is_vision_model(model)
+        for model in provider.get_models()
+    )
+
+
+def get_ocr_capability(settings_get: Any, provider_repo: Any = None) -> dict[str, Any]:
+    config = load_ocr_config(settings_get)
+    provider = _provider_for_config(provider_repo, config)
+    prerequisites_ok = (
+        local_ocr_deps_available()
+        if config.backend == "onnx"
+        else _remote_ready(provider, config.model)
+    )
+    return {
+        "enabled": config.enabled,
+        "backend": config.backend,
+        "model": config.model,
+        "provider_id": config.provider_id,
+        "prerequisites_ok": prerequisites_ok,
+        "usable": config.enabled and prerequisites_ok,
+        "checks": {
+            "deps_available": (
+                local_ocr_deps_available() if config.backend == "onnx" else pdf_ocr_deps_available()
+            ),
+            "provider_ready": _remote_ready(provider, config.model),
+        },
+    }
+
+
+def set_ocr_settings(
+    settings_set: Any,
+    *,
+    enabled: bool,
+    backend: str | None,
+    model: str | None,
+    provider_id: str | None,
+    provider_repo: Any = None,
+) -> None:
+    config = validate_ocr_settings(
+        enabled=enabled,
+        backend=backend,
+        model=model,
+        provider_id=provider_id,
+        provider_repo=provider_repo,
+    )
+    settings_set(_ENABLED_KEY, "true" if enabled else "false")
+    settings_set(_BACKEND_KEY, config.backend)
+    settings_set(_MODEL_KEY, config.model if config.backend == "remote" else "rapidocr")
+    settings_set(_PROVIDER_ID_KEY, config.provider_id if config.backend == "remote" else "")
+
+
+def validate_ocr_settings(
+    *,
+    enabled: bool,
+    backend: str | None,
+    model: str | None,
+    provider_id: str | None,
+    provider_repo: Any = None,
+) -> OcrConfig:
+    selected_backend = (backend or "onnx").strip().lower()
+    if selected_backend not in {"onnx", "remote"}:
+        raise ValueError("knowledge OCR backend must be onnx or remote")
+    selected_model = (model or "").strip()
+    selected_provider_id = (provider_id or "").strip()
+    if enabled and selected_backend == "onnx" and not local_ocr_deps_available():
+        raise RuntimeError("knowledge local OCR prerequisites are not satisfied")
+    if enabled and selected_backend == "remote":
+        config = OcrConfig(True, selected_backend, selected_model, selected_provider_id)
+        if not _remote_ready(_provider_for_config(provider_repo, config), selected_model):
+            raise ValueError("knowledge remote OCR provider is not ready")
+    return OcrConfig(enabled, selected_backend, selected_model, selected_provider_id)
+
+
+def require_ocr_extractor(services: Any) -> OcrExtractor:
+    config = load_ocr_config(services.settings_repo.get)
+    if not config.enabled:
+        raise RuntimeError("knowledge OCR is not enabled")
+    if config.backend == "onnx":
+        if not local_ocr_deps_available():
+            raise RuntimeError("knowledge local OCR prerequisites are not satisfied")
+        return _extract_local
+    provider = _provider_for_config(services.provider_repo, config)
+    if not _remote_ready(provider, config.model):
+        raise RuntimeError("knowledge remote OCR provider is not ready")
+    return _RemoteOcr(provider, config.model)
+
+
+def optional_ocr_extractor(services: Any) -> OcrExtractor | None:
+    if not load_ocr_config(services.settings_repo.get).enabled:
+        return None
+
+    def extract(path: Path) -> str:
+        return require_ocr_extractor(services)(path)
+
+    return extract
+
+
+def _image_inputs(path: Path) -> Iterator[tuple[bytes, str]]:
+    if path.suffix.lower() != ".pdf":
+        media_type = {
+            ".jpg": "image/jpeg",
+            ".jpeg": "image/jpeg",
+            ".webp": "image/webp",
+        }.get(path.suffix.lower(), "image/png")
+        yield path.read_bytes(), media_type
+        return
+
+    import pymupdf
+
+    pymupdf_api: Any = pymupdf
+    document = pymupdf_api.open(path)
+    try:
+        for page in document:
+            yield (
+                page.get_pixmap(matrix=pymupdf_api.Matrix(2, 2), alpha=False).tobytes("png"),
+                "image/png",
+            )
+    finally:
+        document.close()
+
+
+def _rapidocr_engine() -> Any:
+    global _local_engine
+    with _local_engine_lock:
+        if _local_engine is None:
+            from rapidocr import RapidOCR
+
+            _local_engine = RapidOCR()
+        return _local_engine
+
+
+def _extract_local(path: Path) -> str:
+    engine = _rapidocr_engine()
+    parts: list[str] = []
+    for data, _media_type in _image_inputs(path):
+        with _local_engine_lock:
+            result = engine(data)
+        text = getattr(result, "txts", None)
+        if isinstance(text, (list, tuple)):
+            page_text = "\n".join(str(line) for line in text if str(line).strip())
+        else:
+            page_text = str(text or "").strip()
+        if page_text:
+            parts.append(page_text)
+    return "\n\n".join(parts)
+
+
+class _RemoteOcr:
+    def __init__(self, provider: Any, model_id: str) -> None:
+        self._model = build_probe_chat_model(provider, model_id=model_id)
+
+    def __call__(self, path: Path) -> str:
+        parts: list[str] = []
+        for data, media_type in _image_inputs(path):
+            encoded = base64.b64encode(data).decode("ascii")
+            message = HumanMessage(
+                content=[
+                    {"type": "text", "text": _OCR_PROMPT},
+                    {
+                        "type": "image_url",
+                        "image_url": {"url": f"data:{media_type};base64,{encoded}"},
+                    },
+                ]
+            )
+            text = llm_text_content(self._model.invoke([message]))
+            if text:
+                parts.append(text)
+        return "\n\n".join(parts)
diff --git a/src/octop/infra/knowledge/parse.py b/src/octop/infra/knowledge/parse.py
index f1eb5b33..ce52ef23 100644
--- a/src/octop/infra/knowledge/parse.py
+++ b/src/octop/infra/knowledge/parse.py
@@ -2,22 +2,59 @@
 
 from __future__ import annotations
 
+import csv
+import io
+import json
+from collections.abc import Iterable
+from html.parser import HTMLParser
 from pathlib import Path
+from typing import TYPE_CHECKING, Any
 
+from octop.infra.knowledge.ocr import OCR_IMAGE_SUFFIXES
 
-def parse_document(path: Path) -> str:
+if TYPE_CHECKING:
+    from octop.infra.knowledge.ocr import OcrExtractor
+
+_PLAIN_TEXT_SUFFIXES = {
+    ".md",
+    ".markdown",
+    ".txt",
+    ".rst",
+    ".yaml",
+    ".yml",
+    ".jsonl",
+}
+_DOCX_FALLBACK_TAG = "{http://schemas.openxmlformats.org/markup-compatibility/2006}Fallback"
+_DOCX_HTML_TYPES = {"application/xhtml+xml", "text/html"}
+_DOCX_MAIN_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+
+
+def parse_document(path: Path, *, ocr: OcrExtractor | None = None) -> str:
     """Extract searchable text from a supported local document."""
     suffix = path.suffix.lower()
-    if suffix in {".md", ".txt"}:
-        return path.read_text(encoding="utf-8", errors="replace")
+    if suffix in OCR_IMAGE_SUFFIXES:
+        if ocr is None:
+            raise RuntimeError("knowledge OCR is not enabled")
+        return ocr(path)
+    if suffix in _PLAIN_TEXT_SUFFIXES:
+        return _read_text(path)
+    if suffix == ".json":
+        return _parse_json(path)
+    if suffix in {".html", ".htm"}:
+        return _parse_html(path)
+    if suffix == ".csv":
+        return _parse_delimited(path, delimiter=",")
+    if suffix == ".tsv":
+        return _parse_delimited(path, delimiter="\t")
     if suffix == ".pdf":
         from pypdf import PdfReader
 
-        return "\n".join(page.extract_text() or "" for page in PdfReader(path).pages)
+        text = "\n".join(page.extract_text() or "" for page in PdfReader(path).pages)
+        if text.strip() or ocr is None:
+            return text
+        return ocr(path)
     if suffix == ".docx":
-        from docx import Document
-
-        return "\n".join(paragraph.text for paragraph in Document(str(path)).paragraphs)
+        return _parse_docx(path)
     if suffix == ".pptx":
         from pptx import Presentation
 
@@ -27,4 +64,228 @@ def parse_document(path: Path) -> str:
             for shape in slide.shapes
             if hasattr(shape, "text") and shape.text
         )
+    if suffix in {".xlsx", ".xlsm"}:
+        return _parse_xlsx(path)
+    if suffix == ".xls":
+        return _parse_xls(path)
     raise ValueError(f"unsupported knowledge document extension: {suffix or '(none)'}")
+
+
+def _read_text(path: Path) -> str:
+    return path.read_text(encoding="utf-8-sig", errors="replace")
+
+
+def _parse_json(path: Path) -> str:
+    raw = _read_text(path)
+    try:
+        parsed = json.loads(raw)
+    except json.JSONDecodeError:
+        return raw
+    return json.dumps(parsed, ensure_ascii=False, indent=2)
+
+
+def _parse_docx(path: Path) -> str:
+    from docx import Document
+
+    document = Document(str(path))
+    return _docx_body_text(document.element.body, document.part)
+
+
+def _docx_body_text(body: Any, part: Any) -> str:
+    """Collect every ``w:p`` and ``w:altChunk`` in a body, in document order.
+
+    ``Document.paragraphs`` only lists ``w:p`` children of ``w:body``, so text inside
+    tables, content controls (``w:sdt``), revision wrappers (``w:ins``), and text boxes
+    is silently dropped. ``mc:Fallback`` duplicates its ``mc:Choice`` sibling, so its
+    paragraphs are skipped.
+    """
+    from docx.oxml.ns import qn
+
+    alt_chunk_tag = qn("w:altChunk")
+    lines: list[str] = []
+    for element in body.iter(qn("w:p"), alt_chunk_tag):
+        if next(element.iterancestors(_DOCX_FALLBACK_TAG), None) is not None:
+            continue
+        if element.tag == alt_chunk_tag:
+            lines.append(_docx_alt_chunk_text(element, part))
+        else:
+            lines.append(element.text)
+    return "\n".join(lines)
+
+
+def _docx_alt_chunk_text(element: Any, part: Any) -> str:
+    """Expand a ``w:altChunk`` reference the way Word does when opening the file.
+
+    Converters keep the bulk of the text in an embedded HTML or Word part and leave
+    only a stub in ``document.xml``; unexpanded, that body is lost.
+    """
+    from docx.oxml.ns import qn
+
+    chunk = part.related_parts.get(element.get(qn("r:id")) or "")
+    if chunk is None:
+        return ""
+    content_type = str(chunk.content_type)
+    blob: bytes = chunk.blob
+    if content_type in _DOCX_HTML_TYPES:
+        return _html_text(blob.decode("utf-8-sig", errors="replace"))
+    if content_type == "text/plain":
+        return blob.decode("utf-8-sig", errors="replace")
+    if content_type == _DOCX_MAIN_TYPE:
+        from docx import Document
+
+        nested = Document(io.BytesIO(blob))
+        return _docx_body_text(nested.element.body, nested.part)
+    return ""
+
+
+def _parse_html(path: Path) -> str:
+    return _html_text(_read_text(path))
+
+
+def _html_text(raw: str) -> str:
+    parser = _HTMLTextParser()
+    parser.feed(raw)
+    parser.close()
+    lines = [" ".join(line.split()) for line in parser.text().splitlines()]
+    return "\n".join(line for line in lines if line)
+
+
+class _HTMLTextParser(HTMLParser):
+    _SKIP = frozenset({"script", "style", "noscript", "template"})
+    _BLOCK = frozenset(
+        {
+            "p",
+            "div",
+            "br",
+            "li",
+            "tr",
+            "h1",
+            "h2",
+            "h3",
+            "h4",
+            "h5",
+            "h6",
+            "article",
+            "section",
+            "header",
+            "footer",
+            "blockquote",
+            "pre",
+            "table",
+            "ul",
+            "ol",
+        }
+    )
+
+    def __init__(self) -> None:
+        super().__init__(convert_charrefs=True)
+        self._parts: list[str] = []
+        self._skip = 0
+
+    def handle_starttag(self, tag: str, _attrs: list[tuple[str, str | None]]) -> None:
+        if tag in self._SKIP:
+            self._skip += 1
+            return
+        if not self._skip and tag in self._BLOCK:
+            self._parts.append("\n")
+
+    def handle_endtag(self, tag: str) -> None:
+        if tag in self._SKIP:
+            if self._skip:
+                self._skip -= 1
+            return
+        if not self._skip and tag in self._BLOCK:
+            self._parts.append("\n")
+
+    def handle_data(self, data: str) -> None:
+        if not self._skip and data:
+            self._parts.append(data)
+
+    def text(self) -> str:
+        return "".join(self._parts)
+
+
+def _stringify_cell(value: object) -> str:
+    if value is None:
+        return ""
+    if isinstance(value, bool):
+        return "TRUE" if value else "FALSE"
+    if isinstance(value, float) and value.is_integer():
+        return str(int(value))
+    return str(value).replace("\t", " ").replace("\n", " ").strip()
+
+
+def _trim_row(cells: list[str]) -> list[str]:
+    while cells and cells[-1] == "":
+        cells.pop()
+    return cells
+
+
+def _sheet_text(title: str, rows: Iterable[Iterable[object]]) -> str:
+    lines = [f"# {title}"]
+    has_cells = False
+    for raw in rows:
+        cells = _trim_row([_stringify_cell(cell) for cell in raw])
+        if not cells:
+            continue
+        has_cells = True
+        lines.append("\t".join(cells))
+    if not has_cells:
+        return ""
+    return "\n".join(lines)
+
+
+def _parse_delimited(path: Path, *, delimiter: str) -> str:
+    reader = csv.reader(_read_text(path).splitlines(), delimiter=delimiter)
+    return _sheet_text(path.stem, reader)
+
+
+def _parse_xlsx(path: Path) -> str:
+    from openpyxl import load_workbook
+
+    workbook = load_workbook(path, read_only=True, data_only=True)
+    try:
+        parts: list[str] = []
+        for sheet in workbook.worksheets:
+            text = _sheet_text(str(sheet.title), sheet.iter_rows(values_only=True))
+            if text:
+                parts.append(text)
+        return "\n\n".join(parts)
+    finally:
+        workbook.close()
+
+
+def _parse_xls(path: Path) -> str:
+    import xlrd
+
+    book = xlrd.open_workbook(str(path), formatting_info=False)
+    parts: list[str] = []
+    for sheet in book.sheets():
+        rows: list[list[object]] = []
+        for row_idx in range(sheet.nrows):
+            rows.append(
+                [
+                    _xlrd_cell_value(book, sheet.cell(row_idx, col_idx))
+                    for col_idx in range(sheet.ncols)
+                ]
+            )
+        text = _sheet_text(sheet.name, rows)
+        if text:
+            parts.append(text)
+    return "\n\n".join(parts)
+
+
+def _xlrd_cell_value(book: object, cell: object) -> object:
+    import xlrd
+
+    ctype = getattr(cell, "ctype", xlrd.XL_CELL_EMPTY)
+    value = getattr(cell, "value", None)
+    if ctype in {xlrd.XL_CELL_EMPTY, xlrd.XL_CELL_BLANK, xlrd.XL_CELL_ERROR}:
+        return None
+    if ctype == xlrd.XL_CELL_DATE:
+        datemode = int(getattr(book, "datemode", 0))
+        try:
+            return xlrd.xldate_as_datetime(value, datemode).isoformat(sep=" ", timespec="seconds")
+        except (OSError, OverflowError, TypeError, ValueError):
+            return value
+    return value
diff --git a/src/octop/infra/knowledge/service.py b/src/octop/infra/knowledge/service.py
index d6e9d56e..b7c2ef05 100644
--- a/src/octop/infra/knowledge/service.py
+++ b/src/octop/infra/knowledge/service.py
@@ -18,6 +18,11 @@
 )
 from octop.infra.knowledge.gate import assert_knowledge_usable
 from octop.infra.knowledge.index import KnowledgeIndex
+from octop.infra.knowledge.ocr import (
+    OCR_IMAGE_SUFFIXES,
+    load_ocr_config,
+    optional_ocr_extractor,
+)
 from octop.infra.knowledge.parse import parse_document
 from octop.infra.knowledge.relpath import normalize_kb_path, path_basename, path_parent
 
@@ -30,9 +35,26 @@
 _EXT_TO_CONTENT_TYPE = {
     ".txt": "text/plain",
     ".md": "text/markdown",
+    ".markdown": "text/markdown",
+    ".rst": "text/x-rst",
+    ".html": "text/html",
+    ".htm": "text/html",
+    ".json": "application/json",
+    ".jsonl": "application/jsonl",
+    ".yaml": "application/yaml",
+    ".yml": "application/yaml",
+    ".csv": "text/csv",
+    ".tsv": "text/tab-separated-values",
     ".pdf": "application/pdf",
     ".docx": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
     ".pptx": "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+    ".xls": "application/vnd.ms-excel",
+    ".xlsx": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+    ".xlsm": "application/vnd.ms-excel.sheet.macroEnabled.12",
+    ".png": "image/png",
+    ".jpg": "image/jpeg",
+    ".jpeg": "image/jpeg",
+    ".webp": "image/webp",
 }
 _ALLOWED_CONTENT_TYPES = set(_EXT_TO_CONTENT_TYPE.values())
 _TEXT_CONTENT_TYPES = {"text/plain", "text/markdown"}
@@ -41,11 +63,15 @@
 
 
 def _resolve_content_type(filename: str, content_type: str) -> str:
+    suffix = Path(filename).suffix.lower()
+    mapped = _EXT_TO_CONTENT_TYPE.get(suffix)
+    if mapped is not None:
+        return mapped
     ct = (content_type or "").strip().lower()
     if ct in _ALLOWED_CONTENT_TYPES:
         return ct
     if ct in {"", "application/octet-stream"}:
-        return _EXT_TO_CONTENT_TYPE.get(Path(filename).suffix.lower(), ct)
+        return ct
     return ct
 
 
@@ -160,7 +186,8 @@ def preview_document(
             raise LookupError("knowledge document not found")
         if document.is_dir:
             raise LookupError("knowledge document not found")
-        text = parse_document(document_path(kb_id, doc_id, document.filename))
+        path = document_path(kb_id, doc_id, document.filename)
+        text = parse_document(path, ocr=optional_ocr_extractor(self._services))
         if len(text) > _MAX_PREVIEW_CHARS:
             text = text[:_MAX_PREVIEW_CHARS]
         return {
@@ -314,6 +341,11 @@ def upload_document(
         name = path_basename(rel)
         if not name:
             raise ValueError("invalid knowledge document filename")
+        if (
+            Path(name).suffix.lower() in OCR_IMAGE_SUFFIXES
+            and not load_ocr_config(self._services.settings_repo.get).enabled
+        ):
+            raise ValueError("knowledge OCR must be enabled for image documents")
         resolved_type = _resolve_content_type(name, content_type)
         if resolved_type not in _ALLOWED_CONTENT_TYPES:
             raise ValueError(f"unsupported knowledge document content type: {content_type}")
diff --git a/src/octop/infra/mobile/docker_install.py b/src/octop/infra/mobile/docker_install.py
new file mode 100644
index 00000000..f4ceedfc
--- /dev/null
+++ b/src/octop/infra/mobile/docker_install.py
@@ -0,0 +1,387 @@
+"""Automatic Docker install for the Android container backend.
+
+Design notes:
+- No geo detection: the install source is picked by a pure latency race that
+  includes the official https://download.docker.com (fastest wins; when the
+  official source wins, no ``DOWNLOAD_URL`` override is passed).
+- Installs via the bundled official get.docker.com script (vendored copy at
+  scripts/linux/v1.0/install-docker.sh) so hosts the online script does not
+  support (TencentOS / OpenCloudOS releasever mapping, offline curl failures,
+  etc.) still install, and we never pipe the network straight into ``sh``.
+- Registry-mirror config probes Tencent Cloud's mirror reachability (again no
+  geo check) and runs only right after a fresh install, so a daemon that may
+  already be running user containers is never restarted.
+"""
+
+from __future__ import annotations
+
+import asyncio
+import contextlib
+import json
+import os
+import re
+import shutil
+import subprocess
+from collections.abc import AsyncIterator
+from pathlib import Path
+
+from octop.i18n import tr
+from octop.infra.utils.posix_compat import geteuid
+
+# Official source first; latency race decides (no region detection).
+_DOCKER_CE_SOURCES = (
+    "https://download.docker.com",
+    "https://mirrors.aliyun.com/docker-ce",
+    "https://mirrors.tencent.com/docker-ce",
+    "https://mirrors.163.com/docker-ce",
+    "https://mirrors.cernet.edu.cn/docker-ce",
+)
+_OFFICIAL_SOURCE = "https://download.docker.com"
+_TENCENT_MIRROR_HOST = "mirror.ccs.tencentyun.com"
+_TENCENT_MIRROR_URL = f"https://{_TENCENT_MIRROR_HOST}/"
+_DAEMON_JSON = Path("/etc/docker/daemon.json")
+
+_SPEED_TEST_ITERATIONS = 3
+_SPEED_TEST_TIMEOUT = 5.0
+_PROBE_TIMEOUT = 3.0
+_DAEMON_READY_TIMEOUT = 10.0
+_DAEMON_WAIT_AFTER_RESTART = 30.0
+_DAEMON_WAIT_INTERVAL = 2.0
+# The vendored script sleeps 20s when docker already exists, and package
+# manager steps can take minutes on slow links; keep the read patient.
+_SCRIPT_READLINE_TIMEOUT = 600.0
+_SCRIPT_TAIL_LINES = 40
+
+# Known fatal script outputs → friendly localized hints. Matched
+# case-insensitively against the tail of the script output.
+_SCRIPT_ERROR_HINTS: tuple[tuple[re.Pattern[str], str], ...] = (
+    (
+        re.compile(r"unsupported (?:operating system|distribution)", re.I),
+        "docker_hint_unsupported_distro",
+    ),
+    (re.compile(r"needs the ability to run commands as root", re.I), "docker_hint_no_root"),
+    (re.compile(r"unable to find either .sudo. or .su.", re.I), "docker_hint_no_root"),
+    (re.compile(r"command appears to already exist", re.I), "docker_hint_already_installed"),
+    (re.compile(r"curl", re.I), "docker_hint_network"),
+    (
+        re.compile(r"(?:apt|apt-get|dpkg|dnf|yum).*?(?:error|failed|lock)", re.I),
+        "docker_hint_pkg_manager",
+    ),
+    (
+        re.compile(r"^E: .*(?:lock|unable to locate|not available)", re.I | re.M),
+        "docker_hint_pkg_manager",
+    ),
+    (re.compile(r"key.*(?:expired|not found|rejected)", re.I), "docker_hint_gpg_key"),
+    (re.compile(r"no space left on device", re.I), "docker_hint_disk_full"),
+)
+
+
+def _log(locale: str, key: str, **kwargs: object) -> str:
+    text = tr(f"mobile.{key}", locale)
+    return text.format(**kwargs) if kwargs else text
+
+
+def bundled_scripts_dir() -> Path:
+    return Path(__file__).resolve().parent / "scripts" / "linux" / "v1.0"
+
+
+def bundled_install_script() -> Path:
+    """Path of the vendored official Docker install script."""
+    return bundled_scripts_dir() / "install-docker.sh"
+
+
+def _classify_script_error(lines: list[str]) -> str | None:
+    """Map the tail of script output onto a friendly hint key, if any."""
+    tail = "\n".join(lines[-_SCRIPT_TAIL_LINES:])
+    for pattern, key in _SCRIPT_ERROR_HINTS:
+        if pattern.search(tail):
+            return key
+    return None
+
+
+async def _measure_source_delay(url: str) -> float | None:
+    """Average curl time_total over a few probes; None when unreachable."""
+    if shutil.which("curl") is None:
+        return None
+    times: list[float] = []
+    for _ in range(_SPEED_TEST_ITERATIONS):
+        try:
+            proc = await asyncio.create_subprocess_exec(
+                "curl",
+                "-o",
+                "/dev/null",
+                "-s",
+                "-w",
+                "%{time_total}",
+                "--connect-timeout",
+                "3",
+                "-m",
+                str(_SPEED_TEST_TIMEOUT),
+                url,
+                stdout=asyncio.subprocess.PIPE,
+                stderr=asyncio.subprocess.DEVNULL,
+            )
+        except OSError:
+            return None
+        out, _ = await proc.communicate()
+        if proc.returncode != 0:
+            return None
+        try:
+            times.append(float(out.decode("utf-8", errors="replace").strip()))
+        except ValueError:
+            return None
+    return sum(times) / len(times)
+
+
+async def select_download_source() -> tuple[str | None, float | None]:
+    """Latency-race all sources.
+
+    Returns ``(mirror_url, delay)`` for the fastest mirror, ``(None, delay)``
+    when the official source wins (caller must not set ``DOWNLOAD_URL``), or
+    ``(None, None)`` when nothing is reachable.
+    """
+    best_source: str | None = None
+    best_delay: float | None = None
+    for source in _DOCKER_CE_SOURCES:
+        delay = await _measure_source_delay(source)
+        if delay is None:
+            continue
+        if best_delay is None or delay < best_delay:
+            best_delay = delay
+            best_source = None if source == _OFFICIAL_SOURCE else source
+    return best_source, best_delay
+
+
+def can_install_without_password() -> bool:
+    """Whether this process may install packages (root or passwordless sudo)."""
+    if geteuid() == 0:
+        return True
+    if shutil.which("sudo") is None:
+        return False
+    try:
+        proc = subprocess.run(
+            ["sudo", "-n", "true"],
+            capture_output=True,
+            timeout=5,
+            check=False,
+        )
+    except (OSError, subprocess.TimeoutExpired):
+        return False
+    return proc.returncode == 0
+
+
+async def docker_daemon_ready(timeout: float = _DAEMON_READY_TIMEOUT) -> bool:
+    """Docker CLI present and the daemon answers."""
+    if shutil.which("docker") is None:
+        return False
+    try:
+        proc = await asyncio.create_subprocess_exec(
+            "docker",
+            "version",
+            "--format",
+            "{{.Server.Version}}",
+            stdout=asyncio.subprocess.DEVNULL,
+            stderr=asyncio.subprocess.DEVNULL,
+        )
+        await asyncio.wait_for(proc.communicate(), timeout=timeout)
+    except (TimeoutError, OSError):
+        return False
+    return proc.returncode == 0
+
+
+async def _probe_tencent_mirror() -> bool:
+    """Plain TCP reachability check for the Tencent Cloud registry mirror."""
+    try:
+        _, writer = await asyncio.wait_for(
+            asyncio.open_connection(_TENCENT_MIRROR_HOST, 443), timeout=_PROBE_TIMEOUT
+        )
+    except (TimeoutError, OSError):
+        return False
+    writer.close()
+    with contextlib.suppress(OSError):
+        await writer.wait_closed()
+    return True
+
+
+def _privileged_cmd(*cmd: str) -> list[str]:
+    """Prefix ``sudo -n`` when we are not already root (passwordless sudo)."""
+    if geteuid() == 0:
+        return list(cmd)
+    return ["sudo", "-n", *cmd]
+
+
+def _run_privileged(*cmd: str, input_bytes: bytes | None = None) -> bool:
+    """Run ``cmd``, prefixing ``sudo -n`` when the process is not root."""
+    argv = list(cmd) if geteuid() == 0 else _privileged_cmd(*cmd)
+    try:
+        proc = subprocess.run(
+            argv,
+            input=input_bytes,
+            capture_output=True,
+            timeout=15,
+            check=False,
+        )
+    except (OSError, subprocess.TimeoutExpired):
+        return False
+    return proc.returncode == 0
+
+
+def _copy_privileged(src: Path, dst: Path) -> bool:
+    try:
+        shutil.copy2(src, dst)
+        return True
+    except OSError:
+        return _run_privileged("cp", "-a", str(src), str(dst))
+
+
+def _write_text_privileged(path: Path, text: str) -> bool:
+    try:
+        path.write_text(text, encoding="utf-8")
+        return True
+    except OSError:
+        return _run_privileged("tee", str(path), input_bytes=text.encode("utf-8"))
+
+
+def _merge_registry_mirror(daemon_json: Path, mirror: str) -> bool:
+    """Add ``registry-mirrors`` to daemon.json unless already configured.
+
+    Backs up the previous file as ``daemon.json.backup``. Returns True when the
+    file was written; False when left untouched (already configured, or the
+    existing file is unreadable/corrupt). Writes via ``sudo -n`` when the
+    process is not root (same gate as the install itself).
+    """
+    config: dict[str, object] = {}
+    if daemon_json.exists():
+        try:
+            loaded = json.loads(daemon_json.read_text(encoding="utf-8"))
+        except (OSError, ValueError):
+            return False
+        if not isinstance(loaded, dict):
+            return False
+        config = loaded
+    if "registry-mirrors" in config:
+        return False
+    if not daemon_json.parent.exists():
+        return False
+    if daemon_json.exists() and not _copy_privileged(
+        daemon_json, daemon_json.parent / f"{daemon_json.name}.backup"
+    ):
+        return False
+    config["registry-mirrors"] = [mirror]
+    return _write_text_privileged(
+        daemon_json,
+        json.dumps(config, indent=2, ensure_ascii=False) + "\n",
+    )
+
+
+async def _restart_docker_daemon() -> bool:
+    for cmd in (
+        ("systemctl", "restart", "docker"),
+        ("service", "docker", "restart"),
+    ):
+        if shutil.which(cmd[0]) is None:
+            continue
+        argv = _privileged_cmd(*cmd)
+        try:
+            proc = await asyncio.create_subprocess_exec(
+                *argv,
+                stdout=asyncio.subprocess.DEVNULL,
+                stderr=asyncio.subprocess.DEVNULL,
+            )
+            await asyncio.wait_for(proc.communicate(), timeout=_DAEMON_READY_TIMEOUT)
+        except (TimeoutError, OSError):
+            continue
+        if proc.returncode == 0:
+            return True
+    return False
+
+
+async def _wait_for_daemon(seconds: float) -> bool:
+    deadline = asyncio.get_running_loop().time() + seconds
+    while True:
+        if await docker_daemon_ready():
+            return True
+        if asyncio.get_running_loop().time() >= deadline:
+            return False
+        await asyncio.sleep(_DAEMON_WAIT_INTERVAL)
+
+
+async def auto_install_docker_stream(*, locale: str = "en") -> AsyncIterator[str]:
+    """Yield human-readable log lines for the automatic Docker install.
+
+    Success is judged by the caller via :func:`docker_daemon_ready`, so this
+    generator only reports what happened.
+    """
+    # 0) The vendored official script must ship with this Octop install.
+    script = bundled_install_script()
+    if not script.is_file():
+        yield _log(locale, "docker_install_script_missing")
+        return
+
+    # 1) Latency-race install sources (official included, no geo detection).
+    source, delay = await select_download_source()
+    if delay is not None and source is None:
+        yield _log(locale, "docker_source_official")
+    elif source is not None and delay is not None:
+        yield _log(locale, "docker_source_selected", source=source, delay=round(delay, 3))
+    else:
+        yield _log(locale, "docker_source_fallback")
+
+    # 2) Run the bundled official install script; a winning mirror rides on
+    #    DOWNLOAD_URL (the script honours a preset DOWNLOAD_URL env var).
+    env = {k: v for k, v in os.environ.items() if k != "DOWNLOAD_URL"}
+    if source is not None:
+        env["DOWNLOAD_URL"] = source
+    yield _log(locale, "docker_install_log_start")
+    output_lines: list[str] = []
+    try:
+        proc = await asyncio.create_subprocess_exec(
+            "sh",
+            str(script),
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.STDOUT,
+            env=env,
+        )
+    except OSError as exc:
+        yield _log(locale, "docker_install_spawn_failed", error=str(exc))
+        return
+    assert proc.stdout is not None
+    while True:
+        try:
+            line = await asyncio.wait_for(proc.stdout.readline(), timeout=_SCRIPT_READLINE_TIMEOUT)
+        except TimeoutError:
+            proc.kill()
+            await proc.wait()
+            yield _log(locale, "docker_install_stalled")
+            return
+        if not line:
+            break
+        text = line.decode("utf-8", errors="replace").strip()
+        if text:
+            output_lines.append(text)
+            yield text
+    code = await proc.wait()
+    if code != 0:
+        yield _log(locale, "docker_install_script_failed", exit_code=code)
+        hint_key = _classify_script_error(output_lines)
+        if hint_key is not None:
+            yield _log(locale, hint_key)
+        return
+
+    # 3) Registry mirror: only probe reachability, only for this fresh install.
+    if await _probe_tencent_mirror():
+        yield _log(locale, "docker_mirror_reachable")
+        if _merge_registry_mirror(_DAEMON_JSON, _TENCENT_MIRROR_URL):
+            yield _log(locale, "docker_mirror_configured")
+            if await _restart_docker_daemon():
+                yield _log(locale, "docker_restart_ok")
+                if await _wait_for_daemon(_DAEMON_WAIT_AFTER_RESTART):
+                    yield _log(locale, "docker_restart_ready")
+                else:
+                    yield _log(locale, "docker_restart_failed")
+            else:
+                yield _log(locale, "docker_restart_failed")
+        else:
+            yield _log(locale, "docker_mirror_skipped")
+    else:
+        yield _log(locale, "docker_mirror_unreachable")
diff --git a/src/octop/infra/mobile/scripts/linux/v1.0/install-docker.sh b/src/octop/infra/mobile/scripts/linux/v1.0/install-docker.sh
new file mode 100755
index 00000000..77654219
--- /dev/null
+++ b/src/octop/infra/mobile/scripts/linux/v1.0/install-docker.sh
@@ -0,0 +1,857 @@
+#!/bin/sh
+set -e
+# Docker Engine for Linux installation script.
+#
+# This script is intended as a convenient way to configure docker's package
+# repositories and to install Docker Engine, This script is not recommended
+# for production environments. Before running this script, make yourself familiar
+# with potential risks and limitations, and refer to the installation manual
+# at https://docs.docker.com/engine/install/ for alternative installation methods.
+#
+# The script:
+#
+# - Requires `root` or `sudo` privileges to run.
+# - Attempts to detect your Linux distribution and version and configure your
+#   package management system for you.
+# - Doesn't allow you to customize most installation parameters.
+# - Installs dependencies and recommendations without asking for confirmation.
+# - Installs the latest stable release (by default) of Docker CLI, Docker Engine,
+#   Docker Buildx, Docker Compose, containerd, and runc. When using this script
+#   to provision a machine, this may result in unexpected major version upgrades
+#   of these packages. Always test upgrades in a test environment before
+#   deploying to your production systems.
+# - Isn't designed to upgrade an existing Docker installation. When using the
+#   script to update an existing installation, dependencies may not be updated
+#   to the expected version, resulting in outdated versions.
+#
+# Source code is available at https://github.com/docker/docker-install/
+#
+# Usage
+# ==============================================================================
+#
+# To install the latest stable versions of Docker CLI, Docker Engine, and their
+# dependencies:
+#
+# 1. download the script
+#
+#   $ curl -fsSL https://get.docker.com -o install-docker.sh
+#
+# 2. verify the script's content
+#
+#   $ cat install-docker.sh
+#
+# 3. run the script with --dry-run to verify the steps it executes
+#
+#   $ sh install-docker.sh --dry-run
+#
+# 4. run the script either as root, or using sudo to perform the installation.
+#
+#   $ sudo sh install-docker.sh
+#
+# Command-line options
+# ==============================================================================
+#
+# --version <VERSION>
+# Use the --version option to install a specific version, for example:
+#
+#   $ sudo sh install-docker.sh --version 23.0
+#
+# --channel <stable|test>
+#
+# Use the --channel option to install from an alternative installation channel.
+# The following example installs the latest versions from the "test" channel,
+# which includes pre-releases (alpha, beta, rc):
+#
+#   $ sudo sh install-docker.sh --channel test
+#
+# Alternatively, use the script at https://test.docker.com, which uses the test
+# channel as default.
+#
+# --mirror <Aliyun|AzureChinaCloud>
+#
+# Use the --mirror option to install from a mirror supported by this script.
+# Available mirrors are "Aliyun" (https://mirrors.aliyun.com/docker-ce), and
+# "AzureChinaCloud" (https://mirror.azure.cn/docker-ce), for example:
+#
+#   $ sudo sh install-docker.sh --mirror AzureChinaCloud
+#
+# --setup-repo
+#
+# Use the --setup-repo option to configure Docker's package repositories without
+# installing Docker packages. This is useful when you want to add the repository
+# but install packages separately:
+#
+#   $ sudo sh install-docker.sh --setup-repo
+#
+# Automatic Service Start
+#
+# By default, this script automatically starts the Docker daemon and enables the docker
+# service after installation if systemd is used as init.
+#
+# If you prefer to start the service manually, use the --no-autostart option:
+#
+#   $ sudo sh install-docker.sh --no-autostart
+#
+# Note: Starting the service requires appropriate privileges to manage system services.
+#
+# Installing docker-sbx
+#
+# Set the SBX environment variable to "1" to also install the docker-sbx
+# package alongside the regular Docker Engine packages:
+#
+#   $ curl -fsSL https://get.docker.com | sudo SBX=1 sh
+#
+# ==============================================================================
+
+
+# Git commit from https://github.com/docker/docker-install when
+# the script was uploaded (Should only be modified by upload job):
+SCRIPT_COMMIT_SHA="42dcae692436f34526524ed46d3b32885c9355f5"
+
+# strip "v" prefix if present
+VERSION="${VERSION#v}"
+
+# The channel to install from:
+#   * stable
+#   * test
+DEFAULT_CHANNEL_VALUE="stable"
+if [ -z "$CHANNEL" ]; then
+	CHANNEL=$DEFAULT_CHANNEL_VALUE
+fi
+
+DEFAULT_DOWNLOAD_URL="https://download.docker.com"
+if [ -z "$DOWNLOAD_URL" ]; then
+	DOWNLOAD_URL=$DEFAULT_DOWNLOAD_URL
+fi
+
+DEFAULT_REPO_FILE="docker-ce.repo"
+if [ -z "$REPO_FILE" ]; then
+	REPO_FILE="$DEFAULT_REPO_FILE"
+	# Automatically default to a staging repo fora
+	# a staging download url (download-stage.docker.com)
+	case "$DOWNLOAD_URL" in
+		*-stage*) REPO_FILE="docker-ce-staging.repo";;
+	esac
+fi
+
+mirror=''
+DRY_RUN=${DRY_RUN:-}
+REPO_ONLY=${REPO_ONLY:-0}
+NO_AUTOSTART=${NO_AUTOSTART:-0}
+SBX=${SBX:-0}
+
+# Provide a helpful usage statement when --help or any invalid argument is passed
+# to the script. Exit code deliberately not included here as error depends on
+# argument provided.
+usage() {
+	echo
+	echo "USAGE: "
+	echo "    ${0} [--channel <stable|test>] [--mirror <Aliyun|AzureChinaCloud>] [--version <VERSION>] [--setup-repo] [--no-autostart] [--dry-run] [--help]"
+	echo
+}
+
+while [ $# -gt 0 ]; do
+	case "$1" in
+		--channel)
+			CHANNEL="$2"
+			shift
+			;;
+		--dry-run)
+			DRY_RUN=1
+			;;
+		--mirror)
+			mirror="$2"
+			shift
+			;;
+		--version)
+			VERSION="${2#v}"
+			shift
+			;;
+		--setup-repo)
+			REPO_ONLY=1
+			shift
+			;;
+		--no-autostart)
+			NO_AUTOSTART=1
+			;;
+		--help)
+			usage
+			exit 0
+			;;
+		--*)
+			echo "Illegal option $1"
+			usage
+			exit 1
+			;;
+	esac
+	shift $(( $# > 0 ? 1 : 0 ))
+done
+
+case "$mirror" in
+	Aliyun)
+		DOWNLOAD_URL="https://mirrors.aliyun.com/docker-ce"
+		;;
+	AzureChinaCloud)
+		DOWNLOAD_URL="https://mirror.azure.cn/docker-ce"
+		;;
+	"")
+		;;
+	*)
+		>&2 echo "unknown mirror '$mirror': use either 'Aliyun', or 'AzureChinaCloud'."
+		exit 1
+		;;
+esac
+
+case "$CHANNEL" in
+	stable|test)
+		;;
+	*)
+		>&2 echo "unknown CHANNEL '$CHANNEL': use either stable or test."
+		exit 1
+		;;
+esac
+
+command_exists() {
+	command -v "$@" > /dev/null 2>&1
+}
+
+# version_gte checks if the version specified in $VERSION is at least the given
+# SemVer (Maj.Minor[.Patch]), or CalVer (YY.MM) version.It returns 0 (success)
+# if $VERSION is either unset (=latest) or newer or equal than the specified
+# version, or returns 1 (fail) otherwise.
+#
+# examples:
+#
+# VERSION=23.0
+# version_gte 23.0  // 0 (success)
+# version_gte 20.10 // 0 (success)
+# version_gte 19.03 // 0 (success)
+# version_gte 26.1  // 1 (fail)
+version_gte() {
+	if [ -z "$VERSION" ]; then
+			return 0
+	fi
+	version_compare "$VERSION" "$1"
+}
+
+# version_compare compares two version strings (either SemVer (Major.Minor.Path),
+# or CalVer (YY.MM) version strings. It returns 0 (success) if version A is newer
+# or equal than version B, or 1 (fail) otherwise. Patch releases and pre-release
+# (-alpha/-beta) are not taken into account
+#
+# examples:
+#
+# version_compare 23.0.0 20.10 // 0 (success)
+# version_compare 23.0 20.10   // 0 (success)
+# version_compare 20.10 19.03  // 0 (success)
+# version_compare 20.10 20.10  // 0 (success)
+# version_compare 19.03 20.10  // 1 (fail)
+version_compare() (
+	set +x
+
+	yy_a="$(echo "$1" | cut -d'.' -f1)"
+	yy_b="$(echo "$2" | cut -d'.' -f1)"
+	if [ "$yy_a" -lt "$yy_b" ]; then
+		return 1
+	fi
+	if [ "$yy_a" -gt "$yy_b" ]; then
+		return 0
+	fi
+	mm_a="$(echo "$1" | cut -d'.' -f2)"
+	mm_b="$(echo "$2" | cut -d'.' -f2)"
+
+	# trim leading zeros to accommodate CalVer
+	mm_a="${mm_a#0}"
+	mm_b="${mm_b#0}"
+
+	if [ "${mm_a:-0}" -lt "${mm_b:-0}" ]; then
+		return 1
+	fi
+
+	return 0
+)
+
+is_dry_run() {
+	if [ -z "$DRY_RUN" ]; then
+		return 1
+	else
+		return 0
+	fi
+}
+
+is_wsl() {
+	case "$(uname -r)" in
+	*microsoft* ) true ;; # WSL 2
+	*Microsoft* ) true ;; # WSL 1
+	* ) false;;
+	esac
+}
+
+is_darwin() {
+	case "$(uname -s)" in
+	*darwin* ) true ;;
+	*Darwin* ) true ;;
+	* ) false;;
+	esac
+}
+
+deprecation_notice() {
+	distro=$1
+	distro_version=$2
+	echo
+	printf "\033[91;1mDEPRECATION WARNING\033[0m\n"
+	printf "    This Linux distribution (\033[1m%s %s\033[0m) reached end-of-life and is no longer supported by this script.\n" "$distro" "$distro_version"
+	echo   "    No updates or security fixes will be released for this distribution, and users are recommended"
+	echo   "    to upgrade to a currently maintained version of $distro."
+	echo
+	printf   "Press \033[1mCtrl+C\033[0m now to abort this script, or wait for the installation to continue."
+	echo
+	sleep 10
+}
+
+get_distribution() {
+	lsb_dist=""
+	# Every system that we officially support has /etc/os-release
+	if [ -r /etc/os-release ]; then
+		lsb_dist="$(. /etc/os-release && echo "$ID")"
+	fi
+
+	# Normalize Fedora Asahi Remix to fedora
+	if [ "$lsb_dist" = "fedora-asahi-remix" ]; then
+		lsb_dist="fedora"
+	fi
+
+	# Returning an empty string here should be alright since the
+	# case statements don't act unless you provide an actual value
+	echo "$lsb_dist"
+}
+
+start_docker_daemon() {
+	# Use systemctl if available (for systemd-based systems)
+	if command_exists systemctl; then
+		is_dry_run || >&2 echo "Using systemd to manage Docker service"
+		if (
+			is_dry_run || set -x
+			$sh_c "systemctl enable --now docker.service 2>/dev/null"
+		); then
+			is_dry_run || echo "INFO: Docker daemon enabled and started" >&2
+		else
+			is_dry_run || echo "WARNING: unable to enable the docker service" >&2
+		fi
+	else
+		# No service management available (container environment)
+		if ! is_dry_run; then
+			>&2 echo "Note: Running in a container environment without service management"
+			>&2 echo "Docker daemon cannot be started automatically in this environment"
+			>&2 echo "The Docker packages have been installed successfully"
+		fi
+	fi
+	>&2 echo
+}
+
+echo_docker_as_nonroot() {
+	if is_dry_run; then
+		return
+	fi
+	if command_exists docker && [ -e /var/run/docker.sock ]; then
+		(
+			set -x
+			$sh_c 'docker version'
+		) || true
+	fi
+
+	# intentionally mixed spaces and tabs here -- tabs are stripped by "<<-EOF", spaces are kept in the output
+	echo
+	echo "================================================================================"
+	echo
+	if version_gte "20.10"; then
+		echo "To run Docker as a non-privileged user, consider setting up the"
+		echo "Docker daemon in rootless mode for your user:"
+		echo
+		echo "    dockerd-rootless-setuptool.sh install"
+		echo
+		echo "Visit https://docs.docker.com/go/rootless/ to learn about rootless mode."
+		echo
+	fi
+	echo
+	echo "To run the Docker daemon as a fully privileged service, but granting non-root"
+	echo "users access, refer to https://docs.docker.com/go/daemon-access/"
+	echo
+	echo "WARNING: Access to the remote API on a privileged Docker daemon is equivalent"
+	echo "         to root access on the host. Refer to the 'Docker daemon attack surface'"
+	echo "         documentation for details: https://docs.docker.com/go/attack-surface/"
+	echo
+	echo "================================================================================"
+	echo
+}
+
+# Check if this is a forked Linux distro
+check_forked() {
+
+	# Check for lsb_release command existence, it usually exists in forked distros
+	if command_exists lsb_release; then
+		# Check if the `-u` option is supported
+		set +e
+		lsb_release -a -u > /dev/null 2>&1
+		lsb_release_exit_code=$?
+		set -e
+
+		# Check if the command has exited successfully, it means we're in a forked distro
+		if [ "$lsb_release_exit_code" = "0" ]; then
+			# Print info about current distro
+			cat <<-EOF
+			You're using '$lsb_dist' version '$dist_version'.
+			EOF
+
+			# Get the upstream release info
+			lsb_dist=$(lsb_release -a -u 2>&1 | tr '[:upper:]' '[:lower:]' | grep -E 'id' | cut -d ':' -f 2 | tr -d '[:space:]')
+			dist_version=$(lsb_release -a -u 2>&1 | tr '[:upper:]' '[:lower:]' | grep -E 'codename' | cut -d ':' -f 2 | tr -d '[:space:]')
+
+			# Print info about upstream distro
+			cat <<-EOF
+			Upstream release is '$lsb_dist' version '$dist_version'.
+			EOF
+		else
+			if [ -r /etc/debian_version ] && [ "$lsb_dist" != "ubuntu" ] && [ "$lsb_dist" != "raspbian" ]; then
+				if [ "$lsb_dist" = "osmc" ]; then
+					# OSMC runs Raspbian
+					lsb_dist=raspbian
+				else
+					# We're Debian and don't even know it!
+					lsb_dist=debian
+				fi
+				dist_version="$(sed 's/\/.*//' /etc/debian_version | sed 's/\..*//')"
+				case "$dist_version" in
+					13|14|forky)
+						dist_version="trixie"
+					;;
+					12)
+						dist_version="bookworm"
+					;;
+					11)
+						dist_version="bullseye"
+					;;
+					10)
+						dist_version="buster"
+					;;
+					9)
+						dist_version="stretch"
+					;;
+					8)
+						dist_version="jessie"
+					;;
+				esac
+			fi
+		fi
+	fi
+}
+
+do_install() {
+	echo "# Executing docker install script, commit: $SCRIPT_COMMIT_SHA"
+
+	if [ "$REPO_ONLY" != "1" ] && command_exists docker; then
+		cat >&2 <<-'EOF'
+			Warning: the "docker" command appears to already exist on this system.
+
+			If you already have Docker installed, this script can cause trouble, which is
+			why we're displaying this warning and provide the opportunity to cancel the
+			installation.
+
+			If you installed the current Docker package using this script and are using it
+			again to update Docker, you can ignore this message, but be aware that the
+			script resets any custom changes in the deb and rpm repo configuration
+			files to match the parameters passed to the script.
+
+			You may press Ctrl+C now to abort this script.
+		EOF
+		( set -x; sleep 20 )
+	fi
+
+	user="$(id -un 2>/dev/null || true)"
+
+	sh_c='sh -c'
+	if [ "$user" != 'root' ]; then
+		if command_exists sudo; then
+			sh_c='sudo -E sh -c'
+		elif command_exists su; then
+			sh_c='su -c'
+		else
+			cat >&2 <<-'EOF'
+			Error: this installer needs the ability to run commands as root.
+			We are unable to find either "sudo" or "su" available to make this happen.
+			EOF
+			exit 1
+		fi
+	fi
+
+	if is_dry_run; then
+		sh_c="echo"
+	fi
+
+	# perform some very rudimentary platform detection
+	lsb_dist=$( get_distribution )
+	lsb_dist="$(echo "$lsb_dist" | tr '[:upper:]' '[:lower:]')"
+
+	if is_wsl; then
+		echo
+		echo "WSL DETECTED: We recommend using Docker Desktop for Windows."
+		echo "Please get Docker Desktop from https://www.docker.com/products/docker-desktop/"
+		echo
+		cat >&2 <<-'EOF'
+
+			You may press Ctrl+C now to abort this script.
+		EOF
+		( set -x; sleep 20 )
+	fi
+
+	case "$lsb_dist" in
+
+		ubuntu)
+			if command_exists lsb_release; then
+				dist_version="$(lsb_release --codename | cut -f2)"
+			fi
+			if [ -z "$dist_version" ] && [ -r /etc/lsb-release ]; then
+				dist_version="$(. /etc/lsb-release && echo "$DISTRIB_CODENAME")"
+			fi
+		;;
+
+		debian|raspbian)
+			dist_version="$(sed 's/\/.*//' /etc/debian_version | sed 's/\..*//')"
+			case "$dist_version" in
+				13)
+					dist_version="trixie"
+				;;
+				12)
+					dist_version="bookworm"
+				;;
+				11)
+					dist_version="bullseye"
+				;;
+				10)
+					dist_version="buster"
+				;;
+				9)
+					dist_version="stretch"
+				;;
+				8)
+					dist_version="jessie"
+				;;
+			esac
+		;;
+
+		centos|rhel|rocky|tencentos|opencloudos)
+			if [ -z "$dist_version" ] && [ -r /etc/os-release ]; then
+				dist_version="$(. /etc/os-release && echo "$VERSION_ID")"
+			fi
+		;;
+
+		*)
+			if command_exists lsb_release; then
+				dist_version="$(lsb_release --release | cut -f2)"
+			fi
+			if [ -z "$dist_version" ] && [ -r /etc/os-release ]; then
+				dist_version="$(. /etc/os-release && echo "$VERSION_ID")"
+			fi
+		;;
+
+	esac
+
+	# Check if this is a forked Linux distro
+	check_forked
+
+	# Print deprecation warnings for distro versions that recently reached EOL,
+	# but may still be commonly used (especially LTS versions).
+	case "$lsb_dist.$dist_version" in
+		centos.8|centos.7|rhel.7)
+			deprecation_notice "$lsb_dist" "$dist_version"
+			;;
+		debian.buster|debian.stretch|debian.jessie)
+			deprecation_notice "$lsb_dist" "$dist_version"
+			;;
+		raspbian.buster|raspbian.stretch|raspbian.jessie)
+			deprecation_notice "$lsb_dist" "$dist_version"
+			;;
+		ubuntu.focal|ubuntu.bionic|ubuntu.xenial|ubuntu.trusty)
+			deprecation_notice "$lsb_dist" "$dist_version"
+			;;
+		ubuntu.questing|ubuntu.oracular|ubuntu.mantic|ubuntu.lunar|ubuntu.kinetic|ubuntu.impish|ubuntu.hirsute|ubuntu.groovy|ubuntu.eoan|ubuntu.disco|ubuntu.cosmic)
+			deprecation_notice "$lsb_dist" "$dist_version"
+			;;
+		fedora.*)
+			if [ "$dist_version" -lt 43 ]; then
+				deprecation_notice "$lsb_dist" "$dist_version"
+			fi
+			;;
+	esac
+
+	# Run setup for each distro accordingly
+	case "$lsb_dist" in
+		ubuntu|debian|raspbian)
+			pre_reqs="ca-certificates curl"
+			apt_repo_lsb_dist="$lsb_dist"
+			# Docker does not publish a Raspbian Trixie repo; use Debian Trixie instead.
+			if [ "$lsb_dist" = "raspbian" ] && [ "$dist_version" = "trixie" ]; then
+				apt_repo_lsb_dist="debian"
+			fi
+			apt_repo="deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] $DOWNLOAD_URL/linux/$apt_repo_lsb_dist $dist_version $CHANNEL"
+			(
+				if ! is_dry_run; then
+					set -x
+				fi
+				$sh_c 'apt-get -qq update >/dev/null'
+				$sh_c "DEBIAN_FRONTEND=noninteractive apt-get -y -qq install $pre_reqs >/dev/null"
+				$sh_c 'install -m 0755 -d /etc/apt/keyrings'
+				$sh_c "curl -fsSL \"$DOWNLOAD_URL/linux/$apt_repo_lsb_dist/gpg\" -o /etc/apt/keyrings/docker.asc"
+				$sh_c "chmod a+r /etc/apt/keyrings/docker.asc"
+				$sh_c "echo \"$apt_repo\" > /etc/apt/sources.list.d/docker.list"
+				$sh_c 'apt-get -qq update >/dev/null'
+			)
+
+			if [ "$REPO_ONLY" = "1" ]; then
+				exit 0
+			fi
+
+			pkg_version=""
+			cli_pkg_version=""
+			if [ -n "$VERSION" ]; then
+				if is_dry_run; then
+					echo "# WARNING: VERSION pinning is not supported in DRY_RUN"
+				else
+					# Will work for incomplete versions IE (17.12), but may not actually grab the "latest" if in the test channel
+					pkg_pattern="$(echo "$VERSION" | sed 's/-ce-/~ce~.*/g' | sed 's/-/.*/g')"
+					search_command="apt-cache madison docker-ce | grep '$pkg_pattern' | head -1 | awk '{\$1=\$1};1' | cut -d' ' -f 3"
+					echo "INFO: Searching repository for VERSION '$VERSION'"
+					echo "INFO: $search_command"
+					pkg_version="$($sh_c "$search_command")"
+					if [ -z "$pkg_version" ]; then
+						echo
+						echo "ERROR: '$VERSION' not found amongst apt-cache madison results"
+						echo
+						exit 1
+					fi
+					pkg_version="=$pkg_version"
+
+					if version_gte "18.09"; then
+						search_command="apt-cache madison docker-ce-cli | grep '$pkg_pattern' | head -1 | awk '{\$1=\$1};1' | cut -d' ' -f 3"
+						echo "INFO: $search_command"
+						cli_pkg_version="$($sh_c "$search_command")"
+						if [ -n "$cli_pkg_version" ]; then
+							cli_pkg_version="=$cli_pkg_version"
+						fi
+					fi
+				fi
+			fi
+			(
+				pkgs="docker-ce${pkg_version}"
+				if version_gte "18.09"; then
+					# older versions didn't ship the cli and containerd as separate packages
+					pkgs="$pkgs docker-ce-cli${cli_pkg_version} containerd.io"
+				fi
+				if version_gte "20.10"; then
+					pkgs="$pkgs docker-compose-plugin docker-ce-rootless-extras$pkg_version"
+				fi
+				if version_gte "23.0"; then
+					pkgs="$pkgs docker-buildx-plugin"
+				fi
+				if version_gte "28.2"; then
+					pkgs="$pkgs docker-model-plugin"
+				fi
+				if [ "$SBX" = "1" ]; then
+					pkgs="$pkgs docker-sbx"
+				fi
+				if ! is_dry_run; then
+					set -x
+				fi
+				apt_flags="-y -qq"
+				if [ -n "$pkg_version" ]; then
+					apt_flags="$apt_flags --allow-downgrades"
+				fi
+				$sh_c "DEBIAN_FRONTEND=noninteractive apt-get $apt_flags install $pkgs >/dev/null"
+			)
+			if [ "$NO_AUTOSTART" != "1" ]; then
+				start_docker_daemon
+			fi
+			echo_docker_as_nonroot
+			exit 0
+			;;
+		centos|fedora|rhel|rocky|tencentos|opencloudos)
+			if [ "$lsb_dist" = "tencentos" ] || [ "$lsb_dist" = "opencloudos" ]; then
+				repo_file_url="$DOWNLOAD_URL/linux/centos/$REPO_FILE"
+			else
+				repo_file_url="$DOWNLOAD_URL/linux/$lsb_dist/$REPO_FILE"
+			fi
+			(
+				if ! is_dry_run; then
+					set -x
+				fi
+				if command_exists dnf5; then
+					$sh_c "dnf -y -q --setopt=install_weak_deps=False install dnf-plugins-core"
+					$sh_c "dnf5 config-manager addrepo --overwrite --save-filename=docker-ce.repo --from-repofile='$repo_file_url'"
+
+					if [ "$CHANNEL" != "stable" ]; then
+						$sh_c "dnf5 config-manager setopt \"docker-ce-*.enabled=0\""
+						$sh_c "dnf5 config-manager setopt \"docker-ce-$CHANNEL.enabled=1\""
+					fi
+					$sh_c "dnf makecache"
+				elif command_exists dnf; then
+					$sh_c "dnf -y -q --setopt=install_weak_deps=False install dnf-plugins-core"
+					$sh_c "rm -f /etc/yum.repos.d/docker-ce.repo  /etc/yum.repos.d/docker-ce-staging.repo"
+					$sh_c "dnf config-manager --add-repo $repo_file_url"
+
+					if [ "$lsb_dist" = "tencentos" ] || [ "$lsb_dist" = "opencloudos" ]; then
+						# TencentOS / OpenCloudOS 的 $releasever 在 Docker 官方 centos 仓库中没有对应目录（如 tencentos 4 -> 404），
+						# 需映射到 ABI 兼容的 el 版本：TencentOS 3 -> el8 / 4 (glibc 2.38) -> el9；OpenCloudOS 8 -> el8 / 9 -> el9
+						el_releasever=9
+						case "$lsb_dist" in
+							tencentos)
+								case "$dist_version" in 3*) el_releasever=8 ;; esac
+								;;
+							opencloudos)
+								case "$dist_version" in 8*) el_releasever=8 ;; esac
+								;;
+						esac
+						$sh_c "sed -i 's|\$releasever|$el_releasever|g' /etc/yum.repos.d/docker-ce.repo"
+						# 部分镜像站（如腾讯）提供的 repo 文件内部仍写死官方域名，
+						# 当下载源非官方时，同步替换 repo 内的域名，否则 makecache 仍会去访问官方源
+						if [ "$DOWNLOAD_URL" != "$DEFAULT_DOWNLOAD_URL" ]; then
+							$sh_c "sed -i 's|https://download.docker.com|$DOWNLOAD_URL|g' /etc/yum.repos.d/docker-ce.repo"
+						fi
+					fi
+
+					if [ "$CHANNEL" != "stable" ]; then
+						$sh_c "dnf config-manager --set-disabled \"docker-ce-*\""
+						$sh_c "dnf config-manager --set-enabled \"docker-ce-$CHANNEL\""
+					fi
+					$sh_c "dnf makecache"
+				else
+					$sh_c "yum -y -q install yum-utils"
+					$sh_c "rm -f /etc/yum.repos.d/docker-ce.repo  /etc/yum.repos.d/docker-ce-staging.repo"
+					$sh_c "yum-config-manager --add-repo $repo_file_url"
+
+					if [ "$lsb_dist" = "tencentos" ] || [ "$lsb_dist" = "opencloudos" ]; then
+						# TencentOS / OpenCloudOS 的 $releasever 在 Docker 官方 centos 仓库中没有对应目录（如 tencentos 4 -> 404），
+						# 需映射到 ABI 兼容的 el 版本：TencentOS 3 -> el8 / 4 (glibc 2.38) -> el9；OpenCloudOS 8 -> el8 / 9 -> el9
+						el_releasever=9
+						case "$lsb_dist" in
+							tencentos)
+								case "$dist_version" in 3*) el_releasever=8 ;; esac
+								;;
+							opencloudos)
+								case "$dist_version" in 8*) el_releasever=8 ;; esac
+								;;
+						esac
+						$sh_c "sed -i 's|\$releasever|$el_releasever|g' /etc/yum.repos.d/docker-ce.repo"
+						# 部分镜像站（如腾讯）提供的 repo 文件内部仍写死官方域名，
+						# 当下载源非官方时，同步替换 repo 内的域名，否则 makecache 仍会去访问官方源
+						if [ "$DOWNLOAD_URL" != "$DEFAULT_DOWNLOAD_URL" ]; then
+							$sh_c "sed -i 's|https://download.docker.com|$DOWNLOAD_URL|g' /etc/yum.repos.d/docker-ce.repo"
+						fi
+					fi
+
+					if [ "$CHANNEL" != "stable" ]; then
+						$sh_c "yum-config-manager --disable \"docker-ce-*\""
+						$sh_c "yum-config-manager --enable \"docker-ce-$CHANNEL\""
+					fi
+					$sh_c "yum makecache"
+				fi
+			)
+
+			if [ "$REPO_ONLY" = "1" ]; then
+				exit 0
+			fi
+
+			pkg_version=""
+			cli_pkg_version=""
+			if command_exists dnf; then
+				pkg_manager="dnf"
+				pkg_manager_flags="-y -q --best"
+			else
+				pkg_manager="yum"
+				pkg_manager_flags="-y -q"
+			fi
+			if [ -n "$VERSION" ]; then
+				if is_dry_run; then
+					echo "# WARNING: VERSION pinning is not supported in DRY_RUN"
+				else
+					if [ "$lsb_dist" = "fedora" ]; then
+						pkg_suffix="fc$dist_version"
+					else
+						pkg_suffix="el"
+					fi
+					pkg_pattern="$(echo "$VERSION" | sed 's/-ce-/\\\\.ce.*/g' | sed 's/-/.*/g').*$pkg_suffix"
+					search_command="$pkg_manager list --showduplicates docker-ce | grep '$pkg_pattern' | tail -1 | awk '{print \$2}'"
+					echo "INFO: Searching repository for VERSION '$VERSION'"
+					echo "INFO: $search_command"
+					pkg_version="$($sh_c "$search_command")"
+					if [ -z "$pkg_version" ]; then
+						echo
+						echo "ERROR: '$VERSION' not found amongst $pkg_manager list results"
+						echo
+						exit 1
+					fi
+					# Cut out the epoch and prefix with a '-'
+					pkg_version="-$(echo "$pkg_version" | cut -d':' -f 2)"
+
+					if version_gte "18.09"; then
+						# older versions don't support a cli package
+						search_command="$pkg_manager list --showduplicates docker-ce-cli | grep '$pkg_pattern' | tail -1 | awk '{print \$2}'"
+						cli_pkg_version="$($sh_c "$search_command" | cut -d':' -f 2)"
+					fi
+				fi
+			fi
+			(
+				pkgs="docker-ce$pkg_version"
+				if version_gte "18.09"; then
+					# older versions didn't ship the cli and containerd as separate packages
+					if [ -n "$cli_pkg_version" ]; then
+						pkgs="$pkgs docker-ce-cli-$cli_pkg_version containerd.io"
+					else
+						pkgs="$pkgs docker-ce-cli containerd.io"
+					fi
+				fi
+				if version_gte "20.10"; then
+					pkgs="$pkgs docker-compose-plugin docker-ce-rootless-extras$pkg_version"
+				fi
+				if version_gte "23.0"; then
+						pkgs="$pkgs docker-buildx-plugin docker-model-plugin"
+				fi
+				if [ "$SBX" = "1" ]; then
+					pkgs="$pkgs docker-sbx"
+				fi
+				if ! is_dry_run; then
+					set -x
+				fi
+				$sh_c "$pkg_manager $pkg_manager_flags install $pkgs"
+			)
+			if [ "$NO_AUTOSTART" != "1" ]; then
+				start_docker_daemon
+			fi
+			echo_docker_as_nonroot
+			exit 0
+			;;
+		sles)
+			echo "Effective v27.5, please consult SLES distro statement for s390x support."
+			exit 1
+			;;
+		*)
+			if [ -z "$lsb_dist" ]; then
+				if is_darwin; then
+					echo
+					echo "ERROR: Unsupported operating system 'macOS'"
+					echo "Please get Docker Desktop from https://www.docker.com/products/docker-desktop"
+					echo
+					exit 1
+				fi
+			fi
+			echo
+			echo "ERROR: Unsupported distribution '$lsb_dist'"
+			echo
+			exit 1
+			;;
+	esac
+	exit 1
+}
+
+# wrapped up in a function so that we have some protection against only getting
+# half the file during "curl | sh"
+do_install
diff --git a/src/octop/infra/mobile/setup.py b/src/octop/infra/mobile/setup.py
index 9c268799..9a1073e5 100644
--- a/src/octop/infra/mobile/setup.py
+++ b/src/octop/infra/mobile/setup.py
@@ -15,6 +15,11 @@
 from octop.config import OctopConfig
 from octop.i18n import tr
 from octop.infra.mobile.adb import adb_connect, find_adb, list_devices
+from octop.infra.mobile.docker_install import (
+    auto_install_docker_stream,
+    can_install_without_password,
+    docker_daemon_ready,
+)
 
 SetupState = Literal["needs_device", "needs_install", "ready", "unsupported"]
 MobileBackend = Literal["physical", "redroid", "emulator", "none"]
@@ -213,9 +218,22 @@ async def install_mobile_stream(*, locale: str = "en") -> AsyncIterator[str]:
         yield _sse({"done": False, "error": "script_missing"})
         return
     if not _docker_available():
-        yield _sse({"log": _mobile_log(locale, "error_docker_missing")})
-        yield _sse({"done": False, "error": "docker_missing"})
-        return
+        # Try to install Docker automatically; fall back to manual guidance.
+        installed = False
+        if platform.system().lower() == "linux" and can_install_without_password():
+            yield _sse({"log": _mobile_log(locale, "docker_missing_auto_install")})
+            async for msg in auto_install_docker_stream(locale=locale):
+                yield _sse({"log": msg})
+            # Authoritative check: the daemon answering beats script exit codes
+            # (e.g. Docker was installed just now by another process).
+            installed = await docker_daemon_ready()
+        else:
+            yield _sse({"log": _mobile_log(locale, "error_docker_missing")})
+        if not installed:
+            yield _sse({"log": _mobile_log(locale, "docker_auto_install_failed")})
+            yield _sse({"done": False, "error": "docker_missing"})
+            return
+        yield _sse({"log": _mobile_log(locale, "docker_auto_install_ok")})
     yield _sse({"log": _mobile_log(locale, "install_log_start")})
     proc = await asyncio.create_subprocess_exec(
         "bash",
diff --git a/src/octop/infra/proactive/scheduler.py b/src/octop/infra/proactive/scheduler.py
index 6c12cd60..6a51f0c4 100644
--- a/src/octop/infra/proactive/scheduler.py
+++ b/src/octop/infra/proactive/scheduler.py
@@ -17,14 +17,20 @@
 import random
 from datetime import UTC, datetime, time, timedelta
 from typing import TYPE_CHECKING
+from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
 
 if TYPE_CHECKING:
+    from octop.infra.db.repos.agents import AgentRepo
     from octop.infra.db.repos.care_push import CarePushRepo
     from octop.infra.db.repos.proactive_care_config import (
         ProactiveCareConfigRepo,
     )
     from octop.infra.db.repos.sessions import SessionRepo
+    from octop.infra.db.repos.users import UserRepo
     from octop.infra.proactive.service import ProactiveCareService
+from octop.infra.users.preferences import get_timezone_from_preferences_json
+
+_UTC_TZ_NAME = "UTC"
 
 logger = logging.getLogger(__name__)
 
@@ -42,6 +48,7 @@ def compute_next_trigger(
     active_hours_end: str,
     min_interval_hours: int,
     max_interval_hours: int,
+    timezone_name: str = _UTC_TZ_NAME,
 ) -> datetime:
     """Compute the next trigger time.
 
@@ -57,27 +64,31 @@ def compute_next_trigger(
         active_hours_end: Active-hours end (HH:MM).
         min_interval_hours: Minimum interval (hours).
         max_interval_hours: Maximum interval (hours).
+        timezone_name: IANA timezone used for active-window check.
 
     Returns:
         The next trigger time (UTC).
     """
+    timezone = _resolve_timezone(timezone_name)
+
+    # Compute the random candidate using the configured local clock,
+    # then convert the result back to UTC for sleeping.
+    local_now = now.astimezone(timezone)
+
     # Pick a random interval (minute precision)
     interval_minutes = random.randint(
         min_interval_hours * 60,
         max_interval_hours * 60,
     )
-    candidate = now + timedelta(minutes=interval_minutes)
+    candidate = local_now + timedelta(minutes=interval_minutes)
 
     start_t = _parse_hhmm(active_hours_start)
     end_t = _parse_hhmm(active_hours_end)
 
-    # Check whether the candidate falls within active hours (compare hour/minute of local time)
-    # Note: we compare using the UTC time's hour/minute; a timezone conversion may be
-    # needed in real deployments, but since config has no timezone field we use UTC for now.
     candidate_t = candidate.time().replace(second=0, microsecond=0)
 
     if start_t <= candidate_t < end_t:
-        return candidate
+        return candidate.astimezone(UTC)
 
     # Outside active hours -> shift to next active-hours start + random(0, 120min)
     random_offset_minutes = random.randint(0, 120)
@@ -85,16 +96,16 @@ def compute_next_trigger(
     # Find the start of the next active-hours window
     # First try today's active_hours_start
     today = candidate.date()
-    today_start = datetime.combine(today, start_t, tzinfo=UTC)
+    today_start = datetime.combine(today, start_t, tzinfo=timezone)
     if today_start > candidate:
         # Today's active hours have not started yet; use today's
         next_start = today_start
     else:
         # Today's active hours have already passed; use tomorrow's
         tomorrow = today + timedelta(days=1)
-        next_start = datetime.combine(tomorrow, start_t, tzinfo=UTC)
+        next_start = datetime.combine(tomorrow, start_t, tzinfo=timezone)
 
-    return next_start + timedelta(minutes=random_offset_minutes)
+    return (next_start + timedelta(minutes=random_offset_minutes)).astimezone(UTC)
 
 
 def is_in_active_hours(
@@ -102,14 +113,24 @@ def is_in_active_hours(
     *,
     active_hours_start: str,
     active_hours_end: str,
+    timezone_name: str = _UTC_TZ_NAME,
 ) -> bool:
     """Check whether the current time is within the active hours."""
+    now = now.astimezone(_resolve_timezone(timezone_name))
     start_t = _parse_hhmm(active_hours_start)
     end_t = _parse_hhmm(active_hours_end)
     current_t = now.time().replace(second=0, microsecond=0)
     return start_t <= current_t < end_t
 
 
+def _resolve_timezone(timezone_name: str) -> ZoneInfo:
+    """Resolve timezone with UTC fallback."""
+    try:
+        return ZoneInfo(timezone_name)
+    except ZoneInfoNotFoundError:
+        return ZoneInfo(_UTC_TZ_NAME)
+
+
 class ProactiveCareScheduler:
     """Proactive care push random scheduler.
 
@@ -127,12 +148,19 @@ def __init__(
         care_service: ProactiveCareService,
         config_repo: ProactiveCareConfigRepo,
         session_repo: SessionRepo,
+        agent_repo: AgentRepo | None = None,
+        user_repo: UserRepo | None = None,
+        default_timezone: str = _UTC_TZ_NAME,
     ) -> None:
         self._care_service = care_service
         self._config_repo = config_repo
         self._session_repo = session_repo
+        self._agent_repo = agent_repo
+        self._user_repo = user_repo
+        self._default_timezone = default_timezone
         # agent_id -> asyncio.Task
         self._tasks: dict[str, asyncio.Task[None]] = {}
+        self._suspended = False
 
     def replace_persistence(
         self,
@@ -147,11 +175,32 @@ def replace_persistence(
         self._care_service.replace_care_push_repo(care_push_repo)
 
     async def start_all(self) -> None:
-        """At system startup, register random scheduling tasks for all agents with enabled=true."""
+        """At system startup, register random scheduling tasks for all agents with enabled=true.
+
+        Includes agents that never saved a config row: proactive care defaults to on.
+        """
         configs = self._config_repo.list_enabled()
         logger.info("ProactiveCareScheduler: started, found %d enabled agents", len(configs))
         for cfg in configs:
-            self._schedule(cfg.agent_id)
+            self.ensure_scheduled(cfg.agent_id)
+
+    def suspend(self) -> None:
+        """Stop creating new loops. Tests call this so leftover sleeps do not hang pytest."""
+        self._suspended = True
+
+    def ensure_scheduled(self, agent_id: str) -> None:
+        """Start the loop if this agent is enabled and not already scheduled."""
+        if self._suspended:
+            return
+        if agent_id in self._tasks:
+            return
+        cfg = self._config_repo.get(agent_id)
+        if cfg.enabled:
+            self._schedule(agent_id)
+            logger.info(
+                "ProactiveCareScheduler: agent=%s scheduled (default enabled unless opted out)",
+                agent_id,
+            )
 
     def reschedule(self, agent_id: str) -> None:
         """Cancel the current schedule and re-arrange the next trigger time with new config.
@@ -182,14 +231,24 @@ def cancel(self, agent_id: str) -> None:
             task.cancel()
 
     async def shutdown(self) -> None:
-        """Shut down all scheduling tasks."""
-        agent_ids = list(self._tasks.keys())
-        for agent_id in agent_ids:
-            self.cancel(agent_id)
+        """Cancel every loop and wait so a long sleep cannot outlive the process."""
+        pending: list[asyncio.Task[None]] = []
+        for agent_id in list(self._tasks.keys()):
+            task = self._tasks.pop(agent_id, None)
+            if task and not task.done():
+                task.cancel()
+                pending.append(task)
+        if pending:
+            await asyncio.gather(*pending, return_exceptions=True)
         logger.info("ProactiveCareScheduler: all scheduled tasks shut down")
 
     def _schedule(self, agent_id: str) -> None:
         """Create a scheduling task for an agent."""
+        if self._suspended:
+            return
+        existing = self._tasks.get(agent_id)
+        if existing is not None and not existing.done():
+            existing.cancel()
         task = asyncio.create_task(
             self._run_loop(agent_id),
             name=f"proactive_care_{agent_id}",
@@ -199,7 +258,8 @@ def _schedule(self, agent_id: str) -> None:
 
     def _on_task_done(self, agent_id: str, task: asyncio.Task[None]) -> None:
         """Task-completion callback that handles exceptions."""
-        self._tasks.pop(agent_id, None)
+        if self._tasks.get(agent_id) is task:
+            self._tasks.pop(agent_id, None)
         if task.cancelled():
             return
         exc = task.exception()
@@ -227,6 +287,7 @@ async def _run_loop(self, agent_id: str) -> None:
                 return
 
             now = datetime.now(UTC)
+            timezone_name = self._resolve_tz_for_agent(agent_id)
 
             # Compute the next trigger time
             next_trigger = compute_next_trigger(
@@ -235,13 +296,16 @@ async def _run_loop(self, agent_id: str) -> None:
                 active_hours_end=cfg.active_hours_end,
                 min_interval_hours=cfg.min_interval_hours,
                 max_interval_hours=cfg.max_interval_hours,
+                timezone_name=timezone_name,
             )
 
             wait_seconds = (next_trigger - now).total_seconds()
             logger.info(
                 "ProactiveCareScheduler: agent=%s next push at %s (waiting %.0f s)",
                 agent_id,
-                next_trigger.strftime("%Y-%m-%d %H:%M UTC"),
+                next_trigger.astimezone(_resolve_timezone(timezone_name)).strftime(
+                    "%Y-%m-%d %H:%M %Z"
+                ),
                 wait_seconds,
             )
 
@@ -274,6 +338,7 @@ async def _run_loop(self, agent_id: str) -> None:
                 now,
                 active_hours_start=cfg.active_hours_start,
                 active_hours_end=cfg.active_hours_end,
+                timezone_name=timezone_name,
             ):
                 logger.info(
                     "ProactiveCareScheduler: agent=%s current time outside active hours, skipping this push",
@@ -307,3 +372,25 @@ async def _run_loop(self, agent_id: str) -> None:
                     exc_info=exc,
                 )
             # Regardless of success or failure, continue to the next scheduling round
+
+    def _resolve_tz_for_agent(self, agent_id: str) -> str:
+        if self._agent_repo is None or self._user_repo is None:
+            return self._default_timezone
+
+        agent = self._agent_repo.get(agent_id)
+        if agent is None or agent.user_id is None:
+            return self._default_timezone
+
+        user = self._user_repo.get(agent.user_id)
+        if user is None:
+            return self._default_timezone
+
+        timezone_name = get_timezone_from_preferences_json(user.preferences_json)
+        if not timezone_name:
+            return self._default_timezone
+
+        try:
+            ZoneInfo(timezone_name)
+            return timezone_name
+        except ZoneInfoNotFoundError:
+            return self._default_timezone
diff --git a/src/octop/infra/proactive/service.py b/src/octop/infra/proactive/service.py
index e1a6bb4c..4d208dd6 100644
--- a/src/octop/infra/proactive/service.py
+++ b/src/octop/infra/proactive/service.py
@@ -6,7 +6,7 @@
 3. Use EpisodePicker to select the Top-3 most care-worthy episodes.
 4. Read the agent's SOUL.md and embed it into the LLM system prompt.
 5. Call a lightweight LLM to generate a care message (<=200 chars).
-6. Push to the current session via Gateway.push_text_from_session(task_type="text").
+6. Push to the current session via Gateway.push_text_from_session.
 7. Write a dedup record to care_push_records after a successful push.
 """
 
@@ -247,11 +247,9 @@ async def run(self, agent_id: str, session_key: str) -> None:
             logger.warning("ProactiveCareService: LLM call failed agent=%s: %s", agent_id, exc)
             return  # do not push, do not write a record
 
-        # 7. Push the message directly (task_type="text" bypasses the agent ReAct loop)
+        # 7. Push the message directly without invoking the agent.
         try:
-            await self._gateway.push_text_from_session(
-                agent_id, session_key, care_text, task_type="text"
-            )
+            await self._gateway.push_text_from_session(agent_id, session_key, care_text)
         except Exception as exc:
             logger.warning(
                 "ProactiveCareService: push failed agent=%s session=%s: %s",
diff --git a/src/octop/infra/server.py b/src/octop/infra/server.py
index 4d648c37..65f43367 100644
--- a/src/octop/infra/server.py
+++ b/src/octop/infra/server.py
@@ -2,8 +2,10 @@
 
 from __future__ import annotations
 
+import gzip
 import logging
 import os
+import shutil
 import time
 from contextlib import suppress
 from dataclasses import dataclass
@@ -32,18 +34,145 @@
 
 if TYPE_CHECKING:
     from octop.infra.auth.sso.service import SsoService
+    from octop.infra.trajectory.service import TrajectoryService
 
 logger = logging.getLogger(__name__)
 
+# Default 100 MiB per active log file before size-triggered rollover (in addition to daily).
+DEFAULT_LOG_MAX_BYTES = 100 * 1024 * 1024
+DEFAULT_LOG_RETENTION_DAYS = 14
+
+
+class SizeTimedRotatingFileHandler(TimedRotatingFileHandler):
+    """Daily rotation with an optional per-file byte cap (whichever triggers first)."""
+
+    def __init__(
+        self,
+        filename: str | os.PathLike[str],
+        *,
+        max_bytes: int = 0,
+        compress_rotated: bool = True,
+        **kwargs: object,
+    ) -> None:
+        super().__init__(filename, **kwargs)  # type: ignore[arg-type]
+        self.max_bytes = max(0, max_bytes)
+        self.compress_rotated = compress_rotated
+
+    def shouldRollover(self, record: logging.LogRecord) -> bool:
+        if super().shouldRollover(record):
+            return True
+        if self.max_bytes <= 0:
+            return False
+        if self.stream is None:
+            self.stream = self._open()
+        self.stream.flush()
+        return self.stream.tell() >= self.max_bytes
+
+    def rotate(self, source: str, dest: str) -> None:
+        super().rotate(source, dest)
+        if self.compress_rotated:
+            # logrotate delaycompress: leave this cycle's dest plain; gzip prior plains.
+            delaycompress_rotated_logs(Path(dest).parent, enabled=True, keep=Path(dest))
+
+    def rotation_filename(self, default_name: str) -> str:
+        """Avoid overwriting an existing daily backup when size rolls twice same day."""
+        if not os.path.exists(default_name) and not os.path.exists(f"{default_name}.gz"):
+            return default_name
+        index = 1
+        while True:
+            candidate = f"{default_name}-{index:03d}"
+            if not os.path.exists(candidate) and not os.path.exists(f"{candidate}.gz"):
+                return candidate
+            index += 1
+
+
+def gzip_rotated_log(path: Path) -> None:
+    """Compress a rotated log file to ``{name}.gz`` and remove the plain file."""
+    if not path.is_file() or path.suffix == ".gz":
+        return
+    gz_path = path.with_name(f"{path.name}.gz")
+    if gz_path.exists():
+        return
+    try:
+        with path.open("rb") as src, gzip.open(gz_path, "wb", compresslevel=6) as dst:
+            shutil.copyfileobj(src, dst)
+        path.unlink()
+    except OSError:
+        with suppress(OSError):
+            if gz_path.exists():
+                gz_path.unlink()
+
+
+def _parse_log_compress() -> bool:
+    raw = (os.environ.get("OCTOP_LOG_COMPRESS", "1") or "1").strip().lower()
+    return raw not in ("0", "false", "no", "off")
+
+
+def delaycompress_rotated_logs(
+    log_dir: Path,
+    *,
+    enabled: bool,
+    keep: Path | None = None,
+) -> None:
+    """Gzip older rotated plains; leave ``keep`` (or the newest) uncompressed.
+
+    Matches logrotate ``compress`` + ``delaycompress``: postpone compression of the
+    previous log file until the next rotation cycle
+    (https://github.com/logrotate/logrotate).
+    """
+    if not enabled or not log_dir.is_dir():
+        return
+    plains = [
+        entry
+        for entry in log_dir.glob("octop.log.*")
+        if entry.is_file() and not entry.name.endswith(".gz")
+    ]
+    if not plains:
+        return
+    keep_path = max(plains, key=lambda p: p.stat().st_mtime) if keep is None else keep
+    keep_resolved = keep_path.resolve()
+    for entry in plains:
+        if entry.resolve() == keep_resolved:
+            continue
+        gzip_rotated_log(entry)
+
 
-def _build_log_handler(log_path: Path, retention_days: int) -> TimedRotatingFileHandler:
-    """Create a daily-rotating file handler that also enforces retention."""
-    handler = TimedRotatingFileHandler(
+def _parse_log_retention_days() -> int:
+    raw = os.environ.get("OCTOP_LOG_RETENTION_DAYS", str(DEFAULT_LOG_RETENTION_DAYS)) or str(
+        DEFAULT_LOG_RETENTION_DAYS
+    )
+    try:
+        return int(raw)
+    except ValueError:
+        return DEFAULT_LOG_RETENTION_DAYS
+
+
+def _parse_log_max_bytes() -> int:
+    raw = os.environ.get("OCTOP_LOG_MAX_BYTES", str(DEFAULT_LOG_MAX_BYTES)) or str(
+        DEFAULT_LOG_MAX_BYTES
+    )
+    try:
+        return max(0, int(raw))
+    except ValueError:
+        return DEFAULT_LOG_MAX_BYTES
+
+
+def _build_log_handler(
+    log_path: Path,
+    retention_days: int,
+    *,
+    max_bytes: int = DEFAULT_LOG_MAX_BYTES,
+    compress_rotated: bool = True,
+) -> SizeTimedRotatingFileHandler:
+    """Create a daily + size-capped rotating file handler with retention."""
+    handler = SizeTimedRotatingFileHandler(
         log_path,
         when="midnight",
         interval=1,
         backupCount=retention_days,
         encoding="utf-8",
+        max_bytes=max_bytes,
+        compress_rotated=compress_rotated,
     )
     # Rotated files get a date suffix, e.g. octop.log.2026-07-16
     handler.suffix = "%Y-%m-%d"
@@ -85,6 +214,7 @@ class AppRuntime:
     cron_manager: CronManager
     user_manager: UserManager
     proactive_scheduler: ProactiveCareScheduler
+    trajectory_service: TrajectoryService | None = None
 
     def replace_services(self, services: SharedServices, config: OctopConfig) -> None:
         """Retarget all runtime singletons onto a new SharedServices / config.
@@ -100,6 +230,10 @@ def replace_services(self, services: SharedServices, config: OctopConfig) -> Non
             session_repo=services.repos.session_repo,
             care_push_repo=services.repos.care_push_repo,
         )
+        if self.trajectory_service is not None:
+            from octop.infra.trajectory.store import TrajectoryStore  # noqa: PLC0415
+
+            self.trajectory_service.replace_store(TrajectoryStore(services.trajectory_event_repo))
 
 
 class OctopServer:
@@ -235,9 +369,19 @@ async def _boot_runtime(self, config: OctopConfig) -> None:
             plugin_manager=self.plugin_manager,
         )
 
+        from octop.infra.trajectory.live import TrajectoryLiveBus  # noqa: PLC0415
+        from octop.infra.trajectory.service import TrajectoryService  # noqa: PLC0415
+        from octop.infra.trajectory.store import TrajectoryStore  # noqa: PLC0415
+
+        trajectory_service = TrajectoryService(
+            TrajectoryStore(self.services.trajectory_event_repo),
+            TrajectoryLiveBus(),
+        )
+
         gateway = Gateway(
             agent_manager=registry,
             repos=self.services.repos,
+            trajectory_service=trajectory_service,
         )
         await gateway.boot()
 
@@ -251,8 +395,16 @@ async def _boot_runtime(self, config: OctopConfig) -> None:
         gateway.set_slash_meta(version=__version__, started_at=started_at)
         self._started_at = started_at
 
+        from octop.infra.cron.delivery import CronDeliveryService  # noqa: PLC0415
+
+        cron_delivery = CronDeliveryService(
+            gateway=gateway,
+            agent_manager=registry,
+            repos=self.services.repos,
+        )
         cron_mgr = CronManager(
             gateway=gateway,
+            delivery_service=cron_delivery,
             repos=self.services.repos,
             timezone=config.default_timezone,
         )
@@ -279,7 +431,11 @@ async def _boot_runtime(self, config: OctopConfig) -> None:
             care_service=care_service,
             config_repo=self.services.repos.proactive_care_config_repo,
             session_repo=self.services.repos.session_repo,
+            agent_repo=self.services.repos.agent_repo,
+            user_repo=self.services.repos.user_repo,
+            default_timezone=config.default_timezone,
         )
+        registry.set_proactive_scheduler(proactive_scheduler)
 
         await registry.boot()
         await gateway.refresh_media_backends()
@@ -294,6 +450,7 @@ async def _boot_runtime(self, config: OctopConfig) -> None:
             cron_manager=cron_mgr,
             user_manager=user_mgr,
             proactive_scheduler=proactive_scheduler,
+            trajectory_service=trajectory_service,
         )
         from octop.infra.knowledge.jobs import resume_pending_index_jobs  # noqa: PLC0415
 
@@ -361,13 +518,18 @@ def _setup_logging(self) -> None:
             with suppress(OSError):
                 legacy.replace(log_path)
 
-        raw_retention = os.environ.get("OCTOP_LOG_RETENTION_DAYS", "14") or "14"
-        try:
-            retention_days = int(raw_retention)
-        except ValueError:
-            retention_days = 14
-        handler = _build_log_handler(log_path, retention_days)
+        retention_days = _parse_log_retention_days()
+        max_bytes = _parse_log_max_bytes()
+        compress_rotated = _parse_log_compress()
+        handler = _build_log_handler(
+            log_path,
+            retention_days,
+            max_bytes=max_bytes,
+            compress_rotated=compress_rotated,
+        )
         _purge_stale_logs(log_dir, retention_days)
+        # Catch up: gzip older plains, leave the newest rotated file plain (delaycompress).
+        delaycompress_rotated_logs(log_dir, enabled=compress_rotated)
 
         root = logging.getLogger()
         _attach_log_handler(root, handler)
diff --git a/src/octop/infra/trajectory/__init__.py b/src/octop/infra/trajectory/__init__.py
new file mode 100644
index 00000000..0db9ee06
--- /dev/null
+++ b/src/octop/infra/trajectory/__init__.py
@@ -0,0 +1,6 @@
+"""Harness stream → trajectory event projection."""
+
+from octop.infra.trajectory.projector import project_harness_chunk
+from octop.infra.trajectory.types import TrajectoryEvent, TrajectoryKind
+
+__all__ = ["TrajectoryEvent", "TrajectoryKind", "project_harness_chunk"]
diff --git a/src/octop/infra/trajectory/live.py b/src/octop/infra/trajectory/live.py
new file mode 100644
index 00000000..f40a07a4
--- /dev/null
+++ b/src/octop/infra/trajectory/live.py
@@ -0,0 +1,31 @@
+"""In-process pub/sub for trajectory live SSE fan-out."""
+
+from __future__ import annotations
+
+import asyncio
+from typing import Any
+
+
+class TrajectoryLiveBus:
+    def __init__(self, *, subscriber_queue_size: int = 256) -> None:
+        self._subscriber_queue_size = subscriber_queue_size
+        self._subscribers: dict[str, set[asyncio.Queue[dict[str, Any]]]] = {}
+
+    def subscribe(self, thread_id: str) -> asyncio.Queue[dict[str, Any]]:
+        queue: asyncio.Queue[dict[str, Any]] = asyncio.Queue(maxsize=self._subscriber_queue_size)
+        self._subscribers.setdefault(thread_id, set()).add(queue)
+        return queue
+
+    def unsubscribe(self, thread_id: str, queue: asyncio.Queue[dict[str, Any]]) -> None:
+        queues = self._subscribers.get(thread_id)
+        if queues is None:
+            return
+        queues.discard(queue)
+        if not queues:
+            del self._subscribers[thread_id]
+
+    def publish(self, thread_id: str, message: dict[str, Any]) -> None:
+        for queue in list(self._subscribers.get(thread_id, ())):
+            if queue.full():
+                queue.get_nowait()
+            queue.put_nowait(message)
diff --git a/src/octop/infra/trajectory/metrics.py b/src/octop/infra/trajectory/metrics.py
new file mode 100644
index 00000000..e94d5d87
--- /dev/null
+++ b/src/octop/infra/trajectory/metrics.py
@@ -0,0 +1,108 @@
+"""Aggregate session metrics from trajectory events."""
+
+from __future__ import annotations
+
+from collections.abc import Sequence
+from dataclasses import dataclass
+
+from octop.infra.trajectory.types import TrajectoryEvent
+
+
+@dataclass(frozen=True)
+class TrajectoryMetrics:
+    turns: int
+    steps: int
+    llm_duration_ms: float | None
+    tool_duration_ms: float | None
+    ttft_avg_ms: float | None
+    tok_per_s: float | None
+    cache_hit_ratio: float | None
+    input_tokens: int | None
+    output_tokens: int | None
+    cache_read_tokens: int | None
+
+
+def _numeric(value: object) -> float | None:
+    if isinstance(value, bool) or value is None:
+        return None
+    if isinstance(value, (int, float)):
+        return float(value)
+    return None
+
+
+def _int_value(value: object) -> int | None:
+    number = _numeric(value)
+    if number is None:
+        return None
+    return int(number)
+
+
+def _sum_payload(events: Sequence[TrajectoryEvent], key: str) -> float | None:
+    total = 0.0
+    found = False
+    for event in events:
+        value = _numeric(event.payload.get(key))
+        if value is None:
+            continue
+        total += value
+        found = True
+    return total if found else None
+
+
+def _sum_payload_int(events: Sequence[TrajectoryEvent], key: str) -> int | None:
+    total = 0
+    found = False
+    for event in events:
+        value = _int_value(event.payload.get(key))
+        if value is None:
+            continue
+        total += value
+        found = True
+    return total if found else None
+
+
+def _avg_payload(events: Sequence[TrajectoryEvent], key: str) -> float | None:
+    values: list[float] = []
+    for event in events:
+        value = _numeric(event.payload.get(key))
+        if value is not None:
+            values.append(value)
+    if not values:
+        return None
+    return sum(values) / len(values)
+
+
+def aggregate_metrics(events: Sequence[TrajectoryEvent]) -> TrajectoryMetrics:
+    """Roll up session metrics from trajectory events.
+
+    ``turns`` counts events with ``kind == "user"`` (not distinct ``turn_id``).
+    ``steps`` is ``len(events)``. Duration and token fields sum across events
+    that carry them; ``ttft_avg_ms`` and ``tok_per_s`` average assistant payloads.
+    ``cache_hit_ratio`` is ``cache_read / (input + cache_read)`` when both sums
+    exist. Missing numeric inputs stay ``None``.
+    """
+    assistant_events = [event for event in events if event.kind == "assistant"]
+    tool_events = [event for event in events if event.kind == "tool"]
+
+    input_tokens = _sum_payload_int(events, "input_tokens")
+    output_tokens = _sum_payload_int(events, "output_tokens")
+    cache_read_tokens = _sum_payload_int(events, "cache_read_tokens")
+
+    cache_hit_ratio: float | None = None
+    if input_tokens is not None and cache_read_tokens is not None:
+        denom = input_tokens + cache_read_tokens
+        if denom > 0:
+            cache_hit_ratio = cache_read_tokens / denom
+
+    return TrajectoryMetrics(
+        turns=sum(1 for event in events if event.kind == "user"),
+        steps=len(events),
+        llm_duration_ms=_sum_payload(assistant_events, "llm_duration_ms"),
+        tool_duration_ms=_sum_payload(tool_events, "tool_duration_ms"),
+        ttft_avg_ms=_avg_payload(assistant_events, "ttft_ms"),
+        tok_per_s=_avg_payload(assistant_events, "tok_per_s"),
+        cache_hit_ratio=cache_hit_ratio,
+        input_tokens=input_tokens,
+        output_tokens=output_tokens,
+        cache_read_tokens=cache_read_tokens,
+    )
diff --git a/src/octop/infra/trajectory/projector.py b/src/octop/infra/trajectory/projector.py
new file mode 100644
index 00000000..b0201cb5
--- /dev/null
+++ b/src/octop/infra/trajectory/projector.py
@@ -0,0 +1,320 @@
+from __future__ import annotations
+
+from datetime import datetime
+from typing import Any, TypedDict
+
+from octop.infra.trajectory.types import TrajectoryEvent, TrajectoryKind
+
+_IGNORED_TYPES = frozenset(
+    {
+        "reasoning",
+        "state_snapshot",
+        "state_update",
+        "usage",
+        "done",
+        "error",
+        "custom",
+        "hitl_required",
+        "slash_action",
+        "attachment",
+    }
+)
+
+
+class _Common(TypedDict):
+    agent_id: str
+    thread_id: str
+    seq: int
+    ts: float
+    turn_id: str | None
+    request_seq: int | None
+
+
+def project_harness_chunk(
+    chunk: dict[str, Any],
+    *,
+    agent_id: str,
+    thread_id: str,
+    seq: int,
+) -> list[TrajectoryEvent]:
+    try:
+        return _project_harness_chunk(chunk, agent_id=agent_id, thread_id=thread_id, seq=seq)
+    except Exception:
+        return []
+
+
+def _project_harness_chunk(
+    chunk: dict[str, Any],
+    *,
+    agent_id: str,
+    thread_id: str,
+    seq: int,
+) -> list[TrajectoryEvent]:
+    if not isinstance(chunk, dict):
+        return []
+
+    ctype = _kind_key(chunk)
+    if not ctype or ctype in _IGNORED_TYPES or ctype.startswith("state_"):
+        return []
+    ts = _coerce_ts(chunk.get("ts"))
+    turn_id = chunk.get("turn_id") if isinstance(chunk.get("turn_id"), str) else None
+    request_seq_raw = chunk.get("request_seq")
+    request_seq = request_seq_raw if isinstance(request_seq_raw, int) else None
+    common: _Common = {
+        "agent_id": agent_id,
+        "thread_id": thread_id,
+        "seq": seq,
+        "ts": ts,
+        "turn_id": turn_id,
+        "request_seq": request_seq,
+    }
+
+    if ctype == "tool_call_chunk":
+        call_id = str(chunk.get("id") or chunk.get("index", 0))
+        name = str(chunk.get("name") or "")
+        return [
+            _event(
+                **common,
+                kind="tool",
+                suffix=f"tool:{call_id}",
+                summary=f"tool {name or 'tool'}",
+                payload={
+                    "call_id": call_id,
+                    "name": name or "tool",
+                    "args": chunk.get("args"),
+                },
+            )
+        ]
+
+    if ctype == "tool_result":
+        call_id, name, result = _tool_result_fields(chunk)
+        return [
+            _event(
+                **common,
+                kind="tool",
+                suffix=f"tool:{call_id}",
+                summary=f"tool {name}",
+                payload={
+                    "call_id": call_id,
+                    "name": name,
+                    "result": result,
+                },
+            )
+        ]
+
+    if ctype == "token":
+        content = str(chunk.get("content") or "")
+        if not content:
+            return []
+        node = str(chunk.get("node") or "agent")
+        return [
+            _event(
+                **common,
+                kind="assistant",
+                summary=content,
+                payload={"node": node, "content": content},
+            )
+        ]
+
+    if ctype == "user":
+        content = str(chunk.get("content") or "")
+        user_payload: dict[str, Any] = {"content": content}
+        source = chunk.get("source")
+        if isinstance(source, str) and source:
+            user_payload["source"] = source
+        return [
+            _event(
+                **common,
+                kind="user",
+                summary=content,
+                payload=user_payload,
+            )
+        ]
+
+    if ctype == "context":
+        source = str(chunk.get("source") or "")
+        label = str(chunk.get("label") or source or "context")
+        tokens = chunk.get("tokens")
+        if not isinstance(tokens, int) or isinstance(tokens, bool):
+            tokens = None
+        content = str(chunk.get("content") or chunk.get("text") or "")
+        context_payload: dict[str, Any] = {
+            "source": source,
+            "label": label,
+            "tokens": tokens,
+        }
+        _copy_content_reference(chunk, context_payload)
+        if content:
+            context_payload["content"] = content
+        summary = _clip_summary(label, content) if content else label
+        return [
+            _event(
+                **common,
+                kind="context",
+                summary=summary,
+                payload=context_payload,
+            )
+        ]
+
+    if ctype == "system":
+        label = str(chunk.get("label") or "system")
+        content = str(chunk.get("content") or chunk.get("text") or "")
+        system_payload: dict[str, Any] = {"label": label}
+        _copy_content_reference(chunk, system_payload)
+        if content:
+            system_payload["content"] = content
+        summary = _clip_summary(label, content) if content else label
+        return [
+            _event(
+                **common,
+                kind="system",
+                summary=summary,
+                payload=system_payload,
+            )
+        ]
+
+    if ctype == "compacted":
+        summarized = _as_int(chunk.get("summarized_count"))
+        preserved = _as_int(chunk.get("preserved_count"))
+        removed_tokens = _as_int(chunk.get("removed_tokens"))
+        summary = str(chunk.get("summary") or f"compacted {summarized} messages")
+        compacted_payload: dict[str, Any] = {
+            "summarized_count": summarized,
+            "preserved_count": preserved,
+            "removed_tokens": removed_tokens,
+            "summary": summary,
+        }
+        file_path = chunk.get("file_path")
+        if isinstance(file_path, str) and file_path:
+            compacted_payload["file_path"] = file_path
+        return [
+            _event(
+                **common,
+                kind="compacted",
+                summary=summary,
+                payload=compacted_payload,
+            )
+        ]
+
+    return []
+
+
+def _tool_result_fields(chunk: dict[str, Any]) -> tuple[str, str, Any]:
+    call_id = str(chunk.get("id") or chunk.get("tool_call_id") or chunk.get("index", 0))
+    name = str(chunk.get("name") or "tool")
+    result: Any = chunk.get("content")
+    messages = chunk.get("messages")
+    if isinstance(messages, list):
+        for message in messages:
+            msg_id = _message_attr(message, "tool_call_id")
+            msg_name = _message_attr(message, "name")
+            msg_content = _message_attr(message, "content")
+            if msg_id:
+                call_id = str(msg_id)
+            if isinstance(msg_name, str) and msg_name:
+                name = msg_name
+            if msg_content is not None:
+                result = msg_content
+            if msg_id or msg_content is not None:
+                break
+    return call_id, name, result
+
+
+def _message_attr(message: Any, key: str) -> Any:
+    if isinstance(message, dict):
+        return message.get(key)
+    return getattr(message, key, None)
+
+
+def _copy_content_reference(source: dict[str, Any], target: dict[str, Any]) -> None:
+    digest = source.get("content_sha256")
+    chars = source.get("content_chars")
+    if isinstance(digest, str) and digest:
+        target["content_sha256"] = digest
+    if isinstance(chars, int) and not isinstance(chars, bool) and chars >= 0:
+        target["content_chars"] = chars
+
+
+def _kind_key(chunk: dict[str, Any]) -> str:
+    raw = chunk.get("type")
+    if isinstance(raw, str) and raw:
+        return raw
+    if raw is not None and raw != "":
+        return str(raw)
+    role = chunk.get("role")
+    if isinstance(role, str) and role:
+        return role
+    return ""
+
+
+def _coerce_ts(raw: Any) -> float:
+    if raw is None or isinstance(raw, bool):
+        return 0.0
+    if isinstance(raw, (int, float)):
+        return float(raw)
+    if isinstance(raw, str):
+        text = raw.strip()
+        if not text:
+            return 0.0
+        try:
+            return float(text)
+        except ValueError:
+            pass
+        try:
+            return datetime.fromisoformat(text.replace("Z", "+00:00")).timestamp()
+        except (ValueError, OSError):
+            return 0.0
+    return 0.0
+
+
+def _as_int(raw: Any) -> int:
+    if isinstance(raw, bool) or raw is None:
+        return 0
+    if isinstance(raw, int):
+        return raw
+    if isinstance(raw, float):
+        return int(raw)
+    if isinstance(raw, str):
+        try:
+            return int(raw)
+        except ValueError:
+            return 0
+    return 0
+
+
+def _clip_summary(label: str, content: str, *, limit: int = 240) -> str:
+    preview = " ".join(content.split())
+    if preview:
+        if len(preview) > limit:
+            return preview[: max(0, limit - 1)].rstrip() + "…"
+        return preview
+    return label
+
+
+def _event(
+    *,
+    agent_id: str,
+    thread_id: str,
+    seq: int,
+    ts: float,
+    kind: TrajectoryKind,
+    turn_id: str | None,
+    request_seq: int | None,
+    summary: str,
+    payload: dict[str, Any],
+    suffix: str | None = None,
+    is_error: bool = False,
+) -> TrajectoryEvent:
+    return TrajectoryEvent(
+        event_id=f"{thread_id}:{seq}:{suffix or kind}",
+        thread_id=thread_id,
+        agent_id=agent_id,
+        seq=seq,
+        ts=ts,
+        kind=kind,
+        turn_id=turn_id,
+        request_seq=request_seq,
+        is_error=is_error,
+        summary=summary,
+        payload=payload,
+    )
diff --git a/src/octop/infra/trajectory/service.py b/src/octop/infra/trajectory/service.py
new file mode 100644
index 00000000..e3be9ed5
--- /dev/null
+++ b/src/octop/infra/trajectory/service.py
@@ -0,0 +1,404 @@
+"""Orchestrate project → store → live publish. Observe never fails the caller."""
+
+from __future__ import annotations
+
+import json
+import logging
+import time
+from collections.abc import Iterator
+from dataclasses import asdict, dataclass, field, replace
+from typing import Any
+
+from octop.infra.trajectory.live import TrajectoryLiveBus
+from octop.infra.trajectory.metrics import TrajectoryMetrics, aggregate_metrics
+from octop.infra.trajectory.projector import project_harness_chunk
+from octop.infra.trajectory.settings import TRAJECTORY_RETENTION_USER_TURNS
+from octop.infra.trajectory.store import TrajectoryStore
+from octop.infra.trajectory.types import TrajectoryEvent
+
+logger = logging.getLogger(__name__)
+_METRICS_CACHE_TTL_S = 1.0
+_LIVE_UPDATE_INTERVAL_S = 0.05
+
+
+@dataclass
+class _ThreadInFlight:
+    assistant: TrajectoryEvent | None = None
+    usage_target: TrajectoryEvent | None = None
+    tools: dict[str, TrajectoryEvent] = field(default_factory=dict)
+    dirty_tools: set[str] = field(default_factory=set)
+    #: Synthetic ASSISTANT "(tool call only)" already emitted for the current tool burst.
+    tool_call_only: bool = False
+    #: Active turn id when harness chunks omit ``turn_id``.
+    turn_id: str | None = None
+    turn_seq: int = 0
+    next_seq: int | None = None
+    system_seen: bool | None = None
+    last_publish_at: dict[str, float] = field(default_factory=dict)
+
+
+@dataclass(frozen=True)
+class _CachedMetrics:
+    value: TrajectoryMetrics
+    expires_at: float
+
+
+class TrajectoryService:
+    def __init__(self, store: TrajectoryStore, bus: TrajectoryLiveBus) -> None:
+        self._store = store
+        self._bus = bus
+        self._inflight: dict[str, _ThreadInFlight] = {}
+        self._metrics_cache: dict[str, _CachedMetrics] = {}
+
+    def observe_chunk(self, agent_id: str, thread_id: str, chunk: dict[str, Any]) -> None:
+        try:
+            events = project_harness_chunk(chunk, agent_id=agent_id, thread_id=thread_id, seq=0)
+            for event in events:
+                if event.kind == "user":
+                    self.finish_turn(event.thread_id)
+                event = self._with_thread_defaults(event)
+                if event.kind == "assistant":
+                    self._observe_assistant(event)
+                elif event.kind == "tool":
+                    self._observe_tool(event)
+                else:
+                    self._finalize_assistant(event.thread_id)
+                    self._commit_new(event)
+        except Exception:
+            logger.exception(
+                "trajectory observe_chunk failed agent=%s thread=%s",
+                agent_id,
+                thread_id,
+            )
+
+    def replace_store(self, store: TrajectoryStore) -> None:
+        """Point append/list at a rebound control-plane pool."""
+        self._store = store
+        self._inflight.clear()
+        self._metrics_cache.clear()
+
+    def list_events(
+        self,
+        thread_id: str,
+        *,
+        before_seq: int | None,
+        limit: int,
+        kinds: list[str] | None,
+    ) -> list[TrajectoryEvent]:
+        return self._store.list_before(thread_id, before_seq=before_seq, limit=limit, kinds=kinds)
+
+    def list_from_seq(
+        self,
+        thread_id: str,
+        *,
+        from_seq: int,
+        limit: int,
+    ) -> list[TrajectoryEvent]:
+        return self._store.list_from_seq(thread_id, from_seq=from_seq, limit=limit)
+
+    def get_event(self, event_id: str) -> TrajectoryEvent | None:
+        return self._store.get(event_id)
+
+    def metrics(self, thread_id: str, *, refresh: bool = False) -> TrajectoryMetrics:
+        now = time.monotonic()
+        cached = self._metrics_cache.get(thread_id)
+        if not refresh and cached is not None and cached.expires_at > now:
+            return cached.value
+        value = aggregate_metrics(list(self._store.iter_for_export(thread_id)))
+        self._metrics_cache[thread_id] = _CachedMetrics(
+            value=value,
+            expires_at=now + _METRICS_CACHE_TTL_S,
+        )
+        return value
+
+    def has_kind(self, thread_id: str, kind: str) -> bool:
+        state = self._inflight.setdefault(thread_id, _ThreadInFlight())
+        if kind == "system" and state.system_seen is not None:
+            return state.system_seen
+        found = bool(self._store.list_before(thread_id, before_seq=None, limit=1, kinds=[kind]))
+        if kind == "system":
+            state.system_seen = found
+        return found
+
+    def export_jsonl(self, thread_id: str) -> Iterator[str]:
+        for event in self._store.iter_for_export(thread_id):
+            yield json.dumps(asdict(event), ensure_ascii=False)
+
+    def delete_for_thread(self, thread_id: str) -> int:
+        self._inflight.pop(thread_id, None)
+        self._metrics_cache.pop(thread_id, None)
+        return self._store.delete_for_thread(thread_id)
+
+    def finish_turn(self, thread_id: str, usage: dict[str, Any] | None = None) -> None:
+        """Persist final in-flight snapshots and release per-turn aggregation state."""
+        state = self._inflight.get(thread_id)
+        if state is None:
+            return
+        if state.assistant is not None:
+            assistant = state.assistant
+            if usage:
+                assistant = replace(assistant, payload={**assistant.payload, **usage})
+            self._upsert(_stamp_llm_duration(assistant), final=True)
+        elif state.usage_target is not None and usage:
+            target = replace(
+                state.usage_target,
+                payload={**state.usage_target.payload, **usage},
+            )
+            self._upsert(target, final=True)
+        for call_id in state.dirty_tools:
+            tool = state.tools.get(call_id)
+            if tool is not None:
+                self._upsert(tool)
+        state.assistant = None
+        state.usage_target = None
+        state.tools.clear()
+        state.dirty_tools.clear()
+        state.tool_call_only = False
+        state.last_publish_at.clear()
+        self._prune_retention(thread_id)
+
+    def _with_thread_defaults(self, event: TrajectoryEvent) -> TrajectoryEvent:
+        """Fill wall-clock ``ts`` and a stable ``turn_id`` when harness omits them."""
+        state = self._inflight.setdefault(event.thread_id, _ThreadInFlight())
+        ts = event.ts if event.ts > 0 else time.time()
+        turn_id = event.turn_id
+        if not turn_id:
+            if event.kind == "user":
+                state.turn_seq += 1
+                state.turn_id = f"{event.thread_id}:turn:{state.turn_seq}"
+                turn_id = state.turn_id
+            elif state.turn_id is not None:
+                turn_id = state.turn_id
+            # Prefatory system/context before the first USER stays turn_id=None.
+        else:
+            state.turn_id = turn_id
+        if ts == event.ts and turn_id == event.turn_id:
+            return event
+        return replace(event, ts=ts, turn_id=turn_id)
+
+    def _observe_assistant(self, event: TrajectoryEvent) -> None:
+        state = self._inflight.setdefault(event.thread_id, _ThreadInFlight())
+        current = state.assistant
+        if current is not None and _same_assistant_request(current, event):
+            merged = _merge_assistant(current, event)
+            state.assistant = merged
+            state.usage_target = merged
+            self._publish_partial(merged)
+            return
+        self._finalize_assistant(event.thread_id)
+        state.assistant = self._commit_new(event)
+        state.usage_target = state.assistant
+
+    def _observe_tool(self, event: TrajectoryEvent) -> None:
+        state = self._inflight.setdefault(event.thread_id, _ThreadInFlight())
+        call_id = str(event.payload.get("call_id") or "")
+        current = state.tools.get(call_id)
+
+        # DSH parity: only the model issues tool calls. When a tool burst starts
+        # with no open assistant text bubble, insert a synthetic parent row.
+        if current is None and state.assistant is None and not state.tool_call_only:
+            state.usage_target = self._commit_new(_tool_call_only_parent(event))
+            state.tool_call_only = True
+
+        # Stop appending later tokens onto a prior text assistant once tools run.
+        self._finalize_assistant(event.thread_id, clear_only=True)
+
+        if current is not None:
+            merged = _merge_tool(current, event)
+            state.tools[call_id] = merged
+            if "result" in event.payload:
+                self._upsert(merged)
+                state.dirty_tools.discard(call_id)
+            else:
+                state.dirty_tools.add(call_id)
+                self._publish_partial(merged)
+            return
+        committed = self._commit_new(event)
+        if call_id:
+            state.tools[call_id] = committed
+
+    def _finalize_assistant(self, thread_id: str, *, clear_only: bool = False) -> None:
+        state = self._inflight.get(thread_id)
+        if state is None:
+            return
+        current = state.assistant
+        if current is not None:
+            stamped = _stamp_llm_duration(current)
+            self._upsert(stamped)
+            state.usage_target = stamped
+        state.assistant = None
+        if not clear_only:
+            state.tool_call_only = False
+
+    def _commit_new(self, event: TrajectoryEvent) -> TrajectoryEvent:
+        seq = self._next_seq(event.thread_id)
+        stored = replace(event, seq=seq, event_id=_stable_event_id(event, seq))
+        if self._store.append(stored):
+            self._metrics_cache.pop(event.thread_id, None)
+            if event.kind == "system":
+                self._inflight[event.thread_id].system_seen = True
+            self._publish(stored)
+        return stored
+
+    def _upsert(self, event: TrajectoryEvent, *, final: bool = False) -> None:
+        if self._store.upsert(event):
+            self._metrics_cache.pop(event.thread_id, None)
+            self._publish(event, final=final)
+
+    def _prune_retention(self, thread_id: str) -> None:
+        deleted = self._store.prune_older_than_user_turns(
+            thread_id, TRAJECTORY_RETENTION_USER_TURNS
+        )
+        if deleted:
+            self._metrics_cache.pop(thread_id, None)
+
+    def _publish(self, event: TrajectoryEvent, *, final: bool = False) -> None:
+        message = asdict(event)
+        if final:
+            message["_final"] = True
+        self._bus.publish(event.thread_id, message)
+        state = self._inflight.get(event.thread_id)
+        if state is not None:
+            state.last_publish_at[event.event_id] = time.monotonic()
+
+    def _publish_partial(self, event: TrajectoryEvent) -> None:
+        state = self._inflight[event.thread_id]
+        now = time.monotonic()
+        if now - state.last_publish_at.get(event.event_id, 0.0) < _LIVE_UPDATE_INTERVAL_S:
+            return
+        self._publish(event)
+
+    def _next_seq(self, thread_id: str) -> int:
+        state = self._inflight.setdefault(thread_id, _ThreadInFlight())
+        if state.next_seq is not None:
+            seq = state.next_seq
+            state.next_seq += 1
+            return seq
+        latest = self._store.list_before(thread_id, before_seq=None, limit=1, kinds=None)
+        seq = latest[0].seq + 1 if latest else 1
+        state.next_seq = seq + 1
+        return seq
+
+
+def _stable_event_id(event: TrajectoryEvent, seq: int) -> str:
+    if event.kind == "tool":
+        call_id = event.payload.get("call_id")
+        return f"{event.thread_id}:{seq}:tool:{call_id}"
+    if event.kind == "assistant" and event.payload.get("tool_call_only"):
+        return f"{event.thread_id}:{seq}:assistant:tool_call_only"
+    return f"{event.thread_id}:{seq}:{event.kind}"
+
+
+def _tool_call_only_parent(tool_event: TrajectoryEvent) -> TrajectoryEvent:
+    """Synthetic ASSISTANT row that owns a tool burst (DSH “tool call only”)."""
+    return TrajectoryEvent(
+        event_id="",
+        thread_id=tool_event.thread_id,
+        agent_id=tool_event.agent_id,
+        seq=0,
+        ts=tool_event.ts,
+        kind="assistant",
+        turn_id=tool_event.turn_id,
+        request_seq=tool_event.request_seq,
+        is_error=False,
+        summary="(tool call only)",
+        payload={"tool_call_only": True, "content": ""},
+    )
+
+
+def _same_assistant_request(current: TrajectoryEvent, incoming: TrajectoryEvent) -> bool:
+    if current.request_seq is None or incoming.request_seq is None:
+        return True
+    return current.request_seq == incoming.request_seq
+
+
+def _duration_ms(start: float, end: float) -> float | None:
+    if start <= 0 or end < start:
+        return None
+    return max(1.0, (end - start) * 1000.0)
+
+
+def _stamp_llm_duration(event: TrajectoryEvent) -> TrajectoryEvent:
+    if event.payload.get("llm_duration_ms") is not None:
+        return event
+    if event.payload.get("tool_call_only"):
+        return event
+    duration = _duration_ms(event.ts, time.time())
+    if duration is None:
+        return event
+    return replace(event, payload={**event.payload, "llm_duration_ms": duration})
+
+
+def _merge_assistant(current: TrajectoryEvent, incoming: TrajectoryEvent) -> TrajectoryEvent:
+    content = str(current.payload.get("content") or "") + str(incoming.payload.get("content") or "")
+    payload = {**current.payload, **incoming.payload, "content": content}
+    start = current.ts if current.ts > 0 else incoming.ts
+    end = incoming.ts if incoming.ts > 0 else start
+    duration = _duration_ms(start, end)
+    if duration is not None:
+        payload["llm_duration_ms"] = duration
+    return replace(
+        current,
+        # Keep the first-token timestamp so duration spans the full stream.
+        ts=start,
+        summary=content,
+        payload=payload,
+        request_seq=(
+            incoming.request_seq if incoming.request_seq is not None else current.request_seq
+        ),
+        turn_id=incoming.turn_id or current.turn_id,
+    )
+
+
+def _merge_tool(current: TrajectoryEvent, incoming: TrajectoryEvent) -> TrajectoryEvent:
+    payload = dict(current.payload)
+    incoming_payload = incoming.payload
+    payload["name"] = _merge_name(
+        str(payload.get("name") or ""),
+        str(incoming_payload.get("name") or ""),
+    )
+    if "args" in incoming_payload:
+        payload["args"] = _merge_args(payload.get("args"), incoming_payload.get("args"))
+    if "result" in incoming_payload:
+        payload["result"] = incoming_payload["result"]
+    start = current.ts if current.ts > 0 else incoming.ts
+    end = incoming.ts if incoming.ts > 0 else start
+    duration = _duration_ms(start, end)
+    if duration is not None:
+        payload["tool_duration_ms"] = duration
+    name = str(payload.get("name") or "tool")
+    return replace(
+        current,
+        ts=end if end > 0 else current.ts,
+        summary=f"tool {name}",
+        payload=payload,
+        is_error=current.is_error or incoming.is_error,
+        request_seq=(
+            incoming.request_seq if incoming.request_seq is not None else current.request_seq
+        ),
+        turn_id=incoming.turn_id or current.turn_id,
+    )
+
+
+def _merge_name(left: str, right: str) -> str:
+    if not left or left == "tool":
+        return right or left or "tool"
+    if not right or right == "tool":
+        return left
+    if right.startswith(left):
+        return right
+    if left.startswith(right):
+        return left
+    return left + right
+
+
+def _merge_args(left: Any, right: Any) -> Any:
+    if right is None:
+        return left
+    if left is None or left == "":
+        return right
+    if isinstance(left, str) and isinstance(right, str):
+        return left + right
+    if isinstance(left, dict) and isinstance(right, dict):
+        return {**left, **right}
+    return right
diff --git a/src/octop/infra/trajectory/settings.py b/src/octop/infra/trajectory/settings.py
new file mode 100644
index 00000000..1d8f35cd
--- /dev/null
+++ b/src/octop/infra/trajectory/settings.py
@@ -0,0 +1,79 @@
+"""Per-agent trajectory switch and persist-size limits.
+
+``config_json.enable_trajectory`` defaults to enabled. Only the explicit boolean
+``false`` disables observation and writes.
+"""
+
+from __future__ import annotations
+
+import json
+from collections.abc import Mapping
+from dataclasses import replace
+from typing import Any
+
+from octop.infra.trajectory.types import TrajectoryEvent
+
+ENABLE_TRAJECTORY_KEY = "enable_trajectory"
+
+# Persist caps — live SSE still throttles; these bound SQLite row size.
+PAYLOAD_MAX_CHARS = 64_000
+SUMMARY_MAX_CHARS = 240
+TRAJECTORY_RETENTION_USER_TURNS = 50
+TRAJECTORY_SSE_REPLAY_MAX = 2_000
+
+_CLIP_PAYLOAD_KEYS = ("content", "text", "thinking", "args", "result")
+
+
+def agent_trajectory_enabled(cfg: Mapping[str, Any] | None) -> bool:
+    """Return false only when the agent explicitly opted out."""
+    if not cfg:
+        return True
+    return cfg.get(ENABLE_TRAJECTORY_KEY) is not False
+
+
+def apply_enable_trajectory(config: dict[str, Any], enabled: bool) -> dict[str, Any]:
+    """Persist only the non-default opt-out value."""
+    if enabled:
+        config.pop(ENABLE_TRAJECTORY_KEY, None)
+    else:
+        config[ENABLE_TRAJECTORY_KEY] = False
+    return config
+
+
+def clip_text(value: str, limit: int) -> str:
+    if len(value) <= limit:
+        return value
+    if limit <= 1:
+        return "…"
+    return value[: limit - 1].rstrip() + "…"
+
+
+def clip_payload_value(value: Any, *, limit: int = PAYLOAD_MAX_CHARS) -> Any:
+    if isinstance(value, str):
+        return clip_text(value, limit)
+    if isinstance(value, (dict, list)):
+        raw = json.dumps(value, ensure_ascii=False, default=str)
+        if len(raw) <= limit:
+            return value
+        return clip_text(raw, limit)
+    return value
+
+
+def clip_persisted_event(event: TrajectoryEvent) -> TrajectoryEvent:
+    """Bound summary + large payload fields before SQLite write."""
+    summary = clip_text(event.summary or "", SUMMARY_MAX_CHARS)
+    payload = event.payload
+    if not isinstance(payload, dict):
+        return replace(event, summary=summary, payload={})
+    clipped = dict(payload)
+    changed = summary != event.summary
+    for key in _CLIP_PAYLOAD_KEYS:
+        if key not in clipped:
+            continue
+        new_value = clip_payload_value(clipped[key])
+        if new_value is not clipped[key]:
+            clipped[key] = new_value
+            changed = True
+    if not changed:
+        return event
+    return replace(event, summary=summary, payload=clipped)
diff --git a/src/octop/infra/trajectory/store.py b/src/octop/infra/trajectory/store.py
new file mode 100644
index 00000000..5336e666
--- /dev/null
+++ b/src/octop/infra/trajectory/store.py
@@ -0,0 +1,51 @@
+"""Append-only trajectory ledger — thin wrapper around TrajectoryEventRepo."""
+
+from __future__ import annotations
+
+from collections.abc import Iterator
+
+from octop.infra.db.repos.trajectory_events import TrajectoryEventRepo
+from octop.infra.trajectory.settings import clip_persisted_event
+from octop.infra.trajectory.types import TrajectoryEvent
+
+
+class TrajectoryStore:
+    def __init__(self, repo: TrajectoryEventRepo) -> None:
+        self._repo = repo
+
+    def append(self, event: TrajectoryEvent) -> bool:
+        return self._repo.append(clip_persisted_event(event))
+
+    def upsert(self, event: TrajectoryEvent) -> bool:
+        return self._repo.upsert(clip_persisted_event(event))
+
+    def list_before(
+        self,
+        thread_id: str,
+        *,
+        before_seq: int | None,
+        limit: int,
+        kinds: list[str] | None,
+    ) -> list[TrajectoryEvent]:
+        return self._repo.list_before(thread_id, before_seq=before_seq, limit=limit, kinds=kinds)
+
+    def list_from_seq(
+        self,
+        thread_id: str,
+        *,
+        from_seq: int,
+        limit: int,
+    ) -> list[TrajectoryEvent]:
+        return self._repo.list_from_seq(thread_id, from_seq=from_seq, limit=limit)
+
+    def prune_older_than_user_turns(self, thread_id: str, keep_user_turns: int) -> int:
+        return self._repo.prune_older_than_user_turns(thread_id, keep_user_turns)
+
+    def get(self, event_id: str) -> TrajectoryEvent | None:
+        return self._repo.get(event_id)
+
+    def delete_for_thread(self, thread_id: str) -> int:
+        return self._repo.delete_for_thread(thread_id)
+
+    def iter_for_export(self, thread_id: str) -> Iterator[TrajectoryEvent]:
+        return self._repo.iter_for_export(thread_id)
diff --git a/src/octop/infra/trajectory/turn_context.py b/src/octop/infra/trajectory/turn_context.py
new file mode 100644
index 00000000..93984afa
--- /dev/null
+++ b/src/octop/infra/trajectory/turn_context.py
@@ -0,0 +1,128 @@
+"""Synthesize SYSTEM / CONTEXT chunks from harness injection sources of truth."""
+
+from __future__ import annotations
+
+import hashlib
+from collections.abc import Sequence
+from typing import Any
+
+from harness_agent.backends.workspace import DEFAULT_MEMORY_FILES
+
+# Mirror harness ``SkillFilterMiddleware``: memory files are injected via
+# ``BackendWorkspace.memory_paths(DEFAULT_MEMORY_FILES)``.
+_MEMORY_SOURCE = "memory"
+
+
+def memory_file_order() -> list[str]:
+    """Workspace memory files harness injects into the system prompt."""
+    return list(DEFAULT_MEMORY_FILES)
+
+
+def filter_turn_skill_names(
+    enabled_skills: Sequence[dict[str, str]],
+    *,
+    turn_skills: Sequence[str] | None,
+    skills_filter_present: bool,
+) -> list[str]:
+    """Apply the same allow-list semantics as ``SkillFilterMiddleware``.
+
+    * Filter key absent → all enabled skills (display ``name``).
+    * Filter key present (even ``[]``) → keep skills whose name/slug intersects
+      the allow-list (harness ``skill_identity_keys``).
+    """
+    out: list[str] = []
+    seen: set[str] = set()
+    allowed = {str(name) for name in (turn_skills or [])} if skills_filter_present else None
+    for row in enabled_skills:
+        name = str(row.get("name") or row.get("slug") or "").strip()
+        if not name or name in seen:
+            continue
+        if allowed is not None:
+            keys = {name}
+            slug = str(row.get("slug") or "").strip()
+            if slug:
+                keys.add(slug)
+            if not (keys & allowed):
+                continue
+        seen.add(name)
+        out.append(name)
+    return out
+
+
+def build_turn_start_chunks(
+    *,
+    include_system: bool,
+    system_prompt: str | None,
+    workspace_files: Sequence[str],
+    skills: list[str] | None,
+    mcp_servers: list[str] | None,
+    skills_filter_present: bool = False,
+) -> list[dict[str, Any]]:
+    """Return projector-ready chunks aligned with harness injection.
+
+    ``workspace_files`` must already be filtered to files harness may load
+    (``DEFAULT_MEMORY_FILES`` ∩ exists). ``skills`` is the final
+    enabled allow-list for this turn (or ``None`` to omit the skills row when
+    the catalog could not be resolved). When ``skills_filter_present`` and
+    ``skills == []``, emit an explicit ``(none)`` row so the ledger is not
+    silently missing a real empty allow-list.
+    """
+    chunks: list[dict[str, Any]] = []
+    prompt = (system_prompt or "").strip()
+    if include_system and prompt:
+        chunks.append(
+            {
+                "type": "system",
+                "label": "Initial System Prompt",
+                **_content_reference(prompt),
+            }
+        )
+
+    for label in workspace_files:
+        name = (label or "").strip() or "workspace"
+        chunks.append(
+            {
+                "type": "context",
+                "source": _MEMORY_SOURCE,
+                "label": name,
+            }
+        )
+
+    if skills is not None:
+        if skills:
+            listing = "\n".join(f"- {name}" for name in skills)
+        elif skills_filter_present:
+            listing = "(none)"
+        else:
+            listing = ""
+        if listing:
+            chunks.append(
+                {
+                    "type": "context",
+                    "source": "skills",
+                    "label": "Available skills",
+                    "content": listing,
+                }
+            )
+
+    servers = [s.strip() for s in (mcp_servers or []) if isinstance(s, str) and s.strip()]
+    if servers:
+        listing = "\n".join(f"- {name}" for name in servers)
+        chunks.append(
+            {
+                "type": "context",
+                "source": "mcp",
+                "label": "Connectors",
+                "content": listing,
+            }
+        )
+
+    return chunks
+
+
+def _content_reference(content: str) -> dict[str, str | int]:
+    encoded = content.encode("utf-8")
+    return {
+        "content_sha256": hashlib.sha256(encoded).hexdigest(),
+        "content_chars": len(content),
+    }
diff --git a/src/octop/infra/trajectory/types.py b/src/octop/infra/trajectory/types.py
new file mode 100644
index 00000000..f54705f0
--- /dev/null
+++ b/src/octop/infra/trajectory/types.py
@@ -0,0 +1,29 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Any, Literal
+
+TrajectoryKind = Literal[
+    "user",
+    "assistant",
+    "tool",
+    "context",
+    "compacted",
+    "system",
+    "unknown",
+]
+
+
+@dataclass(frozen=True)
+class TrajectoryEvent:
+    event_id: str
+    thread_id: str
+    agent_id: str
+    seq: int
+    ts: float
+    kind: TrajectoryKind
+    turn_id: str | None
+    request_seq: int | None
+    is_error: bool
+    summary: str
+    payload: dict[str, Any]
diff --git a/src/octop/infra/users/permissions.py b/src/octop/infra/users/permissions.py
index 6b1d26ae..6e4a48fa 100644
--- a/src/octop/infra/users/permissions.py
+++ b/src/octop/infra/users/permissions.py
@@ -144,11 +144,11 @@ def _p(
     "search": _p(
         "search",
         "admin",
-        "AI 搜索",
-        "AI search",
-        page="advanced",
-        page_zh="应用设置",
-        page_en="App settings",
+        "搜索引擎",
+        "Search engines",
+        page="models",
+        page_zh="模型",
+        page_en="Models",
     ),
     "knowledge_settings": _p(
         "knowledge_settings",
@@ -162,11 +162,11 @@ def _p(
     "voice": _p(
         "voice",
         "admin",
-        "语音",
-        "Voice",
-        page="advanced",
-        page_zh="应用设置",
-        page_en="App settings",
+        "语音模型",
+        "Voice models",
+        page="models",
+        page_zh="模型",
+        page_en="Models",
     ),
     "observability": _p(
         "observability",
diff --git a/src/octop/infra/users/preferences.py b/src/octop/infra/users/preferences.py
index 18c7be98..2725d836 100644
--- a/src/octop/infra/users/preferences.py
+++ b/src/octop/infra/users/preferences.py
@@ -14,6 +14,7 @@
 PREFERENCES_KEY_REMOTE_BROWSER_BOOKMARKS = "remote_browser_bookmarks"
 PREFERENCES_KEY_PREFERRED_MODEL = "preferred_model"
 PREFERENCES_KEY_MODEL_REASONING = "model_reasoning"
+PREFERENCES_KEY_TIMEZONE = "timezone"
 MAX_BOOKMARK_TITLE_LEN = 80
 
 REASONING_MODES = frozenset({"auto", "enabled", "disabled"})
@@ -111,6 +112,15 @@ def get_model_reasoning_from_json(raw: str | None) -> dict[str, ModelReasoningPr
     return out
 
 
+def get_timezone_from_preferences_json(raw: str | None) -> str | None:
+    """Return the preferred timezone from preferences JSON if present and non-empty."""
+    value = parse_preferences_json(raw).get(PREFERENCES_KEY_TIMEZONE)
+    if not isinstance(value, str):
+        return None
+    value = value.strip()
+    return value or None
+
+
 def merge_preferences_json(
     current_raw: str | None,
     bookmarks: list[RemoteBrowserBookmark],
diff --git a/src/octop/infra/utils/browser_media.py b/src/octop/infra/utils/browser_media.py
index 8c7e9fbb..832340f1 100644
--- a/src/octop/infra/utils/browser_media.py
+++ b/src/octop/infra/utils/browser_media.py
@@ -18,6 +18,29 @@
 BROWSER_PROFILES_REL = "browser-profiles"
 
 
+def parse_octop_user_id(raw: object) -> int | None:
+    """Return a positive Octop ``users.id``, or ``None`` if *raw* is unusable."""
+    if isinstance(raw, bool) or not isinstance(raw, (int, str)):
+        return None
+    try:
+        user_id = int(raw)
+    except (TypeError, ValueError):
+        return None
+    if user_id <= 0:
+        return None
+    return user_id
+
+
+def user_browser_profile(user_id: int) -> str:
+    """Stable harness-browser profile name for one Octop user.
+
+    Dashboard and CLI turns use the logged-in user. IM turns use the agent
+    owner (the same id already stored on the thread). A leftover on-disk
+    ``default`` directory is not migrated and must not be reused.
+    """
+    return f"user-{user_id}"
+
+
 def agent_outbound_screenshots_dir(workspace_dir: Path) -> Path:
     """``{workspace_dir}/outbound/screenshots`` — same convention as IM ``outbound/``."""
     dest = Path(workspace_dir) / OUTBOUND_SCREENSHOTS_REL
@@ -61,9 +84,10 @@ def _maybe_migrate_legacy_profiles(dest: Path) -> None:
 def octop_browser_profiles_dir(paths: PathLayout | None = None) -> Path:
     """Shared Chrome profiles root: ``~/.octop/browser-profiles``.
 
-    Profiles are shared across agents (one headed ``default`` profile for
-    dashboard + ``browser_use``). Prefer this Octop-owned directory over
-    ``~/.harness-browser/profiles`` or system ``/tmp``.
+    Profiles live under one Octop-owned root and are named ``user-<id>``.
+    A pre-isolation ``default`` directory, if present, is left untouched.
+    Prefer this directory over ``~/.harness-browser/profiles`` or system
+    ``/tmp``.
 
     When the Octop dir is empty and a legacy harness-browser profiles tree
     exists, contents are moved once so login cookies survive the cutover.
diff --git a/src/octop/infra/voice/manager.py b/src/octop/infra/voice/manager.py
index 84339137..aa263f5c 100644
--- a/src/octop/infra/voice/manager.py
+++ b/src/octop/infra/voice/manager.py
@@ -189,3 +189,31 @@ async def test_provider(self, provider_id: int, *, mode: str) -> dict[str, Any]:
         if mode == "stt":
             return await adapters.test_stt(row, row.kind)
         return await adapters.test_tts(row, row.kind)
+
+    async def test_configuration(
+        self,
+        *,
+        name: str,
+        kind: str,
+        capability: str,
+        base_url: str | None,
+        api_key: str | None,
+        extra_json: str | None,
+        mode: str,
+    ) -> dict[str, Any]:
+        row = VoiceProviderRow(
+            id=0,
+            name=name,
+            kind=kind,
+            capability=capability,
+            base_url=base_url,
+            api_key=api_key,
+            extra_json=extra_json,
+            note=None,
+            enabled=1,
+            created_at=0,
+            updated_at=0,
+        )
+        if mode == "stt":
+            return await adapters.test_stt(row, kind)
+        return await adapters.test_tts(row, kind)
diff --git a/tests/conftest.py b/tests/conftest.py
index 8d37cb87..bfd0bf9b 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -4,6 +4,7 @@
 
 from collections.abc import Iterator
 from pathlib import Path
+from typing import Any
 
 import pytest
 
@@ -43,6 +44,31 @@ def repo_root() -> Path:
     return _REPO_ROOT
 
 
+# Creating an agent now starts a multi-hour asyncio.sleep (proactive care
+# defaults to on). pytest-asyncio waits for leftover tasks before fixture
+# teardown, so any test that boots OctopServer without going through
+# ``octop_client`` would hang the suite. Scheduler unit tests opt out.
+_PROACTIVE_SCHEDULER_TESTS = "tests/unit/proactive/test_scheduler.py"
+
+
+@pytest.fixture(autouse=True)
+def _suspend_proactive_care_loops(
+    request: pytest.FixtureRequest,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    if _module_path(request.node.nodeid) == _PROACTIVE_SCHEDULER_TESTS:
+        return
+    from octop.infra.proactive.scheduler import ProactiveCareScheduler
+
+    monkeypatch.setattr(ProactiveCareScheduler, "ensure_scheduled", lambda self, _id: None)
+
+    async def _start_all(self: Any) -> None:
+        return None
+
+    monkeypatch.setattr(ProactiveCareScheduler, "start_all", _start_all)
+    monkeypatch.setattr(ProactiveCareScheduler, "_schedule", lambda self, _id: None)
+
+
 @pytest.fixture(autouse=True)
 def _isolated_user_home(
     tmp_path_factory: pytest.TempPathFactory,
diff --git a/tests/integration/test_browser_api.py b/tests/integration/test_browser_api.py
index 1b41900a..f42da999 100644
--- a/tests/integration/test_browser_api.py
+++ b/tests/integration/test_browser_api.py
@@ -1,14 +1,9 @@
 """tests/integration/test_browser_api.py — remote browser endpoints.
 
-We deliberately don't spawn a real Playwright browser in the test
-suite — that requires the chromium binary to be installed and adds
-~5s of cold-start per test. Instead we drive the *gates* and the
-``_probe_env`` helper directly: env-status shape, install spawn
-returning a pid, 503 when browsers aren't ready, cross-user 404.
-
-The happy path (create session → goto → screenshot) is exercised
-manually via the dashboard; once chromium is installed in CI we can
-flip a feature flag and let ``test_create_session_happy_path`` run.
+We deliberately don't spawn a real Chrome in the test suite. These
+cases drive env-status, ``_probe_env``, install SSE, harness-sessions,
+and shutdown gates. Live screencast is covered by dashboard + WS unit
+tests.
 """
 
 from __future__ import annotations
@@ -43,7 +38,7 @@ def test_probe_env_when_playwright_missing() -> None:
     """``_probe_env`` should not raise even with playwright import broken."""
     import builtins
 
-    from octop.api.routers.browser import sessions as br
+    from octop.api.routers.browser import env as br
 
     original_import = builtins.__import__
 
@@ -62,7 +57,7 @@ def fake_import(name: str, *args: Any, **kw: Any) -> Any:
 
 def test_probe_env_harness_browser_without_chromium() -> None:
     """``browsers_ok`` must stay false when no Chrome/Chromium is available."""
-    from octop.api.routers.browser import sessions as br
+    from octop.api.routers.browser import env as br
 
     try:
         import harness_browser  # noqa: F401
@@ -81,7 +76,7 @@ def test_probe_env_harness_browser_without_chromium() -> None:
 
 def test_probe_env_accepts_system_chrome() -> None:
     """System Chrome via find_chrome is enough for browsers_ok (same as launch)."""
-    from octop.api.routers.browser import sessions as br
+    from octop.api.routers.browser import env as br
 
     try:
         import harness_browser  # noqa: F401
@@ -111,7 +106,7 @@ def test_probe_env_accepts_system_chrome() -> None:
 
 
 def test_verify_browser_binary_ok(tmp_path: Path) -> None:
-    from octop.api.routers.browser import sessions as br
+    from octop.api.routers.browser import env as br
 
     if os.name == "nt":
         # Windows cannot exec a shebang script; use a .bat that ignores args.
@@ -126,14 +121,14 @@ def test_verify_browser_binary_ok(tmp_path: Path) -> None:
     assert "Chrome" in msg
 
 
-# --- session list (always permits empty) -----------------------------------
-
-
-async def test_list_sessions_empty(env: Any) -> None:
+async def test_legacy_playwright_session_routes_removed(env: Any) -> None:
+    """In-process Playwright CRUD is gone; the product path is harness-sessions."""
     c, _srv, auth = env
     r = await c.get("/api/browser/sessions", headers=auth)
-    assert r.status_code == 200
-    assert r.json() == []
+    assert r.status_code in (404, 405)
+    r = await c.post("/api/browser/sessions", headers=auth)
+    assert r.status_code in (404, 405)
+    assert r.status_code != 201
 
 
 async def test_harness_sessions_shape(env: Any) -> None:
@@ -204,103 +199,13 @@ def get(self, _url: str, timeout=None):
     assert [tab["active"] for tab in tabs] == [False, True]
 
 
-async def test_new_tab_bad_restore_url_returns_warning() -> None:
-    """A stale restored tab URL should not crash the whole browser session."""
-    from octop.api.routers.browser import sessions as br
-
-    class FakePage:
-        def __init__(self) -> None:
-            self.closed = False
-
-        async def goto(self, *_args: Any, **_kwargs: Any) -> None:
-            raise RuntimeError("net::ERR_FILE_NOT_FOUND")
-
-        async def close(self) -> None:
-            self.closed = True
-
-        def is_closed(self) -> bool:
-            return self.closed
-
-    class FakeContext:
-        async def new_page(self) -> FakePage:
-            return FakePage()
-
-    class FakeSession:
-        id = "sid"
-        url = "about:blank"
-        context = FakeContext()
-        pages: list[Any] = []
-        active_idx = 0
-
-        async def sync_pages(self) -> None:
-            return None
-
-        async def tab_list(self) -> list[dict[str, Any]]:
-            return [{"idx": 0, "url": "about:blank", "title": "", "active": True}]
-
-    with patch("octop.api.routers.browser.sessions._get_session", return_value=FakeSession()):
-        resp = await br.new_tab(
-            "sid",
-            br.NewTabBody(url="file:///missing.html"),
-            SimpleNamespace(id=1),
-        )
-
-    assert resp["id"] == "sid"
-    assert "warning" in resp
-    assert "file:///missing.html" in resp["warning"]
-
-
-# --- create when env not ready -> 503 -------------------------------------
-
-
-async def test_create_session_503_when_env_broken(env: Any) -> None:
-    c, _srv, auth = env
-
-    with patch(
-        "octop.api.routers.browser.sessions._probe_env",
-        return_value={
-            "playwright": True,
-            "browsers_ok": False,
-            "error": "chromium not installed",
-        },
-    ):
-        r = await c.post("/api/browser/sessions", headers=auth)
-    assert r.status_code == 503
-    body = r.json()
-    # The specific env reason is surfaced via ``details`` (the message is a
-    # generic localized string per the i18n design).
-    assert "chromium" in body["error"]["details"]["error"].lower()
-
-
-# --- cross-user isolation --------------------------------------------------
-
-
-async def test_session_404_for_other_user(env: Any) -> None:
-    c, _srv, auth = env
-    r = await c.get("/api/browser/sessions/no-such-id", headers=auth)
-    assert r.status_code == 404
-    r = await c.delete("/api/browser/sessions/no-such-id", headers=auth)
-    assert r.status_code == 404
-    r = await c.get(
-        "/api/browser/sessions/no-such-id/screenshot",
-        headers=auth,
-    )
-    assert r.status_code == 404
-    r = await c.post(
-        "/api/browser/sessions/no-such-id/goto",
-        headers=auth,
-        json={"url": "https://example.com"},
-    )
-    assert r.status_code == 404
-
-
 async def test_shutdown_requires_auth(env: Any) -> None:
     c, _srv, _auth = env
     r = await c.post("/api/browser/shutdown")
     assert r.status_code == 401
 
 
-async def test_shutdown_stops_named_profile(env: Any) -> None:
+async def test_shutdown_ignores_client_profile(env: Any) -> None:
     c, _srv, auth = env
     result = SimpleNamespace(success=True, error=None)
     with patch(
@@ -309,10 +214,10 @@ async def test_shutdown_stops_named_profile(env: Any) -> None:
     ) as tool:
         r = await c.post("/api/browser/shutdown?profile=work", headers=auth)
     assert r.status_code == 200
-    assert r.json() == {"ok": True, "profile": "work"}
+    assert r.json() == {"ok": True, "profile": "user-1"}
     tool.assert_awaited_once_with(
         action="close_session",
-        profile="work",
+        profile="user-1",
         kill=True,
     )
 
diff --git a/tests/integration/test_browser_record_replay_api.py b/tests/integration/test_browser_record_replay_api.py
index 03ea062a..71dd7d6e 100644
--- a/tests/integration/test_browser_record_replay_api.py
+++ b/tests/integration/test_browser_record_replay_api.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from types import SimpleNamespace
 from typing import Any
 from unittest.mock import AsyncMock, patch
 
@@ -49,7 +50,7 @@ async def test_record_replay_start_ensures_daemon_and_starts_recording(env: Any)
     mock_send.assert_awaited_once_with(
         {
             "command": "start",
-            "profile": "thr_demo",
+            "profile": "user-1",
             "name": "demo",
             "privacy": "mask-sensitive",
             "screenshots": "off",
@@ -57,7 +58,7 @@ async def test_record_replay_start_ensures_daemon_and_starts_recording(env: Any)
     )
 
 
-async def test_record_replay_start_falls_back_to_profile_without_agent_profile(env: Any) -> None:
+async def test_record_replay_start_ignores_requested_profile(env: Any) -> None:
     client, _srv, auth = env
 
     with (
@@ -80,7 +81,7 @@ async def test_record_replay_start_falls_back_to_profile_without_agent_profile(e
     mock_send.assert_awaited_once_with(
         {
             "command": "start",
-            "profile": "thr_demo",
+            "profile": "user-1",
             "name": "demo",
             "privacy": "mask-sensitive",
             "screenshots": "off",
@@ -108,11 +109,17 @@ async def test_record_replay_start_returns_503_when_daemon_fails(env: Any) -> No
 
 async def test_record_replay_stop_generates_steps(env: Any) -> None:
     client, _srv, auth = env
+    owned = SimpleNamespace(read_manifest=lambda _rid: SimpleNamespace(profile="user-1"))
 
-    with patch(
-        "octop.api.routers.browser.record_replay.send_record_request",
-        new=AsyncMock(return_value={"ok": True, "recordingId": "rec_1", "events": 4, "steps": 2}),
-    ) as mock_send:
+    with (
+        patch("harness_browser.record.store.RecordingStore", return_value=owned),
+        patch(
+            "octop.api.routers.browser.record_replay.send_record_request",
+            new=AsyncMock(
+                return_value={"ok": True, "recordingId": "rec_1", "events": 4, "steps": 2}
+            ),
+        ) as mock_send,
+    ):
         r = await client.post(
             "/api/browser/record-replay/stop",
             headers=auth,
@@ -131,7 +138,7 @@ async def test_record_replay_stop_generates_steps(env: Any) -> None:
     )
 
 
-async def test_record_replay_start_uses_agent_profile_when_requested(env: Any) -> None:
+async def test_record_replay_start_ignores_requested_agent_profile(env: Any) -> None:
     client, _srv, auth = env
 
     with (
@@ -154,7 +161,7 @@ async def test_record_replay_start_uses_agent_profile_when_requested(env: Any) -
     mock_send.assert_awaited_once_with(
         {
             "command": "start",
-            "profile": "default",
+            "profile": "user-1",
             "name": None,
             "privacy": "mask-sensitive",
             "screenshots": "off",
@@ -166,9 +173,17 @@ async def test_record_replay_replay_runs_runner(env: Any) -> None:
     client, _srv, auth = env
     runner = AsyncMock(return_value={"status": "passed", "recordingId": "rec_1"})
 
-    with patch(
-        "octop.api.routers.browser.record_replay.run_replay_recording",
-        new=runner,
+    with (
+        patch(
+            "harness_browser.record.store.RecordingStore",
+            return_value=SimpleNamespace(
+                read_manifest=lambda _rid: SimpleNamespace(profile="user-1")
+            ),
+        ),
+        patch(
+            "octop.api.routers.browser.record_replay.run_replay_recording",
+            new=runner,
+        ),
     ):
         r = await client.post(
             "/api/browser/record-replay/replay",
@@ -178,4 +193,40 @@ async def test_record_replay_replay_runs_runner(env: Any) -> None:
 
     assert r.status_code == 200
     assert r.json()["status"] == "passed"
-    runner.assert_awaited_once_with("rec_1", profile="thr_demo-replay", inputs={})
+    runner.assert_awaited_once_with("rec_1", profile="user-1", inputs={})
+
+
+async def test_record_status_hides_other_user_active(env: Any) -> None:
+    client, _srv, auth = env
+    with (
+        patch(
+            "octop.api.routers.browser.record_replay.send_record_request",
+            new=AsyncMock(
+                return_value={
+                    "ok": True,
+                    "active": {"recordingId": "rec_x", "profile": "user-99"},
+                }
+            ),
+        ),
+        patch(
+            "octop.api.routers.browser.record_replay._latest_recording_id",
+            return_value=None,
+        ),
+    ):
+        r = await client.get("/api/browser/record-replay/status", headers=auth)
+    assert r.status_code == 200
+    assert r.json()["active"] is None
+
+
+async def test_record_skill_content_hides_other_user_recording(env: Any) -> None:
+    client, _srv, auth = env
+    store = SimpleNamespace(
+        read_manifest=lambda _rid: SimpleNamespace(profile="user-99"),
+    )
+    with patch("harness_browser.record.store.RecordingStore", return_value=store):
+        r = await client.post(
+            "/api/browser/record-replay/skill-content",
+            headers=auth,
+            json={"recordingId": "rec_other"},
+        )
+    assert r.status_code == 404
diff --git a/tests/integration/test_chat_ws.py b/tests/integration/test_chat_ws.py
index cac5a6df..495f3d15 100644
--- a/tests/integration/test_chat_ws.py
+++ b/tests/integration/test_chat_ws.py
@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import asyncio
-import json
 from collections.abc import AsyncIterator
 from pathlib import Path
 from typing import Any
@@ -11,7 +10,6 @@
 
 import httpx
 import pytest
-from starlette.testclient import TestClient
 from starlette.websockets import WebSocketDisconnect
 
 from tests.support.app import octop_client
@@ -23,7 +21,11 @@
     seed_openai_provider,
 )
 from tests.support.fakes import FakeHarnessAgent
-from tests.support.http import ws_token
+from tests.support.http import chat_ws_path, ws_connect
+
+
+def _chat_ws(c: httpx.AsyncClient, aid: str, auth: dict[str, str]) -> Any:
+    return ws_connect(c._octop_app, chat_ws_path(aid, auth))  # type: ignore[attr-defined]
 
 
 @pytest.fixture
@@ -43,80 +45,38 @@ async def env(tmp_octop_home: Path) -> AsyncIterator[Any]:
         yield c, srv, fake, users["alice"], users["bob"], aid
 
 
-def _consume_ws_turn_sync(
-    app: object,
-    aid: str,
-    token: str,
-    body: dict[str, Any],
-) -> list[dict[str, Any]]:
-    chunks: list[dict[str, Any]] = []
-    with TestClient(app).websocket_connect(  # type: ignore[attr-defined]
-        f"/api/agents/{aid}/chat/ws?token={token}"
-    ) as ws:
-        ws.send_json(body)
-        while True:
-            raw = ws.receive_text()
-            chunk = json.loads(raw)
-            chunks.append(chunk)
-            if chunk.get("type") in ("done", "error"):
-                break
-    return chunks
-
-
-def _disconnect_ws_turn_sync(
-    app: object,
-    aid: str,
-    token: str,
-) -> None:
-    with TestClient(app).websocket_connect(  # type: ignore[attr-defined]
-        f"/api/agents/{aid}/chat/ws?token={token}"
-    ) as ws:
-        ws.send_json({"type": "user_turn", "text": "cancel me"})
-        ws.receive_text()
-
-
-def _turn_then_rebind_sync(
-    app: object,
+async def _turn_then_rebind(
+    c: httpx.AsyncClient,
     aid: str,
-    token: str,
+    auth: dict[str, str],
     thread_id: str,
-    gate_release: Any,
+    gate_release: asyncio.Event,
 ) -> list[dict[str, Any]]:
     """Start a turn on conn A, drop it after the first token, re-subscribe on B.
 
     The fake stream is gated between first and second token so B can subscribe
     while the turn is still active, then receive the remaining chunks.
     """
-    with TestClient(app).websocket_connect(  # type: ignore[attr-defined]
-        f"/api/agents/{aid}/chat/ws?token={token}"
-    ) as ws_a:
-        ws_a.send_json(
+    async with _chat_ws(c, aid, auth) as ws_a:
+        await ws_a.send_json(
             {
                 "type": "user_turn",
                 "text": "slow please",
                 "thread_id": thread_id,
             }
         )
-        first = json.loads(ws_a.receive_text())
+        first = await ws_a.receive_json()
         assert first.get("type") == "token"
         assert first.get("content") == "first"
     # A is closed; turn is blocked on gate_release (still active, not cancelled).
 
     frames: list[dict[str, Any]] = []
-    with TestClient(app).websocket_connect(  # type: ignore[attr-defined]
-        f"/api/agents/{aid}/chat/ws?token={token}"
-    ) as ws_b:
-        ws_b.send_json({"type": "subscribe", "thread_id": thread_id})
-        status = json.loads(ws_b.receive_text())
-        frames.append(status)
+    async with _chat_ws(c, aid, auth) as ws_b:
+        await ws_b.send_json({"type": "subscribe", "thread_id": thread_id})
+        frames.append(await ws_b.receive_json())
         # Release the slow stream only after B is subscribed.
         gate_release.set()
-        for _ in range(50):
-            raw = ws_b.receive_text()
-            frame = json.loads(raw)
-            frames.append(frame)
-            if frame.get("type") in ("done", "error"):
-                break
+        frames.extend(await ws_b.drain_turn())
     return frames
 
 
@@ -138,14 +98,7 @@ async def slow_stream(request: dict[str, Any]) -> AsyncIterator[dict[str, Any]]:
     cancel_spy = MagicMock(wraps=srv.app_runtime.agent_registry.cancel_stream)
     srv.app_runtime.agent_registry.cancel_stream = cancel_spy
 
-    frames = await asyncio.to_thread(
-        _turn_then_rebind_sync,
-        c._octop_app,  # type: ignore[attr-defined]
-        aid,
-        ws_token(alice_auth),
-        tid,
-        gate,
-    )
+    frames = await _turn_then_rebind(c, aid, alice_auth, tid, gate)
 
     cancel_spy.assert_not_called()
     assert frames[0] == {"type": "turn_status", "thread_id": tid, "active": True}
@@ -154,63 +107,46 @@ async def slow_stream(request: dict[str, Any]) -> AsyncIterator[dict[str, Any]]:
     assert frames[-1].get("type") == "done"
 
 
-def _turn_with_second_subscriber_sync(
-    app: object,
+async def _turn_with_second_subscriber(
+    c: httpx.AsyncClient,
     aid: str,
-    token: str,
+    auth: dict[str, str],
     thread_id: str,
-    gate_release: Any,
+    gate_release: asyncio.Event,
 ) -> tuple[list[dict[str, Any]], list[dict[str, Any]]]:
     """Keep conn A open, subscribe conn B mid-turn; both receive remaining chunks."""
     a_frames: list[dict[str, Any]] = []
     b_frames: list[dict[str, Any]] = []
-    with TestClient(app).websocket_connect(  # type: ignore[attr-defined]
-        f"/api/agents/{aid}/chat/ws?token={token}"
-    ) as ws_a:
-        ws_a.send_json(
+    async with _chat_ws(c, aid, auth) as ws_a:
+        await ws_a.send_json(
             {
                 "type": "user_turn",
                 "text": "slow please",
                 "thread_id": thread_id,
             }
         )
-        a_frames.append(json.loads(ws_a.receive_text()))
-        with TestClient(app).websocket_connect(  # type: ignore[attr-defined]
-            f"/api/agents/{aid}/chat/ws?token={token}"
-        ) as ws_b:
-            ws_b.send_json({"type": "subscribe", "thread_id": thread_id})
-            b_frames.append(json.loads(ws_b.receive_text()))
+        a_frames.append(await ws_a.receive_json())
+        async with _chat_ws(c, aid, auth) as ws_b:
+            await ws_b.send_json({"type": "subscribe", "thread_id": thread_id})
+            b_frames.append(await ws_b.receive_json())
             gate_release.set()
-            for _ in range(50):
-                frame = json.loads(ws_a.receive_text())
-                a_frames.append(frame)
-                if frame.get("type") in ("done", "error"):
-                    break
-            for _ in range(50):
-                frame = json.loads(ws_b.receive_text())
-                b_frames.append(frame)
-                if frame.get("type") in ("done", "error"):
-                    break
+            rest_a, rest_b = await asyncio.gather(ws_a.drain_turn(), ws_b.drain_turn())
+            a_frames.extend(rest_a)
+            b_frames.extend(rest_b)
     return a_frames, b_frames
 
 
-def _two_threads_turn_sync(
-    app: object,
+async def _two_threads_turn(
+    c: httpx.AsyncClient,
     aid: str,
-    token: str,
+    auth: dict[str, str],
     tid_a: str,
     tid_b: str,
     *,
     text_a: str = "one",
     text_b: str = "two",
 ) -> tuple[list[dict[str, Any]], list[dict[str, Any]]]:
-    """Run two live turns on different threads from one TestClient thread.
-
-    Each sync ``TestClient`` spins a blocking anyio portal; driving two portals
-    from separate ``asyncio.to_thread`` workers deadlocks the server's
-    ``run_coroutine_threadsafe`` outbound path under pytest-asyncio. Interleaving
-    receives on one thread still exercises concurrent per-thread routing.
-    """
+    """Run two live turns on different threads over two concurrent sockets."""
     body_a: dict[str, Any] = {
         "type": "user_turn",
         "text": text_a,
@@ -223,31 +159,10 @@ def _two_threads_turn_sync(
         "messages": [{"role": "user", "content": text_b}],
         "thread_id": tid_b,
     }
-    a_frames: list[dict[str, Any]] = []
-    b_frames: list[dict[str, Any]] = []
-    with (
-        TestClient(app).websocket_connect(  # type: ignore[attr-defined]
-            f"/api/agents/{aid}/chat/ws?token={token}"
-        ) as ws_a,
-        TestClient(app).websocket_connect(  # type: ignore[attr-defined]
-            f"/api/agents/{aid}/chat/ws?token={token}"
-        ) as ws_b,
-    ):
-        ws_a.send_json(body_a)
-        ws_b.send_json(body_b)
-        pending = {"a": True, "b": True}
-        while pending["a"] or pending["b"]:
-            if pending["a"]:
-                frame = json.loads(ws_a.receive_text())
-                a_frames.append(frame)
-                if frame.get("type") in ("done", "error"):
-                    pending["a"] = False
-            if pending["b"]:
-                frame = json.loads(ws_b.receive_text())
-                b_frames.append(frame)
-                if frame.get("type") in ("done", "error"):
-                    pending["b"] = False
-    return a_frames, b_frames
+    async with _chat_ws(c, aid, auth) as ws_a, _chat_ws(c, aid, auth) as ws_b:
+        await ws_a.send_json(body_a)
+        await ws_b.send_json(body_b)
+        return await asyncio.gather(ws_a.drain_turn(), ws_b.drain_turn())  # type: ignore[return-value]
 
 
 async def test_ws_concurrent_subscribers_both_receive_later_chunks(env: Any) -> None:
@@ -266,14 +181,7 @@ async def slow_stream(request: dict[str, Any]) -> AsyncIterator[dict[str, Any]]:
 
     agent.stream = slow_stream
 
-    a_frames, b_frames = await asyncio.to_thread(
-        _turn_with_second_subscriber_sync,
-        c._octop_app,  # type: ignore[attr-defined]
-        aid,
-        ws_token(alice_auth),
-        tid,
-        gate,
-    )
+    a_frames, b_frames = await _turn_with_second_subscriber(c, aid, alice_auth, tid, gate)
 
     assert a_frames[0].get("content") == "first"
     assert [f.get("content") for f in a_frames if f.get("type") == "token"] == ["first", "second"]
@@ -298,14 +206,7 @@ async def tagged_stream(request: dict[str, Any]) -> AsyncIterator[dict[str, Any]
 
     agent.stream = tagged_stream
 
-    a_frames, b_frames = await asyncio.to_thread(
-        _two_threads_turn_sync,
-        c._octop_app,  # type: ignore[attr-defined]
-        aid,
-        ws_token(alice_auth),
-        tid_a,
-        tid_b,
-    )
+    a_frames, b_frames = await _two_threads_turn(c, aid, alice_auth, tid_a, tid_b)
 
     a_tokens = [f.get("content") for f in a_frames if f.get("type") == "token"]
     b_tokens = [f.get("content") for f in b_frames if f.get("type") == "token"]
@@ -334,15 +235,9 @@ async def _consume_ws_turn(
     if extra:
         body.update(extra)
 
-    # Run the blocking starlette TestClient session in a worker thread so the
-    # server's event loop stays free to process the turn (see ws_chat_turn).
-    return await asyncio.to_thread(
-        _consume_ws_turn_sync,
-        c._octop_app,  # type: ignore[attr-defined]
-        aid,
-        ws_token(auth),
-        body,
-    )
+    async with _chat_ws(c, aid, auth) as ws:
+        await ws.send_json(body)
+        return await ws.drain_turn()
 
 
 async def test_ws_emits_chunks_then_done(env: Any) -> None:
@@ -367,28 +262,23 @@ async def slow_stream(request: dict[str, Any]) -> AsyncIterator[dict[str, Any]]:
     cancel_spy = MagicMock(wraps=original_cancel)
     srv.app_runtime.agent_registry.cancel_stream = cancel_spy
 
-    await asyncio.to_thread(
-        _disconnect_ws_turn_sync,
-        c._octop_app,  # type: ignore[attr-defined]
-        aid,
-        ws_token(alice_auth),
-    )
+    async with _chat_ws(c, aid, alice_auth) as ws:
+        await ws.send_json({"type": "user_turn", "text": "cancel me"})
+        await ws.receive_json()
 
     await asyncio.sleep(0.05)
     cancel_spy.assert_not_called()
 
 
-def _subscribe_ws_sync(
-    app: object,
+async def _subscribe_ws(
+    c: httpx.AsyncClient,
     aid: str,
-    token: str,
+    auth: dict[str, str],
     thread_id: str,
 ) -> dict[str, Any]:
-    with TestClient(app).websocket_connect(  # type: ignore[attr-defined]
-        f"/api/agents/{aid}/chat/ws?token={token}"
-    ) as ws:
-        ws.send_json({"type": "subscribe", "thread_id": thread_id})
-        return json.loads(ws.receive_text())
+    async with _chat_ws(c, aid, auth) as ws:
+        await ws.send_json({"type": "subscribe", "thread_id": thread_id})
+        return await ws.receive_json()
 
 
 async def test_ws_subscribe_turn_status_idle(env: Any) -> None:
@@ -397,13 +287,7 @@ async def test_ws_subscribe_turn_status_idle(env: Any) -> None:
     assert create.status_code == 201
     tid = create.json()["thread_id"]
 
-    frame = await asyncio.to_thread(
-        _subscribe_ws_sync,
-        c._octop_app,  # type: ignore[attr-defined]
-        aid,
-        ws_token(alice_auth),
-        tid,
-    )
+    frame = await _subscribe_ws(c, aid, alice_auth, tid)
     assert frame == {"type": "turn_status", "thread_id": tid, "active": False}
 
 
@@ -420,30 +304,10 @@ async def test_ws_subscribe_rejects_another_users_thread(env: Any) -> None:
     assert response.status_code == 201, response.text
     tid = response.json()["thread_id"]
 
-    frame = await asyncio.to_thread(
-        _subscribe_ws_sync,
-        c._octop_app,  # type: ignore[attr-defined]
-        aid,
-        ws_token(alice_auth),
-        tid,
-    )
+    frame = await _subscribe_ws(c, aid, alice_auth, tid)
     assert frame == {"type": "error", "message": f"thread {tid!r} not found"}
 
 
-def _cancel_ws_turn_sync(
-    app: object,
-    aid: str,
-    token: str,
-    thread_id: str,
-) -> None:
-    with TestClient(app).websocket_connect(  # type: ignore[attr-defined]
-        f"/api/agents/{aid}/chat/ws?token={token}"
-    ) as ws:
-        ws.send_json({"type": "user_turn", "text": "cancel me", "thread_id": thread_id})
-        ws.receive_text()  # first token
-        ws.send_json({"type": "cancel", "thread_id": thread_id})
-
-
 async def test_ws_cancel_frame_cancels_active_turn(env: Any) -> None:
     c, srv, _fake, alice_auth, _bob_auth, aid = env
     agent = srv.app_runtime.agent_registry.get_agent(aid)
@@ -459,13 +323,10 @@ async def slow_stream(request: dict[str, Any]) -> AsyncIterator[dict[str, Any]]:
     cancel_spy = MagicMock(wraps=original_cancel)
     srv.app_runtime.agent_registry.cancel_stream = cancel_spy
 
-    await asyncio.to_thread(
-        _cancel_ws_turn_sync,
-        c._octop_app,  # type: ignore[attr-defined]
-        aid,
-        ws_token(alice_auth),
-        tid,
-    )
+    async with _chat_ws(c, aid, alice_auth) as ws:
+        await ws.send_json({"type": "user_turn", "text": "cancel me", "thread_id": tid})
+        await ws.receive_json()  # first token
+        await ws.send_json({"type": "cancel", "thread_id": tid})
 
     for _ in range(40):
         if cancel_spy.called:
@@ -487,24 +348,16 @@ async def test_ws_emits_error_frame_on_exception(env: Any) -> None:
 
 async def test_ws_bad_agent_rejected(env: Any) -> None:
     c, _srv, _fake, alice_auth, _bob_auth, _aid = env
-    with (
-        pytest.raises(WebSocketDisconnect),
-        TestClient(c._octop_app).websocket_connect(  # type: ignore[attr-defined]
-            f"/api/agents/01HMISSING0000000000000000/chat/ws?token={ws_token(alice_auth)}"
-        ),
-    ):
-        pass
+    with pytest.raises(WebSocketDisconnect):
+        async with _chat_ws(c, "01HMISSING0000000000000000", alice_auth):
+            pass
 
 
 async def test_ws_cross_user_rejected(env: Any) -> None:
     c, _srv, _fake, _admin_auth, bob_auth, aid = env
-    with (
-        pytest.raises(WebSocketDisconnect),
-        TestClient(c._octop_app).websocket_connect(  # type: ignore[attr-defined]
-            f"/api/agents/{aid}/chat/ws?token={ws_token(bob_auth)}"
-        ),
-    ):
-        pass
+    with pytest.raises(WebSocketDisconnect):
+        async with _chat_ws(c, aid, bob_auth):
+            pass
 
 
 async def test_ws_accepts_skills_and_model(env: Any) -> None:
diff --git a/tests/integration/test_connectors_api.py b/tests/integration/test_connectors_api.py
index aaf56936..044513b7 100644
--- a/tests/integration/test_connectors_api.py
+++ b/tests/integration/test_connectors_api.py
@@ -72,6 +72,7 @@ async def test_create_tencent_instance(env):
     assert r.status_code == 201
     inst = r.json()
     assert inst["kind"] == "tencent-docs"
+    assert inst["description"]
     assert inst["mcp_server_name"].startswith("tencent-docs__")
     assert inst.get("default_open") is False
 
@@ -103,6 +104,135 @@ async def test_create_instance_default_open(env):
     assert detail.json()["default_open"] is True
 
 
+async def test_same_connector_kind_supports_multiple_named_instances(env):
+    c, _, auth, _ = env
+    first = await c.post(
+        "/api/connector-instances",
+        headers=auth,
+        json={
+            "kind": "tencent-docs",
+            "display_name": "文档一",
+            "credentials": {"token": "token-1"},
+        },
+    )
+    second = await c.post(
+        "/api/connector-instances",
+        headers=auth,
+        json={
+            "kind": "tencent-docs",
+            "display_name": "文档二",
+            "credentials": {"token": "token-2"},
+        },
+    )
+    assert first.status_code == 201
+    assert second.status_code == 201
+    assert first.json()["instance_id"] != second.json()["instance_id"]
+
+    duplicate = await c.post(
+        "/api/connector-instances",
+        headers=auth,
+        json={
+            "kind": "qq-mail",
+            "display_name": "文档一",
+            "credentials": {"email": "a@qq.com", "password": "code"},
+        },
+    )
+    assert duplicate.status_code == 409
+    assert duplicate.json()["error"]["code"] == "CONNECTOR_NAME_TAKEN"
+
+
+async def test_connector_names_are_unique_across_builtin_and_custom(env):
+    c, _, auth, _ = env
+    custom = await c.put(
+        "/api/connectors/custom-mcp",
+        headers=auth,
+        json={
+            "servers": {
+                "custom-server": {
+                    "display_name": "重复名称",
+                    "transport": "streamable_http",
+                    "url": "https://mcp.example.com/mcp",
+                }
+            }
+        },
+    )
+    assert custom.status_code == 200
+
+    builtin = await c.post(
+        "/api/connector-instances",
+        headers=auth,
+        json={
+            "kind": "tencent-docs",
+            "display_name": "重复名称",
+            "credentials": {"token": "test-token"},
+        },
+    )
+    assert builtin.status_code == 409
+    assert builtin.json()["error"]["code"] == "CONNECTOR_NAME_TAKEN"
+
+
+async def test_custom_name_cannot_duplicate_builtin_connector(env):
+    c, _, auth, _ = env
+    builtin = await c.post(
+        "/api/connector-instances",
+        headers=auth,
+        json={
+            "kind": "tencent-docs",
+            "display_name": "内置名称",
+            "credentials": {"token": "test-token"},
+        },
+    )
+    assert builtin.status_code == 201
+
+    custom = await c.put(
+        "/api/connectors/custom-mcp",
+        headers=auth,
+        json={
+            "servers": {
+                "custom-server": {
+                    "display_name": "内置名称",
+                    "transport": "streamable_http",
+                    "url": "https://mcp.example.com/mcp",
+                }
+            }
+        },
+    )
+    assert custom.status_code == 409
+    assert custom.json()["error"]["code"] == "CONNECTOR_NAME_TAKEN"
+
+
+async def test_shared_connector_is_visible_but_not_manageable_by_other_user(env):
+    c, _, admin_auth, _ = env
+    created = await c.post(
+        "/api/connector-instances",
+        headers=admin_auth,
+        json={
+            "kind": "tencent-docs",
+            "display_name": "共享文档",
+            "credentials": {"token": "shared-token"},
+            "shared": True,
+            "default_open": True,
+        },
+    )
+    assert created.status_code == 201
+    instance_id = created.json()["instance_id"]
+
+    user_auth = await create_user(c, admin_auth, username="connector_reader")
+    listed = await c.get("/api/connector-instances", headers=user_auth)
+    assert listed.status_code == 200
+    shared = next(row for row in listed.json() if row["instance_id"] == instance_id)
+    assert shared["shared"] is True
+    assert shared["default_open"] is True
+    assert shared["can_manage"] is False
+
+    patched = await c.patch(
+        f"/api/connector-instances/{instance_id}",
+        headers=user_auth,
+        json={"display_name": "不能修改"},
+    )
+    assert patched.status_code == 403
+
+
 async def test_chat_accepts_user_instance_mcp(env):
     c, _, auth, agent_id = env
     r = await c.post(
@@ -147,6 +277,40 @@ async def test_get_instance_detail(env):
     assert detail["credentials_preview"]["password_configured"] is True
 
 
+async def test_create_and_edit_instance_description(env):
+    c, _, auth, _ = env
+    created = await c.post(
+        "/api/connector-instances",
+        headers=auth,
+        json={
+            "kind": "tencent-docs",
+            "display_name": "文档",
+            "description": "团队文档连接",
+            "credentials": {"token": "test-token"},
+        },
+    )
+    assert created.status_code == 201, created.text
+    instance_id = created.json()["instance_id"]
+    assert created.json()["description"] == "团队文档连接"
+
+    listed = await c.get("/api/connector-instances", headers=auth)
+    row = next(item for item in listed.json() if item["instance_id"] == instance_id)
+    assert row["description"] == "团队文档连接"
+
+    patched = await c.patch(
+        f"/api/connector-instances/{instance_id}",
+        headers=auth,
+        json={"description": "更新后的说明"},
+    )
+    assert patched.status_code == 200, patched.text
+    assert patched.json()["description"] == "更新后的说明"
+
+    detail = await c.get(f"/api/connector-instances/{instance_id}", headers=auth)
+    assert detail.status_code == 200, detail.text
+    assert detail.json()["description"] == "更新后的说明"
+    assert detail.json()["config"]["description"] == "更新后的说明"
+
+
 async def test_probe_returns_tools(env, monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setattr(
         "octop.infra.connectors.gateway.adapters.qq_mail.probe_credentials",
@@ -348,6 +512,37 @@ async def test_patch_custom_mcp_server_default_open_only(env):
     assert "default_open" not in patch_off.json()["servers"]["linear"]
 
 
+async def test_shared_custom_mcp_is_visible_with_collision_safe_name(env):
+    c, _, admin_auth, _ = env
+    put = await c.put(
+        "/api/connectors/custom-mcp",
+        headers=admin_auth,
+        json={
+            "servers": {
+                "linear": {
+                    "transport": "streamable_http",
+                    "url": "https://mcp.linear.app/mcp",
+                    "shared": True,
+                }
+            }
+        },
+    )
+    assert put.status_code == 200
+
+    user_auth = await create_user(c, admin_auth, username="custom_reader")
+    listed = await c.get("/api/connector-instances", headers=user_auth)
+    assert listed.status_code == 200
+    shared = next(
+        row
+        for row in listed.json()
+        if row["kind"] == CUSTOM_MCP_KIND and row["display_name"] == "linear"
+    )
+    assert shared["shared"] is True
+    assert shared["can_manage"] is False
+    assert shared["mcp_server_name"].startswith("custom__")
+    assert shared["mcp_server_name"].endswith("__linear")
+
+
 async def test_custom_mcp_oauth_callback_applies_tokens(env):
     c, srv, auth, _ = env
     user_id = await resolve_user_id(c, auth, "admin")
diff --git a/tests/integration/test_cron_shared_agent.py b/tests/integration/test_cron_shared_agent.py
new file mode 100644
index 00000000..27db1ca9
--- /dev/null
+++ b/tests/integration/test_cron_shared_agent.py
@@ -0,0 +1,84 @@
+"""Cron jobs on a shared expert stay owner-only."""
+
+from __future__ import annotations
+
+from tests.support.auth import create_agent, create_user, seed_openai_provider
+
+
+async def test_shared_agent_hides_owner_cron_from_peer(env) -> None:
+    client, _srv, admin_auth = env
+    await seed_openai_provider(client, admin_auth)
+    owner_auth = await create_user(client, admin_auth, username="cron_owner")
+    peer_auth = await create_user(client, admin_auth, username="cron_peer")
+    agent_id = await create_agent(client, owner_auth, name="shared-cron-bot")
+
+    response = await client.patch(
+        f"/api/agents/{agent_id}",
+        headers=owner_auth,
+        json={"is_shared": True},
+    )
+    assert response.status_code == 200, response.text
+
+    response = await client.post(
+        f"/api/agents/{agent_id}/cron",
+        headers=owner_auth,
+        json={
+            "name": "Owner morning brief",
+            "trigger": "cron:0 9 * * *",
+            "prompt": "Summarize today's calendar",
+            "enabled": False,
+            "task_type": "agent",
+        },
+    )
+    assert response.status_code == 201, response.text
+    created = response.json()
+
+    response = await client.get(f"/api/agents/{agent_id}/cron", headers=peer_auth)
+    assert response.status_code == 200, response.text
+    assert response.json() == []
+
+    response = await client.post(
+        f"/api/agents/{agent_id}/cron",
+        headers=peer_auth,
+        json={
+            "name": "Peer morning brief",
+            "trigger": "cron:0 10 * * *",
+            "prompt": "Peer should not create this",
+            "enabled": False,
+            "task_type": "agent",
+        },
+    )
+    assert response.status_code == 403, response.text
+
+    response = await client.get(
+        f"/api/agents/{agent_id}/cron/{created['id']}",
+        headers=peer_auth,
+    )
+    assert response.status_code == 403
+
+    response = await client.get(f"/api/agents/{agent_id}/cron", headers=admin_auth)
+    assert response.status_code == 200, response.text
+    assert response.json() == []
+
+    response = await client.post(
+        f"/api/agents/{agent_id}/cron",
+        headers=admin_auth,
+        json={
+            "name": "Admin morning brief",
+            "trigger": "cron:0 11 * * *",
+            "prompt": "Admin should not create this",
+            "enabled": False,
+            "task_type": "agent",
+        },
+    )
+    assert response.status_code == 403, response.text
+
+    response = await client.get(
+        f"/api/agents/{agent_id}/cron/{created['id']}",
+        headers=admin_auth,
+    )
+    assert response.status_code == 403
+
+    response = await client.get(f"/api/agents/{agent_id}/cron", headers=owner_auth)
+    assert response.status_code == 200, response.text
+    assert [row["id"] for row in response.json()] == [created["id"]]
diff --git a/tests/integration/test_e2e_golden_path.py b/tests/integration/test_e2e_golden_path.py
index 962c77a5..7bc5f1a8 100644
--- a/tests/integration/test_e2e_golden_path.py
+++ b/tests/integration/test_e2e_golden_path.py
@@ -2,15 +2,12 @@
 
 from __future__ import annotations
 
-import asyncio
-import json
 from typing import Any
 
 import pytest
-from starlette.testclient import TestClient
 
 from tests.support.auth import bootstrap_admin
-from tests.support.http import ws_token
+from tests.support.http import ws_chat_turn
 
 
 @pytest.fixture
@@ -18,37 +15,10 @@ async def env(env_fake_harness):
     yield env_fake_harness
 
 
-def _ws_turn_sync(app: object, agent_id: str, token: str, text: str) -> list[dict[str, Any]]:
-    chunks: list[dict[str, Any]] = []
-    with TestClient(app).websocket_connect(  # type: ignore[attr-defined]
-        f"/api/agents/{agent_id}/chat/ws?token={token}"
-    ) as ws:
-        ws.send_json(
-            {
-                "type": "user_turn",
-                "text": text,
-                "messages": [{"role": "user", "content": text}],
-            }
-        )
-        while True:
-            raw = ws.receive_text()
-            chunk = json.loads(raw)
-            chunks.append(chunk)
-            if chunk.get("type") in ("done", "error"):
-                break
-    return chunks
-
-
 async def _ws_turn(
-    client: object, agent_id: str, auth: dict[str, str], *, text: str = "Hello"
+    client: Any, agent_id: str, auth: dict[str, str], *, text: str = "Hello"
 ) -> list[dict[str, Any]]:
-    return await asyncio.to_thread(
-        _ws_turn_sync,
-        client._octop_app,
-        agent_id,
-        ws_token(auth),
-        text,  # type: ignore[attr-defined]
-    )
+    return await ws_chat_turn(client, agent_id, auth, text=text)
 
 
 async def test_full_golden_path(env: Any) -> None:
diff --git a/tests/integration/test_notifications_ws.py b/tests/integration/test_notifications_ws.py
index c62c1335..81c83b7f 100644
--- a/tests/integration/test_notifications_ws.py
+++ b/tests/integration/test_notifications_ws.py
@@ -2,20 +2,16 @@
 
 from __future__ import annotations
 
-import asyncio
-import json
-import threading
 from collections.abc import AsyncIterator
 from pathlib import Path
 from typing import Any
 
 import pytest
-from starlette.testclient import TestClient
 from starlette.websockets import WebSocketDisconnect
 
 from tests.support.app import octop_client
 from tests.support.auth import auth_header, bootstrap_admin, ensure_users
-from tests.support.http import ws_token
+from tests.support.http import ws_connect, ws_token
 
 
 @pytest.fixture
@@ -27,69 +23,47 @@ async def env(tmp_octop_home: Path) -> AsyncIterator[Any]:
         yield c, srv, users["alice"], users["bob"]
 
 
+def _notifications_ws(c: Any, auth: dict[str, str] | None = None) -> Any:
+    query = f"?token={ws_token(auth)}" if auth else ""
+    return ws_connect(c._octop_app, f"/api/notifications/ws{query}")
+
+
 async def test_notifications_ws_ping_pong(env: Any) -> None:
     c, _srv, alice_auth, _bob_auth = env
-    with TestClient(c._octop_app).websocket_connect(  # type: ignore[attr-defined]
-        f"/api/notifications/ws?token={ws_token(alice_auth)}"
-    ) as ws:
-        ws.send_json({"type": "ping"})
-        assert json.loads(ws.receive_text()) == {"type": "pong"}
+    async with _notifications_ws(c, alice_auth) as ws:
+        await ws.send_json({"type": "ping"})
+        assert await ws.receive_json() == {"type": "pong"}
 
 
 async def test_notifications_ws_missing_token_rejected(env: Any) -> None:
     c, _srv, _alice_auth, _bob_auth = env
-    with (
-        pytest.raises(WebSocketDisconnect),
-        TestClient(c._octop_app).websocket_connect("/api/notifications/ws"),  # type: ignore[attr-defined]
-    ):
-        pass
+    with pytest.raises(WebSocketDisconnect):
+        async with _notifications_ws(c):
+            pass
 
 
 async def test_notifications_ws_receives_user_push(env: Any) -> None:
     c, srv, alice_auth, _bob_auth = env
     user = srv.user_manager.get("alice")
     assert user is not None
-    token = ws_token(alice_auth)
-    connected = threading.Event()
-    frames: list[dict[str, object]] = []
-    errors: list[BaseException] = []
 
-    def _session() -> None:
-        try:
-            with TestClient(c._octop_app).websocket_connect(  # type: ignore[attr-defined]
-                f"/api/notifications/ws?token={token}"
-            ) as ws:
-                ws.send_json({"type": "ping"})
-                pong = json.loads(ws.receive_text())
-                if pong != {"type": "pong"}:
-                    raise AssertionError(f"unexpected pong: {pong!r}")
-                connected.set()
-                frames.append(json.loads(ws.receive_text()))
-        except BaseException as exc:
-            errors.append(exc)
-            connected.set()
-
-    session_task = asyncio.create_task(asyncio.to_thread(_session))
-    assert await asyncio.to_thread(connected.wait, 5)
-    if errors:
-        raise errors[0]
-    await srv.app_runtime.gateway.ws_hub.push_to_user(
-        user.id,
-        {
-            "type": "dashboard_push",
-            "agent_id": "a1",
-            "thread_id": "thr_1",
-            "text": "记得喝水",
-            "agent_name": "助手",
-        },
-    )
-    await asyncio.wait_for(session_task, timeout=5)
-    assert frames == [
-        {
+    async with _notifications_ws(c, alice_auth) as ws:
+        await ws.send_json({"type": "ping"})
+        assert await ws.receive_json() == {"type": "pong"}
+        await srv.app_runtime.gateway.ws_hub.push_to_user(
+            user.id,
+            {
+                "type": "dashboard_push",
+                "agent_id": "a1",
+                "thread_id": "thr_1",
+                "text": "记得喝水",
+                "agent_name": "助手",
+            },
+        )
+        assert await ws.receive_json() == {
             "type": "dashboard_push",
             "agent_id": "a1",
             "thread_id": "thr_1",
             "text": "记得喝水",
             "agent_name": "助手",
         }
-    ]
diff --git a/tests/integration/test_plugin_tool_disable.py b/tests/integration/test_plugin_tool_disable.py
index cf611565..f7a0ae92 100644
--- a/tests/integration/test_plugin_tool_disable.py
+++ b/tests/integration/test_plugin_tool_disable.py
@@ -7,6 +7,8 @@
 from pathlib import Path
 from typing import Any
 
+from tests.support.auth import create_user
+
 _FIXTURE = Path(__file__).resolve().parents[1] / "fixtures" / "plugins" / "echo-tool"
 
 
@@ -74,13 +76,7 @@ async def test_disable_plugin_tool_via_admin_plugins_api(env_with_provider: Any)
 
     settings = await client.get(f"/api/agents/{aid}/tool-settings", headers=auth)
     assert settings.status_code == 200, settings.text
-    by_name = {
-        t["name"]: t
-        for t in settings.json()["tools"]
-        if t["source"] == "plugin" and t["plugin_id"] == "echo-tool"
-    }
-    assert by_name["echo_message"]["enabled"] is False
-    assert by_name["echo_message"]["available"] is True
+    assert all(t["source"] == "builtin" for t in settings.json()["tools"])
 
 
 async def test_disable_plugin_tool_via_expert_tool_settings(env_with_provider: Any) -> None:
@@ -94,13 +90,6 @@ async def test_disable_plugin_tool_via_expert_tool_settings(env_with_provider: A
         json={"enabled": False, "source": "plugin", "plugin_id": "echo-tool"},
     )
     assert r.status_code == 200, r.text
-    by_name = {
-        t["name"]: t
-        for t in r.json()["tools"]
-        if t["source"] == "plugin" and t["plugin_id"] == "echo-tool"
-    }
-    assert by_name["echo_message"]["enabled"] is False
-
     cfg = srv.app_runtime.agent_registry.get_config(aid)
     assert cfg["plugins"]["echo-tool"]["tools"]["echo_message"]["enabled"] is False
     _assert_echo_disabled_on_harness(srv, aid, disabled=True)
@@ -149,7 +138,63 @@ async def test_admin_and_expert_share_plugin_tool_config(env_with_provider: Any)
     assert tool_cfg.get("config", {}).get("prefix") == "x"
 
 
-async def test_global_plugin_disable_marks_tools_unavailable(env_with_provider: Any) -> None:
+async def test_agent_plugin_switch_defaults_on_and_preserves_tools(
+    env_with_provider: Any,
+) -> None:
+    client, srv, auth = env_with_provider
+    await _install_echo(client, auth)
+    aid = await _create_agent(client, auth, "agent-plugin-switch")
+
+    listed = await client.get(f"/api/plugins/agents/{aid}", headers=auth)
+    assert listed.status_code == 200, listed.text
+    plugin = next(p for p in listed.json()["plugins"] if p["id"] == "echo-tool")
+    assert plugin["agent_enabled"] is True
+    assert plugin["enabled"] is True
+
+    configured = await client.patch(
+        f"/api/plugins/agents/{aid}/tools",
+        headers=auth,
+        json={
+            "plugins": {
+                "echo-tool": {
+                    "tools": {
+                        "echo_message": {
+                            "enabled": True,
+                            "config": {"prefix": "kept"},
+                        }
+                    }
+                }
+            }
+        },
+    )
+    assert configured.status_code == 200, configured.text
+
+    off = await client.patch(
+        f"/api/plugins/agents/{aid}",
+        headers=auth,
+        json={"plugins": {"echo-tool": {"enabled": False}}},
+    )
+    assert off.status_code == 200, off.text
+    plugin = next(p for p in off.json()["plugins"] if p["id"] == "echo-tool")
+    assert plugin["agent_enabled"] is False
+    assert plugin["enabled"] is False
+    _assert_echo_disabled_on_harness(srv, aid, disabled=True)
+
+    cfg = srv.app_runtime.agent_registry.get_config(aid)
+    tool_cfg = cfg["plugins"]["echo-tool"]["tools"]["echo_message"]
+    assert tool_cfg == {"enabled": True, "config": {"prefix": "kept"}}
+
+    on = await client.patch(
+        f"/api/plugins/agents/{aid}",
+        headers=auth,
+        json={"plugins": {"echo-tool": {"enabled": True}}},
+    )
+    assert on.status_code == 200, on.text
+    cfg = srv.app_runtime.agent_registry.get_config(aid)
+    assert cfg["plugins"]["echo-tool"]["tools"]["echo_message"] == tool_cfg
+
+
+async def test_global_plugin_disable_takes_priority(env_with_provider: Any) -> None:
     client, _srv, auth = env_with_provider
     await _install_echo(client, auth)
     aid = await _create_agent(client, auth, "global-plugin-off")
@@ -161,11 +206,26 @@ async def test_global_plugin_disable_marks_tools_unavailable(env_with_provider:
     )
     assert off.status_code == 200, off.text
 
-    settings = await client.get(f"/api/agents/{aid}/tool-settings", headers=auth)
-    assert settings.status_code == 200, settings.text
-    echo = next(
-        t
-        for t in settings.json()["tools"]
-        if t["source"] == "plugin" and t["name"] == "echo_message"
+    listed = await client.get(f"/api/plugins/agents/{aid}", headers=auth)
+    assert listed.status_code == 200, listed.text
+    plugin = next(p for p in listed.json()["plugins"] if p["id"] == "echo-tool")
+    assert plugin["global_enabled"] is False
+    assert plugin["agent_enabled"] is True
+    assert plugin["enabled"] is False
+
+
+async def test_agent_plugin_endpoints_enforce_owner(env_with_provider: Any) -> None:
+    client, _srv, admin_auth = env_with_provider
+    await _install_echo(client, admin_auth)
+    owner_auth = await create_user(client, admin_auth, username="plugin_owner")
+    other_auth = await create_user(client, admin_auth, username="plugin_other")
+    aid = await _create_agent(client, owner_auth, "owned-plugin-agent")
+
+    listed = await client.get(f"/api/plugins/agents/{aid}", headers=other_auth)
+    assert listed.status_code == 403, listed.text
+    patched = await client.patch(
+        f"/api/plugins/agents/{aid}",
+        headers=other_auth,
+        json={"plugins": {"echo-tool": {"enabled": False}}},
     )
-    assert echo["available"] is False
+    assert patched.status_code == 403, patched.text
diff --git a/tests/integration/test_plugin_upload.py b/tests/integration/test_plugin_upload.py
index a2ff35da..76d14d25 100644
--- a/tests/integration/test_plugin_upload.py
+++ b/tests/integration/test_plugin_upload.py
@@ -71,3 +71,9 @@ async def test_upload_plugin_requires_admin(env_admin_alice: Any) -> None:
     client, _srv, _admin_auth, alice_auth = env_admin_alice
     r = await client.post("/api/plugins/upload", files=_zip_files(), headers=alice_auth)
     assert r.status_code == 403, r.text
+
+
+async def test_list_plugins_is_available_to_authenticated_users(env_admin_alice: Any) -> None:
+    client, _srv, _admin_auth, alice_auth = env_admin_alice
+    response = await client.get("/api/plugins", headers=alice_auth)
+    assert response.status_code == 200, response.text
diff --git a/tests/integration/test_preferences_api.py b/tests/integration/test_preferences_api.py
index b1c18914..8b07793c 100644
--- a/tests/integration/test_preferences_api.py
+++ b/tests/integration/test_preferences_api.py
@@ -62,3 +62,27 @@ async def test_preferences_reasoning_defaults_roundtrip(env) -> None:
 
     fetched = await client.get("/api/preferences", headers=auth)
     assert fetched.json()["model_reasoning"] == payload["model_reasoning"]
+
+
+@pytest.mark.asyncio
+async def test_preferences_timezone_roundtrip(env) -> None:
+    client, _srv, auth = env
+    payload = {"timezone": "Asia/Shanghai"}
+    r = await client.patch("/api/preferences", headers=auth, json=payload)
+    assert r.status_code == 200
+    assert r.json()["timezone"] == payload["timezone"]
+
+    r = await client.get("/api/preferences", headers=auth)
+    assert r.json()["timezone"] == payload["timezone"]
+
+    r = await client.patch("/api/preferences", headers=auth, json={"timezone": None})
+    assert r.status_code == 200
+    assert "timezone" in r.json()
+    assert r.json()["timezone"] is None
+
+
+@pytest.mark.asyncio
+async def test_preferences_timezone_rejects_invalid_value(env) -> None:
+    client, _srv, auth = env
+    r = await client.patch("/api/preferences", headers=auth, json={"timezone": "BAD_ZONE"})
+    assert r.status_code in (400, 422)
diff --git a/tests/integration/test_published_experts.py b/tests/integration/test_published_experts.py
index e749f81c..b809e758 100644
--- a/tests/integration/test_published_experts.py
+++ b/tests/integration/test_published_experts.py
@@ -167,6 +167,44 @@ async def test_install_keeps_source_quick_prompts_when_publish_body_omits_them(
     assert fork_welcome.json()["quick_prompts"] == source_prompts
 
 
+PNG = b"\x89PNG\r\n\x1a\n" + b"\x00" * 16
+
+
+async def test_published_list_exposes_snapshot_avatar(
+    env: tuple[Any, Any, dict[str, str]],
+) -> None:
+    client, _server, owner_auth, peer_auth, source_agent_id = await _owner_and_peer(env)
+
+    uploaded = await client.post(
+        f"/api/agents/{source_agent_id}/avatar",
+        headers=owner_auth,
+        files={"file": ("face.png", PNG, "image/png")},
+    )
+    assert uploaded.status_code == 201, uploaded.text
+
+    published = await client.post(
+        f"/api/agents/{source_agent_id}/publish-expert",
+        headers=owner_auth,
+        json={"name": "Avatar published"},
+    )
+    assert published.status_code == 201, published.text
+    expert_id = published.json()["id"]
+    icon_url = published.json().get("icon_url")
+    assert isinstance(icon_url, str)
+    assert icon_url.startswith(f"/api/experts/published/{expert_id}/avatar")
+    assert "v=" in icon_url
+
+    listed = await client.get("/api/experts/published", headers=peer_auth)
+    assert listed.status_code == 200, listed.text
+    row = next(item for item in listed.json() if item["id"] == expert_id)
+    assert row["icon_url"] == icon_url
+
+    got = await client.get(icon_url, headers=peer_auth)
+    assert got.status_code == 200, got.text
+    assert got.content == PNG
+    assert got.headers["content-type"].startswith("image/png")
+
+
 async def test_creator_can_refresh_published_expert(
     env: tuple[Any, Any, dict[str, str]],
 ) -> None:
diff --git a/tests/integration/test_trajectory_api.py b/tests/integration/test_trajectory_api.py
new file mode 100644
index 00000000..a814906b
--- /dev/null
+++ b/tests/integration/test_trajectory_api.py
@@ -0,0 +1,536 @@
+"""HTTP trajectory history, event detail, metrics, export, and live SSE."""
+
+from __future__ import annotations
+
+import asyncio
+import json
+from collections.abc import AsyncIterator
+from contextlib import asynccontextmanager, suppress
+from typing import Any
+from urllib.parse import urlencode
+
+from octop.api.routers.chat import trajectory as trajectory_mod
+
+
+def _url(agent_id: str, thread_id: str, suffix: str = "") -> str:
+    return f"/api/agents/{agent_id}/threads/{thread_id}/trajectory{suffix}"
+
+
+async def _create_thread(client: Any, auth: dict[str, str], agent_id: str) -> str:
+    response = await client.post(f"/api/agents/{agent_id}/threads", headers=auth)
+    assert response.status_code == 201, response.text
+    return str(response.json()["thread_id"])
+
+
+def _sse_event_payloads(blob: str, event_name: str) -> list[dict[str, Any]]:
+    payloads: list[dict[str, Any]] = []
+    current: str | None = None
+    for line in blob.splitlines():
+        if line.startswith("event:"):
+            current = line.split(":", 1)[1].strip()
+        elif line.startswith("data:") and current == event_name:
+            raw = line.split(":", 1)[1].strip()
+            parsed = json.loads(raw)
+            if isinstance(parsed, dict):
+                payloads.append(parsed)
+            current = None
+    return payloads
+
+
+class _SseStream:
+    def __init__(
+        self, status_code: int, headers: dict[str, str], chunks: asyncio.Queue[bytes | None]
+    ) -> None:
+        self.status_code = status_code
+        self.headers = headers
+        self._chunks = chunks
+
+    async def aiter_text(self) -> AsyncIterator[str]:
+        while True:
+            chunk = await self._chunks.get()
+            if chunk is None:
+                return
+            yield chunk.decode("utf-8")
+
+
+@asynccontextmanager
+async def _open_asgi_sse(
+    app: Any,
+    path: str,
+    headers: dict[str, str],
+    params: dict[str, Any] | None = None,
+) -> AsyncIterator[_SseStream]:
+    """Drive the ASGI app concurrently so infinite SSE can be consumed chunk-wise.
+
+    httpx.ASGITransport buffers the full body and cannot test live streams.
+    """
+    query = urlencode({key: str(value) for key, value in (params or {}).items()})
+    raw_headers = [
+        (key.lower().encode("latin-1"), value.encode("latin-1")) for key, value in headers.items()
+    ]
+    raw_headers.append((b"host", b"testserver"))
+    chunks: asyncio.Queue[bytes | None] = asyncio.Queue()
+    started: asyncio.Future[tuple[int, dict[str, str]]] = asyncio.get_running_loop().create_future()
+    disconnected = asyncio.Event()
+    request_sent = False
+
+    async def receive() -> dict[str, Any]:
+        nonlocal request_sent
+        if not request_sent:
+            request_sent = True
+            return {"type": "http.request", "body": b"", "more_body": False}
+        await disconnected.wait()
+        return {"type": "http.disconnect"}
+
+    async def send(message: dict[str, Any]) -> None:
+        if message["type"] == "http.response.start":
+            header_map = {
+                key.decode("latin-1"): value.decode("latin-1")
+                for key, value in message.get("headers", [])
+            }
+            if not started.done():
+                started.set_result((int(message["status"]), header_map))
+            return
+        if message["type"] == "http.response.body":
+            body = message.get("body") or b""
+            if body:
+                await chunks.put(bytes(body))
+            if not message.get("more_body", False):
+                await chunks.put(None)
+
+    scope: dict[str, Any] = {
+        "type": "http",
+        "asgi": {"version": "3.0"},
+        "http_version": "1.1",
+        "method": "GET",
+        "scheme": "http",
+        "path": path,
+        "raw_path": path.encode("ascii"),
+        "query_string": query.encode("ascii"),
+        "headers": raw_headers,
+        "client": ("127.0.0.1", 123),
+        "server": ("testserver", 80),
+        "root_path": "",
+    }
+    task = asyncio.create_task(app(scope, receive, send))
+    try:
+        status, header_map = await asyncio.wait_for(started, timeout=5)
+        yield _SseStream(status, header_map, chunks)
+    finally:
+        disconnected.set()
+        task.cancel()
+        with suppress(asyncio.CancelledError):
+            await task
+
+
+async def _read_sse_until(response: _SseStream, *, predicate: Any, timeout: float = 5.0) -> str:
+    buf = ""
+
+    async def _consume() -> str:
+        nonlocal buf
+        async for chunk in response.aiter_text():
+            buf += chunk
+            if predicate(buf):
+                return buf
+        return buf
+
+    return await asyncio.wait_for(_consume(), timeout=timeout)
+
+
+async def test_owner_gets_empty_trajectory_list(env_alice_bob_agent: Any) -> None:
+    client, _srv, alice_auth, _bob_auth, agent_id = env_alice_bob_agent
+    thread_id = await _create_thread(client, alice_auth, agent_id)
+
+    response = await client.get(_url(agent_id, thread_id), headers=alice_auth)
+    assert response.status_code == 200, response.text
+    body = response.json()
+    assert body["thread_id"] == thread_id
+    assert body["events"] == []
+    assert body["has_more"] is False
+    assert body.get("next_before_seq") is None
+
+
+async def test_non_owner_cannot_read_trajectory(env_alice_bob_agent: Any) -> None:
+    client, _srv, alice_auth, bob_auth, agent_id = env_alice_bob_agent
+    thread_id = await _create_thread(client, alice_auth, agent_id)
+
+    response = await client.get(_url(agent_id, thread_id), headers=bob_auth)
+    assert response.status_code in (403, 404)
+
+    response = await client.get(_url(agent_id, thread_id, "/metrics"), headers=bob_auth)
+    assert response.status_code in (403, 404)
+
+    response = await client.get(_url(agent_id, thread_id, "/export"), headers=bob_auth)
+    assert response.status_code in (403, 404)
+
+    response = await client.get(_url(agent_id, thread_id, "/events/any-id"), headers=bob_auth)
+    assert response.status_code in (403, 404)
+
+    response = await client.get(_url(agent_id, thread_id, "/stream"), headers=bob_auth)
+    assert response.status_code in (403, 404)
+
+
+async def test_missing_thread_is_not_found(env_alice_bob_agent: Any) -> None:
+    client, _srv, alice_auth, _bob_auth, agent_id = env_alice_bob_agent
+
+    response = await client.get(_url(agent_id, "no-such-thread"), headers=alice_auth)
+    assert response.status_code == 404
+
+
+async def test_list_returns_summarized_events_after_append(env_alice_bob_agent: Any) -> None:
+    client, srv, alice_auth, _bob_auth, agent_id = env_alice_bob_agent
+    thread_id = await _create_thread(client, alice_auth, agent_id)
+    service = srv.app_runtime.trajectory_service
+    assert service is not None
+    service.observe_chunk(agent_id, thread_id, {"type": "user", "content": "hello there"})
+    service.observe_chunk(
+        agent_id,
+        thread_id,
+        {
+            "type": "tool_call_chunk",
+            "id": "call_1",
+            "name": "read_file",
+            "args": {"path": "a.py"},
+        },
+    )
+    service.observe_chunk(
+        agent_id,
+        thread_id,
+        {
+            "type": "tool_result",
+            "id": "call_1",
+            "name": "read_file",
+            "content": "file contents",
+        },
+    )
+
+    response = await client.get(_url(agent_id, thread_id), headers=alice_auth)
+    assert response.status_code == 200, response.text
+    body = response.json()
+    assert body["thread_id"] == thread_id
+    # user + synthetic ASSISTANT (tool_call_only) + tool
+    assert len(body["events"]) == 3
+    kinds = [event["kind"] for event in body["events"]]
+    assert kinds == ["user", "assistant", "tool"]
+    user_event = body["events"][0]
+    assistant_event = body["events"][1]
+    tool_event = body["events"][2]
+    assert "hello there" in user_event["summary"]
+    # Message bodies stay on the detail endpoint only.
+    assert user_event["payload"].get("content") is None
+    assert assistant_event["payload"].get("tool_call_only") is True
+    # Tool args/result are available on the list for ledger rendering.
+    assert tool_event["payload"]["name"] == "read_file"
+    assert tool_event["payload"]["args"] == {"path": "a.py"}
+    assert tool_event["payload"]["result"] == "file contents"
+
+    detail = await client.get(
+        _url(agent_id, thread_id, f"/events/{user_event['event_id']}"),
+        headers=alice_auth,
+    )
+    assert detail.status_code == 200, detail.text
+    full = detail.json()
+    assert full["event_id"] == user_event["event_id"]
+    assert full["payload"]["content"] == "hello there"
+
+
+async def test_metrics_and_jsonl_export(env_alice_bob_agent: Any) -> None:
+    client, srv, alice_auth, _bob_auth, agent_id = env_alice_bob_agent
+    thread_id = await _create_thread(client, alice_auth, agent_id)
+    service = srv.app_runtime.trajectory_service
+    assert service is not None
+    service.observe_chunk(agent_id, thread_id, {"type": "user", "content": "hello"})
+    service.observe_chunk(
+        agent_id,
+        thread_id,
+        {"type": "tool_call_chunk", "id": "call_1", "name": "read_file", "args": {"path": "a.py"}},
+    )
+
+    metrics = await client.get(_url(agent_id, thread_id, "/metrics"), headers=alice_auth)
+    assert metrics.status_code == 200, metrics.text
+    body = metrics.json()
+    assert body["turns"] == 1
+    assert body["steps"] == 3
+
+    exported = await client.get(_url(agent_id, thread_id, "/export"), headers=alice_auth)
+    assert exported.status_code == 200, exported.text
+    content_type = exported.headers.get("content-type", "")
+    assert "text/plain" in content_type or "ndjson" in content_type
+    disposition = exported.headers.get("content-disposition", "")
+    assert thread_id in disposition
+    lines = [line for line in exported.text.splitlines() if line.strip()]
+    assert len(lines) == 3
+    parsed = [json.loads(line) for line in lines]
+    assert parsed[0]["kind"] == "user"
+    assert parsed[0]["payload"]["content"] == "hello"
+    assert parsed[1]["kind"] == "assistant"
+    assert parsed[1]["payload"].get("tool_call_only") is True
+    assert parsed[2]["kind"] == "tool"
+    assert parsed[2]["payload"]["name"] == "read_file"
+
+
+async def test_event_detail_missing_is_not_found(env_alice_bob_agent: Any) -> None:
+    client, _srv, alice_auth, _bob_auth, agent_id = env_alice_bob_agent
+    thread_id = await _create_thread(client, alice_auth, agent_id)
+
+    response = await client.get(
+        _url(agent_id, thread_id, "/events/missing-event"),
+        headers=alice_auth,
+    )
+    assert response.status_code == 404
+
+
+async def test_live_sse_emits_event_after_subscribe(env_alice_bob_agent: Any) -> None:
+    client, srv, alice_auth, _bob_auth, agent_id = env_alice_bob_agent
+    thread_id = await _create_thread(client, alice_auth, agent_id)
+    service = srv.app_runtime.trajectory_service
+    assert service is not None
+
+    async with _open_asgi_sse(
+        client._octop_app,  # type: ignore[attr-defined]
+        _url(agent_id, thread_id, "/stream"),
+        alice_auth,
+    ) as response:
+        assert response.status_code == 200
+        assert "text/event-stream" in response.headers.get("content-type", "")
+        published = False
+
+        def _ready(buf: str) -> bool:
+            nonlocal published
+            if not published and "event: metrics" in buf:
+                published = True
+                service.observe_chunk(
+                    agent_id, thread_id, {"type": "user", "content": "hello live"}
+                )
+            return any("event_id" in payload for payload in _sse_event_payloads(buf, "event"))
+
+        blob = await _read_sse_until(response, predicate=_ready)
+
+    payloads = _sse_event_payloads(blob, "event")
+    assert payloads
+    assert payloads[0]["event_id"]
+    assert payloads[0]["kind"] == "user"
+
+
+async def test_live_sse_honors_after_seq(env_alice_bob_agent: Any) -> None:
+    client, srv, alice_auth, _bob_auth, agent_id = env_alice_bob_agent
+    thread_id = await _create_thread(client, alice_auth, agent_id)
+    service = srv.app_runtime.trajectory_service
+    assert service is not None
+    service.observe_chunk(agent_id, thread_id, {"type": "user", "content": "first"})
+    service.observe_chunk(agent_id, thread_id, {"type": "user", "content": "second"})
+    listed = await client.get(_url(agent_id, thread_id), headers=alice_auth)
+    events = listed.json()["events"]
+    assert len(events) == 2
+    first_id, second_id = events[0]["event_id"], events[1]["event_id"]
+    first_seq = int(events[0]["seq"])
+
+    async with _open_asgi_sse(
+        client._octop_app,  # type: ignore[attr-defined]
+        _url(agent_id, thread_id, "/stream"),
+        alice_auth,
+        params={"after_seq": first_seq},
+    ) as response:
+        assert response.status_code == 200
+        blob = await _read_sse_until(
+            response,
+            predicate=lambda buf: any(
+                payload.get("event_id") == second_id
+                for payload in _sse_event_payloads(buf, "event")
+            ),
+        )
+
+    event_ids = [payload["event_id"] for payload in _sse_event_payloads(blob, "event")]
+    assert second_id in event_ids
+    # ``after_seq`` also re-emits the boundary row as an upsert refresh.
+    assert first_id in event_ids
+
+
+async def test_sse_catchup_refreshes_same_seq_tool_after_history(
+    env_alice_bob_agent: Any,
+) -> None:
+    """Tool result upserted before subscribe must still appear in catch-up."""
+    client, srv, alice_auth, _bob_auth, agent_id = env_alice_bob_agent
+    thread_id = await _create_thread(client, alice_auth, agent_id)
+    service = srv.app_runtime.trajectory_service
+    assert service is not None
+    service.observe_chunk(
+        agent_id,
+        thread_id,
+        {
+            "type": "tool_call_chunk",
+            "id": "call_race",
+            "name": "read_file",
+            "args": {"path": "a.py"},
+        },
+    )
+    listed = await client.get(_url(agent_id, thread_id), headers=alice_auth)
+    tool = next(event for event in listed.json()["events"] if event["kind"] == "tool")
+    tool_seq = int(tool["seq"])
+    service.observe_chunk(
+        agent_id,
+        thread_id,
+        {
+            "type": "tool_result",
+            "id": "call_race",
+            "name": "read_file",
+            "content": "late result",
+        },
+    )
+
+    async with _open_asgi_sse(
+        client._octop_app,  # type: ignore[attr-defined]
+        _url(agent_id, thread_id, "/stream"),
+        alice_auth,
+        params={"after_seq": tool_seq},
+    ) as response:
+        assert response.status_code == 200
+        blob = await _read_sse_until(
+            response,
+            predicate=lambda buf: any(
+                payload.get("kind") == "tool"
+                and payload.get("payload", {}).get("result") == "late result"
+                for payload in _sse_event_payloads(buf, "event")
+            ),
+        )
+
+    tool_payloads = [
+        payload for payload in _sse_event_payloads(blob, "event") if payload.get("kind") == "tool"
+    ]
+    assert any(p.get("payload", {}).get("result") == "late result" for p in tool_payloads)
+
+
+async def test_live_sse_delivers_same_seq_tool_upsert(env_alice_bob_agent: Any) -> None:
+    """Tool call → result keeps the same seq; the upsert must still stream."""
+    client, srv, alice_auth, _bob_auth, agent_id = env_alice_bob_agent
+    thread_id = await _create_thread(client, alice_auth, agent_id)
+    service = srv.app_runtime.trajectory_service
+    assert service is not None
+
+    async with _open_asgi_sse(
+        client._octop_app,  # type: ignore[attr-defined]
+        _url(agent_id, thread_id, "/stream"),
+        alice_auth,
+    ) as response:
+        assert response.status_code == 200
+        phase = 0
+
+        def _ready(buf: str) -> bool:
+            nonlocal phase
+            payloads = _sse_event_payloads(buf, "event")
+            if phase == 0 and "event: metrics" in buf:
+                phase = 1
+                service.observe_chunk(
+                    agent_id,
+                    thread_id,
+                    {
+                        "type": "tool_call_chunk",
+                        "id": "call_live",
+                        "name": "read_file",
+                        "args": {"path": "a.py"},
+                    },
+                )
+            if phase == 1 and any(
+                p.get("kind") == "tool" and p.get("payload", {}).get("args") for p in payloads
+            ):
+                phase = 2
+                service.observe_chunk(
+                    agent_id,
+                    thread_id,
+                    {
+                        "type": "tool_result",
+                        "id": "call_live",
+                        "name": "read_file",
+                        "content": "file contents",
+                    },
+                )
+            return any(
+                p.get("kind") == "tool" and p.get("payload", {}).get("result") == "file contents"
+                for p in payloads
+            )
+
+        blob = await _read_sse_until(response, predicate=_ready)
+
+    tool_payloads = [
+        payload for payload in _sse_event_payloads(blob, "event") if payload.get("kind") == "tool"
+    ]
+    assert tool_payloads
+    assert any(p.get("payload", {}).get("result") == "file contents" for p in tool_payloads)
+    seqs = {p.get("seq") for p in tool_payloads}
+    assert len(seqs) == 1
+
+
+async def test_live_sse_emits_heartbeat(env_alice_bob_agent: Any, monkeypatch: Any) -> None:
+    monkeypatch.setattr(trajectory_mod, "TRAJECTORY_SSE_HEARTBEAT_S", 0.05)
+    client, _srv, alice_auth, _bob_auth, agent_id = env_alice_bob_agent
+    thread_id = await _create_thread(client, alice_auth, agent_id)
+
+    async with _open_asgi_sse(
+        client._octop_app,  # type: ignore[attr-defined]
+        _url(agent_id, thread_id, "/stream"),
+        alice_auth,
+    ) as response:
+        assert response.status_code == 200
+        blob = await _read_sse_until(response, predicate=lambda buf: "event: heartbeat" in buf)
+    assert "event: heartbeat" in blob
+
+
+async def test_delete_thread_cascades_trajectory_ledger(env_alice_bob_agent: Any) -> None:
+    client, srv, alice_auth, _bob_auth, agent_id = env_alice_bob_agent
+    thread_id = await _create_thread(client, alice_auth, agent_id)
+    service = srv.app_runtime.trajectory_service
+    assert service is not None
+    service.observe_chunk(agent_id, thread_id, {"type": "user", "content": "hello"})
+    service.observe_chunk(agent_id, thread_id, {"type": "user", "content": "again"})
+    assert len(service.list_events(thread_id, before_seq=None, limit=10, kinds=None)) == 2
+
+    response = await client.delete(
+        f"/api/agents/{agent_id}/threads/{thread_id}",
+        headers=alice_auth,
+    )
+    assert response.status_code == 204, response.text
+    assert service.list_events(thread_id, before_seq=None, limit=10, kinds=None) == []
+
+
+async def test_delete_thread_succeeds_when_trajectory_cascade_raises(
+    env_alice_bob_agent: Any,
+) -> None:
+    client, srv, alice_auth, _bob_auth, agent_id = env_alice_bob_agent
+    thread_id = await _create_thread(client, alice_auth, agent_id)
+    service = srv.app_runtime.trajectory_service
+    assert service is not None
+    service.observe_chunk(agent_id, thread_id, {"type": "user", "content": "hello"})
+
+    def _boom(_thread_id: str) -> int:
+        raise RuntimeError("ledger down")
+
+    service.delete_for_thread = _boom  # type: ignore[method-assign]
+
+    response = await client.delete(
+        f"/api/agents/{agent_id}/threads/{thread_id}",
+        headers=alice_auth,
+    )
+    assert response.status_code == 204, response.text
+    listed = await client.get(f"/api/agents/{agent_id}/threads", headers=alice_auth)
+    assert listed.status_code == 200
+    assert all(item["thread_id"] != thread_id for item in listed.json())
+
+
+async def test_live_sse_unsubscribes_on_cancel(env_alice_bob_agent: Any) -> None:
+    client, srv, alice_auth, _bob_auth, agent_id = env_alice_bob_agent
+    thread_id = await _create_thread(client, alice_auth, agent_id)
+    service = srv.app_runtime.trajectory_service
+    assert service is not None
+    bus = service._bus  # noqa: SLF001
+
+    async with _open_asgi_sse(
+        client._octop_app,  # type: ignore[attr-defined]
+        _url(agent_id, thread_id, "/stream"),
+        alice_auth,
+    ) as response:
+        assert response.status_code == 200
+        await _read_sse_until(response, predicate=lambda buf: "event: metrics" in buf)
+        assert thread_id in bus._subscribers  # noqa: SLF001
+
+    await asyncio.sleep(0.05)
+    assert not bus._subscribers.get(thread_id)  # noqa: SLF001
diff --git a/tests/support/app.py b/tests/support/app.py
index bf8e57c8..454844a0 100644
--- a/tests/support/app.py
+++ b/tests/support/app.py
@@ -54,14 +54,21 @@ async def octop_client(
         await srv.start()
         if bind_database and not srv.database_bound:
             await ensure_control_plane_bound(srv)
+        # Creating an agent now starts a random-interval sleep (default ON).
+        # pytest-asyncio waits for leftover tasks before fixture teardown, so
+        # those sleeps hang the suite. Production shutdown still cancels them.
+        if srv.app_runtime is not None:
+            await srv.app_runtime.proactive_scheduler.shutdown()
+            srv.app_runtime.proactive_scheduler.suspend()
         app = build_app(srv)
         try:
             async with httpx.AsyncClient(
                 transport=httpx.ASGITransport(app=app),
                 base_url="http://testserver",
             ) as client:
-                # Expose the ASGI app so tests can open WebSocket sessions via
-                # starlette's sync TestClient (httpx removed AsyncClient.websocket_connect).
+                # Expose the ASGI app so tests can open WebSocket sessions on
+                # this same event loop (tests.support.http.ws_connect); httpx
+                # removed AsyncClient.websocket_connect.
                 client._octop_app = app  # type: ignore[attr-defined]
                 yield client, srv
         finally:
diff --git a/tests/support/http.py b/tests/support/http.py
index ff17e76b..1ade227e 100644
--- a/tests/support/http.py
+++ b/tests/support/http.py
@@ -3,39 +3,144 @@
 from __future__ import annotations
 
 import asyncio
+import contextlib
 import json
+from collections.abc import AsyncIterator
+from contextlib import asynccontextmanager
+from typing import Any
+from urllib.parse import unquote, urlsplit
 
 import httpx
-from starlette.testclient import TestClient
+from starlette.websockets import WebSocketDisconnect
+
+# A single-loop session should never stall; the cap keeps a regression from
+# wedging the whole suite instead of failing this one test.
+_WS_RECEIVE_TIMEOUT_S = 20.0
 
 
 def ws_token(auth: dict[str, str]) -> str:
     return auth["Authorization"].split(" ", 1)[1]
 
 
-def _consume_ws_chunks(
-    app: object, agent_id: str, token: str, body: dict[str, object]
-) -> list[dict[str, object]]:
-    """Run the (blocking) starlette ``TestClient`` ws session in a worker thread.
+class ASGIWebSocketSession:
+    """Drive an ASGI websocket endpoint on the caller's event loop.
 
-    starlette's sync ``TestClient.websocket_connect`` blocks the calling event
-    loop for the whole ``with`` block. The gateway workers that process the
-    turn run on that same loop, so blocking it would deadlock. Running the
-    session in a worker thread keeps the server loop free to stream chunks
-    back to the socket.
+    starlette's sync ``TestClient`` runs the app on its own anyio portal loop.
+    That gives the process two loops over one ``OctopServer``, and loop-bound
+    primitives shared by both (``AgentManager._lock``) then deadlock or raise
+    "bound to a different event loop". Speaking ASGI directly keeps the
+    handler, the gateway workers and the test on the same loop, exactly like
+    uvicorn in production.
     """
-    chunks: list[dict[str, object]] = []
-    with TestClient(app).websocket_connect(  # type: ignore[attr-defined]
-        f"/api/agents/{agent_id}/chat/ws?token={token}",
-    ) as ws:
-        ws.send_json(body)
+
+    def __init__(self, app: Any, path: str) -> None:
+        self._app = app
+        self._path = path
+        self._from_app: asyncio.Queue[dict[str, Any]] = asyncio.Queue()
+        self._to_app: asyncio.Queue[dict[str, Any]] = asyncio.Queue()
+        self._task: asyncio.Task[None] | None = None
+
+    def _scope(self) -> dict[str, Any]:
+        url = urlsplit(self._path)
+        return {
+            "type": "websocket",
+            "asgi": {"version": "3.0", "spec_version": "2.3"},
+            "http_version": "1.1",
+            "scheme": "ws",
+            "path": unquote(url.path),
+            "raw_path": url.path.encode("ascii"),
+            "query_string": url.query.encode("ascii"),
+            "root_path": "",
+            "headers": [(b"host", b"testserver")],
+            "client": ("testclient", 50000),
+            "server": ("testserver", 80),
+            "subprotocols": [],
+            "state": {},
+            "app": self._app,
+        }
+
+    async def _next_event(self, timeout: float) -> dict[str, Any]:
+        assert self._task is not None
+        getter: asyncio.Future[dict[str, Any]] = asyncio.ensure_future(self._from_app.get())
+        done, _pending = await asyncio.wait(
+            {getter, self._task},
+            timeout=timeout,
+            return_when=asyncio.FIRST_COMPLETED,
+        )
+        if getter in done:
+            return getter.result()
+        getter.cancel()
+        with contextlib.suppress(asyncio.CancelledError):
+            await getter
+        if self._task in done:
+            # Surface a handler crash instead of a bare timeout.
+            self._task.result()
+            raise AssertionError("websocket handler returned without sending an event")
+        raise TimeoutError(f"no websocket event after {timeout:.0f}s")
+
+    async def connect(self, timeout: float = _WS_RECEIVE_TIMEOUT_S) -> None:
+        self._task = asyncio.create_task(
+            self._app(self._scope(), self._to_app.get, self._from_app.put),
+            name=f"asgi-ws{self._path}",
+        )
+        await self._to_app.put({"type": "websocket.connect"})
+        event = await self._next_event(timeout)
+        if event["type"] == "websocket.close":
+            raise WebSocketDisconnect(event.get("code", 1000), event.get("reason"))
+        if event["type"] != "websocket.accept":
+            raise AssertionError(f"unexpected handshake event: {event['type']}")
+
+    async def send_json(self, payload: Any) -> None:
+        await self._to_app.put(
+            {"type": "websocket.receive", "text": json.dumps(payload, ensure_ascii=False)},
+        )
+
+    async def receive_json(self, *, timeout: float = _WS_RECEIVE_TIMEOUT_S) -> dict[str, Any]:
+        event = await self._next_event(timeout)
+        if event["type"] == "websocket.close":
+            raise WebSocketDisconnect(event.get("code", 1000), event.get("reason"))
+        raw = event.get("text")
+        if raw is None:
+            raw = bytes(event.get("bytes") or b"").decode("utf-8")
+        parsed: dict[str, Any] = json.loads(raw)
+        return parsed
+
+    async def drain_turn(self, *, timeout: float = _WS_RECEIVE_TIMEOUT_S) -> list[dict[str, Any]]:
+        """Collect frames until the turn reports ``done`` or ``error``."""
+        chunks: list[dict[str, Any]] = []
         while True:
-            raw = ws.receive_text()
-            chunk = json.loads(raw)
+            chunk = await self.receive_json(timeout=timeout)
             chunks.append(chunk)
             if chunk.get("type") in ("done", "error"):
-                break
-    return chunks
+                return chunks
+
+    async def close(self) -> None:
+        if self._task is None:
+            return
+        task = self._task
+        self._task = None
+        await self._to_app.put({"type": "websocket.disconnect", "code": 1000})
+        try:
+            await asyncio.wait_for(task, timeout=_WS_RECEIVE_TIMEOUT_S)
+        except (asyncio.CancelledError, TimeoutError):
+            task.cancel()
+            with contextlib.suppress(asyncio.CancelledError):
+                await task
+
+
+@asynccontextmanager
+async def ws_connect(app: Any, path: str) -> AsyncIterator[ASGIWebSocketSession]:
+    """Open an in-process websocket session against *app* on the current loop."""
+    session = ASGIWebSocketSession(app, path)
+    try:
+        await session.connect()
+        yield session
+    finally:
+        await session.close()
+
+
+def chat_ws_path(agent_id: str, auth: dict[str, str]) -> str:
+    return f"/api/agents/{agent_id}/chat/ws?token={ws_token(auth)}"
 
 
 async def ws_chat_turn(
@@ -45,20 +150,15 @@ async def ws_chat_turn(
     *,
     mcp_servers: list[str] | None = None,
     text: str = "hi",
-) -> list[dict[str, object]]:
-    body: dict[str, object] = {
+) -> list[dict[str, Any]]:
+    body: dict[str, Any] = {
         "type": "user_turn",
         "text": text,
         "messages": [{"role": "user", "content": text}],
     }
     if mcp_servers is not None:
         body["mcp_servers"] = mcp_servers
-    # httpx dropped AsyncClient.websocket_connect; use starlette's sync TestClient
-    # in a worker thread (see _consume_ws_chunks).
-    return await asyncio.to_thread(
-        _consume_ws_chunks,
-        client._octop_app,  # type: ignore[attr-defined]
-        agent_id,
-        ws_token(auth),
-        body,
-    )
+    app = client._octop_app  # type: ignore[attr-defined]
+    async with ws_connect(app, chat_ws_path(agent_id, auth)) as ws:
+        await ws.send_json(body)
+        return await ws.drain_turn()
diff --git a/tests/unit/agents/test_agent_avatar.py b/tests/unit/agents/test_agent_avatar.py
index 6f5de9dc..8dd4456f 100644
--- a/tests/unit/agents/test_agent_avatar.py
+++ b/tests/unit/agents/test_agent_avatar.py
@@ -10,6 +10,8 @@
     agent_avatar_api_path,
     delete_workspace_avatar,
     display_agent_icon_url,
+    display_published_expert_icon_url,
+    read_snapshot_avatar,
     read_workspace_avatar,
     sniff_avatar_media_type,
     write_workspace_avatar,
@@ -91,3 +93,31 @@ def test_display_agent_icon_url_cache_busts_local_avatar() -> None:
     assert display_agent_icon_url(agent_id="agt1", stored="https://cdn/x.png", updated_at=42) == (
         "https://cdn/x.png"
     )
+
+
+def test_read_snapshot_avatar_and_display_url(tmp_path) -> None:
+    assert read_snapshot_avatar(tmp_path) is None
+    assert (
+        display_published_expert_icon_url(
+            expert_id="pexp1",
+            snapshot_dir=tmp_path,
+            updated_at="2026-01-01T00:00:00Z",
+        )
+        is None
+    )
+
+    avatar = tmp_path / ".octop" / "avatar.png"
+    avatar.parent.mkdir(parents=True)
+    avatar.write_bytes(PNG)
+    found = read_snapshot_avatar(tmp_path)
+    assert found is not None
+    assert found[0] == PNG
+    assert found[1] == "image/png"
+    assert (
+        display_published_expert_icon_url(
+            expert_id="pexp1",
+            snapshot_dir=tmp_path,
+            updated_at="2026-01-01T00:00:00Z",
+        )
+        == "/api/experts/published/pexp1/avatar?v=2026-01-01T00:00:00Z"
+    )
diff --git a/tests/unit/agents/test_agent_manager.py b/tests/unit/agents/test_agent_manager.py
index 0fe9c166..56880a12 100644
--- a/tests/unit/agents/test_agent_manager.py
+++ b/tests/unit/agents/test_agent_manager.py
@@ -210,7 +210,18 @@ def test_build_harness_config_includes_cronjob_tools_when_cron_manager_set(
 
     gw = MagicMock()
     gw.thread_registry = MagicMock()
-    cron_mgr = CronManager(gateway=gw, repos=manager._repos, timezone="UTC")
+    from octop.infra.cron.delivery import CronDeliveryService
+
+    cron_mgr = CronManager(
+        gateway=gw,
+        delivery_service=CronDeliveryService(
+            gateway=gw,
+            agent_manager=manager,
+            repos=manager._repos,
+        ),
+        repos=manager._repos,
+        timezone="UTC",
+    )
     cron_mgr._scheduler = MagicMock()
     manager.set_cron_manager(cron_mgr)
 
diff --git a/tests/unit/agents/test_browser_profile_middleware.py b/tests/unit/agents/test_browser_profile_middleware.py
new file mode 100644
index 00000000..fc9ca6d6
--- /dev/null
+++ b/tests/unit/agents/test_browser_profile_middleware.py
@@ -0,0 +1,78 @@
+from unittest.mock import AsyncMock
+
+import pytest
+from langgraph.prebuilt.tool_node import ToolCallRequest
+
+from octop.infra.agents.middleware import browser_profile
+
+
+def _request(name: str, args: dict[str, object]) -> ToolCallRequest:
+    return ToolCallRequest(
+        tool_call={"name": name, "args": args, "id": "call-1"},
+        tool=None,
+        state={},
+        runtime=None,  # type: ignore[arg-type]
+    )
+
+
+@pytest.mark.asyncio
+async def test_browser_profile_is_forced_from_current_user(monkeypatch) -> None:
+    monkeypatch.setattr(
+        browser_profile,
+        "get_config",
+        lambda: {"configurable": {"user": "42"}},
+    )
+    handler = AsyncMock(return_value=object())
+    request = _request("browser_use", {"action": "navigate", "profile": "default"})
+
+    await browser_profile.BrowserProfileMiddleware().awrap_tool_call(request, handler)
+
+    forwarded = handler.await_args.args[0]
+    assert forwarded.tool_call["args"] == {
+        "action": "navigate",
+        "profile": "user-42",
+    }
+
+
+@pytest.mark.asyncio
+async def test_non_browser_tool_is_unchanged(monkeypatch) -> None:
+    monkeypatch.setattr(
+        browser_profile,
+        "get_config",
+        lambda: {"configurable": {"user": "42"}},
+    )
+    handler = AsyncMock(return_value=object())
+    request = _request("read_file", {"path": "notes.txt"})
+
+    await browser_profile.BrowserProfileMiddleware().awrap_tool_call(request, handler)
+
+    assert handler.await_args.args[0] is request
+
+
+@pytest.mark.asyncio
+async def test_browser_profile_blocks_when_user_missing(monkeypatch) -> None:
+    monkeypatch.setattr(browser_profile, "get_config", lambda: {"configurable": {}})
+    handler = AsyncMock(return_value=object())
+    request = _request("browser_use", {"action": "navigate", "profile": "default"})
+
+    result = await browser_profile.BrowserProfileMiddleware().awrap_tool_call(request, handler)
+
+    handler.assert_not_awaited()
+    assert getattr(result, "status", None) == "error"
+    assert "no Octop user id" in str(result.content)
+
+
+@pytest.mark.asyncio
+async def test_browser_profile_blocks_placeholder_user_zero(monkeypatch) -> None:
+    monkeypatch.setattr(
+        browser_profile,
+        "get_config",
+        lambda: {"configurable": {"user": "0"}},
+    )
+    handler = AsyncMock(return_value=object())
+    request = _request("browser_use", {"action": "navigate"})
+
+    result = await browser_profile.BrowserProfileMiddleware().awrap_tool_call(request, handler)
+
+    handler.assert_not_awaited()
+    assert getattr(result, "status", None) == "error"
diff --git a/tests/unit/agents/test_mcp_tool_cache.py b/tests/unit/agents/test_mcp_tool_cache.py
index efd6c0c0..540620a1 100644
--- a/tests/unit/agents/test_mcp_tool_cache.py
+++ b/tests/unit/agents/test_mcp_tool_cache.py
@@ -195,6 +195,61 @@ async def test_prepare_chat_mcp_injects_custom_from_cache() -> None:
     assert isinstance(injected[0], StructuredTool)
 
 
+@pytest.mark.asyncio
+async def test_prepare_chat_mcp_attaches_gateway_tools_without_reload() -> None:
+    """Gateway connectors inject in-process; rebuilding would drop the runtime.
+
+    A rebuild ends in the very same injection, but first closes the harness
+    agent (and the checkpointer pool an in-flight turn still writes to) and
+    holds ``AgentManager._lock`` across workspace I/O.
+    """
+    from octop.infra.agents.manager import AgentManager
+    from octop.infra.connectors.builder import mcp_server_name
+
+    instance_id = "01TESTGATEWAYINSTANCE0001"
+    server = mcp_server_name("qq-mail", instance_id)
+
+    inst = MagicMock()
+    inst.instance_id = instance_id
+    inst.kind = "qq-mail"
+    inst.status = "active"
+    inst.mcp_server_name = server
+
+    agent = MagicMock()
+    agent._mcp_tools = []
+    agent._mcp_tool_name_set = frozenset()
+    agent.config.mcp_server_configs = {}
+
+    def _inject(tools: list[Any]) -> None:
+        agent._mcp_tools = [*tools, *agent._mcp_tools]
+        agent._mcp_tool_name_set = frozenset(str(getattr(t, "name", "")) for t in agent._mcp_tools)
+
+    agent.inject_mcp_tools = MagicMock(side_effect=_inject)
+
+    mgr = object.__new__(AgentManager)
+    mgr._repos = MagicMock()
+    mgr._repos.connector_repo.list_visible.return_value = [inst]
+    mgr._connector_svc = MagicMock()
+    mgr._connector_svc.custom_harness_configs.return_value = {}
+    mgr._connector_svc.decrypt.return_value = {"email": "a@qq.com", "password": "code"}
+    mgr._connector_svc.ensure_fresh_credentials = AsyncMock(return_value={})
+    mgr.get_agent = MagicMock(return_value=agent)
+    mgr.get_row = MagicMock(return_value=MagicMock())
+    mgr._connector_uid_for = MagicMock(return_value=7)
+    mgr.reload_connectors = AsyncMock()
+
+    failed = await mgr.prepare_chat_mcp("A1", [server], connector_user_id=7)
+
+    # Asserted before the tool checks so a reintroduced rebuild reports itself
+    # rather than surfacing as "tools missing".
+    mgr.reload_connectors.assert_not_awaited()
+    assert failed == []
+    assert agent.inject_mcp_tools.call_count == 1
+    assert all(name.startswith(f"{server}_") for name in agent._mcp_tool_name_set)
+    assert server in agent.config.mcp_server_configs
+    mgr._connector_svc.ensure_fresh_credentials.assert_awaited_once_with(instance_id, "qq-mail")
+
+
 def test_wrap_tools_for_shared_use() -> None:
     lock = asyncio.Lock()
     inner = MagicMock()
diff --git a/tests/unit/agents/test_model_flags.py b/tests/unit/agents/test_model_flags.py
index 23f489e1..fa497566 100644
--- a/tests/unit/agents/test_model_flags.py
+++ b/tests/unit/agents/test_model_flags.py
@@ -7,6 +7,7 @@
 from octop.infra.agents.providers.model_flags import (
     is_chat_eligible_model,
     is_embedding_model,
+    is_vision_model,
 )
 from octop.infra.agents.providers.resolved import list_resolved_models
 
@@ -76,6 +77,13 @@ def test_chat_eligible_excludes_embedding() -> None:
     assert not is_chat_eligible_model({"id": "gpt", "enabled": False})
 
 
+def test_vision_model_uses_explicit_input_then_known_ids() -> None:
+    assert is_vision_model({"id": "custom", "input": ["text", "image"]})
+    assert is_vision_model({"id": "gpt-4o-mini", "input": ["text"]})
+    assert is_vision_model({"id": "qwen2.5-vl"})
+    assert not is_vision_model({"id": "text-only", "input": ["text"]})
+
+
 def test_list_resolved_models_skips_embedding() -> None:
     providers = [
         SimpleNamespace(
diff --git a/tests/unit/agents/test_onnx_download.py b/tests/unit/agents/test_onnx_download.py
index 7a497f1f..6568c6a8 100644
--- a/tests/unit/agents/test_onnx_download.py
+++ b/tests/unit/agents/test_onnx_download.py
@@ -2,18 +2,25 @@
 
 from __future__ import annotations
 
+import json
+import os
 import sys
 import threading
 import time
 from pathlib import Path
 
+import httpx
+
 from octop.infra.agents.providers.onnx_catalog import get_onnx_model_meta
 from octop.infra.agents.providers.onnx_download import (
+    COS_ENDPOINT_DEFAULT,
     HF_ENDPOINT_MIRROR,
     HF_ENDPOINT_OFFICIAL,
     DownloadCandidate,
     build_download_candidates,
+    cos_file_url,
     download_model_raced,
+    export_model_tree_for_cos,
     race_download_sources,
 )
 
@@ -27,20 +34,24 @@ def test_bge_small_zh_infers_hf_repo_without_fastembed(monkeypatch) -> None:
     assert "direct_url" not in meta
 
 
-def test_candidates_are_hf_and_mirror_with_inferred_urls(monkeypatch) -> None:
+def test_candidates_are_cos_hf_and_mirror_with_inferred_urls(monkeypatch) -> None:
     from octop.infra.agents.providers import onnx_catalog as catalog
 
     monkeypatch.setattr(catalog, "_fastembed_meta_map", lambda: {})
     cands = build_download_candidates("BAAI/bge-small-zh-v1.5")
-    assert [c.kind for c in cands] == ["hf", "hf-mirror"]
+    assert [c.kind for c in cands] == ["cos", "hf", "hf-mirror"]
     assert cands[0].probe_url == (
-        f"{HF_ENDPOINT_OFFICIAL}/Qdrant/bge-small-zh-v1.5/resolve/main/config.json"
+        f"{COS_ENDPOINT_DEFAULT}/models/embedding/BAAI/bge-small-zh-v1.5/config.json"
     )
     assert cands[1].probe_url == (
+        f"{HF_ENDPOINT_OFFICIAL}/Qdrant/bge-small-zh-v1.5/resolve/main/config.json"
+    )
+    assert cands[2].probe_url == (
         f"{HF_ENDPOINT_MIRROR}/Qdrant/bge-small-zh-v1.5/resolve/main/config.json"
     )
-    assert cands[0].hf_endpoint == HF_ENDPOINT_OFFICIAL
-    assert cands[1].hf_endpoint == HF_ENDPOINT_MIRROR
+    assert cands[0].hf_repo == "Qdrant/bge-small-zh-v1.5"
+    assert cands[1].hf_endpoint == HF_ENDPOINT_OFFICIAL
+    assert cands[2].hf_endpoint == HF_ENDPOINT_MIRROR
 
 
 def test_unknown_model_uses_model_id_as_hf_repo(monkeypatch) -> None:
@@ -48,12 +59,13 @@ def test_unknown_model_uses_model_id_as_hf_repo(monkeypatch) -> None:
 
     monkeypatch.setattr(catalog, "_fastembed_meta_map", lambda: {})
     cands = build_download_candidates("jinaai/jina-embeddings-v2-base-zh")
-    assert [c.kind for c in cands] == ["hf", "hf-mirror"]
-    assert cands[0].hf_repo == "jinaai/jina-embeddings-v2-base-zh"
-    assert cands[0].probe_url.startswith(
+    assert [c.kind for c in cands] == ["cos", "hf", "hf-mirror"]
+    assert cands[1].hf_repo == "jinaai/jina-embeddings-v2-base-zh"
+    assert cands[0].probe_url == cos_file_url("jinaai/jina-embeddings-v2-base-zh", "config.json")
+    assert cands[1].probe_url.startswith(
         f"{HF_ENDPOINT_OFFICIAL}/jinaai/jina-embeddings-v2-base-zh/"
     )
-    assert cands[1].probe_url.startswith(f"{HF_ENDPOINT_MIRROR}/jinaai/jina-embeddings-v2-base-zh/")
+    assert cands[2].probe_url.startswith(f"{HF_ENDPOINT_MIRROR}/jinaai/jina-embeddings-v2-base-zh/")
 
 
 def test_race_orders_by_ttfb_and_skips_failures() -> None:
@@ -207,3 +219,184 @@ def fake_snapshot_download(**kwargs: object) -> str:
 
     assert (400_000, None, "Downloading bytes") in seen
     assert (800_000, 800_000, "Reconstructing") in seen
+
+
+def test_snapshot_disables_xet_before_hub_import(monkeypatch, tmp_path: Path) -> None:
+    import types
+
+    from octop.infra.agents.providers import onnx_download as mod
+
+    seen: dict[str, object] = {}
+    constants = types.ModuleType("huggingface_hub.constants")
+    constants.HF_HUB_DISABLE_XET = False
+    monkeypatch.setitem(sys.modules, "huggingface_hub.constants", constants)
+
+    def fake_snapshot_download(**kwargs: object) -> str:
+        seen["env"] = os.environ.get("HF_HUB_DISABLE_XET")
+        seen["const"] = constants.HF_HUB_DISABLE_XET
+        seen["endpoint"] = kwargs.get("endpoint")
+        return "ok"
+
+    hub = types.ModuleType("huggingface_hub")
+    hub.snapshot_download = fake_snapshot_download
+    monkeypatch.setitem(sys.modules, "huggingface_hub", hub)
+
+    mod._download_hf_snapshot(
+        DownloadCandidate(
+            kind="hf-mirror",
+            probe_url="http://mirror",
+            hf_endpoint=HF_ENDPOINT_MIRROR,
+            hf_repo="Qdrant/bge-small-zh-v1.5",
+        ),
+        tmp_path / "cache",
+    )
+
+    assert seen["env"] == "1"
+    assert seen["const"] is True
+    assert seen["endpoint"] == HF_ENDPOINT_MIRROR
+
+
+def test_cos_base_env_override(monkeypatch) -> None:
+    monkeypatch.setenv("OCTOP_ONNX_COS_BASE", "https://example-cos.example.com/")
+    assert cos_file_url("BAAI/bge-small-zh-v1.5", "config.json") == (
+        "https://example-cos.example.com/models/embedding/BAAI/bge-small-zh-v1.5/config.json"
+    )
+
+
+def test_cos_download_writes_hf_cache(monkeypatch, tmp_path: Path) -> None:
+    from octop.infra.agents.providers.onnx_download import _download_cos_snapshot
+
+    files = {
+        "files.json": json.dumps(
+            {
+                "model_id": "BAAI/bge-small-zh-v1.5",
+                "hf_repo": "Qdrant/bge-small-zh-v1.5",
+                "files": ["config.json", "model.onnx"],
+            }
+        ).encode(),
+        "config.json": b'{"hidden_size": 512}',
+        "model.onnx": b"onnx-bytes",
+    }
+
+    def handler(request: httpx.Request) -> httpx.Response:
+        name = request.url.path.rsplit("/", 1)[-1]
+        body = files.get(name)
+        if body is None:
+            return httpx.Response(404, request=request)
+        return httpx.Response(200, content=body, request=request)
+
+    real_client = httpx.Client
+    monkeypatch.setattr(
+        httpx,
+        "Client",
+        lambda **_kwargs: real_client(transport=httpx.MockTransport(handler)),
+    )
+    cache = tmp_path / "cache"
+    _download_cos_snapshot(
+        DownloadCandidate(
+            kind="cos",
+            probe_url="http://cos/config.json",
+            hf_endpoint="",
+            hf_repo="Qdrant/bge-small-zh-v1.5",
+            model_name="BAAI/bge-small-zh-v1.5",
+        ),
+        cache,
+    )
+    snapshot = cache / "models--Qdrant--bge-small-zh-v1.5" / "snapshots" / "cos-mirror"
+    assert (snapshot / "config.json").read_text(encoding="utf-8") == '{"hidden_size": 512}'
+    assert (snapshot / "model.onnx").read_bytes() == b"onnx-bytes"
+    assert (cache / "models--Qdrant--bge-small-zh-v1.5" / "refs" / "main").read_text(
+        encoding="utf-8"
+    ).strip() == "cos-mirror"
+
+
+def test_cos_download_rejects_parent_paths(monkeypatch, tmp_path: Path) -> None:
+    from octop.infra.agents.providers.onnx_download import _download_cos_snapshot
+
+    def handler(request: httpx.Request) -> httpx.Response:
+        if request.url.path.endswith("files.json"):
+            return httpx.Response(
+                200,
+                content=json.dumps({"files": ["../escape.onnx"]}).encode(),
+                request=request,
+            )
+        return httpx.Response(404, request=request)
+
+    real_client = httpx.Client
+    monkeypatch.setattr(
+        httpx,
+        "Client",
+        lambda **_kwargs: real_client(transport=httpx.MockTransport(handler)),
+    )
+    try:
+        _download_cos_snapshot(
+            DownloadCandidate(
+                kind="cos",
+                probe_url="http://cos/config.json",
+                hf_endpoint="",
+                hf_repo="Qdrant/bge-small-zh-v1.5",
+                model_name="BAAI/bge-small-zh-v1.5",
+            ),
+            tmp_path,
+        )
+    except ValueError as exc:
+        assert "unsafe" in str(exc)
+    else:
+        raise AssertionError("expected unsafe COS path to fail")
+
+
+def test_download_raced_uses_cos_winner(monkeypatch, tmp_path: Path) -> None:
+    from octop.infra.agents.providers import onnx_download as mod
+
+    cands = [
+        DownloadCandidate(
+            kind="cos",
+            probe_url="http://cos",
+            hf_endpoint="",
+            hf_repo="Qdrant/bge-small-zh-v1.5",
+            model_name="BAAI/bge-small-zh-v1.5",
+        ),
+        DownloadCandidate(
+            kind="hf",
+            probe_url="http://hf",
+            hf_endpoint=HF_ENDPOINT_OFFICIAL,
+            hf_repo="Qdrant/bge-small-zh-v1.5",
+        ),
+    ]
+    tried: list[str] = []
+    monkeypatch.setattr(mod, "build_download_candidates", lambda _name: cands)
+    monkeypatch.setattr(mod, "race_download_sources", lambda items, **_kw: items)
+
+    def fake_cos(cand: DownloadCandidate, cache_dir: Path, **_kwargs: object) -> None:
+        del cache_dir
+        tried.append(cand.kind)
+
+    monkeypatch.setattr(mod, "_download_cos_snapshot", fake_cos)
+    winner = download_model_raced("BAAI/bge-small-zh-v1.5", tmp_path)
+    assert winner == "cos"
+    assert tried == ["cos"]
+
+
+def test_export_model_tree_writes_manifest(monkeypatch, tmp_path: Path) -> None:
+    from octop.infra.agents.providers import onnx_catalog as catalog
+
+    monkeypatch.setattr(catalog, "_fastembed_meta_map", lambda: {})
+    snapshot = tmp_path / "snap"
+    snapshot.mkdir()
+    (snapshot / "config.json").write_text("{}", encoding="utf-8")
+    (snapshot / "model.onnx").write_bytes(b"onnx")
+
+    import types
+
+    hub = sys.modules.get("huggingface_hub")
+    if hub is None:
+        hub = types.ModuleType("huggingface_hub")
+        monkeypatch.setitem(sys.modules, "huggingface_hub", hub)
+    monkeypatch.setattr(hub, "snapshot_download", lambda **_kwargs: str(snapshot), raising=False)
+
+    dest = export_model_tree_for_cos("BAAI/bge-small-zh-v1.5", tmp_path / "out")
+    assert dest == tmp_path / "out" / "models" / "embedding" / "BAAI" / "bge-small-zh-v1.5"
+    manifest = json.loads((dest / "files.json").read_text(encoding="utf-8"))
+    assert manifest["model_id"] == "BAAI/bge-small-zh-v1.5"
+    assert manifest["hf_repo"] == "Qdrant/bge-small-zh-v1.5"
+    assert set(manifest["files"]) == {"config.json", "model.onnx"}
diff --git a/tests/unit/agents/test_plugin_tool_defaults.py b/tests/unit/agents/test_plugin_tool_defaults.py
index af863ee8..3d682c42 100644
--- a/tests/unit/agents/test_plugin_tool_defaults.py
+++ b/tests/unit/agents/test_plugin_tool_defaults.py
@@ -3,7 +3,9 @@
 from __future__ import annotations
 
 from octop.infra.agents.plugin_tool_defaults import (
+    agent_plugin_enabled,
     expand_plugin_tools_default_on,
+    merge_plugins_enabled_settings,
     merge_plugins_tool_settings,
 )
 
@@ -32,3 +34,27 @@ def test_expand_default_on_fills_missing_tools() -> None:
         global_plugins={"echo-tool": True},
     )
     assert out["echo-tool"]["tools"]["echo_message"]["enabled"] is True
+
+
+def test_agent_plugin_enabled_defaults_true_when_missing() -> None:
+    assert agent_plugin_enabled({}, "echo-tool") is True
+    assert agent_plugin_enabled({"echo-tool": {"tools": {}}}, "echo-tool") is True
+    assert agent_plugin_enabled({"echo-tool": {"enabled": False}}, "echo-tool") is False
+
+
+def test_plugin_level_toggle_preserves_tool_config() -> None:
+    existing = {
+        "echo-tool": {
+            "tools": {
+                "echo_message": {
+                    "enabled": False,
+                    "config": {"prefix": "kept"},
+                }
+            }
+        }
+    }
+    disabled = merge_plugins_enabled_settings(existing, {"echo-tool": False})
+    assert disabled["echo-tool"]["enabled"] is False
+    assert disabled["echo-tool"]["tools"] == existing["echo-tool"]["tools"]
+    enabled = merge_plugins_enabled_settings(disabled, {"echo-tool": True})
+    assert enabled["echo-tool"]["tools"] == existing["echo-tool"]["tools"]
diff --git a/tests/unit/api/test_acl_gate_coverage.py b/tests/unit/api/test_acl_gate_coverage.py
index 62015656..d9f9a60a 100644
--- a/tests/unit/api/test_acl_gate_coverage.py
+++ b/tests/unit/api/test_acl_gate_coverage.py
@@ -28,7 +28,7 @@
     "routers/connectors.py",
     "routers/knowledge_bases.py",
     "routers/browser/uninstall.py",
-    "routers/browser/sessions.py",
+    "routers/browser/env.py",
     "routers/desktop/install.py",
     "routers/desktop/uninstall.py",
     "routers/desktop/status.py",
diff --git a/tests/unit/api/test_backup_restore_rehydrate.py b/tests/unit/api/test_backup_restore_rehydrate.py
index b71e82fd..b8228118 100644
--- a/tests/unit/api/test_backup_restore_rehydrate.py
+++ b/tests/unit/api/test_backup_restore_rehydrate.py
@@ -147,6 +147,37 @@ def _fake_create(**kwargs: Any) -> BackupFileInfo:
 
     assert result == {"ok": True, "item": entry.to_dict()}
     assert called["pool"] is server.services.db
+    assert called["options"].include_chats is False
+
+
+@pytest.mark.asyncio
+async def test_create_backup_passes_selected_content(monkeypatch: pytest.MonkeyPatch) -> None:
+    entry = BackupFileInfo(
+        name="octop-backup-20260101T000000Z.tar.gz",
+        size=12,
+        modified_at="2026-01-01T00:00:00+00:00",
+        created_at="2026-01-01T00:00:00+00:00",
+    )
+    called: dict[str, Any] = {}
+
+    def _fake_create(**kwargs: Any) -> BackupFileInfo:
+        called.update(kwargs)
+        return entry
+
+    monkeypatch.setattr(backup_router, "_create_and_store_manual_backup", _fake_create)
+    monkeypatch.setattr(backup_router, "_agent_rows", lambda _server: [])
+    server = MagicMock()
+    server.services.db = object()
+    server.services.config.database = object()
+
+    body = backup_router.CreateBackupBody(
+        include_config=False,
+        include_workspaces=False,
+        include_chats=True,
+    )
+    await backup_router.create_backup(body=body, _=None, server=server)
+
+    assert called["options"] == body
 
 
 @pytest.mark.asyncio
diff --git a/tests/unit/api/test_browser_stream_listen.py b/tests/unit/api/test_browser_stream_listen.py
index 807e4c3d..a255f78e 100644
--- a/tests/unit/api/test_browser_stream_listen.py
+++ b/tests/unit/api/test_browser_stream_listen.py
@@ -106,3 +106,33 @@ async def test_resolve_harness_session_create_false_returns_none() -> None:
     ):
         result = await resolve_harness_session("default", create=False)
     assert result is None
+
+
+@pytest.mark.asyncio
+async def test_resolve_harness_session_never_falls_back_to_another_profile() -> None:
+    other_session = object()
+    tool_iface = SimpleNamespace(_registry={"user-2": other_session})
+    hb = SimpleNamespace(BrowserSession=object, tool_interface=tool_iface)
+    with patch.dict(
+        sys.modules,
+        {"harness_browser": hb, "harness_browser.tool_interface": tool_iface},
+    ):
+        result = await resolve_harness_session("user-1", create=False)
+    assert result is None
+
+
+@pytest.mark.asyncio
+async def test_resolve_harness_session_create_true_rejects_empty_hint() -> None:
+    from octop.infra.errors import OctopError
+
+    fake_registry: dict[str, Any] = {"user-2": object()}
+    tool_iface = SimpleNamespace(_registry=fake_registry)
+    hb = SimpleNamespace(BrowserSession=object, tool_interface=tool_iface)
+    with (
+        patch.dict(
+            sys.modules,
+            {"harness_browser": hb, "harness_browser.tool_interface": tool_iface},
+        ),
+        pytest.raises(OctopError, match="browser profile is required"),
+    ):
+        await resolve_harness_session("auto", create=True)
diff --git a/tests/unit/api/test_harness_tabs.py b/tests/unit/api/test_harness_tabs.py
index ef79786c..b79c502a 100644
--- a/tests/unit/api/test_harness_tabs.py
+++ b/tests/unit/api/test_harness_tabs.py
@@ -92,7 +92,7 @@ def get(self, url: str, timeout: object = None) -> _JsonResp:
 
 
 @pytest.mark.asyncio
-async def test_shutdown_browser_kills_named_profile() -> None:
+async def test_shutdown_browser_forces_current_user_profile() -> None:
     result = SimpleNamespace(success=True, error=None)
     with (
         patch(
@@ -101,10 +101,12 @@ async def test_shutdown_browser_kills_named_profile() -> None:
         ) as tool,
         patch("harness_browser.tool_interface._registry", {"work": object()}),
     ):
-        body = await harness_mod.shutdown_browser(profile="work", _=object())
-    assert body == {"ok": True, "profile": "work"}
+        body = await harness_mod.shutdown_browser(
+            user=SimpleNamespace(id=7),
+        )
+    assert body == {"ok": True, "profile": "user-7"}
     tool.assert_awaited_once_with(
         action="close_session",
-        profile="work",
+        profile="user-7",
         kill=True,
     )
diff --git a/tests/unit/api/test_knowledge_bases.py b/tests/unit/api/test_knowledge_bases.py
index d0a50968..9e81a9bf 100644
--- a/tests/unit/api/test_knowledge_bases.py
+++ b/tests/unit/api/test_knowledge_bases.py
@@ -320,6 +320,38 @@ async def test_embedding_options_excludes_onnx_local_provider() -> None:
     assert any(row.get("size_gb") for row in options["onnx"])
 
 
+@pytest.mark.asyncio
+async def test_ocr_options_only_lists_image_capable_models() -> None:
+    from octop.api.routers import knowledge_bases
+
+    provider = SimpleNamespace(
+        id=2,
+        name="OpenAI",
+        enabled=True,
+        api_key="sk-test",
+        base_url="https://example.test/v1",
+        get_models=lambda: [
+            {"id": "text-only", "name": "Text", "input": ["text"]},
+            {"id": "vision-1", "name": "Vision", "input": ["text", "image"]},
+            {"id": "embed-1", "name": "Embed", "embedding": True, "input": ["image"]},
+        ],
+    )
+    server = SimpleNamespace(
+        services=SimpleNamespace(provider_repo=SimpleNamespace(list_all=lambda: [provider]))
+    )
+
+    options = await knowledge_bases.ocr_options(server=server, _admin=object())
+
+    assert options["local"] == {"id": "rapidocr", "name": "RapidOCR (ONNX)"}
+    assert options["remote"] == [
+        {
+            "provider_id": "2",
+            "provider_name": "OpenAI",
+            "models": [{"id": "vision-1", "name": "Vision"}],
+        }
+    ]
+
+
 @pytest.mark.asyncio
 async def test_embedding_options_omits_non_recommended_onnx() -> None:
     from octop.api.routers import knowledge_bases
diff --git a/tests/unit/backend/test_opensandbox_deps.py b/tests/unit/backend/test_opensandbox_deps.py
new file mode 100644
index 00000000..c0266a86
--- /dev/null
+++ b/tests/unit/backend/test_opensandbox_deps.py
@@ -0,0 +1,25 @@
+"""Tests for on-demand OpenSandbox SDK install."""
+
+from __future__ import annotations
+
+from octop.infra.backend import opensandbox_deps
+
+
+def test_ensure_opensandbox_deps_ready_when_importable(monkeypatch) -> None:
+    monkeypatch.setattr(opensandbox_deps, "opensandbox_sdk_available", lambda: True)
+    assert opensandbox_deps.ensure_opensandbox_deps() == "ready"
+
+
+def test_ensure_opensandbox_deps_installs(monkeypatch) -> None:
+    state = {"ok": False}
+
+    def _available() -> bool:
+        return state["ok"]
+
+    def _install(*_a, **_k) -> str:
+        state["ok"] = True
+        return "installed"
+
+    monkeypatch.setattr(opensandbox_deps, "opensandbox_sdk_available", _available)
+    monkeypatch.setattr(opensandbox_deps, "install_packages", _install)
+    assert opensandbox_deps.ensure_opensandbox_deps(allow_install=True) == "installed"
diff --git a/tests/unit/backup/test_auto.py b/tests/unit/backup/test_auto.py
index 696368f4..b33f3a6d 100644
--- a/tests/unit/backup/test_auto.py
+++ b/tests/unit/backup/test_auto.py
@@ -39,18 +39,69 @@ def test_backup_config_from_payload_rejects_bad_retention() -> None:
         backup_config_from_payload({"schedule": "cron:0 4 * * *", "retention_count": 0})
 
 
+def test_backup_config_from_payload_reads_content_options() -> None:
+    cfg = backup_config_from_payload(
+        {
+            "schedule": "cron:0 4 * * *",
+            "retention_count": 3,
+            "include_config": False,
+            "include_workspaces": False,
+            "include_skill_packages": False,
+            "include_plugins": False,
+            "include_knowledge": False,
+            "include_chats": True,
+        }
+    )
+    assert cfg.include_config is False
+    assert cfg.include_workspaces is False
+    assert cfg.include_skill_packages is False
+    assert cfg.include_plugins is False
+    assert cfg.include_knowledge is False
+    assert cfg.include_chats is True
+
+    defaults = backup_config_from_payload({"schedule": "cron:0 4 * * *", "retention_count": 3})
+    assert defaults.include_config is True
+    assert defaults.include_workspaces is True
+    assert defaults.include_skill_packages is True
+    assert defaults.include_plugins is True
+    assert defaults.include_knowledge is True
+    assert defaults.include_chats is False
+
+
 def test_persist_backup_config(tmp_path: Path) -> None:
     cfg_path = tmp_path / "config.json"
     load_config(cfg_path)
     out = persist_backup_config(
         cfg_path,
-        BackupConfig(auto_enabled=True, schedule="interval:3600", retention_count=3),
+        BackupConfig(
+            auto_enabled=True,
+            schedule="interval:3600",
+            retention_count=3,
+            include_config=False,
+            include_workspaces=False,
+            include_skill_packages=False,
+            include_plugins=False,
+            include_knowledge=False,
+            include_chats=True,
+        ),
     )
     assert out.backup.auto_enabled is True
     assert out.backup.schedule == "interval:3600"
     assert out.backup.retention_count == 3
+    assert out.backup.include_chats is True
+    assert out.backup.include_config is False
+    assert out.backup.include_workspaces is False
+    assert out.backup.include_skill_packages is False
+    assert out.backup.include_plugins is False
+    assert out.backup.include_knowledge is False
     reloaded = load_config(cfg_path)
     assert reloaded.backup.auto_enabled is True
+    assert reloaded.backup.include_chats is True
+    assert reloaded.backup.include_config is False
+    assert reloaded.backup.include_workspaces is False
+    assert reloaded.backup.include_skill_packages is False
+    assert reloaded.backup.include_plugins is False
+    assert reloaded.backup.include_knowledge is False
 
 
 def test_apply_auto_backup_schedule_skips_when_disabled(tmp_path: Path) -> None:
diff --git a/tests/unit/backup/test_pg_dump_helpers.py b/tests/unit/backup/test_pg_dump_helpers.py
index 3145eeea..9de1a811 100644
--- a/tests/unit/backup/test_pg_dump_helpers.py
+++ b/tests/unit/backup/test_pg_dump_helpers.py
@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from types import SimpleNamespace
+
 import pytest
 
 from octop.infra.backup import pg_dump
@@ -10,3 +12,25 @@ def test_require_tool_missing(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr(pg_dump.shutil, "which", lambda _name: None)
     with pytest.raises(OctopError, match="pg_dump not found"):
         pg_dump._require_tool("pg_dump")
+
+
+def test_dump_postgres_can_exclude_chat_table_data(
+    monkeypatch: pytest.MonkeyPatch, tmp_path
+) -> None:
+    called: list[str] = []
+    monkeypatch.setattr(pg_dump, "_require_tool", lambda _name: "pg_dump")
+
+    def fake_run(command, **_kwargs):
+        called.extend(command)
+        return SimpleNamespace(returncode=0, stderr="", stdout="")
+
+    monkeypatch.setattr(pg_dump.subprocess, "run", fake_run)
+    pg_dump.dump_postgres(
+        "postgresql://example",
+        tmp_path / "backup.dump",
+        exclude_table_data=("sessions", "threads"),
+    )
+
+    assert called.count("--exclude-table-data") == 2
+    assert "sessions" in called
+    assert "threads" in called
diff --git a/tests/unit/backup/test_store.py b/tests/unit/backup/test_store.py
index 9cd6ba7d..248d962c 100644
--- a/tests/unit/backup/test_store.py
+++ b/tests/unit/backup/test_store.py
@@ -8,10 +8,12 @@
 import pytest
 
 from octop.infra.backup.store import (
+    BackupContentFlags,
     delete_backup_file,
     is_auto_backup_filename,
     list_backup_files,
     normalize_backup_filename,
+    peek_backup_contents,
     prune_auto_backups,
     read_backup_file,
     write_backup_file,
@@ -111,3 +113,46 @@ def test_prune_auto_backups_keep_zero_deletes_all_auto(tmp_path: Path) -> None:
     assert deleted == ["octop-auto-backup-20260101T010000Z.tar.gz"]
     names = {f.name for f in list_backup_files(layout)}
     assert names == {"octop-backup-20260101T000000Z.tar.gz"}
+
+
+def test_peek_backup_contents_reads_manifest(tmp_path: Path) -> None:
+    from octop.config import DatabaseConfig
+    from octop.infra.backup.system_archive import create_system_backup
+    from octop.infra.db.migrate import run_migrations
+    from octop.infra.db.pool import SqlitePool
+
+    layout = PathLayout(tmp_path / ".octop")
+    layout.root.mkdir()
+    pool = SqlitePool(layout.db)
+    run_migrations(pool)
+    archive = tmp_path / "peek.tar.gz"
+    create_system_backup(
+        paths=layout,
+        agent_rows=[],
+        pool=pool,
+        db_config=DatabaseConfig(),
+        dest=archive,
+        include_config=False,
+        include_workspaces=False,
+        include_skill_packages=False,
+        include_plugins=False,
+        include_knowledge=False,
+        include_chats=False,
+    )
+    pool.close()
+    assert peek_backup_contents(archive) == BackupContentFlags(
+        includes_config=False,
+        includes_workspaces=False,
+        includes_skill_packages=False,
+        includes_plugins=False,
+        includes_knowledge=False,
+        includes_chats=False,
+    )
+    write_backup_file(layout, "octop-backup-peek.tar.gz", archive.read_bytes())
+    item = list_backup_files(layout)[0]
+    assert item.includes_config is False
+    assert item.includes_workspaces is False
+    assert item.includes_skill_packages is False
+    assert item.includes_plugins is False
+    assert item.includes_knowledge is False
+    assert item.includes_chats is False
diff --git a/tests/unit/backup/test_system_archive.py b/tests/unit/backup/test_system_archive.py
index 400fc501..89d5bff2 100644
--- a/tests/unit/backup/test_system_archive.py
+++ b/tests/unit/backup/test_system_archive.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import json
+import sqlite3
 import tarfile
 from io import BytesIO
 from pathlib import Path
@@ -42,6 +43,22 @@ def test_manifest_roundtrip_includes_driver_fields() -> None:
     assert loaded.db_file == "db/octop.dump"
 
 
+def test_legacy_manifest_defaults_plugins_omitted() -> None:
+    loaded = BackupManifest.from_dict(
+        {
+            "manifest_version": 1,
+            "octop_version": "0.0.0",
+            "schema_version": 1,
+            "created_at": "t",
+            "home": "/tmp",
+        }
+    )
+    assert loaded.includes_skill_packages is True
+    assert loaded.includes_plugins is False
+    assert loaded.includes_knowledge is False
+    assert loaded.includes_chats is True
+
+
 def test_roundtrip_backup(layout: PathLayout, tmp_path: Path) -> None:
     db_path = layout.db
     pool = SqlitePool(db_path)
@@ -57,6 +74,12 @@ def test_roundtrip_backup(layout: PathLayout, tmp_path: Path) -> None:
     pkg_skill = layout.skill_packages_dir / "pkg01" / "skills" / "writer" / "SKILL.md"
     pkg_skill.parent.mkdir(parents=True, exist_ok=True)
     pkg_skill.write_text("---\nname: writer\ndescription: x\n---\n", encoding="utf-8")
+    plugin_yaml = layout.plugins_dir / "weather" / "plugin.yaml"
+    plugin_yaml.parent.mkdir(parents=True, exist_ok=True)
+    plugin_yaml.write_text("id: weather\n", encoding="utf-8")
+    kb_doc = layout.knowledge_dir / "kb01" / "docs" / "doc1.md"
+    kb_doc.parent.mkdir(parents=True, exist_ok=True)
+    kb_doc.write_text("# note", encoding="utf-8")
     layout.config.write_text('{"port": 8088}', encoding="utf-8")
 
     class Row:
@@ -90,6 +113,8 @@ class Row:
 
     assert result["agents"] == 1
     assert result["skill_package_files"] == 1
+    assert result["plugin_files"] == 1
+    assert result["knowledge_files"] == 1
     assert (restore_layout.agent_workspace("agent01") / "SOUL.md").read_text(
         encoding="utf-8"
     ) == "# soul"
@@ -98,6 +123,12 @@ class Row:
         .read_text(encoding="utf-8")
         .startswith("---")
     )
+    assert (restore_layout.plugins_dir / "weather" / "plugin.yaml").read_text(
+        encoding="utf-8"
+    ) == "id: weather\n"
+    assert (restore_layout.knowledge_dir / "kb01" / "docs" / "doc1.md").read_text(
+        encoding="utf-8"
+    ) == "# note"
     assert json.loads(restore_layout.config.read_text(encoding="utf-8"))["port"] == 8088
 
     with tarfile.open(archive, mode="r:gz") as tf:
@@ -166,6 +197,563 @@ class Row:
     assert "workspaces/agent01/.git/config" not in names
 
 
+def test_default_backup_omits_chats_and_restore_preserves_current_chats(
+    tmp_path: Path,
+) -> None:
+    source_layout = PathLayout(tmp_path / "source")
+    source_layout.root.mkdir()
+    source_pool = SqlitePool(source_layout.db)
+    run_migrations(source_pool)
+    with source_pool.connect() as conn:
+        conn.execute(
+            "INSERT INTO users(id, username, password_hash, role, created_at)"
+            " VALUES (1, 'alice', 'hash', 'admin', 1)"
+        )
+        conn.execute(
+            "INSERT INTO agents(agent_id, user_id, name, created_at, updated_at)"
+            " VALUES ('agent01', 1, 'Agent', 1, 1)"
+        )
+
+    source_ws = source_layout.ensure_agent_workspace("agent01")
+    (source_ws / "SOUL.md").write_text("# source", encoding="utf-8")
+    source_sessions = source_ws / ".octop" / "sessions"
+    source_sessions.mkdir(parents=True)
+    (source_sessions / "large.jsonl").write_text("chat", encoding="utf-8")
+    (source_ws / ".octop" / "checkpoints.sqlite").write_bytes(b"chat-db")
+    user_sessions = source_ws / "project" / "sessions"
+    user_sessions.mkdir(parents=True)
+    (user_sessions / "notes.txt").write_text("keep", encoding="utf-8")
+
+    class Row:
+        agent_id = "agent01"
+        name = "Agent"
+        config_json = '{"system_files_path": ".octop"}'
+
+    archive = tmp_path / "without-chats.tar.gz"
+    create_system_backup(
+        paths=source_layout,
+        agent_rows=[Row()],
+        pool=source_pool,
+        db_config=DatabaseConfig(),
+        dest=archive,
+    )
+    source_pool.close()
+
+    with tarfile.open(archive, mode="r:gz") as tf:
+        names = set(tf.getnames())
+        manifest = json.loads(tf.extractfile("manifest.json").read().decode("utf-8"))
+    assert manifest["includes_chats"] is False
+    assert "workspaces/agent01/SOUL.md" in names
+    assert "workspaces/agent01/project/sessions/notes.txt" in names
+    assert "workspaces/agent01/.octop/sessions/large.jsonl" not in names
+    assert "workspaces/agent01/.octop/checkpoints.sqlite" not in names
+
+    target_layout = PathLayout(tmp_path / "target")
+    target_layout.root.mkdir()
+    target_pool = SqlitePool(target_layout.db)
+    run_migrations(target_pool)
+    with target_pool.connect() as conn:
+        conn.execute(
+            "INSERT INTO users(id, username, password_hash, role, created_at)"
+            " VALUES (1, 'alice', 'old-hash', 'admin', 1)"
+        )
+        conn.execute(
+            "INSERT INTO agents(agent_id, user_id, name, created_at, updated_at)"
+            " VALUES ('agent01', 1, 'Old Agent', 1, 1)"
+        )
+        conn.execute(
+            "INSERT INTO sessions(session_key, agent_id, user_id, channel_type, chat_type,"
+            " thread_id, updated_at) VALUES ('session-1', 'agent01', 1, 'dashboard',"
+            " 'dm', 'thread-1', 1)"
+        )
+        conn.execute(
+            "INSERT INTO threads(thread_id, agent_id, user_id, channel_type, session_key,"
+            " last_active, created_at) VALUES ('thread-1', 'agent01', 1, 'dashboard',"
+            " 'session-1', 1, 1)"
+        )
+        conn.execute(
+            "INSERT INTO thread_messages(thread_id, seq, role, message_json, created_at)"
+            " VALUES ('thread-1', 1, 'user', '{\"content\":\"keep\"}', 1)"
+        )
+        conn.execute(
+            "INSERT INTO trajectory_events("
+            "event_id, agent_id, thread_id, seq, ts, kind, summary, payload_json"
+            ") VALUES ('event-1', 'agent01', 'thread-1', 1, 1, 'user', 'keep', '{}')"
+        )
+
+    target_sessions = target_layout.ensure_agent_workspace("agent01") / ".octop" / "sessions"
+    target_sessions.mkdir(parents=True)
+    current_log = target_sessions / "current.jsonl"
+    current_log.write_text("keep", encoding="utf-8")
+
+    result = restore_system_backup(
+        archive,
+        paths=target_layout,
+        pool=target_pool,
+        db_config=DatabaseConfig(),
+        restore_config=False,
+    )
+    assert result["chats_restored"] is False
+    assert result["preserved_chat_rows"] >= 3
+    with target_pool.connect() as conn:
+        message = conn.execute(
+            "SELECT message_json FROM thread_messages WHERE thread_id = 'thread-1'"
+        ).fetchone()
+        trajectory = conn.execute(
+            "SELECT summary FROM trajectory_events WHERE thread_id = 'thread-1'"
+        ).fetchone()
+    target_pool.close()
+    assert message is not None
+    assert json.loads(message[0])["content"] == "keep"
+    assert trajectory is not None
+    assert trajectory[0] == "keep"
+    assert current_log.read_text(encoding="utf-8") == "keep"
+
+
+def test_restore_without_chats_remaps_user_ids_by_username(tmp_path: Path) -> None:
+    source_layout = PathLayout(tmp_path / "source")
+    source_layout.root.mkdir()
+    source_pool = SqlitePool(source_layout.db)
+    run_migrations(source_pool)
+    with source_pool.connect() as conn:
+        conn.execute(
+            "INSERT INTO users(id, username, password_hash, role, created_at)"
+            " VALUES (1, 'alice', 'hash', 'admin', 1)"
+        )
+        conn.execute(
+            "INSERT INTO agents(agent_id, user_id, name, created_at, updated_at)"
+            " VALUES ('agent01', 1, 'Agent', 1, 1)"
+        )
+
+    class Row:
+        agent_id = "agent01"
+        name = "Agent"
+
+    archive = tmp_path / "remap.tar.gz"
+    create_system_backup(
+        paths=source_layout,
+        agent_rows=[Row()],
+        pool=source_pool,
+        db_config=DatabaseConfig(),
+        dest=archive,
+    )
+    source_pool.close()
+
+    target_layout = PathLayout(tmp_path / "target")
+    target_layout.root.mkdir()
+    target_pool = SqlitePool(target_layout.db)
+    run_migrations(target_pool)
+    with target_pool.connect() as conn:
+        conn.execute(
+            "INSERT INTO users(id, username, password_hash, role, created_at)"
+            " VALUES (2, 'alice', 'live-hash', 'admin', 1)"
+        )
+        conn.execute(
+            "INSERT INTO agents(agent_id, user_id, name, created_at, updated_at)"
+            " VALUES ('agent01', 2, 'Live Agent', 1, 1)"
+        )
+        conn.execute(
+            "INSERT INTO sessions(session_key, agent_id, user_id, channel_type, chat_type,"
+            " thread_id, updated_at, channel_subject_id) VALUES ("
+            " 'agent01:dashboard:2:dm', 'agent01', 2, 'dashboard', 'dm', 'thread-1', 1, '2')"
+        )
+        conn.execute(
+            "INSERT INTO threads(thread_id, agent_id, user_id, channel_type, session_key,"
+            " last_active, created_at) VALUES ('thread-1', 'agent01', 2, 'dashboard',"
+            " 'agent01:dashboard:2:dm', 1, 1)"
+        )
+
+    result = restore_system_backup(
+        archive,
+        paths=target_layout,
+        pool=target_pool,
+        db_config=DatabaseConfig(),
+        restore_config=False,
+    )
+    assert result["skipped_chat_rows"] == 0
+    with target_pool.connect() as conn:
+        session = conn.execute(
+            "SELECT user_id, session_key, channel_subject_id FROM sessions"
+        ).fetchone()
+        conn.execute(
+            "INSERT INTO threads(thread_id, agent_id, user_id, channel_type, session_key,"
+            " last_active, created_at) VALUES ('thread-new', 'agent01', 1, 'dashboard',"
+            " 'x', 1, 1)"
+        )
+        new_pk = conn.execute("SELECT id FROM threads WHERE thread_id = 'thread-new'").fetchone()
+        preserved_pk = conn.execute(
+            "SELECT id FROM threads WHERE thread_id = 'thread-1'"
+        ).fetchone()
+    target_pool.close()
+    assert session is not None
+    assert session[0] == 1
+    assert session[1] == "agent01:dashboard:1:dm"
+    assert session[2] == "1"
+    assert preserved_pk is not None
+    assert new_pk is not None
+    assert int(new_pk[0]) > int(preserved_pk[0])
+
+
+def test_restore_skips_chat_workspace_files_when_manifest_omits_chats(
+    tmp_path: Path,
+) -> None:
+    layout = PathLayout(tmp_path / "src")
+    layout.root.mkdir()
+    pool = SqlitePool(layout.db)
+    run_migrations(pool)
+    with pool.connect() as conn:
+        conn.execute(
+            "INSERT INTO users(username, password_hash, role, created_at) VALUES (?, ?, ?, ?)",
+            ("alice", "hash", "admin", 1),
+        )
+
+    class Row:
+        agent_id = "agent01"
+        name = "Agent"
+        config_json = '{"system_files_path": ".octop"}'
+
+    archive = tmp_path / "inject-chats.tar.gz"
+    create_system_backup(
+        paths=layout,
+        agent_rows=[Row()],
+        pool=pool,
+        db_config=DatabaseConfig(),
+        dest=archive,
+        include_workspaces=True,
+        include_chats=False,
+    )
+    pool.close()
+
+    members: dict[str, bytes] = {}
+    with tarfile.open(archive, mode="r:gz") as tf:
+        for m in tf.getmembers():
+            if m.isfile():
+                f = tf.extractfile(m)
+                assert f is not None
+                members[m.name] = f.read()
+    members["workspaces/agent01/.octop/sessions/injected.jsonl"] = b"overwrite-me"
+    with tarfile.open(archive, mode="w:gz") as tf:
+        for name, blob in members.items():
+            info = tarfile.TarInfo(name=name)
+            info.size = len(blob)
+            tf.addfile(info, BytesIO(blob))
+
+    target = PathLayout(tmp_path / "tgt")
+    target.root.mkdir()
+    target_pool = SqlitePool(target.db)
+    run_migrations(target_pool)
+    keep = target.ensure_agent_workspace("agent01") / ".octop" / "sessions" / "current.jsonl"
+    keep.parent.mkdir(parents=True)
+    keep.write_text("keep", encoding="utf-8")
+    restore_system_backup(
+        archive,
+        paths=target,
+        pool=target_pool,
+        db_config=DatabaseConfig(),
+        restore_config=False,
+    )
+    target_pool.close()
+    assert keep.read_text(encoding="utf-8") == "keep"
+    assert not (
+        target.ensure_agent_workspace("agent01") / ".octop" / "sessions" / "injected.jsonl"
+    ).exists()
+
+
+def test_sqlite_strip_chats_reclaims_pages(tmp_path: Path) -> None:
+    from octop.infra.backup.chats import strip_chat_tables_from_sqlite_file
+    from octop.infra.backup.snapshot import snapshot_sqlite_file
+
+    layout = PathLayout(tmp_path / "home")
+    layout.root.mkdir()
+    pool = SqlitePool(layout.db)
+    run_migrations(pool)
+    with pool.connect() as conn:
+        conn.execute(
+            "INSERT INTO users(id, username, password_hash, role, created_at)"
+            " VALUES (1, 'alice', 'hash', 'admin', 1)"
+        )
+        conn.execute(
+            "INSERT INTO agents(agent_id, user_id, name, created_at, updated_at)"
+            " VALUES ('agent01', 1, 'Agent', 1, 1)"
+        )
+        conn.execute(
+            "INSERT INTO threads(thread_id, agent_id, user_id, channel_type, session_key,"
+            " last_active, created_at) VALUES ('t1', 'agent01', 1, 'dashboard', 's', 1, 1)"
+        )
+        payload = "x" * 2048
+        for seq in range(400):
+            conn.execute(
+                "INSERT INTO thread_messages(thread_id, seq, role, message_json, created_at)"
+                " VALUES ('t1', ?, 'user', ?, 1)",
+                (seq, json.dumps({"content": payload})),
+            )
+        conn.execute(
+            "INSERT INTO trajectory_events("
+            "event_id, agent_id, thread_id, seq, ts, kind, summary, payload_json"
+            ") VALUES ('event-large', 'agent01', 't1', 1, 1, 'assistant', 'large', ?)",
+            (json.dumps({"content": payload}),),
+        )
+    snap = tmp_path / "snap.db"
+    snapshot_sqlite_file(pool.path, snap)
+    pool.close()
+    before = snap.stat().st_size
+    strip_chat_tables_from_sqlite_file(snap)
+    after = snap.stat().st_size
+    assert after < before
+    conn = sqlite3.connect(snap)
+    count = conn.execute("SELECT COUNT(*) FROM thread_messages").fetchone()[0]
+    trajectory_count = conn.execute("SELECT COUNT(*) FROM trajectory_events").fetchone()[0]
+    conn.close()
+    assert count == 0
+    assert trajectory_count == 0
+
+
+def test_backup_can_omit_config_and_workspaces(layout: PathLayout, tmp_path: Path) -> None:
+    pool = SqlitePool(layout.db)
+    run_migrations(pool)
+    layout.config.write_text('{"port": 8088}', encoding="utf-8")
+    workspace = layout.ensure_agent_workspace("agent01")
+    (workspace / "SOUL.md").write_text("# soul", encoding="utf-8")
+
+    class Row:
+        agent_id = "agent01"
+        name = "Agent"
+
+    archive = tmp_path / "database-only.tar.gz"
+    create_system_backup(
+        paths=layout,
+        agent_rows=[Row()],
+        pool=pool,
+        db_config=DatabaseConfig(),
+        dest=archive,
+        include_config=False,
+        include_workspaces=False,
+        include_skill_packages=False,
+        include_plugins=False,
+        include_knowledge=False,
+    )
+    pool.close()
+
+    with tarfile.open(archive, mode="r:gz") as tf:
+        names = set(tf.getnames())
+        manifest = json.loads(tf.extractfile("manifest.json").read().decode("utf-8"))
+    assert manifest["includes_config"] is False
+    assert manifest["includes_skill_packages"] is False
+    assert manifest["includes_plugins"] is False
+    assert manifest["includes_knowledge"] is False
+    assert manifest["agents"][0]["workspace_included"] is False
+    assert "config/config.json" not in names
+    assert "workspaces/agent01/SOUL.md" not in names
+
+
+def test_backup_can_include_skill_packages_and_plugins_without_workspaces(
+    layout: PathLayout, tmp_path: Path
+) -> None:
+    pool = SqlitePool(layout.db)
+    run_migrations(pool)
+    workspace = layout.ensure_agent_workspace("agent01")
+    (workspace / "SOUL.md").write_text("# soul", encoding="utf-8")
+    pkg = layout.skill_packages_dir / "pkg01" / "skills" / "a" / "SKILL.md"
+    pkg.parent.mkdir(parents=True, exist_ok=True)
+    pkg.write_text("---\nname: a\ndescription: x\n---\n", encoding="utf-8")
+    plugin = layout.plugins_dir / "weather" / "plugin.yaml"
+    plugin.parent.mkdir(parents=True, exist_ok=True)
+    plugin.write_text("id: weather\n", encoding="utf-8")
+    kb_doc = layout.knowledge_dir / "kb01" / "docs" / "doc1.md"
+    kb_doc.parent.mkdir(parents=True, exist_ok=True)
+    kb_doc.write_text("# note", encoding="utf-8")
+
+    class Row:
+        agent_id = "agent01"
+        name = "Agent"
+
+    archive = tmp_path / "dirs-only.tar.gz"
+    create_system_backup(
+        paths=layout,
+        agent_rows=[Row()],
+        pool=pool,
+        db_config=DatabaseConfig(),
+        dest=archive,
+        include_config=False,
+        include_workspaces=False,
+        include_skill_packages=True,
+        include_plugins=True,
+        include_knowledge=True,
+    )
+    pool.close()
+
+    with tarfile.open(archive, mode="r:gz") as tf:
+        names = set(tf.getnames())
+        manifest = json.loads(tf.extractfile("manifest.json").read().decode("utf-8"))
+    assert manifest["includes_skill_packages"] is True
+    assert manifest["includes_plugins"] is True
+    assert manifest["includes_knowledge"] is True
+    assert manifest["agents"][0]["workspace_included"] is False
+    assert "workspaces/agent01/SOUL.md" not in names
+    assert "skill-packages/pkg01/skills/a/SKILL.md" in names
+    assert "plugins/weather/plugin.yaml" in names
+    assert "knowledge/kb01/docs/doc1.md" in names
+
+
+def test_restore_without_skill_packages_keeps_live_files(
+    layout: PathLayout, tmp_path: Path
+) -> None:
+    pool = SqlitePool(layout.db)
+    run_migrations(pool)
+    with pool.connect() as conn:
+        conn.execute(
+            "INSERT INTO users(username, password_hash, role, created_at) VALUES (?, ?, ?, ?)",
+            ("alice", "hash", "admin", 1),
+        )
+
+    class Row:
+        agent_id = "agent01"
+        name = "Test"
+
+    archive = tmp_path / "no-packages.tar.gz"
+    create_system_backup(
+        paths=layout,
+        agent_rows=[Row()],
+        pool=pool,
+        db_config=DatabaseConfig(),
+        dest=archive,
+        include_skill_packages=False,
+        include_plugins=False,
+        include_knowledge=False,
+    )
+    pool.close()
+
+    restore_layout = PathLayout(layout.root.parent / "restored-keep-dirs")
+    restore_pool = SqlitePool(restore_layout.db)
+    run_migrations(restore_pool)
+    kept_pkg = restore_layout.skill_packages_dir / "kept" / "skills" / "a" / "SKILL.md"
+    kept_pkg.parent.mkdir(parents=True, exist_ok=True)
+    kept_pkg.write_text("keep-pkg", encoding="utf-8")
+    kept_plugin = restore_layout.plugins_dir / "local" / "plugin.yaml"
+    kept_plugin.parent.mkdir(parents=True, exist_ok=True)
+    kept_plugin.write_text("id: local\n", encoding="utf-8")
+    kept_kb = restore_layout.knowledge_dir / "kb01" / "docs" / "keep.md"
+    kept_kb.parent.mkdir(parents=True, exist_ok=True)
+    kept_kb.write_text("keep-kb", encoding="utf-8")
+
+    restore_system_backup(
+        archive,
+        paths=restore_layout,
+        pool=restore_pool,
+        db_config=DatabaseConfig(),
+        restore_config=False,
+    )
+    restore_pool.close()
+
+    assert kept_pkg.read_text(encoding="utf-8") == "keep-pkg"
+    assert kept_plugin.read_text(encoding="utf-8") == "id: local\n"
+    assert kept_kb.read_text(encoding="utf-8") == "keep-kb"
+
+
+def test_restore_replaces_stale_plugin_files(layout: PathLayout, tmp_path: Path) -> None:
+    pool = SqlitePool(layout.db)
+    run_migrations(pool)
+    with pool.connect() as conn:
+        conn.execute(
+            "INSERT INTO users(username, password_hash, role, created_at) VALUES (?, ?, ?, ?)",
+            ("alice", "hash", "admin", 1),
+        )
+
+    kept = layout.plugins_dir / "weather" / "plugin.yaml"
+    kept.parent.mkdir(parents=True, exist_ok=True)
+    kept.write_text("id: weather\n", encoding="utf-8")
+
+    class Row:
+        agent_id = "agent01"
+        name = "Test"
+
+    archive = tmp_path / "plugins.tar.gz"
+    create_system_backup(
+        paths=layout,
+        agent_rows=[Row()],
+        pool=pool,
+        db_config=DatabaseConfig(),
+        dest=archive,
+        include_workspaces=False,
+        include_skill_packages=False,
+        include_plugins=True,
+        include_knowledge=False,
+    )
+    pool.close()
+
+    restore_layout = PathLayout(layout.root.parent / "restored-plugins")
+    restore_pool = SqlitePool(restore_layout.db)
+    run_migrations(restore_pool)
+    stale = restore_layout.plugins_dir / "stale" / "plugin.yaml"
+    stale.parent.mkdir(parents=True, exist_ok=True)
+    stale.write_text("id: stale\n", encoding="utf-8")
+
+    restore_system_backup(
+        archive,
+        paths=restore_layout,
+        pool=restore_pool,
+        db_config=DatabaseConfig(),
+        restore_config=False,
+    )
+    restore_pool.close()
+
+    assert (restore_layout.plugins_dir / "weather" / "plugin.yaml").is_file()
+    assert not (restore_layout.plugins_dir / "stale").exists()
+
+
+def test_restore_replaces_stale_knowledge_files(layout: PathLayout, tmp_path: Path) -> None:
+    pool = SqlitePool(layout.db)
+    run_migrations(pool)
+    with pool.connect() as conn:
+        conn.execute(
+            "INSERT INTO users(username, password_hash, role, created_at) VALUES (?, ?, ?, ?)",
+            ("alice", "hash", "admin", 1),
+        )
+
+    kept = layout.knowledge_dir / "kb01" / "docs" / "a.md"
+    kept.parent.mkdir(parents=True, exist_ok=True)
+    kept.write_text("# keep", encoding="utf-8")
+
+    class Row:
+        agent_id = "agent01"
+        name = "Test"
+
+    archive = tmp_path / "knowledge.tar.gz"
+    create_system_backup(
+        paths=layout,
+        agent_rows=[Row()],
+        pool=pool,
+        db_config=DatabaseConfig(),
+        dest=archive,
+        include_workspaces=False,
+        include_skill_packages=False,
+        include_plugins=False,
+        include_knowledge=True,
+    )
+    pool.close()
+
+    restore_layout = PathLayout(layout.root.parent / "restored-knowledge")
+    restore_pool = SqlitePool(restore_layout.db)
+    run_migrations(restore_pool)
+    stale = restore_layout.knowledge_dir / "stale" / "docs" / "old.md"
+    stale.parent.mkdir(parents=True, exist_ok=True)
+    stale.write_text("# stale", encoding="utf-8")
+
+    restore_system_backup(
+        archive,
+        paths=restore_layout,
+        pool=restore_pool,
+        db_config=DatabaseConfig(),
+        restore_config=False,
+    )
+    restore_pool.close()
+
+    assert (restore_layout.knowledge_dir / "kb01" / "docs" / "a.md").read_text(
+        encoding="utf-8"
+    ) == "# keep"
+    assert not (restore_layout.knowledge_dir / "stale").exists()
+
+
 def test_restore_replaces_stale_skill_package_files(layout: PathLayout, tmp_path: Path) -> None:
     pool = SqlitePool(layout.db)
     run_migrations(pool)
@@ -282,6 +870,7 @@ class Row:
         pool=pool,
         db_config=DatabaseConfig(),
         dest=dest,
+        include_chats=True,
     )
     # Rewrite octop_version to signal a LightClaw migration backup.
     members: dict[str, bytes] = {}
@@ -499,6 +1088,122 @@ def test_migration_restore_via_none_autodetect(tmp_path: Path) -> None:
     tgt_pool.close()
 
 
+def test_restore_repairs_old_physical_schema_with_current_watermark(tmp_path: Path) -> None:
+    """Restore runs idempotent repairs when a folded migration number is unchanged."""
+    source_layout = PathLayout(tmp_path / "source")
+    source_pool = SqlitePool(source_layout.db)
+    with source_pool.connect() as conn:
+        conn.executescript(
+            (
+                Path(__file__).resolve().parents[3]
+                / "src/octop/infra/db/migrations/001_initial.sql"
+            ).read_text()
+        )
+        conn.execute("UPDATE _schema_version SET version = 13")
+        conn.execute(
+            "INSERT INTO users(username, password_hash, role, created_at) "
+            "VALUES ('owner', 'hash', 'admin', 1)"
+        )
+        user_id = conn.execute("SELECT id FROM users WHERE username = 'owner'").fetchone()[0]
+        conn.execute(
+            "INSERT INTO connectors("
+            "instance_id, user_id, kind, display_name, mcp_server_name, created_at, updated_at"
+            ") VALUES ('instance-1', ?, 'github', 'GitHub', 'connector_github_1', 1, 1)",
+            (user_id,),
+        )
+
+    archive = tmp_path / "old-physical-schema.tar.gz"
+    create_system_backup(
+        paths=source_layout,
+        agent_rows=[],
+        pool=source_pool,
+        db_config=DatabaseConfig(),
+        dest=archive,
+        include_config=False,
+        include_workspaces=False,
+    )
+    source_pool.close()
+
+    target_layout = PathLayout(tmp_path / "target")
+    target_pool = SqlitePool(target_layout.db)
+    run_migrations(target_pool)
+    result = restore_system_backup(
+        archive,
+        paths=target_layout,
+        pool=target_pool,
+        db_config=DatabaseConfig(),
+        restore_config=False,
+    )
+
+    with target_pool.connect() as conn:
+        columns = {row["name"] for row in conn.execute("PRAGMA table_info(connectors)").fetchall()}
+        connector = conn.execute(
+            "SELECT instance_id, shared FROM connectors WHERE instance_id = 'instance-1'"
+        ).fetchone()
+
+    assert result["schema_version"] == 13
+    assert "shared" in columns
+    assert connector is not None
+    assert connector["shared"] == 0
+    target_pool.close()
+
+
+def test_refuse_newer_schema_backup_before_database_replace(
+    layout: PathLayout, tmp_path: Path
+) -> None:
+    pool = SqlitePool(layout.db)
+    run_migrations(pool)
+    archive = tmp_path / "newer-schema.tar.gz"
+    create_system_backup(
+        paths=layout,
+        agent_rows=[],
+        pool=pool,
+        db_config=DatabaseConfig(),
+        dest=archive,
+    )
+
+    members: dict[str, bytes] = {}
+    with tarfile.open(archive, mode="r:gz") as tf:
+        for member in tf.getmembers():
+            if member.isfile():
+                extracted = tf.extractfile(member)
+                assert extracted is not None
+                members[member.name] = extracted.read()
+    manifest = json.loads(members["manifest.json"])
+    manifest["schema_version"] = 999
+    members["manifest.json"] = json.dumps(manifest).encode()
+    with tarfile.open(archive, mode="w:gz") as tf:
+        for name, blob in members.items():
+            info = tarfile.TarInfo(name=name)
+            info.size = len(blob)
+            tf.addfile(info, BytesIO(blob))
+
+    with pool.connect() as conn:
+        conn.execute(
+            "INSERT INTO users(username, password_hash, role, created_at) "
+            "VALUES ('still-here', 'hash', 'admin', 1)"
+        )
+
+    with pytest.raises(OctopError) as excinfo:
+        restore_system_backup(
+            archive,
+            paths=layout,
+            pool=pool,
+            db_config=DatabaseConfig(),
+        )
+
+    assert excinfo.value.code == ErrorCode.BACKUP_SCHEMA_INCOMPATIBLE
+    assert excinfo.value.details == {
+        "archive_schema_version": 999,
+        "runtime_schema_version": 13,
+    }
+    with pool.connect() as conn:
+        assert (
+            conn.execute("SELECT 1 FROM users WHERE username = 'still-here'").fetchone() is not None
+        )
+    pool.close()
+
+
 def test_refuse_cross_engine_restore(layout: PathLayout, tmp_path: Path) -> None:
     pool = SqlitePool(layout.db)
     run_migrations(pool)
diff --git a/tests/unit/connectors/test_custom_mcp.py b/tests/unit/connectors/test_custom_mcp.py
index 531db4cf..855744f9 100644
--- a/tests/unit/connectors/test_custom_mcp.py
+++ b/tests/unit/connectors/test_custom_mcp.py
@@ -53,6 +53,17 @@ def _ensure_user(db: SqlitePool) -> int:
     return int(row["id"])
 
 
+def _ensure_second_user(db: SqlitePool) -> int:
+    with db.transaction() as conn:
+        conn.execute(
+            "INSERT INTO users(username, password_hash, role, created_at) "
+            "VALUES ('u2', 'x', 'user', 1)"
+        )
+        row = conn.execute("SELECT id FROM users WHERE username = 'u2'").fetchone()
+    assert row is not None
+    return int(row["id"])
+
+
 def test_normalize_streamable_http_and_stdio():
     http = normalize_server_spec(
         "deepwiki",
@@ -82,6 +93,37 @@ def test_normalize_streamable_http_and_stdio():
     assert stdio["enabled"] is False
 
 
+def test_shared_custom_server_uses_collision_safe_name_for_viewer(
+    svc: ConnectorService,
+    db: SqlitePool,
+) -> None:
+    owner_id = _ensure_user(db)
+    viewer_id = _ensure_second_user(db)
+    svc.put_custom_servers(
+        owner_id,
+        {
+            "linear": {
+                "transport": "streamable_http",
+                "url": "https://mcp.linear.app/mcp",
+                "shared": True,
+            },
+            "private": {
+                "transport": "streamable_http",
+                "url": "https://private.example.com/mcp",
+            },
+        },
+    )
+
+    visible = svc.list_instances_for_api(viewer_id)
+    assert [row["display_name"] for row in visible] == ["linear"]
+    shared_name = str(visible[0]["mcp_server_name"])
+    assert shared_name.startswith("custom__")
+    assert shared_name.endswith("__linear")
+    assert svc.list_active_mcp_server_names(viewer_id) == [shared_name]
+    assert list(svc.custom_harness_configs(viewer_id)) == [shared_name]
+    assert svc.list_default_open_mcp_server_names(viewer_id) == []
+
+
 def test_rejects_http_scheme_and_private_host():
     with pytest.raises(ValueError, match="https"):
         normalize_server_spec(
diff --git a/tests/unit/connectors/test_default_open.py b/tests/unit/connectors/test_default_open.py
index 4fe8b8e9..ac30f731 100644
--- a/tests/unit/connectors/test_default_open.py
+++ b/tests/unit/connectors/test_default_open.py
@@ -44,6 +44,14 @@ def test_build_instance_config_json_includes_when_true():
     assert '"email": "a@qq.com"' in raw_mail
 
 
+def test_build_instance_config_json_includes_description():
+    raw = build_instance_config_json(
+        kind="tencent-docs",
+        description="团队文档连接",
+    )
+    assert raw == '{"description": "团队文档连接"}'
+
+
 def test_merge_mcp_servers_with_defaults_unions_and_dedupes():
     # Default: apply defaults only when explicit is None (IM-style).
     assert merge_mcp_servers_with_defaults(None, ["a", "b"]) == ["a", "b"]
diff --git a/tests/unit/cron/test_cron_composer_context.py b/tests/unit/cron/test_cron_composer_context.py
index 0cff0cce..cae4113d 100644
--- a/tests/unit/cron/test_cron_composer_context.py
+++ b/tests/unit/cron/test_cron_composer_context.py
@@ -7,10 +7,12 @@
 import pytest
 from langchain_core.messages import HumanMessage
 
+from octop.infra.cron.delivery import CronDeliveryCommand, CronDeliveryService
 from octop.infra.gateway.process.message_keys import (
     COMPOSER_CTX_KEY,
     build_composer_context,
 )
+from octop.infra.gateway.threads import ThreadRegistry
 
 
 def test_cron_composer_context_includes_connectors_and_model() -> None:
@@ -27,23 +29,44 @@ def test_cron_composer_context_includes_connectors_and_model() -> None:
     }
 
 
-@pytest.mark.asyncio
-async def test_push_text_from_session_stamps_composer_on_human_message() -> None:
-    """Agent cron path must put COMPOSER_CTX_KEY on HumanMessage additional_kwargs."""
-    from octop.infra.gateway.gateway import Gateway
-
+def _dashboard_session() -> MagicMock:
     session = MagicMock()
-    session.channel_type = "dashboard"
+    session.channel_type = ThreadRegistry.CHANNEL_DASHBOARD
     session.thread_id = "thr1"
     session.user_id = 1
+    session.agent_id = "a1"
+    session.session_key = "a1:dashboard:1:dm"
     session.channel_id = None
-    session.to_channel_subject = MagicMock(return_value=MagicMock())
+    return session
+
+
+async def _run_locked(_agent_id: str, _session_key: str, operation) -> None:
+    await operation()
+
+
+def _command(**overrides: object) -> CronDeliveryCommand:
+    values: dict[str, object] = {
+        "cron_id": "j1",
+        "cron_name": "nightly",
+        "agent_id": "a1",
+        "user_id": 1,
+        "session_key": "a1:dashboard:1:dm",
+        "prompt": "cron prompt",
+        "fresh_thread": False,
+        "task_type": "agent",
+        "model": None,
+        "mcp_servers": (),
+    }
+    values.update(overrides)
+    return CronDeliveryCommand(**values)  # type: ignore[arg-type]
 
+
+@pytest.mark.asyncio
+async def test_deliver_agent_stamps_composer_on_human_message() -> None:
+    session = _dashboard_session()
     agent_row = MagicMock()
     agent_row.default_model = "openai/gpt-4o"
 
-    chunks = [{"type": "token", "content": "ok"}]
-
     async def _stream(_aid: str, request: dict):
         msgs = request.get("messages") or []
         assert msgs, "expected messages on harness request"
@@ -53,8 +76,7 @@ async def _stream(_aid: str, request: dict):
             "connectors": ["github__1"],
             "model": "openai/gpt-4o-mini",
         }
-        for c in chunks:
-            yield c
+        yield {"type": "token", "content": "ok"}
 
     agent_manager = MagicMock()
     agent_manager.merge_turn_mcp_servers = MagicMock(
@@ -64,41 +86,27 @@ async def _stream(_aid: str, request: dict):
     agent_manager.stream = _stream
     agent_manager.get_row = MagicMock(return_value=agent_row)
 
-    gw = Gateway.__new__(Gateway)
-    gw._agent_manager = agent_manager
-    gw._thread_registry = MagicMock()
-    gw._thread_registry.get_session = MagicMock(return_value=session)
-    gw._require_session = MagicMock(return_value=session)
-    gw._bump_dashboard_session = MagicMock()
-    gw.push_text = AsyncMock()
-    gw._resolve_push_subject = MagicMock(return_value=MagicMock())
-
-    await Gateway.push_text_from_session(
-        gw,
-        "a1",
-        "a1:dashboard:1:dm",
-        "cron prompt",
-        task_type="agent",
-        model="openai/gpt-4o-mini",
-        mcp_servers=["github__1"],
+    gateway = MagicMock()
+    gateway.run_in_session = _run_locked
+    gateway.require_session = MagicMock(return_value=session)
+    gateway.push_session_text = AsyncMock()
+    gateway.notify_dashboard_push = AsyncMock()
+
+    service = CronDeliveryService(
+        gateway=gateway,
+        agent_manager=agent_manager,
+        repos=MagicMock(),
     )
+    await service.deliver(_command(model="openai/gpt-4o-mini", mcp_servers=("github__1",)))
 
     agent_manager.prepare_chat_mcp.assert_awaited()
-    gw.push_text.assert_awaited()
+    gateway.push_session_text.assert_awaited_once()
+    assert gateway.push_session_text.await_args.args[1] == "ok"
 
 
 @pytest.mark.asyncio
-async def test_push_text_from_session_merges_default_open_when_empty() -> None:
-    """Cron with no explicit mcp_servers still injects default_open connectors."""
-    from octop.infra.gateway.gateway import Gateway
-
-    session = MagicMock()
-    session.channel_type = "dashboard"
-    session.thread_id = "thr1"
-    session.user_id = 1
-    session.channel_id = None
-    session.to_channel_subject = MagicMock(return_value=MagicMock())
-
+async def test_deliver_agent_merges_default_open_when_empty() -> None:
+    session = _dashboard_session()
     agent_row = MagicMock()
     agent_row.default_model = "openai/gpt-4o"
 
@@ -117,41 +125,27 @@ async def _stream(_aid: str, request: dict):
     agent_manager.stream = _stream
     agent_manager.get_row = MagicMock(return_value=agent_row)
 
-    gw = Gateway.__new__(Gateway)
-    gw._agent_manager = agent_manager
-    gw._thread_registry = MagicMock()
-    gw._thread_registry.get_session = MagicMock(return_value=session)
-    gw._require_session = MagicMock(return_value=session)
-    gw._bump_dashboard_session = MagicMock()
-    gw.push_text = AsyncMock()
-    gw._resolve_push_subject = MagicMock(return_value=MagicMock())
-
-    await Gateway.push_text_from_session(
-        gw,
-        "a1",
-        "a1:dashboard:1:dm",
-        "cron prompt",
-        task_type="agent",
-        mcp_servers=[],
+    gateway = MagicMock()
+    gateway.run_in_session = _run_locked
+    gateway.require_session = MagicMock(return_value=session)
+    gateway.push_session_text = AsyncMock()
+    gateway.notify_dashboard_push = AsyncMock()
+
+    service = CronDeliveryService(
+        gateway=gateway,
+        agent_manager=agent_manager,
+        repos=MagicMock(),
     )
+    await service.deliver(_command(mcp_servers=()))
 
     agent_manager.merge_turn_mcp_servers.assert_called_once_with(1, None, apply_defaults=True)
     agent_manager.prepare_chat_mcp.assert_awaited()
-    gw.push_text.assert_awaited()
+    gateway.push_session_text.assert_awaited()
 
 
 @pytest.mark.asyncio
-async def test_push_text_from_session_explicit_mcp_overrides_defaults() -> None:
-    """Cron with explicit mcp_servers uses only the user's selection."""
-    from octop.infra.gateway.gateway import Gateway
-
-    session = MagicMock()
-    session.channel_type = "dashboard"
-    session.thread_id = "thr1"
-    session.user_id = 1
-    session.channel_id = None
-    session.to_channel_subject = MagicMock(return_value=MagicMock())
-
+async def test_deliver_agent_explicit_mcp_overrides_defaults() -> None:
+    session = _dashboard_session()
     agent_row = MagicMock()
     agent_row.default_model = None
 
@@ -165,25 +159,20 @@ async def _stream(_aid: str, request: dict):
     agent_manager.stream = _stream
     agent_manager.get_row = MagicMock(return_value=agent_row)
 
-    gw = Gateway.__new__(Gateway)
-    gw._agent_manager = agent_manager
-    gw._thread_registry = MagicMock()
-    gw._thread_registry.get_session = MagicMock(return_value=session)
-    gw._require_session = MagicMock(return_value=session)
-    gw._bump_dashboard_session = MagicMock()
-    gw.push_text = AsyncMock()
-    gw._resolve_push_subject = MagicMock(return_value=MagicMock())
-
-    await Gateway.push_text_from_session(
-        gw,
-        "a1",
-        "a1:dashboard:1:dm",
-        "cron prompt",
-        task_type="agent",
-        mcp_servers=["picked__1"],
+    gateway = MagicMock()
+    gateway.run_in_session = _run_locked
+    gateway.require_session = MagicMock(return_value=session)
+    gateway.push_session_text = AsyncMock()
+    gateway.notify_dashboard_push = AsyncMock()
+
+    service = CronDeliveryService(
+        gateway=gateway,
+        agent_manager=agent_manager,
+        repos=MagicMock(),
     )
+    await service.deliver(_command(mcp_servers=("picked__1",)))
 
     agent_manager.merge_turn_mcp_servers.assert_called_once_with(
         1, ["picked__1"], apply_defaults=False
     )
-    gw.push_text.assert_awaited()
+    gateway.push_session_text.assert_awaited()
diff --git a/tests/unit/cron/test_cron_delivery.py b/tests/unit/cron/test_cron_delivery.py
new file mode 100644
index 00000000..ba21af45
--- /dev/null
+++ b/tests/unit/cron/test_cron_delivery.py
@@ -0,0 +1,358 @@
+"""CronDeliveryService: canonical checkpoint, channel push, and best-effort extras."""
+
+from __future__ import annotations
+
+from pathlib import Path
+from unittest.mock import AsyncMock, MagicMock
+
+import pytest
+from langchain_core.messages import AIMessage, HumanMessage
+
+from octop.infra.cron.delivery import CronDeliveryCommand, CronDeliveryService
+from octop.infra.db.migrate import run_migrations
+from octop.infra.db.pool import SqlitePool
+from octop.infra.db.repos.agents import AgentRepo
+from octop.infra.db.repos.sessions import SessionRepo
+from octop.infra.db.repos.thread_messages import ThreadMessageRepo
+from octop.infra.db.repos.threads import ThreadRepo
+from octop.infra.db.repos.users import UserRepo
+from octop.infra.gateway.threads import ThreadRegistry
+
+
+def _command(**overrides: object) -> CronDeliveryCommand:
+    values: dict[str, object] = {
+        "cron_id": "j1",
+        "cron_name": "喝水提醒",
+        "agent_id": "a1",
+        "user_id": 1,
+        "session_key": "sk",
+        "prompt": "记得喝水",
+        "fresh_thread": False,
+        "task_type": "text",
+        "model": None,
+        "mcp_servers": (),
+    }
+    values.update(overrides)
+    return CronDeliveryCommand(**values)  # type: ignore[arg-type]
+
+
+async def _run_locked(_agent_id: str, _session_key: str, operation) -> None:
+    await operation()
+
+
+def _session(*, channel_type: str, thread_id: str = "thr1") -> MagicMock:
+    session = MagicMock()
+    session.channel_type = channel_type
+    session.thread_id = thread_id
+    session.user_id = 1
+    session.agent_id = "a1"
+    session.session_key = "sk"
+    session.channel_id = "ch-1"
+    return session
+
+
+@pytest.mark.asyncio
+async def test_text_dashboard_appends_checkpoint_before_push() -> None:
+    session = _session(channel_type=ThreadRegistry.CHANNEL_DASHBOARD)
+    human = HumanMessage(content="Task j1: 喝水提醒 executed.", id="cron:x:human")
+    ai = AIMessage(content="记得喝水", id="cron:x:assistant")
+    harness = MagicMock()
+    agent_manager = MagicMock()
+    agent_manager.get_agent.return_value = harness
+
+    order: list[str] = []
+
+    async def append(_thread_id: str, _messages):
+        order.append("checkpoint")
+        return [human, ai]
+
+    harness.aappend_messages = append
+
+    async def push(*_args, **_kwargs):
+        order.append("push")
+
+    async def notify(*_args, **_kwargs):
+        order.append("toast")
+
+    gateway = MagicMock()
+    gateway.run_in_session = _run_locked
+    gateway.require_session = MagicMock(return_value=session)
+    gateway.push_session_text = push
+    gateway.notify_dashboard_push = notify
+
+    repos = MagicMock()
+    repos.user_repo.get.return_value = MagicMock(locale="en")
+    repos.thread_message_repo.append_if_ready.side_effect = lambda *_a, **_k: (
+        order.append("project") or 2
+    )
+
+    service = CronDeliveryService(gateway=gateway, agent_manager=agent_manager, repos=repos)
+    await service.deliver(_command())
+
+    assert order == ["checkpoint", "project", "push", "toast"]
+    assert repos.thread_message_repo.append_if_ready.call_args.args[0] == "thr1"
+
+
+@pytest.mark.asyncio
+async def test_text_checkpoint_failure_skips_push() -> None:
+    session = _session(channel_type=ThreadRegistry.CHANNEL_DASHBOARD)
+    harness = MagicMock()
+    harness.aappend_messages = AsyncMock(side_effect=RuntimeError("checkpoint down"))
+    agent_manager = MagicMock()
+    agent_manager.get_agent.return_value = harness
+
+    gateway = MagicMock()
+    gateway.run_in_session = _run_locked
+    gateway.require_session = MagicMock(return_value=session)
+    gateway.push_session_text = AsyncMock()
+    gateway.notify_dashboard_push = AsyncMock()
+
+    service = CronDeliveryService(
+        gateway=gateway,
+        agent_manager=agent_manager,
+        repos=MagicMock(),
+    )
+    with pytest.raises(RuntimeError, match="checkpoint down"):
+        await service.deliver(_command())
+    gateway.push_session_text.assert_not_awaited()
+    gateway.notify_dashboard_push.assert_not_awaited()
+
+
+@pytest.mark.asyncio
+async def test_text_projection_and_toast_failure_still_pushes() -> None:
+    session = _session(channel_type=ThreadRegistry.CHANNEL_DASHBOARD)
+    harness = MagicMock()
+    harness.aappend_messages = AsyncMock(
+        return_value=[
+            HumanMessage(content="h", id="cron:x:human"),
+            AIMessage(content="记得喝水", id="cron:x:assistant"),
+        ]
+    )
+    agent_manager = MagicMock()
+    agent_manager.get_agent.return_value = harness
+
+    gateway = MagicMock()
+    gateway.run_in_session = _run_locked
+    gateway.require_session = MagicMock(return_value=session)
+    gateway.push_session_text = AsyncMock()
+    gateway.notify_dashboard_push = AsyncMock(side_effect=RuntimeError("toast down"))
+
+    repos = MagicMock()
+    repos.user_repo.get.return_value = MagicMock(locale="zh")
+    repos.thread_message_repo.append_if_ready.side_effect = RuntimeError("project down")
+
+    service = CronDeliveryService(gateway=gateway, agent_manager=agent_manager, repos=repos)
+    await service.deliver(_command())
+    gateway.push_session_text.assert_awaited_once()
+
+
+@pytest.mark.asyncio
+async def test_text_im_skips_checkpoint() -> None:
+    session = _session(channel_type="feishu")
+    agent_manager = MagicMock()
+    gateway = MagicMock()
+    gateway.run_in_session = _run_locked
+    gateway.require_session = MagicMock(return_value=session)
+    gateway.push_session_text = AsyncMock()
+    gateway.notify_dashboard_push = AsyncMock()
+
+    service = CronDeliveryService(
+        gateway=gateway,
+        agent_manager=agent_manager,
+        repos=MagicMock(),
+    )
+    await service.deliver(_command())
+    agent_manager.get_agent.assert_not_called()
+    gateway.push_session_text.assert_awaited_once()
+    gateway.notify_dashboard_push.assert_not_awaited()
+
+
+@pytest.mark.asyncio
+async def test_agent_hitl_does_not_push() -> None:
+    session = _session(channel_type=ThreadRegistry.CHANNEL_DASHBOARD)
+
+    async def _stream(_aid: str, _request: dict):
+        yield {"type": "token", "content": "partial"}
+        yield {"type": "hitl_required"}
+
+    agent_manager = MagicMock()
+    agent_manager.merge_turn_mcp_servers = MagicMock(return_value=None)
+    agent_manager.prepare_chat_mcp = AsyncMock(return_value=[])
+    agent_manager.stream = _stream
+    agent_manager.get_row = MagicMock(return_value=None)
+
+    gateway = MagicMock()
+    gateway.run_in_session = _run_locked
+    gateway.require_session = MagicMock(return_value=session)
+    gateway.push_session_text = AsyncMock()
+
+    service = CronDeliveryService(
+        gateway=gateway,
+        agent_manager=agent_manager,
+        repos=MagicMock(),
+    )
+    with pytest.raises(RuntimeError, match="interaction"):
+        await service.deliver(_command(task_type="agent", prompt="run"))
+    gateway.push_session_text.assert_not_awaited()
+
+
+@pytest.mark.asyncio
+async def test_agent_empty_reply_does_not_push() -> None:
+    session = _session(channel_type="feishu")
+
+    async def _stream(_aid: str, _request: dict):
+        yield {"type": "token", "content": "   "}
+
+    agent_manager = MagicMock()
+    agent_manager.merge_turn_mcp_servers = MagicMock(return_value=None)
+    agent_manager.prepare_chat_mcp = AsyncMock(return_value=[])
+    agent_manager.stream = _stream
+    agent_manager.get_row = MagicMock(return_value=None)
+
+    gateway = MagicMock()
+    gateway.run_in_session = _run_locked
+    gateway.require_session = MagicMock(return_value=session)
+    gateway.push_session_text = AsyncMock()
+
+    service = CronDeliveryService(
+        gateway=gateway,
+        agent_manager=agent_manager,
+        repos=MagicMock(),
+    )
+    with pytest.raises(RuntimeError, match="no visible response"):
+        await service.deliver(_command(task_type="agent", prompt="run"))
+    gateway.push_session_text.assert_not_awaited()
+
+
+@pytest.mark.asyncio
+async def test_agent_strips_orphan_thinking_prefix() -> None:
+    session = _session(channel_type="weixin")
+
+    async def _stream(_aid: str, _request: dict):
+        yield {"type": "token", "content": "internal reasoning"}
+        yield {"type": "token", "content": "</think>"}
+        yield {"type": "token", "content": "最终学习内容"}
+
+    agent_manager = MagicMock()
+    agent_manager.merge_turn_mcp_servers = MagicMock(return_value=None)
+    agent_manager.prepare_chat_mcp = AsyncMock(return_value=[])
+    agent_manager.stream = _stream
+    agent_manager.get_row = MagicMock(return_value=None)
+
+    gateway = MagicMock()
+    gateway.run_in_session = _run_locked
+    gateway.require_session = MagicMock(return_value=session)
+    gateway.push_session_text = AsyncMock()
+
+    service = CronDeliveryService(
+        gateway=gateway,
+        agent_manager=agent_manager,
+        repos=MagicMock(),
+    )
+    await service.deliver(_command(task_type="agent", prompt="run"))
+    assert gateway.push_session_text.await_args.args[1] == "最终学习内容"
+
+
+@pytest.mark.asyncio
+async def test_fresh_thread_resets_before_require_session() -> None:
+    session = _session(channel_type="feishu")
+    order: list[str] = []
+
+    async def reset(_key: str) -> str:
+        order.append("reset")
+        return "thr_new"
+
+    def require(_agent_id: str, _key: str):
+        order.append("require")
+        return session
+
+    gateway = MagicMock()
+    gateway.run_in_session = _run_locked
+    gateway.thread_registry.reset_by_session_key = reset
+    gateway.require_session = require
+    gateway.push_session_text = AsyncMock()
+
+    service = CronDeliveryService(
+        gateway=gateway,
+        agent_manager=MagicMock(),
+        repos=MagicMock(),
+    )
+    await service.deliver(_command(fresh_thread=True, task_type="text"))
+    assert order == ["reset", "require"]
+
+
+@pytest.mark.asyncio
+async def test_wrong_user_rejects_session() -> None:
+    session = _session(channel_type="dashboard")
+    session.user_id = 9
+    gateway = MagicMock()
+    gateway.run_in_session = _run_locked
+    gateway.require_session = MagicMock(return_value=session)
+    gateway.push_session_text = AsyncMock()
+
+    service = CronDeliveryService(
+        gateway=gateway,
+        agent_manager=MagicMock(),
+        repos=MagicMock(),
+    )
+    with pytest.raises(ValueError, match="does not belong to user"):
+        await service.deliver(_command())
+    gateway.push_session_text.assert_not_awaited()
+
+
+@pytest.mark.asyncio
+async def test_dashboard_text_projects_into_real_sqlite(tmp_path: Path) -> None:
+    db = SqlitePool(tmp_path / "octop.db")
+    run_migrations(db)
+    UserRepo(db).create(username="u", password_hash="h", role="user")
+    AgentRepo(db).create(agent_id="a1", user_id=1, name="bot")
+    thread_id = "thr_hist"
+    session_key = ThreadRegistry.dashboard_key(agent_id="a1", user_id=1)
+    ThreadRepo(db).insert(
+        thread_id=thread_id,
+        agent_id="a1",
+        user_id=1,
+        channel_type=ThreadRegistry.CHANNEL_DASHBOARD,
+        session_key=session_key,
+    )
+    SessionRepo(db).upsert(
+        session_key=session_key,
+        agent_id="a1",
+        user_id=1,
+        channel_type=ThreadRegistry.CHANNEL_DASHBOARD,
+        chat_type=ThreadRegistry.CHAT_TYPE_DM,
+        thread_id=thread_id,
+    )
+    session = SessionRepo(db).get(session_key)
+    assert session is not None
+
+    human = HumanMessage(
+        content="Task j1: 喝水提醒 executed.",
+        id="cron:01TESTHUMAN00000000000000:human",
+    )
+    ai = AIMessage(content="记得喝水", id="cron:01TESTHUMAN00000000000000:assistant")
+    harness = MagicMock()
+    harness.aappend_messages = AsyncMock(return_value=[human, ai])
+    agent_manager = MagicMock()
+    agent_manager.get_agent.return_value = harness
+
+    gateway = MagicMock()
+    gateway.run_in_session = _run_locked
+    gateway.require_session = MagicMock(return_value=session)
+    gateway.push_session_text = AsyncMock()
+    gateway.notify_dashboard_push = AsyncMock()
+
+    repos = MagicMock()
+    repos.user_repo = UserRepo(db)
+    repos.thread_message_repo = ThreadMessageRepo(db)
+
+    service = CronDeliveryService(gateway=gateway, agent_manager=agent_manager, repos=repos)
+    await service.deliver(_command(session_key=session_key))
+
+    page, _has_more = ThreadMessageRepo(db).page(thread_id, limit=10)
+    assert [row.role for row in page] == ["human", "ai"]
+    assert page[0].message_id == human.id
+    assert page[1].message_id == ai.id
+    assert "j1" in page[0].message_json
+    assert "记得喝水" in page[1].message_json
+    gateway.push_session_text.assert_awaited_once()
diff --git a/tests/unit/cron/test_cron_job.py b/tests/unit/cron/test_cron_job.py
index 02b4500c..ab6f2fda 100644
--- a/tests/unit/cron/test_cron_job.py
+++ b/tests/unit/cron/test_cron_job.py
@@ -1,4 +1,4 @@
-"""tests/unit/test_cron_job.py — tests for the gateway-based CronJob."""
+"""tests/unit/test_cron_job.py — CronJob bookkeeping around CronDeliveryService."""
 
 from __future__ import annotations
 
@@ -60,13 +60,14 @@ def _job(
     audit: AuditRepo,
     cid: str,
     session_key: str,
-    gateway: MagicMock,
+    delivery_service: MagicMock,
     fresh_thread: bool = False,
     task_type: str = "agent",
     mcp_servers: list[str] | None = None,
 ) -> CronJob:
     return CronJob(
         cron_id=cid,
+        name="say hi",
         agent_id="a1",
         prompt="hi",
         fresh_thread=fresh_thread,
@@ -74,7 +75,8 @@ def _job(
         model=None,
         task_type=task_type,
         mcp_servers=mcp_servers,
-        gateway=gateway,
+        user_id=1,
+        delivery_service=delivery_service,
         cron_repo=cron_repo,
         audit_repo=audit,
     )
@@ -83,104 +85,67 @@ def _job(
 @pytest.mark.asyncio
 async def test_run_records_ok(setup) -> None:
     cron_repo, audit, cid, session_key = setup
+    delivery = MagicMock()
+    delivery.deliver = AsyncMock()
 
-    gateway = MagicMock()
-    gateway.thread_registry = MagicMock()
-    gateway.thread_registry.get_session = MagicMock(
-        return_value=SessionRepo(cron_repo._db).get(session_key)
+    job = _job(
+        cron_repo=cron_repo,
+        audit=audit,
+        cid=cid,
+        session_key=session_key,
+        delivery_service=delivery,
     )
-    gateway.thread_registry.reset_by_session_key = AsyncMock(return_value="thr_new")
-    gateway.push_text_from_session = AsyncMock()
-
-    job = _job(cron_repo=cron_repo, audit=audit, cid=cid, session_key=session_key, gateway=gateway)
     await job.run()
     row = cron_repo.get(cid)
     assert row.last_status == "ok"
     assert row.last_run_at is not None
+    delivery.deliver.assert_awaited_once()
 
 
 @pytest.mark.asyncio
-async def test_run_uses_session_key(setup) -> None:
-    cron_repo, audit, cid, session_key = setup
-
-    gateway = MagicMock()
-    gateway.thread_registry = MagicMock()
-    gateway.thread_registry.get_session = MagicMock(
-        return_value=SessionRepo(cron_repo._db).get(session_key)
-    )
-    gateway.push_text_from_session = AsyncMock()
-
-    job = _job(cron_repo=cron_repo, audit=audit, cid=cid, session_key=session_key, gateway=gateway)
-    await job.run()
-
-    args = gateway.push_text_from_session.call_args
-    assert args.args[0] == "a1"
-    assert args.args[1] == session_key
-    assert args.args[2] == "hi"
-    assert args.kwargs["task_type"] == "agent"
-
-
-@pytest.mark.asyncio
-async def test_run_passes_mcp_servers(setup) -> None:
+async def test_run_passes_delivery_command(setup) -> None:
     cron_repo, audit, cid, session_key = setup
-
-    gateway = MagicMock()
-    gateway.thread_registry = MagicMock()
-    gateway.thread_registry.get_session = MagicMock(
-        return_value=SessionRepo(cron_repo._db).get(session_key)
-    )
-    gateway.push_text_from_session = AsyncMock()
+    delivery = MagicMock()
+    delivery.deliver = AsyncMock()
 
     job = _job(
         cron_repo=cron_repo,
         audit=audit,
         cid=cid,
         session_key=session_key,
-        gateway=gateway,
+        delivery_service=delivery,
         mcp_servers=["github__1"],
+        task_type="text",
+        fresh_thread=True,
     )
     await job.run()
 
-    args = gateway.push_text_from_session.call_args
-    assert args.kwargs["mcp_servers"] == ["github__1"]
+    command = delivery.deliver.await_args.args[0]
+    assert command.cron_id == cid
+    assert command.cron_name == "say hi"
+    assert command.agent_id == "a1"
+    assert command.user_id == 1
+    assert command.session_key == session_key
+    assert command.prompt == "hi"
+    assert command.fresh_thread is True
+    assert command.task_type == "text"
+    assert command.mcp_servers == ("github__1",)
 
 
 @pytest.mark.asyncio
-async def test_run_passes_task_type(setup) -> None:
+async def test_run_records_error_on_failure(setup) -> None:
     cron_repo, audit, cid, session_key = setup
-
-    gateway = MagicMock()
-    gateway.thread_registry = MagicMock()
-    gateway.thread_registry.get_session = MagicMock(
-        return_value=SessionRepo(cron_repo._db).get(session_key)
-    )
-    gateway.push_text_from_session = AsyncMock()
+    delivery = MagicMock()
+    delivery.deliver = AsyncMock(side_effect=RuntimeError("nope"))
 
     job = _job(
         cron_repo=cron_repo,
         audit=audit,
         cid=cid,
         session_key=session_key,
-        gateway=gateway,
-        task_type="text",
+        delivery_service=delivery,
     )
     await job.run()
-    assert gateway.push_text_from_session.call_args.kwargs["task_type"] == "text"
-
-
-@pytest.mark.asyncio
-async def test_run_records_error_on_failure(setup) -> None:
-    cron_repo, audit, cid, session_key = setup
-
-    gateway = MagicMock()
-    gateway.thread_registry = MagicMock()
-    gateway.thread_registry.get_session = MagicMock(
-        return_value=SessionRepo(cron_repo._db).get(session_key)
-    )
-    gateway.push_text_from_session = AsyncMock(side_effect=RuntimeError("nope"))
-
-    job = _job(cron_repo=cron_repo, audit=audit, cid=cid, session_key=session_key, gateway=gateway)
-    await job.run()
     row = cron_repo.get(cid)
     assert row.last_status == "error"
     assert row.last_error == "nope"
@@ -188,37 +153,20 @@ async def test_run_records_error_on_failure(setup) -> None:
     assert rows
 
 
-@pytest.mark.asyncio
-async def test_fresh_thread_resets_on_run(setup) -> None:
-    cron_repo, audit, cid, session_key = setup
-
-    gateway = MagicMock()
-    gateway.thread_registry = MagicMock()
-    gateway.thread_registry.get_session = MagicMock(
-        return_value=SessionRepo(cron_repo._db).get(session_key)
-    )
-    gateway.thread_registry.reset_by_session_key = AsyncMock(return_value="thr_fresh")
-    gateway.push_text_from_session = AsyncMock()
-
-    job = _job(
-        cron_repo=cron_repo,
-        audit=audit,
-        cid=cid,
-        session_key=session_key,
-        gateway=gateway,
-        fresh_thread=True,
-    )
-    await job.run()
-    gateway.thread_registry.reset_by_session_key.assert_called_once_with(session_key)
-
-
 @pytest.mark.asyncio
 async def test_from_row_reads_persisted_session_key(setup) -> None:
     cron_repo, audit, cid, session_key = setup
     row = cron_repo.get(cid)
     assert row is not None
 
-    gateway = MagicMock()
-    job = CronJob.from_row(row, gateway=gateway, cron_repo=cron_repo, audit_repo=audit)
+    delivery = MagicMock()
+    job = CronJob.from_row(
+        row,
+        delivery_service=delivery,
+        cron_repo=cron_repo,
+        audit_repo=audit,
+    )
     assert job._session_key == session_key
     assert job._task_type == "agent"
+    assert job._name == row.name
+    assert job._user_id == 1
diff --git a/tests/unit/cron/test_cron_manager.py b/tests/unit/cron/test_cron_manager.py
index 77d515ca..489c013e 100644
--- a/tests/unit/cron/test_cron_manager.py
+++ b/tests/unit/cron/test_cron_manager.py
@@ -12,6 +12,7 @@
 import pytest
 
 from octop.config import OctopConfig
+from octop.infra.cron.delivery import CronDeliveryService
 from octop.infra.cron.manager import CronManager
 from octop.infra.db.migrate import run_migrations
 from octop.infra.db.pool import SqlitePool
@@ -76,7 +77,16 @@ async def _aiter(items):
 
 def _make_manager(services, *, gateway: MagicMock | None = None) -> CronManager:
     gw = gateway or _make_gateway()
-    mgr = CronManager(gateway=gw, repos=services.repos, timezone="UTC")
+    mgr = CronManager(
+        gateway=gw,
+        delivery_service=CronDeliveryService(
+            gateway=gw,
+            agent_manager=MagicMock(),
+            repos=services.repos,
+        ),
+        repos=services.repos,
+        timezone="UTC",
+    )
     # Replace real APScheduler with a mock to avoid background threads
     fake_scheduler = MagicMock()
     fake_scheduler.running = False
@@ -233,11 +243,13 @@ async def test_create_persists_row(tmp_path: Path) -> None:
         cron_id=cid,
         agent_id=aid,
         user_id=uid,
+        name="Morning report",
         trigger="cron:0 9 * * *",
         prompt="morning report",
     )
 
     assert row.cron_id == cid
+    assert row.name == "Morning report"
     assert row.prompt == "morning report"
     assert row.agent_id == aid
     assert mgr.get(cid) is not None
@@ -261,6 +273,25 @@ async def test_create_schedules_job(tmp_path: Path) -> None:
     mgr._scheduler.add_job.assert_called_once()
 
 
+@pytest.mark.asyncio
+async def test_create_can_start_disabled(tmp_path: Path) -> None:
+    services = _make_services(tmp_path)
+    aid, uid = _make_agent(services)
+    mgr = _make_manager(services)
+
+    row = await mgr.create(
+        cron_id=_cron_id(),
+        agent_id=aid,
+        user_id=uid,
+        trigger="interval:30",
+        prompt="ping",
+        enabled=False,
+    )
+
+    assert row.enabled == 0
+    mgr._scheduler.add_job.assert_not_called()
+
+
 @pytest.mark.asyncio
 async def test_create_writes_audit_entry(tmp_path: Path) -> None:
     """create() writes a cron.create audit log entry."""
diff --git a/tests/unit/cron/test_cron_manager_global.py b/tests/unit/cron/test_cron_manager_global.py
index f29bc246..87fb5308 100644
--- a/tests/unit/cron/test_cron_manager_global.py
+++ b/tests/unit/cron/test_cron_manager_global.py
@@ -8,6 +8,7 @@
 import pytest
 
 from octop.config import OctopConfig
+from octop.infra.cron.delivery import CronDeliveryService
 from octop.infra.cron.manager import CronManager
 from octop.infra.db.migrate import run_migrations
 from octop.infra.db.pool import SqlitePool
@@ -28,7 +29,16 @@ async def test_boot_empty(tmp_path: Path) -> None:
     services = _make_services(tmp_path)
     gateway = MagicMock()
     gateway.thread_registry = MagicMock()
-    mgr = CronManager(gateway=gateway, repos=services.repos, timezone="UTC")
+    mgr = CronManager(
+        gateway=gateway,
+        delivery_service=CronDeliveryService(
+            gateway=gateway,
+            agent_manager=MagicMock(),
+            repos=services.repos,
+        ),
+        repos=services.repos,
+        timezone="UTC",
+    )
     mgr._scheduler = MagicMock()
     mgr._scheduler.get_job = MagicMock(return_value=None)
     await mgr.boot()
@@ -58,7 +68,16 @@ async def test_add_and_remove(tmp_path: Path) -> None:
 
     gateway = MagicMock()
     gateway.thread_registry = MagicMock()
-    mgr = CronManager(gateway=gateway, repos=services.repos, timezone="UTC")
+    mgr = CronManager(
+        gateway=gateway,
+        delivery_service=CronDeliveryService(
+            gateway=gateway,
+            agent_manager=MagicMock(),
+            repos=services.repos,
+        ),
+        repos=services.repos,
+        timezone="UTC",
+    )
     mgr._scheduler = MagicMock()
     mgr._scheduler.get_job = MagicMock(return_value=None)
     await mgr.boot()
diff --git a/tests/unit/cron/test_cron_tools.py b/tests/unit/cron/test_cron_tools.py
index 1a8d07a4..5a430cd1 100644
--- a/tests/unit/cron/test_cron_tools.py
+++ b/tests/unit/cron/test_cron_tools.py
@@ -11,6 +11,7 @@
 from langgraph.config import var_child_runnable_config
 
 from octop.config import OctopConfig
+from octop.infra.cron.delivery import CronDeliveryService
 from octop.infra.cron.manager import CronManager
 from octop.infra.cron.tools import build_cronjob_tools
 from octop.infra.db.migrate import run_migrations
@@ -41,7 +42,16 @@ def _make_manager(services) -> CronManager:
     gw.thread_registry = MagicMock()
     gw.thread_registry.get_session = MagicMock(return_value=None)
     gw.thread_registry.get_or_create_by_key = AsyncMock(return_value="thr_test")
-    mgr = CronManager(gateway=gw, repos=services.repos, timezone="UTC")
+    mgr = CronManager(
+        gateway=gw,
+        delivery_service=CronDeliveryService(
+            gateway=gw,
+            agent_manager=MagicMock(),
+            repos=services.repos,
+        ),
+        repos=services.repos,
+        timezone="UTC",
+    )
     mgr._scheduler = MagicMock()
     mgr._scheduler.get_job = MagicMock(return_value=None)
     return mgr
@@ -96,6 +106,7 @@ async def test_cronjob_isolated_by_agent_and_user(tmp_path: Path) -> None:
     tools = build_cronjob_tools(mgr)
     create = _tool_by_name(tools, "cronjob_create")
     get_tool = _tool_by_name(tools, "cronjob_get")
+    list_tool = _tool_by_name(tools, "cronjob_list")
 
     with _configurable(agent_id=agent_a, user=str(uid)):
         created = json.loads(await create.ainvoke({"trigger": "interval:60", "prompt": "a"}))
@@ -108,6 +119,10 @@ async def test_cronjob_isolated_by_agent_and_user(tmp_path: Path) -> None:
     with _configurable(agent_id=agent_a, user=str(other_uid)):
         err = json.loads(await get_tool.ainvoke({"cron_id": cron_id}))
         assert "error" in err
+        listed = json.loads(await list_tool.ainvoke({"include_disabled": True}))
+        assert listed == []
+        created = json.loads(await create.ainvoke({"trigger": "interval:60", "prompt": "nope"}))
+        assert "error" in created
 
 
 @pytest.mark.asyncio
diff --git a/tests/unit/db/test_agent_profile_columns.py b/tests/unit/db/test_agent_profile_columns.py
index 1b373b61..94e9b348 100644
--- a/tests/unit/db/test_agent_profile_columns.py
+++ b/tests/unit/db/test_agent_profile_columns.py
@@ -110,7 +110,7 @@ def test_migration_007_backfills_profile_columns(tmp_path: Path) -> None:
     with pool.connect() as conn:
         version = conn.execute("SELECT version FROM _schema_version").fetchone()[0]
         row = conn.execute("SELECT * FROM agents WHERE agent_id = ?", ("ag1",)).fetchone()
-    assert version == 10
+    assert version == 13
     assert row["template_name"] == "general-assistant"
     assert row["icon_name"] == "zap"
     assert row["icon_url"] == "https://cdn.example.com/a.png"
diff --git a/tests/unit/db/test_clip_thread_title.py b/tests/unit/db/test_clip_thread_title.py
index d916cb1b..282276df 100644
--- a/tests/unit/db/test_clip_thread_title.py
+++ b/tests/unit/db/test_clip_thread_title.py
@@ -82,7 +82,7 @@ def test_migration_003_repairs_stored_hard_cuts(tmp_path: Path) -> None:
     with pool.connect() as conn:
         v = conn.execute("SELECT version FROM _schema_version").fetchone()[0]
         title = conn.execute("SELECT title FROM threads WHERE thread_id = ?", ("t1",)).fetchone()[0]
-    assert v == 10
+    assert v == 13
     assert title == "x" * 39 + "…"
     # Idempotent repair
     assert repair_all_legacy_thread_titles(pool) == 0
diff --git a/tests/unit/db/test_db_pool.py b/tests/unit/db/test_db_pool.py
index 1fa6f505..9e63da79 100644
--- a/tests/unit/db/test_db_pool.py
+++ b/tests/unit/db/test_db_pool.py
@@ -64,6 +64,7 @@ def test_run_migrations_creates_tables(db: SqlitePool):
         "knowledge_documents",
         "sso_providers",
         "sso_login_states",
+        "trajectory_events",
     }
     assert expected.issubset(names)
     assert "knowledge_base_members" not in names
@@ -85,16 +86,27 @@ def test_run_migrations_idempotent(db: SqlitePool):
         doc_cols = {
             r["name"] for r in conn.execute("PRAGMA table_info(knowledge_documents)").fetchall()
         }
-    assert v == 10
+        connector_cols = {
+            r["name"] for r in conn.execute("PRAGMA table_info(connectors)").fetchall()
+        }
+        connector_indexes = {
+            r["name"] for r in conn.execute("PRAGMA index_list(connectors)").fetchall()
+        }
+    assert v == 13
     assert "login_failed_count" in cols
     assert "login_locked_until" in cols
     assert "preferences_json" in cols
     assert "permissions" in cols
     assert {"email", "sso_provider_id", "sso_subject"}.issubset(cols)
     assert "user_invites" in table_names
-    assert {"thread_messages", "thread_history_projection"}.issubset(table_names)
+    assert {"thread_messages", "thread_history_projection", "trajectory_events"}.issubset(
+        table_names
+    )
     assert "task_type" in cron_cols
     assert "mcp_servers" in cron_cols
+    assert "name" in cron_cols
+    assert "shared" in connector_cols
+    assert "idx_connectors_user_display_name" in connector_indexes
     assert {"model_ref", "reasoning_mode", "reasoning_effort", "artifacts"}.issubset(thread_cols)
     assert {
         "color",
@@ -126,6 +138,7 @@ def test_repair_legacy_schema_ensures_columns(tmp_path: Path) -> None:
     with pool.connect() as conn:
         cron_cols = {r["name"] for r in conn.execute("PRAGMA table_info(cron_jobs)").fetchall()}
     assert "task_type" in cron_cols
+    assert "name" in cron_cols
 
 
 def test_migration_002_idempotent_when_column_already_present(tmp_path: Path) -> None:
@@ -144,7 +157,7 @@ def test_migration_002_idempotent_when_column_already_present(tmp_path: Path) ->
     with pool.connect() as conn:
         v = conn.execute("SELECT version FROM _schema_version").fetchone()[0]
         cron_cols = {r["name"] for r in conn.execute("PRAGMA table_info(cron_jobs)").fetchall()}
-    assert v == 10
+    assert v == 13
     assert "mcp_servers" in cron_cols
     assert "skill_packages" in {
         r["name"]
@@ -281,7 +294,7 @@ def test_stuck_version_6_without_permissions_column_is_repaired(tmp_path: Path)
     with pool.connect() as conn:
         cols = {r["name"] for r in conn.execute("PRAGMA table_info(users)").fetchall()}
         version = conn.execute("SELECT version FROM _schema_version").fetchone()[0]
-    assert version == 10
+    assert version == 13
     assert "permissions" in cols
 
 
@@ -305,9 +318,13 @@ def test_schema_v10_without_projection_tables_is_repaired(tmp_path: Path) -> Non
             for r in conn.execute("SELECT name FROM sqlite_master WHERE type='table'").fetchall()
         }
         kb_cols = {r["name"] for r in conn.execute("PRAGMA table_info(knowledge_bases)").fetchall()}
-    assert version == 10
-    assert {"thread_messages", "thread_history_projection"}.issubset(table_names)
+        cron_cols = {r["name"] for r in conn.execute("PRAGMA table_info(cron_jobs)").fetchall()}
+    assert version == 13
+    assert {"thread_messages", "thread_history_projection", "trajectory_events"}.issubset(
+        table_names
+    )
     assert "max_documents" in kb_cols
+    assert "name" in cron_cols
 
 
 def test_ahead_of_max_schema_version_clamps_to_max(tmp_path: Path) -> None:
@@ -337,12 +354,56 @@ def test_ahead_of_max_schema_version_clamps_to_max(tmp_path: Path) -> None:
             r["name"]
             for r in conn.execute("SELECT name FROM sqlite_master WHERE type='table'").fetchall()
         }
-    assert version == 10
+    assert version == 13
     assert "skill_package_id" in pkg_cols
     assert "published_expert_id" in pub_cols
     assert "user_invites" in invite_tables
 
 
+def test_current_watermark_repairs_pre_v13_connectors_schema(tmp_path: Path) -> None:
+    """A folded v13 schema change is repaired even when migration 013 is skipped."""
+    pool = SqlitePool(tmp_path / "octop.db")
+    with pool.connect() as conn:
+        conn.executescript(
+            (
+                Path(__file__).resolve().parents[3]
+                / "src/octop/infra/db/migrations/001_initial.sql"
+            ).read_text()
+        )
+        conn.execute("UPDATE _schema_version SET version = 13")
+        conn.execute(
+            "INSERT INTO users(username, password_hash, role, created_at) "
+            "VALUES ('owner', 'hash', 'admin', 1)"
+        )
+        user_id = conn.execute("SELECT id FROM users WHERE username = 'owner'").fetchone()[0]
+        conn.execute(
+            "INSERT INTO connectors("
+            "instance_id, user_id, kind, display_name, mcp_server_name, created_at, updated_at"
+            ") VALUES ('instance-1', ?, 'github', 'GitHub', 'connector_github_1', 1, 1)",
+            (user_id,),
+        )
+
+    run_migrations(pool)
+
+    with pool.connect() as conn:
+        columns = {row["name"] for row in conn.execute("PRAGMA table_info(connectors)").fetchall()}
+        user_id = conn.execute("SELECT id FROM users WHERE username = 'owner'").fetchone()[0]
+        conn.execute(
+            "INSERT INTO connectors("
+            "instance_id, user_id, kind, display_name, mcp_server_name, created_at, updated_at"
+            ") VALUES ('instance-2', ?, 'github', 'GitHub Work', 'connector_github_2', 1, 1)",
+            (user_id,),
+        )
+        count = conn.execute(
+            "SELECT COUNT(*) FROM connectors WHERE user_id = ? AND kind = 'github'",
+            (user_id,),
+        ).fetchone()[0]
+
+    assert "shared" in columns
+    assert count == 2
+    pool.close()
+
+
 def test_foreign_keys_enabled(db: SqlitePool):
     with db.connect() as conn:
         fk = conn.execute("PRAGMA foreign_keys").fetchone()[0]
@@ -363,8 +424,8 @@ def test_pre_squash_schema_version_clamped_and_knowledge_tables_filled(
             ).read_text()
         )
         # Simulate a develop DB whose recorded version is ahead of the
-        # consolidated max (v7), so reconcile clamps and repairs knowledge tables.
-        conn.execute("UPDATE _schema_version SET version = 12")
+        # consolidated max, so reconcile clamps and repairs knowledge tables.
+        conn.execute("UPDATE _schema_version SET version = 13")
         conn.execute("ALTER TABLE agents ADD COLUMN is_shared INTEGER NOT NULL DEFAULT 0")
 
     run_migrations(pool)
@@ -376,7 +437,7 @@ def test_pre_squash_schema_version_clamped_and_knowledge_tables_filled(
             for row in conn.execute("SELECT name FROM sqlite_master WHERE type='table'").fetchall()
         }
         user_cols = {r["name"] for r in conn.execute("PRAGMA table_info(users)").fetchall()}
-    assert version == 10
+    assert version == 13
     assert "permissions" in user_cols
     assert {
         "published_experts",
diff --git a/tests/unit/db/test_published_experts_repo.py b/tests/unit/db/test_published_experts_repo.py
index 4705d7f2..23b732cc 100644
--- a/tests/unit/db/test_published_experts_repo.py
+++ b/tests/unit/db/test_published_experts_repo.py
@@ -27,7 +27,7 @@ def test_published_experts_table_exists(db: SqlitePool) -> None:
         v = conn.execute("SELECT version FROM _schema_version").fetchone()[0]
         cols = {r["name"] for r in conn.execute("PRAGMA table_info(published_experts)").fetchall()}
     assert "published_experts" in names
-    assert v == 10
+    assert v == 13
     assert "published_expert_id" in cols
 
 
diff --git a/tests/unit/db/test_repo_cron.py b/tests/unit/db/test_repo_cron.py
index 94ba285a..dc964171 100644
--- a/tests/unit/db/test_repo_cron.py
+++ b/tests/unit/db/test_repo_cron.py
@@ -51,6 +51,7 @@ def test_create_and_get(repo: CronJobRepo, agent_id: str, user_id: int):
         cron_id=cid,
         agent_id=agent_id,
         user_id=user_id,
+        name="Morning report",
         trigger="0 9 * * *",
         prompt="run report",
         session_key=_session_key(agent_id, user_id),
@@ -58,10 +59,12 @@ def test_create_and_get(repo: CronJobRepo, agent_id: str, user_id: int):
     row = repo.get(cid)
     assert isinstance(row, CronJobRow)
     assert row.cron_id == cid
+    assert row.name == "Morning report"
     assert row.trigger == "0 9 * * *"
     assert row.enabled == 1
     assert row.task_type == "agent"
     assert row.last_run_at is None
+    assert row.to_public_dict()["name"] == "Morning report"
 
 
 def test_create_with_task_type(repo: CronJobRepo, agent_id: str, user_id: int):
@@ -129,6 +132,36 @@ def test_list_by_agent(repo: CronJobRepo, agent_id: str, user_id: int):
     assert len(rows) == 2
 
 
+def test_list_by_agent_can_filter_user(
+    db: SqlitePool,
+    repo: CronJobRepo,
+    agent_id: str,
+    user_id: int,
+):
+    other_user = UserRepo(db).create(username="bob", password_hash="h", role="user")
+    repo.create(
+        cron_id=new_ulid(),
+        agent_id=agent_id,
+        user_id=user_id,
+        trigger="* * * * *",
+        prompt="mine",
+        session_key=_session_key(agent_id, user_id),
+    )
+    repo.create(
+        cron_id=new_ulid(),
+        agent_id=agent_id,
+        user_id=other_user,
+        trigger="* * * * *",
+        prompt="theirs",
+        session_key=_session_key(agent_id, other_user),
+    )
+
+    rows = repo.list_by_agent(agent_id, user_id=user_id)
+
+    assert len(rows) == 1
+    assert rows[0].prompt == "mine"
+
+
 def test_update_partial(repo: CronJobRepo, agent_id: str, user_id: int):
     cid = new_ulid()
     repo.create(
diff --git a/tests/unit/db/test_repo_knowledge.py b/tests/unit/db/test_repo_knowledge.py
index 00d38a4f..c20853a5 100644
--- a/tests/unit/db/test_repo_knowledge.py
+++ b/tests/unit/db/test_repo_knowledge.py
@@ -50,7 +50,7 @@ def test_knowledge_tables_migrated(db: SqlitePool) -> None:
         "knowledge_bases",
         "knowledge_documents",
     }.issubset(names)
-    assert v == 10
+    assert v == 13
     assert "knowledge_base_members" not in names
     cols = {r["name"] for r in conn.execute("PRAGMA table_info(knowledge_bases)").fetchall()}
     assert "knowledge_base_id" in cols
diff --git a/tests/unit/db/test_runtime_replace_services.py b/tests/unit/db/test_runtime_replace_services.py
index 6c7e367b..33b7bfff 100644
--- a/tests/unit/db/test_runtime_replace_services.py
+++ b/tests/unit/db/test_runtime_replace_services.py
@@ -6,6 +6,7 @@
 
 from octop.config import OctopConfig
 from octop.infra.agents.manager import AgentManager
+from octop.infra.cron.delivery import CronDeliveryService
 from octop.infra.cron.manager import CronManager
 from octop.infra.db.migrate import run_migrations
 from octop.infra.db.pool import SqlitePool
@@ -33,7 +34,16 @@ def test_replace_services_retargets_user_and_provider_repos(tmp_path: Path) -> N
 
     registry = AgentManager(repos=svc_a.repos, paths=paths_a, config=cfg_a)
     gateway = Gateway(agent_manager=registry, repos=svc_a.repos)
-    cron = CronManager(gateway=gateway, repos=svc_a.repos, timezone=cfg_a.default_timezone)
+    cron = CronManager(
+        gateway=gateway,
+        delivery_service=CronDeliveryService(
+            gateway=gateway,
+            agent_manager=registry,
+            repos=svc_a.repos,
+        ),
+        repos=svc_a.repos,
+        timezone=cfg_a.default_timezone,
+    )
     care = ProactiveCareService(
         gateway=gateway,
         care_push_repo=svc_a.repos.care_push_repo,
@@ -60,6 +70,7 @@ def test_replace_services_retargets_user_and_provider_repos(tmp_path: Path) -> N
     assert registry.providers._provider_repo._db is svc_b.db  # noqa: SLF001
     assert gateway._repos is svc_b.repos  # noqa: SLF001
     assert cron._repos is svc_b.repos  # noqa: SLF001
+    assert cron._delivery_service._repos is svc_b.repos  # noqa: SLF001
 
 
 def test_rebind_module_delegates_retarget_to_app_runtime() -> None:
diff --git a/tests/unit/db/test_skill_package_icons.py b/tests/unit/db/test_skill_package_icons.py
index 27ac3646..e2cd6c8a 100644
--- a/tests/unit/db/test_skill_package_icons.py
+++ b/tests/unit/db/test_skill_package_icons.py
@@ -91,7 +91,7 @@ def test_migration_002_idempotent_when_icon_columns_already_present(tmp_path: Pa
                 "SELECT name FROM sqlite_master WHERE type='index' AND tbl_name='skill_packages'"
             )
         }
-    assert v == 10
+    assert v == 13
     assert "icon_name" in cols
     assert "icon_url" in cols
     assert "skill_package_id" in cols
@@ -110,7 +110,7 @@ def test_repair_legacy_schema_adds_icon_columns_at_version_2(tmp_path: Path) ->
     with pool.connect() as conn:
         v = conn.execute("SELECT version FROM _schema_version").fetchone()[0]
         cols = {r["name"] for r in conn.execute("PRAGMA table_info(skill_packages)").fetchall()}
-    assert v == 10
+    assert v == 13
     assert "icon_name" in cols
     assert "icon_url" in cols
     assert "skill_package_id" in cols
diff --git a/tests/unit/db/test_skill_packages_repo.py b/tests/unit/db/test_skill_packages_repo.py
index 67d7cc58..15c594d6 100644
--- a/tests/unit/db/test_skill_packages_repo.py
+++ b/tests/unit/db/test_skill_packages_repo.py
@@ -28,7 +28,7 @@ def test_skill_packages_table_exists(db: SqlitePool) -> None:
         v = conn.execute("SELECT version FROM _schema_version").fetchone()[0]
         cols = {r["name"] for r in conn.execute("PRAGMA table_info(skill_packages)").fetchall()}
     assert "skill_packages" in names
-    assert v == 10
+    assert v == 13
     assert "skill_package_id" in cols
 
 
diff --git a/tests/unit/desktop/test_stamp_version.py b/tests/unit/desktop/test_stamp_version.py
new file mode 100644
index 00000000..c5801e52
--- /dev/null
+++ b/tests/unit/desktop/test_stamp_version.py
@@ -0,0 +1,83 @@
+"""Tests for desktop Wails version stamping."""
+
+from __future__ import annotations
+
+import importlib.util
+import json
+import plistlib
+from pathlib import Path
+
+_STAMP = Path(__file__).resolve().parents[3] / "desktop" / "src" / "build" / "stamp_version.py"
+_SPEC = importlib.util.spec_from_file_location("octop_desktop_stamp_version", _STAMP)
+assert _SPEC is not None and _SPEC.loader is not None
+stamp_version = importlib.util.module_from_spec(_SPEC)
+_SPEC.loader.exec_module(stamp_version)
+
+
+def test_stamp_plist_sets_bundle_versions(tmp_path: Path) -> None:
+    src = (
+        Path(__file__).resolve().parents[3] / "desktop" / "src" / "build" / "darwin" / "Info.plist"
+    )
+    dest = tmp_path / "Info.plist"
+    dest.write_bytes(src.read_bytes())
+    stamp_version.stamp_plist(dest, "1.2.3")
+    data = plistlib.loads(dest.read_bytes())
+    assert data["CFBundleVersion"] == "1.2.3"
+    assert data["CFBundleShortVersionString"] == "1.2.3"
+    assert data["LSMinimumSystemVersion"] == "12.0.0"
+
+
+def test_stamp_plist_skips_dev_placeholder(tmp_path: Path) -> None:
+    dest = tmp_path / "Info.plist"
+    dest.write_bytes(
+        plistlib.dumps({"CFBundleVersion": "0.9.31", "CFBundleShortVersionString": "0.9.31"})
+    )
+    stamp_version.stamp_plist(dest, "dev")
+    data = plistlib.loads(dest.read_bytes())
+    assert data["CFBundleVersion"] == "0.9.31"
+
+
+def test_stamp_info_json_copies_and_sets_version(tmp_path: Path) -> None:
+    src = (
+        Path(__file__).resolve().parents[3] / "desktop" / "src" / "build" / "windows" / "info.json"
+    )
+    dest = tmp_path / "info.generated.json"
+    stamp_version.stamp_info_json(src, dest, "1.2.3")
+    data = json.loads(dest.read_text(encoding="utf-8"))
+    assert data["fixed"]["file_version"] == "1.2.3"
+    assert data["info"]["0000"]["ProductVersion"] == "1.2.3"
+    original = json.loads(src.read_text(encoding="utf-8"))
+    assert original["info"]["0000"]["CompanyName"] == data["info"]["0000"]["CompanyName"]
+
+
+def test_stamp_info_json_dev_keeps_source_version(tmp_path: Path) -> None:
+    src = (
+        Path(__file__).resolve().parents[3] / "desktop" / "src" / "build" / "windows" / "info.json"
+    )
+    dest = tmp_path / "info.generated.json"
+    stamp_version.stamp_info_json(src, dest, "dev")
+    data = json.loads(dest.read_text(encoding="utf-8"))
+    original = json.loads(src.read_text(encoding="utf-8"))
+    assert data["fixed"]["file_version"] == original["fixed"]["file_version"]
+
+
+def test_four_part_version_pads_semver() -> None:
+    assert stamp_version.four_part_version("1.2.3") == "1.2.3.0"
+    assert stamp_version.four_part_version("1.2.3.4") == "1.2.3.4"
+    assert stamp_version.four_part_version("dev") is None
+
+
+def test_stamp_manifest_sets_octop_identity_only(tmp_path: Path) -> None:
+    src = (
+        Path(__file__).resolve().parents[3]
+        / "desktop"
+        / "src"
+        / "build"
+        / "windows"
+        / "wails.exe.manifest"
+    )
+    dest = tmp_path / "wails.exe.generated.manifest"
+    stamp_version.stamp_manifest(src, dest, "1.2.3")
+    text = dest.read_text(encoding="utf-8")
+    assert 'name="com.tencent.octop" version="1.2.3.0"' in text
+    assert 'name="Microsoft.Windows.Common-Controls" version="6.0.0.0"' in text
diff --git a/tests/unit/gateway/test_channels_qr.py b/tests/unit/gateway/test_channels_qr.py
index 386ec4a4..f054a542 100644
--- a/tests/unit/gateway/test_channels_qr.py
+++ b/tests/unit/gateway/test_channels_qr.py
@@ -313,7 +313,7 @@ def test_pkill_chrome_profile_accepts_resolved_path(monkeypatch: pytest.MonkeyPa
 
 
 def test_feishu_bot_creator_start_without_pkill_mock(mock_server_and_user):
-    """feishu/bot-creator/start must pass profile_dir validation before pkill."""
+    """feishu/bot-creator/start launches the scan-to-create subprocess."""
     server, user = mock_server_and_user
 
     mock_proc = MagicMock()
@@ -353,7 +353,6 @@ def test_feishu_bot_creator_start_returns_pid(mock_server_and_user):
             "octop.api.routers.channels._bot_creator_script",
             return_value="/fake/feishu_bot_creator.py",
         ),
-        patch("octop.api.routers.channels._pkill_chrome_profile", new_callable=AsyncMock),
         patch("octop.api.routers.channels.asyncio.to_thread", new_callable=AsyncMock),
     ):
         app = _make_app(server, user)
diff --git a/tests/unit/gateway/test_cli_channel.py b/tests/unit/gateway/test_cli_channel.py
index 9e41d5e3..1eab7df5 100644
--- a/tests/unit/gateway/test_cli_channel.py
+++ b/tests/unit/gateway/test_cli_channel.py
@@ -56,3 +56,25 @@ async def iter_turn_chunks(self, msg: InboundMessage) -> AsyncIterator[dict[str,
 
     assert {"type": "token", "content": "hello"} in frames
     assert frames[-1] == {"type": "done"}
+
+
+@pytest.mark.asyncio
+async def test_cli_channel_send_text_finalizes_with_done() -> None:
+    hub = CliHub()
+    frames: list[dict[str, Any]] = []
+
+    async def capture(frame: dict[str, Any]) -> None:
+        frames.append(frame)
+
+    hub.register("conn-1", capture)
+    channel = CliChannel(object(), hub=hub)  # type: ignore[arg-type]
+    subject = ChannelSubject(
+        subject_id="7",
+        chat_type="dm",
+        metadata={CLI_CONNECTION_META: "conn-1"},
+    )
+    await channel._send_text(subject, "hello")
+    assert frames == [
+        {"type": "token", "content": "hello"},
+        {"type": "done"},
+    ]
diff --git a/tests/unit/gateway/test_dashboard_ws.py b/tests/unit/gateway/test_dashboard_ws.py
index 525c76bb..3eb62a6b 100644
--- a/tests/unit/gateway/test_dashboard_ws.py
+++ b/tests/unit/gateway/test_dashboard_ws.py
@@ -602,3 +602,25 @@ async def test_global_processor_iter_turn_chunks_slash() -> None:
     chunks = [c async for c in processor.iter_turn_chunks(msg)]
     assert chunks[0]["type"] == "token"
     assert chunks[-1]["type"] == "done"
+
+
+@pytest.mark.asyncio
+async def test_ws_channel_send_text_finalizes_with_done() -> None:
+    hub = WebSocketHub()
+    frames: list[dict[str, Any]] = []
+
+    async def capture(frame: dict[str, Any]) -> None:
+        frames.append(frame)
+
+    hub.register("c1", capture)
+    hub.subscribe("thr1", "c1")
+    channel = WebSocketChannel(object(), hub=hub)  # type: ignore[arg-type]
+    subject = ChannelSubject(
+        subject_id="u1",
+        chat_type="dm",
+        metadata={"thread_id": "thr1"},
+    )
+    await channel._send_text(subject, "hello")
+    assert frames[0]["type"] == "token"
+    assert frames[0]["content"] == "hello"
+    assert frames[-1]["type"] == "done"
diff --git a/tests/unit/gateway/test_feishu_bot_creator.py b/tests/unit/gateway/test_feishu_bot_creator.py
new file mode 100644
index 00000000..835a0064
--- /dev/null
+++ b/tests/unit/gateway/test_feishu_bot_creator.py
@@ -0,0 +1,130 @@
+"""Unit tests for Feishu scan-to-create (lark-oapi register_app)."""
+
+from __future__ import annotations
+
+import json
+from typing import Any
+
+import pytest
+from lark_oapi.scene.registration.errors import AppAccessDeniedError, RegisterAppError
+
+from octop.infra.gateway.bot_creators import feishu_bot_creator as creator
+from octop.infra.gateway.bot_creators.feishu_runner import extract_feishu_credentials
+
+
+def test_extract_feishu_credentials_from_url_payload() -> None:
+    lines = [
+        {
+            "action": "show_qrcode",
+            "content": json.dumps(
+                {"url": "https://accounts.feishu.cn/oauth/v1/device/verify?x=1", "expire_in": 600}
+            ),
+        },
+        {
+            "action": "finish",
+            "level": "success",
+            "data": {"app_id": "cli_1", "app_secret": "sec"},
+        },
+    ]
+    qr_url, app_id, app_secret = extract_feishu_credentials(lines)
+    assert qr_url == "https://accounts.feishu.cn/oauth/v1/device/verify?x=1"
+    assert app_id == "cli_1"
+    assert app_secret == "sec"
+
+
+def test_extract_feishu_credentials_from_bare_url() -> None:
+    lines = [{"action": "show_qrcode", "content": "https://accounts.larksuite.com/x"}]
+    qr_url, app_id, app_secret = extract_feishu_credentials(lines)
+    assert qr_url == "https://accounts.larksuite.com/x"
+    assert app_id is None
+    assert app_secret is None
+
+
+def test_register_feishu_app_maps_sdk_result(monkeypatch: pytest.MonkeyPatch) -> None:
+    captured: dict[str, Any] = {}
+
+    def fake_register_app(**kwargs: Any) -> dict[str, Any]:
+        captured.update(kwargs)
+        kwargs["on_qr_code"]({"url": "https://accounts.feishu.cn/qr", "expire_in": 120})
+        return {
+            "client_id": "cli_new",
+            "client_secret": "secret_new",
+            "user_info": {"open_id": "ou_1", "tenant_brand": "feishu"},
+        }
+
+    sent: dict[str, Any] = {}
+
+    def fake_send(
+        app_id: str, app_secret: str, open_id: str, *, open_base: str, greeting: str
+    ) -> None:
+        sent.update(
+            {
+                "app_id": app_id,
+                "app_secret": app_secret,
+                "open_id": open_id,
+                "open_base": open_base,
+                "greeting": greeting,
+            }
+        )
+
+    monkeypatch.setattr(creator.lark, "register_app", fake_register_app)
+    monkeypatch.setattr(creator, "_send_greeting", fake_send)
+    monkeypatch.setattr(creator, "_save_state", lambda _data: None)
+
+    finish = creator.register_feishu_app(greeting="hello")
+    assert finish["app_id"] == "cli_new"
+    assert finish["app_secret"] == "secret_new"
+    assert finish["open_id"] == "ou_1"
+    assert finish["manage_url"] == "https://open.feishu.cn/app/cli_new"
+    assert captured["create_only"] is True
+    assert captured["source"] == "octop"
+    assert "name" not in captured["app_preset"]
+    assert "avatar" not in captured["app_preset"]
+    assert sent["open_id"] == "ou_1"
+    assert sent["greeting"] == "hello"
+    # No addons: the scan page skips the extra scope-confirmation step.
+    assert "addons" not in captured
+
+
+def test_cmd_create_denied(
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
+) -> None:
+    def fake_register(**_kwargs: Any) -> dict[str, Any]:
+        raise AppAccessDeniedError("access_denied", "user cancelled")
+
+    monkeypatch.setattr(creator.lark, "register_app", fake_register)
+    with pytest.raises(SystemExit) as exc:
+        creator.cmd_create()
+    assert exc.value.code == 1
+    out = capsys.readouterr().out
+    payload = json.loads(out.strip().splitlines()[-1])
+    assert payload["action"] == "finish"
+    assert payload["level"] == "error"
+    assert "denied" in payload["message"].lower()
+
+
+def test_register_feishu_app_rejects_none_result(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setattr(creator.lark, "register_app", lambda **_kwargs: None)
+    monkeypatch.setattr(creator, "_save_state", lambda _data: None)
+    with pytest.raises(RegisterAppError, match=r"missing_credentials"):
+        creator.register_feishu_app()
+
+
+def test_cmd_create_register_error(
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
+) -> None:
+    def fake_register(**_kwargs: Any) -> dict[str, Any]:
+        raise RegisterAppError("unsupported_auth_method", "client_secret missing")
+
+    monkeypatch.setattr(creator.lark, "register_app", fake_register)
+    with pytest.raises(SystemExit) as exc:
+        creator.cmd_create()
+    assert exc.value.code == 1
+    payload = json.loads(capsys.readouterr().out.strip().splitlines()[-1])
+    assert payload["step"] == "create_app"
+
+
+def test_parse_version() -> None:
+    assert creator._parse_version("1.5.5") >= creator.MIN_LARK_OAPI
+    assert creator._parse_version("1.5.4") < creator.MIN_LARK_OAPI
+    assert creator._parse_version("1.7.0") >= creator.MIN_LARK_OAPI
diff --git a/tests/unit/gateway/test_gateway_push.py b/tests/unit/gateway/test_gateway_push.py
index d3dcb794..4aa8ede8 100644
--- a/tests/unit/gateway/test_gateway_push.py
+++ b/tests/unit/gateway/test_gateway_push.py
@@ -17,6 +17,7 @@
 from octop.infra.db.repos.users import UserRepo
 from octop.infra.gateway.gateway import Gateway
 from octop.infra.gateway.threads import ThreadRegistry
+from octop.infra.gateway.ws import WS_CHANNEL_ID
 
 
 @pytest.fixture
@@ -31,21 +32,15 @@ def gateway(tmp_path: Path) -> Gateway:
     repos.thread_repo = ThreadRepo(db)
     repos.channel_repo = MagicMock()
     agent_manager = MagicMock()
-    harness = MagicMock()
-
-    async def stream(_agent_id, _request):
-        yield {"type": "chunk"}
-
-    agent_manager.stream = stream
-    agent_manager.get_agent.return_value = harness
-    agent_manager.merge_turn_mcp_servers = MagicMock(return_value=None)
-    agent_manager.prepare_chat_mcp = AsyncMock(return_value=[])
-    agent_manager.get_row = MagicMock(return_value=None)
-
     gw = Gateway(agent_manager=agent_manager, repos=repos)
     gw._channel_manager = MagicMock()
     gw._channel_manager.channel_ids = ["ch-1"]
     gw._channel_manager.push_text = AsyncMock()
+
+    async def run_in_session(_channel_id, _session_key, operation):
+        await operation()
+
+    gw._channel_manager.run_in_session = run_in_session
     return gw
 
 
@@ -72,7 +67,7 @@ async def test_push_to_session_im_delegates_to_channel_manager(gateway: Gateway)
         channel_id="ch-1",
     )
 
-    await gateway.push_text_from_session("a1", sk, "hello", task_type="text")
+    await gateway.push_text_from_session("a1", sk, "hello")
     gateway._channel_manager.push_text.assert_awaited_once()
     args = gateway._channel_manager.push_text.await_args
     assert args.args[0] == "ch-1"
@@ -114,7 +109,7 @@ async def test_push_text_delegates_to_channel_manager(gateway: Gateway) -> None:
 
 
 @pytest.mark.asyncio
-async def test_push_text_from_session_cron_text_pushes_prompt(gateway: Gateway) -> None:
+async def test_push_text_from_session_im_preserves_subject(gateway: Gateway) -> None:
     sk = ThreadRegistry.make_key(
         agent_id="a1",
         channel_type="qq",
@@ -141,7 +136,7 @@ async def test_push_text_from_session_cron_text_pushes_prompt(gateway: Gateway)
         channel_id="ch-1",
     )
 
-    await gateway.push_text_from_session("a1", sk, "cron ping", task_type="text")
+    await gateway.push_text_from_session("a1", sk, "cron ping")
     gateway._channel_manager.push_text.assert_awaited_once()
     args = gateway._channel_manager.push_text.await_args
     subject = args.args[1]
@@ -184,7 +179,7 @@ async def test_push_text_from_qq_group_session_preserves_proactive_routing(
         channel_id="ch-1",
     )
 
-    await gateway.push_text_from_session("a1", sk, "proactive group message", task_type="text")
+    await gateway.push_text_from_session("a1", sk, "proactive group message")
 
     args = gateway._channel_manager.push_text.await_args
     assert args.args[0] == "ch-1"
@@ -196,86 +191,10 @@ async def test_push_text_from_qq_group_session_preserves_proactive_routing(
     assert args.args[2] == "proactive group message"
 
 
-@pytest.mark.asyncio
-async def test_push_text_from_session_cron_agent_im_pushes_reply(gateway: Gateway) -> None:
-    sk = ThreadRegistry.make_key(agent_id="a1", channel_type="feishu", channel_subject_id="ou_1")
-    gateway.thread_registry._threads.insert(
-        thread_id="thr_im2",
-        agent_id="a1",
-        user_id=1,
-        channel_type="feishu",
-        session_key=sk,
-    )
-    gateway.thread_registry._sessions.upsert(
-        session_key=sk,
-        agent_id="a1",
-        user_id=1,
-        channel_type="feishu",
-        chat_type="dm",
-        thread_id="thr_im2",
-        channel_subject_id="ou_1",
-        channel_chat_type="dm",
-        channel_metadata={"channel_type": "feishu"},
-        channel_id="ch-1",
-    )
-
-    async def stream_with_token(_agent_id, _request):
-        yield {"type": "token", "content": "AI reply"}
-
-    gateway._agent_manager.stream = stream_with_token
-
-    await gateway.push_text_from_session("a1", sk, "run agent", task_type="agent")
-    gateway._channel_manager.push_text.assert_awaited_once()
-    assert gateway._channel_manager.push_text.await_args.args[2] == "AI reply"
-
-
-@pytest.mark.asyncio
-async def test_push_text_from_session_cron_agent_strips_orphan_thinking_prefix(
-    gateway: Gateway,
-) -> None:
-    sk = ThreadRegistry.make_key(
-        agent_id="a1",
-        channel_type="weixin",
-        channel_subject_id="wx_1",
-    )
-    gateway.thread_registry._threads.insert(
-        thread_id="thr_weixin_cron",
-        agent_id="a1",
-        user_id=1,
-        channel_type="weixin",
-        session_key=sk,
-    )
-    gateway.thread_registry._sessions.upsert(
-        session_key=sk,
-        agent_id="a1",
-        user_id=1,
-        channel_type="weixin",
-        chat_type="dm",
-        thread_id="thr_weixin_cron",
-        channel_subject_id="wx_1",
-        channel_chat_type="dm",
-        channel_metadata={"channel_type": "weixin"},
-        channel_id="ch-1",
-    )
-
-    async def stream_with_thinking_leak(_agent_id, _request):
-        yield {"type": "token", "content": "internal reasoning"}
-        yield {"type": "token", "content": "</think>"}
-        yield {"type": "token", "content": "最终学习内容"}
-
-    gateway._agent_manager.stream = stream_with_thinking_leak
-
-    await gateway.push_text_from_session("a1", sk, "run agent", task_type="agent")
-
-    gateway._channel_manager.push_text.assert_awaited_once()
-    assert gateway._channel_manager.push_text.await_args.args[2] == "最终学习内容"
-
-
-@pytest.mark.asyncio
-async def test_push_text_from_session_dashboard_agent_pushes_ws(gateway: Gateway) -> None:
+def _insert_dashboard_session(gateway: Gateway, *, thread_id: str = "thr_dash") -> str:
     sk = ThreadRegistry.dashboard_key(agent_id="a1", user_id=1)
     gateway.thread_registry._threads.insert(
-        thread_id="thr_dash",
+        thread_id=thread_id,
         agent_id="a1",
         user_id=1,
         channel_type="dashboard",
@@ -287,47 +206,29 @@ async def test_push_text_from_session_dashboard_agent_pushes_ws(gateway: Gateway
         user_id=1,
         channel_type="dashboard",
         chat_type="dm",
-        thread_id="thr_dash",
+        thread_id=thread_id,
         channel_metadata={"ws_connection_id": "conn-1"},
     )
+    return sk
 
-    async def stream_with_token(_agent_id, _request):
-        yield {"type": "token", "content": "cron reply"}
-
-    gateway._agent_manager.stream = stream_with_token
 
-    await gateway.push_text_from_session("a1", sk, "run", task_type="agent")
+@pytest.mark.asyncio
+async def test_push_text_from_session_dashboard_injects_thread_id(gateway: Gateway) -> None:
+    sk = _insert_dashboard_session(gateway)
+    await gateway.push_text_from_session("a1", sk, "记得喝水")
     row = gateway.thread_registry.get_session(sk)
     assert row is not None
     assert row.unread_count == 1
     gateway._channel_manager.push_text.assert_awaited_once()
-    assert gateway._channel_manager.push_text.await_args.args[0] == "octop-dashboard"
-    assert gateway._channel_manager.push_text.await_args.args[2] == "cron reply"
-
-
-def _insert_dashboard_session(gateway: Gateway, *, thread_id: str = "thr_dash") -> str:
-    sk = ThreadRegistry.dashboard_key(agent_id="a1", user_id=1)
-    gateway.thread_registry._threads.insert(
-        thread_id=thread_id,
-        agent_id="a1",
-        user_id=1,
-        channel_type="dashboard",
-        session_key=sk,
-    )
-    gateway.thread_registry._sessions.upsert(
-        session_key=sk,
-        agent_id="a1",
-        user_id=1,
-        channel_type="dashboard",
-        chat_type="dm",
-        thread_id=thread_id,
-        channel_metadata={"ws_connection_id": "conn-1"},
-    )
-    return sk
+    args = gateway._channel_manager.push_text.await_args
+    assert args.args[0] == WS_CHANNEL_ID
+    subject = args.args[1]
+    assert subject.metadata["thread_id"] == "thr_dash"
+    assert args.args[2] == "记得喝水"
 
 
 @pytest.mark.asyncio
-async def test_push_text_from_session_dashboard_text_notifies_user(gateway: Gateway) -> None:
+async def test_push_text_from_session_dashboard_notifies_user(gateway: Gateway) -> None:
     sk = _insert_dashboard_session(gateway)
     frames: list[dict[str, object]] = []
 
@@ -337,7 +238,7 @@ async def capture(frame: dict[str, object]) -> None:
     gateway.ws_hub.register("n1", capture, user_id=1)
     gateway._agent_manager.get_row.return_value = SimpleNamespace(name="Agent 1")
 
-    await gateway.push_text_from_session("a1", sk, "记得喝水", task_type="text")
+    await gateway.push_text_from_session("a1", sk, "记得喝水")
 
     assert len(frames) == 1
     frame = frames[0]
@@ -349,21 +250,7 @@ async def capture(frame: dict[str, object]) -> None:
 
 
 @pytest.mark.asyncio
-async def test_push_text_from_session_dashboard_agent_does_not_notify(
-    gateway: Gateway,
-) -> None:
-    sk = _insert_dashboard_session(gateway, thread_id="thr_agent")
-    frames: list[dict[str, object]] = []
-
-    async def capture(frame: dict[str, object]) -> None:
-        frames.append(frame)
-
-    gateway.ws_hub.register("n1", capture, user_id=1)
-
-    async def stream_with_token(_agent_id, _request):
-        yield {"type": "token", "content": "cron reply"}
-
-    gateway._agent_manager.stream = stream_with_token
-
-    await gateway.push_text_from_session("a1", sk, "run", task_type="agent")
-    assert frames == []
+async def test_push_text_from_session_does_not_project_history(gateway: Gateway) -> None:
+    sk = _insert_dashboard_session(gateway, thread_id="thr_text")
+    await gateway.push_text_from_session("a1", sk, "记得喝水")
+    gateway._repos.thread_message_repo.append_if_ready.assert_not_called()
diff --git a/tests/unit/gateway/test_processor_trajectory_observe.py b/tests/unit/gateway/test_processor_trajectory_observe.py
new file mode 100644
index 00000000..537db1d8
--- /dev/null
+++ b/tests/unit/gateway/test_processor_trajectory_observe.py
@@ -0,0 +1,171 @@
+"""GlobalProcessor side-notifies TrajectoryService without changing stream payloads."""
+
+from __future__ import annotations
+
+import asyncio
+import json
+from typing import Any
+from unittest.mock import AsyncMock, MagicMock
+
+import pytest
+from harness_gateway.models import ChannelSubject, InboundMessage, TextContent
+
+from octop.infra.gateway.process.processor import GlobalProcessor
+from octop.infra.gateway.slash.dispatcher import SlashDispatcher
+from octop.infra.gateway.ws import WS_CHANNEL_ID
+
+_TOOL_CHUNK = {
+    "type": "tool_call_chunk",
+    "id": "call_1",
+    "name": "read_file",
+    "args": {"path": "a.py"},
+}
+
+
+class _RecordingService:
+    def __init__(self) -> None:
+        self.calls: list[tuple[str, str, dict[str, Any]]] = []
+        self.finished: list[tuple[str, dict[str, Any] | None]] = []
+
+    def observe_chunk(self, agent_id: str, thread_id: str, chunk: dict[str, Any]) -> None:
+        self.calls.append((agent_id, thread_id, chunk))
+
+    def finish_turn(self, thread_id: str, usage: dict[str, Any] | None = None) -> None:
+        self.finished.append((thread_id, usage))
+
+
+class _BoomService:
+    def observe_chunk(self, *_args: object, **_kwargs: object) -> None:
+        raise RuntimeError("observe down")
+
+    def finish_turn(self, *_args: object, **_kwargs: object) -> None:
+        raise RuntimeError("finish down")
+
+
+def _processor(
+    *,
+    trajectory_service: object | None,
+    enable_trajectory: bool = True,
+) -> GlobalProcessor:
+    async def _stream(*_args: object, **_kwargs: object):
+        yield dict(_TOOL_CHUNK)
+
+    agent_manager = MagicMock()
+    agent_manager.stream = _stream
+    agent_manager.merge_turn_mcp_servers = MagicMock(return_value=None)
+    agent_manager.prepare_chat_mcp = AsyncMock(return_value=[])
+
+    agent_row = MagicMock()
+    agent_row.user_id = 1
+    agent_row.config_json = json.dumps({} if enable_trajectory else {"enable_trajectory": False})
+    agent_row.system_prompt = None
+    agent_repo = MagicMock()
+    agent_repo.get = MagicMock(return_value=agent_row)
+
+    return GlobalProcessor(
+        agent_manager=agent_manager,
+        thread_registry=MagicMock(),
+        audit_repo=MagicMock(),
+        agent_repo=agent_repo,
+        user_repo=MagicMock(),
+        connector_repo=MagicMock(),
+        dispatcher=SlashDispatcher(),
+        usage_repo=None,
+        gateway=None,
+        trajectory_service=trajectory_service,
+    )
+
+
+def _dashboard_msg() -> InboundMessage:
+    return InboundMessage(
+        channel_id=WS_CHANNEL_ID,
+        channel_type="dashboard",
+        tenant_id="agent-1",
+        channel_subject=ChannelSubject(subject_id="1"),
+        content=[TextContent(text="read a.py")],
+        metadata={"session_key": "sk", "thread_id": "thread-1"},
+    )
+
+
+@pytest.mark.asyncio
+async def test_iter_turn_chunks_observes_tool_chunk() -> None:
+    service = _RecordingService()
+    processor = _processor(trajectory_service=service)
+
+    chunks = [c async for c in processor.iter_turn_chunks(_dashboard_msg())]
+
+    assert any(c.get("type") == "tool_call_chunk" for c in chunks)
+    assert chunks[-1]["type"] == "done"
+    tool_calls = [call for call in service.calls if call[2].get("type") == "tool_call_chunk"]
+    assert len(tool_calls) == 1
+    agent_id, thread_id, chunk = tool_calls[0]
+    assert agent_id == "agent-1"
+    assert thread_id == "thread-1"
+    assert chunk["name"] == "read_file"
+
+
+@pytest.mark.asyncio
+async def test_iter_turn_chunks_observes_user_before_stream() -> None:
+    service = _RecordingService()
+    processor = _processor(trajectory_service=service)
+
+    chunks = [c async for c in processor.iter_turn_chunks(_dashboard_msg())]
+
+    assert any(c.get("type") == "tool_call_chunk" for c in chunks)
+    assert [call[2]["type"] for call in service.calls][0] == "user"
+    user_chunk = service.calls[0][2]
+    assert "read a.py" in str(user_chunk.get("content") or "")
+    assert service.calls[0][0] == "agent-1"
+    assert service.calls[0][1] == "thread-1"
+    assert service.finished == [("thread-1", None)]
+
+
+@pytest.mark.asyncio
+async def test_iter_turn_chunks_continues_when_observe_raises() -> None:
+    processor = _processor(trajectory_service=_BoomService())
+
+    chunks = [c async for c in processor.iter_turn_chunks(_dashboard_msg())]
+
+    tool = next(c for c in chunks if c.get("type") == "tool_call_chunk")
+    assert tool["name"] == "read_file"
+    assert chunks[-1]["type"] == "done"
+
+
+@pytest.mark.asyncio
+async def test_iter_turn_chunks_noop_when_service_absent() -> None:
+    processor = _processor(trajectory_service=None)
+
+    chunks = [c async for c in processor.iter_turn_chunks(_dashboard_msg())]
+
+    assert any(c.get("type") == "tool_call_chunk" for c in chunks)
+    assert chunks[-1]["type"] == "done"
+
+
+@pytest.mark.asyncio
+async def test_iter_turn_chunks_finishes_trajectory_when_cancelled() -> None:
+    service = _RecordingService()
+    processor = _processor(trajectory_service=service)
+
+    async def cancelled_stream(*_args: object, **_kwargs: object):
+        yield {"type": "token", "content": "partial"}
+        raise asyncio.CancelledError
+
+    processor._agent_manager.stream = cancelled_stream  # noqa: SLF001
+
+    with pytest.raises(asyncio.CancelledError):
+        _ = [chunk async for chunk in processor.iter_turn_chunks(_dashboard_msg())]
+
+    assert service.finished == [("thread-1", None)]
+
+
+@pytest.mark.asyncio
+async def test_iter_turn_chunks_skips_observe_when_trajectory_disabled() -> None:
+    service = _RecordingService()
+    processor = _processor(trajectory_service=service, enable_trajectory=False)
+
+    chunks = [c async for c in processor.iter_turn_chunks(_dashboard_msg())]
+
+    assert any(c.get("type") == "tool_call_chunk" for c in chunks)
+    assert chunks[-1]["type"] == "done"
+    assert service.calls == []
+    assert service.finished == []
diff --git a/tests/unit/gateway/test_thread_registry.py b/tests/unit/gateway/test_thread_registry.py
index adc5be97..cedf0155 100644
--- a/tests/unit/gateway/test_thread_registry.py
+++ b/tests/unit/gateway/test_thread_registry.py
@@ -178,3 +178,104 @@ async def test_get_or_create_by_key_backfills_channel_id(registry: ThreadRegistr
     row = registry.get_session(sk)
     assert row is not None
     assert row.channel_id == "ch-feishu-1"
+    assert row.channel_metadata is not None
+    assert row.channel_metadata["channel_id"] == "ch-feishu-1"
+
+
+@pytest.mark.asyncio
+async def test_inbound_rebinds_session_to_replacement_channel(registry: ThreadRegistry) -> None:
+    """A deleted channel's id must not stay bound, or proactive push breaks."""
+    sk = ThreadRegistry.make_key(agent_id="a1", channel_type="feishu", channel_subject_id="ou_x")
+    await registry.get_or_create_by_key(
+        session_key=sk,
+        agent_id="a1",
+        user_id=1,
+        channel_type="feishu",
+        channel_channel_id="ch-old",
+    )
+    await registry.get_or_create_by_key(
+        session_key=sk,
+        agent_id="a1",
+        user_id=1,
+        channel_type="feishu",
+        channel_channel_id="ch-new",
+    )
+    row = registry.get_session(sk)
+    assert row is not None
+    assert row.channel_id == "ch-new"
+    assert row.channel_metadata is not None
+    assert row.channel_metadata["channel_id"] == "ch-new"
+
+
+@pytest.mark.asyncio
+async def test_get_or_create_rebinds_replacement_channel(registry: ThreadRegistry) -> None:
+    await registry.get_or_create(
+        agent_id="a1",
+        user_id=1,
+        channel_type="feishu",
+        channel_subject_id="ou_x",
+        channel_id="ch-old",
+    )
+    await registry.get_or_create(
+        agent_id="a1",
+        user_id=1,
+        channel_type="feishu",
+        channel_subject_id="ou_x",
+        channel_id="ch-new",
+    )
+    sk = ThreadRegistry.make_key(agent_id="a1", channel_type="feishu", channel_subject_id="ou_x")
+    row = registry.get_session(sk)
+    assert row is not None
+    assert row.channel_id == "ch-new"
+    assert row.channel_metadata is not None
+    assert row.channel_metadata["channel_id"] == "ch-new"
+
+
+@pytest.mark.asyncio
+async def test_same_channel_id_does_not_rewrite_session(registry: ThreadRegistry) -> None:
+    sk = ThreadRegistry.make_key(agent_id="a1", channel_type="feishu", channel_subject_id="ou_x")
+    await registry.get_or_create_by_key(
+        session_key=sk,
+        agent_id="a1",
+        user_id=1,
+        channel_type="feishu",
+        channel_channel_id="ch-same",
+    )
+    before = registry.get_session(sk)
+    assert before is not None
+    await registry.get_or_create_by_key(
+        session_key=sk,
+        agent_id="a1",
+        user_id=1,
+        channel_type="feishu",
+        channel_channel_id="ch-same",
+    )
+    after = registry.get_session(sk)
+    assert after is not None
+    assert after.updated_at == before.updated_at
+    assert after.channel_id == "ch-same"
+
+
+@pytest.mark.asyncio
+async def test_metadata_refresh_keeps_bound_channel_id(registry: ThreadRegistry) -> None:
+    sk = ThreadRegistry.make_key(agent_id="a1", channel_type="feishu", channel_subject_id="ou_x")
+    await registry.get_or_create_by_key(
+        session_key=sk,
+        agent_id="a1",
+        user_id=1,
+        channel_type="feishu",
+        channel_channel_id="ch-keep",
+    )
+    await registry.get_or_create_by_key(
+        session_key=sk,
+        agent_id="a1",
+        user_id=1,
+        channel_type="feishu",
+        channel_metadata={"chat_id": "oc_1"},
+    )
+    row = registry.get_session(sk)
+    assert row is not None
+    assert row.channel_id == "ch-keep"
+    assert row.channel_metadata is not None
+    assert row.channel_metadata["channel_id"] == "ch-keep"
+    assert row.channel_metadata["chat_id"] == "oc_1"
diff --git a/tests/unit/knowledge/test_jobs.py b/tests/unit/knowledge/test_jobs.py
index b7dc0ab4..fe984bc0 100644
--- a/tests/unit/knowledge/test_jobs.py
+++ b/tests/unit/knowledge/test_jobs.py
@@ -117,6 +117,30 @@ def test_process_document_indexes_chunks_and_marks_ready(
     assert KnowledgeIndex(kb.id).search([1.0, 0.0], 1)[0].doc_id == doc.id
 
 
+def test_process_document_indexes_ocr_text(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setenv("OCTOP_HOME", str(tmp_path / "home"))
+    pool = SqlitePool(tmp_path / "octop.db")
+    run_migrations(pool)
+    repo = KnowledgeRepo(pool)
+    owner_id = UserRepo(pool).create(username="owner", password_hash="h", role="user")
+    kb = repo.create_base(owner_user_id=owner_id, name="Scans", embedding_model="model")
+    doc = repo.create_document(
+        kb_id=kb.id, filename="scan.png", content_type="image/png", byte_size=5
+    )
+    write_document(kb.id, doc.id, doc.filename, b"image")
+    services = SimpleNamespace(knowledge_repo=repo, settings_repo=SettingsRepo(pool))
+    monkeypatch.setattr(jobs, "assert_knowledge_usable", lambda *_args: None)
+    monkeypatch.setattr(jobs, "optional_ocr_extractor", lambda _services: lambda _path: "发票")
+    monkeypatch.setattr(jobs, "embed_knowledge_texts", lambda _services, _texts: [[1.0, 0.0]])
+
+    jobs.process_document(services, kb.id, doc.id)
+
+    updated = repo.get_document(doc.id)
+    assert updated is not None
+    assert updated.status == "ready"
+    assert KnowledgeIndex(kb.id).search([1.0, 0.0], 1)[0].text == "发票"
+
+
 def test_reindex_all_updates_base_model_marks_documents_pending_and_enqueues(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch
 ) -> None:
diff --git a/tests/unit/knowledge/test_ocr.py b/tests/unit/knowledge/test_ocr.py
new file mode 100644
index 00000000..77abd692
--- /dev/null
+++ b/tests/unit/knowledge/test_ocr.py
@@ -0,0 +1,156 @@
+"""Tests for optional knowledge-base OCR configuration and routing."""
+
+from __future__ import annotations
+
+from pathlib import Path
+from types import SimpleNamespace
+
+import pytest
+from pypdf import PdfWriter
+
+from octop.infra.knowledge import ocr
+from octop.infra.knowledge.parse import parse_document
+
+
+def test_ocr_disabled_by_default() -> None:
+    capability = ocr.get_ocr_capability(lambda _key: None)
+
+    assert capability["enabled"] is False
+    assert capability["backend"] == "onnx"
+    assert capability["usable"] is False
+
+
+def test_set_local_ocr_settings(monkeypatch: pytest.MonkeyPatch) -> None:
+    values: dict[str, str] = {}
+    monkeypatch.setattr(ocr, "local_ocr_deps_available", lambda: True)
+
+    ocr.set_ocr_settings(
+        values.__setitem__,
+        enabled=True,
+        backend="onnx",
+        model=None,
+        provider_id=None,
+    )
+
+    assert values == {
+        "knowledge_ocr_enabled": "true",
+        "knowledge_ocr_backend": "onnx",
+        "knowledge_ocr_model": "rapidocr",
+        "knowledge_ocr_provider_id": "",
+    }
+
+
+def test_remote_ocr_requires_image_capable_model() -> None:
+    provider = SimpleNamespace(
+        enabled=True,
+        api_key="secret",
+        base_url="https://example.test/v1",
+        name="Remote",
+        get_models=lambda: [
+            {"id": "text-only", "input": ["text"]},
+            {"id": "vision-1", "input": ["text", "image"]},
+        ],
+    )
+    repo = SimpleNamespace(get=lambda provider_id: provider if provider_id == 7 else None)
+    values: dict[str, str] = {}
+
+    with pytest.raises(ValueError, match="provider is not ready"):
+        ocr.set_ocr_settings(
+            values.__setitem__,
+            enabled=True,
+            backend="remote",
+            model="text-only",
+            provider_id="7",
+            provider_repo=repo,
+        )
+
+    ocr.set_ocr_settings(
+        values.__setitem__,
+        enabled=True,
+        backend="remote",
+        model="vision-1",
+        provider_id="7",
+        provider_repo=repo,
+    )
+    assert ocr.get_ocr_capability(values.get, repo)["usable"] is True
+
+
+def test_image_and_blank_pdf_use_ocr(tmp_path: Path) -> None:
+    image = tmp_path / "scan.png"
+    image.write_bytes(b"not-decoded-by-the-fake")
+    pdf = tmp_path / "scan.pdf"
+    writer = PdfWriter()
+    writer.add_blank_page(width=72, height=72)
+    with pdf.open("wb") as output:
+        writer.write(output)
+    calls: list[Path] = []
+
+    def fake_ocr(path: Path) -> str:
+        calls.append(path)
+        return "recognized text"
+
+    assert parse_document(image, ocr=fake_ocr) == "recognized text"
+    assert parse_document(pdf, ocr=fake_ocr) == "recognized text"
+    assert calls == [image, pdf]
+
+
+def test_text_pdf_does_not_require_ocr(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    pdf = tmp_path / "text.pdf"
+    pdf.write_bytes(b"placeholder")
+
+    class Page:
+        @staticmethod
+        def extract_text() -> str:
+            return "embedded text"
+
+    monkeypatch.setattr(
+        "pypdf.PdfReader",
+        lambda _path: SimpleNamespace(pages=[Page()]),
+    )
+
+    def unexpected_ocr(_path: Path) -> str:
+        raise AssertionError("OCR must not run for a text PDF")
+
+    assert parse_document(pdf, ocr=unexpected_ocr) == "embedded text"
+
+
+def test_image_requires_enabled_ocr(tmp_path: Path) -> None:
+    image = tmp_path / "scan.jpg"
+    image.write_bytes(b"image")
+
+    with pytest.raises(RuntimeError, match="OCR is not enabled"):
+        parse_document(image)
+
+
+def test_local_ocr_joins_rapidocr_text_lines(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    image = tmp_path / "scan.png"
+    image.write_bytes(b"image")
+
+    def engine(_data: bytes) -> SimpleNamespace:
+        return SimpleNamespace(txts=("第一行", "Second line"))
+
+    monkeypatch.setattr(ocr, "_rapidocr_engine", lambda: engine)
+
+    assert ocr._extract_local(image) == "第一行\nSecond line"
+
+
+def test_remote_ocr_sends_image_block(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    image = tmp_path / "scan.png"
+    image.write_bytes(b"image")
+    messages: list[object] = []
+
+    class Model:
+        @staticmethod
+        def invoke(value: list[object]) -> SimpleNamespace:
+            messages.extend(value)
+            return SimpleNamespace(content="remote text")
+
+    monkeypatch.setattr(ocr, "build_probe_chat_model", lambda *_a, **_k: Model())
+    extractor = ocr._RemoteOcr(SimpleNamespace(), "vision")
+
+    assert extractor(image) == "remote text"
+    content = messages[0].content
+    assert content[1]["type"] == "image_url"
+    assert content[1]["image_url"]["url"].startswith("data:image/png;base64,")
diff --git a/tests/unit/knowledge/test_parse.py b/tests/unit/knowledge/test_parse.py
index a32a58e1..15c99069 100644
--- a/tests/unit/knowledge/test_parse.py
+++ b/tests/unit/knowledge/test_parse.py
@@ -2,12 +2,65 @@
 
 from __future__ import annotations
 
+import io
+import zipfile
 from pathlib import Path
 
 import pytest
 
 from octop.infra.knowledge.parse import parse_document
 
+_DOCX_NAMESPACES = (
+    'xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" '
+    'xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" '
+    'xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" '
+    'xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" '
+    'xmlns:v="urn:schemas-microsoft-com:vml"'
+)
+_DOCX_MAIN_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+_ALT_CHUNK_RELATIONSHIP = (
+    '<Relationship Id="rId99" Target="../{name}" '
+    'Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/aFChunk"/>'
+)
+
+
+def _docx_paragraph(text: str) -> str:
+    return f"<w:p><w:r><w:t>{text}</w:t></w:r></w:p>"
+
+
+def _docx_with_body(
+    path: Path, body_xml: str, *, alt_chunk: tuple[str, str, bytes] | None = None
+) -> Path:
+    """Write a .docx whose ``w:body`` holds *body_xml* verbatim.
+
+    *alt_chunk* is ``(part_name, content_type, blob)`` for a part related as ``rId99``,
+    matching what converters emit for ``<w:altChunk r:id="rId99"/>``.
+    """
+    from docx import Document
+
+    Document().save(path)
+    document = f"<w:document {_DOCX_NAMESPACES}><w:body>{body_xml}</w:body></w:document>".encode()
+    with zipfile.ZipFile(path) as source:
+        entries = [(info.filename, source.read(info.filename)) for info in source.infolist()]
+    buffer = io.BytesIO()
+    with zipfile.ZipFile(buffer, "w") as target:
+        for name, data in entries:
+            if name == "word/document.xml":
+                data = document
+            elif alt_chunk is not None and name == "word/_rels/document.xml.rels":
+                relationship = _ALT_CHUNK_RELATIONSHIP.format(name=alt_chunk[0])
+                data = data.replace(
+                    b"</Relationships>", relationship.encode() + b"</Relationships>"
+                )
+            elif alt_chunk is not None and name == "[Content_Types].xml":
+                override = f'<Override PartName="/{alt_chunk[0]}" ContentType="{alt_chunk[1]}"/>'
+                data = data.replace(b"</Types>", override.encode() + b"</Types>")
+            target.writestr(name, data)
+        if alt_chunk is not None:
+            target.writestr(alt_chunk[0], alt_chunk[2])
+    path.write_bytes(buffer.getvalue())
+    return path
+
 
 def test_parse_plain_text_and_markdown(tmp_path: Path) -> None:
     text = tmp_path / "notes.txt"
@@ -45,9 +98,127 @@ def test_parse_pdf_docx_and_pptx(tmp_path: Path) -> None:
     assert parse_document(pptx) == "Slide title"
 
 
+def test_parse_docx_reads_tables_content_controls_and_revisions(tmp_path: Path) -> None:
+    body = (
+        _docx_paragraph("发布说明")
+        + "<w:p/>"
+        + f"<w:tbl><w:tr><w:tc>{_docx_paragraph('第一章 总则')}</w:tc></w:tr></w:tbl>"
+        + f"<w:sdt><w:sdtContent>{_docx_paragraph('第一条 为了规范')}</w:sdtContent></w:sdt>"
+        + '<w:ins w:id="1" w:author="u" w:date="2026-08-27T00:00:00Z">'
+        + f"{_docx_paragraph('第二条 本办法适用于')}</w:ins>"
+    )
+    path = _docx_with_body(tmp_path / "nested.docx", body)
+
+    assert parse_document(path) == "发布说明\n\n第一章 总则\n第一条 为了规范\n第二条 本办法适用于"
+
+
+def test_parse_docx_reads_text_box_once(tmp_path: Path) -> None:
+    text_box = f"<w:txbxContent>{_docx_paragraph('文本框内容')}</w:txbxContent>"
+    body = _docx_paragraph("正文段落") + (
+        "<w:p><w:r><mc:AlternateContent>"
+        f'<mc:Choice Requires="wps"><wps:txbx>{text_box}</wps:txbx></mc:Choice>'
+        f"<mc:Fallback><v:textbox>{text_box}</v:textbox></mc:Fallback>"
+        "</mc:AlternateContent></w:r></w:p>"
+    )
+    path = _docx_with_body(tmp_path / "textbox.docx", body)
+
+    assert parse_document(path) == "正文段落\n\n文本框内容"
+
+
+def test_parse_docx_expands_html_alt_chunk(tmp_path: Path) -> None:
+    chunk = "<html><body><p>第一章 总则</p><p>第一条 为了规范</p></body></html>".encode()
+    path = _docx_with_body(
+        tmp_path / "html_chunk.docx",
+        _docx_paragraph("发布说明") + '<w:altChunk r:id="rId99"/>',
+        alt_chunk=("chunk.xhtml", "application/xhtml+xml", chunk),
+    )
+
+    assert parse_document(path) == "发布说明\n第一章 总则\n第一条 为了规范"
+
+
+def test_parse_docx_expands_word_alt_chunk(tmp_path: Path) -> None:
+    nested = _docx_with_body(tmp_path / "nested.docx", _docx_paragraph("嵌套正文"))
+    path = _docx_with_body(
+        tmp_path / "word_chunk.docx",
+        _docx_paragraph("发布说明") + '<w:altChunk r:id="rId99"/>',
+        alt_chunk=("chunk.docx", _DOCX_MAIN_TYPE, nested.read_bytes()),
+    )
+
+    assert parse_document(path) == "发布说明\n嵌套正文"
+
+
+def test_parse_csv_xlsx_and_xls(tmp_path: Path) -> None:
+    import xlwt
+    from openpyxl import Workbook
+
+    csv_path = tmp_path / "sales.csv"
+    csv_path.write_text("item,qty\napple,2\n", encoding="utf-8")
+
+    tsv_path = tmp_path / "sales.tsv"
+    tsv_path.write_text("item\tqty\napple\t2\n", encoding="utf-8")
+
+    xlsx = tmp_path / "sales.xlsx"
+    workbook = Workbook()
+    sheet = workbook.active
+    assert sheet is not None
+    sheet.title = "Q1"
+    sheet.append(["item", "qty"])
+    sheet.append(["apple", 2])
+    extra = workbook.create_sheet("Q2")
+    extra.append(["item", "qty"])
+    extra.append(["pear", 3])
+    workbook.save(xlsx)
+
+    xlsm = tmp_path / "sales.xlsm"
+    workbook.save(xlsm)
+
+    xls = tmp_path / "sales.xls"
+    book = xlwt.Workbook()
+    q1 = book.add_sheet("Q1")
+    q1.write(0, 0, "item")
+    q1.write(0, 1, "qty")
+    q1.write(1, 0, "apple")
+    q1.write(1, 1, 2)
+    book.save(str(xls))
+
+    expected_xlsx = "# Q1\nitem\tqty\napple\t2\n\n# Q2\nitem\tqty\npear\t3"
+    assert parse_document(csv_path) == "# sales\nitem\tqty\napple\t2"
+    assert parse_document(tsv_path) == "# sales\nitem\tqty\napple\t2"
+    assert parse_document(xlsx) == expected_xlsx
+    assert parse_document(xlsm) == expected_xlsx
+    assert parse_document(xls) == "# Q1\nitem\tqty\napple\t2"
+
+
+def test_parse_html_json_and_plain_variants(tmp_path: Path) -> None:
+    html = tmp_path / "page.html"
+    html.write_text(
+        "<html><head><style>p{color:red}</style></head>"
+        "<body><h1>Title</h1><p>Hello <b>world</b></p>"
+        "<script>alert(1)</script></body></html>",
+        encoding="utf-8",
+    )
+    markdown = tmp_path / "notes.markdown"
+    markdown.write_text("# Heading\n\nbody", encoding="utf-8")
+    rst = tmp_path / "notes.rst"
+    rst.write_text("Heading\n=======\n\nbody", encoding="utf-8")
+    yaml_path = tmp_path / "config.yaml"
+    yaml_path.write_text("name: octop\n", encoding="utf-8")
+    json_path = tmp_path / "data.json"
+    json_path.write_text('{"name":"octop","ok":true}', encoding="utf-8")
+    jsonl = tmp_path / "rows.jsonl"
+    jsonl.write_text('{"a":1}\n{"b":2}\n', encoding="utf-8")
+
+    assert parse_document(html) == "Title\nHello world"
+    assert parse_document(markdown) == "# Heading\n\nbody"
+    assert parse_document(rst) == "Heading\n=======\n\nbody"
+    assert parse_document(yaml_path) == "name: octop\n"
+    assert parse_document(json_path) == '{\n  "name": "octop",\n  "ok": true\n}'
+    assert parse_document(jsonl) == '{"a":1}\n{"b":2}\n'
+
+
 def test_parse_rejects_unsupported_extension(tmp_path: Path) -> None:
-    path = tmp_path / "unsupported.xlsx"
-    path.write_bytes(b"not a spreadsheet")
+    path = tmp_path / "unsupported.zip"
+    path.write_bytes(b"not a document")
 
     with pytest.raises(ValueError, match="unsupported"):
         parse_document(path)
diff --git a/tests/unit/knowledge/test_text_documents.py b/tests/unit/knowledge/test_text_documents.py
index a4dc90d9..5fa8feac 100644
--- a/tests/unit/knowledge/test_text_documents.py
+++ b/tests/unit/knowledge/test_text_documents.py
@@ -71,3 +71,99 @@ def test_create_and_update_text_document(
     assert path.read_text(encoding="utf-8") == "# Updated\n"
     raw = svc.read_text_document(base.id, created.id, actor_user_id=services.owner_id)
     assert raw["text"] == "# Updated\n"
+
+
+def test_upload_spreadsheet_documents(
+    services: SimpleNamespace, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    monkeypatch.setattr(
+        "octop.infra.knowledge.service.assert_knowledge_usable",
+        lambda *_a, **_k: None,
+    )
+    svc = KnowledgeService(services)
+    base = svc.create_base(owner_user_id=services.owner_id, name="Sheets")
+    xlsx = svc.upload_document(
+        base.id,
+        actor_user_id=services.owner_id,
+        filename="sales.xlsx",
+        content_type="application/octet-stream",
+        content=b"fake-xlsx",
+    )
+    csv_doc = svc.upload_document(
+        base.id,
+        actor_user_id=services.owner_id,
+        filename="sales.csv",
+        content_type="application/vnd.ms-excel",
+        content=b"a,b\n1,2\n",
+    )
+    xls = svc.upload_document(
+        base.id,
+        actor_user_id=services.owner_id,
+        filename="legacy.xls",
+        content_type="application/vnd.ms-excel",
+        content=b"fake-xls",
+    )
+    html = svc.upload_document(
+        base.id,
+        actor_user_id=services.owner_id,
+        filename="page.html",
+        content_type="text/html",
+        content=b"<p>hi</p>",
+    )
+    json_doc = svc.upload_document(
+        base.id,
+        actor_user_id=services.owner_id,
+        filename="data.json",
+        content_type="application/json",
+        content=b"{}",
+    )
+    xlsm = svc.upload_document(
+        base.id,
+        actor_user_id=services.owner_id,
+        filename="macro.xlsm",
+        content_type="application/octet-stream",
+        content=b"fake-xlsm",
+    )
+    assert xlsx.content_type == (
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+    )
+    assert csv_doc.content_type == "text/csv"
+    assert xls.content_type == "application/vnd.ms-excel"
+    assert html.content_type == "text/html"
+    assert json_doc.content_type == "application/json"
+    assert xlsm.content_type == "application/vnd.ms-excel.sheet.macroEnabled.12"
+
+
+def test_image_upload_requires_ocr(
+    services: SimpleNamespace, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    monkeypatch.setattr(
+        "octop.infra.knowledge.service.assert_knowledge_usable",
+        lambda *_a, **_k: None,
+    )
+    svc = KnowledgeService(services)
+    base = svc.create_base(owner_user_id=services.owner_id, name="Images")
+
+    with pytest.raises(ValueError, match="OCR must be enabled"):
+        svc.upload_document(
+            base.id,
+            actor_user_id=services.owner_id,
+            filename="scan.png",
+            content_type="image/png",
+            content=b"image",
+        )
+
+    services.settings_repo.get.side_effect = lambda key, default=None: {
+        "knowledge_feature_enabled": "1",
+        "knowledge_embedding_backend": "onnx",
+        "knowledge_embedding_model": "tiny",
+        "knowledge_ocr_enabled": "true",
+    }.get(key, default)
+    created = svc.upload_document(
+        base.id,
+        actor_user_id=services.owner_id,
+        filename="scan.png",
+        content_type="application/octet-stream",
+        content=b"image",
+    )
+    assert created.content_type == "image/png"
diff --git a/tests/unit/mobile/test_docker_install.py b/tests/unit/mobile/test_docker_install.py
new file mode 100644
index 00000000..fbf7b653
--- /dev/null
+++ b/tests/unit/mobile/test_docker_install.py
@@ -0,0 +1,341 @@
+"""tests/unit/mobile/test_docker_install.py"""
+
+from __future__ import annotations
+
+import json
+from pathlib import Path
+from unittest.mock import patch
+
+import pytest
+
+from octop.infra.mobile import docker_install
+from octop.infra.mobile.docker_install import (
+    _merge_registry_mirror,
+    _probe_tencent_mirror,
+    select_download_source,
+)
+
+
+def _with_measure(delays: dict[str, float | None]):
+    def deco(fn):
+        async def wrapper():
+            async def fake(url: str) -> float | None:
+                return delays[url]
+
+            with patch.object(docker_install, "_measure_source_delay", fake):
+                return await fn()
+
+        wrapper.__name__ = fn.__name__
+        return wrapper
+
+    return deco
+
+
+@pytest.mark.asyncio
+@_with_measure(
+    {
+        "https://download.docker.com": 0.1,
+        "https://mirrors.aliyun.com/docker-ce": 0.4,
+        "https://mirrors.tencent.com/docker-ce": 0.5,
+        "https://mirrors.163.com/docker-ce": 0.6,
+        "https://mirrors.cernet.edu.cn/docker-ce": 0.7,
+    }
+)
+async def test_select_download_source_official_wins_no_override() -> None:
+    source, delay = await select_download_source()
+    assert source is None  # official wins → no DOWNLOAD_URL override
+    assert delay == pytest.approx(0.1)
+
+
+@pytest.mark.asyncio
+@_with_measure(
+    {
+        "https://download.docker.com": 0.9,
+        "https://mirrors.aliyun.com/docker-ce": 0.2,
+        "https://mirrors.tencent.com/docker-ce": 0.5,
+        "https://mirrors.163.com/docker-ce": 0.6,
+        "https://mirrors.cernet.edu.cn/docker-ce": 0.7,
+    }
+)
+async def test_select_download_source_mirror_wins() -> None:
+    source, delay = await select_download_source()
+    assert source == "https://mirrors.aliyun.com/docker-ce"
+    assert delay == pytest.approx(0.2)
+
+
+@pytest.mark.asyncio
+@_with_measure(
+    {
+        "https://download.docker.com": None,
+        "https://mirrors.aliyun.com/docker-ce": None,
+        "https://mirrors.tencent.com/docker-ce": None,
+        "https://mirrors.163.com/docker-ce": None,
+        "https://mirrors.cernet.edu.cn/docker-ce": None,
+    }
+)
+async def test_select_download_source_all_unreachable_falls_back() -> None:
+    source, delay = await select_download_source()
+    assert source is None
+    assert delay is None
+
+
+def test_merge_registry_mirror_fresh_file(tmp_path: Path) -> None:
+    daemon = tmp_path / "daemon.json"
+    assert _merge_registry_mirror(daemon, "https://mirror.example/") is True
+    data = json.loads(daemon.read_text(encoding="utf-8"))
+    assert data["registry-mirrors"] == ["https://mirror.example/"]
+
+
+def test_merge_registry_mirror_backs_up_existing(tmp_path: Path) -> None:
+    daemon = tmp_path / "daemon.json"
+    daemon.write_text('{"log-level": "warn"}', encoding="utf-8")
+    assert _merge_registry_mirror(daemon, "https://mirror.example/") is True
+    backup = tmp_path / "daemon.json.backup"
+    assert json.loads(backup.read_text(encoding="utf-8")) == {"log-level": "warn"}
+    data = json.loads(daemon.read_text(encoding="utf-8"))
+    assert data["registry-mirrors"] == ["https://mirror.example/"]
+    assert data["log-level"] == "warn"  # other keys preserved
+
+
+def test_merge_registry_mirror_skips_when_configured(tmp_path: Path) -> None:
+    daemon = tmp_path / "daemon.json"
+    daemon.write_text('{"registry-mirrors": ["https://old/"]}', encoding="utf-8")
+    assert _merge_registry_mirror(daemon, "https://mirror.example/") is False
+    assert json.loads(daemon.read_text(encoding="utf-8")) == {"registry-mirrors": ["https://old/"]}
+
+
+def test_merge_registry_mirror_skips_corrupt_file(tmp_path: Path) -> None:
+    daemon = tmp_path / "daemon.json"
+    daemon.write_text("{not json", encoding="utf-8")
+    assert _merge_registry_mirror(daemon, "https://mirror.example/") is False
+    assert daemon.read_text(encoding="utf-8") == "{not json"  # left untouched
+
+
+def test_privileged_cmd_prefixes_sudo_when_not_root(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setattr(docker_install, "geteuid", lambda: 1000)
+    assert docker_install._privileged_cmd("systemctl", "restart", "docker") == [
+        "sudo",
+        "-n",
+        "systemctl",
+        "restart",
+        "docker",
+    ]
+    monkeypatch.setattr(docker_install, "geteuid", lambda: 0)
+    assert docker_install._privileged_cmd("systemctl", "restart", "docker") == [
+        "systemctl",
+        "restart",
+        "docker",
+    ]
+
+
+def test_write_text_privileged_falls_back_to_sudo_tee(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    target = tmp_path / "daemon.json"
+    monkeypatch.setattr(docker_install, "geteuid", lambda: 1000)
+
+    orig_write = Path.write_text
+
+    def boom(_self: Path, *_args: object, **_kwargs: object) -> None:
+        raise PermissionError("denied")
+
+    calls: list[list[str]] = []
+
+    def fake_run(argv: list[str], **kwargs: object) -> object:
+        calls.append(list(argv))
+        raw = kwargs.get("input")
+        assert isinstance(raw, bytes)
+        orig_write(target, raw.decode("utf-8"), encoding="utf-8")
+
+        class _Proc:
+            returncode = 0
+
+        return _Proc()
+
+    monkeypatch.setattr(Path, "write_text", boom)
+    monkeypatch.setattr(docker_install.subprocess, "run", fake_run)
+    assert docker_install._write_text_privileged(target, '{"ok": true}\n') is True
+    assert calls[0] == ["sudo", "-n", "tee", str(target)]
+    assert json.loads(target.read_text(encoding="utf-8")) == {"ok": True}
+
+
+@pytest.mark.asyncio
+async def test_probe_tencent_mirror_unreachable() -> None:
+    # 127.0.0.1:1 → connection refused → probe returns False quickly.
+    with patch.object(docker_install, "_TENCENT_MIRROR_HOST", "127.0.0.1"):
+        assert await _probe_tencent_mirror() is False
+
+
+@pytest.mark.asyncio
+async def test_install_mobile_stream_auto_installs_docker_then_proceeds() -> None:
+    from octop.infra.mobile import setup as mobile_setup
+
+    async def fake_auto_install(*, locale: str = "en"):
+        yield "docker install log line"
+
+    class FakeProc:
+        def __init__(self) -> None:
+            self.stdout = self
+            self._lines = [b"container install log line"]
+
+        async def readline(self) -> bytes:
+            return self._lines.pop(0) if self._lines else b""
+
+        async def wait(self) -> int:
+            return 0
+
+    async def fake_exec(*args: object, **kwargs: object) -> FakeProc:
+        return FakeProc()
+
+    async def collect():
+        events = []
+        async for evt in mobile_setup.install_mobile_stream(locale="en"):
+            events.append(evt)
+        return events
+
+    script = mobile_setup.bundled_scripts_dir() / "install.sh"
+    with (
+        patch.object(mobile_setup, "_docker_available", return_value=False),
+        patch.object(mobile_setup, "platform") as fake_platform,
+        patch.object(mobile_setup, "can_install_without_password", return_value=True),
+        patch.object(mobile_setup, "auto_install_docker_stream", side_effect=fake_auto_install),
+        patch.object(mobile_setup, "docker_daemon_ready", return_value=True),
+        patch.object(mobile_setup, "bundled_scripts_dir", return_value=script.parent),
+        patch.object(mobile_setup.asyncio, "create_subprocess_exec", new=fake_exec),
+    ):
+        fake_platform.system.return_value = "Linux"
+        events = await collect()
+
+    logs = [
+        json.loads(e.removeprefix("data: ").strip())["log"]
+        for e in events
+        if "log" in json.loads(e.removeprefix("data: ").strip())
+    ]
+    assert any("docker install log line" in line for line in logs)
+    done = [json.loads(e.removeprefix("data: ").strip()) for e in events][-1]
+    assert done.get("done") is True
+
+
+@pytest.mark.asyncio
+async def test_install_mobile_stream_auto_install_fails_reports_docker_missing() -> None:
+    from octop.infra.mobile import setup as mobile_setup
+
+    async def fake_auto_install(*, locale: str = "en"):
+        yield "failed log"
+
+    async def collect():
+        events = []
+        async for evt in mobile_setup.install_mobile_stream(locale="en"):
+            events.append(evt)
+        return events
+
+    with (
+        patch.object(mobile_setup, "_docker_available", return_value=False),
+        patch.object(mobile_setup, "platform") as fake_platform,
+        patch.object(mobile_setup, "can_install_without_password", return_value=True),
+        patch.object(mobile_setup, "auto_install_docker_stream", side_effect=fake_auto_install),
+        patch.object(mobile_setup, "docker_daemon_ready", return_value=False),
+    ):
+        fake_platform.system.return_value = "Linux"
+        events = await collect()
+
+    last = [json.loads(e.removeprefix("data: ").strip()) for e in events][-1]
+    assert last.get("done") is False
+    assert last.get("error") == "docker_missing"
+
+
+@pytest.mark.asyncio
+async def test_install_mobile_stream_no_sudo_reports_docker_missing() -> None:
+    from octop.infra.mobile import setup as mobile_setup
+
+    async def collect():
+        events = []
+        async for evt in mobile_setup.install_mobile_stream(locale="en"):
+            events.append(evt)
+        return events
+
+    with (
+        patch.object(mobile_setup, "_docker_available", return_value=False),
+        patch.object(mobile_setup, "platform") as fake_platform,
+        patch.object(mobile_setup, "can_install_without_password", return_value=False),
+    ):
+        fake_platform.system.return_value = "Linux"
+        events = await collect()
+
+    last = [json.loads(e.removeprefix("data: ").strip()) for e in events][-1]
+    assert last.get("done") is False
+    assert last.get("error") == "docker_missing"
+
+
+def test_classify_script_error_maps_known_failures() -> None:
+    assert (
+        docker_install._classify_script_error(["ERROR: Unsupported distribution 'sles'"])
+        == "docker_hint_unsupported_distro"
+    )
+    assert (
+        docker_install._classify_script_error(
+            ["Error: this installer needs the ability to run commands as root."]
+        )
+        == "docker_hint_no_root"
+    )
+    assert (
+        docker_install._classify_script_error(
+            ["+ curl -fsSL https://example/gpg", "curl: (7) Failed to connect"]
+        )
+        == "docker_hint_network"
+    )
+    assert (
+        docker_install._classify_script_error(["E: Could not get lock /var/lib/dpkg/lock-frontend"])
+        == "docker_hint_pkg_manager"
+    )
+    assert (
+        docker_install._classify_script_error(["No space left on device"])
+        == "docker_hint_disk_full"
+    )
+    # Unrelated output → no hint.
+    assert docker_install._classify_script_error(["All good"]) is None
+
+
+def test_bundled_install_script_ships_with_package() -> None:
+    script = docker_install.bundled_install_script()
+    assert script.is_file()
+    assert script.name == "install-docker.sh"
+
+
+@pytest.mark.asyncio
+async def test_auto_install_missing_script_reports_error() -> None:
+    async def collect():
+        return [line async for line in docker_install.auto_install_docker_stream(locale="en")]
+
+    with patch.object(docker_install, "bundled_install_script", return_value=Path("/nonexistent")):
+        lines = await collect()
+    assert any("missing from the Octop package" in line for line in lines)
+
+
+@pytest.mark.asyncio
+async def test_auto_install_script_failure_emits_friendly_hint() -> None:
+    class FakeProc:
+        def __init__(self) -> None:
+            self.stdout = self
+            self._lines = [b"Installing...", b"ERROR: Unsupported distribution 'xyz'"]
+
+        async def readline(self) -> bytes:
+            return self._lines.pop(0) if self._lines else b""
+
+        async def wait(self) -> int:
+            return 1
+
+    async def fake_exec(*args: object, **kwargs: object) -> FakeProc:
+        return FakeProc()
+
+    async def collect():
+        return [line async for line in docker_install.auto_install_docker_stream(locale="en")]
+
+    with (
+        patch.object(docker_install, "select_download_source", return_value=(None, 0.1)),
+        patch.object(docker_install.asyncio, "create_subprocess_exec", new=fake_exec),
+    ):
+        lines = await collect()
+
+    assert any("exit 1" in line for line in lines)
+    assert any("not supported by the Docker install script" in line for line in lines)
diff --git a/tests/unit/proactive/test_scheduler.py b/tests/unit/proactive/test_scheduler.py
index 935ac3b7..4a36a268 100644
--- a/tests/unit/proactive/test_scheduler.py
+++ b/tests/unit/proactive/test_scheduler.py
@@ -15,6 +15,7 @@
 from datetime import UTC, datetime, time
 from pathlib import Path
 from unittest.mock import AsyncMock
+from zoneinfo import ZoneInfo
 
 import pytest
 
@@ -156,6 +157,20 @@ def test_is_in_active_hours_false_after():
     assert is_in_active_hours(now, active_hours_start="09:00", active_hours_end="22:00") is False
 
 
+def test_is_in_active_hours_with_timezone():
+    # 2026-07-01 01:00 UTC is 09:00 Asia/Shanghai.
+    now = datetime(2026, 7, 1, 1, 0, 0, tzinfo=UTC)
+    assert (
+        is_in_active_hours(
+            now,
+            active_hours_start="09:00",
+            active_hours_end="22:00",
+            timezone_name="Asia/Shanghai",
+        )
+        is True
+    )
+
+
 def test_is_in_active_hours_boundary_start():
     """Should return True exactly at the active-window start."""
     now = datetime(2026, 7, 1, 9, 0, 0, tzinfo=UTC)
@@ -168,6 +183,22 @@ def test_is_in_active_hours_boundary_end():
     assert is_in_active_hours(now, active_hours_start="09:00", active_hours_end="22:00") is False
 
 
+def test_compute_next_trigger_with_timezone():
+    now = datetime(2026, 7, 1, 1, 0, 0, tzinfo=UTC)  # 09:00 Shanghai
+    with pytest.MonkeyPatch.context() as mp:
+        mp.setattr("random.randint", lambda a, b: 60)  # 1 hour
+        result = compute_next_trigger(
+            now=now,
+            active_hours_start="09:00",
+            active_hours_end="22:00",
+            min_interval_hours=1,
+            max_interval_hours=2,
+            timezone_name="Asia/Shanghai",
+        )
+    local = result.astimezone(ZoneInfo("Asia/Shanghai"))
+    assert local.time().hour == 10
+
+
 # ---------------------------------------------------------------------------
 # ProactiveCareConfigRepo tests
 # ---------------------------------------------------------------------------
@@ -231,6 +262,27 @@ def test_config_repo_list_enabled(db: SqlitePool, config_repo: ProactiveCareConf
     assert aid2 not in enabled_ids
 
 
+def test_config_repo_list_enabled_includes_default_on_agents(
+    db: SqlitePool, config_repo: ProactiveCareConfigRepo
+):
+    """Agents with no config row default to enabled and must be scheduled."""
+    uid = UserRepo(db).create(username="carol", password_hash="h", role="admin")
+    aid_default = new_ulid()
+    aid_off = new_ulid()
+    AgentRepo(db).create(agent_id=aid_default, user_id=uid, name="default-on")
+    AgentRepo(db).create(agent_id=aid_off, user_id=uid, name="opted-out")
+    config_repo.upsert(ProactiveCareConfig(agent_id=aid_off, enabled=False))
+
+    enabled = config_repo.list_enabled()
+    enabled_ids = {c.agent_id for c in enabled}
+    assert aid_default in enabled_ids
+    assert aid_off not in enabled_ids
+    default_cfg = next(c for c in enabled if c.agent_id == aid_default)
+    assert default_cfg.enabled is True
+    assert default_cfg.min_interval_hours == 5
+    assert default_cfg.max_interval_hours == 24
+
+
 # ---------------------------------------------------------------------------
 # ProactiveCareScheduler tests
 # ---------------------------------------------------------------------------
@@ -314,3 +366,63 @@ async def test_scheduler_start_all_no_enabled(
     )
     await scheduler.start_all()
     assert len(scheduler._tasks) == 0
+
+
+@pytest.mark.asyncio
+async def test_scheduler_start_all_includes_default_on_agent(
+    agent_id: str,
+    config_repo: ProactiveCareConfigRepo,
+    db: SqlitePool,
+):
+    """start_all should schedule agents that never saved a proactive-care row."""
+    from octop.infra.db.repos.sessions import SessionRepo
+
+    care_service = AsyncMock()
+    scheduler = ProactiveCareScheduler(
+        care_service=care_service,
+        config_repo=config_repo,
+        session_repo=SessionRepo(db),
+    )
+    await scheduler.start_all()
+    assert agent_id in scheduler._tasks
+    scheduler.cancel(agent_id)
+    await asyncio.sleep(0.01)
+
+
+@pytest.mark.asyncio
+async def test_shutdown_cancels_long_sleep_quickly(
+    agent_id: str,
+    config_repo: ProactiveCareConfigRepo,
+    db: SqlitePool,
+) -> None:
+    """A default-on loop sleeps for hours; shutdown must not wait that out."""
+    from octop.infra.db.repos.sessions import SessionRepo
+
+    scheduler = ProactiveCareScheduler(
+        care_service=AsyncMock(),
+        config_repo=config_repo,
+        session_repo=SessionRepo(db),
+    )
+    scheduler.ensure_scheduled(agent_id)
+    assert agent_id in scheduler._tasks
+    await asyncio.wait_for(scheduler.shutdown(), timeout=2)
+    assert scheduler._tasks == {}
+
+
+@pytest.mark.asyncio
+async def test_suspend_skips_new_schedules(
+    agent_id: str,
+    config_repo: ProactiveCareConfigRepo,
+    db: SqlitePool,
+) -> None:
+    from octop.infra.db.repos.sessions import SessionRepo
+
+    scheduler = ProactiveCareScheduler(
+        care_service=AsyncMock(),
+        config_repo=config_repo,
+        session_repo=SessionRepo(db),
+    )
+    scheduler.suspend()
+    scheduler.ensure_scheduled(agent_id)
+    await scheduler.start_all()
+    assert scheduler._tasks == {}
diff --git a/tests/unit/test_config.py b/tests/unit/test_config.py
index 56b05f03..c5e8cda3 100644
--- a/tests/unit/test_config.py
+++ b/tests/unit/test_config.py
@@ -26,6 +26,12 @@ def test_defaults_when_missing(tmp_path: Path):
     assert cfg.backup.auto_enabled is False
     assert cfg.backup.schedule == "cron:0 4 * * *"
     assert cfg.backup.retention_count == 7
+    assert cfg.backup.include_config is True
+    assert cfg.backup.include_workspaces is True
+    assert cfg.backup.include_skill_packages is True
+    assert cfg.backup.include_plugins is True
+    assert cfg.backup.include_knowledge is True
+    assert cfg.backup.include_chats is False
     assert cfg.max_upload_mb == 100
     assert cfg.max_upload_bytes == 100 * 1024 * 1024
     assert cfg_path.exists()  # file written with defaults
@@ -44,6 +50,12 @@ def test_loads_backup_section(tmp_path: Path):
                     "auto_enabled": True,
                     "schedule": "interval:7200",
                     "retention_count": 3,
+                    "include_config": False,
+                    "include_workspaces": False,
+                    "include_skill_packages": False,
+                    "include_plugins": False,
+                    "include_knowledge": False,
+                    "include_chats": True,
                 }
             }
         )
@@ -52,16 +64,34 @@ def test_loads_backup_section(tmp_path: Path):
     assert cfg.backup.auto_enabled is True
     assert cfg.backup.schedule == "interval:7200"
     assert cfg.backup.retention_count == 3
+    assert cfg.backup.include_config is False
+    assert cfg.backup.include_workspaces is False
+    assert cfg.backup.include_skill_packages is False
+    assert cfg.backup.include_plugins is False
+    assert cfg.backup.include_knowledge is False
+    assert cfg.backup.include_chats is True
 
 
 def test_backup_env_overrides(tmp_path: Path, monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setenv("OCTOP_BACKUP_AUTO_ENABLED", "true")
     monkeypatch.setenv("OCTOP_BACKUP_SCHEDULE", "cron:30 5 * * *")
     monkeypatch.setenv("OCTOP_BACKUP_RETENTION_COUNT", "5")
+    monkeypatch.setenv("OCTOP_BACKUP_INCLUDE_CHATS", "true")
+    monkeypatch.setenv("OCTOP_BACKUP_INCLUDE_CONFIG", "false")
+    monkeypatch.setenv("OCTOP_BACKUP_INCLUDE_WORKSPACES", "false")
+    monkeypatch.setenv("OCTOP_BACKUP_INCLUDE_SKILL_PACKAGES", "false")
+    monkeypatch.setenv("OCTOP_BACKUP_INCLUDE_PLUGINS", "false")
+    monkeypatch.setenv("OCTOP_BACKUP_INCLUDE_KNOWLEDGE", "false")
     cfg = load_config(tmp_path / "config.json")
     assert cfg.backup.auto_enabled is True
     assert cfg.backup.schedule == "cron:30 5 * * *"
     assert cfg.backup.retention_count == 5
+    assert cfg.backup.include_chats is True
+    assert cfg.backup.include_config is False
+    assert cfg.backup.include_workspaces is False
+    assert cfg.backup.include_skill_packages is False
+    assert cfg.backup.include_plugins is False
+    assert cfg.backup.include_knowledge is False
 
 
 def test_loads_existing(tmp_path: Path):
diff --git a/tests/unit/test_connectors.py b/tests/unit/test_connectors.py
index ce9c26fa..2880ef80 100644
--- a/tests/unit/test_connectors.py
+++ b/tests/unit/test_connectors.py
@@ -4,6 +4,7 @@
 
 import asyncio
 import json
+import sqlite3
 from pathlib import Path
 
 import pytest
@@ -1255,7 +1256,7 @@ def test_tencent_lexiang_credentials():
     assert payload == {"api_key": "lx-tok", "company_from": "csig"}
 
 
-def test_connector_repo_user_kind_unique(db: SqlitePool):
+def test_connector_repo_supports_multiple_kinds_and_unique_names(db: SqlitePool):
     repo = ConnectorRepo(db)
     with db.transaction() as conn:
         conn.execute(
@@ -1277,6 +1278,27 @@ def test_connector_repo_user_kind_unique(db: SqlitePool):
     with pytest.raises(ValueError):
         repo.validate_mcp_servers_for_user(uid, ["other"])
 
+    second = new_ulid()
+    repo.create(
+        instance_id=second,
+        user_id=uid,
+        kind="tencent-docs",
+        display_name="doc 2",
+        mcp_server_name=mcp_server_name("tencent-docs", second),
+        shared=True,
+    )
+    assert [row.instance_id for row in repo.list_visible(uid)] == [iid, second]
+
+    duplicate_name = new_ulid()
+    with pytest.raises(sqlite3.IntegrityError):
+        repo.create(
+            instance_id=duplicate_name,
+            user_id=uid,
+            kind="qq-mail",
+            display_name="doc",
+            mcp_server_name=mcp_server_name("qq-mail", duplicate_name),
+        )
+
 
 def test_validate_mcp_servers_for_user(db: SqlitePool):
     repo = ConnectorRepo(db)
diff --git a/tests/unit/test_logging.py b/tests/unit/test_logging.py
index 882441ee..1152471a 100644
--- a/tests/unit/test_logging.py
+++ b/tests/unit/test_logging.py
@@ -6,6 +6,7 @@
 
 from __future__ import annotations
 
+import gzip
 import logging
 import os
 import time
@@ -15,10 +16,16 @@
 import pytest
 
 from octop.infra.server import (
+    DEFAULT_LOG_MAX_BYTES,
     OctopServer,
+    SizeTimedRotatingFileHandler,
     _attach_log_handler,
     _build_log_handler,
+    _parse_log_compress,
+    _parse_log_max_bytes,
     _purge_stale_logs,
+    delaycompress_rotated_logs,
+    gzip_rotated_log,
 )
 
 
@@ -49,11 +56,12 @@ def _stale_path(log_dir: Path, name: str, age_days: int) -> Path:
 
 
 def test_build_log_handler_uses_daily_rotation_and_retention(tmp_path: Path):
-    handler = _build_log_handler(tmp_path / "octop.log", retention_days=7)
+    handler = _build_log_handler(tmp_path / "octop.log", retention_days=7, max_bytes=4096)
     try:
-        assert isinstance(handler, TimedRotatingFileHandler)
+        assert isinstance(handler, SizeTimedRotatingFileHandler)
         assert handler.when == "MIDNIGHT"
         assert handler.backupCount == 7
+        assert handler.max_bytes == 4096
         # Date-only suffix keeps filenames valid on Windows (no ':' like %H:%M:%S).
         assert handler.suffix == "%Y-%m-%d"
         assert ":" not in handler.suffix
@@ -182,3 +190,105 @@ def test_setup_logging_falls_back_on_invalid_retention_env(tmp_path: Path, monke
     )
     # Default retention is 14 days.
     assert handler.backupCount == 14
+
+
+def test_parse_log_max_bytes_defaults_and_env(monkeypatch):
+    monkeypatch.delenv("OCTOP_LOG_MAX_BYTES", raising=False)
+    assert _parse_log_max_bytes() == DEFAULT_LOG_MAX_BYTES
+    monkeypatch.setenv("OCTOP_LOG_MAX_BYTES", "2048")
+    assert _parse_log_max_bytes() == 2048
+    monkeypatch.setenv("OCTOP_LOG_MAX_BYTES", "bad")
+    assert _parse_log_max_bytes() == DEFAULT_LOG_MAX_BYTES
+
+
+def test_log_handler_rotates_when_max_bytes_exceeded(tmp_path: Path):
+    log_path = tmp_path / "octop.log"
+    handler = _build_log_handler(log_path, retention_days=3, max_bytes=256)
+    test_logger = logging.getLogger("test.octop.log.size_roll")
+    test_logger.handlers = []
+    test_logger.propagate = False
+    test_logger.setLevel(logging.INFO)
+    test_logger.addHandler(handler)
+    try:
+        for _ in range(40):
+            test_logger.info("x" * 40)
+        handler.flush()
+        backups = [p for p in tmp_path.glob("octop.log*") if p != log_path]
+        assert len(backups) >= 1
+        # delaycompress: newest rotated file stays plain; older ones may be .gz
+        plains = [p for p in backups if not p.name.endswith(".gz")]
+        gzips = [p for p in backups if p.name.endswith(".gz")]
+        assert len(plains) == 1
+        if len(backups) > 1:
+            assert len(gzips) >= 1
+        assert log_path.exists()
+        assert log_path.stat().st_size < 512
+    finally:
+        test_logger.handlers = []
+        handler.close()
+
+
+def test_gzip_rotated_log_replaces_plain_file(tmp_path: Path):
+    plain = tmp_path / "octop.log.2026-09-02"
+    # Binary write keeps LF on Windows (text mode would expand to CRLF).
+    plain.write_bytes(b"hello\nworld\n")
+    gzip_rotated_log(plain)
+    gz = tmp_path / "octop.log.2026-09-02.gz"
+    assert not plain.exists()
+    assert gz.exists()
+    assert gzip.decompress(gz.read_bytes()) == b"hello\nworld\n"
+
+
+def test_delaycompress_keeps_newest_plain_on_startup(tmp_path: Path):
+    log_dir = tmp_path / "logs"
+    log_dir.mkdir()
+    older = log_dir / "octop.log.2026-08-28"
+    newer = log_dir / "octop.log.2026-08-29"
+    older.write_text("older\n", encoding="utf-8")
+    newer.write_text("newer\n", encoding="utf-8")
+    past = time.time() - 86400
+    os.utime(older, (past, past))
+    delaycompress_rotated_logs(log_dir, enabled=True)
+    assert not older.exists()
+    assert (log_dir / "octop.log.2026-08-28.gz").exists()
+    assert newer.exists()
+    assert not (log_dir / "octop.log.2026-08-29.gz").exists()
+
+
+def test_delaycompress_single_plain_stays_uncompressed(tmp_path: Path):
+    log_dir = tmp_path / "logs"
+    log_dir.mkdir()
+    plain = log_dir / "octop.log.2026-08-29"
+    plain.write_text("only\n", encoding="utf-8")
+    delaycompress_rotated_logs(log_dir, enabled=True)
+    assert plain.exists()
+    assert not (log_dir / "octop.log.2026-08-29.gz").exists()
+
+
+def test_parse_log_compress_env(monkeypatch):
+    monkeypatch.delenv("OCTOP_LOG_COMPRESS", raising=False)
+    assert _parse_log_compress() is True
+    monkeypatch.setenv("OCTOP_LOG_COMPRESS", "0")
+    assert _parse_log_compress() is False
+
+
+def test_purge_stale_logs_removes_old_gz_files(tmp_path: Path):
+    log_dir = tmp_path / "logs"
+    log_dir.mkdir()
+    old = _stale_path(log_dir, "octop.log.2020-01-01.gz", age_days=100)
+    new = _stale_path(log_dir, "octop.log.2026-07-16.gz", age_days=1)
+    _purge_stale_logs(log_dir, retention_days=14)
+    assert not old.exists()
+    assert new.exists()
+
+
+def test_setup_logging_respects_max_bytes_env(tmp_path: Path, monkeypatch):
+    monkeypatch.setenv("OCTOP_LOG_MAX_BYTES", "8192")
+    server = OctopServer(home=tmp_path / ".octop")
+    server._setup_logging()
+    handler = next(
+        h
+        for h in logging.getLogger().handlers
+        if isinstance(h, SizeTimedRotatingFileHandler) and h.baseFilename == str(server.paths.log)
+    )
+    assert handler.max_bytes == 8192
diff --git a/tests/unit/test_release_download_links.py b/tests/unit/test_release_download_links.py
new file mode 100644
index 00000000..082e1495
--- /dev/null
+++ b/tests/unit/test_release_download_links.py
@@ -0,0 +1,44 @@
+"""tests/unit/test_release_download_links.py"""
+
+from __future__ import annotations
+
+import importlib.util
+from pathlib import Path
+
+_SCRIPT = Path(__file__).resolve().parents[2] / "scripts" / "release_download_links.py"
+
+
+def _load():
+    spec = importlib.util.spec_from_file_location("release_download_links", _SCRIPT)
+    assert spec is not None and spec.loader is not None
+    module = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(module)
+    return module
+
+
+def test_split_tag_accepts_with_or_without_v() -> None:
+    mod = _load()
+    assert mod.split_tag("0.9.31") == ("v0.9.31", "0.9.31")
+    assert mod.split_tag("v0.9.31") == ("v0.9.31", "0.9.31")
+
+
+def test_render_download_section_matches_github_asset_names() -> None:
+    mod = _load()
+    body = mod.render_download_section("0.9.31")
+    base = "https://github.com/TencentCloud/Octop/releases/download/v0.9.31"
+    assert f"{base}/Octop-desktop-windows-amd64-0.9.31.exe" in body
+    assert f"{base}/Octop-desktop-windows-arm64-0.9.31.exe" in body
+    assert f"{base}/Octop-portable-windows-amd64-0.9.31.zip" in body
+    assert f"{base}/Octop-portable-windows-arm64-0.9.31.zip" in body
+    assert f"{base}/Octop-desktop-darwin-arm64-0.9.31.dmg" in body
+    assert f"{base}/Octop-desktop-darwin-amd64-0.9.31.dmg" in body
+    assert f"{base}/Octop-portable-darwin-arm64-0.9.31.zip" in body
+    assert f"{base}/Octop-portable-darwin-amd64-0.9.31.zip" in body
+    assert f"{base}/Octop-desktop-linux-amd64-0.9.31.tar.gz" in body
+    assert f"{base}/Octop-desktop-linux-arm64-0.9.31.tar.gz" in body
+    assert f"{base}/Octop-portable-linux-amd64-0.9.31.zip" in body
+    assert f"{base}/Octop-portable-linux-arm64-0.9.31.zip" in body
+    assert f"{base}/Octop-fnos-docker-0.9.31.fpk" in body
+    assert f"{base}/Octop-fnos-native-0.9.31.fpk" in body
+    assert "pip install" not in body
+    assert "## Downloads" in body
diff --git a/tests/unit/test_storage_probe.py b/tests/unit/test_storage_probe.py
index 69d0ef2a..1a3dff3f 100644
--- a/tests/unit/test_storage_probe.py
+++ b/tests/unit/test_storage_probe.py
@@ -161,3 +161,40 @@ def _resolve(spec: dict[str, Any], workspace_dir: Any = None) -> Any:
     assert result["ok"] is True
     assert captured["spec"]["username"] == "test"
     assert captured["spec"]["sandbox_scope"] == "user"
+
+
+def test_opensandbox_probe_installs_and_closes(monkeypatch: pytest.MonkeyPatch) -> None:
+    from octop.infra.backend import opensandbox_deps
+    from octop.infra.backend import probe as probe_mod
+
+    monkeypatch.setattr(
+        opensandbox_deps, "ensure_opensandbox_deps", lambda allow_install=True: "ready"
+    )
+    monkeypatch.setattr(
+        probe_mod,
+        "probe_backend",
+        lambda spec: {"ok": True, "message": "ok"},
+    )
+
+    result = probe_storage_backend(
+        _row(
+            kind="opensandbox",
+            bucket="python:3.12",
+            endpoint="localhost:8080",
+            secret_key="sk",
+        )
+    )
+    assert result["ok"] is True
+    assert result.get("message_key") == "opensandbox_probe_ok"
+
+
+def test_opensandbox_probe_reports_install_failure(monkeypatch: pytest.MonkeyPatch) -> None:
+    from octop.infra.backend import opensandbox_deps
+
+    def _boom(*, allow_install: bool = True) -> str:
+        raise RuntimeError("Could not install optional Python components automatically.")
+
+    monkeypatch.setattr(opensandbox_deps, "ensure_opensandbox_deps", _boom)
+    result = probe_storage_backend(_row(kind="opensandbox", bucket="python:3.12"))
+    assert result["ok"] is False
+    assert "install" in result["message"].lower()
diff --git a/tests/unit/test_storage_spec.py b/tests/unit/test_storage_spec.py
index 4e87245f..eacecf8d 100644
--- a/tests/unit/test_storage_spec.py
+++ b/tests/unit/test_storage_spec.py
@@ -69,6 +69,8 @@ def test_backend_spec_supports_execution() -> None:
     assert backend_spec_supports_execution({"type": "local_shell", "virtual_mode": True})
     assert backend_spec_supports_execution({"type": "docker", "image": "python:3.12-slim"})
     assert backend_spec_supports_execution("docker")
+    assert backend_spec_supports_execution({"type": "opensandbox", "image": "python:3.12"})
+    assert backend_spec_supports_execution("opensandbox")
     assert not backend_spec_supports_execution({"type": "filesystem", "virtual_mode": True})
     assert not backend_spec_supports_execution({"type": "state"})
     assert backend_spec_supports_execution(
@@ -84,6 +86,37 @@ def test_storage_backend_kind_agent_resolvable() -> None:
     assert storage_backend_kind_agent_resolvable("cos")
     assert storage_backend_kind_agent_resolvable("filesystem")
     assert storage_backend_kind_agent_resolvable("docker")
+    assert storage_backend_kind_agent_resolvable("opensandbox")
+
+
+def test_row_to_backend_spec_opensandbox() -> None:
+    from octop.infra.backend.adapter import storage_spec_previewable
+
+    row = BackendRow(
+        id=1,
+        name="osb",
+        kind="opensandbox",
+        endpoint="127.0.0.1:8080",
+        access_key=None,
+        secret_key="sk-test",
+        bucket="python:3.12",
+        region="https",
+        config_json='{"timeout": 120, "use_server_proxy": true}',
+        note=None,
+        enabled=1,
+        created_at=0,
+        updated_at=0,
+    )
+    assert row_to_backend_spec(row) == {
+        "type": "opensandbox",
+        "image": "python:3.12",
+        "api_key": "sk-test",
+        "domain": "127.0.0.1:8080",
+        "protocol": "https",
+        "timeout": 120,
+        "use_server_proxy": True,
+    }
+    assert storage_spec_previewable(row_to_backend_spec(row)) is False
 
 
 def test_row_to_backend_spec_docker() -> None:
diff --git a/tests/unit/test_voice_manager.py b/tests/unit/test_voice_manager.py
index 511fdcc6..4ea07d4b 100644
--- a/tests/unit/test_voice_manager.py
+++ b/tests/unit/test_voice_manager.py
@@ -9,8 +9,9 @@
 from octop.infra.db.migrate import run_migrations
 from octop.infra.db.pool import SqlitePool
 from octop.infra.db.repos.settings import SettingsRepo
-from octop.infra.db.repos.voice_providers import VoiceProviderRepo
+from octop.infra.db.repos.voice_providers import VoiceProviderRepo, VoiceProviderRow
 from octop.infra.errors import ErrorCode, OctopError
+from octop.infra.voice import adapters
 from octop.infra.voice.manager import VoiceManager
 
 
@@ -52,3 +53,36 @@ async def test_synthesize_browser_raises_browser_only(voice_mgr: VoiceManager) -
         chunks = [c async for c in voice_mgr.synthesize("hello")]
         assert not chunks
     assert exc.value.code == ErrorCode.VOICE_BROWSER_ONLY
+
+
+@pytest.mark.asyncio
+async def test_configuration_probe_uses_unsaved_values(
+    voice_mgr: VoiceManager, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    captured_row: VoiceProviderRow | None = None
+    captured_kind = ""
+
+    async def fake_test_stt(row: VoiceProviderRow | None, kind: str) -> dict[str, object]:
+        nonlocal captured_row, captured_kind
+        captured_row = row
+        captured_kind = kind
+        return {"ok": True}
+
+    monkeypatch.setattr(adapters, "test_stt", fake_test_stt)
+
+    result = await voice_mgr.test_configuration(
+        name="draft",
+        kind="openai",
+        capability="both",
+        base_url="https://example.test/v1",
+        api_key="sk-draft",
+        extra_json='{"model":"whisper-1"}',
+        mode="stt",
+    )
+
+    assert result == {"ok": True}
+    assert captured_kind == "openai"
+    assert captured_row is not None
+    assert captured_row.name == "draft"
+    assert captured_row.api_key == "sk-draft"
+    assert captured_row.base_url == "https://example.test/v1"
diff --git a/tests/unit/trajectory/fixtures/compacted.json b/tests/unit/trajectory/fixtures/compacted.json
new file mode 100644
index 00000000..e907dae7
--- /dev/null
+++ b/tests/unit/trajectory/fixtures/compacted.json
@@ -0,0 +1,9 @@
+{
+  "type": "compacted",
+  "summarized_count": 12,
+  "preserved_count": 6,
+  "removed_tokens": 4200,
+  "summary": "Earlier turns offloaded to conversation history.",
+  "file_path": ".octop/conversation_history/thr.md",
+  "ts": 1756800001.0
+}
diff --git a/tests/unit/trajectory/fixtures/context_injection.json b/tests/unit/trajectory/fixtures/context_injection.json
new file mode 100644
index 00000000..c7ee39b4
--- /dev/null
+++ b/tests/unit/trajectory/fixtures/context_injection.json
@@ -0,0 +1,7 @@
+{
+  "type": "context",
+  "source": "rules",
+  "label": "AGENTS.md",
+  "tokens": 1280,
+  "ts": 1756800000.0
+}
diff --git a/tests/unit/trajectory/fixtures/session_user.json b/tests/unit/trajectory/fixtures/session_user.json
new file mode 100644
index 00000000..b58e5219
--- /dev/null
+++ b/tests/unit/trajectory/fixtures/session_user.json
@@ -0,0 +1,7 @@
+{
+  "ts": "2026-09-02T18:42:29.152+08:00",
+  "role": "user",
+  "content": "Compare React and Vue for a large admin app.",
+  "thread_id": "thr_fixture_user",
+  "source": "dashboard/octop-dashboard"
+}
diff --git a/tests/unit/trajectory/test_live.py b/tests/unit/trajectory/test_live.py
new file mode 100644
index 00000000..e38638d7
--- /dev/null
+++ b/tests/unit/trajectory/test_live.py
@@ -0,0 +1,38 @@
+"""TrajectoryLiveBus — in-process pub/sub per thread_id."""
+
+from __future__ import annotations
+
+from octop.infra.trajectory.live import TrajectoryLiveBus
+
+
+def test_publish_delivers_to_subscriber() -> None:
+    bus = TrajectoryLiveBus()
+    queue = bus.subscribe("T1")
+    message = {"event_id": "e1", "kind": "user"}
+
+    bus.publish("T1", message)
+
+    assert queue.get_nowait() == message
+
+
+def test_unsubscribe_stops_delivery_and_isolates_threads() -> None:
+    bus = TrajectoryLiveBus()
+    t1 = bus.subscribe("T1")
+    t2 = bus.subscribe("T2")
+
+    bus.unsubscribe("T1", t1)
+    bus.publish("T1", {"event_id": "dropped"})
+    bus.publish("T2", {"event_id": "kept"})
+
+    assert t1.empty()
+    assert t2.get_nowait() == {"event_id": "kept"}
+
+
+def test_slow_subscriber_keeps_only_latest_bounded_events() -> None:
+    bus = TrajectoryLiveBus(subscriber_queue_size=2)
+    queue = bus.subscribe("T1")
+
+    for seq in range(4):
+        bus.publish("T1", {"seq": seq})
+
+    assert [queue.get_nowait(), queue.get_nowait()] == [{"seq": 2}, {"seq": 3}]
diff --git a/tests/unit/trajectory/test_metrics.py b/tests/unit/trajectory/test_metrics.py
new file mode 100644
index 00000000..b42b0a8e
--- /dev/null
+++ b/tests/unit/trajectory/test_metrics.py
@@ -0,0 +1,94 @@
+"""Pure metrics aggregation from trajectory events."""
+
+from __future__ import annotations
+
+from octop.infra.trajectory.metrics import TrajectoryMetrics, aggregate_metrics
+from octop.infra.trajectory.types import TrajectoryEvent
+
+
+def _event(
+    *,
+    seq: int,
+    kind: str,
+    payload: dict | None = None,
+) -> TrajectoryEvent:
+    return TrajectoryEvent(
+        event_id=f"T1:{seq}:{kind}",
+        thread_id="T1",
+        agent_id="A1",
+        seq=seq,
+        ts=float(seq),
+        kind=kind,  # type: ignore[arg-type]
+        turn_id=None,
+        request_seq=None,
+        is_error=False,
+        summary="",
+        payload=payload or {},
+    )
+
+
+def test_aggregate_metrics_sums_durations_and_tokens() -> None:
+    events = [
+        _event(
+            seq=1,
+            kind="assistant",
+            payload={
+                "llm_duration_ms": 1000.0,
+                "ttft_ms": 100.0,
+                "tok_per_s": 50.0,
+                "input_tokens": 100,
+                "output_tokens": 50,
+            },
+        ),
+        _event(
+            seq=2,
+            kind="assistant",
+            payload={
+                "llm_duration_ms": 2000.0,
+                "ttft_ms": 300.0,
+                "tok_per_s": 75.0,
+                "input_tokens": 300,
+                "output_tokens": 150,
+                "cache_read_tokens": 100,
+            },
+        ),
+        _event(seq=3, kind="tool", payload={"tool_duration_ms": 500.0}),
+        _event(seq=4, kind="tool", payload={"tool_duration_ms": 300.0}),
+        _event(seq=5, kind="tool", payload={"tool_duration_ms": 200.0}),
+    ]
+
+    metrics = aggregate_metrics(events)
+
+    assert metrics == TrajectoryMetrics(
+        turns=0,
+        steps=5,
+        llm_duration_ms=3000.0,
+        tool_duration_ms=1000.0,
+        ttft_avg_ms=200.0,
+        tok_per_s=62.5,
+        cache_hit_ratio=0.2,
+        input_tokens=400,
+        output_tokens=200,
+        cache_read_tokens=100,
+    )
+
+
+def test_aggregate_metrics_counts_user_turns() -> None:
+    events = [
+        _event(seq=1, kind="user"),
+        _event(seq=2, kind="assistant", payload={"llm_duration_ms": 500.0}),
+        _event(seq=3, kind="user"),
+    ]
+
+    metrics = aggregate_metrics(events)
+
+    assert metrics.turns == 2
+    assert metrics.steps == 3
+    assert metrics.llm_duration_ms == 500.0
+    assert metrics.tool_duration_ms is None
+    assert metrics.ttft_avg_ms is None
+    assert metrics.tok_per_s is None
+    assert metrics.cache_hit_ratio is None
+    assert metrics.input_tokens is None
+    assert metrics.output_tokens is None
+    assert metrics.cache_read_tokens is None
diff --git a/tests/unit/trajectory/test_projector.py b/tests/unit/trajectory/test_projector.py
new file mode 100644
index 00000000..52684beb
--- /dev/null
+++ b/tests/unit/trajectory/test_projector.py
@@ -0,0 +1,227 @@
+"""Harness/session-fact projector tests.
+
+Fixture shapes live in ``tests/unit/trajectory/fixtures/``:
+
+* ``session_user.json`` — anonymized MemoryMiddleware ``sessions/*.jsonl`` user
+  line (real local samples use ``role`` not ``type``; ISO-8601 ``ts``).
+  Keys: ``ts``, ``role=user``, ``content``, ``thread_id``, ``source``.
+* ``context_injection.json`` — synthetic; session JSONL has no context rows.
+  Spec §2 ``context`` (source / label / token estimate). ``source=rules``
+  matches ``harness_agent.context_usage`` (AGENTS.md / ``<agent_memory>``).
+* ``compacted.json`` — synthetic; matches ``harness_agent.compaction.CompactResult``
+  field names (``summarized_count``, ``preserved_count``, ``removed_tokens``)
+  plus spec §2 ``summary`` / ``file_path``.
+"""
+
+from __future__ import annotations
+
+import json
+from pathlib import Path
+from typing import Any
+
+from octop.infra.trajectory.projector import project_harness_chunk
+
+_FIXTURES = Path(__file__).resolve().parent / "fixtures"
+
+
+def _load_fixture(name: str) -> dict[str, Any]:
+    return json.loads((_FIXTURES / name).read_text(encoding="utf-8"))
+
+
+def test_project_tool_call_chunk_emits_tool_event() -> None:
+    chunk = {
+        "type": "tool_call_chunk",
+        "id": "call_1",
+        "name": "read_file",
+        "args": {"path": "a.py"},
+    }
+    events = project_harness_chunk(chunk, agent_id="A1", thread_id="T1", seq=10)
+    assert len(events) == 1
+    ev = events[0]
+    assert ev.kind == "tool"
+    assert ev.seq == 10
+    assert ev.thread_id == "T1"
+    assert ev.event_id == "T1:10:tool:call_1"
+    assert "read_file" in ev.summary
+    assert ev.payload["call_id"] == "call_1"
+
+
+def test_project_token_chunk_emits_assistant_event() -> None:
+    chunk = {"type": "token", "node": "agent", "content": "Hello world"}
+    events = project_harness_chunk(chunk, agent_id="A1", thread_id="T1", seq=3)
+    assert len(events) == 1
+    ev = events[0]
+    assert ev.kind == "assistant"
+    assert ev.seq == 3
+    assert "Hello" in ev.summary
+
+
+def test_empty_token_chunk_emits_no_events() -> None:
+    events = project_harness_chunk(
+        {"type": "token", "node": "agent", "content": ""},
+        agent_id="A1",
+        thread_id="T1",
+        seq=4,
+    )
+    assert events == []
+
+
+def test_unrecognized_stream_noise_is_not_stored() -> None:
+    events = project_harness_chunk(
+        {"type": "not_a_real_chunk"}, agent_id="A1", thread_id="T1", seq=1
+    )
+    assert events == []
+
+
+def test_state_and_reasoning_chunks_emit_no_events() -> None:
+    for chunk in (
+        {"type": "state_snapshot", "data": {"messages": []}},
+        {"type": "state_update", "node": "agent", "data": {}},
+        {"type": "reasoning", "content": "thinking..."},
+        {"type": "usage", "usage": {"input_tokens": 1}},
+    ):
+        assert project_harness_chunk(chunk, agent_id="A1", thread_id="T1", seq=1) == []
+
+
+def test_project_tool_result_emits_tool_event_with_result() -> None:
+    chunk = {
+        "type": "tool_result",
+        "id": "call_1",
+        "name": "read_file",
+        "content": "file body",
+    }
+    events = project_harness_chunk(chunk, agent_id="A1", thread_id="T1", seq=11)
+    assert len(events) == 1
+    ev = events[0]
+    assert ev.kind == "tool"
+    assert ev.payload["call_id"] == "call_1"
+    assert ev.payload["result"] == "file body"
+    assert ev.event_id == "T1:11:tool:call_1"
+
+
+def test_project_session_user_fact_emits_user_event() -> None:
+    chunk = _load_fixture("session_user.json")
+    events = project_harness_chunk(chunk, agent_id="A1", thread_id="T1", seq=5)
+    assert len(events) == 1
+    ev = events[0]
+    assert ev.kind == "user"
+    assert ev.seq == 5
+    assert ev.thread_id == "T1"
+    assert ev.event_id == "T1:5:user"
+    assert "Compare React and Vue" in ev.summary
+    assert ev.payload["content"] == chunk["content"]
+    assert ev.ts > 0
+
+
+def test_project_context_injection_fact_emits_context_event() -> None:
+    chunk = _load_fixture("context_injection.json")
+    events = project_harness_chunk(chunk, agent_id="A1", thread_id="T1", seq=7)
+    assert len(events) == 1
+    ev = events[0]
+    assert ev.kind == "context"
+    assert ev.event_id == "T1:7:context"
+    assert ev.payload["source"] == "rules"
+    assert ev.payload["label"] == "AGENTS.md"
+    assert ev.payload["tokens"] == 1280
+    assert "AGENTS.md" in ev.summary
+
+
+def test_project_system_chunk_emits_system_event() -> None:
+    events = project_harness_chunk(
+        {
+            "type": "system",
+            "label": "Initial System Prompt",
+            "content": "You are Octop.\nBe helpful.",
+        },
+        agent_id="A1",
+        thread_id="T1",
+        seq=1,
+    )
+    assert len(events) == 1
+    ev = events[0]
+    assert ev.kind == "system"
+    assert ev.event_id == "T1:1:system"
+    assert ev.payload["label"] == "Initial System Prompt"
+    assert "You are Octop" in ev.payload["content"]
+    assert "Initial System Prompt" in ev.summary or "You are Octop" in ev.summary
+
+
+def test_project_system_chunk_keeps_content_reference_without_body() -> None:
+    digest = "a" * 64
+    events = project_harness_chunk(
+        {
+            "type": "system",
+            "label": "Initial System Prompt",
+            "content_sha256": digest,
+            "content_chars": 42,
+        },
+        agent_id="A1",
+        thread_id="T1",
+        seq=1,
+    )
+
+    assert len(events) == 1
+    assert events[0].payload == {
+        "label": "Initial System Prompt",
+        "content_sha256": digest,
+        "content_chars": 42,
+    }
+
+
+def test_project_context_chunk_keeps_content_body() -> None:
+    events = project_harness_chunk(
+        {
+            "type": "context",
+            "source": "rules",
+            "label": "AGENTS.md",
+            "content": "# Rules\nPrefer BackendWorkspace paths.",
+        },
+        agent_id="A1",
+        thread_id="T1",
+        seq=2,
+    )
+    assert len(events) == 1
+    ev = events[0]
+    assert ev.kind == "context"
+    assert ev.payload["content"] == "# Rules\nPrefer BackendWorkspace paths."
+    assert "Prefer BackendWorkspace" in ev.summary or "AGENTS.md" in ev.summary
+
+
+def test_project_compacted_fact_emits_compacted_event() -> None:
+    chunk = _load_fixture("compacted.json")
+    events = project_harness_chunk(chunk, agent_id="A1", thread_id="T1", seq=8)
+    assert len(events) == 1
+    ev = events[0]
+    assert ev.kind == "compacted"
+    assert ev.event_id == "T1:8:compacted"
+    assert ev.payload["summarized_count"] == 12
+    assert ev.payload["preserved_count"] == 6
+    assert ev.payload["removed_tokens"] == 4200
+    assert "offloaded" in ev.summary.lower() or "compact" in ev.summary.lower()
+
+
+def test_bad_input_never_raises() -> None:
+    events = project_harness_chunk(
+        "not-a-chunk",  # type: ignore[arg-type]
+        agent_id="A1",
+        thread_id="T1",
+        seq=1,
+    )
+    assert events == []
+
+    events = project_harness_chunk(
+        {"type": "user", "ts": object(), "content": "hi"},
+        agent_id="A1",
+        thread_id="T1",
+        seq=2,
+    )
+    assert len(events) == 1
+    assert events[0].kind == "user"
+
+    events = project_harness_chunk(
+        {"type": "nope", "ts": "not-a-timestamp"},
+        agent_id="A1",
+        thread_id="T1",
+        seq=3,
+    )
+    assert events == []
diff --git a/tests/unit/trajectory/test_trajectory_event_repo.py b/tests/unit/trajectory/test_trajectory_event_repo.py
new file mode 100644
index 00000000..80e07c1c
--- /dev/null
+++ b/tests/unit/trajectory/test_trajectory_event_repo.py
@@ -0,0 +1,160 @@
+"""TrajectoryEventRepo — append, cursor page, duplicate event_id."""
+
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Any
+
+from octop.infra.db.migrate import run_migrations
+from octop.infra.db.pool import SqlitePool
+from octop.infra.db.repos.agents import AgentRepo
+from octop.infra.db.repos.threads import ThreadRepo
+from octop.infra.db.repos.trajectory_events import TrajectoryEventRepo
+from octop.infra.db.repos.users import UserRepo
+from octop.infra.trajectory.types import TrajectoryEvent
+
+
+def _seed_threads(db: SqlitePool, *thread_ids: str, agent_id: str = "A1") -> None:
+    user_id = UserRepo(db).create(username="traj-user", password_hash="h", role="user")
+    AgentRepo(db).create(agent_id=agent_id, user_id=user_id, name="Agent")
+    threads = ThreadRepo(db)
+    for tid in thread_ids:
+        threads.insert(
+            thread_id=tid,
+            agent_id=agent_id,
+            user_id=user_id,
+            channel_type="dashboard",
+            session_key=f"sk-{tid}",
+            last_active=0,
+        )
+
+
+def _event(
+    *,
+    event_id: str,
+    seq: int,
+    kind: str = "user",
+    thread_id: str = "T1",
+    summary: str = "",
+    payload: dict[str, Any] | None = None,
+    is_error: bool = False,
+    turn_id: str | None = None,
+    request_seq: int | None = None,
+) -> TrajectoryEvent:
+    return TrajectoryEvent(
+        event_id=event_id,
+        thread_id=thread_id,
+        agent_id="A1",
+        seq=seq,
+        ts=float(seq),
+        kind=kind,  # type: ignore[arg-type]
+        turn_id=turn_id,
+        request_seq=request_seq,
+        is_error=is_error,
+        summary=summary,
+        payload=payload or {},
+    )
+
+
+def _repo(tmp_path: Path) -> TrajectoryEventRepo:
+    db = SqlitePool(tmp_path / "octop.db")
+    run_migrations(db)
+    _seed_threads(db, "T1", "T2")
+    return TrajectoryEventRepo(db)
+
+
+def test_append_pages_before_seq_and_rejects_duplicate_event_id(tmp_path: Path) -> None:
+    repo = _repo(tmp_path)
+    first = _event(event_id="e1", seq=1, kind="user", summary="hi")
+    second = _event(event_id="e2", seq=2, kind="assistant", summary="hello")
+
+    assert repo.append(first) is True
+    assert repo.append(second) is True
+
+    page = repo.list_before("T1", before_seq=None, limit=10, kinds=None)
+    assert [event.event_id for event in page] == ["e1", "e2"]
+    assert page[0] == first
+    assert page[1] == second
+
+    older = repo.list_before("T1", before_seq=2, limit=10, kinds=None)
+    assert [event.event_id for event in older] == ["e1"]
+
+    assert repo.append(first) is False
+    assert repo.get("e1") == first
+
+
+def test_list_before_filters_kinds_and_limit(tmp_path: Path) -> None:
+    repo = _repo(tmp_path)
+    for seq, kind in ((1, "user"), (2, "assistant"), (3, "tool"), (4, "assistant")):
+        assert repo.append(_event(event_id=f"e{seq}", seq=seq, kind=kind)) is True
+
+    latest = repo.list_before("T1", before_seq=None, limit=2, kinds=None)
+    assert [event.seq for event in latest] == [3, 4]
+
+    assistants = repo.list_before("T1", before_seq=None, limit=10, kinds=["assistant"])
+    assert [event.seq for event in assistants] == [2, 4]
+
+
+def test_get_delete_and_iter_for_export(tmp_path: Path) -> None:
+    repo = _repo(tmp_path)
+    first = _event(event_id="e1", seq=1, payload={"n": 1})
+    second = _event(event_id="e2", seq=2, is_error=True, turn_id="t", request_seq=7)
+    assert repo.append(first) is True
+    assert repo.append(second) is True
+    assert repo.append(_event(event_id="other", seq=1, thread_id="T2")) is True
+
+    assert repo.get("missing") is None
+    exported = list(repo.iter_for_export("T1"))
+    assert [event.event_id for event in exported] == ["e1", "e2"]
+    assert exported[1].is_error is True
+    assert exported[1].turn_id == "t"
+    assert exported[1].request_seq == 7
+
+    assert repo.delete_for_thread("T1") == 2
+    assert repo.list_before("T1", before_seq=None, limit=10, kinds=None) == []
+    assert repo.get("other") is not None
+
+
+def test_thread_delete_cascades_trajectory_events(tmp_path: Path) -> None:
+    db = SqlitePool(tmp_path / "octop.db")
+    run_migrations(db)
+    with db.connect() as conn:
+        fks = conn.execute("PRAGMA foreign_key_list(trajectory_events)").fetchall()
+    assert any(str(row["table"]) == "threads" for row in fks)
+
+    user_id = UserRepo(db).create(username="u", password_hash="h", role="user")
+    AgentRepo(db).create(agent_id="A1", user_id=user_id, name="Agent")
+    ThreadRepo(db).insert(
+        thread_id="T1",
+        agent_id="A1",
+        user_id=user_id,
+        channel_type="dashboard",
+        session_key="sk",
+        last_active=0,
+    )
+    repo = TrajectoryEventRepo(db)
+    assert repo.append(_event(event_id="e1", seq=1, summary="hi")) is True
+
+    ThreadRepo(db).delete("T1")
+    assert repo.list_before("T1", before_seq=None, limit=10, kinds=None) == []
+
+
+def test_list_from_seq_and_prune_older_than_user_turns(tmp_path: Path) -> None:
+    repo = _repo(tmp_path)
+    for seq, kind in (
+        (1, "system"),
+        (2, "user"),
+        (3, "assistant"),
+        (4, "user"),
+        (5, "assistant"),
+        (6, "user"),
+    ):
+        assert repo.append(_event(event_id=f"e{seq}", seq=seq, kind=kind)) is True
+
+    from_seq = repo.list_from_seq("T1", from_seq=4, limit=10)
+    assert [event.seq for event in from_seq] == [4, 5, 6]
+
+    deleted = repo.prune_older_than_user_turns("T1", 2)
+    assert deleted > 0
+    remaining = repo.list_before("T1", before_seq=None, limit=20, kinds=None)
+    assert [event.seq for event in remaining] == [4, 5, 6]
diff --git a/tests/unit/trajectory/test_trajectory_list_summarize.py b/tests/unit/trajectory/test_trajectory_list_summarize.py
new file mode 100644
index 00000000..111593d9
--- /dev/null
+++ b/tests/unit/trajectory/test_trajectory_list_summarize.py
@@ -0,0 +1,86 @@
+"""Unit tests for trajectory list payload projection."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from octop.api.routers.chat.trajectory import (
+    _LIST_MAX_SUMMARY_CHARS,
+    _LIST_MAX_TOOL_FIELD_CHARS,
+    _resume_after_seq,
+    _summarize_event,
+)
+from octop.infra.trajectory.types import TrajectoryEvent
+
+
+def _event(
+    *,
+    kind: str = "tool",
+    summary: str = "x",
+    payload: dict[str, Any] | None = None,
+) -> TrajectoryEvent:
+    return TrajectoryEvent(
+        event_id="e1",
+        thread_id="T1",
+        agent_id="A1",
+        seq=1,
+        ts=1.0,
+        kind=kind,  # type: ignore[arg-type]
+        turn_id=None,
+        request_seq=None,
+        is_error=False,
+        summary=summary,
+        payload=payload or {},
+    )
+
+
+def test_summarize_keeps_tool_args_and_result() -> None:
+    data = _summarize_event(
+        _event(
+            payload={
+                "name": "read_file",
+                "args": {"path": "a.py"},
+                "result": "ok",
+                "tool_duration_ms": 12,
+            }
+        )
+    )
+    assert data["payload"] == {
+        "name": "read_file",
+        "args": {"path": "a.py"},
+        "result": "ok",
+        "tool_duration_ms": 12,
+    }
+
+
+def test_summarize_omits_message_bodies() -> None:
+    data = _summarize_event(
+        _event(
+            kind="user",
+            payload={"content": "secret body", "source": "dashboard", "text": "also"},
+        )
+    )
+    assert data["payload"] == {"source": "dashboard"}
+    assert "content" not in data["payload"]
+    assert "text" not in data["payload"]
+
+
+def test_summarize_clips_oversized_tool_result() -> None:
+    huge = "x" * (_LIST_MAX_TOOL_FIELD_CHARS + 50)
+    data = _summarize_event(_event(payload={"name": "bash", "result": huge}))
+    result = data["payload"]["result"]
+    assert isinstance(result, str)
+    assert result.endswith("…")
+    assert len(result) == _LIST_MAX_TOOL_FIELD_CHARS + 1
+
+
+def test_summarize_clips_message_summary() -> None:
+    data = _summarize_event(_event(kind="user", summary="x" * (_LIST_MAX_SUMMARY_CHARS + 50)))
+
+    assert data["summary"].endswith("…")
+    assert len(data["summary"]) == _LIST_MAX_SUMMARY_CHARS
+
+
+def test_sse_resume_prefers_newer_last_event_id() -> None:
+    assert _resume_after_seq(10, "14") == 14
+    assert _resume_after_seq(10, "8") == 10
diff --git a/tests/unit/trajectory/test_trajectory_service.py b/tests/unit/trajectory/test_trajectory_service.py
new file mode 100644
index 00000000..b7208f4d
--- /dev/null
+++ b/tests/unit/trajectory/test_trajectory_service.py
@@ -0,0 +1,363 @@
+"""TrajectoryService — observe never raises; list / metrics / export."""
+
+from __future__ import annotations
+
+import json
+from pathlib import Path
+from typing import Any
+from unittest.mock import MagicMock
+
+import pytest
+
+from octop.infra.db.migrate import run_migrations
+from octop.infra.db.pool import SqlitePool
+from octop.infra.db.repos.agents import AgentRepo
+from octop.infra.db.repos.threads import ThreadRepo
+from octop.infra.db.repos.trajectory_events import TrajectoryEventRepo
+from octop.infra.db.repos.users import UserRepo
+from octop.infra.trajectory.live import TrajectoryLiveBus
+from octop.infra.trajectory.service import TrajectoryService
+from octop.infra.trajectory.store import TrajectoryStore
+
+
+def _seed_threads(db: SqlitePool, *thread_ids: str, agent_id: str = "A1") -> None:
+    user_id = UserRepo(db).create(username="traj-user", password_hash="h", role="user")
+    AgentRepo(db).create(agent_id=agent_id, user_id=user_id, name="Agent")
+    threads = ThreadRepo(db)
+    for tid in thread_ids:
+        threads.insert(
+            thread_id=tid,
+            agent_id=agent_id,
+            user_id=user_id,
+            channel_type="dashboard",
+            session_key=f"sk-{tid}",
+            last_active=0,
+        )
+
+
+def _service(tmp_path: Path) -> tuple[TrajectoryService, TrajectoryLiveBus]:
+    db = SqlitePool(tmp_path / "octop.db")
+    run_migrations(db)
+    _seed_threads(db, "T1")
+    bus = TrajectoryLiveBus()
+    service = TrajectoryService(TrajectoryStore(TrajectoryEventRepo(db)), bus)
+    return service, bus
+
+
+def test_observe_chunk_swallows_projector_errors(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    def boom(*_args: Any, **_kwargs: Any) -> list[Any]:
+        raise RuntimeError("projector down")
+
+    monkeypatch.setattr("octop.infra.trajectory.service.project_harness_chunk", boom)
+    service, _bus = _service(tmp_path)
+
+    service.observe_chunk("A1", "T1", {"type": "user", "content": "hi"})
+
+
+def test_observe_chunk_appends_publishes_and_exports(tmp_path: Path) -> None:
+    service, bus = _service(tmp_path)
+    queue = bus.subscribe("T1")
+
+    service.observe_chunk("A1", "T1", {"type": "user", "content": "hello"})
+
+    events = service.list_events("T1", before_seq=None, limit=10, kinds=None)
+    assert len(events) == 1
+    assert events[0].kind == "user"
+    assert "hello" in events[0].summary
+    assert service.get_event(events[0].event_id) == events[0]
+
+    published = queue.get_nowait()
+    assert published["event_id"] == events[0].event_id
+    assert published["kind"] == "user"
+
+    metrics = service.metrics("T1")
+    assert metrics.turns == 1
+    assert metrics.steps == 1
+
+    lines = list(service.export_jsonl("T1"))
+    assert len(lines) == 1
+    exported = json.loads(lines[0])
+    assert exported["event_id"] == events[0].event_id
+    assert exported["kind"] == "user"
+
+
+def test_observe_aggregates_tokens_without_per_token_db_writes(
+    tmp_path: Path,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setattr("octop.infra.trajectory.service.time.monotonic", lambda: 1.0)
+    service, bus = _service(tmp_path)
+    queue = bus.subscribe("T1")
+    append = MagicMock(side_effect=service._store.append)  # noqa: SLF001
+    upsert = MagicMock(side_effect=service._store.upsert)  # noqa: SLF001
+    service._store.append = append  # type: ignore[method-assign]  # noqa: SLF001
+    service._store.upsert = upsert  # type: ignore[method-assign]  # noqa: SLF001
+
+    for piece in ("Hel", "lo ", "world"):
+        service.observe_chunk(
+            "A1",
+            "T1",
+            {"type": "token", "node": "agent", "content": piece, "request_seq": 3},
+        )
+
+    assert append.call_count == 1
+    assert upsert.call_count == 0
+    service.finish_turn("T1")
+    assert upsert.call_count == 1
+
+    events = service.list_events("T1", before_seq=None, limit=10, kinds=None)
+    assert len(events) == 1
+    ev = events[0]
+    assert ev.kind == "assistant"
+    assert ev.summary == "Hello world"
+    assert ev.payload["content"] == "Hello world"
+    assert ev.request_seq == 3
+
+    published = [queue.get_nowait() for _ in range(queue.qsize())]
+    assert len(published) == 2
+    assert published[0]["event_id"] == ev.event_id
+    assert all(item["event_id"] == ev.event_id for item in published)
+
+
+def test_finish_turn_persists_usage_and_marks_final_live_snapshot(tmp_path: Path) -> None:
+    service, bus = _service(tmp_path)
+    queue = bus.subscribe("T1")
+    service.observe_chunk("A1", "T1", {"type": "token", "content": "done"})
+
+    service.finish_turn(
+        "T1",
+        {"input_tokens": 12, "output_tokens": 3, "cache_read_tokens": 4},
+    )
+
+    event = service.list_events("T1", before_seq=None, limit=1, kinds=None)[0]
+    assert event.payload["input_tokens"] == 12
+    assert "_final" not in event.payload
+    published = [queue.get_nowait() for _ in range(queue.qsize())]
+    assert published[-1]["_final"] is True
+
+
+def test_finish_turn_attaches_usage_when_tools_follow_assistant(tmp_path: Path) -> None:
+    service, _bus = _service(tmp_path)
+    service.observe_chunk("A1", "T1", {"type": "token", "content": "checking"})
+    service.observe_chunk(
+        "A1",
+        "T1",
+        {"type": "tool_call_chunk", "id": "c1", "name": "read", "args": "{}"},
+    )
+    service.observe_chunk(
+        "A1",
+        "T1",
+        {"type": "tool_result", "id": "c1", "name": "read", "content": "ok"},
+    )
+
+    service.finish_turn("T1", {"input_tokens": 7, "output_tokens": 2})
+
+    events = service.list_events("T1", before_seq=None, limit=10, kinds=None)
+    assistant = next(event for event in events if event.kind == "assistant")
+    assert assistant.payload["input_tokens"] == 7
+    assert assistant.payload["output_tokens"] == 2
+
+
+def test_metrics_reuses_short_lived_cache(tmp_path: Path) -> None:
+    service, _bus = _service(tmp_path)
+    service.observe_chunk("A1", "T1", {"type": "user", "content": "hello"})
+    iterate = MagicMock(side_effect=service._store.iter_for_export)  # noqa: SLF001
+    service._store.iter_for_export = iterate  # type: ignore[method-assign]  # noqa: SLF001
+
+    service.metrics("T1")
+    service.metrics("T1")
+    assert iterate.call_count == 1
+
+    service.metrics("T1", refresh=True)
+    assert iterate.call_count == 2
+
+
+def test_observe_merges_tool_call_and_result(tmp_path: Path) -> None:
+    service, _bus = _service(tmp_path)
+
+    service.observe_chunk(
+        "A1",
+        "T1",
+        {"type": "tool_call_chunk", "id": "call_1", "name": "read_", "args": '{"p'},
+    )
+    service.observe_chunk(
+        "A1",
+        "T1",
+        {"type": "tool_call_chunk", "id": "call_1", "name": "file", "args": 'ath":"a.py"}'},
+    )
+    service.observe_chunk(
+        "A1",
+        "T1",
+        {"type": "tool_result", "id": "call_1", "name": "read_file", "content": "ok"},
+    )
+
+    events = service.list_events("T1", before_seq=None, limit=10, kinds=None)
+    assert [event.kind for event in events] == ["assistant", "tool"]
+    parent, ev = events
+    assert parent.payload.get("tool_call_only") is True
+    assert parent.summary == "(tool call only)"
+    assert ev.kind == "tool"
+    assert ev.payload["call_id"] == "call_1"
+    assert ev.payload["name"] == "read_file"
+    assert ev.payload["args"] == '{"path":"a.py"}'
+    assert ev.payload["result"] == "ok"
+
+
+def test_observe_tool_burst_shares_one_tool_call_only_parent(tmp_path: Path) -> None:
+    service, _bus = _service(tmp_path)
+
+    service.observe_chunk(
+        "A1",
+        "T1",
+        {"type": "tool_call_chunk", "id": "c1", "name": "ls", "args": "{}"},
+    )
+    service.observe_chunk(
+        "A1",
+        "T1",
+        {"type": "tool_result", "id": "c1", "name": "ls", "content": "a"},
+    )
+    service.observe_chunk(
+        "A1",
+        "T1",
+        {"type": "tool_call_chunk", "id": "c2", "name": "ls", "args": "{}"},
+    )
+    service.observe_chunk(
+        "A1",
+        "T1",
+        {"type": "tool_result", "id": "c2", "name": "ls", "content": "b"},
+    )
+    service.observe_chunk(
+        "A1",
+        "T1",
+        {"type": "token", "node": "agent", "content": "done", "request_seq": 1},
+    )
+
+    events = service.list_events("T1", before_seq=None, limit=20, kinds=None)
+    assert [event.kind for event in events] == ["assistant", "tool", "tool", "assistant"]
+    assert events[0].payload.get("tool_call_only") is True
+    assert events[-1].summary == "done"
+    assert events[-1].payload.get("tool_call_only") is not True
+
+
+def test_observe_does_not_synthesize_parent_when_assistant_text_precedes_tools(
+    tmp_path: Path,
+) -> None:
+    service, _bus = _service(tmp_path)
+    service.observe_chunk(
+        "A1",
+        "T1",
+        {"type": "token", "node": "agent", "content": "Looking…", "request_seq": 2},
+    )
+    service.observe_chunk(
+        "A1",
+        "T1",
+        {"type": "tool_call_chunk", "id": "c1", "name": "read", "args": "{}"},
+    )
+    service.observe_chunk(
+        "A1",
+        "T1",
+        {"type": "tool_result", "id": "c1", "name": "read", "content": "x"},
+    )
+
+    events = service.list_events("T1", before_seq=None, limit=10, kinds=None)
+    assert [event.kind for event in events] == ["assistant", "tool"]
+    assert events[0].summary == "Looking…"
+    assert events[0].payload.get("tool_call_only") is not True
+
+
+def test_observe_does_not_store_state_snapshot(tmp_path: Path) -> None:
+    service, _bus = _service(tmp_path)
+    service.observe_chunk("A1", "T1", {"type": "user", "content": "hi"})
+    service.observe_chunk("A1", "T1", {"type": "state_snapshot", "data": {"messages": []}})
+    service.observe_chunk("A1", "T1", {"type": "reasoning", "content": "think"})
+
+    events = service.list_events("T1", before_seq=None, limit=10, kinds=None)
+    assert len(events) == 1
+    assert events[0].kind == "user"
+
+
+def test_has_kind_detects_system_events(tmp_path: Path) -> None:
+    service, _bus = _service(tmp_path)
+    assert service.has_kind("T1", "system") is False
+    service.observe_chunk(
+        "A1",
+        "T1",
+        {"type": "system", "label": "Initial System Prompt", "content": "You are Octop."},
+    )
+    assert service.has_kind("T1", "system") is True
+    assert service.has_kind("T1", "context") is False
+
+
+def test_observe_assigns_turn_id_and_wall_clock_ts(tmp_path: Path) -> None:
+    service, _bus = _service(tmp_path)
+    service.observe_chunk(
+        "A1",
+        "T1",
+        {"type": "system", "label": "Initial System Prompt", "content": "sys"},
+    )
+    service.observe_chunk("A1", "T1", {"type": "user", "content": "hi"})
+    service.observe_chunk(
+        "A1",
+        "T1",
+        {"type": "token", "node": "agent", "content": "hello"},
+    )
+    service.observe_chunk("A1", "T1", {"type": "user", "content": "again"})
+
+    events = service.list_events("T1", before_seq=None, limit=10, kinds=None)
+    assert [event.kind for event in events] == ["system", "user", "assistant", "user"]
+    assert events[0].turn_id is None
+    assert events[0].ts > 0
+    assert events[1].turn_id == "T1:turn:1"
+    assert events[2].turn_id == "T1:turn:1"
+    assert events[3].turn_id == "T1:turn:2"
+    assert events[1].ts > 0
+
+
+def test_observe_tool_result_records_tool_duration_ms(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    service, _bus = _service(tmp_path)
+    clock = {"t": 1000.0}
+
+    def fake_time() -> float:
+        return clock["t"]
+
+    monkeypatch.setattr("octop.infra.trajectory.service.time.time", fake_time)
+    service.observe_chunk(
+        "A1",
+        "T1",
+        {"type": "tool_call_chunk", "id": "c1", "name": "ls", "args": "{}"},
+    )
+    clock["t"] = 1000.25
+    service.observe_chunk(
+        "A1",
+        "T1",
+        {"type": "tool_result", "id": "c1", "name": "ls", "content": "ok"},
+    )
+
+    events = service.list_events("T1", before_seq=None, limit=10, kinds=None)
+    tool = next(event for event in events if event.kind == "tool")
+    assert tool.payload.get("tool_duration_ms") == pytest.approx(250.0)
+
+
+def test_finish_turn_prunes_old_user_turns(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setattr("octop.infra.trajectory.service.TRAJECTORY_RETENTION_USER_TURNS", 1)
+    service, _bus = _service(tmp_path)
+    service.observe_chunk("A1", "T1", {"type": "user", "content": "one"})
+    service.observe_chunk("A1", "T1", {"type": "user", "content": "two"})
+    service.finish_turn("T1")
+    users = service.list_events("T1", before_seq=None, limit=20, kinds=["user"])
+    assert len(users) == 1
+    assert "two" in users[0].summary
+
+
+def test_list_from_seq_returns_inclusive_tail(tmp_path: Path) -> None:
+    service, _bus = _service(tmp_path)
+    service.observe_chunk("A1", "T1", {"type": "user", "content": "a"})
+    service.observe_chunk("A1", "T1", {"type": "user", "content": "b"})
+    page = service.list_events("T1", before_seq=None, limit=10, kinds=None)
+    assert len(page) == 2
+    replay = service.list_from_seq("T1", from_seq=page[1].seq, limit=10)
+    assert [event.seq for event in replay] == [page[1].seq]
diff --git a/tests/unit/trajectory/test_trajectory_settings.py b/tests/unit/trajectory/test_trajectory_settings.py
new file mode 100644
index 00000000..e3c8182f
--- /dev/null
+++ b/tests/unit/trajectory/test_trajectory_settings.py
@@ -0,0 +1,50 @@
+"""Per-agent trajectory flag and persist clipping."""
+
+from __future__ import annotations
+
+from octop.infra.trajectory.settings import (
+    PAYLOAD_MAX_CHARS,
+    SUMMARY_MAX_CHARS,
+    agent_trajectory_enabled,
+    apply_enable_trajectory,
+    clip_persisted_event,
+    clip_text,
+)
+from octop.infra.trajectory.types import TrajectoryEvent
+
+
+def test_agent_trajectory_enabled_defaults_on_and_allows_explicit_opt_out() -> None:
+    assert agent_trajectory_enabled(None) is True
+    assert agent_trajectory_enabled({}) is True
+    assert agent_trajectory_enabled({"enable_trajectory": False}) is False
+    assert agent_trajectory_enabled({"enable_trajectory": "true"}) is True
+    assert agent_trajectory_enabled({"enable_trajectory": True}) is True
+
+
+def test_apply_enable_trajectory_omits_default_on() -> None:
+    cfg: dict[str, object] = {"backend": {"type": "local"}}
+    apply_enable_trajectory(cfg, False)
+    assert cfg["enable_trajectory"] is False
+    apply_enable_trajectory(cfg, True)
+    assert "enable_trajectory" not in cfg
+
+
+def test_clip_persisted_event_bounds_summary_and_payload() -> None:
+    event = TrajectoryEvent(
+        event_id="e",
+        thread_id="T",
+        agent_id="A",
+        seq=1,
+        ts=1.0,
+        kind="assistant",
+        turn_id=None,
+        request_seq=None,
+        is_error=False,
+        summary="s" * (SUMMARY_MAX_CHARS + 10),
+        payload={"content": "c" * (PAYLOAD_MAX_CHARS + 10)},
+    )
+    clipped = clip_persisted_event(event)
+    assert len(clipped.summary) <= SUMMARY_MAX_CHARS
+    assert len(str(clipped.payload["content"])) <= PAYLOAD_MAX_CHARS
+    assert clip_text("ab", 2) == "ab"
+    assert clip_text("abc", 2).endswith("…")
diff --git a/tests/unit/trajectory/test_trajectory_store.py b/tests/unit/trajectory/test_trajectory_store.py
new file mode 100644
index 00000000..729acad8
--- /dev/null
+++ b/tests/unit/trajectory/test_trajectory_store.py
@@ -0,0 +1,92 @@
+"""TrajectoryStore — thin repo wrapper; duplicate event_id is a no-op."""
+
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Any
+
+from octop.infra.db.migrate import run_migrations
+from octop.infra.db.pool import SqlitePool
+from octop.infra.db.repos.agents import AgentRepo
+from octop.infra.db.repos.threads import ThreadRepo
+from octop.infra.db.repos.trajectory_events import TrajectoryEventRepo
+from octop.infra.db.repos.users import UserRepo
+from octop.infra.trajectory.store import TrajectoryStore
+from octop.infra.trajectory.types import TrajectoryEvent
+
+
+def _seed_threads(db: SqlitePool, *thread_ids: str, agent_id: str = "A1") -> None:
+    user_id = UserRepo(db).create(username="traj-user", password_hash="h", role="user")
+    AgentRepo(db).create(agent_id=agent_id, user_id=user_id, name="Agent")
+    threads = ThreadRepo(db)
+    for tid in thread_ids:
+        threads.insert(
+            thread_id=tid,
+            agent_id=agent_id,
+            user_id=user_id,
+            channel_type="dashboard",
+            session_key=f"sk-{tid}",
+            last_active=0,
+        )
+
+
+def _event(
+    *,
+    event_id: str,
+    seq: int,
+    kind: str = "user",
+    thread_id: str = "T1",
+    summary: str = "",
+    payload: dict[str, Any] | None = None,
+) -> TrajectoryEvent:
+    return TrajectoryEvent(
+        event_id=event_id,
+        thread_id=thread_id,
+        agent_id="A1",
+        seq=seq,
+        ts=float(seq),
+        kind=kind,  # type: ignore[arg-type]
+        turn_id=None,
+        request_seq=None,
+        is_error=False,
+        summary=summary,
+        payload=payload or {},
+    )
+
+
+def _store(tmp_path: Path) -> TrajectoryStore:
+    db = SqlitePool(tmp_path / "octop.db")
+    run_migrations(db)
+    _seed_threads(db, "T1")
+    return TrajectoryStore(TrajectoryEventRepo(db))
+
+
+def test_append_is_idempotent_on_duplicate_event_id(tmp_path: Path) -> None:
+    store = _store(tmp_path)
+    event = _event(event_id="e1", seq=1, summary="hi")
+
+    assert store.append(event) is True
+    assert store.append(event) is False
+
+    page = store.list_before("T1", before_seq=None, limit=10, kinds=None)
+    assert [item.event_id for item in page] == ["e1"]
+    assert store.get("e1") == event
+
+
+def test_append_clips_oversized_payload_and_summary(tmp_path: Path) -> None:
+    from octop.infra.trajectory.settings import PAYLOAD_MAX_CHARS, SUMMARY_MAX_CHARS
+
+    store = _store(tmp_path)
+    huge = "x" * (PAYLOAD_MAX_CHARS + 50)
+    event = _event(
+        event_id="big",
+        seq=1,
+        summary="s" * (SUMMARY_MAX_CHARS + 20),
+        payload={"content": huge, "args": huge},
+    )
+    assert store.append(event) is True
+    stored = store.get("big")
+    assert stored is not None
+    assert len(stored.summary) <= SUMMARY_MAX_CHARS
+    assert len(str(stored.payload["content"])) <= PAYLOAD_MAX_CHARS
+    assert len(str(stored.payload["args"])) <= PAYLOAD_MAX_CHARS
diff --git a/tests/unit/trajectory/test_turn_context.py b/tests/unit/trajectory/test_turn_context.py
new file mode 100644
index 00000000..c26d3c41
--- /dev/null
+++ b/tests/unit/trajectory/test_turn_context.py
@@ -0,0 +1,100 @@
+"""Turn-start SYSTEM / CONTEXT synthesis — must match harness injection SoT."""
+
+from __future__ import annotations
+
+from harness_agent.backends.workspace import DEFAULT_MEMORY_FILES
+
+from octop.infra.trajectory.turn_context import (
+    build_turn_start_chunks,
+    filter_turn_skill_names,
+    memory_file_order,
+)
+
+
+def test_memory_file_order_matches_harness_default_memory_files() -> None:
+    assert memory_file_order() == list(DEFAULT_MEMORY_FILES)
+    assert "USER.md" in memory_file_order()
+    assert "SOUL.md" in memory_file_order()
+
+
+def test_build_turn_start_includes_system_and_memory_skills_mcp() -> None:
+    chunks = build_turn_start_chunks(
+        include_system=True,
+        system_prompt="You are Octop.\nBe helpful.",
+        workspace_files=["AGENTS.md", "USER.md"],
+        skills=["bash", "read"],
+        mcp_servers=["github"],
+    )
+    kinds = [c["type"] for c in chunks]
+    assert kinds == ["system", "context", "context", "context", "context"]
+    assert chunks[0]["label"] == "Initial System Prompt"
+    assert "content" not in chunks[0]
+    assert chunks[0]["content_chars"] == len("You are Octop.\nBe helpful.")
+    assert len(str(chunks[0]["content_sha256"])) == 64
+    assert chunks[1]["source"] == "memory"
+    assert chunks[1]["label"] == "AGENTS.md"
+    assert "content" not in chunks[1]
+    assert chunks[2]["label"] == "USER.md"
+    assert chunks[3]["source"] == "skills"
+    assert "bash" in chunks[3]["content"]
+    assert chunks[4]["source"] == "mcp"
+    assert "github" in chunks[4]["content"]
+
+
+def test_build_turn_start_skips_system_when_already_present() -> None:
+    chunks = build_turn_start_chunks(
+        include_system=False,
+        system_prompt="You are Octop.",
+        workspace_files=[],
+        skills=["bash"],
+        mcp_servers=None,
+    )
+    assert all(c["type"] != "system" for c in chunks)
+    assert len(chunks) == 1
+    assert chunks[0]["source"] == "skills"
+
+
+def test_build_turn_start_skips_empty_system_prompt() -> None:
+    """Empty DB/config prompt must not invent a SYSTEM row."""
+    chunks = build_turn_start_chunks(
+        include_system=True,
+        system_prompt="  ",
+        workspace_files=["SOUL.md"],
+        skills=None,
+        mcp_servers=None,
+    )
+    assert [c["type"] for c in chunks] == ["context"]
+    assert chunks[0]["label"] == "SOUL.md"
+    assert chunks[0]["source"] == "memory"
+
+
+def test_build_turn_start_emits_explicit_empty_skills_allowlist() -> None:
+    chunks = build_turn_start_chunks(
+        include_system=False,
+        system_prompt=None,
+        workspace_files=[],
+        skills=[],
+        mcp_servers=None,
+        skills_filter_present=True,
+    )
+    assert len(chunks) == 1
+    assert chunks[0]["source"] == "skills"
+    assert chunks[0]["content"] == "(none)"
+
+
+def test_filter_turn_skill_names_honours_allowlist_and_disabled() -> None:
+    enabled = [
+        {"name": "Bash", "slug": "bash"},
+        {"name": "Read", "slug": "read"},
+        {"name": "Write", "slug": "write"},
+    ]
+    assert filter_turn_skill_names(enabled, turn_skills=None, skills_filter_present=False) == [
+        "Bash",
+        "Read",
+        "Write",
+    ]
+    # Allow-list may use slug (harness identity keys).
+    assert filter_turn_skill_names(
+        enabled, turn_skills=["read", "missing"], skills_filter_present=True
+    ) == ["Read"]
+    assert filter_turn_skill_names(enabled, turn_skills=[], skills_filter_present=True) == []
diff --git a/tests/unit/users/test_permissions.py b/tests/unit/users/test_permissions.py
index d44c12f4..d0f50421 100644
--- a/tests/unit/users/test_permissions.py
+++ b/tests/unit/users/test_permissions.py
@@ -68,6 +68,8 @@ def test_categories_match_nav_groups() -> None:
         "mobile",
     }
     assert PERMISSIONS["envs"].page == "advanced"
+    assert PERMISSIONS["voice"].page == "models"
+    assert PERMISSIONS["search"].page == "models"
     assert PERMISSIONS["knowledge_settings"].page == "advanced"
     assert PERMISSIONS["knowledge_settings"].category == "admin"
     assert "knowledge_settings" not in BASELINE_PERMISSIONS
diff --git a/tests/unit/users/test_preferences.py b/tests/unit/users/test_preferences.py
index 0ab93fdd..cd43a2d0 100644
--- a/tests/unit/users/test_preferences.py
+++ b/tests/unit/users/test_preferences.py
@@ -10,6 +10,7 @@
     get_model_reasoning_from_json,
     get_preferred_model_from_json,
     get_remote_browser_bookmarks_from_json,
+    get_timezone_from_preferences_json,
     merge_model_preferences_json,
     merge_preferences_json,
     validate_remote_browser_bookmarks,
@@ -65,6 +66,15 @@ def test_get_remote_browser_bookmarks_from_json_invalid_payload() -> None:
     assert get_remote_browser_bookmarks_from_json('{"remote_browser_bookmarks": "x"}') == []
 
 
+def test_get_timezone_from_preferences_json() -> None:
+    assert (
+        get_timezone_from_preferences_json('{"timezone":"Asia/Shanghai","x":1}') == "Asia/Shanghai"
+    )
+    assert get_timezone_from_preferences_json('{"timezone":"   "}') is None
+    assert get_timezone_from_preferences_json('{"x":1}') is None
+    assert get_timezone_from_preferences_json("not-json") is None
+
+
 def test_merge_preserves_other_keys() -> None:
     merged = merge_preferences_json(
         '{"foo": 1}',
diff --git a/uv.lock b/uv.lock
index ad3aae70..07472c1b 100644
--- a/uv.lock
+++ b/uv.lock
@@ -280,6 +280,12 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/2f/1a/b1bd30cda3790557e8791bec5922a6ec8fabb6fa8b008c76a39cf7be6152/anthropic-0.125.0-py3-none-any.whl", hash = "sha256:3486013602eca76d8b12540764e53654f02cf4951110bca86cf06e67428a9f21", size = 1184067, upload-time = "2026-08-19T22:00:44.596Z" },
 ]
 
+[[package]]
+name = "antlr4-python3-runtime"
+version = "4.9.3"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/3e/38/7859ff46355f76f8d19459005ca000b6e7012f2f1ca597746cbcd1fbfe5e/antlr4-python3-runtime-4.9.3.tar.gz", hash = "sha256:f224469b4168294902bb1efa80a8bf7855f24c99aef99cbefc1bcd3cce77881b", size = 117034, upload-time = "2021-11-06T17:52:23.524Z" }
+
 [[package]]
 name = "anyio"
 version = "4.14.1"
@@ -695,6 +701,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335, upload-time = "2022-10-25T02:36:20.889Z" },
 ]
 
+[[package]]
+name = "colorlog"
+version = "6.12.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "colorama", marker = "sys_platform == 'win32'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/8c/55/ba79756cb90c8d69d599d57785398ac87bba7b19c80e87f4e8a562197c93/colorlog-6.12.0.tar.gz", hash = "sha256:2a7924c1dadf18b22a0eb8b06d1c7b01d5341707ec1641eb6fcc4fde0c3e8e5f", size = 18151, upload-time = "2026-07-23T13:40:40.71Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d4/19/0b6647bf5e331521e55d2b63bfbdc210bd9cd605189273f03614a05f702d/colorlog-6.12.0-py3-none-any.whl", hash = "sha256:30d392604e9110045a2c2aeefc27d7a017abbab63f3a8aee594eac0801df784e", size = 12239, upload-time = "2026-07-23T13:40:39.562Z" },
+]
+
 [[package]]
 name = "cos-python-sdk-v5"
 version = "1.9.44"
@@ -953,6 +971,15 @@ dependencies = [
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/e1/d4/c9a2b33935c620678bd5acf5e32feda70ef09f384b24eb17a5719f72f5fe/esdk_obs_python-3.26.6.tar.gz", hash = "sha256:5014e76e85ffa9eda821169302e74868991867ac947da73bc28eb0e6dfba3ab1", size = 116430, upload-time = "2026-07-12T07:09:36.698Z" }
 
+[[package]]
+name = "et-xmlfile"
+version = "2.0.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d3/38/af70d7ab1ae9d4da450eeec1fa3918940a5fafb9055e934af8d6eb0c2313/et_xmlfile-2.0.0.tar.gz", hash = "sha256:dab3f4764309081ce75662649be815c4c9081e88f0837825f90fd28317d4da54", size = 17234, upload-time = "2024-10-25T17:25:40.039Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/c1/8b/5fe2cc11fee489817272089c4203e679c63b570a5aaeb18d852ae3cbba6a/et_xmlfile-2.0.0-py3-none-any.whl", hash = "sha256:7a91720bc756843502c3b7504c77b8fe44217c85c537d85037f0f536151b2caa", size = 18059, upload-time = "2024-10-25T17:25:39.051Z" },
+]
+
 [[package]]
 name = "evdev"
 version = "1.9.3"
@@ -1303,7 +1330,7 @@ wheels = [
 
 [[package]]
 name = "harness-browser"
-version = "0.7.7"
+version = "0.7.8"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "aiohttp" },
@@ -1311,14 +1338,14 @@ dependencies = [
     { name = "pydantic" },
     { name = "websockets" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/c8/a0/7e26d6c9a4bca7782fb8dd9d1e920c17b886938d7041c35fe8eb93928844/harness_browser-0.7.7.tar.gz", hash = "sha256:de99c3ee07098674073604120c45145e8fbc134065de47b4840c758403f4b983", size = 333772, upload-time = "2026-09-01T08:39:45.85Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/84/de/482fbf2d10a1e425f14f1a2bde4d36a479c2cb714ffa080cdca1c296aefe/harness_browser-0.7.8.tar.gz", hash = "sha256:7ffe4e4af8285df4598341bded14e1cb2769b835df6b1e729b603a8a2cacfc92", size = 339599, upload-time = "2026-09-03T06:16:19.629Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/53/2a/c58b20173097c8f2d9e76dd837c21e691bad47baf136450fb850eb644ff0/harness_browser-0.7.7-py3-none-any.whl", hash = "sha256:d182af55a38f4edf30672629cdbb13373023c5bf191ea3baf2fe7a8b53e58d67", size = 98227, upload-time = "2026-09-01T08:39:42.833Z" },
+    { url = "https://files.pythonhosted.org/packages/26/00/87f162ed67c17b9dcf0517cfa7c64112616b30a57a7c0165c62f462798db/harness_browser-0.7.8-py3-none-any.whl", hash = "sha256:6f95d97109ac23ad389d74f725ce9bb7e34863188e8f1a31569b5f1f9d18f913", size = 102054, upload-time = "2026-09-03T06:16:17.851Z" },
 ]
 
 [[package]]
 name = "harness-gateway"
-version = "0.9.3"
+version = "0.9.5"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "aiohttp" },
@@ -1336,18 +1363,18 @@ dependencies = [
     { name = "websockets" },
     { name = "wecom-aibot-sdk" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/bd/31/bffc0bedae91253db68cc6b18f44b2d3e97e964c87548aad86430a0fb296/harness_gateway-0.9.3.tar.gz", hash = "sha256:ea5135daa7e02726c93c5c0f8d124df0f7bf35ebde5e439a673d8eb6fc3f2ee8", size = 497904, upload-time = "2026-08-20T03:26:07.75Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/5a/2c/a037fca7d181c97fb3a19e434830ab0e2ca556ea9627a42976325566c43d/harness_gateway-0.9.5.tar.gz", hash = "sha256:4d7f1c6db78b90072e739fdaf07fd0d88b339a0d65030f0bd2de2884b76a62f2", size = 499064, upload-time = "2026-09-03T08:18:28.814Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/58/11/03374a4b52520e918ee19db1c1d2bb8c844e951edc6d5d96ca55545f345a/harness_gateway-0.9.3-py3-none-any.whl", hash = "sha256:89dc52bbdf4c8167f6e4b003a07cc7dca0908ede572953350287af25a473a17c", size = 138401, upload-time = "2026-08-20T03:26:04.083Z" },
+    { url = "https://files.pythonhosted.org/packages/77/82/3cca28f17f7d0b5e42c802570b7b599b4149795cb7c5f73ed0fd59515124/harness_gateway-0.9.5-py3-none-any.whl", hash = "sha256:0d76d3148898501d3c71acec57c47f7cfd97fba1ee42eb96b1766560b7398051", size = 138899, upload-time = "2026-09-03T08:18:25.786Z" },
 ]
 
 [[package]]
 name = "harness-memory"
-version = "0.9.7"
+version = "0.9.9"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/aa/1e/31ed48da269f67eb18ba758974fa4d315cb0563d4e546bea52c985f21dd1/harness_memory-0.9.7.tar.gz", hash = "sha256:c1013bf5ce57f07393443a313b75e4f0e66f4e7158cc7295cb7e899d3b16719c", size = 34604833, upload-time = "2026-08-20T12:53:17.595Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/fa/1b/2c579ee19f08c29829b957099baf48a62fd360ff51da86193fb87a28605b/harness_memory-0.9.9.tar.gz", hash = "sha256:0dc564007071805d7c7153ba095c013a4559738f6ab5ef4e1ec46098a24b7f3f", size = 1087771, upload-time = "2026-09-04T06:49:27.365Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/e2/05/b239a8db324d79f29c917d51daa1a30753998f559579d393d7629306685a/harness_memory-0.9.7-py3-none-any.whl", hash = "sha256:c0872ebcc24144edb89b3a928de8df0cef80abea36ab1bd2a6ee7ca56e7f71ff", size = 345460, upload-time = "2026-08-20T12:53:12.719Z" },
+    { url = "https://files.pythonhosted.org/packages/16/80/fe6b5cd1da3b5034ca3df132172798c7ddaee02c90a76a3c9cb1d147b977/harness_memory-0.9.9-py3-none-any.whl", hash = "sha256:e6ce999869e30cea3b12ab5852996143d79f9d3f15d7b86ffbcecd316dcc0ad9", size = 351443, upload-time = "2026-09-04T06:49:25.01Z" },
 ]
 
 [[package]]
@@ -2475,7 +2502,7 @@ wheels = [
 
 [[package]]
 name = "octop"
-version = "0.9.31"
+version = "0.9.32"
 source = { editable = "." }
 dependencies = [
     { name = "acme" },
@@ -2492,7 +2519,9 @@ dependencies = [
     { name = "josepy" },
     { name = "langchain-core" },
     { name = "langgraph-checkpoint-postgres" },
+    { name = "lark-oapi" },
     { name = "mcp" },
+    { name = "openpyxl" },
     { name = "orcakit-harness-agent", extra = ["all"] },
     { name = "pillow" },
     { name = "playwright" },
@@ -2509,6 +2538,7 @@ dependencies = [
     { name = "segno" },
     { name = "uvicorn", extra = ["standard"] },
     { name = "websockets" },
+    { name = "xlrd" },
 ]
 
 [package.optional-dependencies]
@@ -2529,6 +2559,12 @@ dev = [
     { name = "pytest-testmon" },
     { name = "pytest-xdist" },
     { name = "ruff" },
+    { name = "xlwt" },
+]
+knowledge-ocr = [
+    { name = "onnxruntime" },
+    { name = "pymupdf" },
+    { name = "rapidocr" },
 ]
 local-embedding = [
     { name = "fastembed" },
@@ -2546,6 +2582,7 @@ dev = [
     { name = "pytest-testmon" },
     { name = "pytest-xdist" },
     { name = "ruff" },
+    { name = "xlwt" },
 ]
 
 [package.metadata]
@@ -2560,24 +2597,28 @@ requires-dist = [
     { name = "edge-tts", specifier = ">=6.1" },
     { name = "fastapi", specifier = ">=0.110" },
     { name = "fastembed", marker = "extra == 'local-embedding'", specifier = ">=0.4" },
-    { name = "harness-browser", specifier = ">=0.7.7" },
-    { name = "harness-gateway", specifier = ">=0.9.3" },
-    { name = "harness-memory", specifier = ">=0.9.7" },
+    { name = "harness-browser", specifier = ">=0.7.8" },
+    { name = "harness-gateway", specifier = ">=0.9.5" },
+    { name = "harness-memory", specifier = ">=0.9.9" },
     { name = "httpx", marker = "extra == 'dev'", specifier = ">=0.27" },
     { name = "huggingface-hub", marker = "extra == 'local-embedding'", specifier = ">=0.20" },
     { name = "josepy", specifier = ">=2.2.0" },
     { name = "langchain-core", specifier = ">=1.4.8" },
     { name = "langgraph-checkpoint-postgres", specifier = ">=2.0" },
+    { name = "lark-oapi", specifier = ">=1.5.5" },
     { name = "mcp", specifier = ">=1.9,<2" },
     { name = "mss", marker = "extra == 'desktop'", specifier = ">=9.0" },
     { name = "mypy", marker = "extra == 'dev'", specifier = ">=1.10" },
-    { name = "orcakit-harness-agent", extras = ["all"], specifier = ">=1.0.2" },
+    { name = "onnxruntime", marker = "extra == 'knowledge-ocr'", specifier = ">=1.17" },
+    { name = "openpyxl", specifier = ">=3.1" },
+    { name = "orcakit-harness-agent", extras = ["all"], specifier = ">=1.0.4" },
     { name = "pillow", specifier = ">=10.0" },
     { name = "playwright", specifier = ">=1.40" },
     { name = "playwright", marker = "extra == 'browser'", specifier = ">=1.40" },
     { name = "psycopg", extras = ["binary"], specifier = ">=3.2" },
     { name = "pydantic", specifier = ">=2.6,<2.14" },
     { name = "pyjwt", specifier = ">=2.8" },
+    { name = "pymupdf", marker = "extra == 'knowledge-ocr'", specifier = ">=1.24" },
     { name = "pynput", marker = "extra == 'desktop'", specifier = ">=1.7" },
     { name = "pypdf", specifier = ">=5.0" },
     { name = "pypinyin", specifier = ">=0.53" },
@@ -2589,14 +2630,17 @@ requires-dist = [
     { name = "python-docx", specifier = ">=1.2.0" },
     { name = "python-pptx", specifier = ">=1.0" },
     { name = "questionary", specifier = ">=2.0" },
+    { name = "rapidocr", marker = "extra == 'knowledge-ocr'", specifier = ">=3.4,<4" },
     { name = "rich", specifier = ">=13.7" },
     { name = "ruff", marker = "extra == 'dev'", specifier = ">=0.4" },
     { name = "scalar-fastapi", specifier = ">=1.0" },
     { name = "segno", specifier = ">=1.6" },
     { name = "uvicorn", extras = ["standard"], specifier = ">=0.27" },
     { name = "websockets", specifier = ">=13.0" },
+    { name = "xlrd", specifier = ">=2.0.1" },
+    { name = "xlwt", marker = "extra == 'dev'", specifier = ">=1.3" },
 ]
-provides-extras = ["dev", "browser", "desktop", "local-embedding"]
+provides-extras = ["dev", "browser", "desktop", "local-embedding", "knowledge-ocr"]
 
 [package.metadata.requires-dev]
 dev = [
@@ -2609,6 +2653,20 @@ dev = [
     { name = "pytest-testmon", specifier = ">=2.0" },
     { name = "pytest-xdist", specifier = ">=3.6" },
     { name = "ruff", specifier = ">=0.4" },
+    { name = "xlwt", specifier = ">=1.3" },
+]
+
+[[package]]
+name = "omegaconf"
+version = "2.3.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "antlr4-python3-runtime" },
+    { name = "pyyaml" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/ce/3d/e4b57b8d9008c6ebe0d5eff901f91d5700cf7bdb8c8863df817463a7fd5e/omegaconf-2.3.1.tar.gz", hash = "sha256:e5e7de64aeebeddaf8e6d3f7a783b32ac2a01c0fbd9c878012caecb891a1f42a", size = 3298472, upload-time = "2026-06-11T05:05:12.885Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/a4/0e/152509871bf30df6fc38569f52a2db9b55dd41aae957adae50a053ac7778/omegaconf-2.3.1-py3-none-any.whl", hash = "sha256:3d701d14e9a8828f1edd28bb70b725908b34277cdd72cf7d6a83f94dadc6b6a0", size = 79502, upload-time = "2026-06-11T05:05:09.954Z" },
 ]
 
 [[package]]
@@ -2662,6 +2720,37 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/ae/f4/561ed79fd94876160018a5e75254cfcb9b0e62d4dded9dcb20072e86d623/openai-2.44.0-py3-none-any.whl", hash = "sha256:0a2a3ab2e29aeda368700f662ff9ba0f9df17ba4c54577a64e08b8115a3cc0ad", size = 1366216, upload-time = "2026-06-24T20:55:58.882Z" },
 ]
 
+[[package]]
+name = "opencv-python"
+version = "5.0.0.93"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "numpy" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/79/4c/a438d23e09ce2033c09f7b784ad2fbdb0adf529e434101ed28f142226f98/opencv_python-5.0.0.93.tar.gz", hash = "sha256:66aac3e5b5faa48d4025816592f3af19e4bfc2c68dec067bae2dbb4ca10aa9e2", size = 81802749, upload-time = "2026-07-02T06:59:53.815Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/9c/75/76f6ade78f6102c61034f828e2a22616708df2c9504bc8d6af9dd8f73dc5/opencv_python-5.0.0.93-cp37-abi3-macosx_13_0_arm64.whl", hash = "sha256:198a75138241810206a17c829dbcc40a7cb1841cda538ca86cbbfc6c7d95f898", size = 48322443, upload-time = "2026-07-02T05:50:25.466Z" },
+    { url = "https://files.pythonhosted.org/packages/15/8c/bc1bda6aae69a32e9d84fc34153ba104cd25226861eb4aea33b2cea4860d/opencv_python-5.0.0.93-cp37-abi3-macosx_14_0_x86_64.whl", hash = "sha256:6bbc32f59e1b1a7db7b39c81f63d00625f041d333037fd8702f6da52cc39108b", size = 34782755, upload-time = "2026-07-02T05:51:30.556Z" },
+    { url = "https://files.pythonhosted.org/packages/f4/8a/b04776ec45d2dea08a1b176f1829201db3515d4ed16c35f8fcc9fa7beb16/opencv_python-5.0.0.93-cp37-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:e2b4272e736836f66c2d176e43ab8101f3a00d45654916399f52e150c58981ac", size = 50614064, upload-time = "2026-07-02T06:53:22.604Z" },
+    { url = "https://files.pythonhosted.org/packages/95/54/eb47866b94f2b5b42dde17644b78055ef1ee05aae59962c7290e55270803/opencv_python-5.0.0.93-cp37-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:f8b6d0a212253dd26ad338c812f1f23ca118fdf05a9c8c6b9444f161aa8c5881", size = 71064711, upload-time = "2026-07-02T06:54:13.148Z" },
+    { url = "https://files.pythonhosted.org/packages/93/da/962579f1e703cbf8c5422fd1f576467dcb3b5b0b0b81c1471c979764353a/opencv_python-5.0.0.93-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:08d5d91d967b58d6db86073b2ad3eaef88ca4ebdfd45c9059bf59f5ded0c7ad2", size = 49798576, upload-time = "2026-07-02T06:54:33.781Z" },
+    { url = "https://files.pythonhosted.org/packages/cf/4c/c73f828fdbcd37eaf21d08fa852544a3ca7c2dbb3ea76873d64f2ea413d1/opencv_python-5.0.0.93-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:c8de2dec111122a02e8beb28e16c31904992dfd6186560b142a92c71403c1039", size = 73783032, upload-time = "2026-07-02T06:55:03.415Z" },
+    { url = "https://files.pythonhosted.org/packages/e2/4b/edaf83b996ca5a1a3d8ccad485706b9c6d4742b13b9c4586bf1c1e7d9423/opencv_python-5.0.0.93-cp37-abi3-win32.whl", hash = "sha256:4b4b1a34c79bf8d3738e3cfe9a9e67b51a79663f6b692cbdad8c31f570da4157", size = 35564734, upload-time = "2026-07-02T05:49:57.704Z" },
+    { url = "https://files.pythonhosted.org/packages/21/f0/9fa6e85cb10c8eb36a0222d27e50fe381b86ce49a55446bf39f491727564/opencv_python-5.0.0.93-cp37-abi3-win_amd64.whl", hash = "sha256:f90ba04b8f73bc5c3814037699739f0156f597338a98f05956c684e7c3ca10d2", size = 44000345, upload-time = "2026-07-02T05:49:54.971Z" },
+]
+
+[[package]]
+name = "openpyxl"
+version = "3.1.5"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "et-xmlfile" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/3d/f9/88d94a75de065ea32619465d2f77b29a0469500e99012523b91cc4141cd1/openpyxl-3.1.5.tar.gz", hash = "sha256:cf0e3cf56142039133628b5acffe8ef0c12bc902d2aadd3e0fe5878dc08d1050", size = 186464, upload-time = "2024-06-28T14:03:44.161Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/c0/da/977ded879c29cbd04de313843e76868e6e13408a94ed6b987245dc7c8506/openpyxl-3.1.5-py2.py3-none-any.whl", hash = "sha256:5282c12b107bffeef825f4617dc029afaf41d0ea60823bbb665ef3079dc79de2", size = 250910, upload-time = "2024-06-28T14:03:41.161Z" },
+]
+
 [[package]]
 name = "opentelemetry-api"
 version = "1.43.0"
@@ -2745,7 +2834,7 @@ wheels = [
 
 [[package]]
 name = "orcakit-harness-agent"
-version = "1.0.2"
+version = "1.0.4"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "deepagents" },
@@ -2763,9 +2852,9 @@ dependencies = [
     { name = "mcp" },
     { name = "pyyaml" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/38/c8/3985ab4520ea92b51506b5932e6f2f3c631cbe2066238234d4047a31ccfd/orcakit_harness_agent-1.0.2.tar.gz", hash = "sha256:a36df51c19b74042319f1d9d4de93f9439fcd5e429b9cbdf5a0523d9de2a9b97", size = 1197763, upload-time = "2026-09-01T08:56:24.118Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/9e/36/e096b72e622b176efb57b16313b49350595e1eed2c670df60fe4ff94dd0f/orcakit_harness_agent-1.0.4.tar.gz", hash = "sha256:9c126056b9a232c599414e479896bfd78c5f51011987080d2ee738a55f8202fc", size = 1204119, upload-time = "2026-09-03T08:18:42.288Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/fd/49/29585033f3be1bee13a76f7a517107540a79dd8011cc223edf74d1416ab5/orcakit_harness_agent-1.0.2-py3-none-any.whl", hash = "sha256:fa61ec1a6ceb13c3233eae3e6707526b9621b85d2dbfea4fa2694a14cbf37bfa", size = 1424971, upload-time = "2026-09-01T08:56:28.24Z" },
+    { url = "https://files.pythonhosted.org/packages/27/95/bc4660a554fcfce78af2c1695a8b96374f81384e7564fc2a0c1091557d9e/orcakit_harness_agent-1.0.4-py3-none-any.whl", hash = "sha256:ef53f6ab53fade47c3866ce2c76a9503119ea9c223cf83c3fdc400ffb681204a", size = 1430458, upload-time = "2026-09-03T08:18:40.712Z" },
 ]
 
 [package.optional-dependencies]
@@ -3312,6 +3401,36 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/47/8d/d529b5d697919ba8c11ad626e835d4039be708a35b0d22de83a269a6682c/pyasn1_modules-0.4.2-py3-none-any.whl", hash = "sha256:29253a9207ce32b64c3ac6600edc75368f98473906e8fd1043bd6b5b1de2c14a", size = 181259, upload-time = "2025-03-28T02:41:19.028Z" },
 ]
 
+[[package]]
+name = "pyclipper"
+version = "1.4.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/f6/21/3c06205bb407e1f79b73b7b4dfb3950bd9537c4f625a68ab5cc41177f5bc/pyclipper-1.4.0.tar.gz", hash = "sha256:9882bd889f27da78add4dd6f881d25697efc740bf840274e749988d25496c8e1", size = 54489, upload-time = "2025-12-01T13:15:35.015Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/90/1b/7a07b68e0842324d46c03e512d8eefa9cb92ba2a792b3b4ebf939dafcac3/pyclipper-1.4.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:222ac96c8b8281b53d695b9c4fedc674f56d6d4320ad23f1bdbd168f4e316140", size = 265676, upload-time = "2025-12-01T13:15:04.15Z" },
+    { url = "https://files.pythonhosted.org/packages/6b/dd/8bd622521c05d04963420ae6664093f154343ed044c53ea260a310c8bb4d/pyclipper-1.4.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:f3672dbafbb458f1b96e1ee3e610d174acb5ace5bd2ed5d1252603bb797f2fc6", size = 140458, upload-time = "2025-12-01T13:15:05.76Z" },
+    { url = "https://files.pythonhosted.org/packages/7a/06/6e3e241882bf7d6ab23d9c69ba4e85f1ec47397cbbeee948a16cf75e21ed/pyclipper-1.4.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:d1f807e2b4760a8e5c6d6b4e8c1d71ef52b7fe1946ff088f4fa41e16a881a5ca", size = 978235, upload-time = "2025-12-01T13:15:06.993Z" },
+    { url = "https://files.pythonhosted.org/packages/cf/f4/3418c1cd5eea640a9fa2501d4bc0b3655fa8d40145d1a4f484b987990a75/pyclipper-1.4.0-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ce1f83c9a4e10ea3de1959f0ae79e9a5bd41346dff648fee6228ba9eaf8b3872", size = 961388, upload-time = "2025-12-01T13:15:08.467Z" },
+    { url = "https://files.pythonhosted.org/packages/ac/94/c85401d24be634af529c962dd5d781f3cb62a67cd769534df2cb3feee97a/pyclipper-1.4.0-cp312-cp312-win32.whl", hash = "sha256:3ef44b64666ebf1cb521a08a60c3e639d21b8c50bfbe846ba7c52a0415e936f4", size = 95169, upload-time = "2025-12-01T13:15:10.098Z" },
+    { url = "https://files.pythonhosted.org/packages/97/77/dfea08e3b230b82ee22543c30c35d33d42f846a77f96caf7c504dd54fab1/pyclipper-1.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:d1e5498d883b706a4ce636247f0d830c6eb34a25b843a1b78e2c969754ca9037", size = 104619, upload-time = "2025-12-01T13:15:11.592Z" },
+    { url = "https://files.pythonhosted.org/packages/67/d0/cbce7d47de1e6458f66a4d999b091640134deb8f2c7351eab993b70d2e10/pyclipper-1.4.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:d49df13cbb2627ccb13a1046f3ea6ebf7177b5504ec61bdef87d6a704046fd6e", size = 264342, upload-time = "2025-12-01T13:15:12.697Z" },
+    { url = "https://files.pythonhosted.org/packages/ce/cc/742b9d69d96c58ac156947e1b56d0f81cbacbccf869e2ac7229f2f86dc4e/pyclipper-1.4.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:37bfec361e174110cdddffd5ecd070a8064015c99383d95eb692c253951eee8a", size = 139839, upload-time = "2025-12-01T13:15:13.911Z" },
+    { url = "https://files.pythonhosted.org/packages/db/48/dd301d62c1529efdd721b47b9e5fb52120fcdac5f4d3405cfc0d2f391414/pyclipper-1.4.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:14c8bdb5a72004b721c4e6f448d2c2262d74a7f0c9e3076aeff41e564a92389f", size = 972142, upload-time = "2025-12-01T13:15:15.477Z" },
+    { url = "https://files.pythonhosted.org/packages/07/bf/d493fd1b33bb090fa64e28c1009374d5d72fa705f9331cd56517c35e381e/pyclipper-1.4.0-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f2a50c22c3a78cb4e48347ecf06930f61ce98cf9252f2e292aa025471e9d75b1", size = 952789, upload-time = "2025-12-01T13:15:17.042Z" },
+    { url = "https://files.pythonhosted.org/packages/cf/88/b95ea8ea21ddca34aa14b123226a81526dd2faaa993f9aabd3ed21231604/pyclipper-1.4.0-cp313-cp313-win32.whl", hash = "sha256:c9a3faa416ff536cee93417a72bfb690d9dea136dc39a39dbbe1e5dadf108c9c", size = 94817, upload-time = "2025-12-01T13:15:18.724Z" },
+    { url = "https://files.pythonhosted.org/packages/ba/42/0a1920d276a0e1ca21dc0d13ee9e3ba10a9a8aa3abac76cd5e5a9f503306/pyclipper-1.4.0-cp313-cp313-win_amd64.whl", hash = "sha256:d4b2d7c41086f1927d14947c563dfc7beed2f6c0d9af13c42fe3dcdc20d35832", size = 104007, upload-time = "2025-12-01T13:15:19.763Z" },
+    { url = "https://files.pythonhosted.org/packages/1a/20/04d58c70f3ccd404f179f8dd81d16722a05a3bf1ab61445ee64e8218c1f8/pyclipper-1.4.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:7c87480fc91a5af4c1ba310bdb7de2f089a3eeef5fe351a3cedc37da1fcced1c", size = 265167, upload-time = "2025-12-01T13:15:20.844Z" },
+    { url = "https://files.pythonhosted.org/packages/bd/2e/a570c1abe69b7260ca0caab4236ce6ea3661193ebf8d1bd7f78ccce537a5/pyclipper-1.4.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:81d8bb2d1fb9d66dc7ea4373b176bb4b02443a7e328b3b603a73faec088b952e", size = 139966, upload-time = "2025-12-01T13:15:22.036Z" },
+    { url = "https://files.pythonhosted.org/packages/e8/3b/e0859e54adabdde8a24a29d3f525ebb31c71ddf2e8d93edce83a3c212ffc/pyclipper-1.4.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:773c0e06b683214dcfc6711be230c83b03cddebe8a57eae053d4603dd63582f9", size = 968216, upload-time = "2025-12-01T13:15:23.18Z" },
+    { url = "https://files.pythonhosted.org/packages/f6/6b/e3c4febf0a35ae643ee579b09988dd931602b5bf311020535fd9e5b7e715/pyclipper-1.4.0-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9bc45f2463d997848450dbed91c950ca37c6cf27f84a49a5cad4affc0b469e39", size = 954198, upload-time = "2025-12-01T13:15:24.522Z" },
+    { url = "https://files.pythonhosted.org/packages/fc/74/728efcee02e12acb486ce9d56fa037120c9bf5b77c54bbdbaa441c14a9d9/pyclipper-1.4.0-cp314-cp314-win32.whl", hash = "sha256:0b8c2105b3b3c44dbe1a266f64309407fe30bf372cf39a94dc8aaa97df00da5b", size = 96951, upload-time = "2025-12-01T13:15:25.79Z" },
+    { url = "https://files.pythonhosted.org/packages/e3/d7/7f4354e69f10a917e5c7d5d72a499ef2e10945312f5e72c414a0a08d2ae4/pyclipper-1.4.0-cp314-cp314-win_amd64.whl", hash = "sha256:6c317e182590c88ec0194149995e3d71a979cfef3b246383f4e035f9d4a11826", size = 106782, upload-time = "2025-12-01T13:15:26.945Z" },
+    { url = "https://files.pythonhosted.org/packages/63/60/fc32c7a3d7f61a970511ec2857ecd09693d8ac80d560ee7b8e67a6d268c9/pyclipper-1.4.0-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:f160a2c6ba036f7eaf09f1f10f4fbfa734234af9112fb5187877efed78df9303", size = 269880, upload-time = "2025-12-01T13:15:28.117Z" },
+    { url = "https://files.pythonhosted.org/packages/49/df/c4a72d3f62f0ba03ec440c4fff56cd2d674a4334d23c5064cbf41c9583f6/pyclipper-1.4.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:a9f11ad133257c52c40d50de7a0ca3370a0cdd8e3d11eec0604ad3c34ba549e9", size = 141706, upload-time = "2025-12-01T13:15:30.134Z" },
+    { url = "https://files.pythonhosted.org/packages/c5/0b/cf55df03e2175e1e2da9db585241401e0bc98f76bee3791bed39d0313449/pyclipper-1.4.0-cp314-cp314t-win32.whl", hash = "sha256:bbc827b77442c99deaeee26e0e7f172355ddb097a5e126aea206d447d3b26286", size = 105308, upload-time = "2025-12-01T13:15:31.225Z" },
+    { url = "https://files.pythonhosted.org/packages/8f/dc/53df8b6931d47080b4fe4ee8450d42e660ee1c5c1556c7ab73359182b769/pyclipper-1.4.0-cp314-cp314t-win_amd64.whl", hash = "sha256:29dae3e0296dff8502eeb7639fcfee794b0eec8590ba3563aee28db269da6b04", size = 117608, upload-time = "2025-12-01T13:15:32.69Z" },
+]
+
 [[package]]
 name = "pycparser"
 version = "3.0"
@@ -3490,6 +3609,24 @@ crypto = [
     { name = "cryptography" },
 ]
 
+[[package]]
+name = "pymupdf"
+version = "1.28.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/a3/fb/b6761fa2d5266f2cdb24c3b91f4023070ab7848381417678e7a289a1d52a/pymupdf-1.28.2.tar.gz", hash = "sha256:5e0be7908a715aa20333caddd73f1d6f01e4cd0c26e869fa2dd0b7f344da2249", size = 87903557, upload-time = "2026-08-06T21:43:23.321Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/b4/51/550c9a75c4ff3245cb4ecb7bb95cbe2ab7374230b8e2b7a1f7259444150b/pymupdf-1.28.2-cp310-abi3-macosx_10_15_x86_64.whl", hash = "sha256:5fc315b425ff1f7afdd1ea2f348205cb19b806767daae7ce4d64115799c2bae1", size = 24645079, upload-time = "2026-08-06T21:37:25.001Z" },
+    { url = "https://files.pythonhosted.org/packages/fa/01/3591f781b417b382a8487a2356e927acfe858b1043bab0ec47f6805bb109/pymupdf-1.28.2-cp310-abi3-macosx_11_0_arm64.whl", hash = "sha256:7113846b35dbf0a033f088e4f4fb543dabeb4b0b12c112966a1ca1ee2d5eacae", size = 23875605, upload-time = "2026-08-06T21:37:40.369Z" },
+    { url = "https://files.pythonhosted.org/packages/d2/86/4a68f080b71b46802178346af46486e1697508e760855ff5f3b218a6dff7/pymupdf-1.28.2-cp310-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:3050a233dde1211efe89ada74e2add6238436434159f46097a1423aad2842545", size = 25095554, upload-time = "2026-08-06T21:37:58.485Z" },
+    { url = "https://files.pythonhosted.org/packages/c7/06/dace3e27af26690cb20bead80dbac42941b0841eb689b8aabbd67dde16f0/pymupdf-1.28.2-cp310-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:397d6715c1f0df7548a92d0afd8ce370fc48fa47aeefac16be2bc04a16a8227f", size = 25762500, upload-time = "2026-08-06T21:38:17.438Z" },
+    { url = "https://files.pythonhosted.org/packages/e5/61/4146dfa1d8172a1ce8d59f0eed94896ddefb8deb2274534d0522fbb8abf5/pymupdf-1.28.2-cp310-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:f89fb2d86d07d643a269f17a093105057e20c79c1d06c103b53600067b6d2b01", size = 25986309, upload-time = "2026-08-06T21:38:35.472Z" },
+    { url = "https://files.pythonhosted.org/packages/52/60/1fb6e64676f7500ebe89054b9e5bbbe14d3101c92d5f1a40ac9a35227673/pymupdf-1.28.2-cp310-abi3-win32.whl", hash = "sha256:530ef543a3885b3b81cb72a854e7c5a625a9233201221132bb6c31698c6a2bdb", size = 18525353, upload-time = "2026-08-06T21:38:47.697Z" },
+    { url = "https://files.pythonhosted.org/packages/4a/61/d563bbccba262f9dd6d2d35ccb72593648184d886188efb12d9ce8f34dd6/pymupdf-1.28.2-cp310-abi3-win_amd64.whl", hash = "sha256:ebd244918798502d7b4504c90410d1711a4d7675a32584ca30f1bab419ecbffe", size = 19826532, upload-time = "2026-08-06T21:39:00.213Z" },
+    { url = "https://files.pythonhosted.org/packages/e2/93/08f404a1f0155fe24137cf2d3aabd3e2b4b08c62053ed89c60f2611be3e9/pymupdf-1.28.2-cp310-abi3-win_arm64.whl", hash = "sha256:ffe91a24edc75c80da2a4b62f50fc0f54632d34fc8fe4cbc48e5c7ff07cf8fb4", size = 19759252, upload-time = "2026-08-06T21:39:12.937Z" },
+    { url = "https://files.pythonhosted.org/packages/58/8c/d897dcd32a25b58186c968b15ce4324ca029e9d96460de12325314e390be/pymupdf-1.28.2-cp313-abi3-pyemscripten_2025_0_wasm32.whl", hash = "sha256:2e1b574c0fd2cb238021033fd3c0f9c4388816638df064e4bfb56d9d81736dc8", size = 18399403, upload-time = "2026-08-06T21:39:25.008Z" },
+    { url = "https://files.pythonhosted.org/packages/f6/f1/de34a1c53fe2bf8c6e71db84b0ced782d408970c9810d2b456a2ae96814c/pymupdf-1.28.2-cp314-cp314t-manylinux_2_28_x86_64.whl", hash = "sha256:fd481ed48bef56305c41fb7e05a055c03345c899c7b101dad086258b438f8168", size = 25802333, upload-time = "2026-08-06T21:39:41.426Z" },
+]
+
 [[package]]
 name = "pynput"
 version = "1.8.2"
@@ -3916,6 +4053,27 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/3c/26/1062c7ec1b053db9e499b4d2d5bc231743201b74051c973dadeac80a8f43/questionary-2.1.1-py3-none-any.whl", hash = "sha256:a51af13f345f1cdea62347589fbb6df3b290306ab8930713bfae4d475a7d4a59", size = 36753, upload-time = "2025-08-28T19:00:19.56Z" },
 ]
 
+[[package]]
+name = "rapidocr"
+version = "3.9.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "colorlog" },
+    { name = "numpy" },
+    { name = "omegaconf" },
+    { name = "opencv-python" },
+    { name = "pillow" },
+    { name = "pyclipper" },
+    { name = "pyyaml" },
+    { name = "requests" },
+    { name = "shapely" },
+    { name = "six" },
+    { name = "tqdm" },
+]
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/55/ed/0ee9b9281986974be9d2406ae0134c8d7c91d2fc613f16ffda9701eeda6f/rapidocr-3.9.2-py3-none-any.whl", hash = "sha256:04d6b8d151f823d930bd91910555f57bea897c0c44fa6794267b94cf9c1ef9a0", size = 27275208, upload-time = "2026-07-21T10:59:01.599Z" },
+]
+
 [[package]]
 name = "referencing"
 version = "0.37.0"
@@ -4209,6 +4367,57 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/d6/02/12c73fd423eb9577b97fc1924966b929eff7074ae6b2e15dd3d30cb9e4ae/segno-1.6.6-py3-none-any.whl", hash = "sha256:28c7d081ed0cf935e0411293a465efd4d500704072cdb039778a2ab8736190c7", size = 76503, upload-time = "2025-03-12T22:12:48.106Z" },
 ]
 
+[[package]]
+name = "shapely"
+version = "2.1.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "numpy" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/4d/bc/0989043118a27cccb4e906a46b7565ce36ca7b57f5a18b78f4f1b0f72d9d/shapely-2.1.2.tar.gz", hash = "sha256:2ed4ecb28320a433db18a5bf029986aa8afcfd740745e78847e330d5d94922a9", size = 315489, upload-time = "2025-09-24T13:51:41.432Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/24/c0/f3b6453cf2dfa99adc0ba6675f9aaff9e526d2224cbd7ff9c1a879238693/shapely-2.1.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:fe2533caae6a91a543dec62e8360fe86ffcdc42a7c55f9dfd0128a977a896b94", size = 1833550, upload-time = "2025-09-24T13:50:30.019Z" },
+    { url = "https://files.pythonhosted.org/packages/86/07/59dee0bc4b913b7ab59ab1086225baca5b8f19865e6101db9ebb7243e132/shapely-2.1.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ba4d1333cc0bc94381d6d4308d2e4e008e0bd128bdcff5573199742ee3634359", size = 1643556, upload-time = "2025-09-24T13:50:32.291Z" },
+    { url = "https://files.pythonhosted.org/packages/26/29/a5397e75b435b9895cd53e165083faed5d12fd9626eadec15a83a2411f0f/shapely-2.1.2-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:0bd308103340030feef6c111d3eb98d50dc13feea33affc8a6f9fa549e9458a3", size = 2988308, upload-time = "2025-09-24T13:50:33.862Z" },
+    { url = "https://files.pythonhosted.org/packages/b9/37/e781683abac55dde9771e086b790e554811a71ed0b2b8a1e789b7430dd44/shapely-2.1.2-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:1e7d4d7ad262a48bb44277ca12c7c78cb1b0f56b32c10734ec9a1d30c0b0c54b", size = 3099844, upload-time = "2025-09-24T13:50:35.459Z" },
+    { url = "https://files.pythonhosted.org/packages/d8/f3/9876b64d4a5a321b9dc482c92bb6f061f2fa42131cba643c699f39317cb9/shapely-2.1.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:e9eddfe513096a71896441a7c37db72da0687b34752c4e193577a145c71736fc", size = 3988842, upload-time = "2025-09-24T13:50:37.478Z" },
+    { url = "https://files.pythonhosted.org/packages/d1/a0/704c7292f7014c7e74ec84eddb7b109e1fbae74a16deae9c1504b1d15565/shapely-2.1.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:980c777c612514c0cf99bc8a9de6d286f5e186dcaf9091252fcd444e5638193d", size = 4152714, upload-time = "2025-09-24T13:50:39.9Z" },
+    { url = "https://files.pythonhosted.org/packages/53/46/319c9dc788884ad0785242543cdffac0e6530e4d0deb6c4862bc4143dcf3/shapely-2.1.2-cp312-cp312-win32.whl", hash = "sha256:9111274b88e4d7b54a95218e243282709b330ef52b7b86bc6aaf4f805306f454", size = 1542745, upload-time = "2025-09-24T13:50:41.414Z" },
+    { url = "https://files.pythonhosted.org/packages/ec/bf/cb6c1c505cb31e818e900b9312d514f381fbfa5c4363edfce0fcc4f8c1a4/shapely-2.1.2-cp312-cp312-win_amd64.whl", hash = "sha256:743044b4cfb34f9a67205cee9279feaf60ba7d02e69febc2afc609047cb49179", size = 1722861, upload-time = "2025-09-24T13:50:43.35Z" },
+    { url = "https://files.pythonhosted.org/packages/c3/90/98ef257c23c46425dc4d1d31005ad7c8d649fe423a38b917db02c30f1f5a/shapely-2.1.2-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:b510dda1a3672d6879beb319bc7c5fd302c6c354584690973c838f46ec3e0fa8", size = 1832644, upload-time = "2025-09-24T13:50:44.886Z" },
+    { url = "https://files.pythonhosted.org/packages/6d/ab/0bee5a830d209adcd3a01f2d4b70e587cdd9fd7380d5198c064091005af8/shapely-2.1.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:8cff473e81017594d20ec55d86b54bc635544897e13a7cfc12e36909c5309a2a", size = 1642887, upload-time = "2025-09-24T13:50:46.735Z" },
+    { url = "https://files.pythonhosted.org/packages/2d/5e/7d7f54ba960c13302584c73704d8c4d15404a51024631adb60b126a4ae88/shapely-2.1.2-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:fe7b77dc63d707c09726b7908f575fc04ff1d1ad0f3fb92aec212396bc6cfe5e", size = 2970931, upload-time = "2025-09-24T13:50:48.374Z" },
+    { url = "https://files.pythonhosted.org/packages/f2/a2/83fc37e2a58090e3d2ff79175a95493c664bcd0b653dd75cb9134645a4e5/shapely-2.1.2-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:7ed1a5bbfb386ee8332713bf7508bc24e32d24b74fc9a7b9f8529a55db9f4ee6", size = 3082855, upload-time = "2025-09-24T13:50:50.037Z" },
+    { url = "https://files.pythonhosted.org/packages/44/2b/578faf235a5b09f16b5f02833c53822294d7f21b242f8e2d0cf03fb64321/shapely-2.1.2-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a84e0582858d841d54355246ddfcbd1fce3179f185da7470f41ce39d001ee1af", size = 3979960, upload-time = "2025-09-24T13:50:51.74Z" },
+    { url = "https://files.pythonhosted.org/packages/4d/04/167f096386120f692cc4ca02f75a17b961858997a95e67a3cb6a7bbd6b53/shapely-2.1.2-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:dc3487447a43d42adcdf52d7ac73804f2312cbfa5d433a7d2c506dcab0033dfd", size = 4142851, upload-time = "2025-09-24T13:50:53.49Z" },
+    { url = "https://files.pythonhosted.org/packages/48/74/fb402c5a6235d1c65a97348b48cdedb75fb19eca2b1d66d04969fc1c6091/shapely-2.1.2-cp313-cp313-win32.whl", hash = "sha256:9c3a3c648aedc9f99c09263b39f2d8252f199cb3ac154fadc173283d7d111350", size = 1541890, upload-time = "2025-09-24T13:50:55.337Z" },
+    { url = "https://files.pythonhosted.org/packages/41/47/3647fe7ad990af60ad98b889657a976042c9988c2807cf322a9d6685f462/shapely-2.1.2-cp313-cp313-win_amd64.whl", hash = "sha256:ca2591bff6645c216695bdf1614fca9c82ea1144d4a7591a466fef64f28f0715", size = 1722151, upload-time = "2025-09-24T13:50:57.153Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/49/63953754faa51ffe7d8189bfbe9ca34def29f8c0e34c67cbe2a2795f269d/shapely-2.1.2-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:2d93d23bdd2ed9dc157b46bc2f19b7da143ca8714464249bef6771c679d5ff40", size = 1834130, upload-time = "2025-09-24T13:50:58.49Z" },
+    { url = "https://files.pythonhosted.org/packages/7f/ee/dce001c1984052970ff60eb4727164892fb2d08052c575042a47f5a9e88f/shapely-2.1.2-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:01d0d304b25634d60bd7cf291828119ab55a3bab87dc4af1e44b07fb225f188b", size = 1642802, upload-time = "2025-09-24T13:50:59.871Z" },
+    { url = "https://files.pythonhosted.org/packages/da/e7/fc4e9a19929522877fa602f705706b96e78376afb7fad09cad5b9af1553c/shapely-2.1.2-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:8d8382dd120d64b03698b7298b89611a6ea6f55ada9d39942838b79c9bc89801", size = 3018460, upload-time = "2025-09-24T13:51:02.08Z" },
+    { url = "https://files.pythonhosted.org/packages/a1/18/7519a25db21847b525696883ddc8e6a0ecaa36159ea88e0fef11466384d0/shapely-2.1.2-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:19efa3611eef966e776183e338b2d7ea43569ae99ab34f8d17c2c054d3205cc0", size = 3095223, upload-time = "2025-09-24T13:51:04.472Z" },
+    { url = "https://files.pythonhosted.org/packages/48/de/b59a620b1f3a129c3fecc2737104a0a7e04e79335bd3b0a1f1609744cf17/shapely-2.1.2-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:346ec0c1a0fcd32f57f00e4134d1200e14bf3f5ae12af87ba83ca275c502498c", size = 4030760, upload-time = "2025-09-24T13:51:06.455Z" },
+    { url = "https://files.pythonhosted.org/packages/96/b3/c6655ee7232b417562bae192ae0d3ceaadb1cc0ffc2088a2ddf415456cc2/shapely-2.1.2-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:6305993a35989391bd3476ee538a5c9a845861462327efe00dd11a5c8c709a99", size = 4170078, upload-time = "2025-09-24T13:51:08.584Z" },
+    { url = "https://files.pythonhosted.org/packages/a0/8e/605c76808d73503c9333af8f6cbe7e1354d2d238bda5f88eea36bfe0f42a/shapely-2.1.2-cp313-cp313t-win32.whl", hash = "sha256:c8876673449f3401f278c86eb33224c5764582f72b653a415d0e6672fde887bf", size = 1559178, upload-time = "2025-09-24T13:51:10.73Z" },
+    { url = "https://files.pythonhosted.org/packages/36/f7/d317eb232352a1f1444d11002d477e54514a4a6045536d49d0c59783c0da/shapely-2.1.2-cp313-cp313t-win_amd64.whl", hash = "sha256:4a44bc62a10d84c11a7a3d7c1c4fe857f7477c3506e24c9062da0db0ae0c449c", size = 1739756, upload-time = "2025-09-24T13:51:12.105Z" },
+    { url = "https://files.pythonhosted.org/packages/fc/c4/3ce4c2d9b6aabd27d26ec988f08cb877ba9e6e96086eff81bfea93e688c7/shapely-2.1.2-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:9a522f460d28e2bf4e12396240a5fc1518788b2fcd73535166d748399ef0c223", size = 1831290, upload-time = "2025-09-24T13:51:13.56Z" },
+    { url = "https://files.pythonhosted.org/packages/17/b9/f6ab8918fc15429f79cb04afa9f9913546212d7fb5e5196132a2af46676b/shapely-2.1.2-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:1ff629e00818033b8d71139565527ced7d776c269a49bd78c9df84e8f852190c", size = 1641463, upload-time = "2025-09-24T13:51:14.972Z" },
+    { url = "https://files.pythonhosted.org/packages/a5/57/91d59ae525ca641e7ac5551c04c9503aee6f29b92b392f31790fcb1a4358/shapely-2.1.2-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f67b34271dedc3c653eba4e3d7111aa421d5be9b4c4c7d38d30907f796cb30df", size = 2970145, upload-time = "2025-09-24T13:51:16.961Z" },
+    { url = "https://files.pythonhosted.org/packages/8a/cb/4948be52ee1da6927831ab59e10d4c29baa2a714f599f1f0d1bc747f5777/shapely-2.1.2-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:21952dc00df38a2c28375659b07a3979d22641aeb104751e769c3ee825aadecf", size = 3073806, upload-time = "2025-09-24T13:51:18.712Z" },
+    { url = "https://files.pythonhosted.org/packages/03/83/f768a54af775eb41ef2e7bec8a0a0dbe7d2431c3e78c0a8bdba7ab17e446/shapely-2.1.2-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:1f2f33f486777456586948e333a56ae21f35ae273be99255a191f5c1fa302eb4", size = 3980803, upload-time = "2025-09-24T13:51:20.37Z" },
+    { url = "https://files.pythonhosted.org/packages/9f/cb/559c7c195807c91c79d38a1f6901384a2878a76fbdf3f1048893a9b7534d/shapely-2.1.2-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:cf831a13e0d5a7eb519e96f58ec26e049b1fad411fc6fc23b162a7ce04d9cffc", size = 4133301, upload-time = "2025-09-24T13:51:21.887Z" },
+    { url = "https://files.pythonhosted.org/packages/80/cd/60d5ae203241c53ef3abd2ef27c6800e21afd6c94e39db5315ea0cbafb4a/shapely-2.1.2-cp314-cp314-win32.whl", hash = "sha256:61edcd8d0d17dd99075d320a1dd39c0cb9616f7572f10ef91b4b5b00c4aeb566", size = 1583247, upload-time = "2025-09-24T13:51:23.401Z" },
+    { url = "https://files.pythonhosted.org/packages/74/d4/135684f342e909330e50d31d441ace06bf83c7dc0777e11043f99167b123/shapely-2.1.2-cp314-cp314-win_amd64.whl", hash = "sha256:a444e7afccdb0999e203b976adb37ea633725333e5b119ad40b1ca291ecf311c", size = 1773019, upload-time = "2025-09-24T13:51:24.873Z" },
+    { url = "https://files.pythonhosted.org/packages/a3/05/a44f3f9f695fa3ada22786dc9da33c933da1cbc4bfe876fe3a100bafe263/shapely-2.1.2-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:5ebe3f84c6112ad3d4632b1fd2290665aa75d4cef5f6c5d77c4c95b324527c6a", size = 1834137, upload-time = "2025-09-24T13:51:26.665Z" },
+    { url = "https://files.pythonhosted.org/packages/52/7e/4d57db45bf314573427b0a70dfca15d912d108e6023f623947fa69f39b72/shapely-2.1.2-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:5860eb9f00a1d49ebb14e881f5caf6c2cf472c7fd38bd7f253bbd34f934eb076", size = 1642884, upload-time = "2025-09-24T13:51:28.029Z" },
+    { url = "https://files.pythonhosted.org/packages/5a/27/4e29c0a55d6d14ad7422bf86995d7ff3f54af0eba59617eb95caf84b9680/shapely-2.1.2-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:b705c99c76695702656327b819c9660768ec33f5ce01fa32b2af62b56ba400a1", size = 3018320, upload-time = "2025-09-24T13:51:29.903Z" },
+    { url = "https://files.pythonhosted.org/packages/9f/bb/992e6a3c463f4d29d4cd6ab8963b75b1b1040199edbd72beada4af46bde5/shapely-2.1.2-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:a1fd0ea855b2cf7c9cddaf25543e914dd75af9de08785f20ca3085f2c9ca60b0", size = 3094931, upload-time = "2025-09-24T13:51:32.699Z" },
+    { url = "https://files.pythonhosted.org/packages/9c/16/82e65e21070e473f0ed6451224ed9fa0be85033d17e0c6e7213a12f59d12/shapely-2.1.2-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:df90e2db118c3671a0754f38e36802db75fe0920d211a27481daf50a711fdf26", size = 4030406, upload-time = "2025-09-24T13:51:34.189Z" },
+    { url = "https://files.pythonhosted.org/packages/7c/75/c24ed871c576d7e2b64b04b1fe3d075157f6eb54e59670d3f5ffb36e25c7/shapely-2.1.2-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:361b6d45030b4ac64ddd0a26046906c8202eb60d0f9f53085f5179f1d23021a0", size = 4169511, upload-time = "2025-09-24T13:51:36.297Z" },
+    { url = "https://files.pythonhosted.org/packages/b1/f7/b3d1d6d18ebf55236eec1c681ce5e665742aab3c0b7b232720a7d43df7b6/shapely-2.1.2-cp314-cp314t-win32.whl", hash = "sha256:b54df60f1fbdecc8ebc2c5b11870461a6417b3d617f555e5033f1505d36e5735", size = 1602607, upload-time = "2025-09-24T13:51:37.757Z" },
+    { url = "https://files.pythonhosted.org/packages/9a/f6/f09272a71976dfc138129b8faf435d064a811ae2f708cb147dccdf7aacdb/shapely-2.1.2-cp314-cp314t-win_amd64.whl", hash = "sha256:0036ac886e0923417932c2e6369b6c52e38e0ff5d9120b90eef5cd9a5fc5cae9", size = 1796682, upload-time = "2025-09-24T13:51:39.233Z" },
+]
+
 [[package]]
 name = "simple-websocket"
 version = "1.1.0"
@@ -4843,6 +5052,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/a4/f5/10b68b7b1544245097b2a1b8238f66f2fc6dcaeb24ba5d917f52bd2eed4f/wsproto-1.3.2-py3-none-any.whl", hash = "sha256:61eea322cdf56e8cc904bd3ad7573359a242ba65688716b0710a5eb12beab584", size = 24405, upload-time = "2025-11-20T18:18:00.454Z" },
 ]
 
+[[package]]
+name = "xlrd"
+version = "2.0.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/07/5a/377161c2d3538d1990d7af382c79f3b2372e880b65de21b01b1a2b78691e/xlrd-2.0.2.tar.gz", hash = "sha256:08b5e25de58f21ce71dc7db3b3b8106c1fa776f3024c54e45b45b374e89234c9", size = 100167, upload-time = "2025-06-14T08:46:39.039Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/1a/62/c8d562e7766786ba6587d09c5a8ba9f718ed3fa8af7f4553e8f91c36f302/xlrd-2.0.2-py2.py3-none-any.whl", hash = "sha256:ea762c3d29f4cca48d82df517b6d89fbce4db3107f9d78713e48cd321d5c9aa9", size = 96555, upload-time = "2025-06-14T08:46:37.766Z" },
+]
+
 [[package]]
 name = "xlsxwriter"
 version = "3.2.9"
@@ -4852,6 +5070,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/3a/0c/3662f4a66880196a590b202f0db82d919dd2f89e99a27fadef91c4a33d41/xlsxwriter-3.2.9-py3-none-any.whl", hash = "sha256:9a5db42bc5dff014806c58a20b9eae7322a134abb6fce3c92c181bfb275ec5b3", size = 175315, upload-time = "2025-09-16T00:16:20.108Z" },
 ]
 
+[[package]]
+name = "xlwt"
+version = "1.3.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/06/97/56a6f56ce44578a69343449aa5a0d98eefe04085d69da539f3034e2cd5c1/xlwt-1.3.0.tar.gz", hash = "sha256:c59912717a9b28f1a3c2a98fd60741014b06b043936dcecbc113eaaada156c88", size = 153929, upload-time = "2017-08-22T06:47:16.498Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/44/48/def306413b25c3d01753603b1a222a011b8621aed27cd7f89cbc27e6b0f4/xlwt-1.3.0-py2.py3-none-any.whl", hash = "sha256:a082260524678ba48a297d922cc385f58278b8aa68741596a87de01a9c628b2e", size = 99981, upload-time = "2017-08-22T06:47:15.281Z" },
+]
+
 [[package]]
 name = "xmltodict"
 version = "1.0.4"