diff --git a/.cursor/skills/publish/SKILL.md b/.cursor/skills/publish/SKILL.md
index 684d7967..9b0039bc 100644
--- a/.cursor/skills/publish/SKILL.md
+++ b/.cursor/skills/publish/SKILL.md
@@ -3,7 +3,7 @@ name: publish
 description: >-
   Publish the Octop Python package: cut a release branch from develop, bump
   version, update CHANGELOG, open a PR to main; after merge, Actions tag on
-  main (PyPI / Docker Hub) and sync main into develop. Use when the user asks
+  main (PyPI / Docker Hub + GHCR) and sync main into develop. Use when the user asks
   to publish, release, bump version, cut a release, or run /publish.
 disable-model-invocation: true
 ---
diff --git a/.github/workflows/auto-tag-on-release.yml b/.github/workflows/auto-tag-on-release.yml
index 3052b34f..280d23b0 100644
--- a/.github/workflows/auto-tag-on-release.yml
+++ b/.github/workflows/auto-tag-on-release.yml
@@ -65,8 +65,9 @@ jobs:
 
       # GITHUB_TOKEN tag pushes do not cascade to other workflows. Explicitly
       # dispatch Release / Docker Publish / Desktop Package (workflow_dispatch
-      # is exempt). Desktop builds in parallel; its release job upserts zips
-      # onto the same v* GitHub Release.
+      # 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*.
       - 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 e7fc21cd..9671aa9e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -115,4 +115,10 @@ jobs:
           CONNECTOR_TENCENT_LEXIANG_COMPANY_FROM: ${{ secrets.LIVE_CONNECTOR_TENCENT_LEXIANG_COMPANY_FROM }}
           CONNECTOR_MEITUAN_TRAVEL_TOKEN: ${{ secrets.LIVE_CONNECTOR_MEITUAN_TRAVEL_TOKEN }}
           CONNECTOR_YUANDIAN_TOKEN: ${{ secrets.LIVE_CONNECTOR_YUANDIAN_TOKEN }}
+          # Channel probes (WeChat iLink + Feishu)
+          WEIXIN_BOT_UIN: ${{ secrets.LIVE_WEIXIN_BOT_UIN }}
+          WEIXIN_TOKEN: ${{ secrets.LIVE_WEIXIN_TOKEN }}
+          WEIXIN_BASE_URL: ${{ secrets.LIVE_WEIXIN_BASE_URL }}
+          FEISHU_APP_ID: ${{ secrets.LIVE_FEISHU_APP_ID }}
+          FEISHU_APP_SECRET: ${{ secrets.LIVE_FEISHU_APP_SECRET }}
         run: make test-live
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 5e37cad7..dd787522 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -1,26 +1,59 @@
 name: Docker Publish
 
-# 仅在推送版本标签（v*）时构建并发布镜像到 Docker Hub。
-# 与 .github/workflows/release.yml（发 PyPI）相互独立、可并行。
-# 普通 push / PR 不会触发，CI 开销保持在最低。
+# 仅在版本标签（v*）上构建并同步发布镜像到 Docker Hub 与 GHCR。
+# 文档与对外引用统一使用：ghcr.io/tencentcloud/octop
+# （Hub 仍用 DOCKERHUB_* secrets 同步推送。）
+#
+# 触发路径：
+#   1. 人工推送 v* tag → on.push.tags
+#   2. Auto Tag 用 GITHUB_TOKEN 推 tag 后显式 workflow_dispatch（token push 不会触发 push 工作流）
+#
+# 注意：workflow_dispatch 下 metadata-action 的 type=semver 不可靠，
+# 必须从 GITHUB_REF_NAME 显式解析版本号。
+#
+# FnOS FPK 由 Release 成功后自动 dispatch，并等待本工作流推送的 :{version} 就绪。
+#
+# 拉取示例：
+#   docker pull ghcr.io/tencentcloud/octop:latest
+#   docker pull ghcr.io/tencentcloud/octop:0.9.28
 on:
   push:
     tags:
       - "v*"
-  # Allow Auto Tag On Release Merge to cascade after a GITHUB_TOKEN tag push
-  # (token-authored pushes do not retrigger push workflows).
   workflow_dispatch:
 
+permissions:
+  contents: read
+  packages: write
+
 jobs:
   docker:
     name: Build and push image
     runs-on: ubuntu-latest
+    # 拒绝在非 v* ref 上误跑（例如 UI 里对 main 点 Run workflow）
+    if: startsWith(github.ref, 'refs/tags/v')
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - name: Resolve version from tag ref
+        id: ver
+        run: |
+          set -euo pipefail
+          ref="${GITHUB_REF_NAME}"
+          case "$ref" in
+            v*)
+              echo "version=${ref#v}" >> "$GITHUB_OUTPUT"
+              echo "tag=$ref" >> "$GITHUB_OUTPUT"
+              ;;
+            *)
+              echo "::error::Expected refs/tags/v*, got ref_name=$ref"
+              exit 1
+              ;;
+          esac
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -30,16 +63,29 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Log in to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Image names
+        id: image
+        run: |
+          echo "ghcr=ghcr.io/$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')" >> "$GITHUB_OUTPUT"
+          echo "hub=${{ secrets.DOCKERHUB_USERNAME }}/octop" >> "$GITHUB_OUTPUT"
+
       - name: Docker metadata
         id: meta
         uses: docker/metadata-action@v5
         with:
-          # 镜像名 = <DOCKERHUB_USERNAME>/octop（个人或组织命名空间均可）。
-          images: ${{ secrets.DOCKERHUB_USERNAME }}/octop
+          images: |
+            ${{ steps.image.outputs.hub }}
+            ${{ steps.image.outputs.ghcr }}
+          # 显式 raw tag：兼容 push.tags 与 Auto Tag 的 workflow_dispatch
           tags: |
-            # v1.2.3 -> 1.2.3
-            type=semver,pattern={{version}}
-            # 每个 tag 同时打 latest
+            type=raw,value=${{ steps.ver.outputs.version }}
             type=raw,value=latest
 
       - name: Build and push
@@ -48,11 +94,8 @@ jobs:
           context: .
           file: ./docker/Dockerfile
           push: true
-          # 默认仅 amd64，构建最快最稳。如需 ARM64（Apple Silicon / Graviton），
-          # 改为 "linux/amd64,linux/arm64" 并加上 docker/setup-qemu-action@v3 步骤。
           platforms: linux/amd64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          # 复用 GitHub Actions 缓存加速后续构建
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/.github/workflows/fnos-build-fpk.yml b/.github/workflows/fnos-build-fpk.yml
index 05c6a338..9ce4060a 100644
--- a/.github/workflows/fnos-build-fpk.yml
+++ b/.github/workflows/fnos-build-fpk.yml
@@ -1,35 +1,30 @@
-name: Build Octop FPK (template)
+name: Build Octop FPK
 
-# TEMPLATE — FnOS (飞牛 NAS) app packaging pipeline for fork maintainers.
-# # This workflow builds the Octop Docker image, the Docker .fpk and the native .fpk,
-# # then publishes GitHub releases (fixed version + rolling latest).
-# #
-# # To enable on your fork:
-# #   1. Replace jubaoliang/octop with your own image namespace (or fork a copy).
-# #   2. Optionally add a push trigger below (e.g. branches: [main]) so a rebuild happens
-# #      automatically on every upstream sync. It is intentionally workflow_dispatch-only
-# #      here so it never runs on the upstream repository.
-# #
-#   image  job：从仓库源码构建 Octop Docker 镜像，推送到 Docker Hub（jubaoliang/octop:vanilla）
-#   fpk    job：构建「Docker 版」飞牛安装包 Fnos-octop-vanilla-<ver>-<iter>.fpk（依赖 image，确保镜像已就绪）
-#   native job：构建「本地版（非 Docker）」飞牛安装包 Fnos-octop-vanilla-native-<ver>-<iter>.fpk。
-#               不内置 Python 运行时（依赖飞牛应用商店 Python 3.12），
-#               仅内置 Octop 核心 whl + 核心依赖 site-packages，不含浏览器二进制与预装技能。
-#   release job：
-#               - 创建固定版本 release（如 fnos-0.9.16-01），保留历史、带更新日志；
-#               - 同步更新滚动 release fnos-vanilla-latest，方便用户始终从同一 URL 下载最新版。
+# FnOS (飞牛 NAS) 安装包流水线。
 #
-# 镜像包随公开仓库默认即为 public，无需额外设置可见性。
+# 触发：
+#   - Release 工作流在 GitHub Release 创建成功后自动 dispatch（推荐）
+#   - 亦可手动 workflow_dispatch（需对应版本镜像已在 GHCR）
+#
+# 制品复用：
+#   - Docker 镜像：不再重建，等待 docker-publish 推送的
+#     ghcr.io/tencentcloud/octop:{version|latest}
+#   - Native wheel：优先从同版本 GitHub Release（v*）下载；
+#     缺失时再回退到本仓源码构建
+#
+# Jobs：
+#   version → ensure-image → fpk（Docker 版 .fpk，仅打包 compose）
+#           ↘ native（本地版 .fpk）→ release（固定版 + 滚动 latest）
 
 on:
   workflow_dispatch:
 
 permissions:
   contents: write
-  packages: write
+  packages: read
 
 concurrency:
-  group: build-octop-vanilla
+  group: build-octop-fnos
   cancel-in-progress: false
 
 jobs:
@@ -40,17 +35,20 @@ jobs:
       iter: ${{ steps.iter.outputs.iter }}
       tag: ${{ steps.iter.outputs.tag }}
       pkg_ver: ${{ steps.iter.outputs.pkg_ver }}
+      image: ${{ steps.ver.outputs.image }}
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           fetch-tags: true
 
-      - name: Read version
+      - name: Read version and image name
         id: ver
         run: |
           VER=$(grep -m1 '^version' pyproject.toml | sed -E 's/.*"([0-9][0-9.]*[0-9])".*/\1/')
+          IMAGE="ghcr.io/$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')"
           echo "version=$VER" >> "$GITHUB_OUTPUT"
+          echo "image=$IMAGE" >> "$GITHUB_OUTPUT"
 
       - name: Compute iteration
         id: iter
@@ -58,10 +56,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           VER=${{ steps.ver.outputs.version }}
-          # 查询已存在的 fnos-<ver>-NN releases，取最大序号 +1 作为本次迭代号。
-          # 之前用 GitHub API / git ls-remote / git tag -l 都在 CI 中因认证、
-          # 限流或本地 tag 未拉取而回退成 0，导致每次都覆盖 fnos-<ver>-01。
-          # GitHub CLI 在 Actions runner 中已预装且自动使用 GITHUB_TOKEN，最稳。
+          # 查询已存在的 fnos-vanilla-<ver>-NN releases，取最大序号 +1。
           echo "[version] existing releases matching fnos-vanilla-${VER}-NN:"
           gh release list --repo "${{ github.repository }}" --limit 100 --json tagName | python3 -c 'import sys,json; [print("  "+r.get("tagName","")) for r in json.load(sys.stdin)]' || true
           EXISTING=$(gh release list --repo "${{ github.repository }}" --limit 100 --json tagName | python3 -c 'import sys,json,re; d=json.load(sys.stdin); pat=re.compile(r"fnos-vanilla-[0-9]+\.[0-9]+\.[0-9]+-([0-9]+)$"); nums=[int(pat.match(r.get("tagName","")).group(1)) for r in d if pat.match(r.get("tagName",""))]; print(max(nums) if nums else 0)')
@@ -71,42 +66,45 @@ jobs:
           echo "iter=$ITER" >> "$GITHUB_OUTPUT"
           echo "tag=fnos-vanilla-${VER}-${ITER}" >> "$GITHUB_OUTPUT"
           echo "pkg_ver=${VER}-${ITER}" >> "$GITHUB_OUTPUT"
-          echo "[version] VER=$VER, EXISTING_MAX=$MAX, ITER=$ITER, TAG=fnos-${VER}-${ITER}"
+          echo "[version] VER=$VER, EXISTING_MAX=$MAX, ITER=$ITER, TAG=fnos-vanilla-${VER}-${ITER}"
 
-  image:
+  # 复用 docker-publish 已推送的镜像，不在此重新 build/push。
+  ensure-image:
     needs: version
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Login to Docker Hub
+      - name: Log in to GHCR
         uses: docker/login-action@v3
         with:
-          # Docker Hub（与 docker-publish.yml 同一凭据，DOCKERHUB_USERNAME 为 jubaoliang 时推送 jubaoliang/octop）
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and push image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: fnos/docker/Dockerfile
-          push: true
-          tags: |
-            jubaoliang/octop:latest
-            jubaoliang/octop:vanilla
-            jubaoliang/octop:vanilla-v${{ needs.version.outputs.version }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+      - name: Wait for GHCR image from docker-publish
+        env:
+          IMAGE: ${{ needs.version.outputs.image }}
+          VER: ${{ needs.version.outputs.version }}
+        run: |
+          set -euo pipefail
+          TAG="${IMAGE}:${VER}"
+          echo "Waiting for ${TAG} (published by docker-publish)..."
+          for i in $(seq 1 90); do
+            if docker buildx imagetools inspect "$TAG" >/dev/null 2>&1; then
+              echo "Image ready: $TAG"
+              docker buildx imagetools inspect "$TAG" | head -20
+              exit 0
+            fi
+            echo "[$i/90] not ready yet..."
+            sleep 20
+          done
+          echo "::error::Timed out waiting for ${TAG}. Ensure Docker Publish finished for v${VER}."
+          exit 1
 
   fpk:
-    needs: [image, version]
+    needs: [ensure-image, version]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -128,8 +126,7 @@ jobs:
           if-no-files-found: error
 
   native:
-    # 即使原生版构建失败也不阻塞整体发布：Docker 版（fpk）始终会发布；
-    # 原生版成功则一并附带。continue-on-error 让 needs 视为通过。
+    # 即使原生版构建失败也不阻塞整体发布：Docker 版（fpk）始终会发布。
     continue-on-error: true
     needs: version
     runs-on: ubuntu-latest
@@ -141,22 +138,40 @@ jobs:
           fetch-depth: 0
           fetch-tags: true
 
-      - name: Set up Python 3.12 (build-only)
+      - name: Try download wheel from GitHub Release
+        id: wheel
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          VER: ${{ needs.version.outputs.version }}
+        run: |
+          set -euo pipefail
+          mkdir -p dist
+          REL_TAG="v${VER}"
+          if gh release download "$REL_TAG" --repo "${{ github.repository }}" -p 'octop-*.whl' -D dist 2>/tmp/wheel-dl.err; then
+            ls -lh dist/octop-*.whl
+            echo "source=release" >> "$GITHUB_OUTPUT"
+            echo "Reusing wheel from GitHub Release ${REL_TAG}"
+          else
+            echo "Release wheel not available yet:"
+            cat /tmp/wheel-dl.err || true
+            echo "source=build" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Set up Python 3.12
         uses: actions/setup-python@v5
         with:
           python-version: "3.12"
 
       - name: Set up Node.js 20 (frontend build)
+        if: steps.wheel.outputs.source == 'build'
         uses: actions/setup-node@v4
         with:
           node-version: "20"
           cache: "npm"
           cache-dependency-path: dashboard/package-lock.json
 
-      # native 包必须包含当前 fork 的源码修改（如 /admin/providers/fetch-models）。
-      # 上游 TencentCloud/Octop 的 release wheel 不包含这些修改，因此改为从当前
-      # 仓库源码构建 wheel：先构建前端产物到 src/octop/dashboard，再打包 wheel。
       - name: Build Octop wheel from current source
+        if: steps.wheel.outputs.source == 'build'
         run: |
           set -e
           echo "=== build frontend ==="
@@ -184,25 +199,11 @@ jobs:
           mkdir -p "${{ github.workspace }}/fnos/native/app/site-packages"
           SP="${{ github.workspace }}/fnos/native/app/site-packages"
           {
-            # 用 uv 安装核心 whl 及其依赖到包内 site-packages。
-            # pip 对 orcakit-harness-agent[all] 的复杂依赖树会报 resolution-too-deep，
-            # uv 的回溯能力强得多（旧方案已验证）。
             python3 -m pip install --quiet uv
-            # 第一步：让 uv 自由解析并安装核心 whl（含其完整依赖树）。
-            # 自由解析会拉到最新的 mcp==2.0.0 + langchain-mcp-adapters==0.3.1，这两者在结构上
-            # 不兼容（见第二步），但本步只负责把依赖装齐，不要求版本正确。
-            # 注意：不能把钉版与 octop.whl 放在同一条 uv 命令里——会和 whl 的传递依赖约束
-            # 发生 resolution 冲突，导致整个 native 构建失败（fdca4c6 的教训）。
             python3 -m uv pip install --python python3.12 \
               --target "$SP" --no-cache "$(ls dist/octop-*.whl | head -1)"
-            # 第二步：强制覆盖为仓库 uv.lock 锁定的兼容组合 mcp==1.28.1 + langchain-mcp-adapters==0.3.0。
-            # mcp 2.0 移除了 mcp.server.fastmcp / mcp.shared.context.RequestContext 等符号，
-            # 而 langchain-mcp-adapters 0.3.x 仍硬导入它们，导致 octop 启动即 ImportError。
-            # 先清掉旧版目录，防止多版本共存导致 Python 仍加载坏的 mcp 2.0。
             rm -rf "$SP/mcp" "$SP"/mcp-*.dist-info \
                    "$SP/langchain_mcp_adapters" "$SP"/langchain_mcp_adapters-*.dist-info
-            # 用 pip download 拿到钉版 whl，再 unzip 进 site-packages。
-            # 这比 pip install --target --force-reinstall 更可控，也不会触发 resolution。
             mkdir -p /tmp/octop-pinned
             python3.12 -m pip download --no-deps --no-cache-dir -d /tmp/octop-pinned \
               "mcp==1.28.1" "langchain-mcp-adapters==0.3.0"
@@ -210,13 +211,9 @@ jobs:
               echo "Extracting pinned wheel: $whl"
               python3.12 -m zipfile -e "$whl" "$SP"
             done
-            # 把核心 whl 也内置进去，供飞牛主机离线重装/回滚使用。
             cp dist/octop-*.whl "$SP/octop.whl"
-            # 校验：必须能走通真正的启动导入链（octop.launch → octop.infra.server →
-            # harness_agent.mcp → langchain_mcp_adapters）。仅 import octop 不会触发该链路，
-            # 故这里显式导入启动入口，确保 mcp/langchain-mcp-adapters 组合确实可用。
             PYTHONPATH="$SP" python3.12 \
-              -c "from octop.launch import run_foreground_blocking; import mcp, langchain_mcp_adapters; print('octop', octop.__version__, '| mcp', mcp.__version__, '| lcma', langchain_mcp_adapters.__version__)"
+              -c "import octop, mcp, langchain_mcp_adapters; from octop.launch import run_foreground_blocking; print('octop', octop.__version__, '| mcp', mcp.__version__, '| lcma', langchain_mcp_adapters.__version__)"
           } 2>&1 | tee -a "$LOG"
 
       - name: Build native FPK
@@ -246,8 +243,7 @@ jobs:
           if-no-files-found: ignore
 
   release:
-    # 即使原生版失败（continue-on-error）也要发布 Docker 版；
-    # 原生版成功时 artifacts/native-fpk 存在，会被一并打包进发布。
+    # 即使原生版失败（continue-on-error）也要发布 Docker 版。
     if: always()
     needs: [fpk, native, version]
     runs-on: ubuntu-latest
@@ -257,8 +253,6 @@ jobs:
           fetch-depth: 0
           fetch-tags: true
 
-      # 分别按名称下载，单个大产物（native-fpk ~560MB）单独下载比「下载全部」更稳定，
-      # 避免 GitHub artifact 服务对“全部”模式偶发 5 次重试失败。
       - name: Download docker fpk artifact (required)
         uses: actions/download-artifact@v4
         with:
@@ -267,7 +261,6 @@ jobs:
           if-no-files-found: error
 
       - name: Download native fpk artifact (best-effort)
-        # 原生版即使下载/解压偶发失败也不阻塞发布：Docker 版始终会发布。
         continue-on-error: true
         uses: actions/download-artifact@v4
         with:
@@ -287,10 +280,7 @@ jobs:
         run: |
           VER="${{ needs.version.outputs.version }}"
           ITER="${{ needs.version.outputs.iter }}"
-          TAG="fnos-vanilla-${VER}-${ITER}"
-          # 找本分支历史中可达的最近固定版本 tag（排除滚动 tag）。
-          # 不能直接 git describe：若历史 tag 误指向其它分支（如 main）的 commit，
-          # describe 会失败并回退到仓库根，导致更新说明把整个历史都列出来。
+          IMAGE="${{ needs.version.outputs.image }}"
           PREV_TAG=""
           for t in $(git tag --list "fnos-vanilla-*" --sort=-creatordate); do
             [ "$t" = "fnos-vanilla-latest" ] && continue
@@ -301,11 +291,10 @@ jobs:
           done
           echo "prev_tag=$PREV_TAG" >> "$GITHUB_OUTPUT"
           {
-            # 安装说明置顶，用户一眼看到下载文件
             echo "## 安装说明"
             echo ""
             echo "1. 飞牛应用中心 → 设置 → 手动安装应用，选择对应 .fpk。"
-            echo "2. Docker 版 **Fnos-octop-vanilla-${VER}-${ITER}.fpk**（约 80KB）：飞牛自动从 Docker Hub 拉取镜像运行，镜像为 \\"jubaoliang/octop:vanilla\\"。"
+            echo "2. Docker 版 **Fnos-octop-vanilla-${VER}-${ITER}.fpk**（约 80KB）：飞牛自动从 GHCR 拉取 \`${IMAGE}:latest\`。"
             echo "3. 本地版 **Fnos-octop-vanilla-native-${VER}-${ITER}.fpk**（约 200MB）：非 Docker，原生运行在飞牛主机；安装时自动关联系统 Python 3.12 开发工具；浏览器、远程桌面等附加组件在 Octop 应用内按需安装。"
             echo ""
             echo "---"
@@ -313,7 +302,6 @@ jobs:
             echo ""
             echo "## 本次更新（v${VER}-${ITER}）"
             echo ""
-            # 只列相对上一版的非 merge commit，最多 30 条，避免说明冗长
             if [ -n "$PREV_TAG" ]; then
               git log --oneline --no-merges "$PREV_TAG"..HEAD | head -30
             else
@@ -322,15 +310,12 @@ jobs:
           } > /tmp/release-body.md
           cat /tmp/release-body.md
 
-      # --- 固定版本 release：保留历史 ---
       - name: Publish fixed release
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ needs.version.outputs.tag }}
-          # 显式指向构建所用 commit，避免 GitHub 默认指向 main 分支 HEAD
-          # （此前 fnos-vanilla-* tag 全部错误指向 main 的 commit）
           target_commitish: ${{ github.sha }}
-          name: Octop (FnOS Vanilla) v${{ needs.version.outputs.pkg_ver }}
+          name: Octop (FnOS) v${{ needs.version.outputs.pkg_ver }}
           body_path: /tmp/release-body.md
           files: dist/*.fpk
           draft: false
@@ -338,7 +323,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      # --- 滚动 release fnos-vanilla-latest：始终指向最新版，只保留最新 assets ---
       - name: Delete rolling release if exists
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -359,7 +343,7 @@ jobs:
         with:
           tag_name: fnos-vanilla-latest
           target_commitish: ${{ github.sha }}
-          name: Octop (FnOS Vanilla) latest
+          name: Octop (FnOS) latest
           body_path: /tmp/release-body.md
           files: dist/*.fpk
           draft: false
diff --git a/.github/workflows/octop-desktop.yml b/.github/workflows/octop-desktop.yml
index 4a453911..df079568 100644
--- a/.github/workflows/octop-desktop.yml
+++ b/.github/workflows/octop-desktop.yml
@@ -4,11 +4,16 @@ name: Octop Desktop Package
 # 打的 tag 不会触发 push workflow）。产物由本 workflow 的 release job upsert 到同一
 # GitHub Release。workflow_dispatch 保留给手工补包 / 按平台重跑。
 # 不要对任意分支 push 跑六平台矩阵。
+# pull_request（desktop/**）打 darwin-* + windows-*，不跑 linux。
 
 on:
   push:
     tags:
       - "v*"
+  pull_request:
+    paths:
+      - "desktop/**"
+      - ".github/workflows/octop-desktop.yml"
   workflow_dispatch:
     inputs:
       platforms:
@@ -69,9 +74,57 @@ jobs:
           if-no-files-found: error
           retention-days: 7
 
+  # Job-level `if` cannot read `matrix.*` (GitHub 422). Filter here so only
+  # selected runners start — PRs → darwin-* + windows-*; dispatch honors `platforms`.
+  select-platforms:
+    name: Select platforms
+    if: github.event_name != 'workflow_dispatch' || github.event.inputs.attach_from_run == ''
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set.outputs.matrix }}
+    steps:
+      - id: set
+        env:
+          EVENT_NAME: ${{ github.event_name }}
+          PLATFORMS: ${{ github.event.inputs.platforms || 'all' }}
+        run: |
+          set -euo pipefail
+          python3 <<'PY'
+          import json
+          import os
+
+          all_plats = [
+              {"plat": "linux-amd64", "arch": "amd64", "os": "ubuntu-latest"},
+              {"plat": "linux-arm64", "arch": "arm64", "os": "ubuntu-24.04-arm"},
+              {"plat": "darwin-arm64", "arch": "arm64", "os": "macos-14"},
+              {"plat": "darwin-amd64", "arch": "amd64", "os": "macos-15-intel"},
+              {"plat": "windows-amd64", "arch": "amd64", "os": "windows-latest"},
+              {"plat": "windows-arm64", "arch": "arm64", "os": "windows-11-arm"},
+          ]
+          if os.environ["EVENT_NAME"] == "pull_request":
+              sel = "darwin-arm64,darwin-amd64,windows-amd64,windows-arm64"
+          else:
+              sel = os.environ.get("PLATFORMS", "all").lower().replace(" ", "")
+          known = {row["plat"] for row in all_plats}
+          if sel == "all":
+              include = all_plats
+          else:
+              wanted = {part for part in sel.split(",") if part}
+              unknown = wanted - known
+              if unknown:
+                  raise SystemExit(f"unknown platform(s): {', '.join(sorted(unknown))}")
+              include = [row for row in all_plats if row["plat"] in wanted]
+          if not include:
+              raise SystemExit(f"no platforms selected: {sel}")
+          matrix = json.dumps({"include": include}, separators=(",", ":"))
+          with open(os.environ["GITHUB_OUTPUT"], "a", encoding="utf-8") as fh:
+              fh.write(f"matrix={matrix}\n")
+          print(matrix)
+          PY
+
   package:
     name: "${{ matrix.plat }}"
-    needs: frontend
+    needs: [frontend, select-platforms]
     runs-on: ${{ matrix.os }}
     # Matrix runners are native for each plat; pin host detection so x64 Git Bash
     # on windows-11-arm does not mis-classify the job as windows-amd64 cross-build.
@@ -79,61 +132,25 @@ jobs:
       GREEN_HOST_PLAT: ${{ matrix.plat }}
     strategy:
       fail-fast: false
-      matrix:
-        include:
-          - plat: linux-amd64
-            arch: amd64
-            os: ubuntu-latest
-          - plat: linux-arm64
-            arch: arm64
-            os: ubuntu-24.04-arm
-          - plat: darwin-arm64
-            arch: arm64
-            os: macos-14
-          - plat: darwin-amd64
-            arch: amd64
-            os: macos-15-intel
-          - plat: windows-amd64
-            arch: amd64
-            os: windows-latest
-          - plat: windows-arm64
-            arch: arm64
-            os: windows-11-arm
+      matrix: ${{ fromJSON(needs.select-platforms.outputs.matrix) }}
     defaults:
       run:
         shell: bash
     steps:
       - uses: actions/checkout@v5
 
-      - name: Decide whether to build this platform
-        id: want
-        run: |
-          set -euo pipefail
-          sel="${{ github.event.inputs.platforms || 'all' }}"
-          sel="$(echo "$sel" | tr '[:upper:]' '[:lower:]' | tr -d ' ')"
-          plat="${{ matrix.plat }}"
-          if [[ "$sel" == "all" || ",$sel," == *",$plat,"* ]]; then
-            echo "build=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "build=false" >> "$GITHUB_OUTPUT"
-            echo "Skipping ${plat} (selection=${sel})"
-          fi
-
       - uses: actions/download-artifact@v5
-        if: steps.want.outputs.build == 'true'
         with:
           name: dashboard-dist
           path: src/octop/dashboard
 
       - uses: astral-sh/setup-uv@v6
-        if: steps.want.outputs.build == 'true'
         with:
           enable-cache: true
           python-version: "3.12"
 
       # GitHub Cache outages must not fail the build — PBS download is cheap enough.
       - name: Cache python-build-standalone downloads
-        if: steps.want.outputs.build == 'true'
         continue-on-error: true
         uses: actions/cache@v5
         with:
@@ -141,13 +158,11 @@ jobs:
           key: pbs-${{ env.PBS_TAG }}-${{ env.PBS_PY }}-${{ matrix.plat }}
 
       - name: Bootstrap portable CPython
-        if: steps.want.outputs.build == 'true'
         env:
           GREEN_HOST_PLAT: ${{ matrix.plat }}
         run: bash desktop/portable/bootstrap-runtime.sh "${{ matrix.plat }}"
 
       - name: Assemble green zip
-        if: steps.want.outputs.build == 'true'
         env:
           GREEN_HOST_PLAT: ${{ matrix.plat }}
         run: |
@@ -156,7 +171,6 @@ jobs:
           bash desktop/portable/package.sh "${{ matrix.plat }}"
 
       - name: Smoke import (native host only)
-        if: steps.want.outputs.build == 'true'
         run: |
           set -euo pipefail
           staging="desktop/portable/release/Octop-${{ matrix.plat }}"
@@ -192,23 +206,20 @@ jobs:
           fi
 
       - uses: actions/setup-go@v6
-        if: steps.want.outputs.build == 'true'
         with:
           go-version: "1.25.x"
           cache-dependency-path: desktop/src/go.sum
 
       - name: Install Linux desktop build dependencies
-        if: steps.want.outputs.build == 'true' && runner.os == 'Linux'
+        if: runner.os == 'Linux'
         run: |
           sudo apt-get update
           sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev
 
       - name: Install Wails v3 CLI
-        if: steps.want.outputs.build == 'true'
         run: go install github.com/wailsapp/wails/v3/cmd/wails3@v3.0.0-beta.13
 
       - name: Package desktop app with bundled portable runtime
-        if: steps.want.outputs.build == 'true'
         working-directory: desktop/src
         run: >-
           wails3 task package
@@ -220,7 +231,6 @@ jobs:
       # (Octop-<plat>.zip containing another Octop-<plat>.zip). Affects every plat.
       # With archive:false, artifact name is the filename (name: is ignored).
       - uses: actions/upload-artifact@v7
-        if: steps.want.outputs.build == 'true'
         with:
           path: desktop/portable/release/Octop-${{ matrix.plat }}.zip
           archive: false
@@ -228,7 +238,6 @@ jobs:
           retention-days: 14
 
       - name: Upload bundled desktop package
-        if: steps.want.outputs.build == 'true'
         uses: actions/upload-artifact@v7
         with:
           path: desktop/src/bin/Octop-Desktop-${{ matrix.plat }}.*
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index de83ed74..48fbe6b1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,5 +1,12 @@
 name: Release
 
+# 版本标签 v* → 测包、发 PyPI、建 GitHub Release，再级联：
+#   - Sync Main Into Develop
+#   - Build Octop FPK（复用本 Release 的 wheel；等待 docker-publish 的 GHCR 镜像）
+#
+# 与 docker-publish.yml / octop-desktop.yml 并行（由 Auto Tag 同时 dispatch，
+# 或人工 push v* tag 同时触发）。桌面产物由 Desktop Package 挂到同一 GitHub Release。
+
 on:
   push:
     tags:
@@ -20,6 +27,7 @@ jobs:
   build:
     name: Build distributions
     runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/v')
     steps:
       - uses: actions/checkout@v4
         with:
@@ -141,3 +149,20 @@ jobs:
           gh workflow run sync-main-to-develop.yml \
             --repo "${{ github.repository }}" \
             --ref main
+
+  # FnOS FPK：复用本 Release 的 wheel + docker-publish 的 GHCR 镜像。
+  # 与 sync-develop 并行；失败不阻断发版。
+  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:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          # --ref 用版本 tag，保证 FPK 打在与 PyPI / 镜像相同的 commit 上
+          gh workflow run fnos-build-fpk.yml \
+            --repo "${{ github.repository }}" \
+            --ref "${{ github.ref_name }}"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f75bddd5..02e393fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,36 @@
 
 ## [Unreleased]
 
+## [0.9.30] - 2026-08-31
+
+### 新增
+
+- 腾讯云 Token Plan 企业版与 Hy 套餐
+- WeKnora、Dify 连接器，以及自定义 MCP 的 OAuth
+- 备份/恢复、聊天工具栏、SSO 预设与更友好的供应商错误提示
+- 技能展示本地化；知识库可配置文档数量上限；钉钉扫码注册
+- 对话接入 ask-user-question 人机确认流程
+
+### 修复
+
+- 专家根目录、连接器排序、飞牛图标及主题确认对话框等界面问题
+- 聊天中文语音识别跟随界面语言
+- MCP OAuth 刷新失败需重新授权；渠道异常 thinking 输出过滤
+- 数据库 v10 迁移遗漏 thread projection 表
+- 飞牛 FPK 无效在线升级与原生版启动加载；长会话相关问题
+- 通道弹框文案统一为「通道」，新建默认实时过程
+- `octop acp` 启动即崩溃（CLI 注册表属性应对齐 `acp_cmd`）
+
+## [0.9.29] - 2026-08-27
+
+### 修复
+
+- 长会话卡死：聊天历史改为独立投影分页加载，并支持后台迁移旧会话（不再同步扫 checkpoint）
+
+### 变更
+
+- 依赖：`orcakit-harness-agent[all]>=0.9.27`、`harness-memory>=0.9.7`、`harness-browser>=0.7.6`（自动 full VACUUM 关闭，空闲维护只走 lifecycle GC + incremental `nudge_vacuum`）
+
 ## [0.9.28] - 2026-08-26
 
 ### 修复
diff --git a/README.md b/README.md
index 78a3a558..5890e029 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.28-orange" /></a>
+  <a href="https://github.com/TencentCloud/Octop/releases"><img alt="Version" src="https://img.shields.io/badge/version-0.9.30-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>
diff --git a/dashboard/package-lock.json b/dashboard/package-lock.json
index 8d06a092..8e841ae4 100644
--- a/dashboard/package-lock.json
+++ b/dashboard/package-lock.json
@@ -14872,24 +14872,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/yaml": {
-      "version": "2.9.0",
-      "resolved": "https://mirrors.tencent.com/npm/yaml/-/yaml-2.9.0.tgz",
-      "integrity": "sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "yaml": "bin.mjs"
-      },
-      "engines": {
-        "node": ">= 14.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/eemeli"
-      }
-    },
     "node_modules/yargs": {
       "version": "17.7.2",
       "resolved": "https://mirrors.tencent.com/npm/yargs/-/yargs-17.7.2.tgz",
diff --git a/dashboard/src/api/modules/backup.ts b/dashboard/src/api/modules/backup.ts
index 712c8a01..2496ba83 100644
--- a/dashboard/src/api/modules/backup.ts
+++ b/dashboard/src/api/modules/backup.ts
@@ -19,9 +19,18 @@ export interface AutoBackupSettings {
   scheduled?: boolean;
 }
 
+export type BackupOperationKind = "create" | "restore" | "auto" | "export";
+
+export interface BackupStatusResponse {
+  busy: boolean;
+  operation: BackupOperationKind | null;
+}
+
 export const backupApi = {
   listBackups: () => request<BackupListResponse>("/admin/backup/list"),
 
+  getStatus: () => request<BackupStatusResponse>("/admin/backup/status"),
+
   getAutoSettings: () => request<AutoBackupSettings>("/admin/backup/auto"),
 
   updateAutoSettings: (body: {
diff --git a/dashboard/src/api/modules/channel.ts b/dashboard/src/api/modules/channel.ts
index 1fe842c4..ffc5ef07 100644
--- a/dashboard/src/api/modules/channel.ts
+++ b/dashboard/src/api/modules/channel.ts
@@ -150,6 +150,29 @@ export const channelApi = {
       body: JSON.stringify({ qrcode_token }),
     }),
 
+  /** Start DingTalk one-click application registration. */
+  dingtalkQrcodeGenerate: (agentId: string) =>
+    request<{
+      registration_id: string;
+      qrcode_url: string;
+      user_code: string;
+      expires_in: number;
+      interval: number;
+    }>(`/agents/${agentId}/channels/dingtalk/qrcode/generate`, {
+      method: "POST",
+    }),
+
+  /** Poll DingTalk registration; credentials are persisted by the backend. */
+  dingtalkQrcodePoll: (agentId: string, registration_id: string) =>
+    request<{
+      status: "waiting" | "success" | "failed" | "expired";
+      channel_id?: string;
+      message?: string;
+    }>(`/agents/${agentId}/channels/dingtalk/qrcode/poll`, {
+      method: "POST",
+      body: JSON.stringify({ registration_id }),
+    }),
+
   /** Start the Feishu bot auto-creation flow. */
   feishuBotCreatorStart: (
     agentId: string,
diff --git a/dashboard/src/api/modules/connectors.ts b/dashboard/src/api/modules/connectors.ts
index 376271fd..4b2dde42 100644
--- a/dashboard/src/api/modules/connectors.ts
+++ b/dashboard/src/api/modules/connectors.ts
@@ -18,6 +18,17 @@ export interface ConnectorCatalogEntry {
   supports_quick_auth?: boolean;
   oauth_mode?: "dynamic" | "configured" | null;
   oauth_ready?: boolean;
+  credential_fields?: ConnectorCredentialField[];
+}
+
+export interface ConnectorCredentialField {
+  key: string;
+  label: string;
+  field_type: "text" | "password" | "url" | "tags";
+  required: boolean;
+  placeholder?: string | null;
+  help?: string | null;
+  secret: boolean;
 }
 
 export interface ConnectorAuthInfo {
@@ -42,6 +53,7 @@ export interface ConnectorInstance {
 }
 
 export interface ConnectorCredentialsPreview {
+  [key: string]: unknown;
   token_configured?: boolean;
   oauth_configured?: boolean;
   expires_at?: number;
@@ -82,11 +94,29 @@ export interface ConnectorProbeResult {
   tool_count?: number;
   tools?: { name: string; description: string }[];
   error?: string;
+  error_type?: string;
   status_code?: number;
+  oauth?: {
+    available: boolean;
+    issuer?: string;
+    resource?: string;
+  };
+}
+
+export interface WeKnoraLocalDetection {
+  found: boolean;
+  base_url?: string;
+  console_url?: string;
 }
 
 export type CustomMcpTransport = "streamable_http" | "stdio";
 
+export interface CustomMcpOAuthPreview {
+  configured?: boolean;
+  required?: boolean;
+  expires_at?: number;
+}
+
 export interface CustomMcpServerSpec {
   transport: CustomMcpTransport;
   url?: string;
@@ -99,8 +129,13 @@ export interface CustomMcpServerSpec {
   display_name?: string;
   /** When true, chat composer pre-selects this MCP server. */
   default_open?: boolean;
+  oauth?: CustomMcpOAuthPreview;
 }
 
+export type OAuthStartTarget =
+  | { type: "catalog"; kind: string }
+  | { type: "custom_mcp"; server_name: string };
+
 export type CustomMcpServers = Record<string, CustomMcpServerSpec>;
 
 export interface ConnectorCliInstallResult {
@@ -141,10 +176,15 @@ export interface FeishuUserAuthCompleteResult {
 export const connectorsApi = {
   catalog: () => request<ConnectorCatalogEntry[]>("/connectors/catalog"),
 
+  detectLocalWeKnora: () =>
+    request<WeKnoraLocalDetection>("/connectors/weknora/detect-local"),
+
   listInstances: () => request<ConnectorInstance[]>("/connector-instances"),
 
   getInstance: (instanceId: string) =>
-    request<ConnectorInstanceDetail>(`/connector-instances/${instanceId}`),
+    request<ConnectorInstanceDetail>(
+      `/connector-instances/${encodeURIComponent(instanceId)}`,
+    ),
 
   createInstance: (body: {
     kind: string;
@@ -158,23 +198,41 @@ export const connectorsApi = {
     }),
 
   deleteInstance: (instanceId: string) =>
-    request<void>(`/connector-instances/${instanceId}`, { method: "DELETE" }),
+    request<void>(`/connector-instances/${encodeURIComponent(instanceId)}`, {
+      method: "DELETE",
+    }),
 
   patchInstance: (
     instanceId: string,
     body: { status?: "active" | "disabled"; default_open?: boolean },
   ) =>
-    request<ConnectorInstance>(`/connector-instances/${instanceId}`, {
-      method: "PATCH",
-      body: JSON.stringify(body),
-    }),
+    request<ConnectorInstance>(
+      `/connector-instances/${encodeURIComponent(instanceId)}`,
+      {
+        method: "PATCH",
+        body: JSON.stringify(body),
+      },
+    ),
 
   testInstance: (instanceId: string) =>
-    request<ConnectorProbeResult>(`/connector-instances/${instanceId}/test`, {
-      method: "POST",
-    }),
+    request<ConnectorProbeResult>(
+      `/connector-instances/${encodeURIComponent(instanceId)}/test`,
+      {
+        method: "POST",
+      },
+    ),
 
-  oauthStart: (kind: string, redirectAfter?: string) =>
+  oauthStart: (target: OAuthStartTarget, redirectAfter?: string) =>
+    request<{ authorize_url: string; state_id: string }>(
+      "/connectors/oauth/start",
+      {
+        method: "POST",
+        body: JSON.stringify({ target, redirect_after: redirectAfter }),
+      },
+    ),
+
+  /** @deprecated Prefer oauthStart with `{ type: "catalog", kind }`. */
+  oauthStartCatalog: (kind: string, redirectAfter?: string) =>
     request<{ authorize_url: string; state_id: string }>(
       `/connectors/oauth/${kind}/start`,
       {
@@ -184,9 +242,12 @@ export const connectorsApi = {
     ),
 
   oauthPending: (stateId: string) =>
-    request<{ kind: string; tokens: Record<string, unknown> }>(
-      `/connectors/oauth/pending/${stateId}`,
-    ),
+    request<{
+      kind: string;
+      tokens: Record<string, unknown>;
+      server_name?: string;
+      applied?: boolean;
+    }>(`/connectors/oauth/pending/${stateId}`),
 
   authorizeUrl: (kind: string) =>
     request<{ authorize_url: string | null }>(
@@ -284,7 +345,10 @@ export const connectorsApi = {
       body: JSON.stringify({ servers }),
     }),
 
-  patchCustomMcpServer: (name: string, body: { enabled: boolean }) =>
+  patchCustomMcpServer: (
+    name: string,
+    body: { enabled?: boolean; default_open?: boolean },
+  ) =>
     request<{ servers: CustomMcpServers }>(
       `/connectors/custom-mcp/servers/${encodeURIComponent(name)}`,
       {
diff --git a/dashboard/src/api/modules/knowledgeBases.ts b/dashboard/src/api/modules/knowledgeBases.ts
index 6a66d2d7..d8cfb256 100644
--- a/dashboard/src/api/modules/knowledgeBases.ts
+++ b/dashboard/src/api/modules/knowledgeBases.ts
@@ -37,6 +37,7 @@ export interface KnowledgeBase {
   embedding_model: string;
   embedding_dim: number;
   doc_count: number;
+  max_documents: number;
   created_at: number;
   updated_at: number;
 }
@@ -151,6 +152,7 @@ export const knowledgeBasesApi = {
     default_open?: boolean;
     shared?: boolean;
     icon_name?: string;
+    max_documents?: number;
   }) =>
     request<KnowledgeBase>("/knowledge-bases", {
       method: "POST",
@@ -165,6 +167,7 @@ export const knowledgeBasesApi = {
       default_open?: boolean;
       shared?: boolean;
       icon_name?: string;
+      max_documents?: number;
     },
   ) =>
     request<KnowledgeBase>(`/knowledge-bases/${id}`, {
diff --git a/dashboard/src/api/modules/octopThreads.ts b/dashboard/src/api/modules/octopThreads.ts
index 8d031552..9791c0de 100644
--- a/dashboard/src/api/modules/octopThreads.ts
+++ b/dashboard/src/api/modules/octopThreads.ts
@@ -34,6 +34,10 @@ export interface OctopThreadHistory {
   has_more?: boolean;
   limit?: number;
   offset?: number;
+  /** Legacy checkpoint is being projected by the bounded background worker. */
+  history_loading?: boolean;
+  history_status?: "pending" | "queued" | "running" | "ready" | "failed";
+  history_retry_after_ms?: number;
   /** True while a turn is still streaming server-side for this thread. */
   turn_active?: boolean;
   /** Pending tool approval for this thread (survives page reload). */
@@ -69,6 +73,18 @@ export interface ContextUsageBreakdown {
   segments: ContextUsageSegment[];
 }
 
+export interface HistoryMigrationStatus {
+  remaining: number;
+  pending: number;
+  queued: number;
+  running: number;
+  failed: number;
+  processing: boolean;
+  agent_busy: boolean;
+  can_start: boolean;
+  accepted?: number;
+}
+
 export const CHAT_HISTORY_PAGE_SIZE = 25;
 
 export const octopThreadsApi = {
@@ -83,6 +99,17 @@ export const octopThreadsApi = {
       { method: "POST" },
     ),
 
+  historyMigrationStatus: (agentId: string) =>
+    request<HistoryMigrationStatus>(
+      `/agents/${encodeURIComponent(agentId)}/history-migration/status`,
+    ),
+
+  startHistoryMigration: (agentId: string) =>
+    request<HistoryMigrationStatus>(
+      `/agents/${encodeURIComponent(agentId)}/history-migration/start`,
+      { method: "POST" },
+    ),
+
   history: (
     agentId: string,
     threadId: string,
diff --git a/dashboard/src/api/types/hitl.ts b/dashboard/src/api/types/hitl.ts
index 775f4c16..43be966f 100644
--- a/dashboard/src/api/types/hitl.ts
+++ b/dashboard/src/api/types/hitl.ts
@@ -14,3 +14,59 @@ export interface HitlPendingPayload {
   action_requests: HitlActionRequest[];
   review_configs?: HitlReviewConfig[];
 }
+
+/** Tool whose HITL pause is a question for the user, not an approval. */
+export const ASK_USER_TOOL_NAME = "ask_user_question";
+
+export interface AskOption {
+  label: string;
+  description?: string;
+}
+
+export interface AskQuestion {
+  question: string;
+  header?: string;
+  options?: AskOption[];
+  multi_select?: boolean;
+}
+
+/** Extract the `questions` payload from an `ask_user_question` pause. */
+export function extractAskQuestions(
+  actions: HitlActionRequest[] | undefined,
+): AskQuestion[] {
+  if (!actions?.length) return [];
+  for (const action of actions) {
+    if (action.name !== ASK_USER_TOOL_NAME) continue;
+    const raw = action.args?.questions;
+    if (!Array.isArray(raw)) continue;
+    return raw
+      .filter((item): item is Record<string, unknown> =>
+        Boolean(item && typeof item === "object" && !Array.isArray(item)),
+      )
+      .map((item) => ({
+        question: typeof item.question === "string" ? item.question : "",
+        header: typeof item.header === "string" ? item.header : undefined,
+        multi_select: item.multi_select === true,
+        options: Array.isArray(item.options)
+          ? item.options
+              .filter((opt): opt is Record<string, unknown> =>
+                Boolean(opt && typeof opt === "object" && !Array.isArray(opt)),
+              )
+              .map((opt) => ({
+                label: typeof opt.label === "string" ? opt.label : "",
+                description:
+                  typeof opt.description === "string"
+                    ? opt.description
+                    : undefined,
+              }))
+              .filter((opt) => opt.label)
+          : [],
+      }))
+      .filter((q) => q.question);
+  }
+  return [];
+}
+
+export function isAskHitl(actions: HitlActionRequest[] | undefined): boolean {
+  return Boolean(actions?.some((a) => a.name === ASK_USER_TOOL_NAME));
+}
diff --git a/dashboard/src/assets/connectors/dify.svg b/dashboard/src/assets/connectors/dify.svg
new file mode 100644
index 00000000..b0b4ba21
--- /dev/null
+++ b/dashboard/src/assets/connectors/dify.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <rect width="64" height="64" rx="15" fill="#1c64f2"/>
+  <path d="M16 14h15c11 0 18 7 18 18s-7 18-18 18H16zm9 8v20h6c6 0 10-4 10-10s-4-10-10-10z" fill="#fff"/>
+</svg>
diff --git a/dashboard/src/assets/connectors/index.ts b/dashboard/src/assets/connectors/index.ts
index 15aa1264..067b3c77 100644
--- a/dashboard/src/assets/connectors/index.ts
+++ b/dashboard/src/assets/connectors/index.ts
@@ -2,6 +2,7 @@ import tencentArdot from "./tencent-ardot.png";
 import baiduMap from "./baidu-map.png";
 import ctripWendao from "./ctrip-wendao.png";
 import dida365 from "./dida365.png";
+import dify from "./dify.svg";
 import feishuCli from "./feishu-cli.png";
 import fliggy from "./fliggy.png";
 import meituanTravel from "./meituan-travel.png";
@@ -16,6 +17,7 @@ import tencentLexiang from "./tencent-lexiang.png";
 import tencentWeiyun from "./tencent-weiyun.png";
 import wechatReading from "./wechat-reading.png";
 import wecomCli from "./wecom-cli.png";
+import weknora from "./weknora.svg";
 import youdaoNote from "./youdao-note.png";
 import yuandian from "./yuandian.png";
 
@@ -36,10 +38,12 @@ export const CONNECTOR_LOGOS: Record<string, string> = {
   "tencent-meeting": tencentMeeting,
   notion,
   dida365: dida365,
+  dify,
   "tencent-news": tencentNews,
   "wechat-reading": wechatReading,
   "youdao-note": youdaoNote,
   "tencent-weiyun": tencentWeiyun,
+  weknora,
 };
 
 export function getConnectorLogo(kind: string): string | undefined {
diff --git a/dashboard/src/assets/connectors/weknora.svg b/dashboard/src/assets/connectors/weknora.svg
new file mode 100644
index 00000000..8dd0fc59
--- /dev/null
+++ b/dashboard/src/assets/connectors/weknora.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <rect width="64" height="64" rx="15" fill="#0052d9"/>
+  <path d="M13 17h8l5 24 6-18h6l6 18 5-24h8L48 49h-8l-5-15-6 15h-8z" fill="#fff"/>
+</svg>
diff --git a/dashboard/src/components/AntdAppProvider.tsx b/dashboard/src/components/AntdAppProvider.tsx
index 339c139f..5683f05d 100644
--- a/dashboard/src/components/AntdAppProvider.tsx
+++ b/dashboard/src/components/AntdAppProvider.tsx
@@ -1,16 +1,19 @@
 import { App } from "antd";
 import { useEffect, type ReactNode } from "react";
 import { bindAntdMessage, unbindAntdMessage } from "../utils/antdMessage";
+import { bindAntdModal, unbindAntdModal } from "../utils/antdModal";
 
-/** Captures App.useApp() APIs for non-hook call sites (utils, hooks, callbacks). */
+/** Captures App.useApp() APIs for non-hook call sites (utils). */
 function AntdAppApiBinder() {
-  const { message } = App.useApp();
+  const { message, modal } = App.useApp();
   useEffect(() => {
     bindAntdMessage(message);
+    bindAntdModal(modal);
     return () => {
       unbindAntdMessage();
+      unbindAntdModal();
     };
-  }, [message]);
+  }, [message, modal]);
   return null;
 }
 
diff --git a/dashboard/src/context/BackupOperationContext.tsx b/dashboard/src/context/BackupOperationContext.tsx
new file mode 100644
index 00000000..b6906767
--- /dev/null
+++ b/dashboard/src/context/BackupOperationContext.tsx
@@ -0,0 +1,235 @@
+import {
+  createContext,
+  useCallback,
+  useContext,
+  useMemo,
+  useRef,
+  useState,
+  type ReactNode,
+} from "react";
+import { App } from "antd";
+import { useTranslation } from "react-i18next";
+
+import {
+  backupApi,
+  type BackupOperationKind,
+  type BackupStatusResponse,
+} from "../api/modules/backup";
+import { apiErrorMessage } from "../utils/apiError";
+
+export type BackupOpKind = BackupOperationKind | "upload" | null;
+
+interface BackupOperationContextValue {
+  kind: BackupOpKind;
+  restoreTarget: string | null;
+  uploadPercent: number | null;
+  /** True while create / restore / auto / export / upload is in flight. */
+  busy: boolean;
+  creating: boolean;
+  restoring: boolean;
+  autoRunning: boolean;
+  createBackup: () => Promise<boolean>;
+  runAutoBackup: () => Promise<boolean>;
+  restoreBackup: (name: string, restoreConfig: boolean) => Promise<boolean>;
+  uploadBackup: (file: File) => Promise<boolean>;
+  /** Align UI with server lock (call from backup panel while mounted). */
+  syncFromServer: () => Promise<void>;
+  /** Called by the backup panel so list refresh can run after remote ops finish. */
+  setOnSettled: (fn: (() => void) | null) => void;
+}
+
+const BackupOperationContext =
+  createContext<BackupOperationContextValue | null>(null);
+
+function mapServerOperation(
+  op: BackupStatusResponse["operation"],
+): BackupOpKind {
+  if (op === "create" || op === "auto" || op === "export") return op;
+  if (op === "restore") return "restore";
+  return "create";
+}
+
+export function BackupOperationProvider({ children }: { children: ReactNode }) {
+  const { message } = App.useApp();
+  const { t } = useTranslation();
+  const [kind, setKind] = useState<BackupOpKind>(null);
+  const [restoreTarget, setRestoreTarget] = useState<string | null>(null);
+  const [uploadPercent, setUploadPercent] = useState<number | null>(null);
+  /** Local request owns the kind; server poll must not clear it mid-flight. */
+  const localOwnedRef = useRef(false);
+  const kindRef = useRef<BackupOpKind>(null);
+  const onSettledRef = useRef<(() => void) | null>(null);
+  kindRef.current = kind;
+
+  const setOnSettled = useCallback((fn: (() => void) | null) => {
+    onSettledRef.current = fn;
+  }, []);
+
+  const notifySettled = useCallback(() => {
+    onSettledRef.current?.();
+  }, []);
+
+  const syncFromServer = useCallback(async () => {
+    try {
+      const status = await backupApi.getStatus();
+      if (localOwnedRef.current) {
+        return;
+      }
+      if (status.busy) {
+        setKind((prev) => prev ?? mapServerOperation(status.operation));
+      } else {
+        setKind((prev) => (prev === "upload" ? prev : null));
+        setRestoreTarget(null);
+      }
+    } catch {
+      // Status is best-effort; ignore transient / permission errors.
+    }
+  }, []);
+
+  const beginLocal = useCallback((next: BackupOpKind) => {
+    if (localOwnedRef.current || kindRef.current !== null) {
+      return false;
+    }
+    localOwnedRef.current = true;
+    setKind(next);
+    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 runAutoBackup = useCallback(async () => {
+    if (!beginLocal("auto")) return false;
+    try {
+      await backupApi.runAutoBackup();
+      message.success(t("backup.autoRunSuccess"));
+      notifySettled();
+      return true;
+    } catch (err: unknown) {
+      message.error(apiErrorMessage(err, t("backup.autoRunFailed"), t));
+      return false;
+    } finally {
+      localOwnedRef.current = false;
+      setKind(null);
+      void syncFromServer();
+    }
+  }, [beginLocal, message, notifySettled, syncFromServer, t]);
+
+  const restoreBackup = useCallback(
+    async (name: string, restoreConfig: boolean) => {
+      if (!beginLocal("restore")) return false;
+      setRestoreTarget(name);
+      try {
+        const result = await backupApi.restoreBackup(name, restoreConfig);
+        message.success(
+          t("backup.importSuccess", {
+            agents: result.agents,
+            files: result.workspace_files,
+          }),
+        );
+        notifySettled();
+        return true;
+      } catch (err: unknown) {
+        message.error(apiErrorMessage(err, t("backup.importFailed"), t));
+        return false;
+      } finally {
+        localOwnedRef.current = false;
+        setKind(null);
+        setRestoreTarget(null);
+        void syncFromServer();
+      }
+    },
+    [beginLocal, message, notifySettled, syncFromServer, t],
+  );
+
+  const uploadBackup = useCallback(
+    async (file: File) => {
+      if (!beginLocal("upload")) return false;
+      setUploadPercent(0);
+      try {
+        await backupApi.uploadBackup(file, (p) => setUploadPercent(p));
+        setUploadPercent(100);
+        message.success(t("backup.uploadSuccess", { name: file.name }));
+        notifySettled();
+        return true;
+      } catch (err: unknown) {
+        const detail = err instanceof Error ? err.message : String(err);
+        message.error(detail || t("backup.uploadFailed"));
+        return false;
+      } finally {
+        localOwnedRef.current = false;
+        setKind(null);
+        setUploadPercent(null);
+      }
+    },
+    [beginLocal, message, notifySettled, t],
+  );
+
+  const creating = kind === "create" || kind === "export";
+  const restoring = kind === "restore";
+  const autoRunning = kind === "auto";
+  const busy = kind !== null;
+
+  const value = useMemo<BackupOperationContextValue>(
+    () => ({
+      kind,
+      restoreTarget,
+      uploadPercent,
+      busy,
+      creating,
+      restoring,
+      autoRunning,
+      createBackup,
+      runAutoBackup,
+      restoreBackup,
+      uploadBackup,
+      syncFromServer,
+      setOnSettled,
+    }),
+    [
+      kind,
+      restoreTarget,
+      uploadPercent,
+      busy,
+      creating,
+      restoring,
+      autoRunning,
+      createBackup,
+      runAutoBackup,
+      restoreBackup,
+      uploadBackup,
+      syncFromServer,
+      setOnSettled,
+    ],
+  );
+
+  return (
+    <BackupOperationContext.Provider value={value}>
+      {children}
+    </BackupOperationContext.Provider>
+  );
+}
+
+export function useBackupOperation(): BackupOperationContextValue {
+  const ctx = useContext(BackupOperationContext);
+  if (!ctx) {
+    throw new Error(
+      "useBackupOperation must be used within BackupOperationProvider",
+    );
+  }
+  return ctx;
+}
diff --git a/dashboard/src/hooks/useCardTableView.ts b/dashboard/src/hooks/useCardTableView.ts
index 4ea30705..bc184bc1 100644
--- a/dashboard/src/hooks/useCardTableView.ts
+++ b/dashboard/src/hooks/useCardTableView.ts
@@ -4,12 +4,13 @@ import { useIsMobile } from "./useIsMobile";
 export type CardTableViewMode = "card" | "table";
 
 /**
- * Shared card/table view toggle. On mobile, card view is always shown
- * (matches Tasks page behaviour) regardless of Segmented selection.
+ * Shared card/table view toggle.
+ * The selected mode is honoured on all viewports (including mobile);
+ * tables rely on existing horizontal-scroll CSS in layout.css.
  */
 export function useCardTableView(defaultMode: CardTableViewMode = "table") {
   const isMobile = useIsMobile();
   const [viewMode, setViewMode] = useState<CardTableViewMode>(defaultMode);
-  const showCardView = isMobile || viewMode === "card";
+  const showCardView = viewMode === "card";
   return { isMobile, viewMode, setViewMode, showCardView };
 }
diff --git a/dashboard/src/hooks/useVoiceInput.ts b/dashboard/src/hooks/useVoiceInput.ts
index e486de15..bad26a83 100644
--- a/dashboard/src/hooks/useVoiceInput.ts
+++ b/dashboard/src/hooks/useVoiceInput.ts
@@ -1,23 +1,41 @@
 import { useCallback, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { voiceApi, type ActiveVoice } from "../api/modules/voice";
+import { speechLocaleFromUi } from "../utils/localePrefs";
 import { cachedActiveVoice, fetchActiveVoice } from "./useVoiceConfig";
 
 import { message as antMessage } from "@/utils/antdMessage";
 
+interface BrowserSpeechRecognitionAlternative {
+  transcript?: string;
+}
+
+interface BrowserSpeechRecognitionResult {
+  isFinal: boolean;
+  length: number;
+  [index: number]: BrowserSpeechRecognitionAlternative;
+}
+
 interface BrowserSpeechRecognitionResultEvent {
-  results: ArrayLike<{ [index: number]: { transcript?: string } }>;
+  resultIndex: number;
+  results: ArrayLike<BrowserSpeechRecognitionResult> & { length: number };
+}
+
+interface BrowserSpeechRecognitionErrorEvent {
+  error?: string;
 }
 
 interface BrowserSpeechRecognition {
   lang: string;
+  continuous: boolean;
   interimResults: boolean;
   maxAlternatives: number;
   onresult: ((event: BrowserSpeechRecognitionResultEvent) => void) | null;
-  onerror: (() => void) | null;
+  onerror: ((event: BrowserSpeechRecognitionErrorEvent) => void) | null;
   onend: (() => void) | null;
   start: () => void;
   stop?: () => void;
+  abort?: () => void;
 }
 
 type SpeechRecognitionCtor = new () => BrowserSpeechRecognition;
@@ -49,6 +67,12 @@ function pickRecorderMimeType(): string {
   return "";
 }
 
+/**
+ * Native Web Speech API transcription.
+ *
+ * Important: settle only on `onend` / error / timeout. Resolving in `onresult`
+ * races Chrome's `onend` and often yields empty text for Chinese utterances.
+ */
 async function transcribeWithBrowser(language: string): Promise<string> {
   const Ctor = getSpeechRecognition();
   if (!Ctor) {
@@ -57,7 +81,11 @@ async function transcribeWithBrowser(language: string): Promise<string> {
   return new Promise((resolve, reject) => {
     const rec = new Ctor();
     let settled = false;
+    let finalText = "";
+    let interimText = "";
     let timer = 0;
+    let lastError: string | undefined;
+
     const settle = (fn: () => void) => {
       if (settled) return;
       settled = true;
@@ -67,23 +95,67 @@ async function transcribeWithBrowser(language: string): Promise<string> {
       rec.onend = null;
       fn();
     };
+
     rec.lang = language;
-    rec.interimResults = false;
+    rec.continuous = false;
+    rec.interimResults = true;
     rec.maxAlternatives = 1;
+
     rec.onresult = (event) => {
-      const text = event.results[0]?.[0]?.transcript?.trim() ?? "";
-      settle(() => resolve(text));
+      let finals = "";
+      let interim = "";
+      for (let i = event.resultIndex; i < event.results.length; i++) {
+        const result = event.results[i];
+        const piece = result?.[0]?.transcript ?? "";
+        if (result?.isFinal) finals += piece;
+        else interim += piece;
+      }
+      if (finals) finalText += finals;
+      interimText = interim;
+    };
+
+    rec.onerror = (event) => {
+      lastError = event.error;
+      // no-speech / aborted: let onend resolve with whatever we have.
+      if (event.error === "no-speech" || event.error === "aborted") return;
+      settle(() => {
+        if (event.error === "network") {
+          reject(new Error("browser STT network"));
+          return;
+        }
+        reject(new Error(`browser STT failed: ${event.error ?? "unknown"}`));
+      });
     };
-    rec.onerror = () => settle(() => reject(new Error("browser STT failed")));
-    rec.onend = () => settle(() => resolve(""));
+
+    rec.onend = () => {
+      const text = (finalText || interimText).trim();
+      settle(() => {
+        if (
+          !text &&
+          lastError &&
+          lastError !== "no-speech" &&
+          lastError !== "aborted"
+        ) {
+          reject(new Error(`browser STT failed: ${lastError}`));
+          return;
+        }
+        resolve(text);
+      });
+    };
+
     timer = window.setTimeout(() => {
       try {
         rec.stop?.();
       } catch {
         // Browser implementations differ; the timeout still settles below.
       }
-      settle(() => reject(new Error("browser STT timed out")));
+      settle(() => {
+        const text = (finalText || interimText).trim();
+        if (text) resolve(text);
+        else reject(new Error("browser STT timed out"));
+      });
     }, BROWSER_STT_TIMEOUT_MS);
+
     try {
       rec.start();
     } catch (err) {
@@ -102,17 +174,19 @@ export function canRecordAudio(): boolean {
 /** Check whether any STT method is available. */
 export function isSttAvailable(): boolean {
   if (canRecordAudio()) return true; // server STT via MediaRecorder
-  return browserSttAvailable(); // browser STT (Android Chrome only)
+  return browserSttAvailable(); // browser STT (Chrome / Edge)
 }
 
 export function useVoiceInput(onText: (text: string) => void) {
-  const { t } = useTranslation();
+  const { t, i18n } = useTranslation();
   const [recording, setRecording] = useState(false);
   const [transcribing, setTranscribing] = useState(false);
   const mediaRecorderRef = useRef<MediaRecorder | null>(null);
   const chunksRef = useRef<Blob[]>([]);
 
-  const language = navigator.language || "zh-CN";
+  // Follow dashboard UI locale — not navigator.language (often en-US on
+  // machines used with Chinese UI / Chinese speech).
+  const language = speechLocaleFromUi(i18n.language);
 
   const stopRecording = useCallback(async () => {
     const recorder = mediaRecorderRef.current;
@@ -136,37 +210,24 @@ export function useVoiceInput(onText: (text: string) => void) {
     setTranscribing(true);
     try {
       const active = await fetchActiveVoice();
-      let text = "";
-      if (active.stt === "browser" && browserSttAvailable()) {
-        text = await transcribeWithBrowser(language);
-      } else {
-        try {
-          const result = await voiceApi.transcribe(blob, language);
-          text = result.text?.trim() ?? "";
-        } catch (err) {
-          const msg = err instanceof Error ? err.message : "";
-          if (msg.includes("VOICE_BROWSER_ONLY") || msg.includes("422")) {
-            if (browserSttAvailable()) {
-              text = await transcribeWithBrowser(language);
-            } else {
-              antMessage.error(t("voice.sttProviderRequired"));
-              return;
-            }
-          } else {
-            // Server STT failed — try browser fallback if available.
-            if (browserSttAvailable()) {
-              antMessage.warning(t("voice.sttFallback"));
-              text = await transcribeWithBrowser(language);
-            } else {
-              throw err;
-            }
-          }
-        }
+      // SpeechRecognition cannot consume a recorded blob. If STT is still
+      // "browser", ask the user to configure a server provider (or use the
+      // click-to-talk browser path from a cold start).
+      if (active.stt === "browser") {
+        antMessage.error(t("voice.sttProviderRequired"));
+        return;
       }
+      const result = await voiceApi.transcribe(blob, language);
+      const text = result.text?.trim() ?? "";
       if (text) onText(text);
       else antMessage.info(t("voice.sttEmpty"));
-    } catch {
-      antMessage.error(t("voice.sttFailed"));
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : "";
+      if (msg.includes("VOICE_BROWSER_ONLY") || msg.includes("422")) {
+        antMessage.error(t("voice.sttProviderRequired"));
+      } else {
+        antMessage.error(t("voice.sttFailed"));
+      }
     } finally {
       setTranscribing(false);
     }
@@ -183,6 +244,13 @@ export function useVoiceInput(onText: (text: string) => void) {
         const text = await transcribeWithBrowser(language);
         if (text) onText(text);
         else antMessage.info(t("voice.sttEmpty"));
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : "";
+        if (msg.includes("network")) {
+          antMessage.error(t("voice.sttNetworkFailed"));
+        } else {
+          antMessage.error(t("voice.sttFailed"));
+        }
       } finally {
         setTranscribing(false);
       }
diff --git a/dashboard/src/layouts/MainLayout/index.tsx b/dashboard/src/layouts/MainLayout/index.tsx
index 87436f11..f6b8687f 100644
--- a/dashboard/src/layouts/MainLayout/index.tsx
+++ b/dashboard/src/layouts/MainLayout/index.tsx
@@ -5,6 +5,7 @@ import Sidebar from "../Sidebar";
 import Header from "../Header";
 import RailEdgeControl from "../../components/RailEdgeControl";
 import { ServiceRestartProvider } from "../../context/ServiceRestartContext";
+import { BackupOperationProvider } from "../../context/BackupOperationContext";
 import PwaUpdatePrompt from "../../components/PwaUpdatePrompt";
 import { PwaAutoPrompt } from "../../components/PwaInstallPrompt";
 import {
@@ -187,181 +188,183 @@ export default function MainLayout() {
 
   return (
     <ServiceRestartProvider>
-      <div
-        style={{
-          height: "100dvh",
-          display: "flex",
-          flexDirection: "row",
-          background: "var(--fn-bg-layout)",
-          transition: "background var(--fn-transition)",
-          overflow: "hidden",
-        }}
-      >
-        {/* Mobile overlay backdrop */}
-        {isMobile && !collapsed && (
-          <div
-            onClick={toggleCollapsed}
-            style={{
-              position: "fixed",
-              inset: 0,
-              background: "rgba(0, 0, 0, 0.40)",
-              zIndex: 99,
-            }}
-          />
-        )}
-
+      <BackupOperationProvider>
         <div
           style={{
-            position: "relative",
-            flexShrink: 0,
-            alignSelf: "stretch",
+            height: "100dvh",
             display: "flex",
-            minHeight: 0,
+            flexDirection: "row",
+            background: "var(--fn-bg-layout)",
+            transition: "background var(--fn-transition)",
+            overflow: "hidden",
           }}
         >
-          <Sidebar
-            selectedKey={selectedKey}
-            collapsed={collapsed}
-            onToggle={toggleCollapsed}
-            isMobile={isMobile}
-          />
-          {!isMobile && (
-            <RailEdgeControl
-              expanded={!collapsed}
-              onToggle={handleNavRailToggle}
-              side="end"
+          {/* Mobile overlay backdrop */}
+          {isMobile && !collapsed && (
+            <div
+              onClick={toggleCollapsed}
+              style={{
+                position: "fixed",
+                inset: 0,
+                background: "rgba(0, 0, 0, 0.40)",
+                zIndex: 99,
+              }}
             />
           )}
-        </div>
 
-        {isChatRoute && !isMinimalLayout && (
           <div
-            id={CHAT_HISTORY_RAIL_ID}
             style={{
+              position: "relative",
               flexShrink: 0,
-              display: "flex",
               alignSelf: "stretch",
+              display: "flex",
               minHeight: 0,
-              height: "100%",
-              position: "relative",
             }}
-          />
-        )}
-
-        {/* Right column: mobile header (if any) + page content */}
-        <div
-          style={{
-            flex: 1,
-            minWidth: 0,
-            minHeight: 0,
-            display: "flex",
-            flexDirection: "column",
-            overflow: "hidden",
-          }}
-        >
-          {isMobile &&
-            !(
-              SELF_HEADER_PATHS.has(currentPath) ||
-              [...SELF_HEADER_PATHS].some((p) =>
-                currentPath.startsWith(p + "/"),
-              )
-            ) && (
-              <Header
-                selectedKey={selectedKey}
-                collapsed={collapsed}
-                onToggle={toggleCollapsed}
-                isMobile={isMobile}
+          >
+            <Sidebar
+              selectedKey={selectedKey}
+              collapsed={collapsed}
+              onToggle={toggleCollapsed}
+              isMobile={isMobile}
+            />
+            {!isMobile && (
+              <RailEdgeControl
+                expanded={!collapsed}
+                onToggle={handleNavRailToggle}
+                side="end"
               />
             )}
+          </div>
 
-          <Layout
+          {isChatRoute && !isMinimalLayout && (
+            <div
+              id={CHAT_HISTORY_RAIL_ID}
+              style={{
+                flexShrink: 0,
+                display: "flex",
+                alignSelf: "stretch",
+                minHeight: 0,
+                height: "100%",
+                position: "relative",
+              }}
+            />
+          )}
+
+          {/* Right column: mobile header (if any) + page content */}
+          <div
             style={{
-              background: "transparent",
               flex: 1,
+              minWidth: 0,
+              minHeight: 0,
               display: "flex",
               flexDirection: "column",
               overflow: "hidden",
-              minWidth: 0,
-              minHeight: 0,
             }}
           >
-            <Content
-              className="page-container"
+            {isMobile &&
+              !(
+                SELF_HEADER_PATHS.has(currentPath) ||
+                [...SELF_HEADER_PATHS].some((p) =>
+                  currentPath.startsWith(p + "/"),
+                )
+              ) && (
+                <Header
+                  selectedKey={selectedKey}
+                  collapsed={collapsed}
+                  onToggle={toggleCollapsed}
+                  isMobile={isMobile}
+                />
+              )}
+
+            <Layout
               style={{
-                background: "var(--fn-bg-layout)",
-                transition: "background var(--fn-transition)",
+                background: "transparent",
                 flex: 1,
-                overflow: "hidden",
                 display: "flex",
                 flexDirection: "column",
+                overflow: "hidden",
+                minWidth: 0,
                 minHeight: 0,
               }}
             >
-              <PwaUpdatePrompt />
-              <PwaAutoPrompt />
-
-              {workbenchMounted && (
-                <div
-                  style={{
-                    flex: 1,
-                    minHeight: 0,
-                    overflow: "hidden",
-                    display: onWorkbench ? "flex" : "none",
-                    flexDirection: "column",
-                  }}
-                >
-                  <RequirePermission>
-                    <Suspense
-                      fallback={
-                        <div
-                          style={{
-                            display: "flex",
-                            justifyContent: "center",
-                            alignItems: "center",
-                            flex: 1,
-                          }}
-                        >
-                          <Spin size="large" />
-                        </div>
-                      }
-                    >
-                      <WorkbenchPage isVisible={onWorkbench} />
-                    </Suspense>
-                  </RequirePermission>
-                </div>
-              )}
-
-              {/* Keep Routes mounted when visiting Workbench so leaving/re-entering
-                  does not remount every lazy page (lag + lost UI state). */}
-              <div
+              <Content
+                className="page-container"
                 style={{
+                  background: "var(--fn-bg-layout)",
+                  transition: "background var(--fn-transition)",
                   flex: 1,
-                  minHeight: 0,
                   overflow: "hidden",
-                  display: onWorkbench ? "none" : "flex",
+                  display: "flex",
                   flexDirection: "column",
+                  minHeight: 0,
                 }}
               >
-                {isFullscreen ? (
+                <PwaUpdatePrompt />
+                <PwaAutoPrompt />
+
+                {workbenchMounted && (
                   <div
                     style={{
                       flex: 1,
                       minHeight: 0,
                       overflow: "hidden",
-                      display: "flex",
+                      display: onWorkbench ? "flex" : "none",
                       flexDirection: "column",
                     }}
                   >
-                    {routes}
+                    <RequirePermission>
+                      <Suspense
+                        fallback={
+                          <div
+                            style={{
+                              display: "flex",
+                              justifyContent: "center",
+                              alignItems: "center",
+                              flex: 1,
+                            }}
+                          >
+                            <Spin size="large" />
+                          </div>
+                        }
+                      >
+                        <WorkbenchPage isVisible={onWorkbench} />
+                      </Suspense>
+                    </RequirePermission>
                   </div>
-                ) : (
-                  <div className="page-content">{routes}</div>
                 )}
-              </div>
-            </Content>
-          </Layout>
+
+                {/* Keep Routes mounted when visiting Workbench so leaving/re-entering
+                  does not remount every lazy page (lag + lost UI state). */}
+                <div
+                  style={{
+                    flex: 1,
+                    minHeight: 0,
+                    overflow: "hidden",
+                    display: onWorkbench ? "none" : "flex",
+                    flexDirection: "column",
+                  }}
+                >
+                  {isFullscreen ? (
+                    <div
+                      style={{
+                        flex: 1,
+                        minHeight: 0,
+                        overflow: "hidden",
+                        display: "flex",
+                        flexDirection: "column",
+                      }}
+                    >
+                      {routes}
+                    </div>
+                  ) : (
+                    <div className="page-content">{routes}</div>
+                  )}
+                </div>
+              </Content>
+            </Layout>
+          </div>
         </div>
-      </div>
+      </BackupOperationProvider>
     </ServiceRestartProvider>
   );
 }
diff --git a/dashboard/src/layouts/PageShell.module.less b/dashboard/src/layouts/PageShell.module.less
index 259a1d7e..d201bc68 100644
--- a/dashboard/src/layouts/PageShell.module.less
+++ b/dashboard/src/layouts/PageShell.module.less
@@ -83,7 +83,8 @@
 
   @media (max-width: 767px) {
     flex: none;
-    overflow: visible;
+    overflow-x: hidden;
+    overflow-y: visible;
 
     :global(.octop-tabs-content-holder),
     :global(.ant-tabs-content-holder),
@@ -92,7 +93,9 @@
     :global(.octop-tabs-tabpane),
     :global(.ant-tabs-tabpane) {
       height: auto !important;
-      overflow: visible;
+      max-width: 100%;
+      overflow-x: hidden;
+      overflow-y: visible;
     }
   }
 }
diff --git a/dashboard/src/layouts/PageShell.tsx b/dashboard/src/layouts/PageShell.tsx
index b6cebfee..0e81f416 100644
--- a/dashboard/src/layouts/PageShell.tsx
+++ b/dashboard/src/layouts/PageShell.tsx
@@ -170,8 +170,12 @@ function PageShell({
           background: "var(--fn-bg-container, var(--fn-bg-elevated))",
           borderRadius: 8,
           padding: contentPad,
-          overflow: pinBody ? "hidden" : "auto",
+          // Mobile: never create a page-level horizontal scrollbar; wide
+          // tables scroll via antd scroll.x inside their own wrapper.
+          overflowX: pinBody || isMobile ? "hidden" : "auto",
+          overflowY: pinBody ? "hidden" : "auto",
           minHeight: 0,
+          minWidth: 0,
           display: pinBody ? "flex" : undefined,
           flexDirection: pinBody ? "column" : undefined,
         }}
diff --git a/dashboard/src/locales/en.json b/dashboard/src/locales/en.json
index bce08fe8..66ba02c2 100644
--- a/dashboard/src/locales/en.json
+++ b/dashboard/src/locales/en.json
@@ -69,7 +69,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_IN_PROGRESS": "A backup is already in progress. Try again shortly.",
+    "BACKUP_IN_PROGRESS": "A backup or restore is already in progress. Try again shortly.",
     "FORBIDDEN": "Permission denied.",
     "NOT_FOUND": "Not found.",
     "USER_DISABLED": "This account has been disabled.",
@@ -322,6 +322,8 @@
     "documents": "Documents",
     "documentLimit": "{{count}} / {{max}} documents",
     "documentLimitReached": "This knowledge base already contains the maximum of {{count}} documents.",
+    "maxDocuments": "Document limit",
+    "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.",
@@ -778,7 +780,7 @@
     "defaultModelPlaceholder": "Select a model",
     "skillPackagesLabel": "Optional Skill Packages",
     "skillPackagesHint": "Mount packages at create time (local storage with root /).",
-    "skillPackagesUnsupportedHint": "Skill packages unavailable: storage root is not /. Set it to /, or use customized / built-in skills.",
+    "skillPackagesUnsupportedHint": "Skill packages unavailable: when the storage root is not /, the sandbox cannot reach skill-package directories, so packages cannot be used.",
     "skillPackagesClearFailed": "Backend settings saved, but clearing mounted skill packages failed",
     "skillPackagesPlaceholder": "Select skill packages",
     "manifestWriteFailed": "Page configuration could not be saved.",
@@ -840,7 +842,8 @@
     "backendRootDirPlaceholder": "Browse and select a directory",
     "backendRootDirDesc": "Defaults to the server user's home directory ({{home}}). You may also browse from filesystem root `/`.",
     "backendRootDirDescAdmin": "Defaults to the server user's home directory ({{home}}). You may also browse from filesystem root `/`.",
-    "backendRootDirJailHint": "When you save a non-root directory, Octop best-effort installs bubblewrap on Linux so shell/skill commands run in a directory jail. If install is unavailable (or on other platforms), execute uses the normal local shell without a jail; file tools still use the virtual filesystem.",
+    "backendRootDirJailHint": "When saving to a non-root directory, Octop sandboxes the AI filesystem to that directory and blocks cross-directory access.",
+    "backendRootDirImmutableHint": "Cannot be changed after creation.",
     "rootDirOutsideHomeWarning": "This path is outside your home directory ({{home}}).",
     "rootDirListFailed": "Could not list subdirectories. Check permissions or choose another path.",
     "rootDirMkdir": "New folder",
@@ -996,6 +999,7 @@
     "stream_stall": "The model stopped sending content while the connection stayed open. Click Retry, or try again later with another model. If this happens often, check the provider status or ask an admin to review stream timeout settings.",
     "rate_limit": "The model provider rate-limited this request. Wait a moment and retry, or switch to another model.",
     "auth": "Model authentication failed. Check that the API key under Settings → Models is correct and still valid.",
+    "insufficient_balance": "The model provider rejected this request due to insufficient balance or quota. Top up or upgrade the plan for this API key, then try again.",
     "context_length": "This conversation is too long for the model's context window. Start a new chat, or shorten the history and try again.",
     "recursion_limit": "The agent hit its max iteration / recursion limit before finishing. Open Configuration and raise Max Iterations, then try again.",
     "timeout_network": "Connecting to the model timed out or the network failed. Check your network and retry. If you use a proxy or self-hosted endpoint, confirm it is reachable.",
@@ -1018,6 +1022,20 @@
       "hintBlocking": "Sending is paused for this agent until slimming finishes.",
       "elapsed": "{{seconds}}s elapsed"
     },
+    "historyMigration": {
+      "title": "Upgrade complete: {{count}} old chats still need optimization",
+      "readyHint": "Run it in the background now so very long chats do not pause on first open. New chats remain available, and only one old chat is read at a time.",
+      "runningHint": "Processing old chats one at a time in the background. New chats remain available; avoid repeatedly refreshing the page.",
+      "agentBusyHint": "This expert is running a task. Wait until it is idle before starting old-chat optimization.",
+      "queueBusyHint": "The migration queue is handling other chats. You can start when capacity is available; this page refreshes automatically.",
+      "retryHint": "{{count}} chats failed during the previous attempt and can be retried safely.",
+      "startFailed": "Could not start background processing. Make sure the agent is running, then retry.",
+      "start": "Optimize in background",
+      "running": "Optimizing",
+      "queueRest": "Queue remaining chats",
+      "waiting": "Waiting for queue",
+      "retry": "Retry failed chats"
+    },
     "thinking": "Thinking",
     "continuing": "Continuing",
     "generating": "Generating",
@@ -1141,6 +1159,22 @@
       "rejectedLabel": "Rejected",
       "rejected": "Rejected by user"
     },
+    "ask": {
+      "title": "A few questions first",
+      "other": "Something else…",
+      "freeTextPlaceholder": "Type your answer",
+      "next": "Next",
+      "review": "Review & send",
+      "reviewTag": "Review",
+      "back": "Back",
+      "submit": "Send answers",
+      "skip": "You decide",
+      "skipMessage": "You decide — pick the best default and tell me what you assumed.",
+      "answered": "Answered",
+      "answeredSummary": "Answered {{count}} question(s)",
+      "dismissedSummary": "Closed {{count}} question(s)",
+      "expand": "View"
+    },
     "modifiedFiles": "Modified files ({{count}})",
     "openBrowser": "View browser",
     "openBrowserHint": "Agent is browsing the web",
@@ -1161,6 +1195,11 @@
     "remoteBrowserTitle": "Remote Browser",
     "dockTerminalTitle": "Terminal",
     "dockPhoneTitle": "Remote Phone",
+    "dockToolUiTitle": "Plugin tool",
+    "dockToolUiMissing": "Tool result is no longer available in this conversation.",
+    "openToolUiInDock": "Open in side panel",
+    "toolUiDockedHint": "Moved to side panel",
+    "toolUiDockedOpen": "Open side panel",
     "loadEarlierMessages": "Load earlier messages"
   },
   "tools": {
@@ -1208,6 +1247,7 @@
     "mobile_handoff_to_user": "Hand off to user (mobile)",
     "read_env_file": "Read env file",
     "write_env_file": "Write env file",
+    "ask_user_question": "Ask the user",
     "generate_image": "Generate image",
     "generate_video": "Generate video"
   },
@@ -1227,6 +1267,7 @@
     "categories": {
       "filesystem": "Files & shell",
       "orchestration": "Planning & sub-agents",
+      "interaction": "User interaction",
       "web": "Web & browser",
       "media": "Media generation",
       "memory": "Memory",
@@ -1331,6 +1372,7 @@
     "storedTitle": "Backup files",
     "storedDesc": "System backups are stored in the directory below. Download or restore with one click.",
     "createButton": "Create backup",
+    "creating": "Backing up…",
     "uploadButton": "Upload backup",
     "uploadSuccess": "Saved {{name}}",
     "uploadFailed": "Upload failed",
@@ -1357,9 +1399,9 @@
     "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. If you also restore config/env, restart the service manually for those to fully apply. This cannot be undone.",
+    "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.",
     "importConfirmTitle": "Confirm restore",
-    "importConfirmBody": "Restore from “{{name}}”? Existing data will be overwritten. 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.",
+    "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",
@@ -1419,6 +1461,14 @@
     "kindWorkspace": "Workspace",
     "path": "Path",
     "skillDescription": "Description",
+    "displayNameZh": "Chinese display name",
+    "displayNameEn": "English display name",
+    "displayNameZhPlaceholder": "Name shown when the interface is in Chinese",
+    "displayNameEnPlaceholder": "Name shown when the interface is in English",
+    "displaySummaryZh": "Chinese short description",
+    "displaySummaryEn": "English short description",
+    "displaySummaryZhPlaceholder": "Short card description in Chinese",
+    "displaySummaryEnPlaceholder": "Short card description in English",
     "noDescription": "No description available",
     "createSkill": "Create Skill",
     "viewSkill": "View Skill",
@@ -1477,7 +1527,7 @@
     "packagesUpdateFailed": "Failed to update mounted packages",
     "packageConflictHint": "The workspace skill “{{slug}}” shadows this package skill.",
     "mountBackendHint": "Skill packages need local storage with root /.",
-    "skillPackagesUnsupportedHint": "Skill packages unavailable: storage root is not /. Set it to / in expert settings, or use customized / built-in skills.",
+    "skillPackagesUnsupportedHint": "Skill packages unavailable: when the storage root is not /, the sandbox cannot reach skill-package directories, so packages cannot be used.",
     "installedSkillsDesc": "Manage installed built-in and customized skills.",
     "tencentSkillHubDesc": "Browse and install community skills from Tencent SkillHub.",
     "install": "Install",
@@ -1845,6 +1895,19 @@
     "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...",
+    "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",
+    "dingtalkQrStep3": "Confirm application creation",
+    "dingtalkQrScanHint": "Scan with DingTalk App to finish authorization",
+    "dingtalkUserCode": "User code",
+    "dingtalkGenerateQr": "Generate DingTalk QR Code",
+    "dingtalkBindSuccess": "DingTalk application created and channel enabled",
+    "dingtalkQrExpired": "DingTalk authorization expired; generate a new QR code",
+    "dingtalkQrFailed": "DingTalk application authorization failed",
     "qqQrIntro1": "Generate a QQ Bot binding QR code",
     "qqQrIntro2": "Scan and confirm with mobile QQ",
     "qqQrIntro3": "Save the returned App ID and secret automatically",
@@ -2103,6 +2166,7 @@
     "sttFailed": "Speech recognition failed",
     "sttFallback": "Server STT failed — switched to browser recognition",
     "sttProviderRequired": "This browser does not support native speech recognition. Configure Tencent Cloud or OpenAI STT.",
+    "sttNetworkFailed": "Browser speech recognition could not reach the network (often Google). Configure Tencent Cloud, Xiaomi Mimo, or OpenAI STT under Settings → Voice.",
     "ttsFailed": "Text-to-speech failed",
     "nothingToRead": "No readable prose in this message (code blocks are skipped)",
     "browserNoChineseVoice": "Chrome has no Chinese voice — using Edge TTS instead",
@@ -2440,7 +2504,6 @@
     "localDownloadContinueBackground": "Continue in background",
     "localDownloadBackground": "Download moved to the background. You will be notified when it finishes.",
     "localDownloadBackgroundHint": "You can close this window. The download continues on the server and you will get a notification when it finishes.",
-    "onnxDownloadProgress": "Downloading {{model}} ({{percent}}%)",
     "onnxDownloadLoading": "Loading {{model}}…",
     "defaultModelDownloadedOnly": "Only downloaded models can be selected",
     "defaultModelNeedDownload": "Download a model below first",
@@ -4170,35 +4233,67 @@
     "modalEditTitle": "Edit user {{username}}"
   },
   "adminSso": {
+    "panelTitle": "Single sign-on",
+    "panelDesc": "Connect an OpenID Connect identity provider so users can sign in with your organization account.",
+    "statusEnabled": "Enabled · {{name}}",
+    "statusDisabled": "Disabled",
+    "statusUnnamed": "Provider",
+    "guideStep1": "Fill issuer & client",
+    "guideStep2": "Copy redirect URI",
+    "guideStep3": "Save settings",
+    "guideStep4": "Test discovery",
+    "guideStep5": "Enable SSO",
+    "guideTitle": "Setup checklist",
     "enabled": "Enable single sign-on",
     "enabledHint": "Allow users to sign in through the configured OpenID Connect provider.",
+    "loginPreview": "Login page preview",
+    "loginPreviewDisabled": "This button appears on the login page only when SSO is enabled.",
+    "sectionProvider": "Identity provider",
+    "sectionProviderHint": "Choose a preset to fill defaults, then enter your issuer URL.",
+    "presetsLabel": "Quick start",
+    "presetAzure": "Azure AD",
+    "presetGoogle": "Google",
+    "presetKeycloak": "Keycloak",
+    "presetOkta": "Okta",
     "displayName": "Provider display name",
+    "displayNamePlaceholder": "Shown on the login button",
     "displayNameRequired": "Enter a provider display name",
     "issuer": "Issuer URL",
     "issuerHint": "The OpenID Connect issuer URL published by your identity provider.",
     "issuerRequired": "Enter a valid issuer URL",
+    "sectionCredentials": "OAuth credentials",
+    "sectionCredentialsHint": "Client ID and secret from your identity provider application registration.",
     "clientId": "Client ID",
     "clientIdRequired": "Enter the client ID",
     "clientSecret": "Client secret",
     "clientSecretHint": "Optional for public clients.",
     "clientSecretConfigured": "A client secret is configured. Leave blank to keep it unchanged.",
+    "clientSecretConfiguredTag": "Configured",
     "clientSecretPlaceholder": "Leave blank to keep the current secret",
     "scopes": "Scopes",
+    "scopesPlaceholder": "openid profile email",
     "scopesRequired": "Enter at least one scope",
+    "sectionAdvanced": "Advanced options",
     "dashboardOrigin": "Dashboard origin override",
     "dashboardOriginHint": "Optional public dashboard URL used after the identity provider redirects back.",
     "dashboardOriginInvalid": "Enter a valid dashboard origin URL",
     "redirectUri": "Redirect URI",
     "redirectUriHint": "Add this exact callback URL to your identity provider configuration.",
+    "redirectUriEmpty": "Save once to generate the redirect URI",
+    "redirectUriDocs": "In Azure AD, Google, Keycloak, or Okta, register this URL as an allowed redirect / callback URI.",
     "copy": "Copy",
+    "copied": "Copied",
     "copyRedirectUri": "Copy redirect URI",
     "copySuccess": "Redirect URI copied",
     "copyFailed": "Could not copy redirect URI",
     "save": "Save",
+    "discard": "Discard",
+    "unsavedChanges": "You have unsaved changes.",
     "saved": "Single sign-on settings saved",
     "saveFailed": "Could not save single sign-on settings",
     "loadFailed": "Could not load single sign-on settings",
     "testConnection": "Test connection",
+    "testNeedsSave": "Save your changes before testing.",
     "testSuccess": "OIDC connection succeeded",
     "testFailed": "OIDC connection test failed",
     "testHint": "Save changes before testing a new issuer or client ID."
@@ -4280,9 +4375,22 @@
       "duplicateName": "Server IDs must be unique",
       "emptyName": "Server ID is required",
       "probeNeedConfig": "Fill in the configuration before probing",
+      "probeOnSave": "Probe connection after save",
+      "probeOnSaveHint": "Octop will request your MCP URL to verify connectivity. If sign-in is required, we will guide you through OAuth.",
+      "probeNeedsOAuth": "This MCP requires OAuth before it can be used",
+      "probeComplete": "Connection verified",
+      "oauthConfigured": "OAuth authorization completed",
+      "oauthAuthorizeHint": "One-click OAuth saves your config first, then opens sign-in; we verify the connection again afterward.",
+      "oauthBeforeEnable": "Complete OAuth authorization before enabling this server",
+      "enable": "Enable connector",
+      "enableHint": "When off, agents will not load tools from this MCP.",
+      "defaultOpen": "Selected by default in chat",
+      "defaultOpenHint": "When on, your Dashboard, IM, and Cron (with no manual picks) include this MCP by default.",
+      "defaultOpenRequiresEnable": "Enable the connector first.",
+      "authorizing": "Authorizing…",
       "probeOk": "Probe ok — found {{count}} tools",
       "deleteConfirm": "Delete MCP server \"{{name}}\"?",
-      "deleteConfirmHint": "Changes take effect after you click Save."
+      "deleteConfirmHint": "Saved servers are removed immediately; unsaved drafts are dropped from this editor only."
     },
     "configuredBadge": "Connected",
     "clickToConnect": "Click to connect",
diff --git a/dashboard/src/locales/zh.json b/dashboard/src/locales/zh.json
index d94c3228..886984d0 100644
--- a/dashboard/src/locales/zh.json
+++ b/dashboard/src/locales/zh.json
@@ -69,7 +69,7 @@
     "SETUP_REQUIRED": "需要完成初始设置。",
     "DATABASE_NOT_EMPTY": "目标数据库已有用户。请改用空库，或直接登录现有管理员账户。",
     "BACKUP_DRIVER_MISMATCH": "该备份与当前数据库引擎不一致（SQLite 与 PostgreSQL 不能互恢）。请将运行时切回备份所用引擎后再恢复，或在当前引擎上重新备份。暂不支持跨引擎恢复。",
-    "BACKUP_IN_PROGRESS": "已有备份任务正在进行，请稍后再试。",
+    "BACKUP_IN_PROGRESS": "已有备份或恢复任务正在进行，请稍后再试。",
     "FORBIDDEN": "没有权限。",
     "NOT_FOUND": "未找到。",
     "USER_DISABLED": "账号已禁用。",
@@ -322,6 +322,8 @@
     "documents": "文档",
     "documentLimit": "{{count}} / {{max}} 个文档",
     "documentLimitReached": "此知识库已达到 {{count}} 个文档的上限。",
+    "maxDocuments": "文档数量上限",
+    "maxDocumentsHint": "本知识库可容纳的最大文档数，0 表示不限制，默认为 100。",
     "documentTooLarge": "单个文档不能超过 {{sizeMb}} MB。",
     "baseLimitReached": "每个用户最多可创建 {{count}} 个知识库。",
     "uploadHint": "支持 md / txt / pdf / docx / pptx，单文件不超过 {{sizeMb}} MB。",
@@ -778,7 +780,7 @@
     "defaultModelPlaceholder": "选择一个模型",
     "skillPackagesLabel": "可选技能包",
     "skillPackagesHint": "创建时挂载选中的技能包（需本地存储，且根目录为 /）。",
-    "skillPackagesUnsupportedHint": "无法使用技能包：当前存储根目录不是 /，请改为 /，或改用自定义/内置技能。",
+    "skillPackagesUnsupportedHint": "无法使用技能包：存储根目录不是 / 时，因沙箱限制无法访问技能包的相关文件目录，因此技能包不可用。",
     "skillPackagesClearFailed": "已保存后端设置，但清除已挂载技能包失败",
     "skillPackagesPlaceholder": "选择技能包",
     "patchFailed": "保存失败",
@@ -841,7 +843,8 @@
     "backendRootDirPlaceholder": "浏览并选择目录",
     "backendRootDirDesc": "默认使用当前系统用户的 home 目录（{{home}}）。也可从文件系统根目录 `/` 起浏览并选择。",
     "backendRootDirDescAdmin": "默认使用当前系统用户的 home 目录（{{home}}）。也可从文件系统根目录 `/` 起浏览并选择。",
-    "backendRootDirJailHint": "保存非根目录时，Octop 会尽量用 bubblewrap（Linux）把 shell/Skill 限制在目录狱中；安装失败或非 Linux 则退化为普通本地 shell（无目录狱）。文件工具始终走虚拟文件系统。",
+    "backendRootDirJailHint": "保存至非根目录时，Octop 会通过沙箱技术将 AI 文件系统限制在该目录内，禁止跨目录访问。",
+    "backendRootDirImmutableHint": "创建后不可更改。",
     "rootDirOutsideHomeWarning": "当前路径不在你的 home 目录（{{home}}）内。",
     "rootDirListFailed": "无法列出子目录，请检查权限或选择其他路径。",
     "rootDirMkdir": "新建文件夹",
@@ -996,6 +999,7 @@
     "stream_stall": "模型响应中断：连接仍在，但长时间没有新内容。请点击「重试」，或稍后更换模型再试。若经常出现，请检查供应商状态，或联系管理员排查流式超时设置。",
     "rate_limit": "模型请求过于频繁，已被限流。请稍等片刻后重试，或切换其他模型。",
     "auth": "模型服务鉴权失败。请检查「设置 → 模型」中的 API Key 是否正确、是否过期。",
+    "insufficient_balance": "模型服务返回余额或额度不足。请为该 API Key 对应的账户充值或升级套餐后再试。",
     "context_length": "对话上下文过长，超出模型限制。请新开会话，或精简历史后再试。",
     "recursion_limit": "智能体已达到最大迭代次数（递归上限），任务尚未完成。请前往「运行配置」调高「最大迭代次数」后重试。",
     "timeout_network": "连接模型服务超时或网络异常。请检查网络后重试；若使用代理或自建服务，请确认其可达。",
@@ -1018,6 +1022,20 @@
       "hintBlocking": "整理期间此智能体暂时无法发送消息，完成后会自动恢复。",
       "elapsed": "已进行 {{seconds}}s"
     },
+    "historyMigration": {
+      "title": "升级完成：还有 {{count}} 个旧会话需要优化",
+      "readyHint": "建议现在后台处理，之后首次打开超长会话就不必临时等待。处理时仍可使用新会话，系统每次只读取一个旧会话。",
+      "runningHint": "正在后台逐个处理；新会话可正常使用，请不要重复刷新页面。",
+      "agentBusyHint": "此专家正在执行任务，请等待专家空闲后再开始旧会话优化。",
+      "queueBusyHint": "后台迁移队列正在处理其他会话；空出位置后即可开始，本页会自动刷新状态。",
+      "retryHint": "有 {{count}} 个会话上次处理失败，可以安全重试。",
+      "startFailed": "未能启动后台处理，请确认 Agent 正在运行后重试。",
+      "start": "现在后台优化",
+      "running": "后台优化中",
+      "queueRest": "加入其余旧会话",
+      "waiting": "等待队列空闲",
+      "retry": "重试失败项"
+    },
     "thinking": "正在思考",
     "continuing": "继续生成中",
     "generating": "生成中",
@@ -1141,6 +1159,22 @@
       "rejectedLabel": "已拒绝",
       "rejected": "用户已拒绝"
     },
+    "ask": {
+      "title": "先问几个问题",
+      "other": "其他…",
+      "freeTextPlaceholder": "输入你的答案",
+      "next": "下一个",
+      "review": "确认并提交",
+      "reviewTag": "回顾",
+      "back": "返回",
+      "submit": "提交回答",
+      "skip": "你决定",
+      "skipMessage": "你决定吧——按最优默认方案继续，并告诉我你依据的假设。",
+      "answered": "已回答",
+      "answeredSummary": "已回答 {{count}} 个问题",
+      "dismissedSummary": "已关闭 {{count}} 个问题",
+      "expand": "查看"
+    },
     "modifiedFiles": "已修改文件（{{count}}）",
     "openBrowser": "查看浏览器",
     "openBrowserHint": "Agent 正在网页中操作",
@@ -1161,6 +1195,11 @@
     "remoteBrowserTitle": "远程浏览器",
     "dockTerminalTitle": "终端",
     "dockPhoneTitle": "远程手机",
+    "dockToolUiTitle": "插件工具",
+    "dockToolUiMissing": "该工具结果已不在当前对话中。",
+    "openToolUiInDock": "在侧栏打开",
+    "toolUiDockedHint": "已移到侧栏",
+    "toolUiDockedOpen": "打开侧栏",
     "loadEarlierMessages": "加载更早的消息"
   },
   "tools": {
@@ -1208,6 +1247,7 @@
     "mobile_handoff_to_user": "交给用户操作（手机）",
     "read_env_file": "读取环境变量",
     "write_env_file": "写入环境变量",
+    "ask_user_question": "向你提问",
     "generate_image": "生成图片",
     "generate_video": "生成视频"
   },
@@ -1227,6 +1267,7 @@
     "categories": {
       "filesystem": "文件与终端",
       "orchestration": "规划与子智能体",
+      "interaction": "用户交互",
       "web": "网页与浏览器",
       "media": "媒体生成",
       "memory": "记忆",
@@ -1330,6 +1371,7 @@
     "storedTitle": "备份文件",
     "storedDesc": "系统备份保存在以下目录，可下载或一键恢复。",
     "createButton": "新建备份",
+    "creating": "备份中…",
     "uploadButton": "上传备份",
     "uploadSuccess": "已保存 {{name}}",
     "uploadFailed": "上传失败",
@@ -1355,10 +1397,10 @@
     "importDesc": "从先前导出的 .tar.gz 归档恢复系统。建议在维护窗口操作。",
     "importButton": "选择备份文件",
     "uploading": "正在上传… {{percent}}%",
-    "restoring": "正在恢复…",
-    "importWarning": "恢复将覆盖当前数据库与本地工作区，并热加载模型、专家与通道。若同时恢复了 config/env，完整生效仍需手动重启服务。此操作不可撤销。",
+    "restoring": "恢复中…",
+    "importWarning": "恢复将覆盖当前数据库与本地工作区，并热加载模型、专家与通道。恢复期间依赖数据库的接口可能短暂不可用，建议在维护窗口操作。若同时恢复了 config/env，完整生效仍需手动重启服务。此操作不可撤销。",
     "importConfirmTitle": "确认恢复备份",
-    "importConfirmBody": "确定从「{{name}}」恢复？这将覆盖现有数据。恢复后会热加载模型、专家与通道，无需重启服务；若勾选恢复配置，config/env 需重启后才完全生效。",
+    "importConfirmBody": "确定从「{{name}}」恢复？这将覆盖现有数据，替换数据库期间服务可能短暂不可用。恢复后会热加载模型、专家与通道，无需重启服务；若勾选恢复配置，config/env 需重启后才完全生效。",
     "importConfirmOk": "恢复",
     "importSuccess": "恢复完成（{{agents}} 个 Agent，{{files}} 个工作区文件）",
     "importFailed": "恢复备份失败",
@@ -1418,6 +1460,14 @@
     "kindWorkspace": "工作区",
     "path": "路径",
     "skillDescription": "描述",
+    "displayNameZh": "中文展示名称",
+    "displayNameEn": "英文展示名称",
+    "displayNameZhPlaceholder": "界面为中文时显示的名称",
+    "displayNameEnPlaceholder": "界面为英文时显示的名称",
+    "displaySummaryZh": "中文简短描述",
+    "displaySummaryEn": "英文简短描述",
+    "displaySummaryZhPlaceholder": "用于技能卡片的中文短描述",
+    "displaySummaryEnPlaceholder": "用于技能卡片的英文短描述",
     "noDescription": "暂无描述",
     "createSkill": "创建技能",
     "viewSkill": "查看技能",
@@ -1476,7 +1526,7 @@
     "packagesUpdateFailed": "更新已挂载技能包失败",
     "packageConflictHint": "工作区技能“{{slug}}”会覆盖此技能包中的同名技能。",
     "mountBackendHint": "技能包需本地存储，且根目录为 /。",
-    "skillPackagesUnsupportedHint": "无法使用技能包：当前存储根目录不是 /，请在专家设置中改为 /，或改用自定义/内置技能。",
+    "skillPackagesUnsupportedHint": "无法使用技能包：存储根目录不是 / 时，因沙箱限制无法访问技能包的相关文件目录，因此技能包不可用。",
     "installedSkillsDesc": "管理已安装的内置和自定义技能。",
     "tencentSkillHubDesc": "浏览和安装来自腾讯 SkillHub 的社区技能。",
     "install": "安装",
@@ -1759,14 +1809,14 @@
     "configFailed": "配置保存失败",
     "channelEnabled": "频道已启用",
     "channelDisabled": "频道已停用",
-    "channelType": "频道类型",
+    "channelType": "通道类型",
     "status": "状态",
     "totalItems": "共 {{count}} 项",
     "botPrefix": "机器人前缀",
     "notSet": "未设置",
     "clickCardToEdit": "点击卡片进行编辑",
     "settings": "设置",
-    "channelSettings": "频道设置",
+    "channelSettings": "通道设置",
     "openPlatform": "开放平台",
     "qqGetCredentialsHint": "在这里获取你的机器人信息",
     "feishuGetCredentialsHint": "在这里获取你的机器人信息",
@@ -1844,6 +1894,19 @@
     "weixinQrStep2": "扫描下方二维码完成授权",
     "weixinQrStep3": "扫码成功后自动获取凭据并接入",
     "weixinQrScanHint": "请使用微信扫描二维码",
+    "dingtalkQrLoading": "正在初始化钉钉应用创建流程...",
+    "dingtalkQrIntro1": "点击按钮生成钉钉应用授权二维码",
+    "dingtalkQrIntro2": "使用同一组织账号登录的钉钉 App 扫码并确认",
+    "dingtalkQrIntro3": "Octop 将自动创建并启用钉钉频道",
+    "dingtalkQrStep1": "打开钉钉 App",
+    "dingtalkQrStep2": "扫描应用授权二维码",
+    "dingtalkQrStep3": "确认创建应用",
+    "dingtalkQrScanHint": "请使用钉钉 App 扫码完成授权",
+    "dingtalkUserCode": "用户码",
+    "dingtalkGenerateQr": "生成钉钉扫码二维码",
+    "dingtalkBindSuccess": "钉钉应用已创建，频道已启用",
+    "dingtalkQrExpired": "钉钉授权已过期，请重新生成二维码",
+    "dingtalkQrFailed": "钉钉应用授权失败",
     "qqQrIntro1": "点击按钮生成 QQ 机器人绑定二维码",
     "qqQrIntro2": "使用手机 QQ 扫码并确认授权",
     "qqQrIntro3": "自动获取 App ID 和密钥并保存频道",
@@ -1906,7 +1969,7 @@
     "botNamePlaceholder": "如：小助手",
     "noAgentSelected": "请先选择或创建一个 Agent 才能管理其频道",
     "statsSummary": "当前支持 {{supported}} 个通道，已配置 {{configured}} 个",
-    "createChannel": "新建频道",
+    "createChannel": "新建通道",
     "emptyHint": "暂无频道,点击右上角新建",
     "testSuccess": "频道探测通过",
     "testFailed": "频道探测失败: {{error}}",
@@ -2103,6 +2166,7 @@
     "sttFailed": "语音识别失败",
     "sttFallback": "服务端识别失败，已切换浏览器识别",
     "sttProviderRequired": "当前浏览器不支持原生语音识别，请配置腾讯云或 OpenAI STT",
+    "sttNetworkFailed": "浏览器语音识别无法联网（常依赖 Google）。请在设置 → 语音服务中配置腾讯云、小米 Mimo 或 OpenAI STT",
     "ttsFailed": "语音合成失败",
     "nothingToRead": "没有可朗读的正文（代码块等内容已跳过）",
     "browserNoChineseVoice": "Chrome 没有中文语音，已改用 Edge TTS 朗读",
@@ -2438,7 +2502,6 @@
     "localDownloadContinueBackground": "后台继续",
     "localDownloadBackground": "下载已转到后台，完成后会通知你",
     "localDownloadBackgroundHint": "可关闭此窗口，下载在服务端继续，完成后会弹出通知。",
-    "onnxDownloadProgress": "正在下载 {{model}}（{{percent}}%）",
     "onnxDownloadLoading": "正在加载 {{model}}…",
     "defaultModelDownloadedOnly": "仅可选择已下载的模型",
     "defaultModelNeedDownload": "请先在下方管理模型中下载",
@@ -4309,35 +4372,67 @@
     "modalEditTitle": "编辑用户 {{username}}"
   },
   "adminSso": {
+    "panelTitle": "单点登录",
+    "panelDesc": "接入 OpenID Connect 身份提供商，让用户使用组织账号登录。",
+    "statusEnabled": "已启用 · {{name}}",
+    "statusDisabled": "未启用",
+    "statusUnnamed": "提供商",
+    "guideStep1": "填写签发者与客户端",
+    "guideStep2": "复制回调地址",
+    "guideStep3": "保存配置",
+    "guideStep4": "测试发现",
+    "guideStep5": "启用 SSO",
+    "guideTitle": "配置清单",
     "enabled": "启用单点登录",
     "enabledHint": "允许用户通过已配置的 OpenID Connect 身份提供商登录。",
+    "loginPreview": "登录页预览",
+    "loginPreviewDisabled": "仅在启用 SSO 后，登录页才会显示此按钮。",
+    "sectionProvider": "身份提供商",
+    "sectionProviderHint": "可先选择预设填充默认值，再填写签发者 URL。",
+    "presetsLabel": "快速开始",
+    "presetAzure": "Azure AD",
+    "presetGoogle": "Google",
+    "presetKeycloak": "Keycloak",
+    "presetOkta": "Okta",
     "displayName": "提供商显示名称",
+    "displayNamePlaceholder": "显示在登录按钮上",
     "displayNameRequired": "请输入提供商显示名称",
     "issuer": "签发者 URL",
     "issuerHint": "身份提供商公开的 OpenID Connect 签发者 URL。",
     "issuerRequired": "请输入有效的签发者 URL",
+    "sectionCredentials": "OAuth 凭证",
+    "sectionCredentialsHint": "来自身份提供商应用注册的客户端 ID 与密钥。",
     "clientId": "客户端 ID",
     "clientIdRequired": "请输入客户端 ID",
     "clientSecret": "客户端密钥",
     "clientSecretHint": "公共客户端可不填写。",
     "clientSecretConfigured": "已配置客户端密钥；留空将保留现有密钥。",
+    "clientSecretConfiguredTag": "已配置",
     "clientSecretPlaceholder": "留空以保留现有密钥",
     "scopes": "授权范围",
+    "scopesPlaceholder": "openid profile email",
     "scopesRequired": "请至少输入一个授权范围",
+    "sectionAdvanced": "高级选项",
     "dashboardOrigin": "控制台来源地址覆盖",
     "dashboardOriginHint": "可选。身份提供商回调后使用的公开控制台 URL。",
     "dashboardOriginInvalid": "请输入有效的控制台来源地址 URL",
     "redirectUri": "回调地址",
     "redirectUriHint": "请将此精确回调 URL 添加到身份提供商配置中。",
+    "redirectUriEmpty": "保存一次后生成回调地址",
+    "redirectUriDocs": "在 Azure AD、Google、Keycloak 或 Okta 中，将此 URL 注册为允许的重定向 / 回调地址。",
     "copy": "复制",
+    "copied": "已复制",
     "copyRedirectUri": "复制回调地址",
     "copySuccess": "回调地址已复制",
     "copyFailed": "无法复制回调地址",
     "save": "保存",
+    "discard": "放弃更改",
+    "unsavedChanges": "有未保存的更改。",
     "saved": "单点登录设置已保存",
     "saveFailed": "无法保存单点登录设置",
     "loadFailed": "无法加载单点登录设置",
     "testConnection": "测试连接",
+    "testNeedsSave": "请先保存更改再测试。",
     "testSuccess": "OIDC 连接成功",
     "testFailed": "OIDC 连接测试失败",
     "testHint": "更改签发者或客户端 ID 后，请先保存再测试。"
@@ -4419,9 +4514,22 @@
       "duplicateName": "服务器 ID 不能重复",
       "emptyName": "请填写服务器 ID",
       "probeNeedConfig": "请先填写完整配置再探测",
+      "probeOnSave": "保存后自动探测连接",
+      "probeOnSaveHint": "将向您填写的 MCP 地址发起请求以验证可用性；若需登录，会引导您完成 OAuth。",
+      "probeNeedsOAuth": "此 MCP 需要 OAuth 授权才能访问",
+      "probeComplete": "连接正常",
+      "oauthConfigured": "已完成 OAuth 授权",
+      "oauthAuthorizeHint": "点击「一键授权」将先保存配置再打开登录页；完成后我们会自动再次验证连接。",
+      "oauthBeforeEnable": "请先完成 OAuth 授权后再启用",
+      "enable": "启用连接器",
+      "enableHint": "关闭后 Agent 不会加载此 MCP 的工具。",
+      "defaultOpen": "对话默认选中",
+      "defaultOpenHint": "开启后，你的 Dashboard、IM 与 Cron（未手动选连接器时）会默认带上此 MCP。",
+      "defaultOpenRequiresEnable": "需先启用连接器。",
+      "authorizing": "授权中…",
       "probeOk": "探测成功，发现 {{count}} 个工具",
       "deleteConfirm": "确定删除 MCP 服务器「{{name}}」？",
-      "deleteConfirmHint": "删除后需点击保存才会生效。"
+      "deleteConfirmHint": "已保存的服务器将立即删除；尚未保存的配置只会从当前编辑中移除。"
     },
     "configuredBadge": "已连接",
     "clickToConnect": "点击连接",
diff --git a/dashboard/src/pages/Admin/Storage/StorageBackendCard.tsx b/dashboard/src/pages/Admin/Storage/StorageBackendCard.tsx
index 639f9562..6cb79b40 100644
--- a/dashboard/src/pages/Admin/Storage/StorageBackendCard.tsx
+++ b/dashboard/src/pages/Admin/Storage/StorageBackendCard.tsx
@@ -5,8 +5,7 @@
  * enabled toggle, edit and delete actions.
  */
 import { useState } from "react";
-import { Button, Modal, Switch, Tooltip } from "antd";
-import { message } from "@/utils/antdMessage";
+import { App, Button, Switch, Tooltip } from "antd";
 
 import {
   Pencil,
@@ -39,6 +38,7 @@ export function StorageBackendCard({
   isNew,
 }: StorageBackendCardProps) {
   const { t } = useTranslation();
+  const { modal, message } = App.useApp();
   const [editOpen, setEditOpen] = useState(false);
   const [browseOpen, setBrowseOpen] = useState(false);
   const [toggling, setToggling] = useState(false);
@@ -96,7 +96,7 @@ export function StorageBackendCard({
   };
 
   const handleDelete = () => {
-    Modal.confirm({
+    modal.confirm({
       title: t("storage.deleteTitle"),
       content: t("storage.deleteConfirm", { name: backend.name }),
       okText: t("common.delete"),
diff --git a/dashboard/src/pages/Admin/Users/SsoPanel.test.tsx b/dashboard/src/pages/Admin/Users/SsoPanel.test.tsx
index 93cbc50a..d563d94c 100644
--- a/dashboard/src/pages/Admin/Users/SsoPanel.test.tsx
+++ b/dashboard/src/pages/Admin/Users/SsoPanel.test.tsx
@@ -1,7 +1,6 @@
-import { describe, expect, it, vi } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 import { render, screen, waitFor } from "@testing-library/react";
-import { I18nextProvider } from "react-i18next";
-import i18n from "../../../i18n";
+import userEvent from "@testing-library/user-event";
 
 const { getOidcConfig, putOidcConfig, testOidcConfig } = vi.hoisted(() => ({
   getOidcConfig: vi.fn(),
@@ -14,12 +13,16 @@ vi.mock("../../../api/modules/sso", () => ({
 }));
 
 vi.mock("@/utils/antdMessage", () => ({
-  message: { error: vi.fn(), success: vi.fn() },
+  message: { error: vi.fn(), success: vi.fn(), warning: vi.fn() },
 }));
 
 import SsoPanel from "./SsoPanel";
 
 describe("<SsoPanel />", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
   it("loads the provider configuration and displays its callback URL", async () => {
     getOidcConfig.mockResolvedValue({
       enabled: true,
@@ -32,11 +35,7 @@ describe("<SsoPanel />", () => {
       redirect_uri: "https://octop.example.com/api/auth/oidc/callback",
     });
 
-    render(
-      <I18nextProvider i18n={i18n}>
-        <SsoPanel />
-      </I18nextProvider>,
-    );
+    render(<SsoPanel />);
 
     await waitFor(() => expect(getOidcConfig).toHaveBeenCalledOnce());
     expect(screen.getByDisplayValue("Acme SSO")).toBeInTheDocument();
@@ -45,5 +44,29 @@ describe("<SsoPanel />", () => {
         "https://octop.example.com/api/auth/oidc/callback",
       ),
     ).toBeInTheDocument();
+    // Mocked t() returns the key; interpolation keeps {{name}} unless options used.
+    expect(screen.getByText("adminSso.statusEnabled")).toBeInTheDocument();
+  });
+
+  it("applies an IdP preset into display name", async () => {
+    const user = userEvent.setup();
+    getOidcConfig.mockResolvedValue({
+      enabled: false,
+      display_name: "",
+      issuer: "",
+      client_id: "",
+      scopes: "openid profile email",
+      dashboard_origin: null,
+      has_client_secret: false,
+      redirect_uri: "",
+    });
+
+    render(<SsoPanel />);
+
+    await waitFor(() => expect(getOidcConfig).toHaveBeenCalledOnce());
+    await user.click(
+      screen.getByRole("button", { name: "adminSso.presetGoogle" }),
+    );
+    expect(screen.getByDisplayValue("Google")).toBeInTheDocument();
   });
 });
diff --git a/dashboard/src/pages/Admin/Users/SsoPanel.tsx b/dashboard/src/pages/Admin/Users/SsoPanel.tsx
index af387dae..ffeb62ca 100644
--- a/dashboard/src/pages/Admin/Users/SsoPanel.tsx
+++ b/dashboard/src/pages/Admin/Users/SsoPanel.tsx
@@ -1,6 +1,34 @@
-import { useCallback, useEffect, useState } from "react";
-import { Button, Form, Input, Space, Spin, Switch, Typography } from "antd";
-import { Copy, FlaskConical, Save } from "lucide-react";
+import {
+  useCallback,
+  useEffect,
+  useRef,
+  useState,
+  type ChangeEvent,
+} from "react";
+import {
+  Alert,
+  Button,
+  Collapse,
+  Form,
+  Input,
+  Select,
+  Space,
+  Spin,
+  Switch,
+  Tag,
+  Tooltip,
+  Typography,
+} from "antd";
+import {
+  Check,
+  CheckCircle2,
+  Copy,
+  FlaskConical,
+  KeyRound,
+  Lock,
+  Save,
+  XCircle,
+} from "lucide-react";
 import { useTranslation } from "react-i18next";
 import { message } from "@/utils/antdMessage";
 import {
@@ -10,6 +38,8 @@ import {
 } from "../../../api/modules/sso";
 import { apiErrorMessage } from "../../../utils/apiError";
 import { copyText } from "../../../utils/copyText";
+import { TabPanelHeader } from "../../Settings/AdvancedSettings/TabPanelHeader";
+import styles from "./index.module.less";
 
 interface SsoFormValues {
   enabled: boolean;
@@ -17,21 +47,83 @@ interface SsoFormValues {
   issuer: string;
   client_id: string;
   client_secret?: string;
-  scopes: string;
+  scopes: string[];
   dashboard_origin?: string;
 }
 
+type TestResult = { ok: boolean; detail: string } | null;
+
+type IdpPresetId = "azure" | "google" | "keycloak" | "okta";
+
+interface IdpPreset {
+  id: IdpPresetId;
+  labelKey: string;
+  displayName: string;
+  scopes: string[];
+  issuerPlaceholder: string;
+}
+
+const IDP_PRESETS: IdpPreset[] = [
+  {
+    id: "azure",
+    labelKey: "adminSso.presetAzure",
+    displayName: "Microsoft",
+    scopes: ["openid", "profile", "email"],
+    issuerPlaceholder: "https://login.microsoftonline.com/{tenant}/v2.0",
+  },
+  {
+    id: "google",
+    labelKey: "adminSso.presetGoogle",
+    displayName: "Google",
+    scopes: ["openid", "profile", "email"],
+    issuerPlaceholder: "https://accounts.google.com",
+  },
+  {
+    id: "keycloak",
+    labelKey: "adminSso.presetKeycloak",
+    displayName: "Keycloak",
+    scopes: ["openid", "profile", "email"],
+    issuerPlaceholder: "https://keycloak.example.com/realms/{realm}",
+  },
+  {
+    id: "okta",
+    labelKey: "adminSso.presetOkta",
+    displayName: "Okta",
+    scopes: ["openid", "profile", "email"],
+    issuerPlaceholder: "https://{domain}.okta.com",
+  },
+];
+
+const SCOPE_OPTIONS = ["openid", "profile", "email", "offline_access"].map(
+  (value) => ({ value, label: value }),
+);
+
+const GUIDE_STEPS = [
+  "adminSso.guideStep1",
+  "adminSso.guideStep2",
+  "adminSso.guideStep3",
+  "adminSso.guideStep4",
+  "adminSso.guideStep5",
+] as const;
+
 function configToFormValues(config: OidcConfig): SsoFormValues {
   return {
     enabled: config.enabled,
     display_name: config.display_name,
     issuer: config.issuer,
     client_id: config.client_id,
-    scopes: config.scopes,
+    scopes: config.scopes
+      .split(/\s+/)
+      .map((s) => s.trim())
+      .filter(Boolean),
     dashboard_origin: config.dashboard_origin ?? "",
   };
 }
 
+function normalizeIssuer(raw: string): string {
+  return raw.trim().replace(/\/+$/, "");
+}
+
 export default function SsoPanel() {
   const { t } = useTranslation();
   const [form] = Form.useForm<SsoFormValues>();
@@ -40,40 +132,85 @@ export default function SsoPanel() {
   const [testing, setTesting] = useState(false);
   const [redirectUri, setRedirectUri] = useState("");
   const [hasClientSecret, setHasClientSecret] = useState(false);
+  const [dirty, setDirty] = useState(false);
+  const [copied, setCopied] = useState(false);
+  const [testResult, setTestResult] = useState<TestResult>(null);
+  const [issuerPlaceholder, setIssuerPlaceholder] = useState(
+    "https://identity.example.com",
+  );
+  const [activePreset, setActivePreset] = useState<IdpPresetId | null>(null);
+  const hydratingRef = useRef(false);
+
+  const enabled = Form.useWatch("enabled", form) ?? false;
+  const displayName = Form.useWatch("display_name", form) ?? "";
+  const issuer = Form.useWatch("issuer", form) ?? "";
+  const clientId = Form.useWatch("client_id", form) ?? "";
+
+  const applyConfig = useCallback(
+    (config: OidcConfig) => {
+      hydratingRef.current = true;
+      form.setFieldsValue(configToFormValues(config));
+      form.setFieldValue("client_secret", undefined);
+      setRedirectUri(config.redirect_uri ?? "");
+      setHasClientSecret(config.has_client_secret);
+      setDirty(false);
+      setTestResult(null);
+      setActivePreset(null);
+      queueMicrotask(() => {
+        hydratingRef.current = false;
+      });
+    },
+    [form],
+  );
 
   const loadConfig = useCallback(async () => {
     setLoading(true);
     try {
       const config = await ssoApi.getOidcConfig();
-      form.setFieldsValue(configToFormValues(config));
-      setRedirectUri(config.redirect_uri ?? "");
-      setHasClientSecret(config.has_client_secret);
+      applyConfig(config);
     } catch (error) {
       message.error(apiErrorMessage(error, t("adminSso.loadFailed"), t));
     } finally {
       setLoading(false);
     }
-  }, [form, t]);
+  }, [applyConfig, t]);
 
   useEffect(() => {
-    void loadConfig();
-  }, [loadConfig]);
+    let cancelled = false;
+    setLoading(true);
+    void (async () => {
+      try {
+        const config = await ssoApi.getOidcConfig();
+        if (cancelled) return;
+        applyConfig(config);
+      } catch (error) {
+        if (cancelled) return;
+        message.error(apiErrorMessage(error, t("adminSso.loadFailed"), t));
+      } finally {
+        if (!cancelled) setLoading(false);
+      }
+    })();
+    return () => {
+      cancelled = true;
+    };
+    // Mount-only load; reload goes through loadConfig().
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
 
   const saveConfig = async (values: SsoFormValues) => {
     setSaving(true);
     try {
       const body: OidcConfigPut = {
-        ...values,
+        enabled: values.enabled,
+        display_name: values.display_name.trim(),
+        issuer: normalizeIssuer(values.issuer),
+        client_id: values.client_id.trim(),
         client_secret: values.client_secret?.trim() || undefined,
+        scopes: values.scopes.join(" "),
         dashboard_origin: values.dashboard_origin?.trim() || null,
       };
       const saved = await ssoApi.putOidcConfig(body);
-      form.setFieldsValue(configToFormValues(saved));
-      form.setFieldValue("client_secret", undefined);
-      setHasClientSecret(saved.has_client_secret);
-      if (saved.redirect_uri) {
-        setRedirectUri(saved.redirect_uri);
-      }
+      applyConfig(saved);
       message.success(t("adminSso.saved"));
     } catch (error) {
       message.error(apiErrorMessage(error, t("adminSso.saveFailed"), t));
@@ -83,146 +220,455 @@ export default function SsoPanel() {
   };
 
   const testConnection = async () => {
+    if (dirty) {
+      message.warning(t("adminSso.testNeedsSave"));
+      return;
+    }
     setTesting(true);
+    setTestResult(null);
     try {
       const result = await ssoApi.testOidcConfig();
-      if (result.ok) {
-        message.success(result.detail || t("adminSso.testSuccess"));
-      } else {
-        message.error(result.detail || t("adminSso.testFailed"));
-      }
+      const detail =
+        result.detail ||
+        (result.ok ? t("adminSso.testSuccess") : t("adminSso.testFailed"));
+      setTestResult({ ok: result.ok, detail });
+      if (result.ok) message.success(detail);
+      else message.error(detail);
     } catch (error) {
-      message.error(apiErrorMessage(error, t("adminSso.testFailed"), t));
+      const detail = apiErrorMessage(error, t("adminSso.testFailed"), t);
+      setTestResult({ ok: false, detail });
+      message.error(detail);
     } finally {
       setTesting(false);
     }
   };
 
   const copyRedirectUri = async () => {
+    if (!redirectUri) return;
     const ok = await copyText(redirectUri);
-    if (ok) message.success(t("adminSso.copySuccess"));
-    else message.error(t("adminSso.copyFailed"));
+    if (ok) {
+      message.success(t("adminSso.copySuccess"));
+      setCopied(true);
+      window.setTimeout(() => setCopied(false), 2000);
+    } else {
+      message.error(t("adminSso.copyFailed"));
+    }
+  };
+
+  const applyPreset = (preset: IdpPreset) => {
+    form.setFieldsValue({
+      display_name: preset.displayName,
+      scopes: preset.scopes,
+    });
+    setIssuerPlaceholder(preset.issuerPlaceholder);
+    setActivePreset(preset.id);
+    setDirty(true);
+    setTestResult(null);
   };
 
+  const guideStep = (() => {
+    if (!issuer.trim() || !clientId.trim()) return 0;
+    if (!redirectUri) return 1;
+    if (dirty) return 2;
+    if (!testResult?.ok) return 3;
+    if (!enabled) return 4;
+    return 5;
+  })();
+
+  const statusLabel = enabled
+    ? t("adminSso.statusEnabled", {
+        name: displayName.trim() || t("adminSso.statusUnnamed"),
+      })
+    : t("adminSso.statusDisabled");
+
   return (
-    <Spin spinning={loading}>
-      <Form<SsoFormValues>
-        form={form}
-        layout="vertical"
-        requiredMark={false}
-        onFinish={(values) => void saveConfig(values)}
-        style={{ maxWidth: 680 }}
-        initialValues={{ enabled: false, scopes: "openid profile email" }}
-      >
-        <Form.Item
-          name="enabled"
-          label={t("adminSso.enabled")}
-          valuePropName="checked"
-          extra={t("adminSso.enabledHint")}
-        >
-          <Switch />
-        </Form.Item>
-        <Form.Item
-          name="display_name"
-          label={t("adminSso.displayName")}
-          rules={[
-            { required: true, message: t("adminSso.displayNameRequired") },
-          ]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          name="issuer"
-          label={t("adminSso.issuer")}
-          extra={t("adminSso.issuerHint")}
-          rules={[
-            {
-              required: true,
-              type: "url",
-              message: t("adminSso.issuerRequired"),
-            },
-          ]}
-        >
-          <Input placeholder="https://identity.example.com" />
-        </Form.Item>
-        <Form.Item
-          name="client_id"
-          label={t("adminSso.clientId")}
-          rules={[{ required: true, message: t("adminSso.clientIdRequired") }]}
-        >
-          <Input autoComplete="off" />
-        </Form.Item>
-        <Form.Item
-          name="client_secret"
-          label={t("adminSso.clientSecret")}
-          extra={
-            hasClientSecret
-              ? t("adminSso.clientSecretConfigured")
-              : t("adminSso.clientSecretHint")
-          }
-        >
-          <Input.Password
-            autoComplete="new-password"
-            placeholder={
-              hasClientSecret
-                ? t("adminSso.clientSecretPlaceholder")
-                : undefined
-            }
-          />
-        </Form.Item>
-        <Form.Item
-          name="scopes"
-          label={t("adminSso.scopes")}
-          rules={[{ required: true, message: t("adminSso.scopesRequired") }]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          name="dashboard_origin"
-          label={t("adminSso.dashboardOrigin")}
-          extra={t("adminSso.dashboardOriginHint")}
-          rules={[
-            { type: "url", message: t("adminSso.dashboardOriginInvalid") },
-          ]}
-        >
-          <Input placeholder="https://octop.example.com" />
-        </Form.Item>
-        <Form.Item
-          label={t("adminSso.redirectUri")}
-          extra={t("adminSso.redirectUriHint")}
-        >
-          <Space.Compact style={{ width: "100%" }}>
-            <Input readOnly value={redirectUri} />
-            <Button
-              icon={<Copy size={15} />}
-              onClick={() => void copyRedirectUri()}
-              aria-label={t("adminSso.copyRedirectUri")}
-            >
-              {t("adminSso.copy")}
-            </Button>
-          </Space.Compact>
-        </Form.Item>
-        <Space>
-          <Button
-            type="primary"
-            htmlType="submit"
-            icon={<Save size={15} />}
-            loading={saving}
+    <div className={styles.ssoPanel}>
+      <TabPanelHeader
+        icon={<KeyRound size={22} />}
+        title={t("adminSso.panelTitle")}
+        description={t("adminSso.panelDesc")}
+        actions={
+          <Tag
+            className={enabled ? styles.ssoStatusTagOn : styles.ssoStatusTagOff}
           >
-            {t("adminSso.save")}
-          </Button>
-          <Button
-            icon={<FlaskConical size={15} />}
-            loading={testing}
-            onClick={() => void testConnection()}
+            <span
+              className={
+                enabled ? styles.ssoStatusDotOn : styles.ssoStatusDotOff
+              }
+            />
+            {statusLabel}
+          </Tag>
+        }
+      />
+
+      <Spin spinning={loading}>
+        <div className={styles.ssoLayout}>
+          <aside className={styles.ssoAside}>
+            <div className={styles.ssoGuide}>
+              <div className={styles.ssoAsideTitle}>
+                {t("adminSso.guideTitle")}
+              </div>
+              <ol className={styles.ssoGuideList}>
+                {GUIDE_STEPS.map((key, index) => {
+                  const done = guideStep > index;
+                  const current = guideStep === index;
+                  return (
+                    <li
+                      key={key}
+                      className={[
+                        styles.ssoGuideItem,
+                        done ? styles.ssoGuideDone : "",
+                        current ? styles.ssoGuideCurrent : "",
+                      ]
+                        .filter(Boolean)
+                        .join(" ")}
+                    >
+                      <span className={styles.ssoGuideIndex} aria-hidden>
+                        {done ? <Check size={12} /> : index + 1}
+                      </span>
+                      <span>{t(key)}</span>
+                    </li>
+                  );
+                })}
+              </ol>
+            </div>
+
+            <div className={styles.ssoAsideCard}>
+              <div className={styles.ssoAsideTitle}>
+                {t("adminSso.loginPreview")}
+              </div>
+              <div
+                className={[
+                  styles.ssoPreviewBtn,
+                  enabled ? "" : styles.ssoPreviewBtnMuted,
+                ]
+                  .filter(Boolean)
+                  .join(" ")}
+              >
+                {t("login.oidcWith", {
+                  name: displayName.trim() || t("adminSso.statusUnnamed"),
+                })}
+              </div>
+              {!enabled && (
+                <p className={styles.ssoPreviewHint}>
+                  {t("adminSso.loginPreviewDisabled")}
+                </p>
+              )}
+            </div>
+
+            <section className={styles.ssoRedirectCard}>
+              <div className={styles.ssoRedirectHeader}>
+                <h4 className={styles.ssoSectionTitle}>
+                  {t("adminSso.redirectUri")}
+                </h4>
+                <p className={styles.ssoSectionHint}>
+                  {t("adminSso.redirectUriHint")}
+                </p>
+              </div>
+              <Space.Compact className={styles.ssoRedirectRow}>
+                <Tooltip title={redirectUri || undefined}>
+                  <Input
+                    readOnly
+                    value={redirectUri}
+                    className={styles.ssoRedirectInput}
+                    placeholder={t("adminSso.redirectUriEmpty")}
+                  />
+                </Tooltip>
+                <Button
+                  type="primary"
+                  icon={copied ? <Check size={15} /> : <Copy size={15} />}
+                  onClick={() => void copyRedirectUri()}
+                  disabled={!redirectUri}
+                  aria-label={t("adminSso.copyRedirectUri")}
+                >
+                  {copied ? t("adminSso.copied") : t("adminSso.copy")}
+                </Button>
+              </Space.Compact>
+              <Typography.Paragraph
+                type="secondary"
+                className={styles.ssoRedirectDocs}
+              >
+                {t("adminSso.redirectUriDocs")}
+              </Typography.Paragraph>
+            </section>
+
+            {testResult && (
+              <Alert
+                className={styles.ssoAlert}
+                type={testResult.ok ? "success" : "error"}
+                showIcon
+                icon={
+                  testResult.ok ? (
+                    <CheckCircle2 size={16} />
+                  ) : (
+                    <XCircle size={16} />
+                  )
+                }
+                message={
+                  testResult.ok
+                    ? t("adminSso.testSuccess")
+                    : t("adminSso.testFailed")
+                }
+                description={testResult.detail}
+                closable
+                onClose={() => setTestResult(null)}
+              />
+            )}
+          </aside>
+
+          <Form<SsoFormValues>
+            form={form}
+            layout="vertical"
+            requiredMark={false}
+            onFinish={(values) => void saveConfig(values)}
+            onValuesChange={() => {
+              if (hydratingRef.current) return;
+              setDirty(true);
+              setTestResult(null);
+            }}
+            initialValues={{
+              enabled: false,
+              scopes: ["openid", "profile", "email"],
+            }}
+            className={styles.ssoForm}
           >
-            {t("adminSso.testConnection")}
-          </Button>
-        </Space>
-        <Typography.Paragraph type="secondary" style={{ marginTop: 16 }}>
-          {t("adminSso.testHint")}
-        </Typography.Paragraph>
-      </Form>
-    </Spin>
+            <section className={styles.ssoSection}>
+              <div className={styles.ssoEnableRow}>
+                <div className={styles.ssoEnableText}>
+                  <div className={styles.ssoSectionTitle}>
+                    {t("adminSso.enabled")}
+                  </div>
+                  <p className={styles.ssoSectionHint}>
+                    {t("adminSso.enabledHint")}
+                  </p>
+                </div>
+                <Form.Item
+                  name="enabled"
+                  valuePropName="checked"
+                  className={styles.ssoEnableSwitch}
+                >
+                  <Switch />
+                </Form.Item>
+              </div>
+            </section>
+
+            <section className={styles.ssoSection}>
+              <div className={styles.ssoSectionHeader}>
+                <h4 className={styles.ssoSectionTitle}>
+                  {t("adminSso.sectionProvider")}
+                </h4>
+                <p className={styles.ssoSectionHint}>
+                  {t("adminSso.sectionProviderHint")}
+                </p>
+              </div>
+
+              <div className={styles.ssoPresets}>
+                <span className={styles.ssoPresetsLabel}>
+                  {t("adminSso.presetsLabel")}
+                </span>
+                <div className={styles.ssoPresetChips}>
+                  {IDP_PRESETS.map((preset) => (
+                    <button
+                      key={preset.id}
+                      type="button"
+                      className={[
+                        styles.ssoPresetChip,
+                        activePreset === preset.id
+                          ? styles.ssoPresetChipActive
+                          : "",
+                      ]
+                        .filter(Boolean)
+                        .join(" ")}
+                      onClick={() => applyPreset(preset)}
+                    >
+                      {t(preset.labelKey)}
+                    </button>
+                  ))}
+                </div>
+              </div>
+
+              <Form.Item
+                name="display_name"
+                label={t("adminSso.displayName")}
+                rules={[
+                  {
+                    required: true,
+                    message: t("adminSso.displayNameRequired"),
+                  },
+                ]}
+              >
+                <Input placeholder={t("adminSso.displayNamePlaceholder")} />
+              </Form.Item>
+              <Form.Item
+                name="issuer"
+                label={t("adminSso.issuer")}
+                extra={t("adminSso.issuerHint")}
+                rules={[
+                  {
+                    required: true,
+                    type: "url",
+                    message: t("adminSso.issuerRequired"),
+                  },
+                ]}
+                getValueFromEvent={(e: ChangeEvent<HTMLInputElement>) =>
+                  e.target.value
+                }
+              >
+                <Input
+                  placeholder={issuerPlaceholder}
+                  onBlur={(e) => {
+                    const next = normalizeIssuer(e.target.value);
+                    if (next !== e.target.value) {
+                      form.setFieldValue("issuer", next);
+                      if (!hydratingRef.current) setDirty(true);
+                    }
+                  }}
+                />
+              </Form.Item>
+            </section>
+
+            <section className={styles.ssoSection}>
+              <div className={styles.ssoSectionHeader}>
+                <h4 className={styles.ssoSectionTitle}>
+                  {t("adminSso.sectionCredentials")}
+                </h4>
+                <p className={styles.ssoSectionHint}>
+                  {t("adminSso.sectionCredentialsHint")}
+                </p>
+              </div>
+              <div className={styles.ssoFieldGrid}>
+                <Form.Item
+                  name="client_id"
+                  label={t("adminSso.clientId")}
+                  rules={[
+                    {
+                      required: true,
+                      message: t("adminSso.clientIdRequired"),
+                    },
+                  ]}
+                >
+                  <Input autoComplete="off" />
+                </Form.Item>
+                <Form.Item
+                  name="client_secret"
+                  label={
+                    <span className={styles.ssoSecretLabel}>
+                      {t("adminSso.clientSecret")}
+                      {hasClientSecret && (
+                        <Tag className={styles.ssoSecretTag}>
+                          <Lock size={11} />
+                          {t("adminSso.clientSecretConfiguredTag")}
+                        </Tag>
+                      )}
+                    </span>
+                  }
+                  extra={
+                    hasClientSecret
+                      ? t("adminSso.clientSecretConfigured")
+                      : t("adminSso.clientSecretHint")
+                  }
+                >
+                  <Input.Password
+                    autoComplete="new-password"
+                    placeholder={
+                      hasClientSecret
+                        ? t("adminSso.clientSecretPlaceholder")
+                        : undefined
+                    }
+                  />
+                </Form.Item>
+              </div>
+              <Form.Item
+                name="scopes"
+                label={t("adminSso.scopes")}
+                rules={[
+                  {
+                    validator: async (_, value: string[] | undefined) => {
+                      if (!value || value.length === 0) {
+                        throw new Error(t("adminSso.scopesRequired"));
+                      }
+                    },
+                  },
+                ]}
+              >
+                <Select
+                  mode="tags"
+                  tokenSeparators={[",", " "]}
+                  options={SCOPE_OPTIONS}
+                  placeholder={t("adminSso.scopesPlaceholder")}
+                />
+              </Form.Item>
+            </section>
+
+            <Collapse
+              ghost
+              className={styles.ssoAdvanced}
+              items={[
+                {
+                  key: "advanced",
+                  label: t("adminSso.sectionAdvanced"),
+                  children: (
+                    <Form.Item
+                      name="dashboard_origin"
+                      label={t("adminSso.dashboardOrigin")}
+                      extra={t("adminSso.dashboardOriginHint")}
+                      rules={[
+                        {
+                          type: "url",
+                          message: t("adminSso.dashboardOriginInvalid"),
+                        },
+                      ]}
+                    >
+                      <Input placeholder="https://octop.example.com" />
+                    </Form.Item>
+                  ),
+                },
+              ]}
+            />
+
+            <div className={styles.ssoFooter}>
+              <div className={styles.ssoFooterActions}>
+                <Button
+                  type="primary"
+                  htmlType="submit"
+                  icon={<Save size={15} />}
+                  loading={saving}
+                >
+                  {t("adminSso.save")}
+                </Button>
+                <Button
+                  icon={<FlaskConical size={15} />}
+                  loading={testing}
+                  disabled={dirty}
+                  onClick={() => void testConnection()}
+                >
+                  {t("adminSso.testConnection")}
+                </Button>
+                {dirty && (
+                  <Button
+                    type="link"
+                    onClick={() => void loadConfig()}
+                    disabled={saving || loading}
+                  >
+                    {t("adminSso.discard")}
+                  </Button>
+                )}
+              </div>
+              <div className={styles.ssoFooterMeta}>
+                {dirty ? (
+                  <span className={styles.ssoDirtyHint}>
+                    {t("adminSso.unsavedChanges")}
+                  </span>
+                ) : (
+                  <span className={styles.ssoTestHint}>
+                    {t("adminSso.testHint")}
+                  </span>
+                )}
+              </div>
+            </div>
+          </Form>
+        </div>
+      </Spin>
+    </div>
   );
 }
diff --git a/dashboard/src/pages/Admin/Users/UsersListPanel.tsx b/dashboard/src/pages/Admin/Users/UsersListPanel.tsx
index f88c9d60..0129127a 100644
--- a/dashboard/src/pages/Admin/Users/UsersListPanel.tsx
+++ b/dashboard/src/pages/Admin/Users/UsersListPanel.tsx
@@ -2,7 +2,7 @@
  * Admin → Users page (plan §14.7).
  *
  * List all users with role/disabled toggles, password reset, delete.
- * Card and table views; default is card on mobile, table on desktop. The view switcher + refresh +
+ * Card and table views (default table). The view switcher + refresh +
  * new-user buttons live in a content-area toolbar (mirrors the Experts
  * page layout). Each row/card shows agent count; click opens a drawer
  * with that user's agents.
diff --git a/dashboard/src/pages/Admin/Users/index.module.less b/dashboard/src/pages/Admin/Users/index.module.less
index f31958f3..8e5fa8d2 100644
--- a/dashboard/src/pages/Admin/Users/index.module.less
+++ b/dashboard/src/pages/Admin/Users/index.module.less
@@ -993,3 +993,441 @@
   gap: 2px;
   font-size: 12px;
 }
+
+/* ── SSO panel ──────────────────────────────────────────────────── */
+
+.ssoPanel {
+  width: 100%;
+  min-width: 0;
+  padding-bottom: 88px;
+}
+
+.ssoLayout {
+  display: grid;
+  grid-template-columns: 1fr;
+  gap: 16px;
+  align-items: start;
+
+  @media (min-width: 1100px) {
+    grid-template-columns: minmax(0, 1fr) minmax(300px, 360px);
+    gap: 24px;
+  }
+}
+
+.ssoAside {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  min-width: 0;
+  order: -1;
+
+  @media (min-width: 1100px) {
+    order: 0;
+    position: sticky;
+    top: 8px;
+    /* Place aside in the second column */
+    grid-column: 2;
+    grid-row: 1;
+  }
+}
+
+.ssoForm {
+  min-width: 0;
+
+  @media (min-width: 1100px) {
+    grid-column: 1;
+    grid-row: 1;
+  }
+
+  :global(.ant-form-item) {
+    margin-bottom: 16px;
+  }
+
+  :global(.ant-form-item-label > label) {
+    color: var(--fn-text-secondary);
+    font-weight: 500;
+  }
+}
+
+.ssoAsideTitle {
+  margin: 0 0 10px;
+  font-size: 13px;
+  font-weight: 600;
+  color: var(--fn-text-primary);
+}
+
+.ssoAsideCard {
+  padding: 14px 16px;
+  border: 1px solid var(--fn-border-primary);
+  border-radius: var(--fn-radius-lg, 12px);
+  background: var(--fn-bg-primary);
+}
+
+.ssoFieldGrid {
+  display: grid;
+  grid-template-columns: 1fr;
+  gap: 0 16px;
+
+  @media (min-width: 720px) {
+    grid-template-columns: 1fr 1fr;
+  }
+}
+
+.ssoStatusTagOn,
+.ssoStatusTagOff {
+  display: inline-flex !important;
+  align-items: center;
+  gap: 6px;
+  margin: 0 !important;
+  padding: 2px 10px !important;
+  border-radius: 999px !important;
+  font-size: 12px !important;
+  font-weight: 500 !important;
+  line-height: 1.5 !important;
+  border: 1px solid transparent !important;
+}
+
+.ssoStatusTagOn {
+  color: var(--fn-color-brand) !important;
+  background: var(--fn-color-brand-bg) !important;
+  border-color: var(
+    --fn-color-brand-border,
+    color-mix(in srgb, var(--fn-color-brand) 28%, transparent)
+  ) !important;
+}
+
+.ssoStatusTagOff {
+  color: var(--fn-text-tertiary) !important;
+  background: var(--fn-bg-container, rgba(0, 0, 0, 0.04)) !important;
+  border-color: var(--fn-border-primary) !important;
+}
+
+.ssoStatusDotOn,
+.ssoStatusDotOff {
+  width: 6px;
+  height: 6px;
+  border-radius: 50%;
+  flex-shrink: 0;
+}
+
+.ssoStatusDotOn {
+  background: var(--fn-color-brand);
+}
+
+.ssoStatusDotOff {
+  background: var(--fn-text-tertiary);
+}
+
+.ssoGuide {
+  margin: 0;
+  padding: 14px 16px;
+  border: 1px solid var(--fn-border-secondary);
+  border-radius: var(--fn-radius-lg, 12px);
+  background: var(--fn-bg-secondary, var(--fn-bg-elevated));
+}
+
+.ssoGuideList {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+
+.ssoGuideItem {
+  display: flex;
+  align-items: flex-start;
+  gap: 8px;
+  font-size: 12px;
+  line-height: 1.45;
+  color: var(--fn-text-tertiary);
+}
+
+.ssoGuideCurrent {
+  color: var(--fn-text-primary);
+  font-weight: 500;
+}
+
+.ssoGuideDone {
+  color: var(--fn-text-secondary);
+}
+
+.ssoGuideIndex {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 18px;
+  height: 18px;
+  border-radius: 50%;
+  flex-shrink: 0;
+  font-size: 11px;
+  font-weight: 600;
+  font-variant-numeric: tabular-nums;
+  background: var(--fn-bg-container, rgba(0, 0, 0, 0.04));
+  color: inherit;
+}
+
+.ssoGuideDone .ssoGuideIndex {
+  color: var(--fn-color-brand);
+  background: var(--fn-color-brand-bg);
+}
+
+.ssoGuideCurrent .ssoGuideIndex {
+  color: #fff;
+  background: var(--fn-color-brand);
+}
+
+.ssoAlert {
+  margin: 0;
+}
+
+.ssoSection {
+  margin-bottom: 16px;
+  padding: 16px 18px;
+  border: 1px solid var(--fn-border-primary);
+  border-radius: var(--fn-radius-lg, 12px);
+  background: var(--fn-bg-primary);
+}
+
+.ssoSectionHeader {
+  margin-bottom: 14px;
+}
+
+.ssoSectionTitle {
+  margin: 0;
+  font-size: 14px;
+  font-weight: 600;
+  line-height: 1.4;
+  color: var(--fn-text-primary);
+}
+
+.ssoSectionHint {
+  margin: 4px 0 0;
+  font-size: 12px;
+  line-height: 1.5;
+  color: var(--fn-text-tertiary);
+}
+
+.ssoEnableRow {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 16px;
+}
+
+.ssoEnableText {
+  flex: 1;
+  min-width: 0;
+}
+
+.ssoEnableSwitch {
+  margin: 0 !important;
+  flex-shrink: 0;
+}
+
+.ssoPreviewBtn {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 40px;
+  padding: 0 12px;
+  border: 1px solid var(--fn-border-primary);
+  border-radius: 10px;
+  background: var(--fn-bg-elevated, var(--fn-bg-secondary));
+  color: var(--fn-text-primary);
+  font-size: 13px;
+  font-weight: 500;
+  text-align: center;
+  pointer-events: none;
+  user-select: none;
+}
+
+.ssoPreviewBtnMuted {
+  opacity: 0.55;
+}
+
+.ssoPreviewHint {
+  margin: 6px 0 0;
+  font-size: 12px;
+  color: var(--fn-text-tertiary);
+}
+
+.ssoPresets {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  margin-bottom: 14px;
+}
+
+.ssoPresetsLabel {
+  font-size: 12px;
+  font-weight: 500;
+  color: var(--fn-text-tertiary);
+}
+
+.ssoPresetChips {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+.ssoPresetChip {
+  display: inline-flex;
+  align-items: center;
+  height: 28px;
+  padding: 0 10px;
+  border: 1px solid var(--fn-border-primary);
+  border-radius: 999px;
+  background: var(--fn-bg-elevated, var(--fn-bg-primary));
+  color: var(--fn-text-secondary);
+  font-size: 12px;
+  font-weight: 500;
+  cursor: pointer;
+  transition:
+    border-color 0.15s ease,
+    background 0.15s ease,
+    color 0.15s ease;
+
+  &:hover {
+    border-color: var(--fn-border-strong, var(--fn-border-primary));
+    color: var(--fn-text-primary);
+  }
+}
+
+.ssoPresetChipActive {
+  border-color: var(
+    --fn-color-brand-border,
+    color-mix(in srgb, var(--fn-color-brand) 45%, transparent)
+  );
+  background: var(--fn-color-brand-bg);
+  color: var(--fn-color-brand);
+}
+
+.ssoSecretLabel {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.ssoSecretTag {
+  display: inline-flex !important;
+  align-items: center;
+  gap: 4px;
+  margin: 0 !important;
+  padding: 0 6px !important;
+  border: none !important;
+  border-radius: 4px !important;
+  font-size: 11px !important;
+  line-height: 18px !important;
+  color: var(--fn-color-brand) !important;
+  background: var(--fn-color-brand-bg) !important;
+}
+
+.ssoAdvanced {
+  margin-bottom: 16px;
+
+  :global(.ant-collapse-header) {
+    padding: 10px 4px !important;
+    font-size: 13px;
+    font-weight: 600;
+    color: var(--fn-text-secondary) !important;
+  }
+
+  :global(.ant-collapse-content-box) {
+    padding: 0 4px 4px !important;
+  }
+}
+
+.ssoRedirectCard {
+  margin: 0;
+  padding: 14px 16px;
+  border: 1px solid
+    var(
+      --fn-color-brand-border,
+      color-mix(in srgb, var(--fn-color-brand) 28%, transparent)
+    );
+  border-radius: var(--fn-radius-lg, 12px);
+  background: var(
+    --fn-color-brand-bg,
+    color-mix(in srgb, var(--fn-color-brand) 6%, transparent)
+  );
+}
+
+.ssoRedirectHeader {
+  margin-bottom: 12px;
+}
+
+.ssoRedirectRow {
+  width: 100%;
+}
+
+.ssoRedirectInput {
+  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
+  font-size: 12px;
+}
+
+.ssoRedirectDocs {
+  margin: 10px 0 0 !important;
+  font-size: 12px !important;
+  line-height: 1.5;
+}
+
+.ssoFooter {
+  position: sticky;
+  bottom: 0;
+  z-index: 2;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-between;
+  gap: 10px 16px;
+  margin-top: 8px;
+  padding: 14px 0 4px;
+  border-top: 1px solid var(--fn-border-primary);
+  background: linear-gradient(
+    to top,
+    var(--fn-bg-primary) 70%,
+    color-mix(in srgb, var(--fn-bg-primary) 80%, transparent)
+  );
+}
+
+.ssoFooterActions {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 8px;
+}
+
+.ssoFooterMeta {
+  flex: 1;
+  min-width: 0;
+  font-size: 12px;
+  line-height: 1.5;
+}
+
+.ssoDirtyHint {
+  color: #d48806;
+}
+
+.ssoTestHint {
+  color: var(--fn-text-tertiary);
+}
+
+@media (max-width: 640px) {
+  .ssoPanel {
+    padding-bottom: 24px;
+  }
+
+  .ssoEnableRow {
+    flex-direction: column;
+    align-items: stretch;
+  }
+
+  .ssoFooter {
+    position: static;
+    flex-direction: column;
+    align-items: stretch;
+  }
+}
diff --git a/dashboard/src/pages/Agent/ACP/index.tsx b/dashboard/src/pages/Agent/ACP/index.tsx
index 15dca3fb..5a47beee 100644
--- a/dashboard/src/pages/Agent/ACP/index.tsx
+++ b/dashboard/src/pages/Agent/ACP/index.tsx
@@ -1,6 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { Button, Empty, Form, Modal, Switch } from "antd";
-import { message } from "@/utils/antdMessage";
+import { App, Button, Empty, Form, Switch } from "antd";
 
 import { useTranslation } from "react-i18next";
 import PageShell from "../../../layouts/PageShell";
@@ -25,6 +24,7 @@ const EMPTY_RUNNERS: Record<string, ACPRunnerConfig> = {};
 
 export default function ACPPage() {
   const { t } = useTranslation();
+  const { modal, message } = App.useApp();
   const { activeAgentId } = useAgent();
   const [runners, setRunners] =
     useState<Record<string, ACPRunnerConfig>>(EMPTY_RUNNERS);
@@ -232,7 +232,7 @@ export default function ACPPage() {
 
   const handleDelete = () => {
     if (!activeKey || isBuiltinRunner(activeKey)) return;
-    Modal.confirm({
+    modal.confirm({
       title: t("acp.deleteTitle", { name: activeKey }),
       content: t("acp.deleteConfirm"),
       okText: t("common.delete"),
diff --git a/dashboard/src/pages/Agent/Channels/ChannelsPanel.tsx b/dashboard/src/pages/Agent/Channels/ChannelsPanel.tsx
index de4c6d09..895ad5a0 100644
--- a/dashboard/src/pages/Agent/Channels/ChannelsPanel.tsx
+++ b/dashboard/src/pages/Agent/Channels/ChannelsPanel.tsx
@@ -199,10 +199,7 @@ export default function ChannelsPanel({ agentId }: ChannelsPanelProps) {
         const next: ChannelFormValues = {
           kind: row.kind as ChannelKey,
           enabled: row.enabled,
-          response_mode:
-            cfg.response_mode === "stream"
-              ? "stream"
-              : DEFAULT_CHANNEL_DISPLAY_CONFIG.response_mode,
+          response_mode: cfg.response_mode === "stream" ? "stream" : "invoke",
           show_thinking:
             typeof cfg.show_thinking === "boolean"
               ? cfg.show_thinking
@@ -240,6 +237,14 @@ export default function ChannelsPanel({ agentId }: ChannelsPanelProps) {
     setDrawerInitialValues(undefined);
   }, []);
 
+  const handleProvisioned = useCallback(() => {
+    message.success(t("channels.dingtalkBindSuccess"));
+    setDrawerOpen(false);
+    setEditing(null);
+    setDrawerInitialValues(undefined);
+    void fetchChannels();
+  }, [fetchChannels, t]);
+
   const handleSubmit = useCallback(
     async (
       kind: ChannelKey,
@@ -435,6 +440,7 @@ export default function ChannelsPanel({ agentId }: ChannelsPanelProps) {
         onDelete={editing ? handleDeleteFromDrawer : undefined}
         onClose={handleDrawerClose}
         onSubmit={handleSubmit}
+        onProvisioned={handleProvisioned}
         onTest={handleTestFromDrawer}
         testing={
           testState.loadingKey !== null &&
diff --git a/dashboard/src/pages/Agent/Channels/components/ChannelDrawer.tsx b/dashboard/src/pages/Agent/Channels/components/ChannelDrawer.tsx
index 1aa24bd3..444b8e67 100644
--- a/dashboard/src/pages/Agent/Channels/components/ChannelDrawer.tsx
+++ b/dashboard/src/pages/Agent/Channels/components/ChannelDrawer.tsx
@@ -87,6 +87,7 @@ const QUICK_CONFIG_CHANNELS: ChannelKey[] = [
   "qq",
   "wecom",
   "weixin",
+  "dingtalk",
   "feishu",
   "yuanbao",
 ];
@@ -114,6 +115,12 @@ type QrPhase =
       token: string;
       baseUrl: string;
     }
+  | {
+      phase: "dingtalk_ready";
+      qrcodeUrl: string;
+      userCode: string;
+    }
+  | { phase: "dingtalk_success"; channelId: string }
   | { phase: "feishu_creating"; message: string }
   | { phase: "feishu_qr"; qrToken: string }
   | { phase: "feishu_progress"; message: string }
@@ -146,6 +153,7 @@ interface ChannelDrawerProps {
     config: Record<string, unknown>,
     enabled: boolean,
   ) => Promise<boolean>;
+  onProvisioned: () => void;
   onTest?: () => void;
   testing?: boolean;
   agentId: string;
@@ -456,6 +464,7 @@ export function ChannelDrawer({
   deleting,
   onClose,
   onSubmit,
+  onProvisioned,
   onTest,
   testing,
   agentId,
@@ -641,6 +650,61 @@ export function ChannelDrawer({
     }
   }, [agentId, stopPolling]);
 
+  // ── DingTalk Flow ───────────────────────────────────────────────────────
+  const startDingtalkQr = useCallback(async () => {
+    setQrState({ phase: "loading" });
+    try {
+      const res = await channelApi.dingtalkQrcodeGenerate(agentId);
+      setQrState({
+        phase: "dingtalk_ready",
+        qrcodeUrl: res.qrcode_url,
+        userCode: res.user_code,
+      });
+      let polling = false;
+      const timer = setInterval(
+        async () => {
+          if (polling) return;
+          polling = true;
+          try {
+            const poll = await channelApi.dingtalkQrcodePoll(
+              agentId,
+              res.registration_id,
+            );
+            if (poll.status === "success" && poll.channel_id) {
+              stopPolling();
+              setQrState({
+                phase: "dingtalk_success",
+                channelId: poll.channel_id,
+              });
+              onProvisioned();
+            } else if (poll.status === "failed" || poll.status === "expired") {
+              stopPolling();
+              setQrState({
+                phase: "error",
+                reason:
+                  poll.message ??
+                  (poll.status === "expired"
+                    ? t("channels.dingtalkQrExpired")
+                    : t("channels.dingtalkQrFailed")),
+              });
+            }
+          } catch {
+            // Transient network error: keep polling until DingTalk expires the flow.
+          } finally {
+            polling = false;
+          }
+        },
+        Math.max(1000, res.interval * 1000),
+      );
+      pollTimerRef.current = timer;
+    } catch (e: unknown) {
+      setQrState({
+        phase: "error",
+        reason: e instanceof Error ? e.message : String(e),
+      });
+    }
+  }, [agentId, onProvisioned, stopPolling, t]);
+
   // ── Feishu Flow ─────────────────────────────────────────────────────────
   const startFeishuCreator = useCallback(
     async (platform: "feishu" | "lark" = "feishu") => {
@@ -1354,6 +1418,105 @@ export function ChannelDrawer({
     );
   }
 
+  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 === "dingtalk_success") {
+      return (
+        <div className={styles.qrPanel}>
+          <Alert
+            type="success"
+            message={t("channels.dingtalkBindSuccess")}
+            style={{ width: "100%" }}
+          />
+        </div>
+      );
+    }
+    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>
+          <div className={styles.qrCardWrap}>
+            <div className={styles.qrFrame}>
+              <QRCodeSVG value={s.qrcodeUrl} size={200} />
+            </div>
+          </div>
+          <p className={styles.qrScanHint}>
+            {t("channels.dingtalkQrScanHint")}
+          </p>
+          <p className={styles.qrScanHint}>
+            {t("channels.dingtalkUserCode")}: <code>{s.userCode}</code>
+          </p>
+          <Button size="small" onClick={resetQr} style={{ marginTop: 4 }}>
+            {t("channels.qrRegenerate")}
+          </Button>
+        </div>
+      );
+    }
+    if (s.phase === "error") {
+      return (
+        <div className={styles.qrPanel}>
+          <Alert
+            type="error"
+            message={s.reason}
+            style={{ width: "100%", marginBottom: 12 }}
+          />
+          <Button onClick={() => void startDingtalkQr()}>
+            {t("channels.qrRetryBtn")}
+          </Button>
+        </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>
+    );
+  }
+
   function renderFeishuPanel() {
     const s = qrState;
     if (s.phase === "feishu_creating" || s.phase === "feishu_progress") {
@@ -1591,7 +1754,11 @@ export function ChannelDrawer({
               style={{ width: 22, height: 22 }}
             />
           )}
-          <span>{isEdit ? `${kindLabel} 频道设置` : "新建频道"}</span>
+          <span>
+            {isEdit
+              ? `${kindLabel} ${t("channels.channelSettings")}`
+              : t("channels.createChannel")}
+          </span>
         </div>
       }
       open={open}
@@ -1681,6 +1848,7 @@ export function ChannelDrawer({
                 {selectedKind === "qq" && renderQqPanel()}
                 {selectedKind === "wecom" && renderWecomPanel()}
                 {selectedKind === "weixin" && renderWeixinPanel()}
+                {selectedKind === "dingtalk" && renderDingtalkPanel()}
                 {selectedKind === "feishu" && renderFeishuPanel()}
                 {selectedKind === "yuanbao" && renderYuanbaoPanel()}
               </>
@@ -1709,7 +1877,7 @@ export function ChannelDrawer({
 
               <Form.Item
                 name="kind"
-                label="频道类型"
+                label={t("channels.channelType")}
                 rules={[{ required: true }]}
               >
                 <Select
diff --git a/dashboard/src/pages/Agent/Channels/components/constants.test.ts b/dashboard/src/pages/Agent/Channels/components/constants.test.ts
index 7eb71ee4..98a9348d 100644
--- a/dashboard/src/pages/Agent/Channels/components/constants.test.ts
+++ b/dashboard/src/pages/Agent/Channels/components/constants.test.ts
@@ -7,8 +7,8 @@ import {
 } from "./constants";
 
 describe("channel display defaults", () => {
-  it("uses invoke delivery for external IM channels", () => {
-    expect(DEFAULT_CHANNEL_DISPLAY_CONFIG.response_mode).toBe("invoke");
+  it("uses stream delivery for new external IM channels", () => {
+    expect(DEFAULT_CHANNEL_DISPLAY_CONFIG.response_mode).toBe("stream");
   });
 });
 
diff --git a/dashboard/src/pages/Agent/Channels/components/constants.ts b/dashboard/src/pages/Agent/Channels/components/constants.ts
index e40f4a4c..1b780592 100644
--- a/dashboard/src/pages/Agent/Channels/components/constants.ts
+++ b/dashboard/src/pages/Agent/Channels/components/constants.ts
@@ -371,7 +371,7 @@ export const CHANNEL_DISPLAY_CONFIG_KEYS = [
 
 /** Default per-channel display settings (harness-gateway ChannelConfig). */
 export const DEFAULT_CHANNEL_DISPLAY_CONFIG = {
-  response_mode: "invoke" as const,
+  response_mode: "stream" as const,
   show_thinking: false,
   show_tool_hints: false,
 } as const;
diff --git a/dashboard/src/pages/Agent/Connectors/ConnectorInstanceCard.tsx b/dashboard/src/pages/Agent/Connectors/ConnectorInstanceCard.tsx
index c86b3475..9ed6cba7 100644
--- a/dashboard/src/pages/Agent/Connectors/ConnectorInstanceCard.tsx
+++ b/dashboard/src/pages/Agent/Connectors/ConnectorInstanceCard.tsx
@@ -1,5 +1,4 @@
-import { Button, Modal } from "antd";
-import { message } from "@/utils/antdMessage";
+import { App, Button } from "antd";
 
 import { Activity, Trash2 } from "lucide-react";
 import { useTranslation } from "react-i18next";
@@ -24,6 +23,7 @@ export function ConnectorInstanceCard({
   onDeleted,
 }: ConnectorInstanceCardProps) {
   const { t } = useTranslation();
+  const { modal, message } = App.useApp();
   const accent = catalogEntry ? connectorAccent(catalogEntry) : "#8c8c8c";
 
   const handleTest = async () => {
@@ -38,7 +38,7 @@ export function ConnectorInstanceCard({
   };
 
   const handleDelete = () => {
-    Modal.confirm({
+    modal.confirm({
       title: t("connectors.deleteConfirm", { name: instance.display_name }),
       okText: t("common.delete"),
       okButtonProps: { danger: true },
diff --git a/dashboard/src/pages/Agent/Connectors/CustomMcpServerCard.tsx b/dashboard/src/pages/Agent/Connectors/CustomMcpServerCard.tsx
index 0be341b7..d17a9bdb 100644
--- a/dashboard/src/pages/Agent/Connectors/CustomMcpServerCard.tsx
+++ b/dashboard/src/pages/Agent/Connectors/CustomMcpServerCard.tsx
@@ -1,5 +1,5 @@
 import type { CSSProperties } from "react";
-import { Alert, Button, Input, Modal, Select, Switch } from "antd";
+import { Alert, App, Button, Input, Select, Switch } from "antd";
 import {
   Activity,
   Cable,
@@ -21,25 +21,34 @@ import styles from "./index.module.less";
 interface CustomMcpServerCardProps {
   card: ServerCardState;
   probing: boolean;
+  authorizing?: boolean;
+  oauthAvailable?: boolean;
   probeTools?: { name: string; description: string }[];
   transportOptions: { value: string; label: string }[];
   onUpdate: (key: string, patch: Partial<ServerCardState>) => void;
   onToggleEnabled: (enabled: boolean) => void;
-  onRemove: () => void;
+  onRemove: () => void | Promise<void>;
   onProbe: () => void;
+  onAuthorize?: () => void;
+  onDefaultOpenChange?: (defaultOpen: boolean) => void;
 }
 
 export function CustomMcpServerCard({
   card,
   probing,
+  authorizing = false,
+  oauthAvailable = false,
   probeTools,
   transportOptions,
   onUpdate,
   onToggleEnabled,
   onRemove,
   onProbe,
+  onAuthorize,
+  onDefaultOpenChange,
 }: CustomMcpServerCardProps) {
   const { t } = useTranslation();
+  const { modal } = App.useApp();
   const isHttp = card.transport === "streamable_http";
   const label = friendlyServerLabel(card);
   const accent = accentForServerName(card.name.trim() || label);
@@ -56,27 +65,43 @@ export function CustomMcpServerCard({
         .join(" ") || "npx / uvx / python";
 
   const handleRemove = () => {
-    Modal.confirm({
+    modal.confirm({
       title: t("connectors.customMcp.deleteConfirm", {
         name: label,
         defaultValue: `确定删除 MCP 服务器「${label}」？`,
       }),
       content: t(
         "connectors.customMcp.deleteConfirmHint",
-        "删除后需点击保存才会生效。",
+        "已保存的服务器将立即删除；尚未保存的配置只会从当前编辑中移除。",
       ),
       okText: t("common.delete"),
       okButtonProps: { danger: true },
       cancelText: t("common.cancel"),
-      onOk: onRemove,
+      onOk: () => Promise.resolve(onRemove()),
     });
   };
 
+  const authPending = isHttp && oauthAvailable && !card.oauthConfigured;
+  const effectiveEnabled = !authPending && card.enabled;
+  const showOAuthConnectLink =
+    isHttp && card.collapsed && authPending && onAuthorize;
+  const connectLabel = t("connectors.clickToConnect", "点击连接");
+
+  const handleConnectClick = () => {
+    if (oauthAvailable && onAuthorize) {
+      onAuthorize();
+    }
+  };
+
   return (
     <div
       className={`${styles.customMcpServerCard}${
         card.collapsed ? "" : ` ${styles.customMcpServerCardOpen}`
-      }${card.enabled ? "" : ` ${styles.customMcpServerCardDisabled}`}`}
+      }${
+        card.enabled && !authPending
+          ? ""
+          : ` ${styles.customMcpServerCardDisabled}`
+      }`}
       style={
         {
           "--mcp-accent": accent,
@@ -111,11 +136,17 @@ export function CustomMcpServerCard({
           </div>
         </div>
         <div className={styles.customMcpServerControls}>
-          <Switch
-            checked={card.enabled}
-            onChange={onToggleEnabled}
-            size="small"
-          />
+          <div className={styles.customMcpEnableControl}>
+            <span className={styles.customMcpEnableLabel}>
+              {t("connectors.customMcp.enable", "启用连接器")}
+            </span>
+            <Switch
+              checked={authPending ? false : card.enabled}
+              disabled={authPending}
+              onChange={onToggleEnabled}
+              size="small"
+            />
+          </div>
           <Button
             type="text"
             size="small"
@@ -138,6 +169,21 @@ export function CustomMcpServerCard({
         </div>
       </div>
 
+      {showOAuthConnectLink ? (
+        <div className={styles.customMcpCardFooter}>
+          <button
+            type="button"
+            className={styles.customMcpConnectLink}
+            onClick={handleConnectClick}
+            disabled={authorizing}
+          >
+            {authorizing
+              ? t("connectors.customMcp.authorizing", "授权中…")
+              : connectLabel}
+          </button>
+        </div>
+      ) : null}
+
       {!card.collapsed ? (
         <div className={styles.customMcpCardBody}>
           <div className={styles.customMcpField}>
@@ -262,46 +308,100 @@ export function CustomMcpServerCard({
           )}
 
           <div className={styles.customMcpField}>
-            <label>{t("connectors.defaultOpen", "是否默认打开")}</label>
+            <label>
+              {t("connectors.customMcp.defaultOpen", "对话默认选中")}
+            </label>
             <div className={styles.customMcpDefaultOpenRow}>
               <Switch
                 checked={card.defaultOpen}
-                onChange={(checked) =>
-                  onUpdate(card.key, { defaultOpen: checked })
-                }
+                disabled={!effectiveEnabled}
+                onChange={(checked) => {
+                  if (onDefaultOpenChange) {
+                    onDefaultOpenChange(checked);
+                    return;
+                  }
+                  onUpdate(card.key, { defaultOpen: checked });
+                }}
               />
-              {!card.defaultOpen ? (
+              {!effectiveEnabled ? (
                 <span className={styles.customMcpFieldHint}>
                   {t(
-                    "connectors.defaultOpenHint",
-                    "关闭时需在对话中手动勾选才会注入工具。",
+                    "connectors.customMcp.defaultOpenRequiresEnable",
+                    "需先启用连接器。",
+                  )}
+                </span>
+              ) : !card.defaultOpen ? (
+                <span className={styles.customMcpFieldHint}>
+                  {t(
+                    "connectors.customMcp.defaultOpenHint",
+                    "开启后，你的 Dashboard、IM 与 Cron（未手动选连接器时）会默认带上此 MCP。",
                   )}
                 </span>
               ) : null}
             </div>
-            {card.defaultOpen ? (
+            {effectiveEnabled && card.defaultOpen ? (
               <Alert
                 type="warning"
                 showIcon
                 message={t(
                   "connectors.defaultOpenWarning",
-                  "开启后默认会在 Dashboard、IM 与 Cron（未特殊选连接器时）携带该工具（额外消耗 token）。Dashboard 可关本轮；Cron 若显式选择连接器则以选择为准。",
+                  "开启后默认会在你的 Dashboard、IM 与 Cron（未特殊选连接器时）携带该工具（额外消耗 token）。Dashboard 可关本轮；Cron 若显式选择连接器则以选择为准。",
                 )}
               />
             ) : null}
           </div>
 
-          <div className={styles.customMcpCardActions}>
-            <Button
-              icon={<Activity size={14} />}
-              loading={probing}
-              onClick={onProbe}
-            >
-              {t("connectors.probe", "探测")}
-            </Button>
-          </div>
+          {isHttp && card.oauthConfigured ? (
+            <Alert
+              type="success"
+              showIcon
+              message={t(
+                "connectors.customMcp.oauthConfigured",
+                "已完成 OAuth 授权",
+              )}
+            />
+          ) : null}
+
+          {isHttp && oauthAvailable && !card.oauthConfigured ? (
+            <Alert
+              type="warning"
+              showIcon
+              message={t(
+                "connectors.customMcp.probeNeedsOAuth",
+                "此 MCP 需要 OAuth 授权才能访问",
+              )}
+              description={t(
+                "connectors.customMcp.oauthAuthorizeHint",
+                "点击「一键授权」完成登录；完成后我们会自动再次验证连接。",
+              )}
+              action={
+                onAuthorize ? (
+                  <Button
+                    size="small"
+                    type="primary"
+                    loading={authorizing}
+                    onClick={onAuthorize}
+                  >
+                    {t("connectors.oneClickOAuth", "一键授权")}
+                  </Button>
+                ) : undefined
+              }
+            />
+          ) : null}
+
+          {isHttp ? (
+            <div className={styles.customMcpCardActions}>
+              <Button
+                icon={<Activity size={14} />}
+                loading={probing}
+                onClick={onProbe}
+              >
+                {t("connectors.probe", "探测")}
+              </Button>
+            </div>
+          ) : null}
 
-          {probeTools !== undefined ? (
+          {isHttp && probeTools !== undefined ? (
             <div className={styles.probeResult}>
               <div className={styles.probeResultHeader}>
                 <CheckCircle2
diff --git a/dashboard/src/pages/Agent/Connectors/CustomMcpTab.tsx b/dashboard/src/pages/Agent/Connectors/CustomMcpTab.tsx
index 8a19d2d0..75fe9b6d 100644
--- a/dashboard/src/pages/Agent/Connectors/CustomMcpTab.tsx
+++ b/dashboard/src/pages/Agent/Connectors/CustomMcpTab.tsx
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
-import { Button, Input, Segmented, Spin } from "antd";
+import { Button, Checkbox, Input, Segmented, Spin } from "antd";
 import { message } from "@/utils/antdMessage";
 
 import { Globe, Plus, Terminal } from "lucide-react";
@@ -7,7 +7,7 @@ import { useTranslation } from "react-i18next";
 
 import {
   connectorsApi,
-  type CustomMcpServerSpec,
+  type ConnectorProbeResult,
   type CustomMcpServers,
   type CustomMcpTransport,
 } from "../../../api/modules/connectors";
@@ -15,9 +15,13 @@ import { apiErrorMessage } from "../../../utils/apiError";
 import { CustomMcpServerCard } from "./CustomMcpServerCard";
 import {
   EXAMPLE_JSON,
+  PROBE_ON_SAVE_KEY,
   cardsToServers,
+  hasHttpProbeTargets,
+  mergeCustomMcpCards,
   newCard,
   notifyConnectorsChanged,
+  oauthHintsFromServers,
   serversToCards,
   type EditorMode,
   type ServerCardState,
@@ -36,15 +40,39 @@ export function CustomMcpTab() {
   const [cards, setCards] = useState<ServerCardState[]>([]);
   const [jsonText, setJsonText] = useState("{}");
   const [jsonError, setJsonError] = useState<string | null>(null);
+  const [probeOnSave, setProbeOnSave] = useState(
+    () => localStorage.getItem(PROBE_ON_SAVE_KEY) === "1",
+  );
+  const [oauthAvailable, setOauthAvailable] = useState<Record<string, boolean>>(
+    {},
+  );
+  const [authorizingKey, setAuthorizingKey] = useState<string | null>(null);
+  const [persistedNames, setPersistedNames] = useState<Set<string>>(
+    () => new Set(),
+  );
+
+  useEffect(() => {
+    localStorage.setItem(PROBE_ON_SAVE_KEY, probeOnSave ? "1" : "0");
+  }, [probeOnSave]);
+
+  const applySavedServers = (
+    servers: CustomMcpServers,
+    prevCards: ServerCardState[],
+  ) => {
+    const nextCards = mergeCustomMcpCards(servers, prevCards);
+    setCards(nextCards);
+    setPersistedNames(new Set(Object.keys(servers)));
+    setJsonText(JSON.stringify(servers, null, 2));
+    setOauthAvailable(oauthHintsFromServers(servers, nextCards));
+    return nextCards;
+  };
 
   const load = useCallback(async () => {
     setLoading(true);
     try {
       const { servers } = await connectorsApi.getCustomMcp();
-      const nextCards = serversToCards(servers);
-      setCards(nextCards);
+      applySavedServers(servers, []);
       setProbeResults({});
-      setJsonText(JSON.stringify(servers, null, 2));
       setJsonError(null);
     } catch (e) {
       console.error(e);
@@ -64,6 +92,35 @@ export function CustomMcpTab() {
     void load();
   }, [load]);
 
+  const persistServerPatch = async (
+    card: ServerCardState,
+    apiPatch: { enabled?: boolean; default_open?: boolean },
+    localPatch: Partial<ServerCardState>,
+  ) => {
+    const optimisticCards = cards.map((item) =>
+      item.key === card.key ? { ...item, ...localPatch } : item,
+    );
+    updateCard(card.key, localPatch);
+    const name = card.name.trim();
+    if (!name || !persistedNames.has(name)) {
+      return;
+    }
+    try {
+      const { servers } = await connectorsApi.patchCustomMcpServer(
+        name,
+        apiPatch,
+      );
+      applySavedServers(servers, optimisticCards);
+      notifyConnectorsChanged();
+    } catch (e) {
+      console.error(e);
+      message.error(
+        apiErrorMessage(e, t("connectors.customMcp.saveFailed", "保存失败"), t),
+      );
+      await load();
+    }
+  };
+
   const syncJsonFromCards = useCallback((nextCards: ServerCardState[]) => {
     try {
       const servers = cardsToServers(nextCards);
@@ -138,18 +195,45 @@ export function CustomMcpTab() {
     setMode("visual");
   };
 
-  const handleRemove = (key: string) => {
-    setCards((prev) => {
-      const next = prev.filter((card) => card.key !== key);
-      syncJsonFromCards(next);
+  const handleRemove = async (key: string) => {
+    const card = cards.find((item) => item.key === key);
+    const serverName = card?.name.trim() ?? "";
+    const nextCards = cards.filter((item) => item.key !== key);
+    setCards(nextCards);
+    syncJsonFromCards(nextCards);
+    setProbeResults((prev) => {
+      if (!(key in prev)) return prev;
+      const next = { ...prev };
+      delete next[key];
       return next;
     });
-    setProbeResults((prev) => {
+    setOauthAvailable((prev) => {
       if (!(key in prev)) return prev;
       const next = { ...prev };
       delete next[key];
       return next;
     });
+
+    if (!serverName || !persistedNames.has(serverName)) {
+      return;
+    }
+
+    try {
+      await connectorsApi.deleteInstance(`custom:${serverName}`);
+      setPersistedNames((prev) => {
+        const next = new Set(prev);
+        next.delete(serverName);
+        return next;
+      });
+      notifyConnectorsChanged();
+      message.success(t("connectors.deleteSuccess", "已删除"));
+    } catch (e) {
+      console.error(e);
+      message.error(
+        apiErrorMessage(e, t("connectors.deleteFailed", "删除失败"), t),
+      );
+      await load();
+    }
   };
 
   const clearProbeResult = (key: string) => {
@@ -159,6 +243,96 @@ export function CustomMcpTab() {
       delete next[key];
       return next;
     });
+    setOauthAvailable((prev) => {
+      if (!(key in prev)) return prev;
+      const next = { ...prev };
+      delete next[key];
+      return next;
+    });
+  };
+
+  const applyProbeResult = (
+    card: ServerCardState,
+    result: ConnectorProbeResult,
+    options: { fromSave?: boolean } = {},
+  ) => {
+    const fromSave = options.fromSave === true;
+    if (result.ok) {
+      const tools = result.tools ?? [];
+      setProbeResults((prev) => ({ ...prev, [card.key]: tools }));
+      setOauthAvailable((prev) => ({ ...prev, [card.key]: false }));
+      if (!fromSave) {
+        updateCard(card.key, { collapsed: false });
+      }
+      if (!fromSave) {
+        if (tools.length === 0) {
+          message.success(
+            t("connectors.probeToolsEmpty", "连接正常，但未发现可用工具"),
+          );
+        } else {
+          message.success(t("connectors.customMcp.probeComplete", "连接正常"));
+        }
+      }
+      return;
+    }
+    setProbeResults((prev) => {
+      const next = { ...prev };
+      delete next[card.key];
+      return next;
+    });
+    if (result.oauth?.available) {
+      setOauthAvailable((prev) => ({ ...prev, [card.key]: true }));
+      if (fromSave) {
+        updateCard(card.key, { enabled: false, defaultOpen: false });
+      } else {
+        updateCard(card.key, {
+          collapsed: false,
+          enabled: false,
+          defaultOpen: false,
+        });
+      }
+      if (!fromSave) {
+        message.warning(
+          t(
+            "connectors.customMcp.probeNeedsOAuth",
+            "此 MCP 需要 OAuth 授权才能访问",
+          ),
+        );
+      }
+      return;
+    }
+    setOauthAvailable((prev) => ({ ...prev, [card.key]: false }));
+    if (!fromSave) {
+      message.error(result.error ?? t("connectors.probeFailed", "探测失败"));
+    }
+  };
+
+  const runProbe = async (
+    card: ServerCardState,
+    options: { byName?: boolean; fromSave?: boolean } = {},
+  ) => {
+    const byName = options.byName === true;
+    const fromSave = options.fromSave === true;
+    setProbingKey(card.key);
+    clearProbeResult(card.key);
+    try {
+      let result: ConnectorProbeResult;
+      if (byName || card.oauthConfigured) {
+        result = await connectorsApi.testCustomMcp({ name: card.name.trim() });
+      } else {
+        const map = cardsToServers([card]);
+        const server = map[card.name.trim()];
+        result = await connectorsApi.testCustomMcp({ server });
+      }
+      applyProbeResult(card, result, { fromSave });
+    } catch (e) {
+      console.error(e);
+      message.error(
+        apiErrorMessage(e, t("connectors.probeFailed", "探测失败"), t),
+      );
+    } finally {
+      setProbingKey(null);
+    }
   };
 
   const resolveServersForSave = (): CustomMcpServers | null => {
@@ -207,13 +381,19 @@ export function CustomMcpTab() {
     setSaving(true);
     try {
       const saved = await connectorsApi.putCustomMcp(servers);
-      const nextCards = serversToCards(saved.servers);
-      setCards(nextCards);
-      setJsonText(JSON.stringify(saved.servers, null, 2));
+      const nextCards = applySavedServers(saved.servers, cards);
       notifyConnectorsChanged();
       message.success(
         t("connectors.customMcp.saveSuccess", "自定义 MCP 已保存"),
       );
+      if (probeOnSave && showProbeSection) {
+        for (const card of nextCards) {
+          if (card.transport !== "streamable_http" || !card.url.trim()) {
+            continue;
+          }
+          await runProbe(card, { byName: true, fromSave: true });
+        }
+      }
     } catch (e) {
       console.error(e);
       message.error(
@@ -225,39 +405,145 @@ export function CustomMcpTab() {
   };
 
   const handleProbe = async (card: ServerCardState) => {
-    let server: CustomMcpServerSpec;
     try {
-      const map = cardsToServers([card]);
-      server = map[card.name.trim()];
+      cardsToServers([card]);
     } catch {
       message.warning(
         t("connectors.customMcp.probeNeedConfig", "请先填写完整配置再探测"),
       );
       return;
     }
-    setProbingKey(card.key);
-    clearProbeResult(card.key);
+    await runProbe(card);
+  };
+
+  const handleOAuth = async (card: ServerCardState) => {
+    const serverName = card.name.trim();
+    if (!serverName) {
+      message.warning(t("connectors.customMcp.emptyName", "请填写服务器名称"));
+      return;
+    }
+    const popup = window.open("", "octop-oauth", "width=520,height=720");
+    if (!popup) {
+      message.error(
+        t(
+          "connectors.oauthPopupBlocked",
+          "授权窗口被浏览器拦截，请允许本站弹出窗口后重试",
+        ),
+      );
+      return;
+    }
+
+    setAuthorizingKey(card.key);
+    let settled = false;
+    let pollTimer: ReturnType<typeof setInterval> | undefined;
+    let timeoutTimer: ReturnType<typeof setTimeout> | undefined;
+    let stateId = "";
+
+    const cleanup = () => {
+      if (pollTimer !== undefined) clearInterval(pollTimer);
+      if (timeoutTimer !== undefined) clearTimeout(timeoutTimer);
+      window.removeEventListener("message", onMessage);
+    };
+
+    const finish = async () => {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      try {
+        popup.close();
+      } catch {
+        // ignore
+      }
+      setAuthorizingKey(null);
+      try {
+        const { servers } = await connectorsApi.getCustomMcp();
+        const nextCards = applySavedServers(servers, cards);
+        const refreshed = nextCards.find((c) => c.name.trim() === serverName);
+        if (refreshed) {
+          await runProbe(refreshed, { byName: true });
+        }
+        message.success(
+          t("connectors.oauthConfigured", "已授权，可直接探测或保存"),
+        );
+      } catch (e) {
+        console.error(e);
+        message.error(
+          apiErrorMessage(
+            e,
+            t("connectors.oauthFailed", "获取授权结果失败"),
+            t,
+          ),
+        );
+      }
+    };
+
+    const claimPending = async () => {
+      if (!stateId || settled) return;
+      try {
+        const pending = await connectorsApi.oauthPending(stateId);
+        if (pending.applied || pending.server_name) {
+          await finish();
+        }
+      } catch {
+        // keep polling until timeout
+      }
+    };
+
+    const onMessage = (ev: MessageEvent) => {
+      if (ev.data?.type !== "octop:connector-oauth") return;
+      if (ev.data.state_id !== stateId) return;
+      void claimPending();
+    };
+
     try {
-      const result = await connectorsApi.testCustomMcp({ server });
-      if (result.ok) {
-        const tools = result.tools ?? [];
-        setProbeResults((prev) => ({ ...prev, [card.key]: tools }));
-        updateCard(card.key, { collapsed: false });
-        if (tools.length === 0) {
-          message.success(
-            t("connectors.probeToolsEmpty", "连接正常，但未发现可用工具"),
-          );
+      const servers = resolveServersForSave();
+      if (!servers) {
+        try {
+          popup.close();
+        } catch {
+          // ignore
         }
-      } else {
-        message.error(result.error ?? t("connectors.probeFailed", "探测失败"));
+        setAuthorizingKey(null);
+        return;
       }
+      const saved = await connectorsApi.putCustomMcp(servers);
+      applySavedServers(saved.servers, cards);
+      notifyConnectorsChanged();
+
+      const { authorize_url, state_id } = await connectorsApi.oauthStart(
+        { type: "custom_mcp", server_name: serverName },
+        window.location.pathname,
+      );
+      stateId = state_id;
+      window.addEventListener("message", onMessage);
+      pollTimer = setInterval(() => {
+        void claimPending();
+      }, 1200);
+      timeoutTimer = setTimeout(() => {
+        if (settled) return;
+        settled = true;
+        cleanup();
+        setAuthorizingKey(null);
+        message.error(
+          t("connectors.oauthTimedOut", "授权超时，请重试一键授权"),
+        );
+      }, 120_000);
+      popup.location.replace(authorize_url);
     } catch (e) {
-      console.error(e);
+      cleanup();
+      setAuthorizingKey(null);
+      try {
+        popup.close();
+      } catch {
+        // ignore
+      }
       message.error(
-        apiErrorMessage(e, t("connectors.probeFailed", "探测失败"), t),
+        apiErrorMessage(
+          e,
+          t("connectors.oauthStartFailed", "无法启动 OAuth"),
+          t,
+        ),
       );
-    } finally {
-      setProbingKey(null);
     }
   };
 
@@ -269,6 +555,21 @@ export function CustomMcpTab() {
     [],
   );
 
+  const showProbeSection = useMemo(() => {
+    if (mode === "visual") {
+      return hasHttpProbeTargets(cards);
+    }
+    try {
+      const parsed = JSON.parse(jsonText) as unknown;
+      if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+        return false;
+      }
+      return hasHttpProbeTargets(parsed as CustomMcpServers);
+    } catch {
+      return false;
+    }
+  }, [mode, cards, jsonText]);
+
   if (loading) {
     return (
       <div className={styles.loadingState}>
@@ -277,6 +578,39 @@ export function CustomMcpTab() {
     );
   }
 
+  const saveFooter = (
+    <div
+      className={`${styles.customMcpFooter}${
+        showProbeSection ? "" : ` ${styles.customMcpFooterSaveOnly}`
+      }`}
+    >
+      {showProbeSection ? (
+        <div className={styles.customMcpFooterMain}>
+          <Checkbox
+            checked={probeOnSave}
+            onChange={(e) => setProbeOnSave(e.target.checked)}
+          >
+            {t("connectors.customMcp.probeOnSave", "保存后自动探测连接")}
+          </Checkbox>
+          <p className={styles.customMcpFooterHint}>
+            {t(
+              "connectors.customMcp.probeOnSaveHint",
+              "将向您填写的 MCP 地址发起请求以验证可用性；若需登录，会引导您完成 OAuth。",
+            )}
+          </p>
+        </div>
+      ) : null}
+      <Button
+        type="primary"
+        className={styles.customMcpFooterSave}
+        loading={saving}
+        onClick={() => void handleSave()}
+      >
+        {t("common.save")}
+      </Button>
+    </div>
+  );
+
   return (
     <div className={styles.customMcpTab}>
       <div className={styles.customMcpIntro}>
@@ -307,97 +641,128 @@ export function CustomMcpTab() {
       </div>
 
       {mode === "json" ? (
-        <div className={styles.customMcpJsonEditor}>
-          <Input.TextArea
-            value={jsonText}
-            onChange={(e) => {
-              setJsonText(e.target.value);
-              setJsonError(null);
-            }}
-            autoSize={{ minRows: 16, maxRows: 32 }}
-            className={styles.customMcpJsonArea}
-            spellCheck={false}
-          />
-          {jsonError ? (
-            <div className={styles.customMcpJsonError}>{jsonError}</div>
-          ) : null}
-        </div>
-      ) : (
         <>
-          <div className={styles.customMcpAddRow}>
-            <button
-              type="button"
-              className={styles.customMcpAddBtn}
-              onClick={() => handleAdd("streamable_http")}
-            >
-              <Globe size={18} />
-              <span>
-                {t("connectors.customMcp.addHttp", "添加 HTTP Server")}
-              </span>
-              <Plus size={16} />
-            </button>
-            <button
-              type="button"
-              className={styles.customMcpAddBtn}
-              onClick={() => handleAdd("stdio")}
-            >
-              <Terminal size={18} />
-              <span>
-                {t("connectors.customMcp.addStdio", "添加 Stdio Server")}
-              </span>
-              <Plus size={16} />
-            </button>
+          <div className={styles.customMcpPanel}>
+            <div className={styles.customMcpJsonEditor}>
+              <Input.TextArea
+                value={jsonText}
+                onChange={(e) => {
+                  setJsonText(e.target.value);
+                  setJsonError(null);
+                }}
+                autoSize={{ minRows: 16, maxRows: 32 }}
+                className={styles.customMcpJsonArea}
+                spellCheck={false}
+              />
+              {jsonError ? (
+                <div className={styles.customMcpJsonError}>{jsonError}</div>
+              ) : null}
+            </div>
           </div>
-
-          <div className={styles.customMcpListSection}>
-            <div className={styles.customMcpListTitle}>
-              {t("connectors.customMcp.listTitle", "已添加的服务器")}
-              {cards.length > 0 ? (
-                <span className={styles.customMcpListCount}>
-                  {cards.length}
+          {saveFooter}
+        </>
+      ) : (
+        <>
+          <div className={styles.customMcpPanel}>
+            <div className={styles.customMcpAddRow}>
+              <button
+                type="button"
+                className={styles.customMcpAddBtn}
+                onClick={() => handleAdd("streamable_http")}
+              >
+                <Globe size={18} />
+                <span>
+                  {t("connectors.customMcp.addHttp", "添加 HTTP Server")}
                 </span>
-              ) : null}
+                <Plus size={16} />
+              </button>
+              <button
+                type="button"
+                className={styles.customMcpAddBtn}
+                onClick={() => handleAdd("stdio")}
+              >
+                <Terminal size={18} />
+                <span>
+                  {t("connectors.customMcp.addStdio", "添加 Stdio Server")}
+                </span>
+                <Plus size={16} />
+              </button>
             </div>
 
-            {cards.length === 0 ? (
-              <div className={styles.customMcpEmpty}>
-                {t(
-                  "connectors.customMcp.emptyList",
-                  "尚未添加自定义 MCP，点击上方按钮开始配置",
-                )}
-              </div>
-            ) : (
-              <div className={styles.customMcpGrid}>
-                {cards.map((card) => (
-                  <CustomMcpServerCard
-                    key={card.key}
-                    card={card}
-                    probing={probingKey === card.key}
-                    probeTools={probeResults[card.key]}
-                    transportOptions={transportOptions}
-                    onUpdate={updateCard}
-                    onToggleEnabled={(enabled) =>
-                      updateCard(card.key, { enabled })
-                    }
-                    onRemove={() => handleRemove(card.key)}
-                    onProbe={() => void handleProbe(card)}
-                  />
-                ))}
+            <div className={styles.customMcpListSection}>
+              <div className={styles.customMcpListTitle}>
+                {t("connectors.customMcp.listTitle", "已添加的服务器")}
+                {cards.length > 0 ? (
+                  <span className={styles.customMcpListCount}>
+                    {cards.length}
+                  </span>
+                ) : null}
               </div>
-            )}
+
+              {cards.length === 0 ? (
+                <div className={styles.customMcpEmpty}>
+                  {t(
+                    "connectors.customMcp.emptyList",
+                    "尚未添加自定义 MCP，点击上方按钮开始配置",
+                  )}
+                </div>
+              ) : (
+                <div className={styles.customMcpGrid}>
+                  {cards.map((card) => (
+                    <CustomMcpServerCard
+                      key={card.key}
+                      card={card}
+                      probing={probingKey === card.key}
+                      authorizing={authorizingKey === card.key}
+                      oauthAvailable={oauthAvailable[card.key] === true}
+                      probeTools={probeResults[card.key]}
+                      transportOptions={transportOptions}
+                      onUpdate={updateCard}
+                      onToggleEnabled={(enabled) => {
+                        if (
+                          oauthAvailable[card.key] &&
+                          !card.oauthConfigured &&
+                          enabled
+                        ) {
+                          message.warning(
+                            t(
+                              "connectors.customMcp.oauthBeforeEnable",
+                              "请先完成 OAuth 授权后再启用",
+                            ),
+                          );
+                          return;
+                        }
+                        void persistServerPatch(
+                          card,
+                          {
+                            enabled,
+                            ...(enabled ? {} : { default_open: false }),
+                          },
+                          {
+                            enabled,
+                            ...(enabled ? {} : { defaultOpen: false }),
+                          },
+                        );
+                      }}
+                      onDefaultOpenChange={(defaultOpen) => {
+                        void persistServerPatch(
+                          card,
+                          { default_open: defaultOpen },
+                          { defaultOpen },
+                        );
+                      }}
+                      onRemove={() => handleRemove(card.key)}
+                      onProbe={() => void handleProbe(card)}
+                      onAuthorize={() => void handleOAuth(card)}
+                    />
+                  ))}
+                </div>
+              )}
+            </div>
           </div>
+          {saveFooter}
         </>
       )}
-
-      <div className={styles.customMcpFooter}>
-        <Button
-          type="primary"
-          loading={saving}
-          onClick={() => void handleSave()}
-        >
-          {t("common.save")}
-        </Button>
-      </div>
     </div>
   );
 }
diff --git a/dashboard/src/pages/Agent/Connectors/customMcpUtils.ts b/dashboard/src/pages/Agent/Connectors/customMcpUtils.ts
index a5975468..bfc3850f 100644
--- a/dashboard/src/pages/Agent/Connectors/customMcpUtils.ts
+++ b/dashboard/src/pages/Agent/Connectors/customMcpUtils.ts
@@ -19,8 +19,12 @@ export interface ServerCardState {
   enabled: boolean;
   defaultOpen: boolean;
   collapsed: boolean;
+  oauthConfigured: boolean;
+  oauthExpiresAt?: number;
 }
 
+export const PROBE_ON_SAVE_KEY = "octop.customMcp.probeOnSave";
+
 export const EXAMPLE_JSON = `{
   "deepwiki": {
     "display_name": "DeepWiki",
@@ -122,6 +126,8 @@ export function serversToCards(servers: CustomMcpServers): ServerCardState[] {
     enabled: spec.enabled !== false,
     defaultOpen: spec.default_open === true,
     collapsed: true,
+    oauthConfigured: spec.oauth?.configured === true,
+    oauthExpiresAt: spec.oauth?.expires_at,
   }));
 }
 
@@ -171,6 +177,54 @@ export function cardsToServers(cards: ServerCardState[]): CustomMcpServers {
   return servers;
 }
 
+/** Whether any server uses HTTP transport (probe / OAuth apply to these only). */
+export function hasHttpProbeTargets(
+  cards: ServerCardState[] | CustomMcpServers,
+): boolean {
+  if (Array.isArray(cards)) {
+    return cards.some((card) => card.transport === "streamable_http");
+  }
+  return Object.values(cards).some(
+    (spec) =>
+      spec &&
+      typeof spec === "object" &&
+      (spec as CustomMcpServerSpec).transport !== "stdio",
+  );
+}
+
+export function mergeCustomMcpCards(
+  servers: CustomMcpServers,
+  prevCards: ServerCardState[],
+): ServerCardState[] {
+  return serversToCards(servers).map((card) => {
+    const prev = prevCards.find((c) => c.name.trim() === card.name.trim());
+    if (!prev) return card;
+    return {
+      ...card,
+      key: prev.key,
+      collapsed: prev.collapsed,
+    };
+  });
+}
+
+export function oauthHintsFromServers(
+  servers: CustomMcpServers,
+  cards: ServerCardState[],
+): Record<string, boolean> {
+  const hints: Record<string, boolean> = {};
+  for (const card of cards) {
+    const spec = servers[card.name.trim()];
+    if (
+      card.transport === "streamable_http" &&
+      spec?.oauth?.required &&
+      spec.oauth?.configured !== true
+    ) {
+      hints[card.key] = true;
+    }
+  }
+  return hints;
+}
+
 export function newCard(
   transport: CustomMcpTransport,
   index: number,
@@ -190,6 +244,7 @@ export function newCard(
     enabled: true,
     defaultOpen: false,
     collapsed: false,
+    oauthConfigured: false,
   };
 }
 
diff --git a/dashboard/src/pages/Agent/Connectors/guidedConnectorUtils.test.ts b/dashboard/src/pages/Agent/Connectors/guidedConnectorUtils.test.ts
new file mode 100644
index 00000000..4078f4ca
--- /dev/null
+++ b/dashboard/src/pages/Agent/Connectors/guidedConnectorUtils.test.ts
@@ -0,0 +1,40 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  consoleUrlFromServiceUrl,
+  extractHttpUrl,
+  isDifyMcpServerUrl,
+  isGuidedConnector,
+} from "./guidedConnectorUtils";
+
+describe("guided connector helpers", () => {
+  it("extracts a pasted URL without surrounding prose", () => {
+    expect(
+      extractHttpUrl(
+        "MCP Server URL: https://dify.example.com/mcp/server/code/mcp。",
+      ),
+    ).toBe("https://dify.example.com/mcp/server/code/mcp");
+    expect(extractHttpUrl("sk-secret")).toBeNull();
+  });
+
+  it("recognizes only Dify app MCP server routes", () => {
+    expect(
+      isDifyMcpServerUrl("https://dify.example.com/mcp/server/server-code/mcp"),
+    ).toBe(true);
+    expect(isDifyMcpServerUrl("https://dify.example.com/v1/chat")).toBe(false);
+  });
+
+  it("derives safe console origins", () => {
+    expect(
+      consoleUrlFromServiceUrl("weknora", "http://127.0.0.1:8080/api/v1"),
+    ).toBe("http://127.0.0.1");
+    expect(
+      consoleUrlFromServiceUrl(
+        "dify",
+        "https://dify.example.com/mcp/server/code/mcp",
+      ),
+    ).toBe("https://dify.example.com");
+    expect(isGuidedConnector("weknora")).toBe(true);
+    expect(isGuidedConnector("notion")).toBe(false);
+  });
+});
diff --git a/dashboard/src/pages/Agent/Connectors/guidedConnectorUtils.ts b/dashboard/src/pages/Agent/Connectors/guidedConnectorUtils.ts
new file mode 100644
index 00000000..c0d17294
--- /dev/null
+++ b/dashboard/src/pages/Agent/Connectors/guidedConnectorUtils.ts
@@ -0,0 +1,45 @@
+export type GuidedConnectorKind = "weknora" | "dify";
+
+export function isGuidedConnector(
+  kind: string | undefined,
+): kind is GuidedConnectorKind {
+  return kind === "weknora" || kind === "dify";
+}
+
+export function extractHttpUrl(text: string): string | null {
+  const match = text.trim().match(/https?:\/\/[^\s<>"']+/i);
+  if (!match) return null;
+  return match[0].replace(/[),.;，。；）]+$/u, "");
+}
+
+export function isDifyMcpServerUrl(value: string): boolean {
+  try {
+    const url = new URL(value.trim());
+    return (
+      ["http:", "https:"].includes(url.protocol) &&
+      /^\/mcp\/server\/[^/]+\/mcp\/?$/.test(url.pathname)
+    );
+  } catch {
+    return false;
+  }
+}
+
+export function consoleUrlFromServiceUrl(
+  kind: GuidedConnectorKind,
+  value: string,
+): string | null {
+  try {
+    const url = new URL(value.trim());
+    if (!["http:", "https:"].includes(url.protocol)) return null;
+    if (
+      kind === "weknora" &&
+      ["127.0.0.1", "localhost"].includes(url.hostname) &&
+      url.port === "8080"
+    ) {
+      return `${url.protocol}//${url.hostname}`;
+    }
+    return url.origin;
+  } catch {
+    return null;
+  }
+}
diff --git a/dashboard/src/pages/Agent/Connectors/index.module.less b/dashboard/src/pages/Agent/Connectors/index.module.less
index 1487c918..032e1b52 100644
--- a/dashboard/src/pages/Agent/Connectors/index.module.less
+++ b/dashboard/src/pages/Agent/Connectors/index.module.less
@@ -487,6 +487,31 @@
   border-radius: var(--fn-radius-md);
 }
 
+.guidedSetup {
+  margin-bottom: 12px;
+  padding: 10px 12px;
+  border: 1px solid var(--fn-card-border-normal);
+  border-radius: var(--fn-radius-md);
+  background: color-mix(
+    in srgb,
+    var(--connector-accent, var(--fn-color-brand)) 4%,
+    var(--fn-bg-primary)
+  );
+  font-size: 13px;
+  color: var(--fn-text-secondary);
+
+  ol {
+    margin: 6px 0 0;
+    padding-left: 20px;
+    line-height: 1.65;
+  }
+}
+
+.guidedSetupTitle {
+  color: var(--fn-text-primary);
+  font-weight: 600;
+}
+
 .guideLinks {
   display: flex;
   flex-wrap: wrap;
@@ -697,6 +722,16 @@
   justify-content: flex-start;
 }
 
+.customMcpPanel {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+  padding: 16px;
+  border: 1px solid var(--fn-border-secondary);
+  border-radius: var(--fn-radius-lg);
+  background: var(--fn-bg-primary);
+}
+
 .customMcpJsonEditor {
   display: flex;
   flex-direction: column;
@@ -926,6 +961,47 @@
   flex-shrink: 0;
 }
 
+.customMcpEnableControl {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  margin-right: 4px;
+}
+
+.customMcpEnableLabel {
+  font-size: 12px;
+  font-weight: 500;
+  color: var(--fn-text-secondary);
+  white-space: nowrap;
+}
+
+.customMcpCardFooter {
+  display: flex;
+  align-items: center;
+  padding: 0 16px 14px;
+  margin-top: -4px;
+}
+
+.customMcpConnectLink {
+  font-size: 12px;
+  color: var(--mcp-accent);
+  font-weight: 500;
+  background: none;
+  border: none;
+  padding: 0;
+  cursor: pointer;
+  text-align: left;
+
+  &:hover:not(:disabled) {
+    text-decoration: underline;
+  }
+
+  &:disabled {
+    opacity: 0.65;
+    cursor: wait;
+  }
+}
+
 .customMcpCardBody {
   display: flex;
   flex-direction: column;
@@ -979,6 +1055,36 @@
 
 .customMcpFooter {
   display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 16px;
+  padding: 16px;
+  border: 1px solid var(--fn-border-secondary);
+  border-radius: var(--fn-radius-lg);
+  background: var(--fn-bg-primary);
+}
+
+.customMcpFooterMain {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  flex: 1;
+  min-width: 0;
+}
+
+.customMcpFooterHint {
+  margin: 0;
+  padding-left: 24px;
+  font-size: 12px;
+  line-height: 1.45;
+  color: var(--fn-text-tertiary);
+}
+
+.customMcpFooterSave {
+  flex-shrink: 0;
+  align-self: center;
+}
+
+.customMcpFooterSaveOnly {
   justify-content: flex-end;
-  padding-top: 4px;
 }
diff --git a/dashboard/src/pages/Agent/Connectors/index.tsx b/dashboard/src/pages/Agent/Connectors/index.tsx
index abccf84e..2dc8258a 100644
--- a/dashboard/src/pages/Agent/Connectors/index.tsx
+++ b/dashboard/src/pages/Agent/Connectors/index.tsx
@@ -44,6 +44,11 @@ import {
   mailProviderById,
 } from "./connectorDefs";
 import { notifyConnectorsChanged } from "./customMcpUtils";
+import {
+  extractHttpUrl,
+  isDifyMcpServerUrl,
+  isGuidedConnector,
+} from "./guidedConnectorUtils";
 import { useConnectorInstances } from "./useConnectors";
 import styles from "./index.module.less";
 
@@ -109,6 +114,18 @@ function buildCredentials(
     credentials.sdk_id = values.sdk_id;
     const secret_key = String(values.secret_key ?? "").trim();
     if (secret_key) credentials.secret_key = secret_key;
+  } else if (entry.auth_kind === "custom_fields") {
+    for (const field of entry.credential_fields ?? []) {
+      const text = String(values[field.key] ?? "").trim();
+      if (!text) continue;
+      credentials[field.key] =
+        field.field_type === "tags"
+          ? text
+              .split(",")
+              .map((item) => item.trim())
+              .filter(Boolean)
+          : text;
+    }
   }
   return credentials;
 }
@@ -146,6 +163,17 @@ function previewToFormValues(
   if (entry.auth_kind === "oauth2" && preview.oauth_configured) {
     values.access_token = "__configured__";
   }
+  if (entry.auth_kind === "custom_fields") {
+    for (const field of entry.credential_fields ?? []) {
+      if (field.secret) continue;
+      const value = preview[field.key];
+      if (Array.isArray(value)) {
+        values[field.key] = value.join(", ");
+      } else if (value !== undefined && value !== null) {
+        values[field.key] = value;
+      }
+    }
+  }
   return values;
 }
 
@@ -178,9 +206,32 @@ function hasFreshCredentialInput(
   if (entry.auth_kind === "api_credentials") {
     return Boolean(String(values.secret_key ?? "").trim());
   }
+  if (entry.auth_kind === "custom_fields") {
+    return (entry.credential_fields ?? []).some(
+      (field) =>
+        field.secret && Boolean(String(values[field.key] ?? "").trim()),
+    );
+  }
   return false;
 }
 
+function customCredentialConfigChanged(
+  entry: ConnectorCatalogEntry,
+  values: Record<string, unknown>,
+  preview: ConnectorCredentialsPreview,
+): boolean {
+  if (entry.auth_kind !== "custom_fields") return false;
+  return (entry.credential_fields ?? []).some((field) => {
+    if (field.secret) return false;
+    const current = String(values[field.key] ?? "").trim();
+    const storedValue = preview[field.key];
+    const stored = Array.isArray(storedValue)
+      ? storedValue.join(", ")
+      : String(storedValue ?? "").trim();
+    return current !== stored;
+  });
+}
+
 function openAuthorizeLabel(
   kind: string,
   t: (key: string, fallback: string) => string,
@@ -216,7 +267,7 @@ function secretFieldRules(required: boolean) {
 
 function configuredExtra(
   preview: ConnectorCredentialsPreview | undefined,
-  key: keyof ConnectorCredentialsPreview,
+  key: string,
   t: (key: string, fallback: string) => string,
 ) {
   if (!preview?.[key]) return undefined;
@@ -260,6 +311,7 @@ function ConnectorConfigDrawer({
     null,
   );
   const [installingCli, setInstallingCli] = useState(false);
+  const [detectingLocalWeKnora, setDetectingLocalWeKnora] = useState(false);
   const [feishuUserAuth, setFeishuUserAuth] =
     useState<FeishuUserAuthStartResult | null>(null);
   const [feishuUserAuthBusy, setFeishuUserAuthBusy] = useState(false);
@@ -685,6 +737,86 @@ function ConnectorConfigDrawer({
     }
   };
 
+  const handleGuidedPaste = async () => {
+    if (!entry || !isGuidedConnector(entry.kind)) return;
+    try {
+      const text = (await navigator.clipboard.readText()).trim();
+      if (!text) {
+        message.warning(t("connectors.clipboardEmpty", "剪贴板为空"));
+        return;
+      }
+      const pastedUrl = extractHttpUrl(text);
+      if (entry.kind === "dify") {
+        if (!pastedUrl) {
+          message.warning(
+            t("connectors.difyPasteUrlRequired", "剪贴板中没有 MCP URL"),
+          );
+          return;
+        }
+        form.setFieldValue("mcp_url", pastedUrl);
+        await form.validateFields(["mcp_url"]);
+      } else if (pastedUrl) {
+        form.setFieldValue("base_url", pastedUrl);
+      } else {
+        form.setFieldValue("api_key", text);
+      }
+      saveFormDraft(
+        draftScope,
+        form.getFieldsValue() as Record<string, unknown>,
+      );
+      message.success(t("connectors.pasteSuccess", "已粘贴"));
+    } catch (error) {
+      if (error && typeof error === "object" && "errorFields" in error) {
+        message.warning(
+          t(
+            "connectors.difyMcpUrlInvalid",
+            "请粘贴 Dify 访问点提供的完整 MCP Server URL",
+          ),
+        );
+        return;
+      }
+      message.error(
+        t("connectors.clipboardDenied", "无法读取剪贴板，请手动粘贴"),
+      );
+    }
+  };
+
+  const handleDetectLocalWeKnora = async () => {
+    if (detectingLocalWeKnora) return;
+    setDetectingLocalWeKnora(true);
+    try {
+      const result = await connectorsApi.detectLocalWeKnora();
+      if (!result.found || !result.base_url) {
+        message.warning(
+          t(
+            "connectors.weknoraNotFound",
+            "未在 OCTOP 主机的 127.0.0.1:8080 检测到 WeKnora",
+          ),
+        );
+        return;
+      }
+      form.setFieldValue("base_url", result.base_url);
+      saveFormDraft(
+        draftScope,
+        form.getFieldsValue() as Record<string, unknown>,
+      );
+      message.success(
+        t("connectors.weknoraFound", "已检测到本机 WeKnora 并填入地址"),
+      );
+    } catch (error) {
+      console.error(error);
+      message.error(
+        apiErrorMessage(
+          error,
+          t("connectors.weknoraDetectFailed", "检测本机 WeKnora 失败"),
+          t,
+        ),
+      );
+    } finally {
+      setDetectingLocalWeKnora(false);
+    }
+  };
+
   const handleOAuth = async () => {
     if (!entry || authorizing) return;
     const popup = window.open("", "octop-oauth", "width=520,height=720");
@@ -785,7 +917,7 @@ function ConnectorConfigDrawer({
 
     try {
       const { authorize_url, state_id } = await connectorsApi.oauthStart(
-        entry.kind,
+        { type: "catalog", kind: entry.kind },
         "/connectors",
       );
       stateId = state_id;
@@ -843,17 +975,35 @@ function ConnectorConfigDrawer({
       Boolean(preview.bot_id) &&
       String(values.bot_id ?? "").trim() !==
         String(preview.bot_id ?? "").trim();
-    const identityChanged = feishuAppIdChanged || wecomBotIdChanged;
-    if (identityChanged && !freshSecret) {
+    const customConfigChanged = customCredentialConfigChanged(
+      entry,
+      values,
+      preview,
+    );
+    const customHasStoredSecret = (entry.credential_fields ?? []).some(
+      (field) => field.secret && preview[`${field.key}_configured`] === true,
+    );
+    const identityChanged =
+      feishuAppIdChanged || wecomBotIdChanged || customConfigChanged;
+    if (
+      identityChanged &&
+      !freshSecret &&
+      (entry.auth_kind !== "custom_fields" || customHasStoredSecret)
+    ) {
       message.warning(
         entry.kind === "feishu-cli"
           ? t(
               "connectors.probeNeedSecretAfterAppIdChange",
               "App ID 已修改，请填写 App Secret 后再探测",
             )
-          : t(
+          : entry.kind === "wecom-cli"
+          ? t(
               "connectors.probeNeedSecretAfterBotIdChange",
               "Bot ID 已修改，请填写 Secret 后再探测",
+            )
+          : t(
+              "connectors.probeNeedSecretAfterConfigChange",
+              "连接配置已修改，请重新填写密钥后再探测",
             ),
       );
       return;
@@ -959,6 +1109,7 @@ function ConnectorConfigDrawer({
   const guideUrl = authInfo?.guide_url ?? entry.guide_url ?? entry.doc_url;
   const manualUrl = authInfo?.manual_url ?? entry.manual_url ?? guideUrl;
   const authHint = authInfo?.auth_hint ?? entry.auth_hint;
+  const guidedKind = isGuidedConnector(entry.kind) ? entry.kind : null;
 
   const preview = instanceDetail?.credentials_preview;
   const secretRequired = !hasStoredCredentials;
@@ -1018,6 +1169,45 @@ function ConnectorConfigDrawer({
 
         {authHint && <div className={styles.authHint}>{authHint}</div>}
 
+        {guidedKind && (
+          <div className={styles.guidedSetup}>
+            <div className={styles.guidedSetupTitle}>
+              {t("connectors.guidedSetup", "快速接入")}
+            </div>
+            {guidedKind === "weknora" ? (
+              <ol>
+                <li>
+                  {t("connectors.weknoraStep1", "打开 WeKnora 并创建 API Key")}
+                </li>
+                <li>
+                  {t(
+                    "connectors.weknoraStep2",
+                    "检测本机服务，或手动填写部署地址",
+                  )}
+                </li>
+                <li>
+                  {t("connectors.guidedStepProbe", "粘贴凭证后探测并保存")}
+                </li>
+              </ol>
+            ) : (
+              <ol>
+                <li>
+                  {t("connectors.difyStep1", "在 Dify 中发布应用或工作流")}
+                </li>
+                <li>
+                  {t(
+                    "connectors.difyStep2",
+                    "在访问点启用 MCP 并复制完整 Server URL",
+                  )}
+                </li>
+                <li>
+                  {t("connectors.guidedStepProbe", "粘贴凭证后探测并保存")}
+                </li>
+              </ol>
+            )}
+          </div>
+        )}
+
         {guideUrl && !hideGuideLink && (
           <div className={styles.guideLinks}>
             <a href={guideUrl} target="_blank" rel="noreferrer">
@@ -1027,6 +1217,27 @@ function ConnectorConfigDrawer({
         )}
 
         <div className={styles.quickAuthBar}>
+          {guidedKind && (
+            <>
+              {guidedKind === "weknora" && (
+                <Button
+                  icon={<RefreshCw size={14} />}
+                  loading={detectingLocalWeKnora}
+                  onClick={() => void handleDetectLocalWeKnora()}
+                >
+                  {t("connectors.detectLocal", "检测本机服务")}
+                </Button>
+              )}
+              <Button
+                icon={<ClipboardPaste size={14} />}
+                onClick={() => void handleGuidedPaste()}
+              >
+                {guidedKind === "dify"
+                  ? t("connectors.pasteMcpUrl", "粘贴 MCP 地址")
+                  : t("connectors.smartPaste", "智能粘贴")}
+              </Button>
+            </>
+          )}
           {entry && isHostCliConnector(entry.kind) && (
             <>
               {canInstallCli && (
@@ -1235,6 +1446,57 @@ function ConnectorConfigDrawer({
             <Input placeholder={entry.name} />
           </Form.Item>
 
+          {entry.auth_kind === "custom_fields" &&
+            (entry.credential_fields ?? []).map((field) => {
+              const isSecret = field.secret || field.field_type === "password";
+              const input = isSecret ? (
+                <Input.Password
+                  placeholder={
+                    hasStoredCredentials && field.secret
+                      ? t("connectors.secretPlaceholder", "留空表示不修改")
+                      : field.placeholder ?? undefined
+                  }
+                />
+              ) : (
+                <Input placeholder={field.placeholder ?? undefined} />
+              );
+              return (
+                <Form.Item
+                  key={field.key}
+                  name={field.key}
+                  label={field.label}
+                  rules={[
+                    ...(isSecret
+                      ? secretFieldRules(field.required && secretRequired)
+                      : [{ required: field.required }]),
+                    ...(entry.kind === "dify" && field.key === "mcp_url"
+                      ? [
+                          {
+                            validator: (_: unknown, value: unknown) =>
+                              !value || isDifyMcpServerUrl(String(value))
+                                ? Promise.resolve()
+                                : Promise.reject(
+                                    new Error(
+                                      t(
+                                        "connectors.difyMcpUrlInvalid",
+                                        "请粘贴 Dify 访问点提供的完整 MCP Server URL",
+                                      ),
+                                    ),
+                                  ),
+                          },
+                        ]
+                      : []),
+                  ]}
+                  extra={
+                    configuredExtra(preview, `${field.key}_configured`, t) ??
+                    field.help
+                  }
+                >
+                  {input}
+                </Form.Item>
+              );
+            })}
+
           {entry.auth_kind === "personal_token" && (
             <Form.Item
               name="token"
diff --git a/dashboard/src/pages/Agent/Memory/VectorSearchConfig.tsx b/dashboard/src/pages/Agent/Memory/VectorSearchConfig.tsx
index 8993f410..31437d61 100644
--- a/dashboard/src/pages/Agent/Memory/VectorSearchConfig.tsx
+++ b/dashboard/src/pages/Agent/Memory/VectorSearchConfig.tsx
@@ -1,7 +1,6 @@
 import { useState, useEffect, useCallback, useRef } from "react";
 import { useTranslation } from "react-i18next";
-import { Select, Input, Button, Spin, Progress, Modal, Alert } from "antd";
-import { message } from "@/utils/antdMessage";
+import { App, Select, Input, Button, Spin, Progress, Alert } from "antd";
 
 import { Download, CheckCircle, AlertCircle } from "lucide-react";
 import api from "../../../api";
@@ -16,6 +15,7 @@ import styles from "./VectorSearchConfig.module.less";
 
 export default function VectorSearchConfig() {
   const { t } = useTranslation();
+  const { modal, message } = App.useApp();
 
   const [config, setConfig] = useState<EmbeddingConfig | null>(null);
   const [loading, setLoading] = useState(true);
@@ -102,7 +102,7 @@ export default function VectorSearchConfig() {
   /** Disable vector search in one action by applying provider=none immediately. */
   const handleDisableVectorSearch = useCallback(() => {
     if (!config || config.provider === "none") return;
-    Modal.confirm({
+    modal.confirm({
       title: t("memory.vs.disableVectorConfirmTitle"),
       content: t("memory.vs.disableVectorConfirmDesc"),
       okText: t("common.disable"),
@@ -181,7 +181,7 @@ export default function VectorSearchConfig() {
     const currentModel = config?.localModel || "";
     if (!currentModel) return;
 
-    Modal.confirm({
+    modal.confirm({
       title: t("memory.vs.deleteModelCacheTitle"),
       content: t("memory.vs.deleteModelCacheDesc", { model: currentModel }),
       okText: t("common.delete"),
diff --git a/dashboard/src/pages/Agent/Memory/shared/deprecateAtom.tsx b/dashboard/src/pages/Agent/Memory/shared/deprecateAtom.tsx
index 87543a99..6fecc9ab 100644
--- a/dashboard/src/pages/Agent/Memory/shared/deprecateAtom.tsx
+++ b/dashboard/src/pages/Agent/Memory/shared/deprecateAtom.tsx
@@ -4,8 +4,9 @@
  * Reuses the same confirm dialog, optional reason input, deprecateAtom call,
  * and toast behavior across tree and list drawers.
  */
-import { Input, Modal, Typography } from "antd";
+import { Input, Typography } from "antd";
 import { message } from "@/utils/antdMessage";
+import { modal } from "@/utils/antdModal";
 import i18n from "@/i18n";
 
 import {
@@ -24,7 +25,7 @@ export function confirmDeprecateAtom({
   onSuccess?: () => void;
 }) {
   let reason = "";
-  Modal.confirm({
+  modal.confirm({
     title: i18n.t("memory.deprecate.title"),
     content: (
       <div>
diff --git a/dashboard/src/pages/Agent/Skills/components/InstalledSkillsTab.tsx b/dashboard/src/pages/Agent/Skills/components/InstalledSkillsTab.tsx
index 5085ad99..f666d3a5 100644
--- a/dashboard/src/pages/Agent/Skills/components/InstalledSkillsTab.tsx
+++ b/dashboard/src/pages/Agent/Skills/components/InstalledSkillsTab.tsx
@@ -10,7 +10,6 @@ import { EmptyState } from "../../../../components/EmptyState";
 import { SkillCard } from "./SkillCard";
 import { SkillDrawer, type SkillFormValues } from "./SkillDrawer";
 import { SkillImportModal } from "./SkillImportModal";
-import { hubInfoBySlugFromCache } from "./skillHubCache";
 import SkillsTable from "./SkillsTable";
 import type { SkillDetail, SkillSpec } from "../useSkills";
 import styles from "../index.module.less";
@@ -80,8 +79,6 @@ export default function InstalledSkillsTab({
   const [hoverKey, setHoverKey] = useState<string | null>(null);
   const [form] = Form.useForm<SkillFormValues>();
 
-  const hubSkillsBySlug = useMemo(() => hubInfoBySlugFromCache(), []);
-
   const filteredSkills = useMemo(
     () =>
       skills
@@ -173,7 +170,6 @@ export default function InstalledSkillsTab({
           <SkillCard
             key={`${skill.kind}-${skill.slug}`}
             skill={skill}
-            hubInfo={hubSkillsBySlug.get(skill.slug)}
             isHover={hoverKey === skill.slug}
             onClick={() => void handleEdit(skill)}
             onMouseEnter={() => setHoverKey(skill.slug)}
diff --git a/dashboard/src/pages/Agent/Skills/components/SkillCard.tsx b/dashboard/src/pages/Agent/Skills/components/SkillCard.tsx
index cb34f0ec..42fba928 100644
--- a/dashboard/src/pages/Agent/Skills/components/SkillCard.tsx
+++ b/dashboard/src/pages/Agent/Skills/components/SkillCard.tsx
@@ -14,18 +14,8 @@ import type { SkillSpec } from "../useSkills";
 import { useSkillDisplayName } from "../skillDisplayNames";
 import styles from "../index.module.less";
 
-/** SkillHub metadata matched by slug — used to show the marketplace's
- * Chinese name / description / icon for installed skills (falls back to the
- * local SKILL.md values when absent). */
-export interface SkillHubInfo {
-  name?: string;
-  description_zh?: string;
-  iconUrl?: string | null;
-}
-
 interface SkillCardProps {
   skill: SkillSpec;
-  hubInfo?: SkillHubInfo;
   isHover: boolean;
   onClick: () => void;
   onMouseEnter: () => void;
@@ -186,7 +176,6 @@ const renderSkillIcon = (skill: SkillSpec) => {
 
 export function SkillCard({
   skill,
-  hubInfo,
   onClick,
   onMouseEnter,
   onMouseLeave,
@@ -201,11 +190,9 @@ export function SkillCard({
   const iconColor = DEFAULT_COLOR;
   const iconBg = `${iconColor}18`; // ~10% opacity tint
 
-  // Prefer the SkillHub marketplace's Chinese name / description / icon when
-  // this installed skill matches a hub skill by slug; fall back to SKILL.md.
-  const displayName = hubInfo?.name || skillDisplayName(skill);
-  const displayDesc = hubInfo?.description_zh || skill.description;
-  const hubIcon = hubInfo?.iconUrl || skill.iconUrl;
+  const displayName = skillDisplayName(skill);
+  const displayDesc = skill.description;
+  const hubIcon = skill.iconUrl;
 
   const handleDeleteClick = (e: React.MouseEvent) => {
     e.stopPropagation();
diff --git a/dashboard/src/pages/Agent/Skills/components/SkillDrawer.test.ts b/dashboard/src/pages/Agent/Skills/components/SkillDrawer.test.ts
index fd695a2f..1f6e8e79 100644
--- a/dashboard/src/pages/Agent/Skills/components/SkillDrawer.test.ts
+++ b/dashboard/src/pages/Agent/Skills/components/SkillDrawer.test.ts
@@ -37,6 +37,27 @@ describe("SkillDrawer emoji metadata", () => {
     expect(md).toContain("octop:");
   });
 
+  it("writes localized presentation fields into octop metadata", () => {
+    const md = buildSkillMarkdown({
+      name: "demo",
+      description: "Agent trigger description",
+      labelZh: "演示技能",
+      labelEn: "Demo Skill",
+      summaryZh: "完成演示任务",
+      summaryEn: "Complete demo tasks",
+      emoji: "⚙️",
+      metadata: [],
+      body: "Do things.",
+    });
+
+    expect(md).toContain("label:");
+    expect(md).toContain("zh: 演示技能");
+    expect(md).toContain("en: Demo Skill");
+    expect(md).toContain("summary:");
+    expect(md).toContain("zh: 完成演示任务");
+    expect(md).toContain("en: Complete demo tasks");
+  });
+
   it("extracts emoji from flattened metadata and keeps other keys", () => {
     const { emoji, metadata } = parseSkillEmojiAndMetadata([
       { key: OCTOP_EMOJI_META_KEY, value: "🔧" },
diff --git a/dashboard/src/pages/Agent/Skills/components/SkillDrawer.tsx b/dashboard/src/pages/Agent/Skills/components/SkillDrawer.tsx
index b49354d3..def4c391 100644
--- a/dashboard/src/pages/Agent/Skills/components/SkillDrawer.tsx
+++ b/dashboard/src/pages/Agent/Skills/components/SkillDrawer.tsx
@@ -33,6 +33,10 @@ export interface MetadataEntry {
 export interface SkillFormValues {
   name: string;
   description: string;
+  labelZh?: string;
+  labelEn?: string;
+  summaryZh?: string;
+  summaryEn?: string;
   /** Surfaced as ``metadata.octop.emoji`` in SKILL.md. */
   emoji: string;
   metadata: MetadataEntry[];
@@ -43,6 +47,16 @@ export interface SkillFormValues {
 }
 
 export const OCTOP_EMOJI_META_KEY = "octop.emoji";
+const OCTOP_LABEL_ZH_META_KEY = "octop.label.zh";
+const OCTOP_LABEL_EN_META_KEY = "octop.label.en";
+const OCTOP_SUMMARY_ZH_META_KEY = "octop.summary.zh";
+const OCTOP_SUMMARY_EN_META_KEY = "octop.summary.en";
+const PRESENTATION_META_KEYS = new Set([
+  OCTOP_LABEL_ZH_META_KEY,
+  OCTOP_LABEL_EN_META_KEY,
+  OCTOP_SUMMARY_ZH_META_KEY,
+  OCTOP_SUMMARY_EN_META_KEY,
+]);
 
 /**
  * The skill name doubles as the workspace directory slug, so only
@@ -135,6 +149,24 @@ function withEmojiMetadata(
   return [{ key: OCTOP_EMOJI_META_KEY, value }, ...rest];
 }
 
+function withPresentationMetadata(
+  pairs: MetadataEntry[] | undefined,
+  values: SkillFormValues,
+): MetadataEntry[] {
+  const rest = (pairs ?? []).filter(
+    (row) => !PRESENTATION_META_KEYS.has(row.key.trim()),
+  );
+  const presentation = [
+    [OCTOP_LABEL_ZH_META_KEY, values.labelZh],
+    [OCTOP_LABEL_EN_META_KEY, values.labelEn],
+    [OCTOP_SUMMARY_ZH_META_KEY, values.summaryZh],
+    [OCTOP_SUMMARY_EN_META_KEY, values.summaryEn],
+  ]
+    .filter((entry): entry is [string, string] => Boolean(entry[1]?.trim()))
+    .map(([key, value]) => ({ key, value: value.trim() }));
+  return [...presentation, ...rest];
+}
+
 function buildMetadataObject(
   pairs: MetadataEntry[] | undefined,
 ): Record<string, unknown> {
@@ -154,7 +186,10 @@ export function buildSkillMarkdown(values: SkillFormValues): string {
     `description: ${yamlQuote(values.description.trim())}`,
   ];
   const meta = buildMetadataObject(
-    withEmojiMetadata(values.metadata, values.emoji ?? ""),
+    withEmojiMetadata(
+      withPresentationMetadata(values.metadata, values),
+      values.emoji ?? "",
+    ),
   );
   if (Object.keys(meta).length > 0) {
     lines.push("metadata:");
@@ -214,11 +249,19 @@ function parseSkillFormFromDetail(detail: SkillDetail): SkillFormValues {
     flattenMetadata(fm.metadata),
     detail.emoji?.trim() || DEFAULT_SKILL_EMOJI,
   );
+  const presentationValue = (key: string) =>
+    metadata.find((entry) => entry.key === key)?.value ?? "";
   return {
     name: displayName,
     description,
+    labelZh: presentationValue(OCTOP_LABEL_ZH_META_KEY),
+    labelEn: presentationValue(OCTOP_LABEL_EN_META_KEY),
+    summaryZh: presentationValue(OCTOP_SUMMARY_ZH_META_KEY),
+    summaryEn: presentationValue(OCTOP_SUMMARY_EN_META_KEY),
     emoji,
-    metadata,
+    metadata: metadata.filter(
+      (entry) => !PRESENTATION_META_KEYS.has(entry.key),
+    ),
     body: detail.body || "",
     content: detail.raw,
     source: detail.kind === "builtin" ? "builtin" : "workspace",
@@ -490,6 +533,37 @@ export function SkillDrawer({
     </Form.Item>
   );
 
+  const presentationFields = (
+    <>
+      <Form.Item name="labelZh" label={t("skills.displayNameZh")}>
+        <Input
+          placeholder={t("skills.displayNameZhPlaceholder")}
+          disabled={!fieldsEditable}
+        />
+      </Form.Item>
+      <Form.Item name="labelEn" label={t("skills.displayNameEn")}>
+        <Input
+          placeholder={t("skills.displayNameEnPlaceholder")}
+          disabled={!fieldsEditable}
+        />
+      </Form.Item>
+      <Form.Item name="summaryZh" label={t("skills.displaySummaryZh")}>
+        <Input.TextArea
+          placeholder={t("skills.displaySummaryZhPlaceholder")}
+          autoSize={{ minRows: 2, maxRows: 3 }}
+          disabled={!fieldsEditable}
+        />
+      </Form.Item>
+      <Form.Item name="summaryEn" label={t("skills.displaySummaryEn")}>
+        <Input.TextArea
+          placeholder={t("skills.displaySummaryEnPlaceholder")}
+          autoSize={{ minRows: 2, maxRows: 3 }}
+          disabled={!fieldsEditable}
+        />
+      </Form.Item>
+    </>
+  );
+
   const emojiField = (
     <Form.Item
       name="emoji"
@@ -713,6 +787,7 @@ export function SkillDrawer({
                 <div className={styles.createFields}>
                   {nameField}
                   {descriptionField}
+                  {presentationFields}
                   {emojiField}
                   {metadataFields}
                 </div>
@@ -726,6 +801,7 @@ export function SkillDrawer({
           <div className={styles.viewScroll}>
             {nameField}
             {descriptionField}
+            {presentationFields}
             {emojiField}
             <Form.Item name="source" label={t("skills.sourceLabel")}>
               <Input disabled />
diff --git a/dashboard/src/pages/Agent/Skills/components/SkillHubTab.tsx b/dashboard/src/pages/Agent/Skills/components/SkillHubTab.tsx
index 0f3c1ad5..7982e52c 100644
--- a/dashboard/src/pages/Agent/Skills/components/SkillHubTab.tsx
+++ b/dashboard/src/pages/Agent/Skills/components/SkillHubTab.tsx
@@ -49,6 +49,41 @@ function skillDesc(skill: SkillHubSkill): string {
   return skill.description_zh || skill.description || "";
 }
 
+function firstText(...values: unknown[]): string {
+  for (const value of values) {
+    const text = String(value ?? "").trim();
+    if (text) return text;
+  }
+  return "";
+}
+
+function localizedPair(
+  zh: string,
+  en: string,
+): { zh?: string; en?: string } | undefined {
+  const pair: { zh?: string; en?: string } = {};
+  if (zh) pair.zh = zh;
+  if (en && en !== zh) pair.en = en;
+  return Object.keys(pair).length > 0 ? pair : undefined;
+}
+
+function hubInstallPresentation(skill: SkillHubSkill): {
+  label?: { zh?: string; en?: string };
+  summary?: { zh?: string; en?: string };
+} {
+  const raw = skill as SkillHubSkill & Record<string, unknown>;
+  return {
+    label: localizedPair(
+      firstText(raw.display_name_zh, raw.displayName, skill.name),
+      firstText(raw.display_name_en, raw.displayNameEn),
+    ),
+    summary: localizedPair(
+      firstText(skill.description_zh, raw.summary_zh, skill.description),
+      firstText(raw.description_en, raw.summary_en),
+    ),
+  };
+}
+
 function normalizeHubSkill(raw: Record<string, unknown>): SkillHubSkill {
   const slug = String(raw.slug ?? raw.name ?? "");
   return {
@@ -226,10 +261,12 @@ export default function SkillHubTab({ target, onInstalled }: SkillHubTabProps) {
       setDrawerOpen(false);
       setInstallingSlug(skill.slug);
       try {
+        const presentation = hubInstallPresentation(skill);
         const body: Record<string, unknown> = {
           skill_name: skill.slug,
-          display_name: skill.name,
           icon_url: skill.iconUrl ?? null,
+          label: presentation.label,
+          summary: presentation.summary,
           overwrite: true,
         };
         if (installTarget.type === "agent") {
diff --git a/dashboard/src/pages/Agent/Skills/components/SkillPackagesTab.tsx b/dashboard/src/pages/Agent/Skills/components/SkillPackagesTab.tsx
index b3c57332..5f6af122 100644
--- a/dashboard/src/pages/Agent/Skills/components/SkillPackagesTab.tsx
+++ b/dashboard/src/pages/Agent/Skills/components/SkillPackagesTab.tsx
@@ -13,7 +13,6 @@ import { PackageIcon } from "../../../SkillPackages/PackageIcon";
 import { showApiError } from "../../../../utils/showApiToast";
 import { supportsHostSkillPackagesFromConfig } from "../../../Experts/components/agentBackendForm";
 import type { SkillSpec } from "../useSkills";
-import { hubInfoBySlugFromCache } from "./skillHubCache";
 import styles from "../index.module.less";
 
 interface SkillPackagesTabProps {
@@ -26,10 +25,8 @@ interface SkillPackagesTabProps {
 function resolvePackageSkillIcon(
   packageSkill: SkillPackageSkill,
   installed: SkillSpec | undefined,
-  hubIconUrl?: string | null,
 ): { iconUrl?: string; emoji?: string } {
-  const iconUrl =
-    hubIconUrl || packageSkill.icon_url || installed?.iconUrl || undefined;
+  const iconUrl = packageSkill.icon_url || installed?.iconUrl || undefined;
   const emoji = packageSkill.emoji || installed?.emoji;
   return { iconUrl, emoji };
 }
@@ -77,8 +74,6 @@ export default function SkillPackagesTab({
   );
   const [detailLoading, setDetailLoading] = useState(false);
 
-  const hubSkillsBySlug = useMemo(() => hubInfoBySlugFromCache(), []);
-
   useEffect(() => {
     let cancelled = false;
     setLoading(true);
@@ -302,18 +297,13 @@ export default function SkillPackagesTab({
               <div className={styles.packageSkillRowList}>
                 {detailPackage.skills.map((packageSkill) => {
                   const installed = skillsBySlug.get(packageSkill.slug);
-                  const hubInfo = hubSkillsBySlug.get(packageSkill.slug);
                   const { iconUrl, emoji } = resolvePackageSkillIcon(
                     packageSkill,
                     installed,
-                    hubInfo?.iconUrl,
                   );
-                  const displayName =
-                    hubInfo?.name || packageSkill.name || packageSkill.slug;
+                  const displayName = packageSkill.name || packageSkill.slug;
                   const displayDesc =
-                    hubInfo?.description_zh ||
-                    packageSkill.description ||
-                    t("skills.noDescription");
+                    packageSkill.description || t("skills.noDescription");
                   const shadows = workspaceSlugs.has(packageSkill.slug);
                   const canToggle = detailMounted && !!installed && !shadows;
 
diff --git a/dashboard/src/pages/Agent/Skills/components/SkillsTable.tsx b/dashboard/src/pages/Agent/Skills/components/SkillsTable.tsx
index 3020f2b0..abae4174 100644
--- a/dashboard/src/pages/Agent/Skills/components/SkillsTable.tsx
+++ b/dashboard/src/pages/Agent/Skills/components/SkillsTable.tsx
@@ -1,6 +1,6 @@
-import { Popconfirm, Switch, Table, Tag } from "antd";
+import { Popconfirm, Switch, Table, Tag, Tooltip } from "antd";
 import type { ColumnsType } from "antd/es/table";
-import { Trash2 } from "lucide-react";
+import { Eye, Trash2 } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import type { SkillSpec } from "../useSkills";
 import { useSkillDisplayName } from "../skillDisplayNames";
@@ -71,20 +71,23 @@ export default function SkillsTable({
     {
       title: t("skills.table.actions", "操作"),
       key: "actions",
-      width: kind === "custom" ? "12%" : "8%",
+      width: kind === "custom" ? 88 : 56,
       align: "center",
       render: (_v, row) => (
         <div className={styles.tableActions}>
-          <button
-            type="button"
-            className={styles.tableActionBtn}
-            onClick={(e) => {
-              e.stopPropagation();
-              onView(row);
-            }}
-          >
-            {t("common.view")}
-          </button>
+          <Tooltip title={t("common.view")} mouseEnterDelay={0.5}>
+            <button
+              type="button"
+              className={styles.tableActionBtn}
+              aria-label={t("common.view")}
+              onClick={(e) => {
+                e.stopPropagation();
+                onView(row);
+              }}
+            >
+              <Eye size={13} />
+            </button>
+          </Tooltip>
           {kind === "custom" && onDelete ? (
             <Popconfirm
               title={t("skills.deleteConfirmContent", { slug: row.slug })}
@@ -116,6 +119,7 @@ export default function SkillsTable({
       dataSource={skills}
       pagination={false}
       size="middle"
+      scroll={{ x: 720 }}
       onRow={(row) => ({
         onClick: () => onView(row),
         style: { cursor: "pointer" },
diff --git a/dashboard/src/pages/Agent/Skills/components/skillHubCache.ts b/dashboard/src/pages/Agent/Skills/components/skillHubCache.ts
index e20751d3..a52790e4 100644
--- a/dashboard/src/pages/Agent/Skills/components/skillHubCache.ts
+++ b/dashboard/src/pages/Agent/Skills/components/skillHubCache.ts
@@ -1,4 +1,3 @@
-import type { SkillHubInfo } from "./SkillCard";
 import type { SkillHubSkill } from "./SkillHubDetailDrawer";
 
 const RANKINGS_CACHE_KEY = "octop:skillhub-rankings:v1";
@@ -32,15 +31,3 @@ export function saveRankingsCache(data: Record<string, SkillHubSkill[]>): void {
     // localStorage may be full or unavailable; ignore silently.
   }
 }
-
-/** Flatten rankings cache into a slug → presentation map (same as installed skills). */
-export function hubInfoBySlugFromCache(): Map<string, SkillHubInfo> {
-  const bySlug = new Map<string, SkillHubInfo>();
-  const cached = loadRankingsCache() ?? {};
-  for (const rows of Object.values(cached)) {
-    for (const row of rows) {
-      bySlug.set(row.slug, row);
-    }
-  }
-  return bySlug;
-}
diff --git a/dashboard/src/pages/Agent/Skills/skillDisplayNames.test.ts b/dashboard/src/pages/Agent/Skills/skillDisplayNames.test.ts
new file mode 100644
index 00000000..c52523cb
--- /dev/null
+++ b/dashboard/src/pages/Agent/Skills/skillDisplayNames.test.ts
@@ -0,0 +1,14 @@
+import { describe, expect, it } from "vitest";
+import { resolveSkillDisplayName } from "./skillDisplayNames";
+
+describe("resolveSkillDisplayName", () => {
+  it("prefers the API presentation name over the slug", () => {
+    expect(
+      resolveSkillDisplayName({ slug: "pdf", name: "PDF 阅读与编辑" }),
+    ).toBe("PDF 阅读与编辑");
+  });
+
+  it("uses the slug when the API only returns the identity name", () => {
+    expect(resolveSkillDisplayName({ slug: "pdf", name: "pdf" })).toBe("pdf");
+  });
+});
diff --git a/dashboard/src/pages/Agent/Skills/skillDisplayNames.ts b/dashboard/src/pages/Agent/Skills/skillDisplayNames.ts
index ba4733f6..fa09493b 100644
--- a/dashboard/src/pages/Agent/Skills/skillDisplayNames.ts
+++ b/dashboard/src/pages/Agent/Skills/skillDisplayNames.ts
@@ -1,36 +1,22 @@
 /**
- * Localised labels for built-in agent skills shown in the dashboard.
- * Labels are defined in backend ``src/octop/i18n/*.json`` (``skills.*``).
+ * Resolve API-provided presentation names. ``name`` is the localized label
+ * from the list API; ``slug`` is the stable identity.
  */
 
-import { useTranslation } from "react-i18next";
-
 export interface SkillLabelInput {
   slug?: string;
   name?: string;
 }
 
-export function resolveSkillDisplayName(
-  skill: SkillLabelInput,
-  translate: (slug: string) => string,
-): string {
-  const slug = skill.slug ?? skill.name ?? "";
-  if (!slug) return "";
-  const localized = translate(slug);
-  if (localized !== slug) return localized;
-  return skill.name || slug;
+export function resolveSkillDisplayName(skill: SkillLabelInput): string {
+  const slug = (skill.slug ?? "").trim();
+  const name = (skill.name ?? "").trim();
+  if (name && slug && name !== slug) return name;
+  return name || slug;
 }
 
 export function useSkillDisplayName(): (skill: SkillLabelInput) => string {
-  const { t } = useTranslation();
-
-  const translate = (slug: string) => {
-    const key = `skills.${slug}`;
-    const translated = t(key);
-    return translated === key ? slug : translated;
-  };
-
-  return (skill: SkillLabelInput) => resolveSkillDisplayName(skill, translate);
+  return resolveSkillDisplayName;
 }
 
 /** Resolve by slug alone (e.g. expert template preview before agent exists). */
diff --git a/dashboard/src/pages/Agent/Skills/useSkills.ts b/dashboard/src/pages/Agent/Skills/useSkills.ts
index 56ed41be..0f6cc7f1 100644
--- a/dashboard/src/pages/Agent/Skills/useSkills.ts
+++ b/dashboard/src/pages/Agent/Skills/useSkills.ts
@@ -1,6 +1,5 @@
 import { useCallback, useState } from "react";
-import { Modal } from "antd";
-import { message } from "@/utils/antdMessage";
+import { App } from "antd";
 
 import { useTranslation } from "react-i18next";
 import { request } from "../../../api/request";
@@ -94,6 +93,7 @@ export function useSkills(
   options?: { enabled?: boolean },
 ) {
   const { t } = useTranslation();
+  const { modal, message } = App.useApp();
   const enabled = options?.enabled !== false && !!agentId;
 
   const {
@@ -209,7 +209,7 @@ export function useSkills(
     async (skill: SkillSpec): Promise<boolean> => {
       if (!agentId) return false;
       const confirmed = await new Promise<boolean>((resolve) => {
-        Modal.confirm({
+        modal.confirm({
           title: t("common.delete"),
           content: t("skills.deleteConfirmContent", { slug: skill.slug }),
           okText: t("common.delete"),
diff --git a/dashboard/src/pages/Agent/Tools/ToolsPanel.tsx b/dashboard/src/pages/Agent/Tools/ToolsPanel.tsx
index 647bff3c..231f0e50 100644
--- a/dashboard/src/pages/Agent/Tools/ToolsPanel.tsx
+++ b/dashboard/src/pages/Agent/Tools/ToolsPanel.tsx
@@ -55,6 +55,7 @@ import styles from "./ToolsPanel.module.less";
 const CATEGORY_ORDER = [
   "filesystem",
   "orchestration",
+  "interaction",
   "web",
   "media",
   "memory",
@@ -70,6 +71,7 @@ const CATEGORY_ORDER = [
 const CATEGORY_ACCENT: Record<string, string> = {
   filesystem: "#3B82F6",
   orchestration: "#8B5CF6",
+  interaction: "#14B8A6",
   web: "#22C55E",
   media: "#EC4899",
   memory: "#F59E0B",
diff --git a/dashboard/src/pages/Agent/Workspace/components/WorkspaceDrawer.tsx b/dashboard/src/pages/Agent/Workspace/components/WorkspaceDrawer.tsx
index c59f1b75..07e83300 100644
--- a/dashboard/src/pages/Agent/Workspace/components/WorkspaceDrawer.tsx
+++ b/dashboard/src/pages/Agent/Workspace/components/WorkspaceDrawer.tsx
@@ -6,6 +6,7 @@
 
 import { useCallback, useEffect, useState } from "react";
 import {
+  App,
   Tree,
   Empty,
   Spin,
@@ -21,7 +22,6 @@ import {
   Popconfirm,
   Input,
 } from "antd";
-import { message } from "@/utils/antdMessage";
 
 import type { TreeDataNode, TreeProps } from "antd";
 import {
@@ -259,6 +259,7 @@ export default function WorkspaceDrawer({
   onClose,
 }: WorkspaceDrawerProps) {
   const { t } = useTranslation();
+  const { modal, message } = App.useApp();
   const isMobile = useIsMobile();
   const timeZone = useServerTimezone();
   const { agents } = useAgent();
@@ -707,7 +708,7 @@ export default function WorkspaceDrawer({
                   label: t("common.delete"),
                   danger: true,
                   onClick: () => {
-                    Modal.confirm({
+                    modal.confirm({
                       title: target.is_dir
                         ? t("workspace.deleteDirConfirm")
                         : t("workspace.deleteConfirm"),
diff --git a/dashboard/src/pages/Chat/ChatToolDockContext.tsx b/dashboard/src/pages/Chat/ChatToolDockContext.tsx
new file mode 100644
index 00000000..ef35825a
--- /dev/null
+++ b/dashboard/src/pages/Chat/ChatToolDockContext.tsx
@@ -0,0 +1,70 @@
+import { createContext, useContext, useMemo, type ReactNode } from "react";
+import { dockToolUiTabId } from "./utils/dockToolUiTabId";
+import type { DockTab, DockTabId } from "./hooks/useChatDockPanel";
+
+export interface OpenToolUiPanelOptions {
+  callId: string;
+  title?: string;
+  toolName?: string;
+}
+
+interface ChatToolDockContextValue {
+  openToolUiPanel: (opts: OpenToolUiPanelOptions) => void;
+  closeToolUiPanel: (callId: string) => void;
+  focusToolUiPanel: (callId: string) => void;
+  isToolUiDocked: (callId: string | undefined) => boolean;
+}
+
+const ChatToolDockContext = createContext<ChatToolDockContextValue | null>(
+  null,
+);
+
+export function ChatToolDockProvider({
+  dockOpen,
+  openTabs,
+  activeTabId,
+  openToolUiPanel,
+  closeToolUiPanel,
+  focusToolUiPanel,
+  children,
+}: {
+  dockOpen: boolean;
+  openTabs: DockTab[];
+  activeTabId: DockTabId | null;
+  openToolUiPanel: (opts: OpenToolUiPanelOptions) => void;
+  closeToolUiPanel: (callId: string) => void;
+  focusToolUiPanel: (callId: string) => void;
+  children: ReactNode;
+}) {
+  const activeToolUiCallId = useMemo(() => {
+    if (!dockOpen || activeTabId == null) return null;
+    const active = openTabs.find((tab) => tab.id === activeTabId);
+    return active?.kind === "toolUi" ? active.callId : null;
+  }, [dockOpen, openTabs, activeTabId]);
+
+  const value = useMemo<ChatToolDockContextValue>(
+    () => ({
+      openToolUiPanel,
+      closeToolUiPanel,
+      focusToolUiPanel,
+      // Placeholder only while this tool's tab is the visible dock surface.
+      // Closing the dock, the tab, or switching away restores the chat card.
+      isToolUiDocked: (callId) => !!callId && activeToolUiCallId === callId,
+    }),
+    [activeToolUiCallId, openToolUiPanel, closeToolUiPanel, focusToolUiPanel],
+  );
+
+  return (
+    <ChatToolDockContext.Provider value={value}>
+      {children}
+    </ChatToolDockContext.Provider>
+  );
+}
+
+export function useChatToolDock(): ChatToolDockContextValue | null {
+  return useContext(ChatToolDockContext);
+}
+
+export function dockTabIdForToolCall(callId: string): DockTabId {
+  return dockToolUiTabId(callId);
+}
diff --git a/dashboard/src/pages/Chat/chatBrowserPanel.partial.less b/dashboard/src/pages/Chat/chatBrowserPanel.partial.less
index bc26bfbd..2b0269c8 100644
--- a/dashboard/src/pages/Chat/chatBrowserPanel.partial.less
+++ b/dashboard/src/pages/Chat/chatBrowserPanel.partial.less
@@ -221,6 +221,39 @@
   justify-content: center;
 }
 
+.dockToolUiBody {
+  flex: 1;
+  min-width: 0;
+  min-height: 0;
+  width: 100%;
+  overflow: auto;
+  padding: 12px;
+  box-sizing: border-box;
+
+  /* Stretch plugin cards that use chat-column maxWidth (often inline). */
+  .toolUiRendererWrap,
+  [data-octop-tool-renderer],
+  [data-octop-plugin-ui],
+  .octop-builtin-ui-fallback {
+    display: block;
+    width: 100% !important;
+    max-width: 100% !important;
+    box-sizing: border-box;
+  }
+}
+
+.dockToolUiMissing {
+  flex: 1;
+  min-height: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 24px;
+  color: var(--fn-text-tertiary);
+  font-size: 13px;
+  text-align: center;
+}
+
 .dockFileList {
   flex: 1;
   min-height: 0;
diff --git a/dashboard/src/pages/Chat/chatContextChips.partial.less b/dashboard/src/pages/Chat/chatContextChips.partial.less
index b9d9c817..7e4f0ef5 100644
--- a/dashboard/src/pages/Chat/chatContextChips.partial.less
+++ b/dashboard/src/pages/Chat/chatContextChips.partial.less
@@ -48,6 +48,17 @@
   height: 16px;
 }
 
+.contextChipIconImg {
+  width: 14px;
+  height: 14px;
+  object-fit: contain;
+}
+
+.contextChipCompact .contextChipIconImg {
+  width: 12px;
+  height: 12px;
+}
+
 .contextChipLabel {
   min-width: 0;
   flex: 1;
diff --git a/dashboard/src/pages/Chat/chatInputCore.partial.less b/dashboard/src/pages/Chat/chatInputCore.partial.less
index c0365e22..eba3f8f6 100644
--- a/dashboard/src/pages/Chat/chatInputCore.partial.less
+++ b/dashboard/src/pages/Chat/chatInputCore.partial.less
@@ -18,6 +18,22 @@
   }
 }
 
+.askQuestionDock {
+  flex-shrink: 0;
+  padding: 0 20px 8px;
+  background: var(--fn-bg-elevated, #fff);
+
+  @media (max-width: 767px) {
+    padding: 0 12px 6px;
+  }
+}
+
+.askQuestionDockInner {
+  width: 100%;
+  max-width: var(--chat-column-max, 960px);
+  margin: 0 auto;
+}
+
 .chatInput {
   flex-shrink: 0;
   padding: 16px 24px 20px;
diff --git a/dashboard/src/pages/Chat/chatInputPickers.partial.less b/dashboard/src/pages/Chat/chatInputPickers.partial.less
index 74fa80cb..ac246312 100644
--- a/dashboard/src/pages/Chat/chatInputPickers.partial.less
+++ b/dashboard/src/pages/Chat/chatInputPickers.partial.less
@@ -514,6 +514,13 @@
   font-size: 13px;
   font-weight: 600;
   line-height: 1;
+  overflow: hidden;
+}
+
+.skillPickerAvatarImg {
+  width: 18px;
+  height: 18px;
+  object-fit: contain;
 }
 
 .skillPickerText {
diff --git a/dashboard/src/pages/Chat/chatMessages.partial.less b/dashboard/src/pages/Chat/chatMessages.partial.less
index 7c9cc3f4..0d296912 100644
--- a/dashboard/src/pages/Chat/chatMessages.partial.less
+++ b/dashboard/src/pages/Chat/chatMessages.partial.less
@@ -709,6 +709,104 @@
   max-width: 100%;
 }
 
+.toolUiRendererWrap {
+  position: relative;
+  display: block;
+  width: 100%;
+  max-width: 100%;
+  min-width: 0;
+  box-sizing: border-box;
+  /* Normal block flow: cards with maxWidth keep filling up to that cap;
+     cards with width:100% fill the message column. Do not use fit-content /
+     inline-grid here — those shrink to content width. */
+
+  .toolUiDockActions {
+    position: absolute;
+    z-index: 2;
+    opacity: 0;
+    pointer-events: none;
+    transition: opacity 0.15s ease;
+  }
+
+  &:hover .toolUiDockActions,
+  &:focus-within .toolUiDockActions {
+    opacity: 1;
+    pointer-events: auto;
+  }
+
+  @media (hover: none) {
+    .toolUiDockActions {
+      opacity: 1;
+      pointer-events: auto;
+    }
+  }
+}
+
+.toolUiDockBtn {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 28px;
+  height: 28px;
+  border: 1px solid var(--fn-border-secondary);
+  border-radius: 8px;
+  background: color-mix(in srgb, var(--fn-bg-primary) 92%, transparent);
+  color: var(--fn-text-secondary);
+  box-shadow: 0 1px 2px rgba(15, 23, 42, 0.08);
+  cursor: pointer;
+  backdrop-filter: blur(4px);
+
+  &:hover {
+    color: var(--fn-color-brand);
+    border-color: color-mix(in srgb, var(--fn-color-brand) 38%, transparent);
+  }
+
+  &:focus-visible {
+    outline: 2px solid var(--fn-color-brand);
+    outline-offset: 2px;
+  }
+}
+
+.toolUiDockPlaceholder {
+  display: inline-flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 8px;
+  max-width: 100%;
+  padding: 8px 12px;
+  border: 1px dashed var(--fn-border-secondary);
+  border-radius: 10px;
+  background: color-mix(in srgb, var(--fn-bg-secondary) 70%, transparent);
+  color: var(--fn-text-secondary);
+  text-align: left;
+  cursor: pointer;
+
+  &:hover {
+    border-color: color-mix(in srgb, var(--fn-color-brand) 38%, transparent);
+    color: var(--fn-color-brand);
+  }
+
+  &:focus-visible {
+    outline: 2px solid var(--fn-color-brand);
+    outline-offset: 2px;
+  }
+}
+
+.toolUiDockPlaceholderTitle {
+  font-size: 13px;
+  font-weight: 500;
+  color: var(--fn-text-primary);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.toolUiDockPlaceholderHint {
+  font-size: 12px;
+  color: var(--fn-text-tertiary);
+  flex-shrink: 0;
+}
+
 .assistantTurnAnswer {
   min-width: 0;
 }
diff --git a/dashboard/src/pages/Chat/components/AskQuestionCard.module.less b/dashboard/src/pages/Chat/components/AskQuestionCard.module.less
new file mode 100644
index 00000000..d7e613ca
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/AskQuestionCard.module.less
@@ -0,0 +1,342 @@
+.card {
+  border: 1px solid var(--fn-border-primary);
+  border-radius: var(--fn-radius-lg);
+  padding: 14px 16px;
+  background: 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;
+  justify-content: space-between;
+  margin-bottom: 12px;
+}
+
+.title {
+  font-weight: 600;
+  font-size: 14px;
+  color: var(--fn-text-primary);
+}
+
+.progress {
+  padding: 2px 8px;
+  border: 1px solid var(--fn-border-secondary);
+  border-radius: var(--fn-radius-full);
+  background: var(--fn-bg-secondary);
+  font-size: 12px;
+  line-height: 18px;
+  color: var(--fn-text-tertiary);
+  font-variant-numeric: tabular-nums;
+}
+
+.steps {
+  max-height: min(420px, 42vh);
+  overflow-y: auto;
+}
+
+.block {
+  padding: 4px 0 14px;
+}
+
+.questionRow {
+  display: flex;
+  gap: 8px;
+  margin-bottom: 8px;
+  align-items: baseline;
+}
+
+.qIndex {
+  color: var(--fn-text-tertiary);
+  font-variant-numeric: tabular-nums;
+  flex-shrink: 0;
+}
+
+.qText {
+  font-weight: 500;
+  line-height: 1.5;
+  color: var(--fn-text-primary);
+}
+
+.qHeader {
+  color: var(--fn-text-secondary);
+  font-weight: 400;
+}
+
+.options {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  padding-left: 20px;
+}
+
+.option {
+  display: flex;
+  align-items: flex-start;
+  gap: 10px;
+  text-align: left;
+  min-height: 42px;
+  padding: 9px 11px;
+  border: 1px solid var(--fn-border-primary);
+  border-radius: var(--fn-radius-md);
+  background: var(--fn-bg-primary);
+  color: var(--fn-text-primary);
+  cursor: pointer;
+  transition:
+    border-color var(--fn-transition-fast),
+    background var(--fn-transition-fast),
+    box-shadow var(--fn-transition-fast),
+    transform var(--fn-transition-fast);
+
+  &:hover:not(:disabled) {
+    border-color: var(--fn-color-brand);
+    background: var(--fn-bg-hover);
+    box-shadow: var(--fn-shadow-xs);
+    transform: translateY(-1px);
+  }
+
+  &:active:not(:disabled) {
+    transform: scale(0.99);
+  }
+
+  &:focus-visible {
+    outline: 2px solid var(--fn-color-brand);
+    outline-offset: 2px;
+  }
+
+  &:disabled {
+    cursor: default;
+  }
+}
+
+.selected {
+  border-color: var(--fn-color-brand);
+  background: var(--fn-color-brand-bg);
+}
+
+.key {
+  flex-shrink: 0;
+  width: 18px;
+  height: 18px;
+  border-radius: 4px;
+  border: 1px solid var(--fn-border-primary);
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 11px;
+  font-weight: 600;
+  color: var(--fn-text-secondary);
+  margin-top: 1px;
+}
+
+.selected .key {
+  border-color: var(--fn-color-brand);
+  color: var(--fn-color-on-brand);
+  background: var(--fn-color-brand);
+}
+
+.optionBody {
+  display: flex;
+  flex-direction: column;
+  min-width: 0;
+}
+
+.optionLabel {
+  font-weight: 500;
+  line-height: 1.4;
+}
+
+.optionDesc {
+  font-size: 12px;
+  line-height: 1.5;
+  color: var(--fn-text-tertiary);
+}
+
+.freeText {
+  margin-top: 6px;
+
+  &:global(.octop-input) {
+    border-color: var(--fn-border-input);
+    border-radius: var(--fn-radius-md);
+    background: var(--fn-bg-primary);
+
+    &:focus,
+    &:focus-within {
+      border-color: var(--fn-color-brand);
+      box-shadow: 0 0 0 2px var(--fn-color-brand-glow);
+    }
+  }
+}
+
+.doneAnswer {
+  padding-left: 20px;
+  font-size: 13px;
+  color: var(--fn-text-secondary);
+  line-height: 1.5;
+}
+
+.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;
+  }
+
+  &:disabled {
+    cursor: not-allowed;
+    opacity: 0.4;
+  }
+}
+
+.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);
+  }
+}
+
+.secondaryAction {
+  color: var(--fn-text-secondary);
+  background: var(--fn-bg-primary);
+  border-color: var(--fn-border-primary);
+
+  &:hover:not(:disabled) {
+    color: var(--fn-text-brand);
+    background: var(--fn-bg-hover);
+    border-color: var(--fn-color-brand-border);
+  }
+}
+
+.skipAction {
+  margin-left: auto;
+  min-width: auto;
+  padding-inline: 10px;
+  color: var(--fn-text-tertiary);
+  background: transparent;
+
+  &:hover:not(:disabled) {
+    color: var(--fn-text-secondary);
+    background: var(--fn-bg-secondary);
+  }
+}
+
+.completedCard {
+  padding: 0;
+  border-color: transparent;
+  background: transparent;
+  box-shadow: none;
+}
+
+.completedSummary {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+  padding: 8px 10px;
+  border: 1px solid var(--fn-border-secondary);
+  border-radius: var(--fn-radius-md);
+  color: var(--fn-text-secondary);
+  background: var(--fn-bg-secondary);
+  cursor: pointer;
+  list-style: none;
+  font-size: 13px;
+
+  &::-webkit-details-marker {
+    display: none;
+  }
+
+  &::before {
+    content: "›";
+    flex-shrink: 0;
+    color: var(--fn-text-tertiary);
+    transition: transform 0.15s ease;
+  }
+}
+
+.completedCard[open] .completedSummary::before {
+  transform: rotate(90deg);
+}
+
+.completedStatus {
+  flex: 1;
+  min-width: 0;
+  font-weight: 500;
+}
+
+.expandHint {
+  flex-shrink: 0;
+  font-size: 12px;
+  color: var(--fn-text-tertiary);
+}
+
+.completedQuestions {
+  margin-top: 6px;
+  padding: 10px 12px 0;
+  border-left: 2px solid var(--fn-border-primary);
+}
+
+@media (max-width: 767px) {
+  .card {
+    padding: 12px;
+  }
+
+  .options,
+  .doneAnswer {
+    padding-left: 0;
+  }
+
+  .option {
+    min-height: 44px;
+  }
+
+  .actions {
+    gap: 6px;
+  }
+
+  .actionButton {
+    height: 36px;
+    padding-inline: 13px;
+  }
+}
diff --git a/dashboard/src/pages/Chat/components/AskQuestionCard.test.tsx b/dashboard/src/pages/Chat/components/AskQuestionCard.test.tsx
new file mode 100644
index 00000000..a87bb33c
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/AskQuestionCard.test.tsx
@@ -0,0 +1,96 @@
+import { fireEvent, render, screen } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+import AskQuestionCard from "./AskQuestionCard";
+
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({
+    t: (key: string) => key,
+  }),
+}));
+
+const questions = [
+  {
+    header: "Framework",
+    question: "Which framework?",
+    options: [{ label: "React" }, { label: "Vue" }],
+  },
+  {
+    header: "Database",
+    question: "Which databases?",
+    multi_select: true,
+    options: [{ label: "PostgreSQL" }, { label: "Redis" }],
+  },
+];
+
+describe("AskQuestionCard", () => {
+  it("shows exactly one question at a time", () => {
+    render(
+      <AskQuestionCard
+        questions={questions}
+        status="pending"
+        onSubmit={vi.fn()}
+      />,
+    );
+
+    expect(screen.getByText("Which framework?")).toBeInTheDocument();
+    expect(screen.queryByText("Which databases?")).not.toBeInTheDocument();
+
+    fireEvent.click(screen.getByRole("button", { name: /React/ }));
+
+    expect(screen.queryByText("Which framework?")).not.toBeInTheDocument();
+    expect(screen.getByText("Which databases?")).toBeInTheDocument();
+  });
+
+  it("collects all answers before submitting once", () => {
+    const onSubmit = vi.fn();
+    render(
+      <AskQuestionCard
+        questions={questions}
+        status="pending"
+        onSubmit={onSubmit}
+      />,
+    );
+
+    fireEvent.click(screen.getByRole("button", { name: /React/ }));
+    fireEvent.click(screen.getByRole("button", { name: /PostgreSQL/ }));
+    fireEvent.click(screen.getByRole("button", { name: "chat.ask.review" }));
+
+    expect(screen.getByText("Which framework?")).toBeInTheDocument();
+    expect(screen.getByText("Which databases?")).toBeInTheDocument();
+
+    fireEvent.click(screen.getByRole("button", { name: "chat.ask.submit" }));
+    expect(onSubmit).toHaveBeenCalledWith(
+      "Framework: React\nDatabase: PostgreSQL",
+    );
+  });
+
+  it("renders open-ended questions as a text field directly", () => {
+    render(
+      <AskQuestionCard
+        questions={[{ question: "Anything else?" }]}
+        status="pending"
+        onSubmit={vi.fn()}
+      />,
+    );
+
+    expect(
+      screen.getByPlaceholderText("chat.ask.freeTextPlaceholder"),
+    ).toBeInTheDocument();
+    expect(screen.queryByText("chat.ask.other")).not.toBeInTheDocument();
+  });
+
+  it("collapses an answered question set in message history", () => {
+    const { container } = render(
+      <AskQuestionCard questions={questions} status="approved" />,
+    );
+
+    const details = container.querySelector("details");
+    expect(details).not.toHaveAttribute("open");
+    expect(screen.getByText("chat.ask.answeredSummary")).toBeInTheDocument();
+    expect(screen.queryByText("Which framework?")).not.toBeVisible();
+
+    fireEvent.click(container.querySelector("summary")!);
+    expect(details).toHaveAttribute("open");
+    expect(screen.getByText("Which framework?")).toBeVisible();
+  });
+});
diff --git a/dashboard/src/pages/Chat/components/AskQuestionCard.tsx b/dashboard/src/pages/Chat/components/AskQuestionCard.tsx
new file mode 100644
index 00000000..19020530
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/AskQuestionCard.tsx
@@ -0,0 +1,320 @@
+import { useState } from "react";
+import { Input } from "antd";
+import { useTranslation } from "react-i18next";
+import type { AskQuestion } from "../../../api/types/hitl";
+import styles from "./AskQuestionCard.module.less";
+
+const { TextArea } = Input;
+
+/** Sentinel choice that reveals the free-text input for a question. */
+const OTHER = "__other__";
+
+const OPTION_KEYS = ["A", "B", "C", "D", "E", "F"] as const;
+
+export interface AskQuestionCardProps {
+  questions: AskQuestion[];
+  status: "pending" | "approved" | "rejected";
+  onSubmit?: (message: string) => void;
+}
+
+/** What the user picked for one question. */
+type Answer = { picked: string[]; other: string };
+
+/** Resolve one question's answer to display text, or `null` when unanswered. */
+function answerText(question: AskQuestion, answer: Answer): string | null {
+  const labels = answer.picked.filter((v) => v !== OTHER);
+  const wantsOther = answer.picked.includes(OTHER) || !question.options?.length;
+  const other = answer.other.trim();
+  if (wantsOther && other) labels.push(other);
+  if (!labels.length) return null;
+  return labels.join("; ");
+}
+
+interface QuestionCardProps {
+  question: AskQuestion;
+  index: number;
+  /** Stepped flow state for this question. */
+  state: "done" | "current";
+  answer: Answer;
+  onAnswer: (answer: Answer, changed: string) => void;
+}
+
+function QuestionCard({
+  question,
+  index,
+  state,
+  answer,
+  onAnswer,
+}: QuestionCardProps) {
+  const { t } = useTranslation();
+  const options = question.options ?? [];
+  const done = state === "done";
+  const interactive = state === "current";
+  const openEnded = options.length === 0;
+  const hasOther = openEnded || answer.picked.includes(OTHER);
+
+  const toggle = (label: string) => {
+    if (!interactive) return;
+    if (question.multi_select) {
+      const picked = answer.picked.includes(label)
+        ? answer.picked.filter((v) => v !== label)
+        : [...answer.picked, label];
+      onAnswer({ ...answer, picked }, label);
+    } else {
+      onAnswer({ ...answer, picked: [label] }, label);
+    }
+  };
+
+  const confirmed = answerText(question, answer);
+
+  return (
+    <div className={styles.block}>
+      <div className={styles.questionRow}>
+        <span className={styles.qIndex}>{index + 1}.</span>
+        <span className={styles.qText}>
+          {question.header ? (
+            <span className={styles.qHeader}>{question.header} · </span>
+          ) : null}
+          {question.question}
+        </span>
+      </div>
+
+      {done && confirmed !== null ? (
+        <div className={styles.doneAnswer}>{confirmed}</div>
+      ) : (
+        <div
+          className={`${styles.options} ${interactive ? "" : styles.locked}`}
+        >
+          {options.map((option, optionIndex) => {
+            const key = OPTION_KEYS[optionIndex] ?? String(optionIndex + 1);
+            const selected = answer.picked.includes(option.label);
+            return (
+              <button
+                key={option.label}
+                type="button"
+                className={`${styles.option} ${
+                  selected ? styles.selected : ""
+                }`}
+                disabled={!interactive}
+                onClick={() => toggle(option.label)}
+              >
+                <span className={styles.key}>{key}</span>
+                <span className={styles.optionBody}>
+                  <span className={styles.optionLabel}>{option.label}</span>
+                  {option.description ? (
+                    <span className={styles.optionDesc}>
+                      {option.description}
+                    </span>
+                  ) : null}
+                </span>
+              </button>
+            );
+          })}
+          {!openEnded ? (
+            <button
+              type="button"
+              className={`${styles.option} ${hasOther ? styles.selected : ""}`}
+              disabled={!interactive}
+              onClick={() => toggle(OTHER)}
+            >
+              <span className={styles.key}>
+                {options.length < OPTION_KEYS.length
+                  ? OPTION_KEYS[options.length]
+                  : ""}
+              </span>
+              <span className={styles.optionBody}>
+                <span className={styles.optionLabel}>
+                  {t("chat.ask.other")}
+                </span>
+              </span>
+            </button>
+          ) : null}
+          {interactive && hasOther ? (
+            <TextArea
+              className={styles.freeText}
+              autoSize={{ minRows: 1, maxRows: 4 }}
+              value={answer.other}
+              placeholder={t("chat.ask.freeTextPlaceholder")}
+              onChange={(e) =>
+                onAnswer({ ...answer, other: e.target.value }, OTHER)
+              }
+            />
+          ) : null}
+        </div>
+      )}
+    </div>
+  );
+}
+
+function AskQuestionCard({
+  questions,
+  status,
+  onSubmit,
+}: AskQuestionCardProps) {
+  const { t } = useTranslation();
+  const interactive = status === "pending" && Boolean(onSubmit);
+  const [answers, setAnswers] = useState<Answer[]>(() =>
+    questions.map(() => ({ picked: [], other: "" })),
+  );
+  const [current, setCurrent] = useState(0);
+  const [reviewing, setReviewing] = useState(false);
+
+  const total = questions.length;
+  const resolved = questions.map((q, i) => answerText(q, answers[i]));
+  const currentAnswer = resolved[current];
+  const isLast = current === total - 1;
+
+  if (total === 0) return null;
+
+  if (!interactive) {
+    return (
+      <details className={`${styles.card} ${styles.completedCard}`}>
+        <summary className={styles.completedSummary}>
+          <span className={styles.completedStatus}>
+            {status === "approved"
+              ? t("chat.ask.answeredSummary", { count: questions.length })
+              : t("chat.ask.dismissedSummary", { count: questions.length })}
+          </span>
+          <span className={styles.expandHint}>{t("chat.ask.expand")}</span>
+        </summary>
+        <div className={styles.completedQuestions}>
+          {questions.map((question, index) => (
+            <div key={index} className={styles.block}>
+              <div className={styles.questionRow}>
+                <span className={styles.qIndex}>{index + 1}.</span>
+                <span className={styles.qText}>{question.question}</span>
+              </div>
+            </div>
+          ))}
+        </div>
+      </details>
+    );
+  }
+
+  const advance = () => {
+    if (isLast) {
+      setReviewing(true);
+    } else {
+      setCurrent((c) => c + 1);
+    }
+  };
+
+  const submit = () => {
+    if (!onSubmit || resolved.some((text) => text === null)) return;
+    const body = questions
+      .map((q, i) => {
+        const head = q.header?.trim() || q.question;
+        return `${head}: ${resolved[i]}`;
+      })
+      .join("\n");
+    onSubmit(body);
+  };
+
+  const skip = () => {
+    onSubmit?.(t("chat.ask.skipMessage"));
+  };
+
+  const setAnswerAt = (index: number, answer: Answer, changed: string) => {
+    setAnswers((prev) => prev.map((a, i) => (i === index ? answer : a)));
+    // Single-select: picking a preset option is a commitment, so advance
+    // straight to the next question. Multi-select needs explicit confirmation
+    // to know when the user is done toggling; "other" needs free text.
+    const question = questions[index];
+    if (!question.multi_select && changed !== OTHER) {
+      if (index === total - 1) {
+        setReviewing(true);
+      } else {
+        setCurrent((c) => c + 1);
+      }
+    }
+  };
+
+  return (
+    <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>
+      </div>
+
+      <div className={styles.steps}>
+        {reviewing ? (
+          questions.map((question, index) => (
+            <QuestionCard
+              key={index}
+              question={question}
+              index={index}
+              state="done"
+              answer={answers[index]}
+              onAnswer={(answer, changed) =>
+                setAnswerAt(index, answer, changed)
+              }
+            />
+          ))
+        ) : (
+          <QuestionCard
+            key={current}
+            question={questions[current]}
+            index={current}
+            state="current"
+            answer={answers[current]}
+            onAnswer={(answer, changed) =>
+              setAnswerAt(current, answer, changed)
+            }
+          />
+        )}
+      </div>
+
+      <div className={styles.actions}>
+        {reviewing ? (
+          <>
+            <button
+              type="button"
+              className={`${styles.actionButton} ${styles.primaryAction}`}
+              onClick={submit}
+            >
+              {t("chat.ask.submit")}
+            </button>
+            <button
+              type="button"
+              className={`${styles.actionButton} ${styles.secondaryAction}`}
+              onClick={() => setReviewing(false)}
+            >
+              {t("chat.ask.back")}
+            </button>
+          </>
+        ) : (
+          <>
+            <button
+              type="button"
+              className={`${styles.actionButton} ${styles.primaryAction}`}
+              disabled={currentAnswer === null}
+              onClick={advance}
+            >
+              {isLast ? t("chat.ask.review") : t("chat.ask.next")}
+            </button>
+            {current > 0 ? (
+              <button
+                type="button"
+                className={`${styles.actionButton} ${styles.secondaryAction}`}
+                onClick={() => setCurrent((value) => value - 1)}
+              >
+                {t("chat.ask.back")}
+              </button>
+            ) : null}
+            <button
+              type="button"
+              className={`${styles.actionButton} ${styles.skipAction}`}
+              onClick={skip}
+            >
+              {t("chat.ask.skip")}
+            </button>
+          </>
+        )}
+      </div>
+    </div>
+  );
+}
+
+export default AskQuestionCard;
diff --git a/dashboard/src/pages/Chat/components/ChatDockPanel.tsx b/dashboard/src/pages/Chat/components/ChatDockPanel.tsx
index 11469835..135dab32 100644
--- a/dashboard/src/pages/Chat/components/ChatDockPanel.tsx
+++ b/dashboard/src/pages/Chat/components/ChatDockPanel.tsx
@@ -13,6 +13,7 @@ import {
   FilePen,
   FolderOpen,
   Globe,
+  Puzzle,
   RefreshCw,
   Terminal,
   X,
@@ -29,6 +30,7 @@ import { dockFileBasename } from "../utils/dockFilePath";
 import styles from "../index.module.less";
 import ChatDockFileList from "./ChatDockFileList";
 import FilePanelContent from "./FilePanelContent";
+import ChatDockToolUiContent from "./ChatDockToolUiContent";
 
 const TerminalPage = lazy(() => import("../../Control/Terminal"));
 
@@ -45,6 +47,8 @@ interface ChatDockPanelProps {
   onCloseTab: (id: DockTabId) => void;
   onOpenFile: (path: string) => void;
   browserEnvironment?: DisplayEnvironment;
+  threadId?: string | null;
+  isStreamingTurn?: boolean;
   /**
    * False while the chat dock shell is closed but keep-alive mounted.
    * Mirrors Workbench ``isVisible`` so terminal does not treat hide as a
@@ -70,6 +74,8 @@ const ChatDockPanel: React.FC<ChatDockPanelProps> = ({
   onCloseTab,
   onOpenFile,
   browserEnvironment = "desktop",
+  threadId = null,
+  isStreamingTurn = false,
   surfaceVisible = true,
 }) => {
   const { t } = useTranslation();
@@ -82,6 +88,10 @@ const ChatDockPanel: React.FC<ChatDockPanelProps> = ({
   const [mountedFilePaths, setMountedFilePaths] = useState<string[]>(() =>
     openTabs.filter((tab) => tab.kind === "file").map((tab) => tab.path),
   );
+  const [mountedToolUiCallIds, setMountedToolUiCallIds] = useState<string[]>(
+    () =>
+      openTabs.filter((tab) => tab.kind === "toolUi").map((tab) => tab.callId),
+  );
   const [fileActionsByPath, setFileActionsByPath] = useState<
     Record<string, ReactNode>
   >({});
@@ -98,6 +108,9 @@ const ChatDockPanel: React.FC<ChatDockPanelProps> = ({
     const openFilePaths = new Set(
       openTabs.filter((tab) => tab.kind === "file").map((tab) => tab.path),
     );
+    const openToolUiCallIds = new Set(
+      openTabs.filter((tab) => tab.kind === "toolUi").map((tab) => tab.callId),
+    );
     setMountedFilePaths((prev) => {
       const next = prev.filter((path) => openFilePaths.has(path));
       let changed = next.length !== prev.length;
@@ -109,6 +122,17 @@ const ChatDockPanel: React.FC<ChatDockPanelProps> = ({
       }
       return changed ? next : prev;
     });
+    setMountedToolUiCallIds((prev) => {
+      const next = prev.filter((callId) => openToolUiCallIds.has(callId));
+      let changed = next.length !== prev.length;
+      for (const callId of openToolUiCallIds) {
+        if (!next.includes(callId)) {
+          next.push(callId);
+          changed = true;
+        }
+      }
+      return changed ? next : prev;
+    });
     setFileActionsByPath((prev) => {
       let changed = false;
       const next: Record<string, ReactNode> = {};
@@ -172,6 +196,15 @@ const ChatDockPanel: React.FC<ChatDockPanelProps> = ({
               <Terminal size={16} strokeWidth={2} aria-hidden />
               <span>{t("chat.dockTerminalTitle", "终端")}</span>
             </>
+          ) : tab.kind === "toolUi" ? (
+            <>
+              <Puzzle size={16} strokeWidth={2} aria-hidden />
+              <span title={tab.title ?? tab.toolName}>
+                {tab.title ??
+                  tab.toolName ??
+                  t("chat.dockToolUiTitle", "Plugin tool")}
+              </span>
+            </>
           ) : (
             <>
               <FilePen size={16} strokeWidth={2} aria-hidden />
@@ -312,6 +345,26 @@ const ChatDockPanel: React.FC<ChatDockPanelProps> = ({
             </Suspense>
           </div>
         )}
+
+        {mountedToolUiCallIds.map((callId) => {
+          const isActive =
+            activeTab?.kind === "toolUi" && activeTab.callId === callId;
+          return (
+            <div
+              key={callId}
+              className={styles.dockTabBody}
+              hidden={!isActive}
+              style={{ display: isActive ? "flex" : "none" }}
+            >
+              <ChatDockToolUiContent
+                threadId={threadId}
+                callId={callId}
+                agentId={agentId}
+                isStreamingTurn={isStreamingTurn}
+              />
+            </div>
+          );
+        })}
       </div>
     </ChatDockPanelShell>
   );
diff --git a/dashboard/src/pages/Chat/components/ChatDockPanels.tsx b/dashboard/src/pages/Chat/components/ChatDockPanels.tsx
index 26ce7dbd..e8c13c26 100644
--- a/dashboard/src/pages/Chat/components/ChatDockPanels.tsx
+++ b/dashboard/src/pages/Chat/components/ChatDockPanels.tsx
@@ -18,6 +18,8 @@ interface ChatDockPanelsProps {
   onCloseTab: (id: DockTabId) => void;
   onOpenFile: (path: string) => void;
   browserEnvironment: DisplayEnvironment;
+  threadId?: string | null;
+  isStreamingTurn?: boolean;
   onModeChange: (mode: PanelMode) => void;
   onClose: () => void;
   onResizeStart: (
@@ -50,6 +52,8 @@ export default function ChatDockPanels({
   onCloseTab,
   onOpenFile,
   browserEnvironment,
+  threadId = null,
+  isStreamingTurn = false,
   onModeChange,
   onClose,
   onResizeStart,
@@ -84,6 +88,8 @@ export default function ChatDockPanels({
       onCloseTab={onCloseTab}
       onOpenFile={onOpenFile}
       browserEnvironment={browserEnvironment}
+      threadId={threadId}
+      isStreamingTurn={isStreamingTurn}
       surfaceVisible={visible}
     />
   );
diff --git a/dashboard/src/pages/Chat/components/ChatDockToolUiContent.tsx b/dashboard/src/pages/Chat/components/ChatDockToolUiContent.tsx
new file mode 100644
index 00000000..cfa0e934
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/ChatDockToolUiContent.tsx
@@ -0,0 +1,45 @@
+import { useTranslation } from "react-i18next";
+import { useToolMessageByCallId } from "../hooks/useToolMessageByCallId";
+import { ToolDetailsInline } from "./MessageBubble";
+import styles from "../index.module.less";
+
+interface ChatDockToolUiContentProps {
+  threadId: string | null;
+  callId: string;
+  agentId: string;
+  isStreamingTurn: boolean;
+}
+
+export default function ChatDockToolUiContent({
+  threadId,
+  callId,
+  agentId,
+  isStreamingTurn,
+}: ChatDockToolUiContentProps) {
+  const { t } = useTranslation();
+  const message = useToolMessageByCallId(threadId, callId);
+
+  if (!message?.toolData) {
+    return (
+      <div className={styles.dockToolUiMissing}>
+        {t(
+          "chat.dockToolUiMissing",
+          "Tool result is no longer available in this conversation.",
+        )}
+      </div>
+    );
+  }
+
+  const isStreaming = message.status === "streaming" && isStreamingTurn;
+
+  return (
+    <div className={styles.dockToolUiBody}>
+      <ToolDetailsInline
+        toolData={message.toolData}
+        isStreaming={isStreaming}
+        agentId={agentId}
+        forceInline
+      />
+    </div>
+  );
+}
diff --git a/dashboard/src/pages/Chat/components/ChatInput.tsx b/dashboard/src/pages/Chat/components/ChatInput.tsx
index 89bab4ba..b13b8319 100644
--- a/dashboard/src/pages/Chat/components/ChatInput.tsx
+++ b/dashboard/src/pages/Chat/components/ChatInput.tsx
@@ -7,8 +7,7 @@ import {
   useImperativeHandle,
 } from "react";
 import { useTranslation } from "react-i18next";
-import { Modal } from "antd";
-import { message as antMessage } from "@/utils/antdMessage";
+import { App } from "antd";
 
 import { useIsMobile } from "../../../hooks/useIsMobile";
 import { useSlashCommands } from "../../../hooks/useSlashCommands";
@@ -151,6 +150,7 @@ const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
     ref,
   ) {
     const { t, i18n } = useTranslation();
+    const { modal, message: antMessage } = App.useApp();
     const { commands: slashCommands, labelFor } = useSlashCommands("ui");
     const isMobile = useIsMobile();
     useKeyboardOffset();
@@ -488,7 +488,7 @@ const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
         };
 
         if (text.trim() || attachments.length > 0) {
-          Modal.confirm({
+          modal.confirm({
             title: t("chat.queue.reclaimOverwriteTitle"),
             content: t("chat.queue.reclaimOverwrite"),
             okText: t("common.confirm", "确认"),
diff --git a/dashboard/src/pages/Chat/components/ChatInputPreviewBar.tsx b/dashboard/src/pages/Chat/components/ChatInputPreviewBar.tsx
index 1aadf137..b63f696f 100644
--- a/dashboard/src/pages/Chat/components/ChatInputPreviewBar.tsx
+++ b/dashboard/src/pages/Chat/components/ChatInputPreviewBar.tsx
@@ -12,7 +12,7 @@ import { knowledgeIconForName } from "../../KnowledgeBases/knowledgeIcons";
 import { inferKindFromNameAndMime } from "../utils/chatAttachments";
 import { ChatMediaPlayer } from "./ChatMediaPlayer";
 import ContextChip from "./ContextChip";
-import { skillChipLabel } from "../utils/skillChipLabel";
+import { skillChipIcon } from "../utils/skillChipIcon";
 import { useSkillDisplayName } from "../../Agent/Skills/skillDisplayNames";
 import { modelShortLabel } from "../../../utils/modelOptions";
 import styles from "../index.module.less";
@@ -247,7 +247,7 @@ export default function ChatInputPreviewBar({
             <ContextChip
               key={slug}
               variant="skill"
-              icon={skillChipLabel(skill)}
+              icon={skillChipIcon(skill)}
               label={skillDisplayName(skill)}
               onRemove={() =>
                 onSkillsChange(selectedSkills.filter((n) => n !== slug))
diff --git a/dashboard/src/pages/Chat/components/ContextWindowRing.tsx b/dashboard/src/pages/Chat/components/ContextWindowRing.tsx
index d093e023..b1b40c92 100644
--- a/dashboard/src/pages/Chat/components/ContextWindowRing.tsx
+++ b/dashboard/src/pages/Chat/components/ContextWindowRing.tsx
@@ -12,8 +12,6 @@ import styles from "../index.module.less";
 
 const DEFAULT_MAX = 128_000;
 const BREAKDOWN_CACHE_TTL_MS = 30_000;
-/** Debounce snapshot refresh after stream ``usedTokens`` changes. */
-const HINT_REFRESH_DEBOUNCE_MS = 800;
 
 const SEGMENT_COLORS: Record<ContextUsageSegmentKey, string> = {
   system_prompt: "#9ca3af",
@@ -64,7 +62,6 @@ export default function ContextWindowRing({
   // Stream hint — kept in a ref so prefetch does not re-fire on every token tick.
   const hintUsedRef = useRef(usedTokens ?? 0);
   hintUsedRef.current = usedTokens ?? 0;
-  const lastHintRefreshRef = useRef<number | null>(null);
 
   const max = maxTokens > 0 ? maxTokens : DEFAULT_MAX;
   const hintUsed = usedTokens ?? 0;
@@ -126,34 +123,15 @@ export default function ContextWindowRing({
     [agentId, threadId, max, selectedConnectors, selectedSkills, cacheKey],
   );
 
-  // Prefetch when the thread / cap / filters change — not when stream hint ticks.
+  // Reset detail cache on thread/filter changes. The ring itself keeps growing
+  // from the live/persisted token hint and never needs a checkpoint read.
   useEffect(() => {
-    if (!agentId || !threadId || isPendingThread(threadId)) {
-      setBreakdown(null);
-      cacheRef.current = null;
-      lastHintRefreshRef.current = null;
-      return;
-    }
-    lastHintRefreshRef.current = null;
-    void loadBreakdown({ silent: true });
-  }, [agentId, threadId, cacheKey, loadBreakdown]);
-
-  // After a turn finishes, ``usedTokens`` settles on last_input_tokens —
-  // soft-refresh once per distinct hint (debounced) for a fresh harness stamp.
-  useEffect(() => {
-    if (!agentId || !threadId || isPendingThread(threadId) || hintUsed <= 0) {
-      return;
-    }
-    if (lastHintRefreshRef.current === hintUsed) return;
-    const timer = window.setTimeout(() => {
-      lastHintRefreshRef.current = hintUsed;
-      cacheRef.current = null;
-      void loadBreakdown({ silent: true, force: true });
-    }, HINT_REFRESH_DEBOUNCE_MS);
-    return () => window.clearTimeout(timer);
-  }, [hintUsed, agentId, threadId, loadBreakdown]);
+    setBreakdown(null);
+    cacheRef.current = null;
+  }, [cacheKey]);
 
   const ringUsed = useMemo(() => {
+    if (hintUsed > 0) return Math.min(hintUsed, max);
     if (breakdown && breakdown.used_tokens > 0) {
       const breakdownMax =
         breakdown.max_tokens > 0 ? breakdown.max_tokens : max;
@@ -161,7 +139,6 @@ export default function ContextWindowRing({
     }
     // Until prefetch returns, show last-call hint (capped so a stale
     // turn-sum cannot flash a full ring).
-    if (hintUsed > 0) return Math.min(hintUsed, max);
     return 0;
   }, [breakdown, hintUsed, max]);
 
diff --git a/dashboard/src/pages/Chat/components/HistoryMigrationBanner.module.less b/dashboard/src/pages/Chat/components/HistoryMigrationBanner.module.less
new file mode 100644
index 00000000..c0ce7166
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/HistoryMigrationBanner.module.less
@@ -0,0 +1,74 @@
+.banner {
+  position: relative;
+  flex: 0 0 auto;
+  display: flex;
+  align-items: center;
+  gap: 14px;
+  margin: 8px var(--chat-column-pad-x, 24px) 0;
+  padding: 10px 14px;
+  border: 1px solid var(--fn-border, #e8e8ed);
+  border-radius: 10px;
+  background: var(--fn-bg-secondary, #f5f5f7);
+
+  @media (max-width: 767px) {
+    align-items: flex-start;
+    margin: 8px var(--chat-column-pad-x-narrow, 12px) 0;
+  }
+}
+
+.content {
+  flex: 1;
+  min-width: 0;
+}
+
+.title {
+  font-size: 13px;
+  font-weight: 600;
+  color: var(--fn-text-primary);
+}
+
+.hint,
+.errorHint {
+  margin-top: 3px;
+  font-size: 12px;
+  line-height: 1.45;
+  color: var(--fn-text-secondary);
+}
+
+.errorHint {
+  color: var(--fn-color-error, #d14343);
+}
+
+.progressTrack {
+  height: 3px;
+  margin-top: 8px;
+  overflow: hidden;
+  border-radius: 999px;
+  background: color-mix(in srgb, var(--fn-primary, #e8516d) 16%, transparent);
+}
+
+.progressBar {
+  display: block;
+  width: 40%;
+  height: 100%;
+  border-radius: inherit;
+  background: var(--fn-primary, #e8516d);
+  animation: historyMigrationProgress 1.3s ease-in-out infinite;
+}
+
+@keyframes historyMigrationProgress {
+  from {
+    transform: translateX(-100%);
+  }
+
+  to {
+    transform: translateX(250%);
+  }
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .progressBar {
+    width: 100%;
+    animation: none;
+  }
+}
diff --git a/dashboard/src/pages/Chat/components/HistoryMigrationBanner.test.tsx b/dashboard/src/pages/Chat/components/HistoryMigrationBanner.test.tsx
new file mode 100644
index 00000000..7f7404d5
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/HistoryMigrationBanner.test.tsx
@@ -0,0 +1,52 @@
+import { render, screen } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+import type { HistoryMigrationStatus } from "../../../api/modules/octopThreads";
+import HistoryMigrationBanner from "./HistoryMigrationBanner";
+
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({
+    t: (key: string) => key,
+  }),
+}));
+
+const idleStatus: HistoryMigrationStatus = {
+  remaining: 1,
+  pending: 1,
+  queued: 0,
+  running: 0,
+  failed: 0,
+  processing: false,
+  agent_busy: false,
+  can_start: true,
+};
+
+describe("HistoryMigrationBanner", () => {
+  it("shows an indeterminate progress bar only while migration is processing", () => {
+    const { rerender } = render(
+      <HistoryMigrationBanner
+        status={idleStatus}
+        starting={false}
+        startFailed={false}
+        onStart={vi.fn()}
+      />,
+    );
+
+    expect(screen.queryByRole("progressbar")).not.toBeInTheDocument();
+
+    rerender(
+      <HistoryMigrationBanner
+        status={{ ...idleStatus, processing: true, pending: 0, running: 1 }}
+        starting={false}
+        startFailed={false}
+        onStart={vi.fn()}
+      />,
+    );
+
+    const progress = screen.getByRole("progressbar");
+    expect(progress).toHaveAttribute(
+      "aria-label",
+      "chat.historyMigration.running",
+    );
+    expect(progress).not.toHaveAttribute("aria-valuenow");
+  });
+});
diff --git a/dashboard/src/pages/Chat/components/HistoryMigrationBanner.tsx b/dashboard/src/pages/Chat/components/HistoryMigrationBanner.tsx
new file mode 100644
index 00000000..23c3b3fa
--- /dev/null
+++ b/dashboard/src/pages/Chat/components/HistoryMigrationBanner.tsx
@@ -0,0 +1,72 @@
+import { Button } from "antd";
+import { useTranslation } from "react-i18next";
+import type { HistoryMigrationStatus } from "../../../api/modules/octopThreads";
+import styles from "./HistoryMigrationBanner.module.less";
+
+interface HistoryMigrationBannerProps {
+  status: HistoryMigrationStatus;
+  starting: boolean;
+  startFailed: boolean;
+  onStart: () => void;
+}
+
+export default function HistoryMigrationBanner({
+  status,
+  starting,
+  startFailed,
+  onStart,
+}: HistoryMigrationBannerProps) {
+  const { t } = useTranslation();
+  const active = status.processing;
+  const canQueueMore = status.can_start && status.pending + status.failed > 0;
+  const failedHint = startFailed || (status.failed > 0 && !active);
+
+  return (
+    <div className={styles.banner} role="status">
+      <div className={styles.content}>
+        <div className={styles.title}>
+          {t("chat.historyMigration.title", { count: status.remaining })}
+        </div>
+        <div className={failedHint ? styles.errorHint : styles.hint}>
+          {startFailed
+            ? t("chat.historyMigration.startFailed")
+            : active
+            ? t("chat.historyMigration.runningHint")
+            : status.agent_busy
+            ? t("chat.historyMigration.agentBusyHint")
+            : !status.can_start
+            ? t("chat.historyMigration.queueBusyHint")
+            : status.failed > 0
+            ? t("chat.historyMigration.retryHint", { count: status.failed })
+            : t("chat.historyMigration.readyHint")}
+        </div>
+        {active && (
+          <div
+            className={styles.progressTrack}
+            role="progressbar"
+            aria-label={t("chat.historyMigration.running")}
+          >
+            <span className={styles.progressBar} />
+          </div>
+        )}
+      </div>
+      <Button
+        size="small"
+        type={active ? "default" : "primary"}
+        loading={starting}
+        disabled={!status.can_start || (active && !canQueueMore)}
+        onClick={onStart}
+      >
+        {active
+          ? canQueueMore
+            ? t("chat.historyMigration.queueRest")
+            : t("chat.historyMigration.running")
+          : !status.can_start
+          ? t("chat.historyMigration.waiting")
+          : status.failed > 0
+          ? t("chat.historyMigration.retry")
+          : t("chat.historyMigration.start")}
+      </Button>
+    </div>
+  );
+}
diff --git a/dashboard/src/pages/Chat/components/MessageBubble.tsx b/dashboard/src/pages/Chat/components/MessageBubble.tsx
index a96c26a8..0ce5a00e 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 } from "antd";
+import { Image, Button, Tooltip } from "antd";
 import { message as antMessage } from "@/utils/antdMessage";
 
 import Markdown from "../../../components/Markdown/LazyMarkdown";
@@ -11,6 +11,7 @@ import {
   Volume2,
   Settings,
   GitFork,
+  PanelRight,
 } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
@@ -37,6 +38,8 @@ import {
   isChatStreamError,
 } from "../../../utils/chatStreamError";
 import { MessageFileCard } from "./MessageFileCard";
+import AskQuestionCard from "./AskQuestionCard";
+import { extractAskQuestions, isAskHitl } from "../../../api/types/hitl";
 import styles from "../index.module.less";
 import {
   DefaultToolRenderer,
@@ -51,6 +54,10 @@ import {
 import { BuiltinOctopUiFallback } from "../../../plugins/toolRenderers/builtin/BuiltinOctopUiFallback";
 import { ToolUiErrorBoundary } from "../../../plugins/toolRenderers/ToolUiErrorBoundary";
 import { lookupPluginIdForTool } from "../../../plugins/toolRenderers/toolPluginIndex";
+import { useChatToolDock } from "../ChatToolDockContext";
+import { useToolUiDockButtonStyle } from "../hooks/useToolUiDockButtonStyle";
+import type { ParsedToolOutput } from "../../../plugins/toolRenderers/types";
+import type { ToolRendererRegistration } from "../../../plugins/toolRenderers/types";
 
 interface MessageBubbleProps {
   message: ChatMessage;
@@ -312,19 +319,42 @@ function CopyButton({ text }: { text: string }) {
   );
 }
 
+function canDockToolUi(
+  registration: ToolRendererRegistration | null,
+  parsed: ParsedToolOutput,
+): boolean {
+  if (parsed.octopUi) return true;
+  return (
+    registration != null &&
+    registration.id !== "default" &&
+    registration.pluginId !== "builtin"
+  );
+}
+
+function toolUiDockLabel(
+  toolData: NonNullable<ChatMessage["toolData"]>,
+): string {
+  return toolData.displayName?.trim() || toolData.name?.trim() || "Tool";
+}
+
 export function ToolDetailsInline({
   toolData,
   isStreaming,
   onAcpPermissionSelect,
   hideMediaPreview = false,
   agentId = null,
+  forceInline = false,
 }: {
   toolData: NonNullable<ChatMessage["toolData"]>;
   isStreaming: boolean;
   onAcpPermissionSelect?: (message: string) => void;
   hideMediaPreview?: boolean;
   agentId?: string | null;
+  /** When true, skip dock attach / placeholder (full renderer in side panel). */
+  forceInline?: boolean;
 }) {
+  const { t } = useTranslation();
+  const toolDock = useChatToolDock();
   // Plugin UIs load async after mount — bump forces resolve() to re-run.
   const rendererVersion = useToolRendererVersion();
   const parsed = useMemo(
@@ -385,13 +415,77 @@ export function ToolDetailsInline({
     agentId,
   };
 
+  const dockable = canDockToolUi(registration ?? null, parsed);
+  const callId = toolData.callId;
+  const isDocked =
+    !forceInline &&
+    dockable &&
+    !!callId &&
+    (toolDock?.isToolUiDocked(callId) ?? false);
+
+  const showDockButton =
+    !forceInline && !isDocked && dockable && !!callId && !!toolDock;
+  const { wrapRef, buttonStyle } = useToolUiDockButtonStyle(showDockButton, [
+    toolData.output,
+    registration?.id,
+    rendererVersion,
+  ]);
+
+  const openInDock = useCallback(() => {
+    if (!callId || !toolDock) return;
+    toolDock.openToolUiPanel({
+      callId,
+      title: toolUiDockLabel(toolData),
+      toolName: toolData.name,
+    });
+  }, [callId, toolData, toolDock]);
+
+  const dockActions = showDockButton ? (
+    <div className={styles.toolUiDockActions} style={buttonStyle}>
+      <Tooltip title={t("chat.openToolUiInDock", "Open in side panel")}>
+        <button
+          type="button"
+          className={styles.toolUiDockBtn}
+          onClick={openInDock}
+          aria-label={t("chat.openToolUiInDock", "Open in side panel")}
+        >
+          <PanelRight size={14} strokeWidth={2} aria-hidden />
+        </button>
+      </Tooltip>
+    </div>
+  ) : null;
+
+  if (isDocked) {
+    return (
+      <button
+        type="button"
+        className={styles.toolUiDockPlaceholder}
+        onClick={() => toolDock?.focusToolUiPanel(callId!)}
+        title={t("chat.toolUiDockedOpen", "Open side panel")}
+      >
+        <PanelRight size={16} strokeWidth={2} aria-hidden />
+        <span className={styles.toolUiDockPlaceholderTitle}>
+          {toolUiDockLabel(toolData)}
+        </span>
+        <span className={styles.toolUiDockPlaceholderHint}>
+          {t("chat.toolUiDockedHint", "Moved to side panel")}
+        </span>
+      </button>
+    );
+  }
+
   if (registration && registration.id !== "default") {
     const Comp = registration.component;
     return (
-      <div data-octop-tool-renderer="">
+      <div
+        ref={wrapRef}
+        data-octop-tool-renderer=""
+        className={styles.toolUiRendererWrap}
+      >
         <ToolUiErrorBoundary propsForFallback={props}>
           <Comp {...props} />
         </ToolUiErrorBoundary>
+        {dockActions}
       </div>
     );
   }
@@ -399,8 +493,13 @@ export function ToolDetailsInline({
   // Structured plugin envelope without a loaded custom renderer — still show a card.
   if (parsed.octopUi) {
     return (
-      <div data-octop-tool-renderer="">
+      <div
+        ref={wrapRef}
+        data-octop-tool-renderer=""
+        className={styles.toolUiRendererWrap}
+      >
         <BuiltinOctopUiFallback {...props} />
+        {dockActions}
       </div>
     );
   }
@@ -485,6 +584,32 @@ function MessageBubble({
   if (message.hitlData) {
     const actions = message.hitlData.action_requests ?? [];
     const hitlStatus = message.hitlData.status ?? "pending";
+    if (isAskHitl(actions)) {
+      // Pending questions are rendered in ChatPage's composer dock so they
+      // stay immediately above the input even when message history scrolls.
+      if (hitlStatus === "pending") return null;
+      const questions = extractAskQuestions(actions);
+      return (
+        <div
+          className={`${styles.bubble} ${styles.assistantBubble} ${
+            compact ? styles.compact : ""
+          }`}
+        >
+          <AskQuestionCard
+            questions={questions}
+            status={hitlStatus}
+            onSubmit={
+              onHitlDecision
+                ? (answer) =>
+                    onHitlDecision(
+                      actions.map(() => ({ type: "respond", message: answer })),
+                    )
+                : undefined
+            }
+          />
+        </div>
+      );
+    }
     return (
       <div
         className={`${styles.bubble} ${styles.assistantBubble} ${
diff --git a/dashboard/src/pages/Chat/components/SkillPickerPopover.tsx b/dashboard/src/pages/Chat/components/SkillPickerPopover.tsx
index 5554f856..bf0d3052 100644
--- a/dashboard/src/pages/Chat/components/SkillPickerPopover.tsx
+++ b/dashboard/src/pages/Chat/components/SkillPickerPopover.tsx
@@ -16,7 +16,20 @@ interface SkillPickerPopoverProps {
   onNavigateAway?: () => void;
 }
 
-function skillAvatarLabel(skill: SkillSpec): string {
+function SkillAvatar({ skill }: { skill: SkillSpec }) {
+  const iconUrl = skill.iconUrl?.trim();
+  return (
+    <span className={styles.skillPickerAvatar}>
+      {iconUrl ? (
+        <img src={iconUrl} alt="" className={styles.skillPickerAvatarImg} />
+      ) : (
+        skillAvatarFallback(skill)
+      )}
+    </span>
+  );
+}
+
+function skillAvatarFallback(skill: SkillSpec): string {
   if (skill.emoji) return skill.emoji;
   const name = skill.name || skill.slug;
   return name.charAt(0).toUpperCase();
@@ -79,9 +92,7 @@ export default function SkillPickerPopover({
               onSkillsChange(next);
             }}
           >
-            <span className={styles.skillPickerAvatar}>
-              {skillAvatarLabel(skill)}
-            </span>
+            <SkillAvatar skill={skill} />
             <span className={pickerStyles.itemText}>
               <span className={pickerStyles.itemName}>
                 {skillDisplayName(skill)}
diff --git a/dashboard/src/pages/Chat/components/UserMessageComposerTags.tsx b/dashboard/src/pages/Chat/components/UserMessageComposerTags.tsx
index 57ee0a5f..4c366d37 100644
--- a/dashboard/src/pages/Chat/components/UserMessageComposerTags.tsx
+++ b/dashboard/src/pages/Chat/components/UserMessageComposerTags.tsx
@@ -9,7 +9,7 @@ import ExpertAgentAvatar from "./ExpertAgentAvatar";
 import { ConnectorLogo } from "../../Agent/Connectors/connectorDefs";
 import { knowledgeIconForName } from "../../KnowledgeBases/knowledgeIcons";
 import ContextChip, { type ContextChipVariant } from "./ContextChip";
-import { skillChipLabel } from "../utils/skillChipLabel";
+import { skillChipIcon } from "../utils/skillChipIcon";
 import { modelShortLabel } from "../../../utils/modelOptions";
 import styles from "../index.module.less";
 
@@ -46,7 +46,7 @@ export default function UserMessageComposerTags({
       items.push({
         key: `skill-${slug}`,
         variant: "skill",
-        icon: skill ? skillChipLabel(skill) : "✦",
+        icon: skill ? skillChipIcon(skill) : "✦",
         label: skill?.name || slug,
       });
     }
diff --git a/dashboard/src/pages/Chat/hooks/chatStore.hitlResume.test.ts b/dashboard/src/pages/Chat/hooks/chatStore.hitlResume.test.ts
new file mode 100644
index 00000000..f5c4ba2f
--- /dev/null
+++ b/dashboard/src/pages/Chat/hooks/chatStore.hitlResume.test.ts
@@ -0,0 +1,46 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { getSnapshot, removeSession, resumeHitl } from "./chatStore";
+
+vi.mock("../../../api/config", () => ({
+  getApiUrl: (path: string) => `/api${path}`,
+}));
+
+const SESSION = "test-hitl-resume";
+
+describe("resumeHitl", () => {
+  afterEach(() => {
+    vi.unstubAllGlobals();
+    removeSession(SESSION);
+  });
+
+  it("renders resumed tokens and notifies after the completed stream", async () => {
+    const body = [
+      'event: chunk\ndata: {"type":"token","content":"completed answer"}\n\n',
+      'event: chunk\ndata: {"type":"done"}\n\n',
+    ].join("");
+    vi.stubGlobal(
+      "fetch",
+      vi.fn().mockResolvedValue(
+        new Response(body, {
+          status: 200,
+          headers: { "Content-Type": "text/event-stream" },
+        }),
+      ),
+    );
+    const onStreamEnd = vi.fn();
+
+    await resumeHitl(
+      SESSION,
+      "agent-1",
+      "thread-1",
+      [{ type: "respond", message: "answer" }],
+      onStreamEnd,
+    );
+
+    expect(getSnapshot(SESSION).messages.at(-1)?.content).toBe(
+      "completed answer",
+    );
+    expect(getSnapshot(SESSION).isStreaming).toBe(false);
+    expect(onStreamEnd).toHaveBeenCalledOnce();
+  });
+});
diff --git a/dashboard/src/pages/Chat/hooks/chatStore.ts b/dashboard/src/pages/Chat/hooks/chatStore.ts
index 022592a9..8a4c9ec4 100644
--- a/dashboard/src/pages/Chat/hooks/chatStore.ts
+++ b/dashboard/src/pages/Chat/hooks/chatStore.ts
@@ -2024,6 +2024,17 @@ export async function sendTurn(
 ): Promise<void> {
   const state = getOrCreate(sessionId);
 
+  if (sessionId === "__pending__" || threadId === "__pending__") {
+    appendErrorBubble(
+      state,
+      "Thread is still being created. Please retry shortly.",
+    );
+    clearStreamingFlags(state);
+    notify(state);
+    onStreamEnd?.();
+    return;
+  }
+
   if (!agentId) {
     appendErrorBubble(state, "No agent selected. Pick one from the top bar.");
     clearStreamingFlags(state);
@@ -2127,11 +2138,7 @@ async function consumeSseResponse(
       const chunk = parseHarnessChunk(line);
       if (!chunk) continue;
       handleHarnessChunk(state, chunk, sessionId);
-      if (
-        chunk.type === "done" ||
-        chunk.type === "error" ||
-        chunk.type === "hitl_required"
-      ) {
+      if (chunk.type === "done" || chunk.type === "error") {
         controller.abort();
         finish();
         return;
@@ -2152,6 +2159,7 @@ export async function resumeHitl(
   agentId: string,
   threadId: string,
   decisions: Array<{ type: string; message?: string }>,
+  onStreamEnd?: () => void,
 ): Promise<void> {
   const state = getOrCreate(sessionId);
   state.abortController?.abort();
@@ -2175,7 +2183,10 @@ export async function resumeHitl(
     (headers as Record<string, string>).Authorization = `Bearer ${token}`;
   }
 
+  let finished = false;
   const finish = () => {
+    if (finished) return;
+    finished = true;
     clearStreamingFlags(state);
     clearStreamActivity(sessionId);
     pendingResumeBySession.delete(sessionId);
@@ -2186,6 +2197,7 @@ export async function resumeHitl(
     sealInFlightAssistantMessages(state);
     notify(state);
     emitStreamEvent({ kind: "streamEnd", sessionId });
+    onStreamEnd?.();
   };
 
   try {
diff --git a/dashboard/src/pages/Chat/hooks/useChat.ts b/dashboard/src/pages/Chat/hooks/useChat.ts
index 3db23e7a..12f5830f 100644
--- a/dashboard/src/pages/Chat/hooks/useChat.ts
+++ b/dashboard/src/pages/Chat/hooks/useChat.ts
@@ -683,6 +683,8 @@ async function loadThreadHistory(
   nextOffset: number;
   turnActive: boolean;
   artifacts: string[];
+  projectionLoading: boolean;
+  retryAfterMs: number;
 }> {
   try {
     const { octopThreadsApi, CHAT_HISTORY_PAGE_SIZE } = await import(
@@ -722,6 +724,11 @@ async function loadThreadHistory(
       nextOffset: offset + limit,
       turnActive: Boolean(history.turn_active),
       artifacts,
+      projectionLoading: Boolean(history.history_loading),
+      retryAfterMs:
+        typeof history.history_retry_after_ms === "number"
+          ? history.history_retry_after_ms
+          : 1500,
     };
   } catch (err) {
     console.error("loadThreadHistory failed", err);
@@ -731,6 +738,8 @@ async function loadThreadHistory(
       nextOffset: 0,
       turnActive: false,
       artifacts: [],
+      projectionLoading: false,
+      retryAfterMs: 1500,
     };
   }
 }
@@ -879,18 +888,32 @@ export function useChat(
       setHistoryLoading(true);
 
       try {
-        const {
-          messages: converted,
-          hasMore,
-          nextOffset,
-          turnActive,
-        } = await loadThreadHistory(agentId, targetThreadId, { offset: 0 });
+        let loaded = await loadThreadHistory(agentId, targetThreadId, {
+          offset: 0,
+        });
+        while (loaded.projectionLoading && loadGenRef.current === gen) {
+          await new Promise((resolve) =>
+            window.setTimeout(
+              resolve,
+              Math.max(500, Math.min(loaded.retryAfterMs, 5000)),
+            ),
+          );
+          if (loadGenRef.current !== gen) return;
+          loaded = await loadThreadHistory(agentId, targetThreadId, {
+            offset: 0,
+          });
+        }
         if (loadGenRef.current !== gen) return;
-        chatStore.setHistoryPage(key, converted, {
-          hasMore,
-          nextOffset,
+        chatStore.setHistoryPage(key, loaded.messages, {
+          hasMore: loaded.hasMore,
+          nextOffset: loaded.nextOffset,
         });
-        if (shouldProbeActiveTurn({ isStreaming: false, turnActive })) {
+        if (
+          shouldProbeActiveTurn({
+            isStreaming: false,
+            turnActive: loaded.turnActive,
+          })
+        ) {
           attachAfterHistory(key, targetThreadId);
         }
       } finally {
@@ -939,54 +962,59 @@ export function useChat(
    * Used when the user overscrolls at the bottom to recover from a dropped WS
    * stream that left the last assistant turn incomplete in memory.
    */
-  const refreshHistory = useCallback(async () => {
-    const key = stableSessionId;
-    const snap = chatStore.getSnapshot(key);
-    if (
-      refreshInFlightRef.current ||
-      historyRefreshing ||
-      historyLoading ||
-      shouldBlockHistoryRefresh({
-        isStreaming: snap.isStreaming,
-        hasLiveSocket: chatStore.hasLiveSocket(key),
-      }) ||
-      !agentId ||
-      key === "__empty__"
-    ) {
-      return;
-    }
+  const refreshHistory = useCallback(
+    async (targetSessionId?: string) => {
+      const key = targetSessionId || stableSessionId;
+      const snap = chatStore.getSnapshot(key);
+      if (
+        refreshInFlightRef.current ||
+        historyRefreshing ||
+        historyLoading ||
+        shouldBlockHistoryRefresh({
+          isStreaming: snap.isStreaming,
+          hasLiveSocket: chatStore.hasLiveSocket(key),
+        }) ||
+        !agentId ||
+        key === "__empty__"
+      ) {
+        return;
+      }
 
-    refreshInFlightRef.current = true;
-    // Separate from loadGenRef: loadHistory may bump loadGen while we fetch.
-    // Always clear the refreshing flag in finally so the footer cannot stick.
-    const gen = ++loadGenRef.current;
-    setHistoryRefreshing(true);
+      refreshInFlightRef.current = true;
+      // Separate from loadGenRef: loadHistory may bump loadGen while we fetch.
+      // Always clear the refreshing flag in finally so the footer cannot stick.
+      const gen = ++loadGenRef.current;
+      setHistoryRefreshing(true);
 
-    try {
-      const {
-        messages: latest,
-        hasMore,
-        nextOffset,
-      } = await loadThreadHistory(agentId, key, { offset: 0 });
-      // Stale after a concurrent loadHistory / newer refresh — drop apply only.
-      if (loadGenRef.current !== gen) return;
-
-      // Keep older pages the user already scrolled in; replace the overlapping
-      // latest-page window with the server copy so truncated WS turns heal.
-      const latestIds = new Set(latest.map((m) => m.id));
-      const firstOverlap = snap.messages.findIndex((m) => latestIds.has(m.id));
-      const olderPrefix =
-        firstOverlap > 0 ? snap.messages.slice(0, firstOverlap) : [];
-      chatStore.setHistoryPage(key, [...olderPrefix, ...latest], {
-        hasMore: olderPrefix.length > 0 ? snap.historyHasMore : hasMore,
-        nextOffset:
-          olderPrefix.length > 0 ? snap.historyNextOffset : nextOffset,
-      });
-    } finally {
-      refreshInFlightRef.current = false;
-      setHistoryRefreshing(false);
-    }
-  }, [agentId, stableSessionId, historyRefreshing, historyLoading]);
+      try {
+        const {
+          messages: latest,
+          hasMore,
+          nextOffset,
+        } = await loadThreadHistory(agentId, key, { offset: 0 });
+        // Stale after a concurrent loadHistory / newer refresh — drop apply only.
+        if (loadGenRef.current !== gen) return;
+
+        // Keep older pages the user already scrolled in; replace the overlapping
+        // latest-page window with the server copy so truncated WS turns heal.
+        const latestIds = new Set(latest.map((m) => m.id));
+        const firstOverlap = snap.messages.findIndex((m) =>
+          latestIds.has(m.id),
+        );
+        const olderPrefix =
+          firstOverlap > 0 ? snap.messages.slice(0, firstOverlap) : [];
+        chatStore.setHistoryPage(key, [...olderPrefix, ...latest], {
+          hasMore: olderPrefix.length > 0 ? snap.historyHasMore : hasMore,
+          nextOffset:
+            olderPrefix.length > 0 ? snap.historyNextOffset : nextOffset,
+        });
+      } finally {
+        refreshInFlightRef.current = false;
+        setHistoryRefreshing(false);
+      }
+    },
+    [agentId, stableSessionId, historyRefreshing, historyLoading],
+  );
 
   /**
    * Edit a historical user message: truncate everything from that message
@@ -1036,9 +1064,11 @@ export function useChat(
       const threadId =
         storeKey || (stableSessionId !== "__empty__" ? stableSessionId : "");
       if (!threadId || threadId === "__empty__") return;
-      void chatStore.resumeHitl(key, agentId, threadId, decisions);
+      void chatStore.resumeHitl(key, agentId, threadId, decisions, () => {
+        void refreshHistory(threadId);
+      });
     },
-    [agentId, stableSessionId],
+    [agentId, stableSessionId, refreshHistory],
   );
 
   return {
diff --git a/dashboard/src/pages/Chat/hooks/useChatComposerResources.ts b/dashboard/src/pages/Chat/hooks/useChatComposerResources.ts
index 4a7fec9b..7ba748c0 100644
--- a/dashboard/src/pages/Chat/hooks/useChatComposerResources.ts
+++ b/dashboard/src/pages/Chat/hooks/useChatComposerResources.ts
@@ -22,6 +22,7 @@ import {
 } from "../utils/chatStorage";
 import { resolveInitialConnectors } from "../utils/resolveInitialConnectors";
 import { withDefaultOpenKnowledgeBases } from "../utils/withDefaultOpenKnowledgeBases";
+import { isPendingThread } from "./useSessions";
 
 export function useChatComposerResources(
   resolvedAgentId: string | null | undefined,
@@ -312,7 +313,11 @@ export function useChatComposerResources(
           },
         }));
       }
-      if (resolvedAgentId && activeThreadId) {
+      if (
+        resolvedAgentId &&
+        activeThreadId &&
+        !isPendingThread(activeThreadId)
+      ) {
         void octopThreadsApi.patch(resolvedAgentId, activeThreadId, {
           model_ref: model,
           reasoning_mode: nextMode,
@@ -337,7 +342,11 @@ export function useChatComposerResources(
           },
         }));
       }
-      if (resolvedAgentId && activeThreadId) {
+      if (
+        resolvedAgentId &&
+        activeThreadId &&
+        !isPendingThread(activeThreadId)
+      ) {
         void octopThreadsApi.patch(resolvedAgentId, activeThreadId, {
           reasoning_mode: mode,
           reasoning_effort: effort,
diff --git a/dashboard/src/pages/Chat/hooks/useChatDockPanel.test.ts b/dashboard/src/pages/Chat/hooks/useChatDockPanel.test.ts
index c89e1828..0fa60191 100644
--- a/dashboard/src/pages/Chat/hooks/useChatDockPanel.test.ts
+++ b/dashboard/src/pages/Chat/hooks/useChatDockPanel.test.ts
@@ -115,6 +115,64 @@ describe("useChatDockPanel tabs", () => {
     expect(result.current.dockOpen).toBe(false);
   });
 
+  it("openToolUiTab dedupes by callId and focuses the tool tab", () => {
+    const { result } = renderHook(() => useChatDockPanel(false));
+    act(() => {
+      result.current.openToolUiTab({
+        callId: "call-1",
+        title: "Demo card",
+        toolName: "demo_card",
+      });
+    });
+    act(() => {
+      result.current.openToolUiTab({
+        callId: "call-1",
+        title: "Demo card",
+      });
+    });
+    expect(result.current.dockOpen).toBe(true);
+    expect(
+      result.current.openTabs.filter((t) => t.kind === "toolUi"),
+    ).toHaveLength(1);
+    expect(result.current.activeTabId).toBe("toolUi:call-1");
+    expect(result.current.openTabs[0]).toMatchObject({
+      kind: "toolUi",
+      callId: "call-1",
+      title: "Demo card",
+    });
+  });
+
+  it("focusToolUiTab reopens dock on an existing tool tab", () => {
+    const { result } = renderHook(() => useChatDockPanel(false));
+    act(() => {
+      result.current.openToolUiTab({ callId: "call-2", title: "Card" });
+      result.current.handleClose();
+    });
+    expect(result.current.dockOpen).toBe(false);
+    // Closing the dock drops toolUi tabs so the message stream restores.
+    expect(
+      result.current.openTabs.filter((t) => t.kind === "toolUi"),
+    ).toHaveLength(0);
+    act(() => {
+      result.current.openToolUiTab({ callId: "call-2", title: "Card" });
+    });
+    expect(result.current.dockOpen).toBe(true);
+    expect(result.current.activeTabId).toBe("toolUi:call-2");
+  });
+
+  it("handleClose removes toolUi tabs but keeps other tabs", () => {
+    const { result } = renderHook(() => useChatDockPanel(false));
+    act(() => {
+      result.current.openBrowserTab();
+      result.current.openToolUiTab({ callId: "call-3", title: "Card" });
+    });
+    act(() => {
+      result.current.handleClose();
+    });
+    expect(result.current.dockOpen).toBe(false);
+    expect(result.current.openTabs.map((t) => t.id)).toEqual(["browser"]);
+  });
+
   it("does not expose deprecated dismiss / kind aliases", () => {
     const { result } = renderHook(() => useChatDockPanel(false));
     expect(result.current).not.toHaveProperty("userDismissedRef");
diff --git a/dashboard/src/pages/Chat/hooks/useChatDockPanel.ts b/dashboard/src/pages/Chat/hooks/useChatDockPanel.ts
index 8be9d2eb..d6ae45da 100644
--- a/dashboard/src/pages/Chat/hooks/useChatDockPanel.ts
+++ b/dashboard/src/pages/Chat/hooks/useChatDockPanel.ts
@@ -6,6 +6,7 @@ import {
   isHostAbsolutePath,
   normalizeDockFilePath,
 } from "../utils/dockFilePath";
+import { dockToolUiTabId } from "../utils/dockToolUiTabId";
 import { usePanelResize, type PanelSizes } from "./usePanelResize";
 
 const PANEL_MODE_KEY = "octop:chat-dock:mode";
@@ -20,7 +21,14 @@ export type DockTab =
   | { id: "files"; kind: "files" }
   | { id: "browser"; kind: "browser" }
   | { id: "terminal"; kind: "terminal" }
-  | { id: string; kind: "file"; path: string };
+  | { id: string; kind: "file"; path: string }
+  | {
+      id: string;
+      kind: "toolUi";
+      callId: string;
+      title?: string;
+      toolName?: string;
+    };
 
 export type DockTabId = DockTab["id"];
 
@@ -120,6 +128,16 @@ export function useChatDockPanel(isMobile: boolean, agentId?: string | null) {
 
   const handleClose = useCallback(() => {
     setDockOpen(false);
+    // Closing the dock restores tool UIs to the message stream.
+    setOpenTabs((prev) => {
+      const next = prev.filter((t) => t.kind !== "toolUi");
+      setActiveTabId((current) => {
+        if (current == null) return null;
+        if (next.some((t) => t.id === current)) return current;
+        return next[0]?.id ?? null;
+      });
+      return next;
+    });
   }, []);
 
   const openFileList = useCallback(() => {
@@ -174,6 +192,39 @@ export function useChatDockPanel(isMobile: boolean, agentId?: string | null) {
     openDock();
   }, [openDock]);
 
+  const openToolUiTab = useCallback(
+    (opts: { callId: string; title?: string; toolName?: string }) => {
+      const callId = opts.callId?.trim();
+      if (!callId) return;
+      const id = dockToolUiTabId(callId);
+      setOpenTabs((prev) => {
+        if (prev.some((t) => t.id === id)) return prev;
+        return [
+          ...prev,
+          {
+            id,
+            kind: "toolUi" as const,
+            callId,
+            title: opts.title,
+            toolName: opts.toolName,
+          },
+        ];
+      });
+      setActiveTabId(id);
+      openDock();
+    },
+    [openDock],
+  );
+
+  const focusToolUiTab = useCallback(
+    (callId: string) => {
+      const id = dockToolUiTabId(callId);
+      setActiveTabId(id);
+      openDock();
+    },
+    [openDock],
+  );
+
   /** Toggle dock open/closed around a dedicated tab (browser / terminal). */
   const toggleDockTab = useCallback(
     (tab: Extract<DockTab, { kind: "browser" | "terminal" }>) => {
@@ -263,6 +314,8 @@ export function useChatDockPanel(isMobile: boolean, agentId?: string | null) {
     toggleBrowserPanel,
     openTerminalTab,
     toggleTerminalPanel,
+    openToolUiTab,
+    focusToolUiTab,
     closeTab,
     setActiveTab,
   };
diff --git a/dashboard/src/pages/Chat/hooks/useChatSend.ts b/dashboard/src/pages/Chat/hooks/useChatSend.ts
index b16ed378..69acd868 100644
--- a/dashboard/src/pages/Chat/hooks/useChatSend.ts
+++ b/dashboard/src/pages/Chat/hooks/useChatSend.ts
@@ -2,7 +2,7 @@ import { useCallback, useEffect } from "react";
 import type { TFunction } from "i18next";
 import { useNavigate } from "react-router-dom";
 import type { ChatAttachment, UserComposerContext } from "./useChat";
-import type { Session } from "./useSessions";
+import { isPendingThread, type Session } from "./useSessions";
 import * as chatStore from "./chatStore";
 import { EMPTY_CHAT_SESSION_KEY, PENDING_THREAD_ID } from "../constants";
 import { clipThreadTitle } from "../utils/threadTitle";
@@ -165,6 +165,10 @@ export function useChatSend({
         overrides?.threadId !== undefined ? overrides.threadId : activeThreadId;
 
       if (targetThreadId) {
+        if (isPendingThread(targetThreadId)) {
+          message.info(t("chat.creatingSession", "正在创建会话，请稍候"));
+          return false;
+        }
         const hadMessages =
           targetThreadId === activeThreadId
             ? messagesLength > 0
diff --git a/dashboard/src/pages/Chat/hooks/useHistoryMigration.ts b/dashboard/src/pages/Chat/hooks/useHistoryMigration.ts
new file mode 100644
index 00000000..5d34f032
--- /dev/null
+++ b/dashboard/src/pages/Chat/hooks/useHistoryMigration.ts
@@ -0,0 +1,64 @@
+import { useCallback, useEffect, useState } from "react";
+import {
+  octopThreadsApi,
+  type HistoryMigrationStatus,
+} from "../../../api/modules/octopThreads";
+
+export function useHistoryMigration(
+  agentId: string | null | undefined,
+  enabled: boolean,
+) {
+  const [status, setStatus] = useState<HistoryMigrationStatus | null>(null);
+  const [starting, setStarting] = useState(false);
+  const [startFailed, setStartFailed] = useState(false);
+
+  useEffect(() => {
+    if (!agentId || !enabled) {
+      setStatus(null);
+      setStartFailed(false);
+      return;
+    }
+    let stopped = false;
+    let timer: number | null = null;
+    const pull = async () => {
+      let delay = 30_000;
+      try {
+        const next = await octopThreadsApi.historyMigrationStatus(agentId);
+        if (!stopped) setStatus(next);
+        if (next.remaining > 0) {
+          delay = next.processing || next.agent_busy ? 2000 : 10_000;
+        }
+      } catch {
+        // A later single-flight poll retries without hiding the last known status.
+      } finally {
+        if (!stopped) timer = window.setTimeout(pull, delay);
+      }
+    };
+    void pull();
+    return () => {
+      stopped = true;
+      if (timer != null) window.clearTimeout(timer);
+    };
+  }, [agentId, enabled]);
+
+  const start = useCallback(async () => {
+    if (!agentId || starting) return;
+    setStarting(true);
+    setStartFailed(false);
+    try {
+      setStatus(await octopThreadsApi.startHistoryMigration(agentId));
+    } catch {
+      setStartFailed(true);
+    } finally {
+      setStarting(false);
+    }
+  }, [agentId, starting]);
+
+  return {
+    status,
+    visible: Boolean(status && status.remaining > 0),
+    starting,
+    startFailed,
+    start,
+  };
+}
diff --git a/dashboard/src/pages/Chat/hooks/useMemoryMaintenance.ts b/dashboard/src/pages/Chat/hooks/useMemoryMaintenance.ts
index 8762999c..81c33d80 100644
--- a/dashboard/src/pages/Chat/hooks/useMemoryMaintenance.ts
+++ b/dashboard/src/pages/Chat/hooks/useMemoryMaintenance.ts
@@ -34,20 +34,26 @@ export function useMemoryMaintenance(
       return;
     }
     let stop = false;
-    const pull = () => {
-      request<{ memory_maintenance?: MemoryMaintenanceStatus | null }>(
-        `/agents/${agentId}/status`,
-      )
-        .then((row) => {
-          if (!stop) setStatus(row.memory_maintenance ?? null);
-        })
-        .catch(() => {});
+    let timer: number | null = null;
+    const pull = async () => {
+      let nextDelay = 10_000;
+      try {
+        const row = await request<{
+          memory_maintenance?: MemoryMaintenanceStatus | null;
+        }>(`/agents/${agentId}/status`);
+        const next = row.memory_maintenance ?? null;
+        if (!stop) setStatus(next);
+        if (next && VISIBLE.has(next.phase)) nextDelay = 2000;
+      } catch {
+        // Keep the last known state; a later single-flight poll can recover.
+      } finally {
+        if (!stop) timer = window.setTimeout(pull, nextDelay);
+      }
     };
-    pull();
-    const timer = setInterval(pull, 2000);
+    void pull();
     return () => {
       stop = true;
-      clearInterval(timer);
+      if (timer != null) window.clearTimeout(timer);
     };
   }, [agentId, enabled]);
 
diff --git a/dashboard/src/pages/Chat/hooks/useToolMessageByCallId.ts b/dashboard/src/pages/Chat/hooks/useToolMessageByCallId.ts
new file mode 100644
index 00000000..9f7cff5a
--- /dev/null
+++ b/dashboard/src/pages/Chat/hooks/useToolMessageByCallId.ts
@@ -0,0 +1,24 @@
+import { useSyncExternalStore } from "react";
+import * as chatStore from "./chatStore";
+import type { ChatMessage } from "./useChat";
+
+/** Live tool message row for a ``toolData.callId`` in the active thread. */
+export function useToolMessageByCallId(
+  threadId: string | null,
+  callId: string,
+): ChatMessage | null {
+  return useSyncExternalStore(
+    (onStoreChange) =>
+      threadId ? chatStore.subscribe(threadId, onStoreChange) : () => {},
+    () => {
+      if (!threadId) return null;
+      const { messages } = chatStore.getSnapshot(threadId);
+      return (
+        messages.find(
+          (m) => m.toolData?.callId === callId && m.toolData != null,
+        ) ?? null
+      );
+    },
+    () => null,
+  );
+}
diff --git a/dashboard/src/pages/Chat/hooks/useToolUiDockButtonStyle.ts b/dashboard/src/pages/Chat/hooks/useToolUiDockButtonStyle.ts
new file mode 100644
index 00000000..e3b41880
--- /dev/null
+++ b/dashboard/src/pages/Chat/hooks/useToolUiDockButtonStyle.ts
@@ -0,0 +1,73 @@
+import {
+  useCallback,
+  useLayoutEffect,
+  useRef,
+  useState,
+  type CSSProperties,
+  type RefObject,
+} from "react";
+
+const DOCK_BTN_SIZE = 28;
+const DOCK_BTN_INSET = 8;
+
+function findToolUiCard(root: HTMLElement): HTMLElement | null {
+  return (
+    root.querySelector<HTMLElement>("[data-octop-plugin-ui]") ??
+    root.querySelector<HTMLElement>(".octop-builtin-ui-fallback") ??
+    null
+  );
+}
+
+/**
+ * Place the dock button at the top-right of the plugin card without changing
+ * the card's layout width (avoid fit-content / inline-grid shrink-to-fit).
+ */
+export function useToolUiDockButtonStyle(
+  enabled: boolean,
+  deps: unknown[] = [],
+): {
+  wrapRef: RefObject<HTMLDivElement>;
+  buttonStyle: CSSProperties | undefined;
+} {
+  const wrapRef = useRef<HTMLDivElement>(null);
+  const [buttonStyle, setButtonStyle] = useState<CSSProperties | undefined>();
+
+  const update = useCallback(() => {
+    const root = wrapRef.current;
+    if (!root || !enabled) {
+      setButtonStyle(undefined);
+      return;
+    }
+    const card = findToolUiCard(root);
+    if (!card) {
+      setButtonStyle({ top: DOCK_BTN_INSET, right: DOCK_BTN_INSET });
+      return;
+    }
+    const rootRect = root.getBoundingClientRect();
+    const cardRect = card.getBoundingClientRect();
+    setButtonStyle({
+      top: Math.max(0, cardRect.top - rootRect.top) + DOCK_BTN_INSET,
+      left:
+        Math.max(0, cardRect.right - rootRect.left) -
+        DOCK_BTN_SIZE -
+        DOCK_BTN_INSET,
+    });
+  }, [enabled]);
+
+  useLayoutEffect(() => {
+    update();
+    if (!enabled) return;
+    const root = wrapRef.current;
+    if (!root) return;
+
+    const ro = new ResizeObserver(() => update());
+    ro.observe(root);
+    const card = findToolUiCard(root);
+    if (card) ro.observe(card);
+
+    return () => ro.disconnect();
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- caller passes render-invalidating deps
+  }, [enabled, update, ...deps]);
+
+  return { wrapRef, buttonStyle };
+}
diff --git a/dashboard/src/pages/Chat/index.tsx b/dashboard/src/pages/Chat/index.tsx
index ba16c0a3..a01d1d80 100644
--- a/dashboard/src/pages/Chat/index.tsx
+++ b/dashboard/src/pages/Chat/index.tsx
@@ -57,17 +57,28 @@ import { prefetchVoiceConfig } from "../../hooks/useVoiceConfig";
 import { isSharedExpertViewer } from "../../utils/sharedExpert";
 import ChatDockPanels from "./components/ChatDockPanels";
 import { ChatFilePreviewProvider } from "./ChatFilePreviewContext";
+import {
+  ChatToolDockProvider,
+  dockTabIdForToolCall,
+} from "./ChatToolDockContext";
 import ChatSidebarPanel from "./components/ChatSidebarPanel";
 import ChatTitleBar from "./components/ChatTitleBar";
 import ChatComposerChrome from "./components/ChatComposerChrome";
+import AskQuestionCard from "./components/AskQuestionCard";
+import { extractAskQuestions, isAskHitl } from "../../api/types/hitl";
 import { isAgentChatReady } from "../../utils/agentError";
 import { useMemoryMaintenance } from "./hooks/useMemoryMaintenance";
 import MemoryMaintenanceBanner from "./components/MemoryMaintenanceBanner";
+import { useHistoryMigration } from "./hooks/useHistoryMigration";
+import HistoryMigrationBanner from "./components/HistoryMigrationBanner";
 import { apiErrorMessage } from "../../utils/apiError";
 import PwaInstallPrompt from "../../components/PwaInstallPrompt";
 import { promptNeedsUserInput } from "../../utils/quickInputPrefill";
 import { OPEN_NAV_RECORDS_EVENT } from "../../layouts/chatHistoryRail";
-import { usePluginToolUis } from "../../plugins/toolRenderers";
+import {
+  usePluginToolUis,
+  setPluginUiDockHandlers,
+} from "../../plugins/toolRenderers";
 import styles from "./index.module.less";
 
 export default function ChatPage() {
@@ -171,6 +182,10 @@ function ChatPageInner() {
     visible: memoryMaintVisible,
     blocking: memoryMaintBlocking,
   } = useMemoryMaintenance(resolvedAgentId, agentChatReady && !noAgents);
+  const historyMigration = useHistoryMigration(
+    resolvedAgentId,
+    agentChatReady && !noAgents && !sharedExpertViewer,
+  );
 
   useEffect(() => {
     void refreshAgents({ silent: true });
@@ -311,10 +326,27 @@ function ChatPageInner() {
     openBrowserTab,
     toggleBrowserPanel,
     toggleTerminalPanel,
+    openToolUiTab,
+    focusToolUiTab,
     closeTab: closeDockTab,
     setActiveTab: setDockActiveTab,
   } = useChatDockPanel(isMobile, resolvedAgentId);
 
+  const closeToolUiPanel = useCallback(
+    (callId: string) => {
+      closeDockTab(dockTabIdForToolCall(callId));
+    },
+    [closeDockTab],
+  );
+
+  useEffect(() => {
+    setPluginUiDockHandlers({
+      openSidePanel: openToolUiTab,
+      closeSidePanel: closeToolUiPanel,
+    });
+    return () => setPluginUiDockHandlers({});
+  }, [openToolUiTab, closeToolUiPanel]);
+
   const composerSession = useMemo(
     () => sessions.find((session) => session.id === activeThreadId) ?? null,
     [sessions, activeThreadId],
@@ -642,6 +674,24 @@ function ChatPageInner() {
     () => messages.some((message) => message.hitlData?.status === "pending"),
     [messages],
   );
+  const pendingAsk = useMemo(() => {
+    for (let index = messages.length - 1; index >= 0; index -= 1) {
+      const message = messages[index];
+      const hitl = message.hitlData;
+      if (
+        !hitl ||
+        (hitl.status ?? "pending") !== "pending" ||
+        !isAskHitl(hitl.action_requests)
+      ) {
+        continue;
+      }
+      const questions = extractAskQuestions(hitl.action_requests);
+      if (questions.length > 0) {
+        return { id: message.id, actions: hitl.action_requests, questions };
+      }
+    }
+    return null;
+  }, [messages]);
   const forkDisabled = forking || isStreaming || hasPendingHitl;
   const forkDisabledHint =
     !forking && (isStreaming || hasPendingHitl)
@@ -823,362 +873,403 @@ function ChatPageInner() {
 
   return (
     <ChatFilePreviewProvider openFilePreview={openFileAt}>
-      {chatHistoryRail ? createPortal(chatSidebarPanel, chatHistoryRail) : null}
-      <div
-        className={`${styles.chatPage} ${
-          dockIsResizing ? styles.panelResizeActive : ""
-        } ${
-          dockOpen && dockMode === "bottom" ? styles.chatPageWithBottomDock : ""
-        }`}
+      <ChatToolDockProvider
+        dockOpen={dockOpen}
+        openTabs={openTabs}
+        activeTabId={activeTabId}
+        openToolUiPanel={openToolUiTab}
+        closeToolUiPanel={closeToolUiPanel}
+        focusToolUiPanel={focusToolUiTab}
       >
-        {/* Main chat area */}
-        <div className={styles.chatMain}>
-          {/* Mobile toolbar — session list + optional title + agent profile */}
-          {isMobile && (
-            <div className={styles.mobileToolbar}>
-              <button
-                className={styles.menuBtn}
-                onClick={() => {
-                  if (isMinimalLayout) {
-                    window.dispatchEvent(new Event(OPEN_NAV_RECORDS_EVENT));
-                    return;
-                  }
-                  setSidebarOpen(!sidebarOpen);
-                }}
-                title={t("nav.chatHistory") || "会话列表"}
-              >
-                <PanelLeftOpen size={18} strokeWidth={1.8} />
-              </button>
-              {activeSessionTitle && (
-                <div className={styles.mobileTitle} title={activeSessionTitle}>
-                  {activeSessionTitle}
-                </div>
-              )}
-              {resolvedAgentId && !sharedExpertViewer && (
-                <div className={styles.mobileToolbarRight}>
-                  <button
-                    className={styles.menuBtn}
-                    onClick={() => setAgentProfileOpen(true)}
-                    title={t("chat.agentProfile.open")}
-                    aria-label={t("chat.agentProfile.open")}
-                  >
-                    <GraduationCap size={18} strokeWidth={1.8} />
-                  </button>
-                  <button
-                    className={styles.menuBtn}
-                    onClick={() => setWorkspaceDrawerOpen(true)}
-                    disabled={!agentChatReady}
-                    title={
-                      agentChatReady
-                        ? t("chat.openWorkspace", "工作区")
-                        : t("workspace.requiresRunning")
+        {chatHistoryRail
+          ? createPortal(chatSidebarPanel, chatHistoryRail)
+          : null}
+        <div
+          className={`${styles.chatPage} ${
+            dockIsResizing ? styles.panelResizeActive : ""
+          } ${
+            dockOpen && dockMode === "bottom"
+              ? styles.chatPageWithBottomDock
+              : ""
+          }`}
+        >
+          {/* Main chat area */}
+          <div className={styles.chatMain}>
+            {/* Mobile toolbar — session list + optional title + agent profile */}
+            {isMobile && (
+              <div className={styles.mobileToolbar}>
+                <button
+                  className={styles.menuBtn}
+                  onClick={() => {
+                    if (isMinimalLayout) {
+                      window.dispatchEvent(new Event(OPEN_NAV_RECORDS_EVENT));
+                      return;
                     }
-                    aria-label={t("chat.openWorkspace", "工作区")}
+                    setSidebarOpen(!sidebarOpen);
+                  }}
+                  title={t("nav.chatHistory") || "会话列表"}
+                >
+                  <PanelLeftOpen size={18} strokeWidth={1.8} />
+                </button>
+                {activeSessionTitle && (
+                  <div
+                    className={styles.mobileTitle}
+                    title={activeSessionTitle}
                   >
-                    <FolderOpen size={18} strokeWidth={1.8} />
-                  </button>
-                </div>
-              )}
-            </div>
-          )}
-
-          {!isMobile && activeSession && activeSessionTitle && (
-            <ChatTitleBar
-              session={activeSession}
-              title={activeSessionTitle}
-              onRename={renameSession}
-              onPin={pinSession}
-              onFork={handleForkSession}
-              onDelete={handleDeleteSession}
-              forkDisabled={sessionForkDisabled}
-              forkDisabledHint={sessionForkDisabledHint}
-            />
-          )}
-
-          {memoryMaintVisible && memoryMaint && (
-            <MemoryMaintenanceBanner
-              status={memoryMaint}
-              blocking={memoryMaintBlocking}
-            />
-          )}
-
-          {memoryMaintVisible && memoryMaint && (
-            <MemoryMaintenanceBanner
-              status={memoryMaint}
-              blocking={memoryMaintBlocking}
-            />
-          )}
+                    {activeSessionTitle}
+                  </div>
+                )}
+                {resolvedAgentId && !sharedExpertViewer && (
+                  <div className={styles.mobileToolbarRight}>
+                    <button
+                      className={styles.menuBtn}
+                      onClick={() => setAgentProfileOpen(true)}
+                      title={t("chat.agentProfile.open")}
+                      aria-label={t("chat.agentProfile.open")}
+                    >
+                      <GraduationCap size={18} strokeWidth={1.8} />
+                    </button>
+                    <button
+                      className={styles.menuBtn}
+                      onClick={() => setWorkspaceDrawerOpen(true)}
+                      disabled={!agentChatReady}
+                      title={
+                        agentChatReady
+                          ? t("chat.openWorkspace", "工作区")
+                          : t("workspace.requiresRunning")
+                      }
+                      aria-label={t("chat.openWorkspace", "工作区")}
+                    >
+                      <FolderOpen size={18} strokeWidth={1.8} />
+                    </button>
+                  </div>
+                )}
+              </div>
+            )}
 
-          <div className={styles.chatContent}>
-            {!agentChatReady || noAgents ? (
-              <AgentNotReadyScreen
-                agent={activeAgent}
-                noAgents={noAgents}
-                loading={agentsLoading}
+            {!isMobile && activeSession && activeSessionTitle && (
+              <ChatTitleBar
+                session={activeSession}
+                title={activeSessionTitle}
+                onRename={renameSession}
+                onPin={pinSession}
+                onFork={handleForkSession}
+                onDelete={handleDeleteSession}
+                forkDisabled={sessionForkDisabled}
+                forkDisabledHint={sessionForkDisabledHint}
               />
-            ) : showWelcome ? (
-              <WelcomeScreen
-                agentName={activeAgent?.name ?? null}
-                welcomeSuffix={welcomeSuffix}
-                quickCards={expertQuickCards}
-                onPromptClick={handlePromptClick}
-                hideMascot={isStreaming}
+            )}
+
+            {memoryMaintVisible && memoryMaint && (
+              <MemoryMaintenanceBanner
+                status={memoryMaint}
+                blocking={memoryMaintBlocking}
               />
-            ) : (
-              <MessageList
-                messages={messages}
-                composerLookups={composerLookups}
-                loading={awaitingThreadHistory}
-                historyHasMore={historyHasMore}
-                historyLoadingMore={historyLoadingMore}
-                historyRefreshing={historyRefreshing}
-                onLoadMoreHistory={loadMoreHistory}
-                onRefreshHistory={refreshHistory}
-                isStreaming={isStreaming}
-                thinkingStartedAt={thinkingStartedAt}
-                sessionKey={activeThreadId ?? undefined}
-                onCancel={cancelStream}
-                onRegenerate={handleRegenerate}
-                onEditUserMessage={handleEditUserMessage}
-                onForkAssistantMessage={handleForkAssistantMessage}
-                forkDisabled={forkDisabled}
-                forkDisabledHint={forkDisabledHint}
-                onAcpPermissionSelect={handleAcpPermissionSelect}
-                onHitlDecision={handleHitlDecision}
-                onOpenBrowser={
-                  hasBrowserTool && !isMobile ? openBrowserTab : undefined
-                }
-                onEditFile={
-                  !sharedExpertViewer && panelFilePaths.length > 0 && !isMobile
-                    ? openFileList
-                    : undefined
-                }
+            )}
+
+            {historyMigration.visible && historyMigration.status && (
+              <HistoryMigrationBanner
+                status={historyMigration.status}
+                starting={historyMigration.starting}
+                startFailed={historyMigration.startFailed}
+                onStart={() => void historyMigration.start()}
               />
             )}
-          </div>
 
-          {!isMobile &&
-            !dockOpen &&
-            !agentProfileOpen &&
-            !workspaceDrawerOpen && (
-              <div className={styles.chatFloatActions}>
-                {/* PWA install first when available — same column as browser / experts. */}
-                <PwaInstallPrompt appearance="chatFloat" />
-                {resolvedAgentId && !sharedExpertViewer && (
-                  <>
+            <div className={styles.chatContent}>
+              {!agentChatReady || noAgents ? (
+                <AgentNotReadyScreen
+                  agent={activeAgent}
+                  noAgents={noAgents}
+                  loading={agentsLoading}
+                />
+              ) : showWelcome ? (
+                <WelcomeScreen
+                  agentName={activeAgent?.name ?? null}
+                  welcomeSuffix={welcomeSuffix}
+                  quickCards={expertQuickCards}
+                  onPromptClick={handlePromptClick}
+                  hideMascot={isStreaming}
+                />
+              ) : (
+                <MessageList
+                  messages={messages}
+                  composerLookups={composerLookups}
+                  loading={awaitingThreadHistory}
+                  historyHasMore={historyHasMore}
+                  historyLoadingMore={historyLoadingMore}
+                  historyRefreshing={historyRefreshing}
+                  onLoadMoreHistory={loadMoreHistory}
+                  onRefreshHistory={refreshHistory}
+                  isStreaming={isStreaming}
+                  thinkingStartedAt={thinkingStartedAt}
+                  sessionKey={activeThreadId ?? undefined}
+                  onCancel={cancelStream}
+                  onRegenerate={handleRegenerate}
+                  onEditUserMessage={handleEditUserMessage}
+                  onForkAssistantMessage={handleForkAssistantMessage}
+                  forkDisabled={forkDisabled}
+                  forkDisabledHint={forkDisabledHint}
+                  onAcpPermissionSelect={handleAcpPermissionSelect}
+                  onHitlDecision={handleHitlDecision}
+                  onOpenBrowser={
+                    hasBrowserTool && !isMobile ? openBrowserTab : undefined
+                  }
+                  onEditFile={
+                    !sharedExpertViewer &&
+                    panelFilePaths.length > 0 &&
+                    !isMobile
+                      ? openFileList
+                      : undefined
+                  }
+                />
+              )}
+            </div>
+
+            {!isMobile &&
+              !dockOpen &&
+              !agentProfileOpen &&
+              !workspaceDrawerOpen && (
+                <div className={styles.chatFloatActions}>
+                  {/* PWA install first when available — same column as browser / experts. */}
+                  <PwaInstallPrompt appearance="chatFloat" />
+                  {resolvedAgentId && !sharedExpertViewer && (
+                    <>
+                      <Tooltip
+                        title={t("chat.agentProfile.open")}
+                        mouseEnterDelay={0.35}
+                        placement="left"
+                      >
+                        <span className={styles.chatFloatBtnWrap}>
+                          <button
+                            type="button"
+                            className={styles.agentProfileBtn}
+                            onClick={() => setAgentProfileOpen(true)}
+                            aria-label={t("chat.agentProfile.open")}
+                          >
+                            <GraduationCap size={20} strokeWidth={2.1} />
+                          </button>
+                        </span>
+                      </Tooltip>
+                      <Tooltip
+                        title={
+                          agentChatReady
+                            ? t("chat.openWorkspace", "工作区")
+                            : t("workspace.requiresRunning")
+                        }
+                        mouseEnterDelay={0.35}
+                        placement="left"
+                      >
+                        <span className={styles.chatFloatBtnWrap}>
+                          <button
+                            type="button"
+                            className={styles.chatFloatBtn}
+                            disabled={!agentChatReady}
+                            onClick={() => setWorkspaceDrawerOpen(true)}
+                            aria-label={t("chat.openWorkspace", "工作区")}
+                          >
+                            <FolderOpen size={20} strokeWidth={2.1} />
+                          </button>
+                        </span>
+                      </Tooltip>
+                    </>
+                  )}
+                  {!sharedExpertViewer && panelFilePaths.length > 0 && (
                     <Tooltip
-                      title={t("chat.agentProfile.open")}
+                      title={t("chat.modifiedFiles", {
+                        count: panelFilePaths.length,
+                        defaultValue: "已修改文件（{{count}}）",
+                      })}
                       mouseEnterDelay={0.35}
                       placement="left"
                     >
                       <span className={styles.chatFloatBtnWrap}>
                         <button
                           type="button"
-                          className={styles.agentProfileBtn}
-                          onClick={() => setAgentProfileOpen(true)}
-                          aria-label={t("chat.agentProfile.open")}
+                          className={styles.chatFloatBtn}
+                          onClick={() => openFileList()}
+                          aria-label={t("chat.modifiedFiles", {
+                            count: panelFilePaths.length,
+                            defaultValue: "已修改文件（{{count}}）",
+                          })}
                         >
-                          <GraduationCap size={20} strokeWidth={2.1} />
+                          <FilePen size={20} strokeWidth={2.1} />
                         </button>
+                        {panelFilePaths.length > 1 && (
+                          <span className={styles.chatFloatBadge}>
+                            {panelFilePaths.length > 99
+                              ? "99+"
+                              : panelFilePaths.length}
+                          </span>
+                        )}
                       </span>
                     </Tooltip>
+                  )}
+                  {canTerminal && (
                     <Tooltip
-                      title={
-                        agentChatReady
-                          ? t("chat.openWorkspace", "工作区")
-                          : t("workspace.requiresRunning")
-                      }
+                      title={t("chat.openTerminal", "打开终端")}
                       mouseEnterDelay={0.35}
                       placement="left"
                     >
                       <span className={styles.chatFloatBtnWrap}>
                         <button
                           type="button"
-                          className={styles.chatFloatBtn}
-                          disabled={!agentChatReady}
-                          onClick={() => setWorkspaceDrawerOpen(true)}
-                          aria-label={t("chat.openWorkspace", "工作区")}
+                          className={styles.terminalFloatBtn}
+                          onClick={toggleTerminalPanel}
+                          aria-label={t("chat.openTerminal", "打开终端")}
                         >
-                          <FolderOpen size={20} strokeWidth={2.1} />
+                          <Terminal size={20} strokeWidth={2.1} />
                         </button>
                       </span>
                     </Tooltip>
-                  </>
-                )}
-                {!sharedExpertViewer && panelFilePaths.length > 0 && (
-                  <Tooltip
-                    title={t("chat.modifiedFiles", {
-                      count: panelFilePaths.length,
-                      defaultValue: "已修改文件（{{count}}）",
-                    })}
-                    mouseEnterDelay={0.35}
-                    placement="left"
-                  >
-                    <span className={styles.chatFloatBtnWrap}>
-                      <button
-                        type="button"
-                        className={styles.chatFloatBtn}
-                        onClick={() => openFileList()}
-                        aria-label={t("chat.modifiedFiles", {
-                          count: panelFilePaths.length,
-                          defaultValue: "已修改文件（{{count}}）",
-                        })}
-                      >
-                        <FilePen size={20} strokeWidth={2.1} />
-                      </button>
-                      {panelFilePaths.length > 1 && (
-                        <span className={styles.chatFloatBadge}>
-                          {panelFilePaths.length > 99
-                            ? "99+"
-                            : panelFilePaths.length}
-                        </span>
-                      )}
-                    </span>
-                  </Tooltip>
-                )}
-                {canTerminal && (
+                  )}
                   <Tooltip
-                    title={t("chat.openTerminal", "打开终端")}
+                    title={
+                      browserSessionId
+                        ? t("browserWorkspace.browserStatusActive", {
+                            owner:
+                              browserControlOwner === "agent"
+                                ? t("browserWorkspace.agentControl")
+                                : t("browserWorkspace.userTakeover"),
+                          })
+                        : t("browserWorkspace.browserStatusIdle")
+                    }
                     mouseEnterDelay={0.35}
                     placement="left"
                   >
                     <span className={styles.chatFloatBtnWrap}>
                       <button
                         type="button"
-                        className={styles.terminalFloatBtn}
-                        onClick={toggleTerminalPanel}
-                        aria-label={t("chat.openTerminal", "打开终端")}
+                        className={[
+                          styles.browserStatusBtn,
+                          browserSessionId ? styles.browserStatusActive : "",
+                          browserSessionId &&
+                          (browserSessionState === "awaiting_user_auth" ||
+                            browserSessionState === "authenticating")
+                            ? styles.browserStatusAuth
+                            : "",
+                          browserSessionId && browserControlOwner === "user"
+                            ? styles.browserStatusTakeover
+                            : "",
+                        ]
+                          .filter(Boolean)
+                          .join(" ")}
+                        onClick={toggleBrowserPanel}
+                        aria-label={t("chat.openBrowser")}
                       >
-                        <Terminal size={20} strokeWidth={2.1} />
+                        <Globe size={20} strokeWidth={2.1} />
+                        {browserSessionId && (
+                          <span
+                            className={`${styles.browserStatusDot} ${
+                              styles[`browserStatus_${browserControlOwner}`]
+                            }`}
+                          />
+                        )}
                       </button>
                     </span>
                   </Tooltip>
-                )}
-                <Tooltip
-                  title={
-                    browserSessionId
-                      ? t("browserWorkspace.browserStatusActive", {
-                          owner:
-                            browserControlOwner === "agent"
-                              ? t("browserWorkspace.agentControl")
-                              : t("browserWorkspace.userTakeover"),
-                        })
-                      : t("browserWorkspace.browserStatusIdle")
-                  }
-                  mouseEnterDelay={0.35}
-                  placement="left"
-                >
-                  <span className={styles.chatFloatBtnWrap}>
-                    <button
-                      type="button"
-                      className={[
-                        styles.browserStatusBtn,
-                        browserSessionId ? styles.browserStatusActive : "",
-                        browserSessionId &&
-                        (browserSessionState === "awaiting_user_auth" ||
-                          browserSessionState === "authenticating")
-                          ? styles.browserStatusAuth
-                          : "",
-                        browserSessionId && browserControlOwner === "user"
-                          ? styles.browserStatusTakeover
-                          : "",
-                      ]
-                        .filter(Boolean)
-                        .join(" ")}
-                      onClick={toggleBrowserPanel}
-                      aria-label={t("chat.openBrowser")}
-                    >
-                      <Globe size={20} strokeWidth={2.1} />
-                      {browserSessionId && (
-                        <span
-                          className={`${styles.browserStatusDot} ${
-                            styles[`browserStatus_${browserControlOwner}`]
-                          }`}
-                        />
-                      )}
-                    </button>
-                  </span>
-                </Tooltip>
+                </div>
+              )}
+
+            <ChatComposerChrome sessionUsageLabel={sessionUsageLabel} />
+            {pendingAsk ? (
+              <div className={styles.askQuestionDock}>
+                <div className={styles.askQuestionDockInner}>
+                  <AskQuestionCard
+                    key={pendingAsk.id}
+                    questions={pendingAsk.questions}
+                    status="pending"
+                    onSubmit={(answer) =>
+                      handleHitlDecision(
+                        pendingAsk.actions.map(() => ({
+                          type: "respond",
+                          message: answer,
+                        })),
+                      )
+                    }
+                  />
+                </div>
               </div>
-            )}
+            ) : null}
+            <ChatInput
+              ref={chatInputRef}
+              onSend={wrappedHandleSend}
+              onQueue={enqueueQueued}
+              queuedItems={queuedItems}
+              onRemoveQueued={removeQueued}
+              onReclaimQueued={reclaimQueued}
+              onCancel={cancelStream}
+              onNewChat={handleNewChat}
+              isStreaming={isStreaming}
+              disabled={!agentChatReady || noAgents || memoryMaintBlocking}
+              initialText={prefillInputRef.current}
+              onComposerCleared={() => {
+                prefillInputRef.current = "";
+              }}
+              availableModels={availableModels}
+              selectedModel={selectedModel}
+              onModelChange={setSelectedModel}
+              reasoningMode={reasoningMode}
+              reasoningEffort={reasoningEffort}
+              onReasoningChange={handleReasoningChange}
+              availableConnectors={chatConnectors}
+              selectedConnectors={selectedConnectors}
+              onConnectorsChange={handleConnectorsChange}
+              availableKnowledgeBases={chatKnowledgeBases}
+              selectedKnowledgeBaseIds={selectedKnowledgeBaseIds}
+              onKnowledgeBaseIdsChange={handleKnowledgeBaseIdsChange}
+              availableSkills={chatSkills}
+              selectedSkills={selectedSkills}
+              onSkillsChange={handleSkillsChange}
+              availableAgents={chatAgentOptions}
+              selectedTargetAgents={selectedTargetAgents}
+              onTargetAgentsChange={setSelectedTargetAgents}
+              agentId={resolvedAgentId}
+              threadId={activeThreadId}
+              defaultModel={activeAgent?.default_model ?? null}
+              contextUsedTokens={contextUsedTokens}
+              contextMaxTokens={contextMaxTokens}
+            />
+          </div>
 
-          <ChatComposerChrome sessionUsageLabel={sessionUsageLabel} />
-          <ChatInput
-            ref={chatInputRef}
-            onSend={wrappedHandleSend}
-            onQueue={enqueueQueued}
-            queuedItems={queuedItems}
-            onRemoveQueued={removeQueued}
-            onReclaimQueued={reclaimQueued}
-            onCancel={cancelStream}
-            onNewChat={handleNewChat}
-            isStreaming={isStreaming}
-            disabled={!agentChatReady || noAgents || memoryMaintBlocking}
-            initialText={prefillInputRef.current}
-            onComposerCleared={() => {
-              prefillInputRef.current = "";
-            }}
-            availableModels={availableModels}
-            selectedModel={selectedModel}
-            onModelChange={setSelectedModel}
-            reasoningMode={reasoningMode}
-            reasoningEffort={reasoningEffort}
-            onReasoningChange={handleReasoningChange}
-            availableConnectors={chatConnectors}
-            selectedConnectors={selectedConnectors}
-            onConnectorsChange={handleConnectorsChange}
-            availableKnowledgeBases={chatKnowledgeBases}
-            selectedKnowledgeBaseIds={selectedKnowledgeBaseIds}
-            onKnowledgeBaseIdsChange={handleKnowledgeBaseIdsChange}
-            availableSkills={chatSkills}
-            selectedSkills={selectedSkills}
-            onSkillsChange={handleSkillsChange}
-            availableAgents={chatAgentOptions}
-            selectedTargetAgents={selectedTargetAgents}
-            onTargetAgentsChange={setSelectedTargetAgents}
-            agentId={resolvedAgentId}
+          <ChatDockPanels
+            isMobile={isMobile}
+            dockOpen={dockOpen}
+            dockMode={dockMode}
+            isResizing={dockIsResizing}
+            panelSizes={dockPanelSizes}
+            agentId={resolvedAgentId ?? ""}
+            filePaths={sharedExpertViewer ? [] : panelFilePaths}
+            openTabs={openTabs}
+            activeTabId={activeTabId}
+            onSelectTab={setDockActiveTab}
+            onCloseTab={closeDockTab}
+            onOpenFile={openFileAt}
+            browserEnvironment={browserEnvironment}
             threadId={activeThreadId}
-            defaultModel={activeAgent?.default_model ?? null}
-            contextUsedTokens={contextUsedTokens}
-            contextMaxTokens={contextMaxTokens}
+            isStreamingTurn={isStreaming}
+            onModeChange={handleDockModeChange}
+            onClose={handleDockClose}
+            onResizeStart={dockHandleResizeStart}
           />
-        </div>
 
-        <ChatDockPanels
-          isMobile={isMobile}
-          dockOpen={dockOpen}
-          dockMode={dockMode}
-          isResizing={dockIsResizing}
-          panelSizes={dockPanelSizes}
-          agentId={resolvedAgentId ?? ""}
-          filePaths={sharedExpertViewer ? [] : panelFilePaths}
-          openTabs={openTabs}
-          activeTabId={activeTabId}
-          onSelectTab={setDockActiveTab}
-          onCloseTab={closeDockTab}
-          onOpenFile={openFileAt}
-          browserEnvironment={browserEnvironment}
-          onModeChange={handleDockModeChange}
-          onClose={handleDockClose}
-          onResizeStart={dockHandleResizeStart}
-        />
-
-        {!sharedExpertViewer && (
-          <>
-            <AgentProfileDrawer
-              open={agentProfileOpen}
-              agent={activeAgent}
-              isMobile={isMobile}
-              onClose={() => setAgentProfileOpen(false)}
-            />
-            <WorkspaceDrawer
-              agentId={resolvedAgentId ?? ""}
-              open={workspaceDrawerOpen}
-              onClose={() => setWorkspaceDrawerOpen(false)}
-            />
-          </>
-        )}
-      </div>
+          {!sharedExpertViewer && (
+            <>
+              <AgentProfileDrawer
+                open={agentProfileOpen}
+                agent={activeAgent}
+                isMobile={isMobile}
+                onClose={() => setAgentProfileOpen(false)}
+              />
+              <WorkspaceDrawer
+                agentId={resolvedAgentId ?? ""}
+                open={workspaceDrawerOpen}
+                onClose={() => setWorkspaceDrawerOpen(false)}
+              />
+            </>
+          )}
+        </div>
+      </ChatToolDockProvider>
     </ChatFilePreviewProvider>
   );
 }
diff --git a/dashboard/src/pages/Chat/utils/dockToolUiTabId.ts b/dashboard/src/pages/Chat/utils/dockToolUiTabId.ts
new file mode 100644
index 00000000..3bd1c50f
--- /dev/null
+++ b/dashboard/src/pages/Chat/utils/dockToolUiTabId.ts
@@ -0,0 +1,4 @@
+/** Stable dock tab id for a tool call's plugin UI panel. */
+export function dockToolUiTabId(callId: string): string {
+  return `toolUi:${callId}`;
+}
diff --git a/dashboard/src/pages/Chat/utils/skillChipIcon.tsx b/dashboard/src/pages/Chat/utils/skillChipIcon.tsx
new file mode 100644
index 00000000..1b098695
--- /dev/null
+++ b/dashboard/src/pages/Chat/utils/skillChipIcon.tsx
@@ -0,0 +1,18 @@
+import type { ReactNode } from "react";
+import type { SkillSpec } from "../../Agent/Skills/useSkills";
+import styles from "../index.module.less";
+
+function skillChipFallback(skill: SkillSpec): string {
+  if (skill.emoji) return skill.emoji;
+  const name = skill.name || skill.slug;
+  return name.charAt(0).toUpperCase();
+}
+
+/** Composer / history chip icon: market image, then emoji, then initial. */
+export function skillChipIcon(skill: SkillSpec): ReactNode {
+  const iconUrl = skill.iconUrl?.trim();
+  if (iconUrl) {
+    return <img src={iconUrl} alt="" className={styles.contextChipIconImg} />;
+  }
+  return skillChipFallback(skill);
+}
diff --git a/dashboard/src/pages/Chat/utils/skillChipLabel.ts b/dashboard/src/pages/Chat/utils/skillChipLabel.ts
deleted file mode 100644
index 31ec5c6f..00000000
--- a/dashboard/src/pages/Chat/utils/skillChipLabel.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { SkillSpec } from "../../Agent/Skills/useSkills";
-
-export function skillChipLabel(skill: SkillSpec): string {
-  if (skill.emoji) return skill.emoji;
-  const name = skill.name || skill.slug;
-  return name.charAt(0).toUpperCase();
-}
diff --git a/dashboard/src/pages/Control/CronJobs/components/columns.tsx b/dashboard/src/pages/Control/CronJobs/components/columns.tsx
index 62e1c229..a95cf3b0 100644
--- a/dashboard/src/pages/Control/CronJobs/components/columns.tsx
+++ b/dashboard/src/pages/Control/CronJobs/components/columns.tsx
@@ -26,6 +26,8 @@ interface ColumnHandlers {
   onDelete: (jobId: string) => void;
   t: TFunction;
   timeZone: string;
+  /** Pin leading/trailing columns (disable on narrow screens). */
+  stickyColumns?: boolean;
 }
 
 function channelLabel(channel: string, t: TFunction): string {
@@ -36,13 +38,14 @@ function channelLabel(channel: string, t: TFunction): string {
 export const createColumns = (
   handlers: ColumnHandlers,
 ): ColumnsType<CronJob> => {
+  const sticky = handlers.stickyColumns !== false;
   return [
     {
       title: handlers.t("cronJobs.col.id"),
       dataIndex: "id",
       key: "id",
       width: 120,
-      fixed: "left",
+      fixed: sticky ? "left" : undefined,
       ellipsis: true,
       onHeaderCell: () => ({ style: { paddingLeft: 28 } }),
       render: (id: string, record: CronJob) => {
@@ -113,7 +116,7 @@ export const createColumns = (
       dataIndex: "enabled",
       key: "enabled",
       width: 100,
-      fixed: "left",
+      fixed: sticky ? "left" : undefined,
       render: (enabled: boolean) => (
         <span
           style={{
@@ -250,7 +253,7 @@ export const createColumns = (
       title: handlers.t("cronJobs.action"),
       key: "action",
       width: 200,
-      fixed: "right",
+      fixed: sticky ? "right" : undefined,
       render: (_: unknown, record: CronJob) => {
         const menuItems: MenuProps["items"] = [
           {
diff --git a/dashboard/src/pages/Control/CronJobs/index.module.less b/dashboard/src/pages/Control/CronJobs/index.module.less
index 7c434671..af3916ac 100644
--- a/dashboard/src/pages/Control/CronJobs/index.module.less
+++ b/dashboard/src/pages/Control/CronJobs/index.module.less
@@ -13,16 +13,28 @@
 /* ── Table (aligned with admin/users .userTable) ─────────────── */
 
 .cronTable {
+  width: 100%;
+  min-width: 0;
+  max-width: 100%;
+
+  :global(.octop-table-wrapper),
+  :global(.ant-table-wrapper) {
+    max-width: 100%;
+  }
+
+  :global(.octop-table),
   :global(.ant-table) {
     background: transparent;
   }
 
+  :global(.octop-table-container),
   :global(.ant-table-container) {
     border: 1px solid var(--fn-border-primary);
     border-radius: var(--fn-radius-lg, 12px);
     overflow: hidden;
   }
 
+  :global(.octop-table-thead > tr > th),
   :global(.ant-table-thead > tr > th) {
     background: var(--fn-bg-secondary, var(--fn-bg-elevated));
     color: var(--fn-text-tertiary);
@@ -32,21 +44,28 @@
     white-space: nowrap;
   }
 
+  :global(.octop-table-tbody > tr > td),
   :global(.ant-table-tbody > tr > td) {
     padding: 10px 12px;
     vertical-align: middle;
   }
 
+  :global(.octop-table-cell-fix-left),
+  :global(.octop-table-cell-fix-right),
   :global(.ant-table-cell-fix-left),
   :global(.ant-table-cell-fix-right) {
     background: var(--fn-bg-primary, #fff) !important;
   }
 
+  :global(.octop-table-thead .octop-table-cell-fix-left),
+  :global(.octop-table-thead .octop-table-cell-fix-right),
   :global(.ant-table-thead .ant-table-cell-fix-left),
   :global(.ant-table-thead .ant-table-cell-fix-right) {
     background: var(--fn-bg-secondary, #fafafa) !important;
   }
 
+  :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;
@@ -98,6 +117,9 @@
 .listShell {
   position: relative;
   transition: opacity 0.15s ease;
+  width: 100%;
+  min-width: 0;
+  max-width: 100%;
 }
 
 .listShellBusy {
diff --git a/dashboard/src/pages/Control/CronJobs/index.tsx b/dashboard/src/pages/Control/CronJobs/index.tsx
index 7071d49b..546fb27c 100644
--- a/dashboard/src/pages/Control/CronJobs/index.tsx
+++ b/dashboard/src/pages/Control/CronJobs/index.tsx
@@ -230,6 +230,7 @@ function CronJobsPage() {
     onDelete: handleDelete,
     t,
     timeZone: cronTimezone,
+    stickyColumns: !isMobile,
   });
 
   // Until the user picks an agent there is nothing to fetch and no scope
@@ -354,7 +355,7 @@ function CronJobsPage() {
               dataSource={jobs}
               rowKey="id"
               size="middle"
-              scroll={{ x: "max-content" }}
+              scroll={{ x: 1300 }}
               pagination={{
                 pageSize: 10,
                 showSizeChanger: false,
diff --git a/dashboard/src/pages/Control/RemoteBrowser/index.tsx b/dashboard/src/pages/Control/RemoteBrowser/index.tsx
index ee815c39..7385ff84 100644
--- a/dashboard/src/pages/Control/RemoteBrowser/index.tsx
+++ b/dashboard/src/pages/Control/RemoteBrowser/index.tsx
@@ -10,6 +10,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useSearchParams } from "react-router-dom";
 import {
   Alert,
+  App,
   Button,
   Drawer,
   Modal,
@@ -20,7 +21,6 @@ import {
   Tooltip,
   Typography,
 } from "antd";
-import { message as antMessage } from "@/utils/antdMessage";
 
 import {
   Bot,
@@ -310,6 +310,7 @@ export default function RemoteBrowserPage({
   isVisible = true,
 }: RemoteBrowserPageProps) {
   const { t } = useTranslation();
+  const { modal, message: antMessage } = App.useApp();
   const isMobile = useIsMobile();
   const { activeAgent, activeAgentId, agents } = useAgent();
   const [searchParams] = useSearchParams();
@@ -610,7 +611,7 @@ export default function RemoteBrowserPage({
 
   const handleUninstall = useCallback(() => {
     if (!envStatus?.playwright_chromium || uninstalling) return;
-    Modal.confirm({
+    modal.confirm({
       title: t("remoteBrowser.uninstallTitle", "卸载远程浏览器"),
       content: t(
         "remoteBrowser.uninstallConfirm",
diff --git a/dashboard/src/pages/Control/RemoteDesktop/DesktopPanel.tsx b/dashboard/src/pages/Control/RemoteDesktop/DesktopPanel.tsx
index ee50b71c..664271f1 100644
--- a/dashboard/src/pages/Control/RemoteDesktop/DesktopPanel.tsx
+++ b/dashboard/src/pages/Control/RemoteDesktop/DesktopPanel.tsx
@@ -1,6 +1,7 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import {
   Alert,
+  App,
   Button,
   Drawer,
   Modal,
@@ -11,7 +12,6 @@ import {
   Tag,
   Tooltip,
 } from "antd";
-import { message } from "@/utils/antdMessage";
 
 import {
   CheckCircle2,
@@ -90,6 +90,7 @@ export default function DesktopPanel({
   isVisible = true,
 }: DesktopPanelProps) {
   const { t } = useTranslation();
+  const { modal, message } = App.useApp();
   const user = useCurrentUser();
   const canDesktop = userCan(user, "desktop");
   const isMobile = useIsMobile();
@@ -253,7 +254,7 @@ export default function DesktopPanel({
           "remoteDesktop.uninstallConfirmLinux",
           "将停止虚拟桌面服务并移除已安装组件，是否继续？",
         );
-    Modal.confirm({
+    modal.confirm({
       title: t("remoteDesktop.uninstallTitle", "卸载远程桌面"),
       content: confirmText,
       okText: t("remoteDesktop.uninstall", "卸载"),
@@ -394,7 +395,7 @@ export default function DesktopPanel({
   const handleResolutionChange = useCallback(
     (value: DesktopResolution) => {
       if (envStatus?.platform === "linux" && isStreaming) {
-        Modal.confirm({
+        modal.confirm({
           title: t("remoteDesktop.geometryRestartTitle", "切换分辨率"),
           content: t(
             "remoteDesktop.geometryRestartWarning",
diff --git a/dashboard/src/pages/Experts/components/AgentBackendFields.tsx b/dashboard/src/pages/Experts/components/AgentBackendFields.tsx
index 5ce9eb2a..249d3ae3 100644
--- a/dashboard/src/pages/Experts/components/AgentBackendFields.tsx
+++ b/dashboard/src/pages/Experts/components/AgentBackendFields.tsx
@@ -167,29 +167,46 @@ export default function AgentBackendFields({
                 : undefined
             }
           >
-            <RootDirSelect treeRoot={treeRoot} />
+            <RootDirSelect
+              treeRoot={treeRoot}
+              disabled={rootDirMode === "edit"}
+            />
           </Form.Item>
           <div style={{ margin: "-8px 0 12px" }}>
-            <p
-              style={{
-                fontSize: 12,
-                color: "var(--fn-text-tertiary)",
-                margin: 0,
-              }}
-            >
-              {t("experts.backendRootDirDesc", {
-                home: fsDefaults?.home ?? "~",
-              })}
-            </p>
-            <p
-              style={{
-                fontSize: 12,
-                color: "var(--fn-text-tertiary)",
-                margin: "4px 0 0",
-              }}
-            >
-              {t("experts.backendRootDirJailHint")}
-            </p>
+            {rootDirMode === "edit" ? (
+              <p
+                style={{
+                  fontSize: 12,
+                  color: "var(--fn-text-tertiary)",
+                  margin: 0,
+                }}
+              >
+                {t("experts.backendRootDirImmutableHint")}
+              </p>
+            ) : (
+              <>
+                <p
+                  style={{
+                    fontSize: 12,
+                    color: "var(--fn-text-tertiary)",
+                    margin: 0,
+                  }}
+                >
+                  {t("experts.backendRootDirDesc", {
+                    home: fsDefaults?.home ?? "~",
+                  })}
+                </p>
+                <p
+                  style={{
+                    fontSize: 12,
+                    color: "var(--fn-text-tertiary)",
+                    margin: "4px 0 0",
+                  }}
+                >
+                  {t("experts.backendRootDirJailHint")}
+                </p>
+              </>
+            )}
           </div>
         </>
       )}
diff --git a/dashboard/src/pages/Experts/components/AgentExpertsTable.tsx b/dashboard/src/pages/Experts/components/AgentExpertsTable.tsx
index ecda869e..e3f87140 100644
--- a/dashboard/src/pages/Experts/components/AgentExpertsTable.tsx
+++ b/dashboard/src/pages/Experts/components/AgentExpertsTable.tsx
@@ -38,6 +38,7 @@ import ToolCatalogDrawer from "./ToolCatalogDrawer";
 import { request } from "../../../api/request";
 import type { OctopAgent } from "../../../context/AgentContext";
 import { useAgent } from "../../../context/AgentContext";
+import { useIsMobile } from "../../../hooks/useIsMobile";
 import MbtiPersonaTag from "../../../components/MbtiPersonaTag";
 import MbtiCatalogDrawer from "./MbtiCatalogDrawer";
 import { ExpertIcon } from "./iconForName";
@@ -82,6 +83,7 @@ export default function AgentExpertsTable({
 }: AgentExpertsTableProps) {
   const { t } = useTranslation();
   const navigate = useNavigate();
+  const isMobile = useIsMobile();
   const { setActiveAgent, refresh: refreshAgents } = useAgent();
   const [localStates, setLocalStates] = useState<Record<string, string>>({});
   const [actionLoadingId, setActionLoadingId] = useState<string | null>(null);
@@ -112,6 +114,7 @@ export default function AgentExpertsTable({
   const [scrollY, setScrollY] = useState(360);
 
   useLayoutEffect(() => {
+    if (isMobile) return;
     const el = tableWrapRef.current;
     if (!el) return;
 
@@ -130,7 +133,7 @@ export default function AgentExpertsTable({
       ro.disconnect();
       window.removeEventListener("resize", update);
     };
-  }, [agents.length]);
+  }, [agents.length, isMobile]);
 
   const openMbtiCatalog = useCallback((agentId: string) => {
     setMbtiAgentId(agentId);
@@ -267,7 +270,7 @@ export default function AgentExpertsTable({
       title: t("experts.table.name", "名称"),
       dataIndex: "name",
       width: 160,
-      fixed: "left",
+      fixed: isMobile ? undefined : "left",
       render: (name: string, row) => (
         <div className={styles.tableNameCell}>
           <span
@@ -385,7 +388,7 @@ export default function AgentExpertsTable({
       title: t("experts.table.actions", "操作"),
       key: "actions",
       width: 370,
-      fixed: "right",
+      fixed: isMobile ? undefined : "right",
       render: (_v, row) => {
         const state = localStates[row.agent_id] ?? row.state;
         const isTransient = TRANSIENT.has(state);
@@ -559,7 +562,7 @@ export default function AgentExpertsTable({
           rowKey="agent_id"
           dataSource={agents}
           columns={columns}
-          scroll={{ x: 1370, y: scrollY }}
+          scroll={isMobile ? { x: 1370 } : { x: 1370, y: scrollY }}
           pagination={{
             defaultPageSize: 10,
             showSizeChanger: true,
diff --git a/dashboard/src/pages/Experts/components/EditAgentDrawer.tsx b/dashboard/src/pages/Experts/components/EditAgentDrawer.tsx
index 2310c421..1b5fad39 100644
--- a/dashboard/src/pages/Experts/components/EditAgentDrawer.tsx
+++ b/dashboard/src/pages/Experts/components/EditAgentDrawer.tsx
@@ -2,6 +2,8 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import {
+  Alert,
+  App,
   Button,
   Collapse,
   Drawer,
@@ -12,9 +14,7 @@ import {
   Select,
   Spin,
   Switch,
-  Alert,
 } from "antd";
-import { message } from "@/utils/antdMessage";
 
 import { MoreHorizontal } from "lucide-react";
 import { request } from "../../../api/request";
@@ -208,6 +208,7 @@ function EditAgentDrawerBody({
   onSavingChange,
 }: EditAgentDrawerBodyProps) {
   const { t } = useTranslation();
+  const { modal, message } = App.useApp();
   const { refresh } = useAgent();
   const skillDisplayName = useSkillDisplayName();
   const [workspaceDrawerOpen, setWorkspaceDrawerOpen] = useState(false);
@@ -548,7 +549,7 @@ function EditAgentDrawerBody({
   };
 
   const confirmDeleteConfigFile = (path: string) => {
-    Modal.confirm({
+    modal.confirm({
       title: t("workspace.deleteConfirm"),
       okText: t("common.delete"),
       cancelText: t("common.cancel"),
@@ -563,7 +564,7 @@ function EditAgentDrawerBody({
 
   const confirmDeleteSkill = (skill: SkillSummary) => {
     const slug = skill.slug ?? skill.name;
-    Modal.confirm({
+    modal.confirm({
       title: t("skills.deleteConfirmContent", { slug }),
       okText: t("common.delete"),
       cancelText: t("common.cancel"),
@@ -579,7 +580,7 @@ function EditAgentDrawerBody({
   };
 
   const confirmDeleteSubagent = (subagent: SubagentSummary) => {
-    Modal.confirm({
+    modal.confirm({
       title: t("workspace.deleteConfirm"),
       okText: t("common.delete"),
       cancelText: t("common.cancel"),
diff --git a/dashboard/src/pages/Experts/components/PublishTemplateButton.tsx b/dashboard/src/pages/Experts/components/PublishTemplateButton.tsx
index 1fd7e8bf..811ee5f8 100644
--- a/dashboard/src/pages/Experts/components/PublishTemplateButton.tsx
+++ b/dashboard/src/pages/Experts/components/PublishTemplateButton.tsx
@@ -1,7 +1,6 @@
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Dropdown, Modal, Tooltip } from "antd";
-import { message } from "@/utils/antdMessage";
+import { App, Dropdown, Tooltip } from "antd";
 import { Upload } from "lucide-react";
 import {
   publishedExpertsApi,
@@ -27,6 +26,7 @@ export default function PublishTemplateButton({
   buttonClassName = styles.agentCard2NameActionBtn,
 }: PublishTemplateButtonProps) {
   const { t } = useTranslation();
+  const { modal, message } = App.useApp();
   const [loading, setLoading] = useState(false);
   const [drawerOpen, setDrawerOpen] = useState(false);
   const [drawerMode, setDrawerMode] = useState<"publish" | "refresh">(
@@ -45,7 +45,7 @@ export default function PublishTemplateButton({
 
   const confirmUnpublish = () => {
     if (!published) return;
-    Modal.confirm({
+    modal.confirm({
       title: t("experts.published.unpublishConfirm"),
       okText: t("experts.published.unpublish"),
       cancelText: t("common.cancel"),
diff --git a/dashboard/src/pages/Experts/components/PublishedExpertCard.tsx b/dashboard/src/pages/Experts/components/PublishedExpertCard.tsx
index c5f300b4..527d9e37 100644
--- a/dashboard/src/pages/Experts/components/PublishedExpertCard.tsx
+++ b/dashboard/src/pages/Experts/components/PublishedExpertCard.tsx
@@ -1,7 +1,6 @@
 import { memo, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Dropdown, Modal } from "antd";
-import { message } from "@/utils/antdMessage";
+import { App, Dropdown } from "antd";
 import { MoreHorizontal } from "lucide-react";
 import { iconForName } from "./iconForName";
 import {
@@ -25,11 +24,12 @@ export const PublishedExpertCard = memo(function PublishedExpertCard({
   onChanged,
 }: PublishedExpertCardProps) {
   const { t } = useTranslation();
+  const { modal, message } = App.useApp();
   const [loading, setLoading] = useState(false);
   const accent = expert.color || "var(--fn-color-brand)";
 
   const confirmUnpublish = () => {
-    Modal.confirm({
+    modal.confirm({
       title: t("experts.published.unpublishConfirm"),
       okText: t("experts.published.unpublish"),
       cancelText: t("common.cancel"),
diff --git a/dashboard/src/pages/Experts/components/RootDirSelect.tsx b/dashboard/src/pages/Experts/components/RootDirSelect.tsx
index c042a0b5..fdaa7830 100644
--- a/dashboard/src/pages/Experts/components/RootDirSelect.tsx
+++ b/dashboard/src/pages/Experts/components/RootDirSelect.tsx
@@ -36,6 +36,8 @@ interface RootDirSelectProps {
   onChange?: (value: string) => void;
   /** Tree browse root: host ``/`` (or drive root). Default value is still home. */
   treeRoot?: string;
+  /** When true, shows the current path but blocks picking / mkdir / rename. */
+  disabled?: boolean;
 }
 
 type DisplayTreeNode = Omit<DirTreeNode, "title" | "children"> & {
@@ -73,6 +75,7 @@ export default function RootDirSelect({
   value,
   onChange,
   treeRoot = HOST_FS_ROOT,
+  disabled = false,
 }: RootDirSelectProps) {
   const { t } = useTranslation();
   const normalizedRoot = normalizeTreeRoot(treeRoot);
@@ -312,6 +315,14 @@ export default function RootDirSelect({
         );
       }
 
+      if (disabled) {
+        return (
+          <span className={styles.rootDirTitle}>
+            <span className={styles.rootDirTitleLabel}>{name}</span>
+          </span>
+        );
+      }
+
       return (
         <span className={styles.rootDirTitle}>
           <span className={styles.rootDirTitleLabel}>{name}</span>
@@ -363,6 +374,7 @@ export default function RootDirSelect({
       beginEditing,
       busy,
       commitRename,
+      disabled,
       editingName,
       editingPath,
       handleMkdir,
@@ -383,13 +395,16 @@ export default function RootDirSelect({
       className={styles.rootDirSelect}
       popupClassName={styles.rootDirDropdown}
       classNames={{ popup: { root: styles.rootDirDropdown } }}
-      open={open}
+      disabled={disabled}
+      open={disabled ? false : open}
       onDropdownVisibleChange={(next) => {
+        if (disabled) return;
         if (!next && editingPathRef.current) return;
         setOpen(next);
       }}
       value={value}
       onChange={(next) => {
+        if (disabled) return;
         setOpen(false);
         onChange?.(next);
       }}
diff --git a/dashboard/src/pages/Experts/components/SubagentManager.tsx b/dashboard/src/pages/Experts/components/SubagentManager.tsx
index f7d29c1f..9bc882ea 100644
--- a/dashboard/src/pages/Experts/components/SubagentManager.tsx
+++ b/dashboard/src/pages/Experts/components/SubagentManager.tsx
@@ -9,8 +9,7 @@ import {
   useState,
   type CSSProperties,
 } from "react";
-import { Alert, Empty, Form, Input, Modal, Spin, Tabs } from "antd";
-import { message } from "@/utils/antdMessage";
+import { Alert, App, Empty, Form, Input, Spin, Tabs } from "antd";
 
 import { CircleCheck, Download, Plus, RefreshCw, Search } from "lucide-react";
 import { Eye, Pencil, Trash2 } from "lucide-react";
@@ -70,6 +69,7 @@ export default function SubagentManager({
   fillHeight = false,
 }: SubagentManagerProps) {
   const { t, i18n } = useTranslation();
+  const { modal, message } = App.useApp();
   const lang = normalizeUiLocale(i18n.language);
   const [divisions, setDivisions] = useState<SubagentCatalogDivision[]>([]);
   const [allItems, setAllItems] = useState<SubagentCatalogItem[]>([]);
@@ -339,7 +339,7 @@ export default function SubagentManager({
   };
 
   const confirmDeleteSubagent = (subagent: AgentSubagentSummary) => {
-    Modal.confirm({
+    modal.confirm({
       title: t("workspace.deleteConfirm"),
       okText: t("common.delete"),
       cancelText: t("common.cancel"),
diff --git a/dashboard/src/pages/Experts/components/agentBackendForm.ensureBwrap.test.ts b/dashboard/src/pages/Experts/components/agentBackendForm.ensureBwrap.test.ts
index 142e912b..14f51e98 100644
--- a/dashboard/src/pages/Experts/components/agentBackendForm.ensureBwrap.test.ts
+++ b/dashboard/src/pages/Experts/components/agentBackendForm.ensureBwrap.test.ts
@@ -5,7 +5,7 @@ describe("ensureBwrap helpers", () => {
   it("maps status to toast kind", () => {
     expect(ensureBwrapToastKind("ready")).toBe("none");
     expect(ensureBwrapToastKind("installed")).toBe("success");
-    expect(ensureBwrapToastKind("skipped")).toBe("warning");
+    expect(ensureBwrapToastKind("skipped")).toBe("none");
     expect(ensureBwrapToastKind("degraded")).toBe("warning");
   });
 
diff --git a/dashboard/src/pages/Experts/components/agentBackendForm.ts b/dashboard/src/pages/Experts/components/agentBackendForm.ts
index 1f1a2576..ddf05b96 100644
--- a/dashboard/src/pages/Experts/components/agentBackendForm.ts
+++ b/dashboard/src/pages/Experts/components/agentBackendForm.ts
@@ -168,7 +168,7 @@ export async function ensureBubblewrapAfterProbe(): Promise<EnsureBwrapResult> {
 export function ensureBwrapToastKind(
   status: EnsureBwrapStatus,
 ): "none" | "success" | "warning" {
-  if (status === "ready") return "none";
+  if (status === "ready" || status === "skipped") return "none";
   if (status === "installed") return "success";
   return "warning";
 }
diff --git a/dashboard/src/pages/Experts/index.module.less b/dashboard/src/pages/Experts/index.module.less
index 2f11ca0c..02f9f5d2 100644
--- a/dashboard/src/pages/Experts/index.module.less
+++ b/dashboard/src/pages/Experts/index.module.less
@@ -1739,6 +1739,14 @@
 
 .expertsTable {
   margin: 12px 0 0;
+  width: 100%;
+  min-width: 0;
+  max-width: 100%;
+
+  :global(.octop-table-wrapper),
+  :global(.ant-table-wrapper) {
+    max-width: 100%;
+  }
 
   :global(.octop-table-pagination) {
     margin: 12px 0 0 !important;
diff --git a/dashboard/src/pages/KnowledgeBases/index.tsx b/dashboard/src/pages/KnowledgeBases/index.tsx
index 714cb295..027cf322 100644
--- a/dashboard/src/pages/KnowledgeBases/index.tsx
+++ b/dashboard/src/pages/KnowledgeBases/index.tsx
@@ -7,11 +7,13 @@ import {
 } from "react";
 import {
   Alert,
+  App,
   Button,
   Drawer,
   Empty,
   Form,
   Input,
+  InputNumber,
   List,
   Modal,
   Popconfirm,
@@ -25,7 +27,6 @@ import {
   Tooltip,
   Typography,
 } from "antd";
-import { message } from "@/utils/antdMessage";
 import { ResizableTable } from "@/components/ResizableTable";
 import {
   Check,
@@ -94,6 +95,7 @@ type BaseFormValues = {
   name: string;
   description?: string;
   icon_name?: string;
+  max_documents?: number;
 };
 
 type DocsViewMode = "card" | "table";
@@ -221,6 +223,7 @@ function ReadinessRow({
 
 export default function KnowledgeBasesPage() {
   const { t } = useTranslation();
+  const { modal, message } = App.useApp();
   const navigate = useNavigate();
   const isMobile = useIsMobile();
   const timeZone = useServerTimezone();
@@ -327,7 +330,8 @@ export default function KnowledgeBasesPage() {
     : 0;
   const atBaseLimit = ownedBaseCount >= limits.max_bases_per_owner;
   const fileCount = documents.filter((document) => !document.is_dir).length;
-  const isAtDocumentLimit = fileCount >= limits.max_docs_per_kb;
+  const isAtDocumentLimit =
+    fileCount >= (selected?.max_documents ?? limits.max_docs_per_kb);
   const folderEntries = documents
     .filter((document) =>
       isDirectKnowledgeChild(document.path || document.filename, currentFolder),
@@ -417,7 +421,7 @@ export default function KnowledgeBasesPage() {
         );
       } else if (status === "downloading") {
         setDownloadProgressLabel(
-          t("models.onnxDownloadProgress", { model: modelId, percent: pct }),
+          t("models.onnxDownloading", { model: modelId }),
         );
       } else {
         setDownloadProgressLabel(t("models.localDownloadPreparing"));
@@ -598,6 +602,7 @@ export default function KnowledgeBasesPage() {
       name: "",
       description: "",
       icon_name: "book-open",
+      max_documents: 100,
     });
     setDefaultOpenChecked(false);
     setSharedChecked(false);
@@ -611,6 +616,7 @@ export default function KnowledgeBasesPage() {
       name: selected.name,
       description: selected.description,
       icon_name: selected.icon_name || undefined,
+      max_documents: selected.max_documents,
     });
     setDefaultOpenChecked(selected.default_open);
     setSharedChecked(selected.shared);
@@ -717,7 +723,7 @@ export default function KnowledgeBasesPage() {
         capability.provider_id !==
           (featureBackend === "remote" ? featureProviderId : ""))
     ) {
-      Modal.confirm({
+      modal.confirm({
         title: t("knowledgeBases.rebuildConfirmTitle"),
         content: t("knowledgeBases.rebuildConfirmDescription"),
         okText: t("common.confirm"),
@@ -778,7 +784,7 @@ export default function KnowledgeBasesPage() {
   const startOnnxDownload = async (modelId: string) => {
     const selected = catalog.find((model) => model.id === modelId);
     const size = formatSizeGb(selected?.size_gb);
-    Modal.confirm({
+    modal.confirm({
       title: t("models.localDownloadConfirmTitle"),
       content: t("models.localDownloadConfirmOnnx", {
         name: modelId,
@@ -813,7 +819,10 @@ export default function KnowledgeBasesPage() {
 
   const uploadDocuments = async (files: FileList | null) => {
     if (!selected || !files || !usable || isAtDocumentLimit) return;
-    const remaining = Math.max(0, limits.max_docs_per_kb - fileCount);
+    const remaining = Math.max(
+      0,
+      (selected?.max_documents ?? limits.max_docs_per_kb) - fileCount,
+    );
     const chosen = Array.from(files).slice(0, remaining);
     const oversized = chosen.filter(
       (file) => file.size > limits.max_document_bytes,
@@ -1476,7 +1485,8 @@ export default function KnowledgeBasesPage() {
                       <span className={skillStyles.gridCount}>
                         {t("knowledgeBases.documentLimit", {
                           count: fileCount,
-                          max: limits.max_docs_per_kb,
+                          max:
+                            selected?.max_documents ?? limits.max_docs_per_kb,
                         })}
                       </span>
                       <div className={skillStyles.gridToolbarRight}>
@@ -1607,7 +1617,8 @@ export default function KnowledgeBasesPage() {
                         type="info"
                         showIcon
                         message={t("knowledgeBases.documentLimitReached", {
-                          count: limits.max_docs_per_kb,
+                          count:
+                            selected?.max_documents ?? limits.max_docs_per_kb,
                         })}
                       />
                     ) : null}
@@ -1724,6 +1735,7 @@ export default function KnowledgeBasesPage() {
                         size="small"
                         rowKey="id"
                         pagination={false}
+                        scroll={{ x: 720 }}
                         dataSource={folderEntries}
                         onRow={(document) => ({
                           onClick: document.is_dir
@@ -1937,6 +1949,19 @@ export default function KnowledgeBasesPage() {
               showCount
             />
           </Form.Item>
+          <Form.Item
+            name="max_documents"
+            label={t("knowledgeBases.maxDocuments")}
+            extra={t("knowledgeBases.maxDocumentsHint")}
+          >
+            <InputNumber
+              min={0}
+              max={10000}
+              step={1}
+              precision={0}
+              style={{ width: "100%" }}
+            />
+          </Form.Item>
           <Form.Item name="icon_name" label={t("knowledgeBases.icon")}>
             <KnowledgeIconPicker />
           </Form.Item>
diff --git a/dashboard/src/pages/Settings/BackupRestore/index.tsx b/dashboard/src/pages/Settings/BackupRestore/index.tsx
index 69258f17..d12172a9 100644
--- a/dashboard/src/pages/Settings/BackupRestore/index.tsx
+++ b/dashboard/src/pages/Settings/BackupRestore/index.tsx
@@ -1,5 +1,6 @@
 import { useCallback, useEffect, useState } from "react";
 import {
+  App,
   Button,
   Checkbox,
   Divider,
@@ -14,7 +15,6 @@ import {
   Table,
   Upload,
 } from "antd";
-import { message } from "@/utils/antdMessage";
 
 import type { ColumnsType } from "antd/es/table";
 import {
@@ -34,6 +34,7 @@ import {
   type AutoBackupSettings,
   type BackupFileItem,
 } from "../../../api/modules/backup";
+import { useBackupOperation } from "../../../context/BackupOperationContext";
 import { useServiceRestartContext } from "../../../context/ServiceRestartContext";
 import { useIsMobile } from "../../../hooks/useIsMobile";
 import { useServerTimezone } from "../../../hooks/useServerTimezone";
@@ -75,6 +76,7 @@ function parseIntervalSeconds(spec: string): number | null {
 interface BackupFileCardProps {
   row: BackupFileItem;
   downloading: boolean;
+  restoringThis: boolean;
   busy: boolean;
   timeZone: string;
   onDownload: (row: BackupFileItem) => void;
@@ -85,6 +87,7 @@ interface BackupFileCardProps {
 function BackupFileCard({
   row,
   downloading,
+  restoringThis,
   busy,
   timeZone,
   onDownload,
@@ -122,10 +125,11 @@ function BackupFileCard({
         <Button
           size="small"
           icon={<RotateCcw size={14} />}
+          loading={restoringThis}
           disabled={busy}
           onClick={() => onRestore(row)}
         >
-          {t("backup.restoreAction")}
+          {restoringThis ? t("backup.restoring") : t("backup.restoreAction")}
         </Button>
         <Button
           size="small"
@@ -143,18 +147,31 @@ function BackupFileCard({
 
 export default function BackupRestorePanel() {
   const { t } = useTranslation();
+  const { modal, message } = App.useApp();
   const isMobile = useIsMobile();
   const serverTimezone = useServerTimezone();
   const { isRestarting } = useServiceRestartContext();
+  const {
+    kind,
+    restoreTarget,
+    uploadPercent,
+    busy: opBusy,
+    creating,
+    restoring,
+    autoRunning,
+    createBackup,
+    runAutoBackup,
+    restoreBackup,
+    uploadBackup,
+    syncFromServer,
+    setOnSettled,
+  } = useBackupOperation();
+
   const [items, setItems] = useState<BackupFileItem[]>([]);
   const [dir, setDir] = useState("");
   const [loading, setLoading] = useState(false);
-  const [creating, setCreating] = useState(false);
   const [restoreOpen, setRestoreOpen] = useState(false);
   const [restoreConfig, setRestoreConfig] = useState(true);
-  const [restoring, setRestoring] = useState(false);
-  const [restoreProgress, setRestoreProgress] = useState(false);
-  const [uploadPercent, setUploadPercent] = useState<number | null>(null);
   const [pendingRestore, setPendingRestore] = useState<BackupFileItem | null>(
     null,
   );
@@ -167,15 +184,10 @@ export default function BackupRestorePanel() {
   const [autoScheduled, setAutoScheduled] = useState(false);
   const [autoLoading, setAutoLoading] = useState(false);
   const [autoSaving, setAutoSaving] = useState(false);
-  const [autoRunning, setAutoRunning] = useState(false);
 
-  const busy =
-    creating ||
-    restoring ||
-    uploadPercent !== null ||
-    isRestarting ||
-    autoSaving ||
-    autoRunning;
+  const busy = opBusy || isRestarting || autoSaving;
+  const backingUp = creating || autoRunning || kind === "export";
+  const restoringThisName = restoring ? restoreTarget : null;
 
   const customIntervalSeconds = parseIntervalSeconds(autoSchedule);
 
@@ -201,7 +213,7 @@ export default function BackupRestorePanel() {
     } finally {
       setLoading(false);
     }
-  }, [t]);
+  }, [message, t]);
 
   const refreshAuto = useCallback(async () => {
     setAutoLoading(true);
@@ -213,24 +225,43 @@ export default function BackupRestorePanel() {
     } finally {
       setAutoLoading(false);
     }
-  }, [applyAutoSettings, t]);
+  }, [applyAutoSettings, message, t]);
 
   useEffect(() => {
     void refresh();
     void refreshAuto();
   }, [refresh, refreshAuto]);
 
-  const onCreate = async () => {
-    setCreating(true);
-    try {
-      await backupApi.createBackup();
-      message.success(t("backup.createSuccess"));
-      await refresh();
-    } catch (err: unknown) {
-      message.error(apiErrorMessage(err, t("backup.createFailed"), t));
-    } finally {
-      setCreating(false);
+  useEffect(() => {
+    setOnSettled(() => {
+      void refresh();
+    });
+    return () => setOnSettled(null);
+  }, [refresh, setOnSettled]);
+
+  // Re-attach to in-flight server ops after remount / hard refresh.
+  useEffect(() => {
+    void syncFromServer();
+    const id = window.setInterval(() => {
+      void syncFromServer();
+    }, 2000);
+    return () => window.clearInterval(id);
+  }, [syncFromServer]);
+
+  // Keep modal open while a restore for this selection is running (incl. after remount).
+  useEffect(() => {
+    if (restoring && restoreTarget) {
+      setRestoreOpen(true);
+      setPendingRestore((prev) =>
+        prev?.name === restoreTarget
+          ? prev
+          : ({ name: restoreTarget } as BackupFileItem),
+      );
     }
+  }, [restoring, restoreTarget]);
+
+  const onCreate = async () => {
+    await createBackup();
   };
 
   const onSaveAuto = async () => {
@@ -251,16 +282,7 @@ export default function BackupRestorePanel() {
   };
 
   const onRunAuto = async () => {
-    setAutoRunning(true);
-    try {
-      await backupApi.runAutoBackup();
-      message.success(t("backup.autoRunSuccess"));
-      await refresh();
-    } catch (err: unknown) {
-      message.error(apiErrorMessage(err, t("backup.autoRunFailed"), t));
-    } finally {
-      setAutoRunning(false);
-    }
+    await runAutoBackup();
   };
 
   const onDownload = async (row: BackupFileItem) => {
@@ -278,33 +300,17 @@ export default function BackupRestorePanel() {
 
   const confirmRestore = async () => {
     if (!pendingRestore) return;
-    setRestoring(true);
-    setRestoreProgress(true);
-    try {
-      const result = await backupApi.restoreBackup(
-        pendingRestore.name,
-        restoreConfig,
-      );
-      message.success(
-        t("backup.importSuccess", {
-          agents: result.agents,
-          files: result.workspace_files,
-        }),
-      );
+    const name = pendingRestore.name;
+    const ok = await restoreBackup(name, restoreConfig);
+    if (ok) {
       setRestoreOpen(false);
       setPendingRestore(null);
-      await refresh();
-    } catch (err: unknown) {
-      message.error(apiErrorMessage(err, t("backup.importFailed"), t));
-    } finally {
-      setRestoreProgress(false);
-      setRestoring(false);
     }
   };
 
   const onDelete = (row: BackupFileItem) => {
     if (busy) return;
-    Modal.confirm({
+    modal.confirm({
       title: t("backup.deleteConfirmTitle"),
       content: t("backup.deleteConfirmBody", { name: row.name }),
       okText: t("common.delete"),
@@ -366,13 +372,16 @@ export default function BackupRestorePanel() {
             type="link"
             size="small"
             icon={<RotateCcw size={14} />}
+            loading={restoringThisName === row.name}
             disabled={busy}
             onClick={() => {
               setPendingRestore(row);
               setRestoreOpen(true);
             }}
           >
-            {t("backup.restoreAction")}
+            {restoringThisName === row.name
+              ? t("backup.restoring")
+              : t("backup.restoreAction")}
           </Button>
           <Button
             type="link"
@@ -415,32 +424,14 @@ export default function BackupRestorePanel() {
             disabled={busy && !creating}
             onClick={() => void onCreate()}
           >
-            {t("backup.createButton")}
+            {creating ? t("backup.creating") : t("backup.createButton")}
           </Button>
           <Upload
             accept=".tar.gz,.tgz,application/gzip,application/x-gzip"
             showUploadList={false}
             disabled={busy}
             beforeUpload={(file) => {
-              void (async () => {
-                setUploadPercent(0);
-                try {
-                  await backupApi.uploadBackup(file, (p) =>
-                    setUploadPercent(p),
-                  );
-                  setUploadPercent(100);
-                  message.success(
-                    t("backup.uploadSuccess", { name: file.name }),
-                  );
-                  await refresh();
-                } catch (err: unknown) {
-                  const detail =
-                    err instanceof Error ? err.message : String(err);
-                  message.error(detail || t("backup.uploadFailed"));
-                } finally {
-                  setUploadPercent(null);
-                }
-              })();
+              void uploadBackup(file);
               return false;
             }}
           >
@@ -456,7 +447,7 @@ export default function BackupRestorePanel() {
             {t("common.refresh")}
           </Button>
         </div>
-        {(uploadPercent !== null || restoreProgress) && (
+        {(uploadPercent !== null || restoring || backingUp) && (
           <div className={styles.progressBlock}>
             {uploadPercent !== null ? (
               <>
@@ -465,13 +456,20 @@ export default function BackupRestorePanel() {
                 </div>
                 <Progress percent={uploadPercent} status="active" />
               </>
-            ) : (
+            ) : restoring ? (
               <>
                 <div className={styles.progressLabel}>
                   {t("backup.restoring")}
                 </div>
                 <Progress percent={100} status="active" showInfo={false} />
               </>
+            ) : (
+              <>
+                <div className={styles.progressLabel}>
+                  {t("backup.creating")}
+                </div>
+                <Progress percent={100} status="active" showInfo={false} />
+              </>
             )}
           </div>
         )}
@@ -493,6 +491,7 @@ export default function BackupRestorePanel() {
                     key={row.name}
                     row={row}
                     downloading={downloading === row.name}
+                    restoringThis={restoringThisName === row.name}
                     busy={busy}
                     timeZone={serverTimezone}
                     onDownload={onDownload}
@@ -634,7 +633,7 @@ export default function BackupRestorePanel() {
                 disabled={busy && !autoRunning}
                 onClick={() => void onRunAuto()}
               >
-                {t("backup.autoRunNow")}
+                {autoRunning ? t("backup.creating") : t("backup.autoRunNow")}
               </Button>
             </div>
           </div>
@@ -651,14 +650,16 @@ export default function BackupRestorePanel() {
           }
         }}
         onOk={() => void confirmRestore()}
-        okText={t("backup.importConfirmOk")}
+        okText={restoring ? t("backup.restoring") : t("backup.importConfirmOk")}
         cancelText={t("common.cancel")}
         confirmLoading={restoring}
         okButtonProps={{ danger: true, disabled: busy && !restoring }}
         cancelButtonProps={{ disabled: restoring }}
       >
         <p>
-          {t("backup.importConfirmBody", { name: pendingRestore?.name ?? "" })}
+          {t("backup.importConfirmBody", {
+            name: pendingRestore?.name ?? restoreTarget ?? "",
+          })}
         </p>
         <div className={styles.checkboxRow}>
           <Checkbox
diff --git a/dashboard/src/pages/Settings/Embedding/index.tsx b/dashboard/src/pages/Settings/Embedding/index.tsx
index ed71a38b..291d1111 100644
--- a/dashboard/src/pages/Settings/Embedding/index.tsx
+++ b/dashboard/src/pages/Settings/Embedding/index.tsx
@@ -1,7 +1,6 @@
 import { useState, useEffect, useCallback, useRef } from "react";
 import { useTranslation } from "react-i18next";
-import { Select, Input, Button, Spin, Progress, Alert, Modal } from "antd";
-import { message } from "@/utils/antdMessage";
+import { App, Select, Input, Button, Spin, Progress, Alert } from "antd";
 
 import { Download, CheckCircle, AlertCircle } from "lucide-react";
 import api from "../../../api";
@@ -16,6 +15,7 @@ import styles from "./index.module.less";
 
 export default function EmbeddingPage() {
   const { t } = useTranslation();
+  const { modal, message } = App.useApp();
 
   // State management.
   const [config, setConfig] = useState<EmbeddingConfig | null>(null);
@@ -120,7 +120,7 @@ export default function EmbeddingPage() {
 
   const handleDisableVectorSearch = useCallback(() => {
     if (!config || config.provider === "none") return;
-    Modal.confirm({
+    modal.confirm({
       title: t("embedding.disableVectorConfirmTitle"),
       content: t("embedding.disableVectorConfirmDesc"),
       okText: t("common.disable"),
diff --git a/dashboard/src/pages/Settings/Environments/index.tsx b/dashboard/src/pages/Settings/Environments/index.tsx
index 54038974..6a5899c7 100644
--- a/dashboard/src/pages/Settings/Environments/index.tsx
+++ b/dashboard/src/pages/Settings/Environments/index.tsx
@@ -1,6 +1,5 @@
 import { useState, useCallback, useMemo } from "react";
-import { Button, Modal } from "antd";
-import { message } from "@/utils/antdMessage";
+import { App, Button } from "antd";
 
 import { useTranslation } from "react-i18next";
 
@@ -39,6 +38,7 @@ function shiftIndices(prev: Set<number>, removedIdx: number): Set<number> {
 
 function EnvironmentsPage() {
   const { t } = useTranslation();
+  const { modal, message } = App.useApp();
   const isMobile = useIsMobile();
   const { envVars, loading, error, fetchAll } = useEnvVars();
   const [rows, setRows] = useState<Row[] | null>(null);
@@ -137,7 +137,7 @@ function EnvironmentsPage() {
         return;
       }
 
-      Modal.confirm({
+      modal.confirm({
         title: t("environments.deleteVariable"),
         content: t("environments.deleteConfirm", { name: row.key }),
         okText: t("common.delete"),
@@ -171,7 +171,7 @@ function EnvironmentsPage() {
         ? names.map((n) => `"${n}"`).join(", ")
         : `${names.length} variables`;
 
-    Modal.confirm({
+    modal.confirm({
       title: t("environments.deleteSelected"),
       content: t("environments.deleteSelectedConfirm", { label }),
       okText: t("common.delete"),
diff --git a/dashboard/src/pages/Settings/Models/components/cards/ProviderCard.tsx b/dashboard/src/pages/Settings/Models/components/cards/ProviderCard.tsx
index 3ca8c664..e40dc761 100644
--- a/dashboard/src/pages/Settings/Models/components/cards/ProviderCard.tsx
+++ b/dashboard/src/pages/Settings/Models/components/cards/ProviderCard.tsx
@@ -4,8 +4,7 @@
  * All providers are admin-managed. Local runtimes cannot be deleted.
  */
 import { useEffect, useState } from "react";
-import { Button, Card, Modal, Switch, Tooltip } from "antd";
-import { message } from "@/utils/antdMessage";
+import { App, Button, Card, Switch, Tooltip } from "antd";
 
 import { Pencil, Trash2, Zap } from "lucide-react";
 import { useTranslation } from "react-i18next";
@@ -40,6 +39,7 @@ export function ProviderCard({
   apiPrefix = "/admin/providers",
 }: ProviderCardProps) {
   const { t } = useTranslation();
+  const { modal, message } = App.useApp();
   const [modalOpen, setModalOpen] = useState(false);
   const [testing, setTesting] = useState(false);
   const [toggling, setToggling] = useState(false);
@@ -96,7 +96,7 @@ export function ProviderCard({
 
   const handleDelete = (e: React.MouseEvent) => {
     e.stopPropagation();
-    Modal.confirm({
+    modal.confirm({
       title: t("models.deleteProviderTitle"),
       content: t("models.deleteProviderConfirmSimple", { name: provider.name }),
       okText: t("common.delete"),
diff --git a/dashboard/src/pages/Settings/Models/components/modals/ModelListEditor.tsx b/dashboard/src/pages/Settings/Models/components/modals/ModelListEditor.tsx
index 98669963..0e2718af 100644
--- a/dashboard/src/pages/Settings/Models/components/modals/ModelListEditor.tsx
+++ b/dashboard/src/pages/Settings/Models/components/modals/ModelListEditor.tsx
@@ -6,16 +6,15 @@
  */
 import { useState } from "react";
 import {
+  App,
   Button,
   Form,
   Input,
   InputNumber,
-  Modal,
   Select,
   Switch,
   Tooltip,
 } from "antd";
-import { message } from "@/utils/antdMessage";
 
 import {
   Check,
@@ -76,6 +75,7 @@ export function ModelListEditor({
   onTestModel,
 }: ModelListEditorProps) {
   const { t } = useTranslation();
+  const { modal, message } = App.useApp();
   const downloadedSet = (() => {
     if (!localDownload) return null;
     const raw = localDownload.downloadedIds;
@@ -120,7 +120,7 @@ export function ModelListEditor({
   };
 
   const handleRemoveModel = (modelId: string, modelName: string) => {
-    Modal.confirm({
+    modal.confirm({
       title: t("models.removeModel"),
       content: t("models.removeModelConfirm", {
         name: modelName,
diff --git a/dashboard/src/pages/Settings/Models/components/modals/ProviderConfigModal.tsx b/dashboard/src/pages/Settings/Models/components/modals/ProviderConfigModal.tsx
index 9cde7395..4a3d0ec9 100644
--- a/dashboard/src/pages/Settings/Models/components/modals/ProviderConfigModal.tsx
+++ b/dashboard/src/pages/Settings/Models/components/modals/ProviderConfigModal.tsx
@@ -7,8 +7,16 @@
  *     with local model list, download, and delete UI
  */
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { Button, Divider, Form, Input, Modal, Progress, Select } from "antd";
-import { message } from "@/utils/antdMessage";
+import {
+  App,
+  Button,
+  Divider,
+  Form,
+  Input,
+  Modal,
+  Progress,
+  Select,
+} from "antd";
 
 import { Download, Key, Loader2, Trash2, X, Zap } from "lucide-react";
 import { useTranslation } from "react-i18next";
@@ -76,6 +84,7 @@ export function ProviderConfigModal({
   apiPrefix = "/providers",
 }: ProviderConfigModalProps) {
   const { t } = useTranslation();
+  const { modal, message } = App.useApp();
   const [saving, setSaving] = useState(false);
   const [formDirty, setFormDirty] = useState(false);
   const [testing, setTesting] = useState(false);
@@ -296,7 +305,7 @@ export function ProviderConfigModal({
   };
 
   const handleOllamaDelete = (model: OllamaModelResponse) => {
-    Modal.confirm({
+    modal.confirm({
       title: t("models.localDeleteModel"),
       content: t("models.localDeleteConfirm", { name: model.name }),
       okText: t("common.delete"),
@@ -320,7 +329,7 @@ export function ProviderConfigModal({
   };
 
   const handleCancelOllamaDownload = (task: OllamaDownloadTaskResponse) => {
-    Modal.confirm({
+    modal.confirm({
       title: t("models.localCancelDownload"),
       content: t("models.localCancelDownloadConfirm", { repo: task.name }),
       okText: t("models.localCancelDownload"),
@@ -432,10 +441,7 @@ export function ProviderConfigModal({
               );
             } else if (d.status === "downloading") {
               setDownloadProgressLabel(
-                t("models.onnxDownloadProgress", {
-                  model: modelId,
-                  percent: pct,
-                }),
+                t("models.onnxDownloading", { model: modelId }),
               );
             }
           },
@@ -469,7 +475,7 @@ export function ProviderConfigModal({
         );
       } else if (d.status === "downloading") {
         setDownloadProgressLabel(
-          t("models.onnxDownloadProgress", { model: modelId, percent: pct }),
+          t("models.onnxDownloading", { model: modelId }),
         );
       }
     });
@@ -488,7 +494,7 @@ export function ProviderConfigModal({
   const handleLocalModelDownload = useCallback(
     async (modelId: string) => {
       if (isOllama) {
-        Modal.confirm({
+        modal.confirm({
           title: t("models.localDownloadConfirmTitle"),
           content: t("models.localDownloadConfirmOllama", { name: modelId }),
           okText: t("models.localDownloadModel"),
@@ -531,7 +537,7 @@ export function ProviderConfigModal({
         /* use cached / unknown */
       }
 
-      Modal.confirm({
+      modal.confirm({
         title: t("models.localDownloadConfirmTitle"),
         content: t("models.localDownloadConfirmOnnx", {
           name: modelId,
@@ -691,7 +697,7 @@ export function ProviderConfigModal({
   };
 
   const handleRevoke = () => {
-    Modal.confirm({
+    modal.confirm({
       title: t("models.revokeConfirmTitle"),
       content: t("models.revokeConfirmContentSimple", { name: provider.name }),
       okText: t("models.revoke"),
diff --git a/dashboard/src/pages/Settings/Models/presetUtils.ts b/dashboard/src/pages/Settings/Models/presetUtils.ts
index 94ddfbad..fdf7ca48 100644
--- a/dashboard/src/pages/Settings/Models/presetUtils.ts
+++ b/dashboard/src/pages/Settings/Models/presetUtils.ts
@@ -42,7 +42,9 @@ const VARIANT_LABELS: Record<string, string> = {
   coding_plan_cn: "Coding (CN)",
   coding_plan_intl: "Coding (Intl)",
   token_plan: "Token Plan",
+  token_plan_enterprise_cn: "Token Enterprise (CN)",
   token_plan_intl: "Token (Intl)",
+  hy_token_plan: "Hy Token Plan",
   hai: "HAI",
   china: "China",
   international: "International",
diff --git a/dashboard/src/pages/Settings/SearchConfig/index.tsx b/dashboard/src/pages/Settings/SearchConfig/index.tsx
index cb744aa9..07a425a3 100644
--- a/dashboard/src/pages/Settings/SearchConfig/index.tsx
+++ b/dashboard/src/pages/Settings/SearchConfig/index.tsx
@@ -1,6 +1,5 @@
 import { useEffect, useState, useCallback } from "react";
-import { Button, Form, Input, Typography, Spin, Modal } from "antd";
-import { message } from "@/utils/antdMessage";
+import { App, Button, Form, Input, Typography, Spin, Modal } from "antd";
 
 import {
   Check,
@@ -84,6 +83,7 @@ function ConfigureModal({
   onSaved,
 }: ConfigureModalProps) {
   const { t } = useTranslation();
+  const { modal, message } = App.useApp();
   const [form] = Form.useForm();
   const [saving, setSaving] = useState(false);
   const [testing, setTesting] = useState(false);
@@ -155,7 +155,7 @@ function ConfigureModal({
   };
 
   const handleRevoke = () => {
-    Modal.confirm({
+    modal.confirm({
       title: t("setupWizard.search.revokeTitle", { name: provider.name }),
       content: t("setupWizard.search.revokeConfirm", { name: provider.name }),
       okText: t("setupWizard.search.revoke"),
diff --git a/dashboard/src/pages/Settings/octop/Agents.tsx b/dashboard/src/pages/Settings/octop/Agents.tsx
index 29051515..136f0483 100644
--- a/dashboard/src/pages/Settings/octop/Agents.tsx
+++ b/dashboard/src/pages/Settings/octop/Agents.tsx
@@ -69,7 +69,7 @@ export default function OctopAgentsPage() {
   const { t } = useTranslation();
   const [agents, setAgents] = useState<OctopAgent[]>([]);
   const [loading, setLoading] = useState(true);
-  const { viewMode, setViewMode, showCardView } = useCardTableView(
+  const { isMobile, viewMode, setViewMode, showCardView } = useCardTableView(
     loadViewMode(),
   );
   const [actionLoadingId, setActionLoadingId] = useState<string | null>(null);
@@ -144,7 +144,7 @@ export default function OctopAgentsPage() {
         title: t("adminAgents.columns.name"),
         dataIndex: "name",
         width: 140,
-        fixed: "left",
+        fixed: isMobile ? undefined : "left",
         render: (name: string, row: OctopAgent) => (
           <button
             type="button"
@@ -256,7 +256,7 @@ export default function OctopAgentsPage() {
         title: t("adminAgents.columns.actions"),
         key: "actions",
         width: 140,
-        fixed: "right",
+        fixed: isMobile ? undefined : "right",
         render: (_, row) => {
           const busy = actionLoadingId === row.agent_id;
           return (
@@ -314,7 +314,7 @@ export default function OctopAgentsPage() {
         },
       },
     ],
-    [actionLoadingId, t, onAct, onDelete],
+    [actionLoadingId, isMobile, t, onAct, onDelete],
   );
 
   return (
diff --git a/dashboard/src/pages/SkillPackages/PackageSkillCard.tsx b/dashboard/src/pages/SkillPackages/PackageSkillCard.tsx
index b9292b83..1f8e7834 100644
--- a/dashboard/src/pages/SkillPackages/PackageSkillCard.tsx
+++ b/dashboard/src/pages/SkillPackages/PackageSkillCard.tsx
@@ -1,9 +1,7 @@
-import { useMemo } from "react";
 import { Popconfirm } from "antd";
 import { FileCode2, Info, Trash2 } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import type { SkillPackageSkill } from "../../api/types/skillPackage";
-import { hubInfoBySlugFromCache } from "../Agent/Skills/components/skillHubCache";
 import skillStyles from "../Agent/Skills/index.module.less";
 
 interface PackageSkillCardProps {
@@ -22,15 +20,10 @@ export function PackageSkillCard({
   onDelete,
 }: PackageSkillCardProps) {
   const { t } = useTranslation();
-  const hubInfo = useMemo(
-    () => hubInfoBySlugFromCache().get(skill.slug),
-    [skill.slug],
-  );
-  const iconUrl = hubInfo?.iconUrl || skill.icon_url || undefined;
+  const iconUrl = skill.icon_url || undefined;
   const emoji = skill.emoji;
-  const displayName = hubInfo?.name || skill.name;
-  const displayDesc =
-    hubInfo?.description_zh || skill.description || t("skills.noDescription");
+  const displayName = skill.name;
+  const displayDesc = skill.description || t("skills.noDescription");
   const iconBg = `${DEFAULT_COLOR}18`;
 
   return (
diff --git a/dashboard/src/pages/SkillPackages/PackageSkillsTable.tsx b/dashboard/src/pages/SkillPackages/PackageSkillsTable.tsx
index 799c0499..b493d2b7 100644
--- a/dashboard/src/pages/SkillPackages/PackageSkillsTable.tsx
+++ b/dashboard/src/pages/SkillPackages/PackageSkillsTable.tsx
@@ -1,6 +1,6 @@
-import { Popconfirm } from "antd";
+import { Popconfirm, Tooltip } from "antd";
 import type { ColumnsType } from "antd/es/table";
-import { Trash2 } from "lucide-react";
+import { Eye, Trash2 } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import type { SkillPackageSkill } from "../../api/types/skillPackage";
 import { ResizableTable } from "@/components/ResizableTable";
@@ -43,20 +43,23 @@ export default function PackageSkillsTable({
     {
       title: t("skillPackages.tableActions"),
       key: "actions",
-      width: canMutate ? "14%" : "10%",
+      width: canMutate ? 88 : 56,
       align: "center",
       render: (_v, row) => (
         <div className={skillStyles.tableActions}>
-          <button
-            type="button"
-            className={skillStyles.tableActionBtn}
-            onClick={(e) => {
-              e.stopPropagation();
-              onView(row);
-            }}
-          >
-            {t("common.view")}
-          </button>
+          <Tooltip title={t("common.view")} mouseEnterDelay={0.5}>
+            <button
+              type="button"
+              className={skillStyles.tableActionBtn}
+              aria-label={t("common.view")}
+              onClick={(e) => {
+                e.stopPropagation();
+                onView(row);
+              }}
+            >
+              <Eye size={14} />
+            </button>
+          </Tooltip>
           {canMutate && onDelete ? (
             <Popconfirm
               title={t("skillPackages.deleteSkillConfirm")}
@@ -87,6 +90,7 @@ export default function PackageSkillsTable({
       rowKey="slug"
       size="middle"
       pagination={false}
+      scroll={{ x: 720 }}
       dataSource={skills}
       columns={columns}
       onRow={(row) => ({
diff --git a/dashboard/src/plugins/toolRenderers/host.ts b/dashboard/src/plugins/toolRenderers/host.ts
index a03225c0..b1a43aec 100644
--- a/dashboard/src/plugins/toolRenderers/host.ts
+++ b/dashboard/src/plugins/toolRenderers/host.ts
@@ -13,6 +13,19 @@ import type {
 } from "./types";
 
 let contextOverride: Partial<ToolRenderContext> = {};
+let dockHandlers: {
+  openSidePanel?: (opts: {
+    callId: string;
+    title?: string;
+    toolName?: string;
+  }) => void;
+  closeSidePanel?: (callId: string) => void;
+} = {};
+
+/** Chat page wires dock open/close for plugin ``host.openSidePanel``. */
+export function setPluginUiDockHandlers(handlers: typeof dockHandlers): void {
+  dockHandlers = handlers;
+}
 
 /** Chat page sets agent/thread so plugin UIs can call scoped APIs. */
 export function setPluginUiToolContext(
@@ -56,6 +69,12 @@ function createHost(defaultPluginId: string): OctopPluginUIHost {
     request<T = unknown>(path: string, init?: RequestInit) {
       return request<T>(path, init);
     },
+    openSidePanel(opts) {
+      dockHandlers.openSidePanel?.(opts);
+    },
+    closeSidePanel(callId) {
+      dockHandlers.closeSidePanel?.(callId);
+    },
   };
 }
 
diff --git a/dashboard/src/plugins/toolRenderers/index.ts b/dashboard/src/plugins/toolRenderers/index.ts
index 7682ec98..d6a5d18a 100644
--- a/dashboard/src/plugins/toolRenderers/index.ts
+++ b/dashboard/src/plugins/toolRenderers/index.ts
@@ -3,6 +3,7 @@ export {
   builtinPluginHost,
   createPluginUiHost,
   setPluginUiToolContext,
+  setPluginUiDockHandlers,
 } from "./host";
 export {
   loadInstalledPluginUis,
diff --git a/dashboard/src/plugins/toolRenderers/types.ts b/dashboard/src/plugins/toolRenderers/types.ts
index 9a430dab..be024839 100644
--- a/dashboard/src/plugins/toolRenderers/types.ts
+++ b/dashboard/src/plugins/toolRenderers/types.ts
@@ -53,6 +53,12 @@ export interface ToolRendererRegistration {
   component: ComponentType<ToolRenderProps>;
 }
 
+export interface OpenSidePanelOptions {
+  callId: string;
+  title?: string;
+  toolName?: string;
+}
+
 export interface OctopPluginUIHost {
   registerRenderer(
     reg: Omit<ToolRendererRegistration, "pluginId"> & { pluginId?: string },
@@ -62,6 +68,10 @@ export interface OctopPluginUIHost {
   patchResult(callId: string, nextData: unknown): void;
   /** Authenticated Octop API request (path starts with ``/`` under ``/api``). */
   request<T = unknown>(path: string, init?: RequestInit): Promise<T>;
+  /** Open this tool call's UI in the chat side dock (one tab per callId). */
+  openSidePanel(opts: OpenSidePanelOptions): void;
+  /** Close the side dock tab for this tool call, if open. */
+  closeSidePanel(callId: string): void;
 }
 
 /** Shape expected from ``ui/dist/index.js``. */
diff --git a/dashboard/src/styles/layout.css b/dashboard/src/styles/layout.css
index 44879355..89e4dfba 100644
--- a/dashboard/src/styles/layout.css
+++ b/dashboard/src/styles/layout.css
@@ -311,16 +311,13 @@ html[data-theme="dark"] .octop-ant-switch-checked {
     padding: 0;
   }
 
-  /* Force tables to scroll horizontally on mobile */
+  /* Tables scroll inside their own wrapper on mobile — do not set
+     min-width on .octop-table (that expands the page and creates a
+     second, page-level horizontal scrollbar). */
   .ant-table-wrapper,
-  [class*="-table-wrapper"] {
-    overflow-x: auto !important;
-    -webkit-overflow-scrolling: touch;
-  }
-
-  .ant-table,
-  [class*="-table"] {
-    min-width: 600px;
+  .octop-table-wrapper {
+    max-width: 100%;
+    min-width: 0;
   }
 
   /* Modal responsive — max width on mobile */
diff --git a/dashboard/src/utils/antdModal.ts b/dashboard/src/utils/antdModal.ts
new file mode 100644
index 00000000..9a731132
--- /dev/null
+++ b/dashboard/src/utils/antdModal.ts
@@ -0,0 +1,28 @@
+import { Modal } from "antd";
+import type { HookAPI } from "antd/es/modal/useModal";
+
+/**
+ * Theme-aware modal API bound from antd `<App>` via App.useApp().
+ * Prefer this over `Modal.confirm` (static methods ignore ConfigProvider theme).
+ */
+let bound: HookAPI | null = null;
+
+export function bindAntdModal(api: HookAPI): void {
+  bound = api;
+}
+
+export function unbindAntdModal(): void {
+  bound = null;
+}
+
+function resolve(): HookAPI {
+  return bound ?? (Modal as unknown as HookAPI);
+}
+
+export const modal: HookAPI = new Proxy({} as HookAPI, {
+  get(_target, prop, _receiver) {
+    const api = resolve();
+    const value = Reflect.get(api, prop, api);
+    return typeof value === "function" ? value.bind(api) : value;
+  },
+});
diff --git a/dashboard/src/utils/chatStreamError.test.ts b/dashboard/src/utils/chatStreamError.test.ts
index 52ab443a..910eb4ca 100644
--- a/dashboard/src/utils/chatStreamError.test.ts
+++ b/dashboard/src/utils/chatStreamError.test.ts
@@ -29,6 +29,30 @@ describe("classifyChatStreamError", () => {
     ).toBe("stream_errors.auth");
   });
 
+  it("classifies insufficient balance / 402", () => {
+    const msg =
+      "Error code: 402 - {'error': {'message': 'Insufficient Balance', " +
+      "'type': 'unknown_error', 'param': None, 'code': 'invalid_request_error'}}";
+    expect(classifyChatStreamError(msg)).toBe(
+      "stream_errors.insufficient_balance",
+    );
+    expect(
+      classifyChatStreamError(
+        "HTTP 402 POST https://api.example.com/v1/chat: Insufficient Balance",
+      ),
+    ).toBe("stream_errors.insufficient_balance");
+    expect(chatStreamErrorAction(msg)).toEqual({
+      path: "/admin/models",
+      labelKey: "modelConfig.configureButton",
+    });
+  });
+
+  it("classifies HTTP 5xx as provider_unavailable", () => {
+    expect(classifyChatStreamError("HTTP 503: service overloaded")).toBe(
+      "stream_errors.provider_unavailable",
+    );
+  });
+
   it("classifies LangGraph recursion limit as recursion_limit", () => {
     const msg =
       "Recursion limit of 2 reached without hitting a stop condition. " +
diff --git a/dashboard/src/utils/chatStreamError.ts b/dashboard/src/utils/chatStreamError.ts
index bdb6dd12..f5ed50e2 100644
--- a/dashboard/src/utils/chatStreamError.ts
+++ b/dashboard/src/utils/chatStreamError.ts
@@ -6,6 +6,7 @@ const _STREAM_ERROR_KEYS = [
   "stream_errors.stream_stall",
   "stream_errors.rate_limit",
   "stream_errors.auth",
+  "stream_errors.insufficient_balance",
   "stream_errors.context_length",
   "stream_errors.recursion_limit",
   "stream_errors.timeout_network",
@@ -26,6 +27,10 @@ const STREAM_ERROR_ACTIONS: Partial<Record<StreamErrorKey, StreamErrorAction>> =
       path: "/admin/models",
       labelKey: "modelConfig.configureButton",
     },
+    "stream_errors.insufficient_balance": {
+      path: "/admin/models",
+      labelKey: "modelConfig.configureButton",
+    },
     "stream_errors.recursion_limit": {
       path: "/agent-config",
       labelKey: "chat.goToAgentConfig",
@@ -64,6 +69,7 @@ export function classifyChatStreamError(
 
   if (
     lower.includes("error code: 429") ||
+    lower.includes("http 429") ||
     lower.includes("rate_limit") ||
     compact.includes("ratelimiterror") ||
     lower.includes("too many requests")
@@ -71,8 +77,26 @@ export function classifyChatStreamError(
     return "stream_errors.rate_limit";
   }
 
+  if (
+    lower.includes("error code: 402") ||
+    lower.includes("http 402") ||
+    lower.includes("insufficient balance") ||
+    lower.includes("insufficient_quota") ||
+    lower.includes("insufficient credits") ||
+    lower.includes("exceeded your current quota") ||
+    lower.includes("payment_required") ||
+    lower.includes("billing_not_active") ||
+    lower.includes("arrearage") ||
+    msg.includes("余额不足") ||
+    msg.includes("账户余额") ||
+    msg.includes("欠费")
+  ) {
+    return "stream_errors.insufficient_balance";
+  }
+
   if (
     lower.includes("error code: 401") ||
+    lower.includes("http 401") ||
     lower.includes("invalid_api_key") ||
     lower.includes("incorrect api key") ||
     compact.includes("authenticationerror") ||
@@ -108,7 +132,10 @@ export function classifyChatStreamError(
     lower.includes("service unavailable") ||
     lower.includes("error code: 500") ||
     lower.includes("error code: 502") ||
-    lower.includes("error code: 503")
+    lower.includes("error code: 503") ||
+    lower.includes("http 500") ||
+    lower.includes("http 502") ||
+    lower.includes("http 503")
   ) {
     return "stream_errors.provider_unavailable";
   }
diff --git a/dashboard/src/utils/confirmModal.ts b/dashboard/src/utils/confirmModal.ts
index 917c1f86..81db2a62 100644
--- a/dashboard/src/utils/confirmModal.ts
+++ b/dashboard/src/utils/confirmModal.ts
@@ -1,5 +1,5 @@
-import { Modal } from "antd";
 import type { ModalFuncProps } from "antd";
+import { modal } from "./antdModal";
 
 const MOBILE_BREAKPOINT = 768;
 
@@ -7,14 +7,14 @@ function detectMobile(): boolean {
   return typeof window !== "undefined" && window.innerWidth < MOBILE_BREAKPOINT;
 }
 
-/** Mobile-friendly wrapper around antd `Modal.confirm` (stacked full-width buttons). */
+/** Mobile-friendly wrapper around themed `modal.confirm` (stacked full-width buttons). */
 export function showConfirmModal(
   props: ModalFuncProps,
   options?: { isMobile?: boolean },
 ): void {
   const isMobile = options?.isMobile ?? detectMobile();
 
-  Modal.confirm({
+  modal.confirm({
     centered: true,
     ...(isMobile
       ? {
diff --git a/dashboard/src/utils/localePrefs.test.ts b/dashboard/src/utils/localePrefs.test.ts
index a960faf7..3a850c46 100644
--- a/dashboard/src/utils/localePrefs.test.ts
+++ b/dashboard/src/utils/localePrefs.test.ts
@@ -3,6 +3,7 @@ import {
   detectBrowserLocale,
   readStoredUiLocale,
   resolveInitialLocale,
+  speechLocaleFromUi,
   storeUiLocale,
   UI_LOCALE_STORAGE_KEY,
 } from "./localePrefs";
@@ -40,4 +41,12 @@ describe("localePrefs", () => {
     localStorage.removeItem(UI_LOCALE_STORAGE_KEY);
     expect(resolveInitialLocale()).toBe("en");
   });
+
+  it("speechLocaleFromUi maps UI locale to STT BCP-47 tags", () => {
+    expect(speechLocaleFromUi("zh")).toBe("zh-CN");
+    expect(speechLocaleFromUi("zh-CN")).toBe("zh-CN");
+    expect(speechLocaleFromUi("en")).toBe("en-US");
+    expect(speechLocaleFromUi("en-US")).toBe("en-US");
+    expect(speechLocaleFromUi(null)).toBe("zh-CN");
+  });
 });
diff --git a/dashboard/src/utils/localePrefs.ts b/dashboard/src/utils/localePrefs.ts
index ae6eee9a..24a34f8a 100644
--- a/dashboard/src/utils/localePrefs.ts
+++ b/dashboard/src/utils/localePrefs.ts
@@ -56,3 +56,8 @@ export function syncDocumentLang(locale: UiLocale): void {
   if (typeof document === "undefined") return;
   document.documentElement.lang = locale === "zh" ? "zh-CN" : "en";
 }
+
+/** BCP-47 tag for STT / SpeechRecognition from dashboard UI locale. */
+export function speechLocaleFromUi(locale: string | null | undefined): string {
+  return normalizeUiLocale(locale) === "zh" ? "zh-CN" : "en-US";
+}
diff --git a/desktop/README.md b/desktop/README.md
index b8f2873f..3775409e 100644
--- a/desktop/README.md
+++ b/desktop/README.md
@@ -25,9 +25,10 @@ From repo root:
 make -f desktop/portable/Makefile green
 ```
 
-CI: `.github/workflows/octop-portable.yml` builds all six native platform/arch
-variants. Each job first creates the green zip and then packages the matching
-Wails application.
+CI: `.github/workflows/octop-desktop.yml` builds native platform/arch variants.
+`v*` tags and `workflow_dispatch` (platforms=`all`) run all six; pull requests
+that touch `desktop/` build `darwin-*` and `windows-*` (amd64 + arm64). Each job
+first creates the green zip and then packages the matching Wails application.
 
 ## Build a complete desktop release
 
diff --git a/docs/agent-backend-file-io.md b/docs/agent-backend-file-io.md
index e62dbe75..68cce890 100644
--- a/docs/agent-backend-file-io.md
+++ b/docs/agent-backend-file-io.md
@@ -234,7 +234,7 @@ create(agent)
 
 ## 12. 局部 root_dir 与 execute jail（补充）
 
-当 agent backend 为本地 `local_shell`，且同时满足 **Linux + `virtual_mode=True` + `root_dir` 非主机 `/` + 宿主机有 `bwrap`** 时，harness 在 **构造 backend 之前** 路由到 `BubbledLocalShellBackend`，将 `execute`（含 Skill 脚本）包进 bubblewrap：工作根绑到 `/`，与文件工具虚拟路径对齐。其余情况（宿主根、非 Linux、无 bwrap、`filesystem`）走普通 `HarnessLocalShellBackend` / deepagents `local_shell`，**不再**对 execute 做虚拟路径改写。
+当 agent backend 为本地 `local_shell`，且同时满足 **Linux + `virtual_mode=True` + `root_dir` 非主机 `/` + 宿主机有 `bwrap`** 时，harness 在 **构造 backend 之前** 路由到 `BubbledLocalShellBackend`，将 `execute`（含 Skill 脚本）包进 bubblewrap：工作根绑到 `/`，与文件工具虚拟路径对齐。其余情况（宿主根、非 Linux、无 bwrap、`filesystem`）走普通 `HarnessLocalShellBackend`：无目录狱，但在 **harness-agent >= 1.0** 且 `virtual_mode` + 非宿主 `root_dir` 时，仍会把 `execute` 命令里的虚拟绝对路径改写到该 `root_dir` 下再在宿主机执行。
 
 `scripts/install.sh`（及 desktop Linux 安装脚本）会在 **Linux** 上尽力安装 `bubblewrap`；保存局部 `root_dir` 时仪表盘也会调用 `POST /api/filesystem/ensure-bwrap` 做同样的尽力安装。macOS / 无 bwrap 时无目录狱，文件工具仍靠 deepagents `virtual_mode`；`BackendWorkspace` 读/物化路径 failback 不变：绝对路径先 virtual 映到 `root_dir` 再原始宿主机路径；相对路径先 `{root_dir}/{rel}` 再 `{workspace_dir}/{rel}`。Dashboard path I/O: use ``dashboard/src/utils/workspaceIoPath.ts`` for download/file API paths
 (host absolute stays ``file://…``). Dock tab identity may still ``canonicalizeDockFilePath``;
diff --git a/docs/api.md b/docs/api.md
index af26b367..2afcbcad 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -314,10 +314,19 @@ for non-`/` paths.
 | `GET`    | `/connectors/auth/{kind}/info` | user | auth flow info |
 | `GET`    | `/connectors/auth/{kind}/authorize-url` | user | build the authorize URL |
 | `POST`   | `/connectors/auth/{kind}/exchange-code` | user | exchange auth code |
-| `POST`   | `/connectors/oauth/{kind}/start` | user | start an OAuth flow |
+| `POST`   | `/connectors/oauth/start` | user | start OAuth (catalog or custom MCP via `target`) |
+| `POST`   | `/connectors/oauth/{kind}/start` | user | legacy catalog OAuth start |
+| `PUT`    | `/connectors/custom-mcp` | user | save custom MCP server map |
+| `PATCH`  | `/connectors/custom-mcp/servers/{name}` | user | patch `enabled` / `default_open` on one server |
+| `POST`   | `/connectors/custom-mcp/test` | user | probe a custom MCP server (inline spec or saved name) |
 | `GET`    | `/connectors/oauth/callback` | public | OAuth redirect target |
 | `GET`    | `/connectors/oauth/pending/{state_id}` | user | poll the OAuth result |
 
+Custom MCP OAuth (streamable HTTP, public HTTPS URL only): Octop discovers the authorization
+server from the MCP URL (401 / RFC 9728 protected-resource metadata), requires dynamic client
+registration (DCR), stores encrypted tokens in the custom MCP spec, and injects `Authorization:
+Bearer` when loading tools. Loopback MCP URLs do not use remote OAuth discovery.
+
 ## Internal MCP (harness agents)
 
 | Method | Path | Auth | Notes |
diff --git a/fnos/README.md b/fnos/README.md
index 2dfde019..90f534e5 100644
--- a/fnos/README.md
+++ b/fnos/README.md
@@ -19,10 +19,10 @@ After install, open the app (Docker: `http://<device-ip>:8088`, native: `http://
 
 | 版本 | 包名 | 体积 | 运行方式 | 依赖 |
 |------|------|------|----------|------|
-| **Docker 版** | `octop-<ver>.fpk` | ~8 KB | 飞牛自动从 Docker Hub 拉取 `jubaoliang/octop:latest` 镜像运行 | 宿主需有 Docker 运行时 |
+| **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 版**实现为 FnOS `docker-project`：包体只含 `docker-compose.yaml` 与向导配置，运行时由飞牛从 Docker Hub 拉取镜像。镜像已内置全部附加组件（`browser` 浏览器自动化 + `desktop` 桌面控制）与前端。
+- **Docker 版**实现为 FnOS `docker-project`：包体只含 `docker-compose.yaml` 与向导配置，运行时由飞牛从 GHCR 拉取镜像。镜像已内置全部附加组件（`browser` 浏览器自动化 + `desktop` 桌面控制）与前端。
 - **本地版**实现为 FnOS 原生 `app`：包内自带独立 Python 3.12 运行时、Octop 全部依赖、前端构建产物、Playwright Chromium，以及 `data-share` 共享数据目录，直接以进程方式运行，不依赖 Docker。
 
 > 两款包都在滚动发布 **`fnos-latest`**：<https://github.com/TencentCloud/Octop/releases/tag/fnos-latest>
@@ -44,7 +44,7 @@ fnos/
 │   │   └── install         # 安装向导（可配置管理员账号/密码、日志级别、LLM 密钥）
 │   ├── app/
 │   │   ├── docker/
-│   │   │   └── docker-compose.yaml   # 引用 jubaoliang/octop:latest
+│   │   │   └── docker-compose.yaml   # 引用 ghcr.io/tencentcloud/octop:latest
 │   │   └── ui/
 │   │       ├── config                # 桌面图标入口
 │   │       └── images/icon-{64,256}.png
@@ -63,9 +63,10 @@ fnos/
 
 ## 工作机制
 
-1. **源码同步**：`.github/workflows/zz-sync-upstream.yml` 每 6 小时把上游 `TencentCloud/Octop` 的更新合并进本仓 `main` 分支（使用仓库自带 `GITHUB_TOKEN`，无需 PAT）。
-2. **镜像构建**：`.github/workflows/fnos-build-fpk.yml` 的 `image` job 在 `main` 更新时，用 `fnos/docker/Dockerfile` 从仓库源码构建 Octop 镜像并推送到 Docker Hub `jubaoliang/octop:latest`（含全部附加组件）。
-3. **安装包构建**：同一 workflow 的 `fpk` job 用 `scripts/build-fpk.sh` 把 `fnos/docker/` 打成 Docker 版 `.fpk`；`native` job 用 python-build-standalone 构建 Python 3.12 运行时、安装全部依赖与 Playwright Chromium，把 `fnos/native/` 打成本地版 `.fpk`（`continue-on-error`，失败不阻塞 Docker 版）。两者均以滚动发布 `fnos-latest` 提供下载。
+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` 打包，并以滚动发布 `fnos-vanilla-latest` 提供下载。
 
 ## 本地构建 .fpk（无需 Docker）
 
@@ -84,6 +85,6 @@ bash scripts/build-fpk.sh native     # 仅本地版      → dist/octop-native-<
    - 不想依赖 Docker、希望自带运行时原生运行 → 选 `octop-native-<version>.fpk`
 2. 安装向导中设置管理员账号/密码、日志级别、LLM 密钥（可选）。
 3. 安装完成后桌面出现「Octop AI 助手」图标，浏览器打开 `http://<设备IP>:8088`。
-4. Docker 版镜像首次会从 Docker Hub `jubaoliang/octop:latest` 拉取；请确保该镜像为公开（workflow 已自动设为 public）。本地版无需联网拉镜像，首次启动会按需要补装 Chromium 系统库（需 root 权限，已尽力处理）。
+4. Docker 版镜像首次会从 GHCR `ghcr.io/tencentcloud/octop:latest` 拉取；请确保该包为 Public（首次推送后可在 GitHub Packages 设置）。本地版无需联网拉镜像，首次启动会按需要补装 Chromium 系统库（需 root 权限，已尽力处理）。
 
 > 服务端口固定为 `8088`（飞牛端口映射与桌面图标均据此）。附加组件（browser 浏览器自动化 + desktop 桌面控制）已在镜像中默认安装。
diff --git a/fnos/docker/Dockerfile b/fnos/docker/Dockerfile
index fabbfc4d..4de37b74 100644
--- a/fnos/docker/Dockerfile
+++ b/fnos/docker/Dockerfile
@@ -7,7 +7,7 @@
 #   - desktop  （mss / pynput / pillow，桌面控制附加组件）
 #
 # 构建上下文必须为仓库根目录（fnpack / CI 中以仓库根为 context）：
-#   docker build -f fnos/docker/Dockerfile -t jubaoliang/octop:latest .
+#   docker build -f fnos/docker/Dockerfile -t ghcr.io/tencentcloud/octop:latest .
 #
 # 国内加速（可选 build-arg）：
 #   PIP_INDEX_URL / PIP_TRUSTED_HOST / NPM_REGISTRY / APT_MIRROR
diff --git a/fnos/docker/ICON.PNG b/fnos/docker/ICON.PNG
index cc5ca51d..917525ef 100644
Binary files a/fnos/docker/ICON.PNG and b/fnos/docker/ICON.PNG differ
diff --git a/fnos/docker/ICON_256.PNG b/fnos/docker/ICON_256.PNG
index 4c85d8c9..060f846d 100644
Binary files a/fnos/docker/ICON_256.PNG and b/fnos/docker/ICON_256.PNG differ
diff --git a/fnos/docker/app/docker/docker-compose.yaml b/fnos/docker/app/docker/docker-compose.yaml
index c3ef0082..4c4510d1 100644
--- a/fnos/docker/app/docker/docker-compose.yaml
+++ b/fnos/docker/app/docker/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   octop:
-    image: jubaoliang/octop:latest
+    image: ghcr.io/tencentcloud/octop:latest
     container_name: octop
     restart: unless-stopped
     pull_policy: always
diff --git a/fnos/docker/app/ui/images/icon_256.png b/fnos/docker/app/ui/images/icon_256.png
index 4c85d8c9..060f846d 100644
Binary files a/fnos/docker/app/ui/images/icon_256.png and b/fnos/docker/app/ui/images/icon_256.png differ
diff --git a/fnos/docker/app/ui/images/icon_64.png b/fnos/docker/app/ui/images/icon_64.png
index 84a23221..d865620f 100644
Binary files a/fnos/docker/app/ui/images/icon_64.png and b/fnos/docker/app/ui/images/icon_64.png differ
diff --git a/fnos/docker/manifest b/fnos/docker/manifest
index 7db0b030..7f6e0e8b 100644
--- a/fnos/docker/manifest
+++ b/fnos/docker/manifest
@@ -1,7 +1,7 @@
 appname=octop
 version=0.9.15
 display_name=OCTOP
-desc=腾讯开源的多用户多智能体 AI 助手平台，支持 Web 控制台、CLI、IM 渠道与定时任务，数据全部本地存储。<br/><br/><strong>安装后使用：</strong><br/>在应用中心点击「打开」按钮即可进入 Web 控制台，默认地址 http://设备IP:8088。<br/>初始管理员账号：admin，初始密码：Octop123（首次登录后请在头像菜单修改密码）。<br/><br/><strong>首次登录后：</strong><br/>请在控制台「设置」中配置 LLM 模型、IM 渠道、远程桌面、浏览器等组件。<br/><br/>注意：Docker 版通过容器部署，会自动从 jubaoliang/octop:latest 拉取镜像运行，已预装 browser / desktop 附加组件。
+desc=腾讯开源的多用户多智能体 AI 助手平台，支持 Web 控制台、CLI、IM 渠道与定时任务，数据全部本地存储。<br/><br/><strong>安装后使用：</strong><br/>在应用中心点击「打开」按钮即可进入 Web 控制台，默认地址 http://设备IP:8088。<br/>初始管理员账号：admin，初始密码：Octop123（首次登录后请在头像菜单修改密码）。<br/><br/><strong>首次登录后：</strong><br/>请在控制台「设置」中配置 LLM 模型、IM 渠道、远程桌面、浏览器等组件。<br/><br/>注意：Docker 版通过容器部署，会自动从 ghcr.io/tencentcloud/octop:latest 拉取镜像运行，已预装 browser / desktop 附加组件。
 source=thirdparty
 platform=all
 maintainer=TencentCloud OrcaKit
diff --git a/fnos/native/ICON.PNG b/fnos/native/ICON.PNG
index cc5ca51d..917525ef 100644
Binary files a/fnos/native/ICON.PNG and b/fnos/native/ICON.PNG differ
diff --git a/fnos/native/ICON_256.PNG b/fnos/native/ICON_256.PNG
index 4c85d8c9..060f846d 100644
Binary files a/fnos/native/ICON_256.PNG and b/fnos/native/ICON_256.PNG differ
diff --git a/fnos/native/app/bin/octop b/fnos/native/app/bin/octop
old mode 100644
new mode 100755
index e282f6b4..de1d0f3d
--- a/fnos/native/app/bin/octop
+++ b/fnos/native/app/bin/octop
@@ -9,7 +9,11 @@ set -euo pipefail
 
 # 共享函数库（find_python312 / fix_ownership_and_perms / free_octop_ports）
 # 打包时由 scripts/build-fpk.sh 注入；仓库内运行无此文件时跳过（函数缺失时再报错）。
-_OCTOP_COMMON=""$(dirname "$0")/../cmd/common.sh""
+# 注意：FPK 解包后 cmd/ 落在 /var/apps/octop-native/cmd（管理目录），而本文件位于
+# 负载目录 $TRIM_APPDEST/bin，`$0/../cmd` 指向载荷内不存在的位置，故需回退到
+# 外层 cmd 的实际落点。
+_OCTOP_COMMON="$(dirname "$0")/../cmd/common.sh"
+[ -f "$_OCTOP_COMMON" ] || _OCTOP_COMMON="/var/apps/octop-native/cmd/common.sh"
 [ -f "$_OCTOP_COMMON" ] && source "$_OCTOP_COMMON"
 
 APPDEST="${TRIM_APPDEST:-/var/apps/octop-native}"
@@ -47,6 +51,21 @@ PY="$(find_python312)" || {
 SITE_PACKAGES="$APPDEST/site-packages"
 export PYTHONPATH="${SITE_PACKAGES}${PYTHONPATH:+:${PYTHONPATH}}"
 
+# 内置在线升级优先使用 uv（pip 对 orcakit-harness-agent[all] 依赖树解析会卡死）。
+# 系统无 uv 且当前为 root 时自动安装一次（装到系统 Python bin，软链到 /usr/local/bin）。
+if [ "$(id -u)" = "0" ] && ! command -v uv >/dev/null 2>&1; then
+    "$PY" -m pip install -q --disable-pip-version-check uv 2>/dev/null || true
+    if [ -x "$(dirname "$PY")/uv" ]; then
+        ln -sf "$(dirname "$PY")/uv" /usr/local/bin/uv 2>/dev/null || true
+    fi
+fi
+
+# 飞牛 FPK 部署标识 + 打包 site-packages 路径：内置在线升级安装到此目录
+# （launcher 实际加载的位置），重启服务后即加载新版，升级真正生效
+# （见 src/octop/infra/setup/self_update.py 的 _run_fpk_upgrade）。
+export OCTOP_INSTALL_MODE="fpk-native"
+export OCTOP_FPK_SITE_PACKAGES="$SITE_PACKAGES"
+
 # 兜底：若包内 site-packages 中未检测到 octop（升级异常 / 损坏等），
 # 用内置核心 whl 就地离线安装，避免用户联网下载。
 if ! "$PY" -c "import octop" >/dev/null 2>&1; then
diff --git a/fnos/native/app/bin/octop-cli b/fnos/native/app/bin/octop-cli
old mode 100644
new mode 100755
index ffa781b5..a3b50e29
--- a/fnos/native/app/bin/octop-cli
+++ b/fnos/native/app/bin/octop-cli
@@ -21,7 +21,11 @@ set -euo pipefail
 
 # 共享函数库（find_python312 / fix_ownership_and_perms / free_octop_ports）
 # 打包时由 scripts/build-fpk.sh 注入；仓库内运行无此文件时跳过（函数缺失时再报错）。
-_OCTOP_COMMON=""$(dirname "$0")/../cmd/common.sh""
+# 注意：FPK 解包后 cmd/ 落在 /var/apps/octop-native/cmd（管理目录），而本文件位于
+# 负载目录 $TRIM_APPDEST/bin，`$0/../cmd` 指向载荷内不存在的位置，故需回退到
+# 外层 cmd 的实际落点。
+_OCTOP_COMMON="$(dirname "$0")/../cmd/common.sh"
+[ -f "$_OCTOP_COMMON" ] || _OCTOP_COMMON="/var/apps/octop-native/cmd/common.sh"
 [ -f "$_OCTOP_COMMON" ] && source "$_OCTOP_COMMON"
 
 APPDEST="${TRIM_APPDEST:-/var/apps/octop-native}"
@@ -56,6 +60,21 @@ export HOME="$DATA_DIR"
 export OCTOP_HOME="$DATA_DIR/.octop"
 export OCTOP_DATA_DIR="$DATA_DIR"
 
+# 内置在线升级优先使用 uv（pip 对 orcakit-harness-agent[all] 依赖树解析会卡死）。
+# 系统无 uv 且当前为 root 时自动安装一次（装到系统 Python bin，软链到 /usr/local/bin）。
+if [ "$(id -u)" = "0" ] && ! command -v uv >/dev/null 2>&1; then
+    "$PY" -m pip install -q --disable-pip-version-check uv 2>/dev/null || true
+    if [ -x "$(dirname "$PY")/uv" ]; then
+        ln -sf "$(dirname "$PY")/uv" /usr/local/bin/uv 2>/dev/null || true
+    fi
+fi
+
+# 飞牛 FPK 部署标识 + 打包 site-packages 路径：内置在线升级安装到此目录
+# （launcher 实际加载的位置），重启服务后即加载新版，升级真正生效
+# （见 src/octop/infra/setup/self_update.py 的 _run_fpk_upgrade）。
+export OCTOP_INSTALL_MODE="fpk-native"
+export OCTOP_FPK_SITE_PACKAGES="$SITE_PACKAGES"
+
 # 兜底：若包内 octop 未就绪，用内置核心 whl 离线安装（避免联网）
 if ! "$PY" -c "import octop" >/dev/null 2>&1; then
     echo "[octop] 未检测到已安装的 Octop，正在用内置核心 whl 离线安装 ..."
@@ -72,6 +91,8 @@ if id octop-native >/dev/null 2>&1 && command -v sudo >/dev/null 2>&1; then
         HOME="$HOME" \
         OCTOP_HOME="$OCTOP_HOME" \
         OCTOP_DATA_DIR="$OCTOP_DATA_DIR" \
+        OCTOP_INSTALL_MODE="$OCTOP_INSTALL_MODE" \
+        OCTOP_FPK_SITE_PACKAGES="$OCTOP_FPK_SITE_PACKAGES" \
         "$PY" -m octop.cli.main "$@"
 else
     exec "$PY" -m octop.cli.main "$@"
diff --git a/fnos/native/app/ui/images/icon_256.png b/fnos/native/app/ui/images/icon_256.png
index 4c85d8c9..060f846d 100644
Binary files a/fnos/native/app/ui/images/icon_256.png and b/fnos/native/app/ui/images/icon_256.png differ
diff --git a/fnos/native/app/ui/images/icon_64.png b/fnos/native/app/ui/images/icon_64.png
index 84a23221..d865620f 100644
Binary files a/fnos/native/app/ui/images/icon_64.png and b/fnos/native/app/ui/images/icon_64.png differ
diff --git a/pyproject.toml b/pyproject.toml
index 4b33a445..4cc5f45e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "octop"
-version = "0.9.28"
+version = "0.9.30"
 description = "Smarter self-hosted AI assistant for multiple users and agents, built on harness-agent"
 readme = "README.md"
 license = { text = "MIT" }
@@ -21,7 +21,7 @@ dependencies = [
     "apscheduler>=3.10,<4",
     "argon2-cffi>=23.1",
     "pyjwt>=2.8",
-    "orcakit-harness-agent[all]>=0.9.27",
+    "orcakit-harness-agent[all]>=1.0.1",
     "harness-memory>=0.9.7",
     "harness-gateway>=0.9.3",
     "cryptography>=41",
diff --git a/src/octop/__init__.py b/src/octop/__init__.py
index f999b8b4..99d011e5 100644
--- a/src/octop/__init__.py
+++ b/src/octop/__init__.py
@@ -2,4 +2,4 @@
 
 from __future__ import annotations
 
-__version__ = "0.9.28"
+__version__ = "0.9.30"
diff --git a/src/octop/api/routers/backup.py b/src/octop/api/routers/backup.py
index b55e07d8..905427d1 100644
--- a/src/octop/api/routers/backup.py
+++ b/src/octop/api/routers/backup.py
@@ -2,33 +2,43 @@
 
 from __future__ import annotations
 
+import asyncio
 import logging
+import os
+import tempfile
+from pathlib import Path
 from typing import Any, cast
 
-from fastapi import APIRouter, Depends, File, Query, UploadFile
-from fastapi.responses import StreamingResponse
+from fastapi import APIRouter, BackgroundTasks, Depends, File, Query, UploadFile
+from fastapi.responses import FileResponse
 from pydantic import BaseModel, Field
 
 from octop.api.common.content_disposition import content_disposition
 from octop.api.deps import get_server, require_permission
-from octop.config import load_config
+from octop.config import DatabaseConfig, load_config
 from octop.infra.backup.auto import (
     AUTO_BACKUP_JOB_ID,
-    BACKUP_LOCK,
     backup_config_from_payload,
+    backup_status_payload,
+    hold_backup_lock,
+    raise_if_backup_busy,
     run_auto_backup,
     update_server_backup_config,
 )
 from octop.infra.backup.store import (
+    BackupFileInfo,
     delete_backup_file,
     list_backup_files,
     normalize_backup_filename,
-    read_backup_file,
+    place_backup_file,
+    resolve_backup_path,
     write_backup_file,
 )
 from octop.infra.backup.system_archive import create_system_backup, restore_system_backup
+from octop.infra.db.pool import DatabasePool
 from octop.infra.db.repos.audit import ACTOR_ADMIN
 from octop.infra.errors import ErrorCode, OctopError
+from octop.infra.utils.paths import PathLayout
 
 logger = logging.getLogger(__name__)
 
@@ -63,6 +73,83 @@ def _auto_settings_payload(server: Any) -> dict[str, Any]:
     }
 
 
+def _raise_if_backup_busy() -> None:
+    raise_if_backup_busy()
+
+
+def _create_and_store_manual_backup(
+    *,
+    paths: PathLayout,
+    agent_rows: list[Any],
+    pool: DatabasePool,
+    db_config: DatabaseConfig,
+) -> BackupFileInfo:
+    """Sync create + place for ``asyncio.to_thread`` (keeps the event loop free)."""
+    with tempfile.TemporaryDirectory() as tmp:
+        tmp_path = Path(tmp) / "backup.tar.gz"
+        filename = create_system_backup(
+            paths=paths,
+            agent_rows=agent_rows,
+            pool=pool,
+            db_config=db_config,
+            dest=tmp_path,
+        )
+        return place_backup_file(paths, filename, tmp_path)
+
+
+def _restore_stored_backup(
+    *,
+    paths: PathLayout,
+    filename: str,
+    pool: DatabasePool,
+    db_config: DatabaseConfig,
+    restore_config: bool,
+    owner_user_id: int,
+) -> dict[str, Any]:
+    """Sync path-based restore for ``asyncio.to_thread``."""
+    archive = resolve_backup_path(paths, filename)
+    return restore_system_backup(
+        archive,
+        paths=paths,
+        pool=pool,
+        db_config=db_config,
+        restore_config=restore_config,
+        owner_user_id=owner_user_id,
+    )
+
+
+def _create_ephemeral_backup(
+    *,
+    paths: PathLayout,
+    agent_rows: list[Any],
+    pool: DatabasePool,
+    db_config: DatabaseConfig,
+) -> 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")
+    os.close(fd)
+    tmp_path = Path(name)
+    try:
+        filename = create_system_backup(
+            paths=paths,
+            agent_rows=agent_rows,
+            pool=pool,
+            db_config=db_config,
+            dest=tmp_path,
+        )
+    except Exception:
+        tmp_path.unlink(missing_ok=True)
+        raise
+    return tmp_path, filename
+
+
+def _unlink_quiet(path: Path) -> None:
+    try:
+        path.unlink(missing_ok=True)
+    except OSError:
+        logger.warning("failed to remove ephemeral backup %s", path, exc_info=True)
+
+
 async def _rehydrate_runtime_after_restore(server: Any) -> None:
     """Sync restored providers/agents, IM channels, and cron (no process restart)."""
     runtime = getattr(server, "app_runtime", None)
@@ -101,6 +188,14 @@ async def list_backups(
     }
 
 
+@router.get("/backup/status", summary="Whether a backup or restore is in progress")
+async def get_backup_status(
+    _: Any = Depends(require_permission("backup")),
+) -> dict[str, Any]:
+    """Return lock state for dashboard busy UI across navigation / refresh."""
+    return backup_status_payload()
+
+
 @router.get("/backup/auto", summary="Get automatic backup settings")
 async def get_auto_backup_settings(
     _: Any = Depends(require_permission("backup")),
@@ -128,11 +223,7 @@ async def run_auto_backup_now(
     server: Any = Depends(get_server),
 ) -> dict[str, Any]:
     """Create one automatic backup immediately (same path as the scheduled job)."""
-    if BACKUP_LOCK.locked():
-        raise OctopError(
-            ErrorCode.BACKUP_IN_PROGRESS,
-            "a backup is already in progress",
-        )
+    _raise_if_backup_busy()
     entry = await run_auto_backup(server)
     if entry is None:
         raise OctopError(
@@ -149,38 +240,35 @@ async def create_backup(
 ) -> dict[str, Any]:
     """Create a full backup archive and persist it under ``backups_dir``."""
     assert server.services is not None
-    if BACKUP_LOCK.locked():
-        raise OctopError(
-            ErrorCode.BACKUP_IN_PROGRESS,
-            "a backup is already in progress",
-        )
-    async with BACKUP_LOCK:
-        data, filename = create_system_backup(
+    _raise_if_backup_busy()
+    async with hold_backup_lock("create"):
+        entry = await asyncio.to_thread(
+            _create_and_store_manual_backup,
             paths=server.paths,
             agent_rows=_agent_rows(server),
             pool=server.services.db,
             db_config=server.services.config.database,
         )
-        entry = write_backup_file(server.paths, filename, data)
     return {"ok": True, "item": entry.to_dict()}
 
 
 @router.get(
     "/backup/files/{filename}",
     summary="Download a stored backup archive",
-    response_class=StreamingResponse,
+    response_class=FileResponse,
 )
 async def download_backup_file(
     filename: str,
     _: Any = Depends(require_permission("backup")),
     server: Any = Depends(get_server),
-) -> StreamingResponse:
-    """Stream a backup file from ``backups_dir``."""
+) -> FileResponse:
+    """Stream a backup file from ``backups_dir`` without loading it into memory."""
     safe = normalize_backup_filename(filename)
-    data = read_backup_file(server.paths, safe)
-    return StreamingResponse(
-        iter([data]),
+    path = await asyncio.to_thread(resolve_backup_path, server.paths, safe)
+    return FileResponse(
+        path,
         media_type="application/gzip",
+        filename=safe,
         headers={"Content-Disposition": content_disposition(safe)},
     )
 
@@ -200,19 +288,26 @@ async def restore_backup_file(
     Restored ``config.json`` / ``env`` still require a process restart to take effect.
 
     LightClaw migration archives reassign imported ownership to the restoring admin.
+
+    Heavy disk/DB work runs in a worker thread so the asyncio event loop stays
+    responsive; concurrent create/restore/auto backup is rejected via
+    ``BACKUP_LOCK``. SQLite restore still holds the shared DB lock for the
+    merge window, so DB-backed APIs may briefly queue during that phase.
     """
     assert server.services is not None
+    _raise_if_backup_busy()
     safe = normalize_backup_filename(filename)
-    raw = read_backup_file(server.paths, safe)
-    result = restore_system_backup(
-        raw,
-        paths=server.paths,
-        pool=server.services.db,
-        db_config=server.services.config.database,
-        restore_config=restore_config,
-        owner_user_id=int(user.id),
-    )
-    await _rehydrate_runtime_after_restore(server)
+    async with hold_backup_lock("restore"):
+        result = await asyncio.to_thread(
+            _restore_stored_backup,
+            paths=server.paths,
+            filename=safe,
+            pool=server.services.db,
+            db_config=server.services.config.database,
+            restore_config=restore_config,
+            owner_user_id=int(user.id),
+        )
+        await _rehydrate_runtime_after_restore(server)
     server.services.audit_repo.write(
         actor=getattr(user, "username", None) or ACTOR_ADMIN,
         action="backup.restore",
@@ -230,29 +325,35 @@ async def remove_backup_file(
 ) -> None:
     """Remove a backup archive from ``backups_dir``."""
     safe = normalize_backup_filename(filename)
-    delete_backup_file(server.paths, safe)
+    await asyncio.to_thread(delete_backup_file, server.paths, safe)
 
 
 @router.get(
     "/backup/export",
     summary="Download full system backup (ephemeral)",
-    response_class=StreamingResponse,
+    response_class=FileResponse,
 )
 async def export_backup(
+    background_tasks: BackgroundTasks,
     _: Any = Depends(require_permission("backup")),
     server: Any = Depends(get_server),
-) -> StreamingResponse:
+) -> FileResponse:
     """Create and stream a backup without persisting to ``backups_dir``."""
     assert server.services is not None
-    data, filename = create_system_backup(
-        paths=server.paths,
-        agent_rows=_agent_rows(server),
-        pool=server.services.db,
-        db_config=server.services.config.database,
-    )
-    return StreamingResponse(
-        iter([data]),
+    _raise_if_backup_busy()
+    async with hold_backup_lock("export"):
+        tmp_path, filename = await asyncio.to_thread(
+            _create_ephemeral_backup,
+            paths=server.paths,
+            agent_rows=_agent_rows(server),
+            pool=server.services.db,
+            db_config=server.services.config.database,
+        )
+    background_tasks.add_task(_unlink_quiet, tmp_path)
+    return FileResponse(
+        tmp_path,
         media_type="application/gzip",
+        filename=filename,
         headers={"Content-Disposition": content_disposition(filename)},
     )
 
@@ -272,5 +373,5 @@ async def import_backup(
 
     name = file.filename or "uploaded-backup.tar.gz"
     safe = normalize_backup_filename(name)
-    entry = write_backup_file(server.paths, safe, raw)
+    entry = await asyncio.to_thread(write_backup_file, server.paths, safe, raw)
     return {"ok": True, "item": entry.to_dict()}
diff --git a/src/octop/api/routers/channels.py b/src/octop/api/routers/channels.py
index 492932e2..4867aab5 100644
--- a/src/octop/api/routers/channels.py
+++ b/src/octop/api/routers/channels.py
@@ -8,8 +8,11 @@
 import os
 import platform as _platform
 import re
+import secrets
 import subprocess
 import sys
+import time
+from dataclasses import dataclass, field
 from pathlib import Path as _FsPath
 from typing import Any, Literal, cast
 
@@ -19,7 +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.channels import qr_bind
+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
 from octop.infra.utils.subprocess_io import parse_subprocess_json_lines
@@ -58,6 +61,10 @@ class YuanbaoBotCreatorStartBody(BaseModel):
     ip: str = ""
 
 
+class DingTalkRegistrationPollBody(BaseModel):
+    registration_id: str
+
+
 def _parse_bot_creator_body(model: type[BaseModel], raw: dict[str, Any] | None) -> BaseModel:
     try:
         return model.model_validate(raw or {})
@@ -406,7 +413,186 @@ def _get_plat_code() -> int:
     return 0
 
 
-# ─── WeCom QR code ──────────────────────────────────────────────────────────
+# ─── DingTalk application registration ─────────────────────────────────────
+
+
+_DINGTALK_MAX_EXPIRES_IN = 2 * 60 * 60
+_DINGTALK_MAX_SESSIONS = 256
+
+
+@dataclass
+class _DingTalkRegistrationSession:
+    agent_id: str
+    actor_id: str
+    device_code: str
+    expires_at: float
+    interval: int
+    credentials: tuple[str, str] | None = None
+    channel_id: str | None = None
+    lock: asyncio.Lock = field(default_factory=asyncio.Lock)
+
+
+_dingtalk_registration_sessions: dict[str, _DingTalkRegistrationSession] = {}
+
+
+def _prune_dingtalk_registration_sessions(now: float) -> None:
+    expired = [
+        key for key, session in _dingtalk_registration_sessions.items() if session.expires_at <= now
+    ]
+    for key in expired:
+        _dingtalk_registration_sessions.pop(key, None)
+    if len(_dingtalk_registration_sessions) < _DINGTALK_MAX_SESSIONS:
+        return
+    oldest = min(
+        _dingtalk_registration_sessions,
+        key=lambda key: _dingtalk_registration_sessions[key].expires_at,
+    )
+    _dingtalk_registration_sessions.pop(oldest, None)
+
+
+@router.post("/agents/{agent_id}/channels/dingtalk/qrcode/generate")
+async def dingtalk_qrcode_generate(
+    agent_id: str,
+    as_user: int | None = None,
+    user: Any = Depends(require_permission("channels")),
+    server: Any = Depends(get_server),
+) -> dict[str, Any]:
+    """Start DingTalk Device Flow while retaining the device code server-side."""
+    _require_agent_access(agent_id, user=user, as_user=as_user, server=server)
+    try:
+        result = await dingtalk_registration.generate()
+    except Exception as exc:
+        logger.exception("Failed to start DingTalk application registration")
+        raise HTTPException(
+            status_code=502,
+            detail="Failed to start DingTalk application registration.",
+        ) from exc
+
+    expires_in = max(
+        1,
+        min(int(result.get("expires_in") or 600), _DINGTALK_MAX_EXPIRES_IN),
+    )
+    interval = max(1, min(int(result.get("interval") or 5), 30))
+    registration_id = secrets.token_urlsafe(32)
+    now = time.monotonic()
+    _prune_dingtalk_registration_sessions(now)
+    _dingtalk_registration_sessions[registration_id] = _DingTalkRegistrationSession(
+        agent_id=agent_id,
+        actor_id=str(as_user if as_user is not None else user.id),
+        device_code=str(result["device_code"]),
+        expires_at=now + expires_in,
+        interval=interval,
+    )
+    return {
+        "registration_id": registration_id,
+        "qrcode_url": str(result["verification_uri_complete"]),
+        "user_code": str(result["user_code"]),
+        "expires_in": expires_in,
+        "interval": interval,
+    }
+
+
+@router.post("/agents/{agent_id}/channels/dingtalk/qrcode/poll")
+async def dingtalk_qrcode_poll(
+    agent_id: str,
+    body: DingTalkRegistrationPollBody,
+    request: Request,
+    as_user: int | None = None,
+    user: Any = Depends(require_permission("channels")),
+    server: Any = Depends(get_server),
+) -> dict[str, Any]:
+    """Poll DingTalk registration and create the channel without exposing secrets."""
+    _require_agent_access(agent_id, user=user, as_user=as_user, server=server)
+    registration_id = _sanitize_token(body.registration_id, "registration_id")
+    session = _dingtalk_registration_sessions.get(registration_id)
+    actor_id = str(as_user if as_user is not None else user.id)
+    if session is None or session.agent_id != agent_id or session.actor_id != actor_id:
+        raise HTTPException(status_code=404, detail="DingTalk registration session not found.")
+
+    async with session.lock:
+        if session.channel_id is not None:
+            return {"status": "success", "channel_id": session.channel_id}
+        if time.monotonic() >= session.expires_at:
+            _dingtalk_registration_sessions.pop(registration_id, None)
+            return {"status": "expired"}
+
+        if session.credentials is None:
+            try:
+                result = await dingtalk_registration.poll(session.device_code)
+            except Exception as exc:
+                logger.exception("Failed to poll DingTalk application registration")
+                raise HTTPException(
+                    status_code=502,
+                    detail="Failed to poll DingTalk application registration.",
+                ) from exc
+
+            status = str(result.get("status") or "").upper()
+            if status == "WAITING":
+                return {"status": "waiting"}
+            if status == "EXPIRED":
+                _dingtalk_registration_sessions.pop(registration_id, None)
+                return {"status": "expired"}
+            if status == "FAIL":
+                _dingtalk_registration_sessions.pop(registration_id, None)
+                return {
+                    "status": "failed",
+                    "message": str(result.get("fail_reason") or "DingTalk authorization failed."),
+                }
+            if status != "SUCCESS":
+                raise HTTPException(
+                    status_code=502,
+                    detail="DingTalk returned an unknown registration status.",
+                )
+
+            client_id = result.get("client_id")
+            client_secret = result.get("client_secret")
+            if not isinstance(client_id, str) or not client_id:
+                raise HTTPException(status_code=502, detail="DingTalk did not return client_id.")
+            if not isinstance(client_secret, str) or not client_secret:
+                raise HTTPException(
+                    status_code=502, detail="DingTalk did not return client_secret."
+                )
+            session.credentials = (client_id, client_secret)
+
+        client_id, client_secret = session.credentials
+        config = {
+            "client_id": client_id,
+            "client_secret": client_secret,
+            "response_mode": "stream",
+            "show_thinking": False,
+            "show_tool_hints": False,
+        }
+        probe = await server.app_runtime.gateway.probe_config(
+            agent_id=agent_id,
+            kind="dingtalk",
+            config=config,
+            locale=resolve_request_locale(request),
+        )
+        if not probe.get("ok"):
+            return {
+                "status": "failed",
+                "message": str(probe.get("error") or "DingTalk connection check failed."),
+            }
+
+        from octop.infra.gateway.gateway import ChannelCreateSpec  # noqa: PLC0415
+        from octop.infra.utils.ulid import new_ulid as _new_ulid  # noqa: PLC0415
+
+        spec = ChannelCreateSpec(
+            channel_id=_new_ulid(),
+            agent_id=agent_id,
+            user_id=_acting_user_id(user, as_user),
+            kind="dingtalk",
+            name="dingtalk",
+            config=config,
+        )
+        row = await server.app_runtime.gateway.create_channel(spec)
+        session.channel_id = row.channel_id
+        session.credentials = None
+        session.device_code = ""
+        return {"status": "success", "channel_id": row.channel_id}
+
+
+# ─── WeCom QR code ─────────────────────────────────
 
 
 @router.post("/agents/{agent_id}/channels/wecom/qrcode/generate")
diff --git a/src/octop/api/routers/chat/history.py b/src/octop/api/routers/chat/history.py
index e85f6557..35ed58fa 100644
--- a/src/octop/api/routers/chat/history.py
+++ b/src/octop/api/routers/chat/history.py
@@ -13,8 +13,9 @@
 from octop.api.routers.chat.models import ForkThreadBody, RebindSessionBody, RenameThreadBody
 from octop.api.routers.chat.serialize import (
     HISTORY_DEFAULT_LIMIT,
+    _backfill_thread_projection,
     _clamp_history_limit,
-    _load_thread_messages,
+    _load_projected_thread_messages,
 )
 from octop.infra.agents.context_breakdown import SEGMENT_KEYS, compute_context_breakdown
 from octop.infra.agents.middleware.thread_artifacts import artifacts_for_response
@@ -28,6 +29,35 @@
 router = APIRouter()
 
 
+def _agent_is_busy(server: Any, agent_id: str) -> bool:
+    checker = getattr(server.app_runtime.agent_registry, "is_agent_active", None)
+    return callable(checker) and checker(agent_id) is True
+
+
+def _history_migration_payload(server: Any, *, agent_id: str, user_id: int) -> dict[str, Any]:
+    repo = server.services.thread_message_repo
+    summary = repo.migration_summary(
+        agent_id=agent_id,
+        user_id=user_id,
+    )
+    queue = server.app_runtime.gateway.history_backfill
+    processing = any(
+        queue.contains(thread_id)
+        for thread_id in repo.migration_active_thread_ids(agent_id=agent_id, user_id=user_id)
+    )
+    agent_busy = _agent_is_busy(server, agent_id)
+    return {
+        "remaining": summary.remaining,
+        "pending": summary.pending,
+        "queued": summary.queued,
+        "running": summary.running,
+        "failed": summary.failed,
+        "processing": processing,
+        "agent_busy": agent_busy,
+        "can_start": summary.remaining > 0 and queue.available_slots > 0 and not agent_busy,
+    }
+
+
 def _agent_facing_workspace_dir(server: Any, agent_id: str) -> Path:
     """Agent-visible workspace_dir for artifact path joins (not host root_dir map)."""
     registry = getattr(getattr(server, "app_runtime", None), "agent_registry", None)
@@ -88,6 +118,74 @@ async def list_threads(
     ]
 
 
+@router.get(
+    "/agents/{agent_id}/history-migration/status",
+    summary="Legacy history migration status",
+)
+async def get_history_migration_status(
+    agent_id: str,
+    as_user: int | None = None,
+    user: Any = Depends(current_user),
+    server: Any = Depends(get_server),
+) -> dict[str, Any]:
+    """Report old conversations awaiting the v10 dashboard history projection."""
+    require_agent_row(agent_id, user=user, as_user=as_user, server=server)
+    effective_uid = as_user if as_user is not None else user.id
+    return _history_migration_payload(server, agent_id=agent_id, user_id=effective_uid)
+
+
+@router.post(
+    "/agents/{agent_id}/history-migration/start",
+    summary="Start legacy history migration",
+)
+async def start_history_migration(
+    agent_id: str,
+    as_user: int | None = None,
+    user: Any = Depends(current_user),
+    server: Any = Depends(get_server),
+) -> dict[str, Any]:
+    """Queue a bounded batch; the gateway decodes exactly one checkpoint at a time."""
+    require_agent_row(agent_id, user=user, as_user=as_user, server=server)
+    # Fail before changing persisted states when this agent is not actually available.
+    server.app_runtime.agent_registry.get_agent(agent_id)
+    effective_uid = as_user if as_user is not None else user.id
+    if _agent_is_busy(server, agent_id):
+        return {
+            **_history_migration_payload(server, agent_id=agent_id, user_id=effective_uid),
+            "accepted": 0,
+        }
+    queue = server.app_runtime.gateway.history_backfill
+    repo = server.services.thread_message_repo
+    candidate_limit = queue.available_slots + queue.active_jobs
+    candidates = repo.migration_candidates(
+        agent_id=agent_id,
+        user_id=effective_uid,
+        limit=candidate_limit,
+    )
+    accepted = 0
+    for candidate in candidates:
+        if queue.contains(candidate.thread_id):
+            continue
+
+        async def _work(thread_id: str = candidate.thread_id) -> None:
+            await _backfill_thread_projection(
+                server,
+                agent_id,
+                thread_id,
+                user=user,
+            )
+
+        if not queue.enqueue(candidate.thread_id, _work):
+            break
+        if candidate.status != "running":
+            repo.mark_projection(candidate.thread_id, "queued")
+        accepted += 1
+    return {
+        **_history_migration_payload(server, agent_id=agent_id, user_id=effective_uid),
+        "accepted": accepted,
+    }
+
+
 @router.post("/agents/{agent_id}/threads", status_code=201, summary="New thread")
 async def create_thread(
     agent_id: str,
@@ -175,14 +273,44 @@ async def get_thread_history(
     row = _require_thread(server, agent_id, thread_id, user, as_user)
     page_limit = _clamp_history_limit(limit)
     page_offset = max(0, offset)
-    messages, has_more = await _load_thread_messages(
-        server,
-        agent_id,
-        thread_id,
-        page_limit,
-        offset=page_offset,
-        user=user,
-    )
+    projection_repo = server.services.thread_message_repo
+    projection_status = projection_repo.projection_status(thread_id)
+    history_loading = projection_status != "ready"
+    if history_loading:
+
+        async def _work() -> None:
+            await _backfill_thread_projection(
+                server,
+                agent_id,
+                thread_id,
+                user=user,
+            )
+
+        accepted = (
+            False
+            if _agent_is_busy(server, agent_id)
+            else server.app_runtime.gateway.history_backfill.enqueue(thread_id, _work)
+        )
+        if accepted and projection_status not in ("queued", "running"):
+            projection_repo.mark_projection(thread_id, "queued")
+        messages: list[dict[str, Any]] = []
+        has_more = False
+        projection_status = (
+            projection_status
+            if accepted and projection_status in ("queued", "running")
+            else "queued"
+            if accepted
+            else "pending"
+        )
+    else:
+        messages, has_more = _load_projected_thread_messages(
+            server,
+            agent_id,
+            thread_id,
+            page_limit,
+            offset=page_offset,
+            user=user,
+        )
     effective_uid = as_user if as_user is not None else user.id
     hitl_pending = pending_hitl_payload(
         server.app_runtime.gateway.processor.hitl_coordinator.store,
@@ -197,6 +325,9 @@ async def get_thread_history(
         "has_more": has_more,
         "limit": page_limit,
         "offset": page_offset,
+        "history_loading": history_loading,
+        "history_status": projection_status,
+        "history_retry_after_ms": 1500 if history_loading else 0,
         "turn_active": server.app_runtime.gateway.ws_hub.is_turn_active(thread_id),
         "hitl_pending": hitl_pending,
         "artifacts": artifacts_for_response(row.artifacts, workspace_dir),
@@ -256,6 +387,7 @@ async def fork_thread(
         content=body.content,
         assistant_turns_from_end=body.assistant_turns_from_end,
         locale=resolve_request_locale(request),
+        thread_message_repo=server.services.thread_message_repo,
     )
 
 
diff --git a/src/octop/api/routers/chat/models.py b/src/octop/api/routers/chat/models.py
index ab6d8e29..54f6a580 100644
--- a/src/octop/api/routers/chat/models.py
+++ b/src/octop/api/routers/chat/models.py
@@ -4,7 +4,13 @@
 
 from typing import Any, Literal
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_validator
+
+# Decision types understood by langchain's HumanInTheLoopMiddleware.
+_DECISION_TYPES: frozenset[str] = frozenset({"approve", "edit", "reject", "respond"})
+# One decision per interrupted tool call; the model cannot fan out further.
+_MAX_DECISIONS = 16
+_MAX_DECISION_MESSAGE_CHARS = 8000
 
 
 class ChatTurnBody(BaseModel):
@@ -148,5 +154,40 @@ class HitlResumeBody(BaseModel):
     thread_id: str = Field(..., description="Conversation thread awaiting approval.")
     decisions: list[dict[str, Any]] = Field(
         ...,
-        description='Human decisions, e.g. [{"type": "approve"}] or [{"type": "reject", "message": "..."}].',
+        min_length=1,
+        max_length=_MAX_DECISIONS,
+        description=(
+            'Human decisions, e.g. [{"type": "approve"}], '
+            '[{"type": "reject", "message": "..."}] or '
+            '[{"type": "respond", "message": "<answer>"}].'
+        ),
     )
+
+    @field_validator("decisions")
+    @classmethod
+    def _validate_decisions(cls, value: list[dict[str, Any]]) -> list[dict[str, Any]]:
+        """Reject malformed decisions before they reach the agent graph.
+
+        ``respond``/``reject`` messages are injected into the model context
+        verbatim, so their payload is validated here rather than downstream.
+        """
+        for decision in value:
+            kind = decision.get("type")
+            if kind not in _DECISION_TYPES:
+                msg = f"unsupported decision type: {kind!r}"
+                raise ValueError(msg)
+            if kind == "edit" and not isinstance(decision.get("edited_action"), dict):
+                msg = "edit decision requires an 'edited_action' object"
+                raise ValueError(msg)
+            message = decision.get("message")
+            if kind == "respond" and (not isinstance(message, str) or not message.strip()):
+                msg = "respond decision requires a non-empty 'message'"
+                raise ValueError(msg)
+            if message is not None:
+                if not isinstance(message, str):
+                    msg = "decision 'message' must be a string"
+                    raise ValueError(msg)
+                if len(message) > _MAX_DECISION_MESSAGE_CHARS:
+                    msg = f"decision 'message' exceeds {_MAX_DECISION_MESSAGE_CHARS} characters"
+                    raise ValueError(msg)
+        return value
diff --git a/src/octop/api/routers/chat/routes.py b/src/octop/api/routers/chat/routes.py
index 27ef51b5..6cf20883 100644
--- a/src/octop/api/routers/chat/routes.py
+++ b/src/octop/api/routers/chat/routes.py
@@ -6,7 +6,7 @@
 from collections.abc import AsyncIterator, Awaitable, Callable
 from typing import Any
 
-from fastapi import APIRouter, Depends, Request
+from fastapi import APIRouter, Depends, HTTPException, Request
 from fastapi.responses import StreamingResponse
 
 from octop.api.common.agent import assert_agent_access
@@ -22,7 +22,11 @@
 )
 from octop.infra.agents.profile import welcome_from_row
 from octop.infra.errors import ErrorCode, OctopError
-from octop.infra.gateway.hitl.coordinator import HitlChannelCoordinator, HitlStreamContext
+from octop.infra.gateway.hitl.coordinator import (
+    HitlChannelCoordinator,
+    HitlStreamContext,
+    decision_rejection_reason,
+)
 from octop.infra.gateway.hitl.store import HitlPendingRecord
 from octop.infra.utils.llm_text import ainvoke_text
 from octop.infra.utils.locale import resolve_request_locale
@@ -89,7 +93,7 @@ async def get_chat_welcome(
 
 async def iter_dashboard_hitl_resume_sse(
     *,
-    agent_registry: Any,
+    processor: Any,
     hitl_coordinator: HitlChannelCoordinator,
     agent_id: str,
     thread_id: str,
@@ -114,21 +118,29 @@ async def iter_dashboard_hitl_resume_sse(
         session_key=session_key,
         channel_type=channel_type,
     )
+    disconnected = False
     try:
-        async for chunk in agent_registry.resume_hitl(agent_id, thread_id, decisions):
-            if await is_disconnected():
-                break
+        async for chunk in processor.iter_hitl_resume_chunks(
+            agent_id=agent_id,
+            thread_id=thread_id,
+            user_id=user_id,
+            decisions=decisions,
+        ):
+            if not disconnected:
+                disconnected = await is_disconnected()
             if isinstance(chunk, dict) and chunk.get("type") == "hitl_required":
                 request_payload = chunk.get("request")
                 if isinstance(request_payload, dict):
                     hitl_coordinator.register_from_request(request_payload, ctx=hitl_ctx)
-            yield format_sse("chunk", chunk)
+            if not disconnected:
+                yield format_sse("chunk", chunk)
         if pending is not None:
             hitl_coordinator.store.mark_resolved(
                 pending.pending_id,
                 "rejected" if rejected else "approved",
             )
-        yield format_sse("chunk", {"type": "done"})
+        if not disconnected:
+            yield format_sse("chunk", {"type": "done"})
     except Exception as exc:
         yield format_sse(
             "chunk",
@@ -162,8 +174,8 @@ async def resume_hitl(
 ) -> StreamingResponse:
     """Resume a paused human-in-the-loop tool approval and stream subsequent chunks."""
     assert_agent_access(server, agent_id, user)
-    agent_registry = server.app_runtime.agent_registry
-    hitl_coordinator = server.app_runtime.gateway.processor.hitl_coordinator
+    processor = server.app_runtime.gateway.processor
+    hitl_coordinator = processor.hitl_coordinator
     pending = hitl_coordinator.store.resolve_pending_for_thread(
         body.thread_id,
         agent_id=agent_id,
@@ -176,10 +188,14 @@ async def resume_hitl(
         user_id=user.id,
         pending=pending,
     )
+    if pending is not None:
+        reason = decision_rejection_reason(pending, body.decisions)
+        if reason is not None:
+            raise HTTPException(status_code=400, detail=reason)
 
     async def gen() -> AsyncIterator[str]:
         async for frame in iter_dashboard_hitl_resume_sse(
-            agent_registry=agent_registry,
+            processor=processor,
             hitl_coordinator=hitl_coordinator,
             agent_id=agent_id,
             thread_id=body.thread_id,
diff --git a/src/octop/api/routers/chat/serialize.py b/src/octop/api/routers/chat/serialize.py
index 9d83623a..c13539cf 100644
--- a/src/octop/api/routers/chat/serialize.py
+++ b/src/octop/api/routers/chat/serialize.py
@@ -6,10 +6,14 @@
 import json
 import logging
 import re
+import sqlite3
 from datetime import datetime
 from pathlib import Path
 from typing import Any
 
+from langchain_core.messages import messages_from_dict
+from langchain_core.runnables import RunnableConfig
+
 from octop.api.common.agent_workspace import resolve_agent_workspace_dir
 from octop.i18n.domains.attachment import attachment_empty_image
 from octop.infra.agents.context_breakdown import usage_dict_from_message
@@ -388,6 +392,141 @@ async def _load_thread_messages(
     )
 
 
+def _isolated_sqlite_checkpoint_messages(
+    harness: Any,
+    thread_id: str,
+) -> list[Any] | None:
+    """Read the newest SQLite checkpoint through a separate read-only connection.
+
+    ``None`` means the harness is not backed by a discoverable SQLite saver.
+    Once SQLite is detected, failures are raised instead of falling back to the
+    live saver connection: availability of new turns is more important than a
+    legacy UI backfill.
+    """
+    checkpoint = getattr(harness, "_checkpointer_instance", None)
+    if checkpoint is None:
+        return None
+
+    backend = getattr(checkpoint, "_backend", None)
+    raw_path = getattr(backend, "_db_path", None)
+    saver = getattr(checkpoint, "_checkpointer", checkpoint)
+    disk_saver = getattr(saver, "_disk", saver)
+    live_conn = getattr(disk_saver, "conn", None)
+    if raw_path is None and isinstance(live_conn, sqlite3.Connection):
+        rows = live_conn.execute("PRAGMA database_list").fetchall()
+        raw_path = next((row[2] for row in rows if row[1] == "main"), None)
+    if raw_path is None or str(raw_path) == ":memory:":
+        return None
+
+    from langgraph.checkpoint.sqlite import SqliteSaver  # noqa: PLC0415
+
+    uri = f"{Path(raw_path).resolve().as_uri()}?mode=ro"
+    conn = sqlite3.connect(uri, uri=True, check_same_thread=False)
+    try:
+        conn.execute("PRAGMA query_only = ON")
+        conn.execute("PRAGMA busy_timeout = 5000")
+        isolated = SqliteSaver(conn=conn, serde=getattr(disk_saver, "serde", None))
+        config: RunnableConfig = {"configurable": {"thread_id": thread_id}}
+        for checkpoint_tuple in isolated.list(config, limit=1):
+            messages = checkpoint_tuple.checkpoint.get("channel_values", {}).get("messages", [])
+            return list(messages) if isinstance(messages, list) else []
+        return []
+    finally:
+        conn.close()
+
+
+def _load_projected_thread_messages(
+    server: Any,
+    agent_id: str,
+    thread_id: str,
+    limit: int,
+    *,
+    user: Any,
+    offset: int = 0,
+) -> tuple[list[dict[str, Any]], bool]:
+    """Read one page without touching the agent checkpoint database."""
+    rows, has_more = server.services.thread_message_repo.page(
+        thread_id,
+        limit=limit,
+        offset=offset,
+    )
+    out: list[dict[str, Any]] = []
+    for row in rows:
+        try:
+            wire = json.loads(row.message_json)
+            message = messages_from_dict([wire])[0]
+        except Exception:
+            logger.warning(
+                "invalid projected history row thread=%s seq=%s",
+                thread_id,
+                row.seq,
+                exc_info=True,
+            )
+            continue
+        entry = _serialize_history_message(message, user=user)
+        if entry is not None:
+            out.append(entry)
+    return _enrich_history_tool_media(out, agent_id=agent_id), has_more
+
+
+async def _backfill_thread_projection(
+    server: Any,
+    agent_id: str,
+    thread_id: str,
+    *,
+    user: Any,
+) -> None:
+    """Decode one legacy checkpoint off-request and atomically publish it."""
+    repo = server.services.thread_message_repo
+    registry = server.app_runtime.agent_registry
+    reserve = getattr(registry, "try_begin_history_backfill", None)
+    release = getattr(registry, "end_history_backfill", None)
+    reserved = reserve(agent_id) if callable(reserve) else True
+    if reserved is False:
+        await asyncio.to_thread(repo.mark_projection, thread_id, "pending")
+        return
+    try:
+        await asyncio.to_thread(repo.mark_projection, thread_id, "running")
+        harness = registry.get_agent(agent_id)
+        raw = await asyncio.to_thread(
+            _isolated_sqlite_checkpoint_messages,
+            harness,
+            thread_id,
+        )
+        if raw is None:
+            raw, _has_more = await _load_checkpoint_messages(
+                harness,
+                thread_id,
+                1_000_000,
+                0,
+            )
+        if not raw:
+            session_rows, _ = await _load_thread_messages_from_sessions(
+                server,
+                agent_id,
+                thread_id,
+                1_000_000,
+                offset=0,
+                user=user,
+            )
+            raw = session_rows
+        from octop.infra.gateway.process.history_projection import message_inputs  # noqa: PLC0415
+
+        projected = await asyncio.to_thread(message_inputs, list(raw))
+        await asyncio.to_thread(repo.replace_all, thread_id, projected)
+    except Exception as exc:
+        logger.exception("history projection backfill failed for thread=%s", thread_id)
+        await asyncio.to_thread(
+            repo.mark_projection,
+            thread_id,
+            "failed",
+            error=str(exc)[:500],
+        )
+    finally:
+        if callable(release):
+            release(agent_id)
+
+
 def _enrich_history_tool_media(
     messages: list[dict[str, Any]],
     *,
diff --git a/src/octop/api/routers/connectors.py b/src/octop/api/routers/connectors.py
index 0624d749..6c2412ec 100644
--- a/src/octop/api/routers/connectors.py
+++ b/src/octop/api/routers/connectors.py
@@ -11,10 +11,11 @@
 
 from fastapi import APIRouter, Depends, Query, Request
 from fastapi.responses import HTMLResponse
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, model_validator
 
 from octop.api.common.public_base import resolve_public_base
 from octop.api.deps import current_user, get_server, require_permission
+from octop.i18n import tr
 from octop.infra.connectors.builder import (
     mcp_server_name,
     normalize_weiyun_mcp_token,
@@ -23,13 +24,14 @@
 from octop.infra.connectors.catalog import (
     catalog_entry_to_dict,
     get_catalog_entry,
-    get_mcp_oauth_remote,
     list_catalog,
 )
 from octop.infra.connectors.custom_mcp import (
     CUSTOM_MCP_KIND,
     is_custom_mcp_kind,
+    oauth_configured,
     parse_synthetic_instance_id,
+    redact_servers_for_api,
 )
 from octop.infra.connectors.default_open import (
     build_instance_config_json,
@@ -50,9 +52,14 @@
     load_oauth_ctx,
     oauth_ready_for_kind,
     save_oauth_ctx,
-    start_oauth,
+    start_oauth_for_target,
+)
+from octop.infra.connectors.oauth.registry import (
+    oauth_state_kind_for_target,
+    oauth_target_requires_https,
 )
 from octop.infra.connectors.probe import (
+    detect_local_weknora,
     prepare_probe_credentials,
     probe_connector,
     probe_custom_mcp_server,
@@ -60,6 +67,7 @@
 from octop.infra.connectors.service import 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
 from octop.infra.utils.ulid import new_ulid
 
 logger = logging.getLogger(__name__)
@@ -95,6 +103,15 @@ class PatchInstanceBody(BaseModel):
 
 class OAuthStartBody(BaseModel):
     redirect_after: str | None = None
+    target: dict[str, Any] | None = Field(
+        default=None,
+        description='OAuth target, e.g. {"type":"catalog","kind":"notion"} or '
+        '{"type":"custom_mcp","server_name":"my-server"}',
+    )
+
+
+class OAuthStartLegacyBody(BaseModel):
+    redirect_after: str | None = None
 
 
 class ExchangeAuthCodeBody(BaseModel):
@@ -127,7 +144,14 @@ class CustomMcpPutBody(BaseModel):
 
 
 class CustomMcpServerPatchBody(BaseModel):
-    enabled: bool
+    enabled: bool | None = None
+    default_open: 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")
+        return self
 
 
 class CustomMcpTestBody(BaseModel):
@@ -137,6 +161,103 @@ class CustomMcpTestBody(BaseModel):
     server: dict[str, Any] | None = None
 
 
+def _oauth_callback_html(
+    request: Request,
+    message_key: str,
+    *,
+    status_code: int = 200,
+    **fmt: Any,
+) -> HTMLResponse:
+    locale = resolve_request_locale(request)
+    message = tr(f"connector.oauth.{message_key}", locale, **fmt)
+    return HTMLResponse(f"<html><body>{message}</body></html>", status_code=status_code)
+
+
+def _resolve_custom_mcp_url(svc: ConnectorService, user_id: int, server_name: str) -> str:
+    saved = svc.get_custom_servers(user_id)
+    raw = saved.get(server_name)
+    if not isinstance(raw, dict):
+        raise OctopError(
+            ErrorCode.CONNECTOR_NOT_FOUND,
+            f"custom MCP server {server_name!r} not found; save configuration before OAuth",
+        )
+    if str(raw.get("transport") or "") not in ("streamable_http", "http"):
+        raise OctopError(
+            ErrorCode.CONNECTOR_KIND_UNSUPPORTED,
+            "OAuth is only supported for streamable HTTP custom MCP servers",
+        )
+    mcp_url = str(raw.get("url") or "").strip()
+    if not mcp_url:
+        raise OctopError(ErrorCode.CONNECTOR_INVALID_CREDENTIALS, "server url is required")
+    return mcp_url
+
+
+async def _begin_oauth_flow(
+    *,
+    request: Request,
+    user: Any,
+    server: Any,
+    target: dict[str, Any],
+    redirect_after: str | None,
+) -> dict[str, Any]:
+    target_type = str(target.get("type") or "").strip()
+    if target_type == "catalog":
+        kind = str(target.get("kind") or "").strip()
+        if not oauth_ready_for_kind(kind, server.services.settings_repo):
+            raise OctopError(
+                ErrorCode.CONNECTOR_INVALID_CREDENTIALS,
+                f"OAuth for {kind} is not available",
+            )
+    elif target_type != "custom_mcp":
+        raise OctopError(ErrorCode.CONNECTOR_INVALID_CREDENTIALS, "unsupported oauth target")
+
+    state = secrets.token_urlsafe(24)
+    state_id = new_ulid()
+    base = resolve_public_base(request)
+    redirect_uri = f"{base}/api/connectors/oauth/callback"
+    if oauth_target_requires_https(target) and _is_public_http_uri(redirect_uri):
+        label = str(target.get("kind") or target.get("server_name") or "MCP")
+        raise OctopError(
+            ErrorCode.CONNECTOR_OAUTH_HTTPS_REQUIRED,
+            f"{label} OAuth callbacks require HTTPS for non-loopback addresses",
+        )
+
+    mcp_url: str | None = None
+    if target_type == "custom_mcp":
+        server_name = str(target.get("server_name") or "").strip()
+        if not server_name:
+            raise OctopError(
+                ErrorCode.CONNECTOR_INVALID_CREDENTIALS,
+                "custom_mcp target requires server_name",
+            )
+        mcp_url = _resolve_custom_mcp_url(_connector_service(server), user.id, server_name)
+
+    try:
+        authorize_url, verifier, ctx = await start_oauth_for_target(
+            target=target,
+            redirect_uri=redirect_uri,
+            state=state,
+            settings_repo=server.services.settings_repo,
+            mcp_url=mcp_url,
+        )
+    except ValueError as exc:
+        raise OctopError(ErrorCode.CONNECTOR_INVALID_CREDENTIALS, str(exc)) from exc
+    except Exception as exc:
+        logger.exception("oauth start failed for target %s", target)
+        raise OctopError(ErrorCode.CONNECTOR_INVALID_CREDENTIALS, str(exc)) from exc
+
+    server.services.repos.connector_repo.create_oauth_state(
+        state_id=state_id,
+        state=state,
+        user_id=user.id,
+        kind=oauth_state_kind_for_target(target),
+        code_verifier=verifier,
+        redirect_after=redirect_after,
+    )
+    save_oauth_ctx(server.services.settings_repo, state_id, ctx)
+    return {"authorize_url": authorize_url, "state_id": state_id}
+
+
 def _connector_service(server: Any) -> ConnectorService:
     return ConnectorService(
         repo=server.services.repos.connector_repo,
@@ -272,6 +393,14 @@ def _credentials_preview(kind: str, creds: dict[str, Any]) -> dict[str, Any]:
             preview["sdk_id"] = str(creds["sdk_id"])
         if str(creds.get("secret_key") or "").strip():
             preview["secret_key_configured"] = True
+    elif entry.auth_kind == "custom_fields":
+        for field in entry.credential_fields:
+            value = creds.get(field.key)
+            if field.secret:
+                if str(value or "").strip():
+                    preview[f"{field.key}_configured"] = True
+            elif value not in (None, "", []):
+                preview[field.key] = value
     return preview
 
 
@@ -307,6 +436,15 @@ async def get_catalog(
     ]
 
 
+@router.get("/connectors/weknora/detect-local", summary="Detect local WeKnora")
+async def detect_weknora_on_octop_host(
+    user: Any = Depends(current_user),
+) -> dict[str, Any]:
+    """Check WeKnora's fixed default loopback health endpoint (no persistence)."""
+    del user
+    return await detect_local_weknora()
+
+
 @router.get("/connector-instances", summary="List connector instances")
 async def list_instances(
     user: Any = Depends(current_user),
@@ -322,7 +460,7 @@ async def get_custom_mcp(
     server: Any = Depends(get_server),
 ) -> dict[str, Any]:
     """Return the user's custom MCP server map (langchain-mcp-adapters shape)."""
-    servers = _connector_service(server).get_custom_servers(user.id)
+    servers = _connector_service(server).get_custom_servers_for_api(user.id)
     return {"servers": servers}
 
 
@@ -345,12 +483,12 @@ async def put_custom_mcp(
         payload=str(len(servers)),
     )
     _schedule_connector_reload(server, user.id)
-    return {"servers": servers}
+    return {"servers": redact_servers_for_api(servers)}
 
 
 @router.patch(
     "/connectors/custom-mcp/servers/{server_name}",
-    summary="Enable or disable one custom MCP server",
+    summary="Patch one custom MCP server",
 )
 async def patch_custom_mcp_server(
     server_name: str,
@@ -358,10 +496,15 @@ async def patch_custom_mcp_server(
     user: Any = Depends(current_user),
     server: Any = Depends(get_server),
 ) -> dict[str, Any]:
-    """Toggle ``enabled`` for a single custom MCP server without rewriting others."""
+    """Update ``enabled`` and/or ``default_open`` for one custom MCP server."""
     svc = _connector_service(server)
     try:
-        servers = svc.patch_custom_server_enabled(user.id, server_name, enabled=body.enabled)
+        servers = svc.patch_custom_server(
+            user.id,
+            server_name,
+            enabled=body.enabled,
+            default_open=body.default_open,
+        )
     except KeyError as exc:
         raise OctopError(
             ErrorCode.CONNECTOR_NOT_FOUND, f"custom MCP server {server_name!r} not found"
@@ -369,7 +512,7 @@ async def patch_custom_mcp_server(
     except ValueError as exc:
         raise OctopError(ErrorCode.CONNECTOR_INVALID_CREDENTIALS, str(exc)) from exc
     _schedule_connector_reload(server, user.id)
-    return {"servers": servers}
+    return {"servers": redact_servers_for_api(servers)}
 
 
 @router.post("/connectors/custom-mcp/test", summary="Probe a custom MCP server")
@@ -396,7 +539,16 @@ async def test_custom_mcp(
             ErrorCode.CONNECTOR_INVALID_CREDENTIALS,
             "provide name or server spec to probe",
         )
-    return await probe_custom_mcp_server(spec)
+    result = await probe_custom_mcp_server(spec)
+    if body.name:
+        try:
+            if result.get("oauth", {}).get("available") and not oauth_configured(spec):
+                svc.note_custom_server_oauth_required(user.id, body.name, required=True)
+            elif result.get("ok") or not result.get("oauth", {}).get("available"):
+                svc.note_custom_server_oauth_required(user.id, body.name, required=False)
+        except KeyError:
+            pass
+    return result
 
 
 @router.get("/connector-instances/{instance_id}", summary="Get connector instance")
@@ -946,57 +1098,41 @@ async def auth_exchange_code(
     return {"credentials": tokens}
 
 
-@router.post("/connectors/oauth/{kind}/start", summary="Start OAuth flow")
-async def oauth_start(
-    kind: str,
+@router.post("/connectors/oauth/start", summary="Start OAuth flow (unified)")
+async def oauth_start_unified(
     body: OAuthStartBody,
     request: Request,
     user: Any = Depends(current_user),
     server: Any = Depends(get_server),
 ) -> dict[str, Any]:
-    """Begin browser OAuth: returns `authorize_url` and `state_id` to poll after redirect."""
-    if not oauth_ready_for_kind(kind, server.services.settings_repo):
-        raise OctopError(
-            ErrorCode.CONNECTOR_INVALID_CREDENTIALS,
-            f"OAuth for {kind} is not available",
-        )
+    """Begin browser OAuth for a catalog connector or custom MCP server."""
+    if not body.target or not isinstance(body.target, dict):
+        raise OctopError(ErrorCode.CONNECTOR_INVALID_CREDENTIALS, "oauth target is required")
+    return await _begin_oauth_flow(
+        request=request,
+        user=user,
+        server=server,
+        target=body.target,
+        redirect_after=body.redirect_after,
+    )
 
-    state = secrets.token_urlsafe(24)
-    state_id = new_ulid()
-    base = resolve_public_base(request)
-    redirect_uri = f"{base}/api/connectors/oauth/callback"
-    if get_mcp_oauth_remote(kind) is not None and _is_public_http_uri(redirect_uri):
-        raise OctopError(
-            ErrorCode.CONNECTOR_OAUTH_HTTPS_REQUIRED,
-            f"{kind} OAuth callbacks require HTTPS for non-loopback addresses",
-        )
 
-    try:
-        authorize_url, verifier, ctx = await start_oauth(
-            kind=kind,
-            redirect_uri=redirect_uri,
-            state=state,
-            settings_repo=server.services.settings_repo,
-        )
-    except ValueError as exc:
-        raise OctopError(ErrorCode.CONNECTOR_INVALID_CREDENTIALS, str(exc)) from exc
-    except Exception as exc:
-        logger.exception("oauth start failed for %s", kind)
-        raise OctopError(
-            ErrorCode.CONNECTOR_INVALID_CREDENTIALS,
-            f"无法启动 OAuth: {exc}",
-        ) from exc
-
-    server.services.repos.connector_repo.create_oauth_state(
-        state_id=state_id,
-        state=state,
-        user_id=user.id,
-        kind=kind,
-        code_verifier=verifier,
+@router.post("/connectors/oauth/{kind}/start", summary="Start OAuth flow (legacy)")
+async def oauth_start_legacy(
+    kind: str,
+    body: OAuthStartLegacyBody,
+    request: Request,
+    user: Any = Depends(current_user),
+    server: Any = Depends(get_server),
+) -> dict[str, Any]:
+    """Legacy catalog-only alias for :func:`oauth_start_unified`."""
+    return await _begin_oauth_flow(
+        request=request,
+        user=user,
+        server=server,
+        target={"type": "catalog", "kind": kind},
         redirect_after=body.redirect_after,
     )
-    save_oauth_ctx(server.services.settings_repo, state_id, ctx)
-    return {"authorize_url": authorize_url, "state_id": state_id}
 
 
 @router.get("/connectors/oauth/callback", summary="OAuth callback")
@@ -1009,14 +1145,27 @@ async def oauth_callback(
 ) -> HTMLResponse:
     """OAuth redirect target. Exchanges the code and stores credentials. No JWT required."""
     if error:
-        return HTMLResponse(f"<html><body>授权失败: {error}</body></html>", status_code=400)
+        return _oauth_callback_html(
+            request,
+            "callback_auth_failed",
+            status_code=400,
+            error=error,
+        )
     if not code or not state:
-        return HTMLResponse("<html><body>缺少 code 或 state</body></html>", status_code=400)
+        return _oauth_callback_html(
+            request,
+            "callback_missing_params",
+            status_code=400,
+        )
 
     repo = server.services.repos.connector_repo
     row = repo.consume_oauth_state(state)
     if row is None:
-        return HTMLResponse("<html><body>无效或过期的 state</body></html>", status_code=400)
+        return _oauth_callback_html(
+            request,
+            "callback_invalid_state",
+            status_code=400,
+        )
 
     base = resolve_public_base(request)
     redirect_uri = f"{base}/api/connectors/oauth/callback"
@@ -1038,15 +1187,52 @@ async def oauth_callback(
         delete_oauth_ctx(server.services.settings_repo, row.state_id)
     except Exception as exc:
         logger.exception("oauth callback failed for %s", row.kind)
-        return HTMLResponse(f"<html><body>Token 交换失败: {exc}</body></html>", status_code=400)
+        return _oauth_callback_html(
+            request,
+            "callback_token_exchange_failed",
+            status_code=400,
+            detail=str(exc),
+        )
+
+    pending_payload: dict[str, Any] = {
+        "user_id": row.user_id,
+        "kind": row.kind,
+        "tokens": tokens,
+    }
+    if row.kind == CUSTOM_MCP_KIND:
+        server_name = str(ctx.get("server_name") or "")
+        issuer = str(ctx.get("issuer") or "")
+        resource = str(ctx.get("resource") or "").strip() or None
+        try:
+            svc = _connector_service(server)
+            svc.apply_custom_server_oauth(
+                row.user_id,
+                server_name,
+                tokens,
+                issuer=issuer,
+                resource=resource,
+            )
+            _schedule_connector_reload(server, row.user_id)
+            pending_payload["server_name"] = server_name
+            pending_payload["applied"] = True
+        except Exception as exc:
+            logger.exception("custom MCP oauth apply failed")
+            return _oauth_callback_html(
+                request,
+                "callback_save_failed",
+                status_code=400,
+                detail=str(exc),
+            )
 
     # Store tokens in a short-lived settings key for frontend pickup, or auto-create instance.
     pending_key = f"connector.oauth.pending.{row.state_id}"
     server.services.settings_repo.set(
         pending_key,
-        json.dumps({"user_id": row.user_id, "kind": row.kind, "tokens": tokens}),
+        json.dumps(pending_payload),
     )
     redirect = row.redirect_after or "/connectors"
+    locale = resolve_request_locale(request)
+    success_message = tr("connector.oauth.callback_success", locale)
     html = f"""<!DOCTYPE html><html><body>
 <script>
   if (window.opener) {{
@@ -1056,7 +1242,7 @@ async def oauth_callback(
     window.location.href = '{redirect}?oauth_state={row.state_id}';
   }}
 </script>
-<p>授权完成，可关闭此窗口。</p>
+<p>{success_message}</p>
 </body></html>"""
     return HTMLResponse(html)
 
@@ -1079,7 +1265,12 @@ async def oauth_pending(
     if int(data.get("user_id") or 0) != user.id:
         raise OctopError(ErrorCode.FORBIDDEN, "not your oauth session")
     server.services.settings_repo.delete(key)
-    return {"kind": data.get("kind"), "tokens": data.get("tokens") or {}}
+    return {
+        "kind": data.get("kind"),
+        "tokens": data.get("tokens") or {},
+        "server_name": data.get("server_name"),
+        "applied": data.get("applied"),
+    }
 
 
 async def validate_chat_mcp_servers(
diff --git a/src/octop/api/routers/knowledge_bases.py b/src/octop/api/routers/knowledge_bases.py
index 8e8bf167..dc24ec00 100644
--- a/src/octop/api/routers/knowledge_bases.py
+++ b/src/octop/api/routers/knowledge_bases.py
@@ -69,6 +69,12 @@ class CreateBaseBody(BaseModel):
     default_open: bool = False
     shared: bool = False
     icon_name: str = Field(default="", max_length=64)
+    max_documents: int | None = Field(
+        default=None,
+        ge=0,
+        le=10_000,
+        description="Per-base document limit. 0 = unlimited, default 100.",
+    )
 
 
 class CreateFolderBody(BaseModel):
@@ -98,6 +104,12 @@ class UpdateBaseBody(BaseModel):
     default_open: bool | None = None
     shared: bool | None = None
     icon_name: str | None = Field(default=None, max_length=64)
+    max_documents: int | None = Field(
+        default=None,
+        ge=0,
+        le=10_000,
+        description="Per-base document limit. 0 = unlimited.",
+    )
 
 
 class RenameDocumentBody(BaseModel):
@@ -418,6 +430,7 @@ async def create_base(
             default_open=body.default_open,
             shared=body.shared,
             icon_name=body.icon_name.strip(),
+            max_documents=body.max_documents if body.max_documents is not None else MAX_DOCS_PER_KB,
         )
         return _base_payload(server, base)
     except Exception as exc:
@@ -480,6 +493,7 @@ async def update_base(
                 default_open=body.default_open,
                 shared=body.shared,
                 icon_name=body.icon_name.strip() if body.icon_name is not None else None,
+                max_documents=body.max_documents,
                 is_admin=_is_admin(user),
             ),
         )
diff --git a/src/octop/api/routers/providers.py b/src/octop/api/routers/providers.py
index e030f13f..c9c49634 100644
--- a/src/octop/api/routers/providers.py
+++ b/src/octop/api/routers/providers.py
@@ -8,7 +8,7 @@
 from types import SimpleNamespace
 from typing import Any, cast
 
-from fastapi import APIRouter, Depends
+from fastapi import APIRouter, Depends, Request
 from pydantic import BaseModel
 
 from octop.api.deps import current_user, get_server, require_permission
@@ -36,6 +36,7 @@
     poll_device_token,
     request_device_code,
 )
+from octop.infra.utils.locale import resolve_request_locale
 from octop.infra.utils.ulid import new_ulid
 
 logger = logging.getLogger(__name__)
@@ -297,6 +298,7 @@ async def admin_delete_provider(
 @admin_router.post("/test-draft", summary="Test unsaved provider draft")
 async def admin_test_provider_draft(
     body: ProviderTestDraftBody,
+    request: Request,
     _: Any = Depends(require_permission("providers")),
 ) -> dict[str, Any]:
     """Probe connectivity for a provider draft before it is saved."""
@@ -315,12 +317,18 @@ async def admin_test_provider_draft(
         extra_json=body.extra_json,
         embedding=body.embedding,
     )
-    return await probe_provider_row(row, model_id=model_id, embedding=body.embedding)
+    return await probe_provider_row(
+        row,
+        model_id=model_id,
+        embedding=body.embedding,
+        locale=resolve_request_locale(request),
+    )
 
 
 @admin_router.post("/fetch-models", summary="List models from an OpenAI-compatible draft")
 async def admin_fetch_provider_models(
     body: ProviderFetchModelsBody,
+    request: Request,
     _: Any = Depends(require_permission("providers")),
 ) -> dict[str, Any]:
     """Fetch remote model ids via OpenAI-compatible ``GET /models`` (openai kind only)."""
@@ -337,6 +345,7 @@ async def admin_fetch_provider_models(
         base_url=(body.base_url or "").strip() or None,
         api_key=api_key,
         extra_headers=provider_headers(draft) or None,
+        locale=resolve_request_locale(request),
     )
 
 
@@ -456,6 +465,7 @@ async def codex_oauth_logout(
 @admin_router.post("/{provider_id}/test")
 async def admin_test_provider(
     provider_id: int,
+    request: Request,
     body: ProviderTestBody | None = None,
     _: Any = Depends(require_permission("providers")),
     server: Any = Depends(get_server),
@@ -467,4 +477,9 @@ async def admin_test_provider(
     row = await _maybe_refresh_codex_row(server, row)
     model_id = body.model_id if body else None
     embedding = body.embedding if body else None
-    return await probe_provider_row(row, model_id=model_id, embedding=embedding)
+    return await probe_provider_row(
+        row,
+        model_id=model_id,
+        embedding=embedding,
+        locale=resolve_request_locale(request),
+    )
diff --git a/src/octop/api/routers/setup.py b/src/octop/api/routers/setup.py
index 7387453b..8a7f7dda 100644
--- a/src/octop/api/routers/setup.py
+++ b/src/octop/api/routers/setup.py
@@ -390,6 +390,7 @@ async def resume_wizard(server: Any = Depends(get_server)) -> dict[str, Any]:
 @router.post("/setup/test-provider", summary="Test provider draft connectivity")
 async def test_provider_draft(
     body: ProviderTestBody,
+    request: Request,
     server: Any = Depends(get_server),
     authorization: str | None = Header(default=None),
 ) -> dict[str, Any]:
@@ -405,7 +406,7 @@ async def test_provider_draft(
         base_url=body.base_url,
         model_id=body.model_id,
     )
-    return await probe_provider_row(row)
+    return await probe_provider_row(row, locale=resolve_request_locale(request))
 
 
 @router.post("/setup/finish", summary="Finish setup wizard")
diff --git a/src/octop/api/routers/skill_packages.py b/src/octop/api/routers/skill_packages.py
index 1e17dfa9..696330cf 100644
--- a/src/octop/api/routers/skill_packages.py
+++ b/src/octop/api/routers/skill_packages.py
@@ -28,7 +28,7 @@
 from octop.infra.skills.skillhub_market import SkillHubMarketError as SkillHubDownloadError
 from octop.infra.users.identity import User
 from octop.infra.utils.frontmatter import parse_frontmatter
-from octop.infra.utils.locale import resolve_request_locale
+from octop.infra.utils.locale import Locale, resolve_request_locale
 
 router = APIRouter(prefix="/skill-packages")
 
@@ -114,10 +114,17 @@ def _package_skill_exists(store: SkillPackageStore, package_id: str, slug: str)
     return (store.package_skills_dir(package_id) / slug / "SKILL.md").is_file()
 
 
+class LocalizedSkillCopy(BaseModel):
+    zh: str | None = None
+    en: str | None = None
+
+
 class HubInstallPackageSkillBody(BaseModel):
     skill_name: str
     display_name: str | None = None
     icon_url: str | None = None
+    label: LocalizedSkillCopy | None = None
+    summary: LocalizedSkillCopy | None = None
     overwrite: bool = False
 
 
@@ -148,8 +155,16 @@ def _row_public_dict(row: SkillPackageRow) -> dict[str, Any]:
     return payload
 
 
-def _package_payload(store: SkillPackageStore, row: SkillPackageRow) -> dict[str, Any]:
-    return {**_row_public_dict(row), "skills": store.list_skill_summaries(row.id)}
+def _package_payload(
+    store: SkillPackageStore,
+    row: SkillPackageRow,
+    *,
+    locale: Locale | None = None,
+) -> dict[str, Any]:
+    return {
+        **_row_public_dict(row),
+        "skills": store.list_skill_summaries(row.id, locale=locale),
+    }
 
 
 def _creator_fields(server: OctopServer, created_by: str) -> dict[str, str | None]:
@@ -171,9 +186,11 @@ def _package_payload_with_creator(
     server: OctopServer,
     store: SkillPackageStore,
     row: SkillPackageRow,
+    *,
+    locale: Locale | None = None,
 ) -> dict[str, Any]:
     return {
-        **_package_payload(store, row),
+        **_package_payload(store, row, locale=locale),
         **_creator_fields(server, row.created_by),
     }
 
@@ -220,8 +237,13 @@ def _package_skill_or_404(
     store: SkillPackageStore,
     package_id: str,
     slug: str,
+    *,
+    locale: Locale | None = None,
 ) -> dict[str, Any]:
-    for skill in store.list_skill_summaries(package_id):
+    for skill in store.list_skill_summaries(
+        package_id,
+        locale=locale,
+    ):
         if skill["slug"] == slug:
             return skill
     raise OctopError(ErrorCode.NOT_FOUND, f"skill {slug!r} not found")
@@ -342,7 +364,12 @@ async def get_skill_package(
 ) -> dict[str, Any]:
     store = _store(server)
     row = _package_or_404(store, package_id, locale=resolve_request_locale(request))
-    return _package_payload_with_creator(server, store, row)
+    return _package_payload_with_creator(
+        server,
+        store,
+        row,
+        locale=resolve_request_locale(request),
+    )
 
 
 @router.patch("/{package_id}", summary="Update global skill package metadata")
@@ -373,7 +400,12 @@ async def update_skill_package(
             raise_skill_package_name_taken(name)
         raise
     updated = _package_or_404(store, package_id, locale=resolve_request_locale(request))
-    return _package_payload_with_creator(server, store, updated)
+    return _package_payload_with_creator(
+        server,
+        store,
+        updated,
+        locale=resolve_request_locale(request),
+    )
 
 
 @router.delete(
@@ -402,7 +434,10 @@ async def list_package_skills(
 ) -> list[dict[str, Any]]:
     store = _store(server)
     _package_or_404(store, package_id, locale=resolve_request_locale(request))
-    return store.list_skill_summaries(package_id)
+    return store.list_skill_summaries(
+        package_id,
+        locale=resolve_request_locale(request),
+    )
 
 
 @router.get("/{package_id}/skills/{slug}", summary="Get a global package skill")
@@ -415,7 +450,12 @@ async def get_package_skill(
 ) -> dict[str, Any]:
     store = _store(server)
     _package_or_404(store, package_id, locale=resolve_request_locale(request))
-    skill = _package_skill_or_404(store, package_id, slug)
+    skill = _package_skill_or_404(
+        store,
+        package_id,
+        slug,
+        locale=resolve_request_locale(request),
+    )
     raw = (store.package_skills_dir(package_id) / slug / "SKILL.md").read_text(encoding="utf-8")
     frontmatter, body = parse_frontmatter(raw)
     return {**skill, "frontmatter": frontmatter, "body": body, "raw": raw}
@@ -653,8 +693,22 @@ async def hub_install_package_skill(
 
     display_name = (body.display_name or "").strip()
     icon_url = (body.icon_url or "").strip()
+    label = (
+        {key: value.strip() for key, value in body.label.model_dump().items() if value}
+        if body.label
+        else {}
+    )
+    summary = (
+        {key: value.strip() for key, value in body.summary.model_dump().items() if value}
+        if body.summary
+        else {}
+    )
     if len(display_name) > 200:
         raise HTTPException(status_code=400, detail="display_name is too long")
+    if any(len(value) > 200 for value in label.values()):
+        raise HTTPException(status_code=400, detail="localized skill label is too long")
+    if any(len(value) > 1024 for value in summary.values()):
+        raise HTTPException(status_code=400, detail="localized skill summary is too long")
     if len(icon_url) > 2048 or (icon_url and not valid_skillhub_icon_url(icon_url)):
         raise HTTPException(status_code=400, detail="icon_url must be an HTTP(S) URL")
 
@@ -686,6 +740,8 @@ async def hub_install_package_skill(
             files=files,
             display_name=display_name,
             icon_url=icon_url,
+            label=label,
+            summary=summary,
             overwrite=body.overwrite,
         )
     except SkillAlreadyExistsError as exc:
@@ -703,5 +759,5 @@ async def hub_install_package_skill(
         "installed": True,
         "name": skill_name,
         "transport": transport,
-        "skill": _package_skill_or_404(store, package_id, skill_name),
+        "skill": _package_skill_or_404(store, package_id, skill_name, locale=locale),
     }
diff --git a/src/octop/api/routers/skills.py b/src/octop/api/routers/skills.py
index e9eaaefe..50666d0d 100644
--- a/src/octop/api/routers/skills.py
+++ b/src/octop/api/routers/skills.py
@@ -53,6 +53,7 @@
     skills_disabled_set as _disabled_set,
 )
 from octop.infra.errors import ErrorCode, OctopError
+from octop.infra.skills.presentation import apply_skill_presentation
 from octop.infra.skills.skill_package_store import SkillPackageStore
 from octop.infra.skills.skill_packages import (
     SkillPackageError,
@@ -61,7 +62,7 @@
     resolve_skill_package,
     validate_skill_slug,
 )
-from octop.infra.utils.locale import resolve_request_locale
+from octop.infra.utils.locale import Locale, resolve_request_locale
 
 logger = logging.getLogger(__name__)
 
@@ -140,39 +141,24 @@ def _summary_dict(
     *,
     enabled: bool,
     kind: str,
+    locale: Locale | None = None,
 ) -> dict[str, Any]:
-    out: dict[str, Any] = {
-        # ``slug`` is the directory name — the stable identifier used for all
-        # by-name operations (detail / enable / disable / delete / install
-        # check). ``name`` is the frontmatter display name, which may differ
-        # from the slug (e.g. dir "tencent-meeting-skill" with frontmatter
-        # name "tencent-meeting-mcp"); using ``name`` as the id 404s.
-        "slug": name,
-        "name": str(meta.get("name") or name),
-        "description": str(meta.get("description") or ""),
-        "enabled": enabled,
-        "kind": kind,
-    }
-    # Presentation metadata is kept separate from the stable directory slug and
-    # the skill's own frontmatter name. Octop-authored metadata wins, while
-    # upstream formats remain supported for already-installed marketplace skills.
-    metadata = meta.get("metadata") or {}
-    if isinstance(metadata, dict):
-        has_display_name = False
-        for namespace in ("octop", "lightclaw", "orca", "openclaw"):
-            ext = metadata.get(namespace) or {}
-            if not isinstance(ext, dict):
-                continue
-            display_name = str(ext.get("display_name") or "").strip()
-            if display_name and not has_display_name:
-                out["name"] = display_name
-                has_display_name = True
-            emoji = str(ext.get("emoji") or "").strip()
-            if emoji and "emoji" not in out:
-                out["emoji"] = emoji
-            icon_url = str(ext.get("icon_url") or "").strip()
-            if icon_url and "icon_url" not in out and _valid_skillhub_icon_url(icon_url):
-                out["icon_url"] = icon_url
+    out = apply_skill_presentation(
+        {
+            # ``slug`` is the directory name — the stable identifier used for all
+            # by-name operations (detail / enable / disable / delete / install
+            # check). ``name`` is the frontmatter display name, which may differ
+            # from the slug (e.g. dir "tencent-meeting-skill" with frontmatter
+            # name "tencent-meeting-mcp"); using ``name`` as the id 404s.
+            "slug": name,
+            "name": str(meta.get("name") or name),
+            "description": str(meta.get("description") or ""),
+            "enabled": enabled,
+            "kind": kind,
+        },
+        meta,
+        locale=locale,
+    )
     return out
 
 
@@ -182,23 +168,6 @@ def _valid_skillhub_icon_url(value: str) -> bool:
     return valid_skillhub_icon_url(value)
 
 
-def _with_skillhub_presentation_metadata(
-    content: str,
-    *,
-    display_name: str,
-    icon_url: str,
-) -> str:
-    from octop.infra.skills.install import (  # noqa: PLC0415
-        with_skillhub_presentation_metadata,
-    )
-
-    return with_skillhub_presentation_metadata(
-        content,
-        display_name=display_name,
-        icon_url=icon_url,
-    )
-
-
 def _skill_manifest_path(name: str, kind: str, workspace: Any) -> str:
     root = _BUILTIN_ROOT if kind == "builtin" else _SKILLS_ROOT
     return f"{root}/{name}/SKILL.md"
@@ -476,6 +445,7 @@ async def validate_chat_skills(
 @router.get("/agents/{agent_id}/skills")
 async def list_skills(
     agent_id: str,
+    request: Request,
     as_user: int | None = None,
     user: Any = Depends(current_user),
     server: Any = Depends(get_server),
@@ -484,7 +454,10 @@ async def list_skills(
     assert server.app_runtime is not None
     return cast(
         list[dict[str, Any]],
-        await server.app_runtime.agent_registry.list_skill_summaries(agent_id),
+        await server.app_runtime.agent_registry.list_skill_summaries(
+            agent_id,
+            locale=resolve_request_locale(request),
+        ),
     )
 
 
@@ -498,6 +471,7 @@ class SkillPackageMountBody(BaseModel):
 )
 async def list_skill_package_mounts(
     agent_id: str,
+    request: Request,
     as_user: int | None = None,
     user: Any = Depends(current_user),
     server: Any = Depends(get_server),
@@ -510,6 +484,7 @@ async def list_skill_package_mounts(
         repo=server.services.skill_package_repo,
         root=server.paths.skill_packages_dir,
     )
+    locale = resolve_request_locale(request)
     packages: list[dict[str, Any]] = []
     for package_id in package_ids:
         package = store.repo.get(package_id)
@@ -520,7 +495,7 @@ async def list_skill_package_mounts(
                 "id": package.id,
                 "name": package.name,
                 "description": package.description,
-                "skills": store.list_skill_summaries(package_id),
+                "skills": store.list_skill_summaries(package_id, locale=locale),
             }
         )
     return {"package_ids": package_ids, "packages": packages}
@@ -548,6 +523,7 @@ async def replace_skill_package_mounts(
 async def get_skill(
     agent_id: str,
     name: str,
+    request: Request,
     as_user: int | None = None,
     user: Any = Depends(current_user),
     server: Any = Depends(get_server),
@@ -562,7 +538,13 @@ async def get_skill(
     meta, body = _parse_frontmatter(manifest)
     disabled = _disabled_set(ctx.config)
     return {
-        **_summary_dict(name, meta, enabled=name not in disabled, kind=kind),
+        **_summary_dict(
+            name,
+            meta,
+            enabled=name not in disabled,
+            kind=kind,
+            locale=resolve_request_locale(request),
+        ),
         "frontmatter": meta,
         "body": body,
         "raw": manifest,
@@ -957,28 +939,18 @@ async def disable_skill(
     await _persist_disabled(server, agent_id, disabled)
 
 
+class LocalizedSkillCopy(BaseModel):
+    zh: str | None = None
+    en: str | None = None
+
+
 class HubInstallBody(BaseModel):
     skill_name: str
     enable: bool = True
     display_name: str | None = None
     icon_url: str | None = None
-
-
-def _skillhub_uploads(
-    skill_name: str,
-    files: list[tuple[str, bytes]],
-    *,
-    display_name: str,
-    icon_url: str,
-) -> list[tuple[str, bytes]]:
-    from octop.infra.skills.install import prepare_skillhub_package  # noqa: PLC0415
-
-    return prepare_skillhub_package(
-        skill_name,
-        files,
-        display_name=display_name,
-        icon_url=icon_url,
-    ).workspace_uploads()
+    label: LocalizedSkillCopy | None = None
+    summary: LocalizedSkillCopy | None = None
 
 
 async def _download_skillhub_package_via_cli(
@@ -1232,8 +1204,22 @@ async def hub_install_skill(
         ) from None
     display_name = (body.display_name or "").strip()
     icon_url = (body.icon_url or "").strip()
+    label = (
+        {key: value.strip() for key, value in body.label.model_dump().items() if value}
+        if body.label
+        else {}
+    )
+    summary = (
+        {key: value.strip() for key, value in body.summary.model_dump().items() if value}
+        if body.summary
+        else {}
+    )
     if len(display_name) > 200:
         raise HTTPException(status_code=400, detail="display_name is too long")
+    if any(len(value) > 200 for value in label.values()):
+        raise HTTPException(status_code=400, detail="localized skill label is too long")
+    if any(len(value) > 1024 for value in summary.values()):
+        raise HTTPException(status_code=400, detail="localized skill summary is too long")
     if len(icon_url) > 2048 or (icon_url and not valid_skillhub_icon_url(icon_url)):
         raise HTTPException(status_code=400, detail="icon_url must be an HTTP(S) URL")
 
@@ -1272,6 +1258,8 @@ async def hub_install_skill(
             files=files,
             display_name=display_name,
             icon_url=icon_url,
+            label=label,
+            summary=summary,
             overwrite=True,
             enable=body.enable,
         )
diff --git a/src/octop/cli/commands/backup.py b/src/octop/cli/commands/backup.py
index 8503b9f5..f706bb85 100644
--- a/src/octop/cli/commands/backup.py
+++ b/src/octop/cli/commands/backup.py
@@ -2,12 +2,14 @@
 
 from __future__ import annotations
 
+import tempfile
 from pathlib import Path
 
 import click
 
 from octop.config import load_config
 from octop.infra.backup.auto import create_and_store_auto_backup
+from octop.infra.backup.store import place_backup_file
 from octop.infra.backup.system_archive import create_system_backup, restore_system_backup
 from octop.infra.db.factory import open_database
 from octop.infra.db.migrate import run_migrations
@@ -39,21 +41,29 @@ def create(output: Path | None, home: Path | None) -> None:
     run_migrations(db)
     services = build_shared_services(db=db, paths=paths, config=config)
     rows = services.agent_repo.list_all()
-    data, suggested = create_system_backup(
-        paths=paths,
-        agent_rows=rows,
-        pool=db,
-        db_config=config.database,
-    )
-    db.close()
+    try:
+        with tempfile.TemporaryDirectory() as tmp:
+            tmp_path = Path(tmp) / "backup.tar.gz"
+            suggested = create_system_backup(
+                paths=paths,
+                agent_rows=rows,
+                pool=db,
+                db_config=config.database,
+                dest=tmp_path,
+            )
+            if output is None:
+                entry = place_backup_file(paths, suggested, tmp_path)
+                dest = paths.backup_file(entry.name)
+                size = entry.size
+            else:
+                dest = output
+                dest.parent.mkdir(parents=True, exist_ok=True)
+                tmp_path.replace(dest)
+                size = dest.stat().st_size
+    finally:
+        db.close()
 
-    if output is None:
-        paths.ensure_backups_dir()
-        dest = paths.backup_file(suggested)
-    else:
-        dest = output
-    dest.write_bytes(data)
-    click.echo(f"wrote {dest} ({len(data)} bytes)")
+    click.echo(f"wrote {dest} ({size} bytes)")
 
 
 @backup.group("auto")
@@ -133,9 +143,8 @@ def restore(
     paths = _paths(home)
     config = load_config(paths.config)
     db = open_database(config, paths)
-    raw = archive.read_bytes()
     result = restore_system_backup(
-        raw,
+        archive,
         paths=paths,
         pool=db,
         db_config=config.database,
diff --git a/src/octop/cli/commands/init.py b/src/octop/cli/commands/init.py
index ea59ef89..78fdaeda 100644
--- a/src/octop/cli/commands/init.py
+++ b/src/octop/cli/commands/init.py
@@ -80,37 +80,40 @@ def init(
     apply_env_file(env_file_path(paths.root))
     config = load_config(paths.config)
     db = open_database(config, paths)
-    run_migrations(db)
+    try:
+        run_migrations(db)
 
-    username = admin_username
-    password = admin_password
-    display_name = admin_display_name
+        username = admin_username
+        password = admin_password
+        display_name = admin_display_name
 
-    if not non_interactive:
-        from octop.cli.support import prompts as _prompts
+        if not non_interactive:
+            from octop.cli.support import prompts as _prompts
 
-        if not username:
-            username = _prompts.text("Admin username:")
-        if not password:
-            password = _prompts.password("Admin password:")
-        if display_name is None:
-            display_name = _prompts.text("Display name (optional):", default="") or None
+            if not username:
+                username = _prompts.text("Admin username:")
+            if not password:
+                password = _prompts.password("Admin password:")
+            if display_name is None:
+                display_name = _prompts.text("Display name (optional):", default="") or None
 
-    if not username:
-        click.echo("error: admin username is required", err=True)
-        raise SystemExit(1)
-    try:
-        validate_password_policy(password or "")
-    except OctopError as exc:
-        click.echo(f"error: {exc.message}", err=True)
-        raise SystemExit(1) from None
+        if not username:
+            click.echo("error: admin username is required", err=True)
+            raise SystemExit(1)
+        try:
+            validate_password_policy(password or "")
+        except OctopError as exc:
+            click.echo(f"error: {exc.message}", err=True)
+            raise SystemExit(1) from None
 
-    UserRepo(db).create(
-        username=username,
-        password_hash=hash_password(password or ""),
-        role="admin",
-        display_name=display_name,
-    )
+        UserRepo(db).create(
+            username=username,
+            password_hash=hash_password(password or ""),
+            role="admin",
+            display_name=display_name,
+        )
+    finally:
+        db.close()
 
     click.echo(f"\u2705 Octop bootstrapped at {home}")
     click.echo(f"   admin user: {username}")
diff --git a/src/octop/cli/registry.py b/src/octop/cli/registry.py
index 41a40662..dd5828d1 100644
--- a/src/octop/cli/registry.py
+++ b/src/octop/cli/registry.py
@@ -26,6 +26,6 @@
     "update": (".commands.update", "update", "Check for and install a newer Octop release."),
     "clean": (".commands.clean", "clean", "Remove CLI state or wipe all of ~/.octop."),
     "backup": (".commands.backup", "backup", "Export and restore Octop backups."),
-    "acp": (".commands.acp", "acp", "Run Octop agent as ACP server (stdio)."),
+    "acp": (".commands.acp", "acp_cmd", "Run Octop agent as ACP server (stdio)."),
     "plugin": (".commands.plugin", "plugin", "Install and manage plugins."),
 }
diff --git a/src/octop/cli/support/embedded_ops.py b/src/octop/cli/support/embedded_ops.py
index 9d801864..394f3c32 100644
--- a/src/octop/cli/support/embedded_ops.py
+++ b/src/octop/cli/support/embedded_ops.py
@@ -67,13 +67,13 @@ def fetch_thread_history(agent_id: str, thread_id: str, *, limit: int = 50) -> A
 
 
 async def probe_provider_async(provider_id: int, *, model_id: str | None = None) -> dict[str, Any]:
-    from octop.cli.support.db import open_cli_services
+    from octop.cli.support.db import open_cli_services, resolve_cli_locale
 
     with open_cli_services() as svc:
         row = svc.provider_repo.get(provider_id)
         if row is None:
             raise OctopError(ErrorCode.NOT_FOUND, "provider not found")
-    return await probe_provider_row(row, model_id=model_id)
+    return await probe_provider_row(row, model_id=model_id, locale=resolve_cli_locale())
 
 
 def probe_provider(provider_id: int, *, model_id: str | None = None) -> dict[str, Any]:
diff --git a/src/octop/i18n/domains/stream.py b/src/octop/i18n/domains/stream.py
index 2d21d543..05d4bb6c 100644
--- a/src/octop/i18n/domains/stream.py
+++ b/src/octop/i18n/domains/stream.py
@@ -10,6 +10,7 @@
 STREAM_STALL = f"{_PREFIX}stream_errors.stream_stall"
 RATE_LIMIT = f"{_PREFIX}stream_errors.rate_limit"
 AUTH = f"{_PREFIX}stream_errors.auth"
+INSUFFICIENT_BALANCE = f"{_PREFIX}stream_errors.insufficient_balance"
 CONTEXT_LENGTH = f"{_PREFIX}stream_errors.context_length"
 RECURSION_LIMIT = f"{_PREFIX}stream_errors.recursion_limit"
 TIMEOUT_NETWORK = f"{_PREFIX}stream_errors.timeout_network"
@@ -19,6 +20,7 @@
 __all__ = [
     "AUTH",
     "CONTEXT_LENGTH",
+    "INSUFFICIENT_BALANCE",
     "MODEL_CALL_FAILED",
     "PROVIDER_UNAVAILABLE",
     "RATE_LIMIT",
@@ -64,14 +66,32 @@ def classify_stream_error_message(message: str) -> str | None:
 
     if (
         "error code: 429" in lower
+        or "http 429" in lower
         or "rate_limit" in lower
         or "ratelimiterror" in compact
         or "too many requests" in lower
     ):
         return RATE_LIMIT
 
+    if (
+        "error code: 402" in lower
+        or "http 402" in lower
+        or "insufficient balance" in lower
+        or "insufficient_quota" in lower
+        or "insufficient credits" in lower
+        or "exceeded your current quota" in lower
+        or "payment_required" in lower
+        or "billing_not_active" in lower
+        or "arrearage" in lower
+        or "余额不足" in msg
+        or "账户余额" in msg
+        or "欠费" in msg
+    ):
+        return INSUFFICIENT_BALANCE
+
     if (
         "error code: 401" in lower
+        or "http 401" in lower
         or "invalid_api_key" in lower
         or "incorrect api key" in lower
         or "authenticationerror" in compact
@@ -105,6 +125,9 @@ def classify_stream_error_message(message: str) -> str | None:
         or "error code: 500" in lower
         or "error code: 502" in lower
         or "error code: 503" in lower
+        or "http 500" in lower
+        or "http 502" in lower
+        or "http 503" in lower
     ):
         return PROVIDER_UNAVAILABLE
 
diff --git a/src/octop/i18n/domains/tools.py b/src/octop/i18n/domains/tools.py
index 56247208..b61bf7e7 100644
--- a/src/octop/i18n/domains/tools.py
+++ b/src/octop/i18n/domains/tools.py
@@ -16,6 +16,8 @@
         "unknown",
         "current_time",
         "write_todos",
+        # Its own HITL channel — approving an approval prompt makes no sense.
+        "ask_user_question",
         # Memory
         "memory_search",
         "memory_get",
diff --git a/src/octop/i18n/en.json b/src/octop/i18n/en.json
index e52d594d..6c7c12ea 100644
--- a/src/octop/i18n/en.json
+++ b/src/octop/i18n/en.json
@@ -71,6 +71,22 @@
       "pending_line": "`{pending_id}` — {count} tool(s)",
       "dashboard_hint": "Tool approval in chat uses the approval card in the dashboard, or `/approve` / `/reject` in IM channels."
     },
+    "ask": {
+      "card_title": "❓ I need you to decide",
+      "progress": "Question {current} of {total}",
+      "question_line": "**{index}. {question}**",
+      "question_line_headed": "**{index}. [{header}] {question}**",
+      "option_line": "   {opt}) {label}",
+      "option_line_desc": "   {opt}) {label} — {description}",
+      "multi_hint": "   (multiple allowed, e.g. `a,c`)",
+      "open_hint": "   (answer in a sentence)",
+      "card_footer": "Reply with a letter (e.g. `a`) or type your own answer.",
+      "card_pending_id": "Question ID: `{pending_id}` (valid for 30 minutes)",
+      "answer_ack": "Got it. Continuing…",
+      "answer_recorded": "✅ Recorded. Here is the next question.",
+      "not_owner": "Only the user who was asked can answer.",
+      "answered_prefix": "User answered: "
+    },
     "title": {
       "usage": "Usage: /title <text>",
       "done": "Title set: {title}"
@@ -280,13 +296,23 @@
       }
     }
   },
+  "connector": {
+    "oauth": {
+      "callback_auth_failed": "Authorization failed: {error}",
+      "callback_missing_params": "Missing authorization code or state.",
+      "callback_invalid_state": "Invalid or expired authorization state.",
+      "callback_token_exchange_failed": "Token exchange failed: {detail}",
+      "callback_save_failed": "Failed to save authorization: {detail}",
+      "callback_success": "Authorization complete. You may close this window."
+    }
+  },
   "errors": {
     "AUTH_FAILED": "Authentication failed.",
     "TOKEN_EXPIRED": "Session expired. Please sign in again.",
     "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_IN_PROGRESS": "A backup is already in progress. Try again shortly.",
+    "BACKUP_IN_PROGRESS": "A backup or restore is already in progress. Try again shortly.",
     "FORBIDDEN": "Permission denied.",
     "NOT_FOUND": "Not found.",
     "USER_DISABLED": "This account has been disabled.",
@@ -482,6 +508,7 @@
     "mobile_handoff_to_user": "Hand off to user (mobile)",
     "read_env_file": "Read env file",
     "write_env_file": "Write env file",
+    "ask_user_question": "Ask the user",
     "generate_image": "Generate image",
     "generate_video": "Generate video"
   },
@@ -551,6 +578,7 @@
     "stream_stall": "The model stopped sending content while the connection stayed open. Click Retry, or try again later with another model. If this happens often, check the provider status or ask an admin to review stream timeout settings.",
     "rate_limit": "The model provider rate-limited this request. Wait a moment and retry, or switch to another model.",
     "auth": "Model authentication failed. Check that the API key under Settings → Models is correct and still valid.",
+    "insufficient_balance": "The model provider rejected this request due to insufficient balance or quota. Top up or upgrade the plan for this API key, then try again.",
     "context_length": "This conversation is too long for the model's context window. Start a new chat, or shorten the history and try again.",
     "recursion_limit": "The agent hit its max iteration / recursion limit before finishing. Open Configuration and raise Max Iterations, then try again.",
     "timeout_network": "Connecting to the model timed out or the network failed. Check your network and retry. If you use a proxy or self-hosted endpoint, confirm it is reachable.",
diff --git a/src/octop/i18n/zh.json b/src/octop/i18n/zh.json
index b6861e94..7379fab7 100644
--- a/src/octop/i18n/zh.json
+++ b/src/octop/i18n/zh.json
@@ -71,6 +71,22 @@
       "pending_line": "`{pending_id}` — {count} 个工具",
       "dashboard_hint": "控制台聊天请使用审批卡片；IM 通道请使用 `/approve` 或 `/reject`。"
     },
+    "ask": {
+      "card_title": "❓ 有个地方需要你拍板",
+      "progress": "第 {current}/{total} 个问题",
+      "question_line": "**{index}. {question}**",
+      "question_line_headed": "**{index}. [{header}] {question}**",
+      "option_line": "   {opt}) {label}",
+      "option_line_desc": "   {opt}) {label} —— {description}",
+      "multi_hint": "   （可多选，如 `a,c`）",
+      "open_hint": "   （直接用一句话回答）",
+      "card_footer": "直接回复序号（如 `a`），或输入你自己的答案。",
+      "card_pending_id": "提问 ID：`{pending_id}`（30 分钟内有效）",
+      "answer_ack": "收到，继续处理…",
+      "answer_recorded": "✅ 已记录，下面是下一个问题。",
+      "not_owner": "仅被提问的用户可以回答。",
+      "answered_prefix": "用户回答："
+    },
     "title": {
       "usage": "用法：/title <标题>",
       "done": "标题已设置：{title}"
@@ -280,13 +296,23 @@
       }
     }
   },
+  "connector": {
+    "oauth": {
+      "callback_auth_failed": "授权失败：{error}",
+      "callback_missing_params": "缺少 code 或 state。",
+      "callback_invalid_state": "无效或过期的 state。",
+      "callback_token_exchange_failed": "Token 交换失败：{detail}",
+      "callback_save_failed": "保存授权失败：{detail}",
+      "callback_success": "授权完成，可关闭此窗口。"
+    }
+  },
   "errors": {
     "AUTH_FAILED": "认证失败。",
     "TOKEN_EXPIRED": "登录已过期，请重新登录。",
     "SETUP_REQUIRED": "需要完成初始设置。",
     "DATABASE_NOT_EMPTY": "目标数据库已有用户。请改用空库，或直接登录现有管理员账户。",
     "BACKUP_DRIVER_MISMATCH": "该备份与当前数据库引擎不一致（SQLite 与 PostgreSQL 不能互恢）。请将运行时切回备份所用引擎后再恢复，或在当前引擎上重新备份。暂不支持跨引擎恢复。",
-    "BACKUP_IN_PROGRESS": "已有备份任务正在进行，请稍后再试。",
+    "BACKUP_IN_PROGRESS": "已有备份或恢复任务正在进行，请稍后再试。",
     "FORBIDDEN": "没有权限。",
     "NOT_FOUND": "未找到。",
     "USER_DISABLED": "账号已禁用。",
@@ -482,6 +508,7 @@
     "mobile_handoff_to_user": "交给用户操作（手机）",
     "read_env_file": "读取环境变量",
     "write_env_file": "写入环境变量",
+    "ask_user_question": "向你提问",
     "generate_image": "生成图片",
     "generate_video": "生成视频"
   },
@@ -551,6 +578,7 @@
     "stream_stall": "模型响应中断：连接仍在，但长时间没有新内容。请点击「重试」，或稍后更换模型再试。若经常出现，请检查供应商状态，或联系管理员排查流式超时设置。",
     "rate_limit": "模型请求过于频繁，已被限流。请稍等片刻后重试，或切换其他模型。",
     "auth": "模型服务鉴权失败。请检查「设置 → 模型」中的 API Key 是否正确、是否过期。",
+    "insufficient_balance": "模型服务返回余额或额度不足。请为该 API Key 对应的账户充值或升级套餐后再试。",
     "context_length": "对话上下文过长，超出模型限制。请新开会话，或精简历史后再试。",
     "recursion_limit": "智能体已达到最大迭代次数（递归上限），任务尚未完成。请前往「运行配置」调高「最大迭代次数」后重试。",
     "timeout_network": "连接模型服务超时或网络异常。请检查网络后重试；若使用代理或自建服务，请确认其可达。",
diff --git a/src/octop/infra/agents/builtin_skills/skill-manager/SKILL.md b/src/octop/infra/agents/builtin_skills/skill-manager/SKILL.md
index 464eb057..e7d08393 100644
--- a/src/octop/infra/agents/builtin_skills/skill-manager/SKILL.md
+++ b/src/octop/infra/agents/builtin_skills/skill-manager/SKILL.md
@@ -1,6 +1,15 @@
 ---
 name: skill-manager
 description: 必须用于通过对话管理当前专家实例的 Skill，包括查找、检查、安装、导入、更新、编辑、列出、恢复或删除。支持 skillhub.cn/skills/... 页面 URL、SkillHub CLI、本地及上传文件、SKILL.md、ZIP/TAR、Git/GitHub 和普通下载 URL；也用于把 PDF、Markdown、文档、代码、图片等任意资料整理成新 Skill。Must use for conversational Skill management from files, URLs, Git repositories, archives, or SkillHub.
+metadata:
+  octop:
+    emoji: "🧩"
+    label:
+      zh: "技能管理"
+      en: "Skill Manager"
+    summary:
+      zh: "在当前实例中查找、安装、导入、更新或删除技能。"
+      en: "Find, install, import, update, or delete skills on this instance."
 ---
 
 # Skill Manager
diff --git a/src/octop/infra/agents/context_breakdown.py b/src/octop/infra/agents/context_breakdown.py
index 8679c2ba..f37844e2 100644
--- a/src/octop/infra/agents/context_breakdown.py
+++ b/src/octop/infra/agents/context_breakdown.py
@@ -1,10 +1,4 @@
-"""Context window usage — thin adapter over harness-agent snapshots.
-
-Prefers ``HarnessAgent.aget_context_usage`` when present. Stock occupancy is
-stored on ``AIMessage.additional_kwargs['context_usage']``; older stamps may
-omit ``source``, which must not be treated as empty. If the live getter
-drops those stamps, this module re-reads the same kwargs from history.
-"""
+"""Context window usage without checkpoint reads on dashboard requests."""
 
 from __future__ import annotations
 
@@ -126,35 +120,6 @@ def _additional_kwargs(msg: Any) -> dict[str, Any] | None:
     return _as_mapping(kwargs)
 
 
-def _breakdown_from_context_stamp(
-    payload: Any, *, max_tokens: int
-) -> ContextBreakdownResult | None:
-    """Rebuild the ring from ``additional_kwargs['context_usage']`` (stock snapshots)."""
-    mapped = _as_mapping(payload)
-    if not mapped:
-        return None
-    segs_raw = _as_mapping(mapped.get("segments")) or {}
-    segments = {key: _token_int(segs_raw.get(key)) for key in SEGMENT_KEYS}
-    used = (
-        _token_int(mapped.get("used_tokens"))
-        or _token_int(mapped.get("input_tokens"))
-        or sum(segments.values())
-    )
-    if used <= 0:
-        return None
-    cap = _token_int(mapped.get("max_tokens"))
-    if cap == 0:
-        cap = max_tokens if max_tokens > 0 else 128_000
-    if not any(segments.values()):
-        segments = dict.fromkeys(SEGMENT_KEYS, 0)
-        segments["conversation"] = min(used, cap)
-    return ContextBreakdownResult(
-        max_tokens=cap,
-        used_tokens=min(used, cap),
-        segments=segments,
-    )
-
-
 def usage_dict_from_message(msg: Any) -> dict[str, Any] | None:
     """Normalize LangChain token counts for history + the context ring.
 
@@ -224,39 +189,6 @@ def usage_dict_from_message(msg: Any) -> dict[str, Any] | None:
     return payload
 
 
-def _message_input_tokens(msg: Any) -> int:
-    usage = usage_dict_from_message(msg)
-    return int(usage["input_tokens"]) if usage else 0
-
-
-async def _load_checkpoint_messages(harness: Any, thread_id: str) -> list[Any]:
-    getter = getattr(harness, "aget_history", None)
-    if getter is None:
-        return []
-    try:
-        return list(await getter(thread_id, limit=40))
-    except Exception:
-        logger.debug(
-            "aget_history failed while recovering context usage thread=%s",
-            thread_id,
-            exc_info=True,
-        )
-        return []
-
-
-def _stamp_breakdown_from_messages(
-    messages: list[Any], *, max_tokens: int
-) -> ContextBreakdownResult | None:
-    for msg in reversed(messages):
-        kwargs = _additional_kwargs(msg)
-        if not kwargs:
-            continue
-        bd = _breakdown_from_context_stamp(kwargs.get("context_usage"), max_tokens=max_tokens)
-        if bd is not None:
-            return bd
-    return None
-
-
 async def compute_context_breakdown(
     registry: Any,
     *,
@@ -268,10 +200,12 @@ async def compute_context_breakdown(
     skills: list[str] | None = None,
     usage_repo: Any | None = None,
 ) -> ContextBreakdownResult:
-    """Return harness context usage, or a stream-token fallback.
+    """Return a non-blocking context snapshot or a token-ledger fallback.
 
     ``mcp_servers`` / ``skills`` are accepted for dashboard query compatibility
-    but unused — the harness snapshot already reflects the filtered request.
+    but unused — the live harness snapshot already reflects the filtered request.
+    This endpoint deliberately never falls back to checkpoint history: opening
+    the context popover must not decode a multi-gigabyte legacy checkpoint.
     """
     del mcp_servers, skills
     row = registry.get_row(agent_id)
@@ -285,15 +219,14 @@ async def compute_context_breakdown(
         logger.debug("no live harness for context usage agent=%s", agent_id, exc_info=True)
 
     usage: Any = None
-    getter = getattr(harness, "aget_context_usage", None) if harness is not None else None
-    if getter is not None:
+    middleware = getattr(harness, "_context_usage_mw", None) if harness is not None else None
+    snapshot_getter = getattr(middleware, "get_snapshot", None)
+    if callable(snapshot_getter):
         try:
-            # The harness snapshot owns the exact routed model capacity. Passing
-            # the dashboard fallback here would overwrite it after model switches.
-            usage = await getter(thread_id)
+            usage = snapshot_getter(thread_id)
         except Exception:
             logger.debug(
-                "harness aget_context_usage failed for thread=%s",
+                "live context snapshot failed for thread=%s",
                 thread_id,
                 exc_info=True,
             )
@@ -302,18 +235,6 @@ async def compute_context_breakdown(
     if _usage_has_segments(usage):
         return _usage_to_breakdown(usage, fallback_max_tokens=max_tokens)
 
-    messages: list[Any] = []
-    if harness is not None:
-        messages = await _load_checkpoint_messages(harness, thread_id)
-        stamped = _stamp_breakdown_from_messages(messages, max_tokens=max_tokens)
-        if stamped is not None:
-            return stamped
-
-    recovered = 0
-    for msg in reversed(messages):
-        recovered = _message_input_tokens(msg)
-        if recovered:
-            break
     logged = 0
     if usage_repo is not None:
         last_fn = getattr(usage_repo, "last_thread_input_tokens", None)
@@ -326,7 +247,7 @@ async def compute_context_breakdown(
                     thread_id,
                     exc_info=True,
                 )
-    fallback = recovered or logged or _token_int(input_tokens)
+    fallback = logged or _token_int(input_tokens)
     if fallback:
         return _from_stream_input_tokens(fallback, max_tokens=max_tokens)
 
diff --git a/src/octop/infra/agents/manager.py b/src/octop/infra/agents/manager.py
index 449a3c71..6d076d71 100644
--- a/src/octop/infra/agents/manager.py
+++ b/src/octop/infra/agents/manager.py
@@ -8,6 +8,7 @@
 import re
 import shutil
 from collections.abc import AsyncIterator, Callable, Sequence
+from contextlib import asynccontextmanager
 from dataclasses import dataclass, field, fields, replace
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, cast
@@ -57,8 +58,10 @@
 from octop.infra.connectors.service import ConnectorService
 from octop.infra.db.repos.audit import ACTOR_SYSTEM
 from octop.infra.errors import ErrorCode, OctopError
+from octop.infra.skills.presentation import apply_skill_presentation, localize_skill_summary
 from octop.infra.skills.skill_package_store import SkillPackageStore
 from octop.infra.skills.workspace_catalog import list_workspace_skill_summaries
+from octop.infra.utils.locale import Locale
 from octop.infra.utils.ulid import new_short_id
 
 if TYPE_CHECKING:
@@ -333,6 +336,9 @@ def __init__(
         self._team_processor: Any | None = None
         self._harness_manager: HarnessAgentManager | None = None
         self._lock = asyncio.Lock()
+        self._active_invocations: dict[str, int] = {}
+        self._invocation_waiters: dict[str, int] = {}
+        self._history_backfills: dict[str, asyncio.Event] = {}
         self._reload_dirty: set[str] = set()
         self._reload_worker_running: dict[str, bool] = {}
         self._bootstrap_graph_refresh_pending: set[str] = set()
@@ -872,25 +878,76 @@ async def delete_thread_checkpoint(self, agent_id: str, thread_id: str) -> bool:
     # Chat / invoke — stream, call, HITL, thread model overrides
     # ------------------------------------------------------------------
 
+    def is_agent_active(self, agent_id: str) -> bool:
+        """Whether the agent is currently executing a user-visible invocation."""
+        return self._active_invocations.get(agent_id, 0) > 0
+
+    def try_begin_history_backfill(self, agent_id: str) -> bool:
+        """Reserve an idle agent for one history backfill without racing a new turn."""
+        if (
+            self.is_agent_active(agent_id)
+            or self._invocation_waiters.get(agent_id, 0) > 0
+            or agent_id in self._history_backfills
+        ):
+            return False
+        self._history_backfills[agent_id] = asyncio.Event()
+        return True
+
+    def end_history_backfill(self, agent_id: str) -> None:
+        """Release one history-backfill reservation and wake waiting invocations."""
+        event = self._history_backfills.pop(agent_id, None)
+        if event is not None:
+            event.set()
+
+    async def _begin_invocation(self, agent_id: str) -> None:
+        self._invocation_waiters[agent_id] = self._invocation_waiters.get(agent_id, 0) + 1
+        try:
+            while event := self._history_backfills.get(agent_id):
+                await event.wait()
+        finally:
+            waiting = self._invocation_waiters.get(agent_id, 1) - 1
+            if waiting > 0:
+                self._invocation_waiters[agent_id] = waiting
+            else:
+                self._invocation_waiters.pop(agent_id, None)
+        self._active_invocations[agent_id] = self._active_invocations.get(agent_id, 0) + 1
+
+    def _end_invocation(self, agent_id: str) -> None:
+        active = self._active_invocations.get(agent_id, 1) - 1
+        if active > 0:
+            self._active_invocations[agent_id] = active
+        else:
+            self._active_invocations.pop(agent_id, None)
+
+    @asynccontextmanager
+    async def _track_invocation(self, agent_id: str) -> AsyncIterator[None]:
+        await self._begin_invocation(agent_id)
+        try:
+            yield
+        finally:
+            self._end_invocation(agent_id)
+
     async def stream(self, agent_id: str, request: dict[str, Any]) -> AsyncIterator[Any]:
         """Stream harness chunks (Langfuse tracing handled inside harness-agent)."""
         if self._harness_manager is None:
             raise self._unavailable_error(agent_id)
 
-        self._apply_pending_bootstrap_graph_refresh(agent_id)
-        req = self._prepare_stream_request(agent_id, request)
-        async for chunk in self._harness_manager.stream(agent_id, cast(Any, req)):
-            yield chunk
-        self._apply_pending_bootstrap_graph_refresh(agent_id)
+        async with self._track_invocation(agent_id):
+            self._apply_pending_bootstrap_graph_refresh(agent_id)
+            req = self._prepare_stream_request(agent_id, request)
+            async for chunk in self._harness_manager.stream(agent_id, cast(Any, req)):
+                yield chunk
+            self._apply_pending_bootstrap_graph_refresh(agent_id)
 
     async def call(self, agent_id: str, request: dict[str, Any]) -> dict[str, Any]:
         """Non-streaming harness invocation (one-shot agent call)."""
         if self._harness_manager is None:
             raise self._unavailable_error(agent_id)
-        self._apply_pending_bootstrap_graph_refresh(agent_id)
-        req = self._prepare_stream_request(agent_id, request)
-        result = await self._harness_manager.call(agent_id, cast(Any, req))
-        self._apply_pending_bootstrap_graph_refresh(agent_id)
+        async with self._track_invocation(agent_id):
+            self._apply_pending_bootstrap_graph_refresh(agent_id)
+            req = self._prepare_stream_request(agent_id, request)
+            result = await self._harness_manager.call(agent_id, cast(Any, req))
+            self._apply_pending_bootstrap_graph_refresh(agent_id)
         if not isinstance(result, dict):
             return {"result": result}
         return result
@@ -904,10 +961,11 @@ async def resume_hitl(
         """Resume a paused HITL interrupt for *thread_id*."""
         if self._harness_manager is None:
             raise self._unavailable_error(agent_id)
-        self._apply_pending_bootstrap_graph_refresh(agent_id)
-        async for chunk in self._harness_manager.resume_hitl(agent_id, thread_id, decisions):
-            yield chunk
-        self._apply_pending_bootstrap_graph_refresh(agent_id)
+        async with self._track_invocation(agent_id):
+            self._apply_pending_bootstrap_graph_refresh(agent_id)
+            async for chunk in self._harness_manager.resume_hitl(agent_id, thread_id, decisions):
+                yield chunk
+            self._apply_pending_bootstrap_graph_refresh(agent_id)
 
     def cancel_stream(self, agent_id: str, thread_id: str) -> None:
         """Signal harness-agent to stop the active stream for *(agent_id, thread_id)*."""
@@ -1679,7 +1737,12 @@ def resolve_context_max_tokens(self, agent_id: str, *, fallback: int = 128_000)
         """Return the configured context cap for *agent_id* (``max_input_length``)."""
         return config_context_max_tokens(self.get_config(agent_id), fallback=fallback)
 
-    async def list_skill_summaries(self, agent_id: str) -> list[dict[str, Any]]:
+    async def list_skill_summaries(
+        self,
+        agent_id: str,
+        *,
+        locale: Locale | None = None,
+    ) -> list[dict[str, Any]]:
         """Installed skills for *agent_id* (harness catalog + package ``kind`` labels).
 
         Harness lists builtin / workspace / ``skills_dir`` entries (all non-builtin as
@@ -1706,8 +1769,28 @@ async def list_skill_summaries(self, agent_id: str) -> list[dict[str, Any]]:
                     skills_disabled=skills_disabled_set(cfg),
                 )
             )
+        from harness_agent.skills import catalog as harness_skill_catalog  # noqa: PLC0415
+
+        if getattr(harness_skill_catalog, "SKILL_PRESENTATION_METADATA_VERSION", 0) < 1:
+            workspace = getattr(agent, "workspace", None)
+            aread = getattr(workspace, "aread_text", None)
+            if callable(aread):
+                for index, row in enumerate(harness_rows):
+                    if row.get("label") or row.get("display_name"):
+                        continue
+                    slug = str(row.get("slug") or "").strip()
+                    if not slug:
+                        continue
+                    root = "_builtin_skills" if row.get("kind") == "builtin" else "skills"
+                    manifest = await aread(f"{root}/{slug}/SKILL.md")
+                    if manifest is None:
+                        continue
+                    meta, _body = parse_frontmatter(manifest)
+                    harness_rows[index] = apply_skill_presentation(row, meta)
         package_ids = skill_package_ids_list(cfg)
         if not package_ids:
+            if locale is not None:
+                return [localize_skill_summary(row, locale) for row in harness_rows]
             return harness_rows
 
         disabled = skills_disabled_set(cfg)
@@ -1754,13 +1837,16 @@ async def list_skill_summaries(self, agent_id: str) -> list[dict[str, Any]]:
             merged[slug] = package_row
 
         kind_order = {"builtin": 0, "package": 1, "workspace": 2}
-        return sorted(
+        rows = sorted(
             merged.values(),
             key=lambda row: (
                 kind_order.get(str(row.get("kind")), 99),
                 str(row.get("slug", "")),
             ),
         )
+        if locale is not None:
+            return [localize_skill_summary(row, locale) for row in rows]
+        return rows
 
     async def list_subagent_summaries(self, agent_id: str) -> list[dict[str, Any]]:
         """Installed subagents for *agent_id* (delegates to harness-agent catalog)."""
diff --git a/src/octop/infra/agents/providers/presets.py b/src/octop/infra/agents/providers/presets.py
index c707662c..039bf3a6 100644
--- a/src/octop/infra/agents/providers/presets.py
+++ b/src/octop/infra/agents/providers/presets.py
@@ -71,7 +71,12 @@ def _reasoning_profile(provider_id: str, model_id: str) -> dict[str, Any] | None
             return {
                 "supported": True,
                 "adapter": "thinking_nested_effort"
-                if provider in {"tencent-token-plan", "tencent-coding-plan"}
+                if provider
+                in {
+                    "tencent-token-plan",
+                    "tencent-token-plan-enterprise-cn",
+                    "tencent-coding-plan",
+                }
                 else "thinking",
                 "toggle": True,
                 "default_mode": "enabled",
@@ -85,6 +90,13 @@ def _reasoning_profile(provider_id: str, model_id: str) -> dict[str, Any] | None
                 "toggle": True,
                 "default_mode": "enabled",
             }
+        if provider == "tencent-hy-token-plan" and model.startswith("hy3"):
+            return {
+                "supported": True,
+                "adapter": "status_only",
+                "toggle": False,
+                "default_mode": "enabled",
+            }
 
     if provider == "deepseek":
         if model == "deepseek-reasoner":
diff --git a/src/octop/infra/agents/providers/probe.py b/src/octop/infra/agents/providers/probe.py
index cd4b554d..0d8fae1c 100644
--- a/src/octop/infra/agents/providers/probe.py
+++ b/src/octop/infra/agents/providers/probe.py
@@ -149,7 +149,16 @@ def _embeddings_url(base_url: str | None) -> str:
     return f"{root}/embeddings"
 
 
-async def _probe_embedding_endpoint(row: Any, *, model_id: str) -> dict[str, Any]:
+def _friendly_probe_error(exc: BaseException | str, *, locale: str) -> str:
+    """Map raw provider exceptions / HTTP bodies to localized guidance when known."""
+    from octop.i18n.domains.stream import stream_error_message
+
+    return stream_error_message(str(exc), locale)
+
+
+async def _probe_embedding_endpoint(
+    row: Any, *, model_id: str, locale: str = "en"
+) -> dict[str, Any]:
     """POST OpenAI-compatible ``{base}/embeddings`` and time the round-trip."""
     started = time.perf_counter()
     url = _embeddings_url(getattr(row, "base_url", None))
@@ -166,7 +175,7 @@ async def _probe_embedding_endpoint(row: Any, *, model_id: str) -> dict[str, Any
             )
     except Exception as exc:
         logger.info("embedding probe failed for %s: %s", getattr(row, "name", "?"), exc)
-        return {"ok": False, "error": str(exc)}
+        return {"ok": False, "error": _friendly_probe_error(exc, locale=locale)}
 
     if response.status_code >= 400:
         detail = response.text.strip()
@@ -175,7 +184,7 @@ async def _probe_embedding_endpoint(row: Any, *, model_id: str) -> dict[str, Any
         error = f"HTTP {response.status_code} POST {url}"
         if detail:
             error = f"{error}: {detail}"
-        return {"ok": False, "error": error}
+        return {"ok": False, "error": _friendly_probe_error(error, locale=locale)}
 
     try:
         payload = response.json()
@@ -198,7 +207,11 @@ async def _probe_embedding_endpoint(row: Any, *, model_id: str) -> dict[str, Any
 
 
 async def probe_provider_row(
-    row: Any, *, model_id: str | None = None, embedding: bool | None = None
+    row: Any,
+    *,
+    model_id: str | None = None,
+    embedding: bool | None = None,
+    locale: str = "en",
 ) -> dict[str, Any]:
     """Probe a provider: chat models get a one-token ping; embedding models POST /embeddings."""
     from octop.infra.agents.providers.model_flags import is_onnx_local_provider
@@ -213,18 +226,20 @@ async def probe_provider_row(
         result = await probe_local_model(_onnx_probe_model_id(row, model_id))
         if result.get("latency_ms") is not None:
             result["latency_ms"] = int(result["latency_ms"])
+        if not result.get("ok") and result.get("error"):
+            result["error"] = _friendly_probe_error(str(result["error"]), locale=locale)
         return result
 
     mid = _probe_model_id(row, model_id)
     if _should_probe_embedding(row, model_id=mid, embedding=embedding):
-        return await _probe_embedding_endpoint(row, model_id=mid)
+        return await _probe_embedding_endpoint(row, model_id=mid, locale=locale)
     started = time.perf_counter()
     try:
         chat = build_probe_chat_model(row, model_id=mid)
         result = await asyncio.wait_for(chat.ainvoke("ping"), timeout=30.0)
     except Exception as exc:
         logger.info("provider probe failed for %s: %s", getattr(row, "name", "?"), exc)
-        return {"ok": False, "error": str(exc)}
+        return {"ok": False, "error": _friendly_probe_error(exc, locale=locale)}
     latency_ms = int((time.perf_counter() - started) * 1000)
     _ = getattr(result, "content", None)
     return {"ok": True, "latency_ms": latency_ms}
@@ -240,6 +255,7 @@ async def fetch_openai_compatible_models(
     base_url: str | None,
     api_key: str,
     extra_headers: dict[str, str] | None = None,
+    locale: str = "en",
 ) -> dict[str, Any]:
     """List models via OpenAI-compatible ``GET {base}/models``."""
     url = _models_list_url(base_url)
@@ -251,7 +267,7 @@ async def fetch_openai_compatible_models(
             response = await client.get(url, headers=headers)
     except Exception as exc:
         logger.info("provider fetch-models failed for %s: %s", url, exc)
-        return {"ok": False, "error": str(exc)}
+        return {"ok": False, "error": _friendly_probe_error(exc, locale=locale)}
 
     if response.status_code >= 400:
         detail = response.text.strip()
@@ -260,7 +276,7 @@ async def fetch_openai_compatible_models(
         error = f"HTTP {response.status_code}"
         if detail:
             error = f"{error}: {detail}"
-        return {"ok": False, "error": error}
+        return {"ok": False, "error": _friendly_probe_error(error, locale=locale)}
 
     try:
         payload = response.json()
diff --git a/src/octop/infra/agents/providers/reasoning.py b/src/octop/infra/agents/providers/reasoning.py
index 3cb84616..1a26deef 100644
--- a/src/octop/infra/agents/providers/reasoning.py
+++ b/src/octop/infra/agents/providers/reasoning.py
@@ -45,7 +45,9 @@ def _legacy_adapter(model_id: str, *, base_url: str | None) -> str:
         return "openrouter"
     if "dashscope" in url or "maas.aliyuncs.com" in url:
         return "dashscope"
-    if model_id.startswith("deepseek-v4-") and "lkeap.cloud.tencent.com" in url:
+    if model_id.startswith("deepseek-v4-") and any(
+        host in url for host in ("lkeap.cloud.tencent.com", "tencentmaas.com")
+    ):
         return "thinking_nested_effort"
     if any(host in url for host in ("deepseek.com", "bigmodel.cn", "z.ai", "moonshot")):
         return "thinking"
@@ -92,7 +94,10 @@ def reasoning_capability(
                 {
                     "efforts": ["high", "max"],
                     "adapter": "thinking_nested_effort"
-                    if "lkeap.cloud.tencent.com" in (base_url or "").lower()
+                    if any(
+                        host in (base_url or "").lower()
+                        for host in ("lkeap.cloud.tencent.com", "tencentmaas.com")
+                    )
                     else "thinking",
                 }
             )
diff --git a/src/octop/infra/agents/thread_fork.py b/src/octop/infra/agents/thread_fork.py
index 3a5ec4f2..61a60f19 100644
--- a/src/octop/infra/agents/thread_fork.py
+++ b/src/octop/infra/agents/thread_fork.py
@@ -187,6 +187,7 @@ async def fork_dashboard_thread(
     content: str | None = None,
     assistant_turns_from_end: int | None = None,
     locale: str = "en",
+    thread_message_repo: Any | None = None,
 ) -> dict[str, Any]:
     """Create a dashboard thread seeded through the selected assistant reply."""
     messages = await load_checkpoint_messages(harness, source.thread_id)
@@ -198,6 +199,17 @@ async def fork_dashboard_thread(
     )
     # Include the selected assistant message (and any tool traffic before it).
     prefix = messages[: idx + 1]
+    prefix_projection_inputs: list[Any] | None = None
+    if thread_message_repo is not None:
+        from octop.infra.gateway.process.history_projection import (  # noqa: PLC0415
+            message_inputs,
+        )
+
+        projection_inputs = message_inputs(messages)
+        prefix_projection_inputs = message_inputs(prefix)
+        # A fork already paid the explicit full-history read cost. Reuse it to
+        # heal an empty read model instead of decoding the source again later.
+        thread_message_repo.append_if_ready(source.thread_id, projection_inputs)
 
     session_key = ThreadRegistry.dashboard_key(agent_id=source.agent_id, user_id=user_id)
     dest_id = thread_registry.create_thread(
@@ -210,6 +222,9 @@ async def fork_dashboard_thread(
     )
     try:
         await write_checkpoint_messages(harness, thread_id=dest_id, messages=prefix)
+        if thread_message_repo is not None:
+            assert prefix_projection_inputs is not None
+            thread_message_repo.append_if_ready(dest_id, prefix_projection_inputs)
     except Exception:
         thread_registry.delete_thread(dest_id)
         raise
diff --git a/src/octop/infra/agents/tool_catalog.py b/src/octop/infra/agents/tool_catalog.py
index 75c71d55..9a9bd7ab 100644
--- a/src/octop/infra/agents/tool_catalog.py
+++ b/src/octop/infra/agents/tool_catalog.py
@@ -68,6 +68,7 @@ class BuiltinToolEntry:
     BuiltinToolEntry("send_file_to_user", "misc"),
     BuiltinToolEntry("read_env_file", "misc"),
     BuiltinToolEntry("write_env_file", "misc"),
+    BuiltinToolEntry("ask_user_question", "interaction"),
     BuiltinToolEntry("tavily_search", "web"),
     BuiltinToolEntry("brave_search", "web"),
     BuiltinToolEntry("google_search", "web"),
diff --git a/src/octop/infra/backup/auto.py b/src/octop/infra/backup/auto.py
index 6bb8c998..2f4c2aff 100644
--- a/src/octop/infra/backup/auto.py
+++ b/src/octop/infra/backup/auto.py
@@ -5,16 +5,19 @@
 import asyncio
 import json
 import logging
+import tempfile
+from collections.abc import AsyncIterator
+from contextlib import asynccontextmanager
 from dataclasses import replace
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, cast
+from typing import TYPE_CHECKING, Any, Literal, cast
 
 from octop.config import BackupConfig, OctopConfig, load_config
 from octop.infra.backup.store import (
     BackupFileInfo,
     is_auto_backup_filename,
+    place_backup_file,
     prune_auto_backups,
-    write_backup_file,
 )
 from octop.infra.backup.system_archive import create_system_backup
 from octop.infra.cron.trigger import build_trigger
@@ -34,12 +37,47 @@
 _AUTO_FILENAME_PREFIX = "octop-auto-backup-"
 _MANUAL_FILENAME_PREFIX = "octop-backup-"
 
+BackupOperation = Literal["create", "restore", "auto", "export"]
+
 _lock = asyncio.Lock()
+_active_operation: BackupOperation | None = None
 
 # Shared with manual create so concurrent backups do not overlap.
 BACKUP_LOCK = _lock
 
 
+def get_backup_operation() -> BackupOperation | None:
+    """Return the in-flight backup/restore kind, or ``None`` when idle."""
+    if not _lock.locked():
+        return None
+    return _active_operation
+
+
+def backup_status_payload() -> dict[str, Any]:
+    op = get_backup_operation()
+    return {"busy": op is not None, "operation": op}
+
+
+@asynccontextmanager
+async def hold_backup_lock(operation: BackupOperation) -> AsyncIterator[None]:
+    """Acquire ``BACKUP_LOCK`` and publish *operation* for status polling."""
+    global _active_operation
+    async with _lock:
+        _active_operation = operation
+        try:
+            yield
+        finally:
+            _active_operation = None
+
+
+def raise_if_backup_busy() -> None:
+    if _lock.locked():
+        raise OctopError(
+            ErrorCode.BACKUP_IN_PROGRESS,
+            "a backup or restore is already in progress",
+        )
+
+
 def to_auto_backup_filename(suggested: str) -> str:
     """Map ``octop-backup-*.tar.gz`` → ``octop-auto-backup-*.tar.gz``."""
     name = Path(suggested).name
@@ -105,14 +143,17 @@ def create_and_store_auto_backup(
     retention_count: int,
 ) -> tuple[BackupFileInfo, list[str]]:
     """Create a full system backup with the auto filename prefix and prune."""
-    data, suggested = create_system_backup(
-        paths=paths,
-        agent_rows=agent_rows,
-        pool=pool,
-        db_config=db_config,
-    )
-    filename = to_auto_backup_filename(suggested)
-    entry = write_backup_file(paths, filename, data)
+    with tempfile.TemporaryDirectory() as tmp:
+        tmp_path = Path(tmp) / "backup.tar.gz"
+        suggested = create_system_backup(
+            paths=paths,
+            agent_rows=agent_rows,
+            pool=pool,
+            db_config=db_config,
+            dest=tmp_path,
+        )
+        filename = to_auto_backup_filename(suggested)
+        entry = place_backup_file(paths, filename, tmp_path)
     deleted = prune_auto_backups(paths, keep=retention_count)
     return entry, deleted
 
@@ -123,7 +164,7 @@ async def run_auto_backup(server: OctopServer) -> BackupFileInfo | None:
         logger.info("auto backup skipped: another backup is already running")
         return None
 
-    async with _lock:
+    async with hold_backup_lock("auto"):
         config = load_config(server.paths.config)
         if server.services is None:
             logger.warning("auto backup skipped: server services not ready")
diff --git a/src/octop/infra/backup/store.py b/src/octop/infra/backup/store.py
index aa9260c8..21f4e5a6 100644
--- a/src/octop/infra/backup/store.py
+++ b/src/octop/infra/backup/store.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import re
+import shutil
 from dataclasses import dataclass
 from datetime import UTC, datetime
 from pathlib import Path
@@ -74,49 +75,66 @@ def list_backup_files(paths: PathLayout) -> list[BackupFileInfo]:
             continue
         if not any(path.name.endswith(suffix) for suffix in _BACKUP_SUFFIXES):
             continue
-        stat = path.stat()
-        modified = _iso_utc_from_timestamp(stat.st_mtime)
-        created = resolve_backup_created_at(path.name, path, mtime=stat.st_mtime)
-        out.append(
-            BackupFileInfo(
-                name=path.name,
-                size=stat.st_size,
-                modified_at=modified,
-                created_at=created,
-            )
-        )
+        out.append(backup_file_info(path))
     return out
 
 
-def write_backup_file(paths: PathLayout, filename: str, data: bytes) -> BackupFileInfo:
-    paths.ensure_backups_dir()
-    safe = normalize_backup_filename(filename)
-    dest = paths.backup_file(safe)
-    dest.write_bytes(data)
-    stat = dest.stat()
+def backup_file_info(path: Path) -> BackupFileInfo:
+    """Build ``BackupFileInfo`` from an existing archive path."""
+    path = Path(path)
+    if not path.is_file():
+        raise OctopError(ErrorCode.NOT_FOUND, f"backup not found: {path.name}")
+    stat = path.stat()
     modified = _iso_utc_from_timestamp(stat.st_mtime)
-    created = resolve_backup_created_at(safe, dest, mtime=stat.st_mtime)
+    created = resolve_backup_created_at(path.name, path, mtime=stat.st_mtime)
     return BackupFileInfo(
-        name=safe,
+        name=path.name,
         size=stat.st_size,
         modified_at=modified,
         created_at=created,
     )
 
 
-def read_backup_file(paths: PathLayout, filename: str) -> bytes:
+def write_backup_file(paths: PathLayout, filename: str, data: bytes) -> BackupFileInfo:
+    paths.ensure_backups_dir()
     safe = normalize_backup_filename(filename)
-    path = paths.backup_file(safe)
-    if not path.is_file():
-        raise OctopError(ErrorCode.NOT_FOUND, f"backup not found: {safe}")
-    return path.read_bytes()
+    dest = paths.backup_file(safe)
+    dest.write_bytes(data)
+    return backup_file_info(dest)
 
 
-def delete_backup_file(paths: PathLayout, filename: str) -> None:
+def place_backup_file(paths: PathLayout, filename: str, src: Path) -> BackupFileInfo:
+    """Move *src* into ``backups_dir`` under *filename* (atomic replace when possible)."""
+    paths.ensure_backups_dir()
+    safe = normalize_backup_filename(filename)
+    dest = paths.backup_file(safe)
+    src = Path(src)
+    if src.resolve() == dest.resolve():
+        return backup_file_info(dest)
+    dest.parent.mkdir(parents=True, exist_ok=True)
+    try:
+        src.replace(dest)
+    except OSError:
+        shutil.copy2(src, dest)
+        src.unlink(missing_ok=True)
+    return backup_file_info(dest)
+
+
+def resolve_backup_path(paths: PathLayout, filename: str) -> Path:
+    """Return the on-disk path for a stored backup (must exist)."""
     safe = normalize_backup_filename(filename)
     path = paths.backup_file(safe)
     if not path.is_file():
         raise OctopError(ErrorCode.NOT_FOUND, f"backup not found: {safe}")
+    return path
+
+
+def read_backup_file(paths: PathLayout, filename: str) -> bytes:
+    return resolve_backup_path(paths, filename).read_bytes()
+
+
+def delete_backup_file(paths: PathLayout, filename: str) -> None:
+    path = resolve_backup_path(paths, filename)
     path.unlink()
 
 
diff --git a/src/octop/infra/backup/system_archive.py b/src/octop/infra/backup/system_archive.py
index 8e45ef2b..53a87904 100644
--- a/src/octop/infra/backup/system_archive.py
+++ b/src/octop/infra/backup/system_archive.py
@@ -45,47 +45,65 @@
 _PG_DUMP_ARC = f"{_DB_DIR}/octop.dump"
 _MIGRATION_VERSION_SUFFIX = "-migrated-from-lightclaw"
 
+# Align with workspace zip export; keep backups smaller / faster.
+_SKIP_DIR_NAMES = frozenset(
+    {
+        ".git",
+        "__pycache__",
+        ".venv",
+        "venv",
+        "node_modules",
+        ".mypy_cache",
+        ".pytest_cache",
+        ".ruff_cache",
+        ".tox",
+        ".next",
+        ".turbo",
+        "dist",
+        "build",
+    }
+)
+
 
 def _timestamp() -> str:
     return datetime.now(UTC).strftime("%Y%m%dT%H%M%SZ")
 
 
+def suggested_backup_filename() -> str:
+    """Canonical basename for a newly created manual backup archive."""
+    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 _add_dir(tf: tarfile.TarFile, src: Path, arc_root: 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).as_posix()
-        tf.add(path, arcname=f"{arc_root}/{rel}")
+        rel = path.relative_to(src)
+        if _should_skip_path(rel):
+            continue
+        tf.add(path, arcname=f"{arc_root}/{rel.as_posix()}")
 
 
-def create_system_backup(
+def _build_manifest(
     *,
     paths: PathLayout,
     agent_rows: list[Any],
     pool: DatabasePool,
-    db_config: DatabaseConfig,
-) -> tuple[bytes, str]:
-    """Build a ``.tar.gz`` archive and return ``(bytes, suggested_filename)``."""
+    db_arc: str,
+    database_driver: str,
+    database_dump_format: str,
+    env_path: Path,
+) -> BackupManifest:
     try:
         schema_version = _current_version(pool)
     except Exception:
         schema_version = 0
-
-    if pool.dialect == "postgresql":
-        db_arc = _PG_DUMP_ARC
-        database_driver = "postgresql"
-        database_dump_format = "pg_custom"
-    else:
-        db_arc = _SQLITE_DB_ARC
-        database_driver = "sqlite"
-        database_dump_format = "sqlite_file"
-        if not isinstance(pool, SqlitePool):
-            raise OctopError(ErrorCode.INTERNAL_ERROR, "sqlite backup requires SqlitePool")
-        if not pool.path.is_file():
-            raise OctopError(ErrorCode.NOT_FOUND, f"database not found: {pool.path}")
-
     agents = [
         AgentBackupEntry(
             agent_id=str(row.agent_id),
@@ -94,8 +112,7 @@ def create_system_backup(
         )
         for row in agent_rows
     ]
-    env_path = env_file_path(paths.root)
-    manifest = BackupManifest(
+    return BackupManifest(
         manifest_version=MANIFEST_VERSION,
         octop_version=__version__,
         schema_version=schema_version,
@@ -109,57 +126,106 @@ def create_system_backup(
         includes_env=env_path.is_file(),
     )
 
-    buf = io.BytesIO()
-    with tempfile.TemporaryDirectory() as tmp:
-        root = Path(tmp)
-        db_dest = root / db_arc
-        if pool.dialect == "postgresql":
-            dump_postgres(db_config.postgresql_conninfo(), db_dest)
-        else:
-            assert isinstance(pool, SqlitePool)
-            snapshot_sqlite_file(pool.path, db_dest)
-
-        manifest_path = root / _MANIFEST_NAME
-        manifest_path.write_text(manifest.to_json(), encoding="utf-8")
-
-        if 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():
-            cfg_dir = root / _CONFIG_DIR
-            cfg_dir.mkdir(parents=True, exist_ok=True)
-            shutil.copy2(env_path, cfg_dir / "env")
-
-        with tarfile.open(fileobj=buf, mode="w:gz") as tf:
-            tf.add(manifest_path, arcname=_MANIFEST_NAME)
-            tf.add(db_dest, arcname=db_arc)
+
+def create_system_backup(
+    *,
+    paths: PathLayout,
+    agent_rows: list[Any],
+    pool: DatabasePool,
+    db_config: DatabaseConfig,
+    dest: Path,
+) -> str:
+    """Write a ``.tar.gz`` archive to *dest* (streamed to disk).
+
+    Returns the suggested basename (``octop-backup-….tar.gz``). Callers that
+    need a different name should rename/move *dest* afterward.
+    """
+    if pool.dialect == "postgresql":
+        db_arc = _PG_DUMP_ARC
+        database_driver = "postgresql"
+        database_dump_format = "pg_custom"
+    else:
+        db_arc = _SQLITE_DB_ARC
+        database_driver = "sqlite"
+        database_dump_format = "sqlite_file"
+        if not isinstance(pool, SqlitePool):
+            raise OctopError(ErrorCode.INTERNAL_ERROR, "sqlite backup requires SqlitePool")
+        if not pool.path.is_file():
+            raise OctopError(ErrorCode.NOT_FOUND, f"database not found: {pool.path}")
+
+    env_path = env_file_path(paths.root)
+    manifest = _build_manifest(
+        paths=paths,
+        agent_rows=agent_rows,
+        pool=pool,
+        db_arc=db_arc,
+        database_driver=database_driver,
+        database_dump_format=database_dump_format,
+        env_path=env_path,
+    )
+    filename = suggested_backup_filename()
+    dest = Path(dest)
+    dest.parent.mkdir(parents=True, exist_ok=True)
+    partial = dest.with_name(dest.name + ".partial")
+
+    try:
+        with tempfile.TemporaryDirectory() as tmp:
+            root = Path(tmp)
+            db_dest = root / db_arc
+            if pool.dialect == "postgresql":
+                dump_postgres(db_config.postgresql_conninfo(), db_dest)
+            else:
+                assert isinstance(pool, SqlitePool)
+                snapshot_sqlite_file(pool.path, db_dest)
+
+            manifest_path = root / _MANIFEST_NAME
+            manifest_path.write_text(manifest.to_json(), encoding="utf-8")
+
             if paths.config.is_file():
-                tf.add(root / _CONFIG_DIR / "config.json", arcname=f"{_CONFIG_DIR}/config.json")
+                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():
-                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 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)
+                cfg_dir = root / _CONFIG_DIR
+                cfg_dir.mkdir(parents=True, exist_ok=True)
+                shutil.copy2(env_path, cfg_dir / "env")
+
+            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():
+                    tf.add(
+                        root / _CONFIG_DIR / "config.json",
+                        arcname=f"{_CONFIG_DIR}/config.json",
+                    )
+                if 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 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:
+        partial.unlink(missing_ok=True)
+        raise
 
-    filename = f"octop-backup-{_timestamp()}.tar.gz"
-    return buf.getvalue(), filename
+    return filename
 
 
-def _extract_manifest(members: dict[str, bytes]) -> BackupManifest:
-    raw = members.get(_MANIFEST_NAME)
-    if raw is None:
+def _extract_manifest_from_dir(extracted: Path) -> BackupManifest:
+    manifest_path = extracted / _MANIFEST_NAME
+    if not manifest_path.is_file():
         raise OctopError(ErrorCode.SLASH_BAD_ARGS, "backup archive missing manifest.json")
     try:
-        manifest = BackupManifest.load_text(raw.decode("utf-8"))
-    except (json.JSONDecodeError, ValueError, TypeError) as exc:
+        manifest = BackupManifest.load_text(manifest_path.read_text(encoding="utf-8"))
+    except (json.JSONDecodeError, ValueError, TypeError, OSError) as exc:
         raise OctopError(ErrorCode.SLASH_BAD_ARGS, f"invalid manifest: {exc}") from exc
     if manifest.manifest_version != MANIFEST_VERSION:
         raise OctopError(
@@ -169,17 +235,18 @@ def _extract_manifest(members: dict[str, bytes]) -> BackupManifest:
     return manifest
 
 
-def _read_tar_members(data: bytes) -> dict[str, bytes]:
-    out: dict[str, bytes] = {}
-    with tarfile.open(fileobj=io.BytesIO(data), mode="r:*") as tf:
-        for member in tf.getmembers():
-            if not member.isfile():
-                continue
-            extracted = tf.extractfile(member)
-            if extracted is None:
-                continue
-            out[member.name.replace("\\", "/")] = extracted.read()
-    return out
+def _extract_archive(source: Path | bytes, dest_dir: Path) -> None:
+    """Extract *source* into *dest_dir* without holding the whole archive in a dict."""
+    dest_dir.mkdir(parents=True, exist_ok=True)
+    if isinstance(source, bytes):
+        with tarfile.open(fileobj=io.BytesIO(source), mode="r:*") as tf:
+            # Python 3.12+: refuse path traversal / special files.
+            tf.extractall(dest_dir, filter=tarfile.data_filter)
+        return
+    if not Path(source).is_file():
+        raise OctopError(ErrorCode.NOT_FOUND, f"backup not found: {source}")
+    with tarfile.open(source, mode="r:*") as tf:
+        tf.extractall(dest_dir, filter=tarfile.data_filter)
 
 
 def _is_migration_backup(manifest: BackupManifest) -> bool:
@@ -187,8 +254,22 @@ def _is_migration_backup(manifest: BackupManifest) -> bool:
     return manifest.octop_version.endswith(_MIGRATION_VERSION_SUFFIX)
 
 
+def _iter_extracted_files(root: Path, prefix: str) -> list[tuple[str, Path]]:
+    """Return ``(archive-relative-posix, on-disk path)`` under *prefix*."""
+    base = root / prefix
+    if not base.is_dir():
+        return []
+    out: list[tuple[str, Path]] = []
+    for path in sorted(base.rglob("*")):
+        if not path.is_file():
+            continue
+        rel = path.relative_to(root).as_posix()
+        out.append((rel, path))
+    return out
+
+
 def restore_system_backup(
-    data: bytes,
+    source: Path | bytes,
     *,
     paths: PathLayout,
     pool: DatabasePool,
@@ -199,6 +280,8 @@ def restore_system_backup(
 ) -> dict[str, Any]:
     """Restore database, workspaces, and optional config from a tar.gz archive.
 
+    *source* may be a filesystem path (preferred) or in-memory bytes (tests / legacy).
+
     ``preserve_users`` controls whether the *current* Octop instance's login
     credentials (``users`` rows + ``secrets.jwt``) are written back after the
     database is replaced:
@@ -215,72 +298,69 @@ def restore_system_backup(
     performing the restore) receives all imported ``user_id`` ownership. When
     omitted, the first preserved admin (else first preserved user) is used.
     """
-    members = _read_tar_members(data)
-    manifest = _extract_manifest(members)
-    is_migration = _is_migration_backup(manifest)
-
-    # Resolve effective preserve_users flag before touching the DB.
-    effective_preserve_users = is_migration if preserve_users is None else preserve_users
-
-    archive_driver = manifest.database_driver or "sqlite"
-    if archive_driver != pool.dialect:
-        raise OctopError(
-            ErrorCode.BACKUP_DRIVER_MISMATCH,
-            f"backup database_driver={archive_driver!r} does not match "
-            f"runtime dialect={pool.dialect!r}; cross-engine restore is refused",
-            status=400,
-            details={"archive_driver": archive_driver, "runtime_driver": pool.dialect},
-        )
-
-    db_blob = members.get(manifest.db_file)
-    if db_blob is None:
-        raise OctopError(ErrorCode.SLASH_BAD_ARGS, "backup archive missing database file")
-
-    # Capture current login credentials before overwriting the DB (only when needed).
-    saved_users: list[tuple[object, ...]] = []
-    saved_jwt: bytes | None = None
-    if effective_preserve_users and pool is not None:
-        saved_users = capture_users_from_pool(pool)
-        saved_jwt = capture_jwt_secret_from_pool(pool)
-
-    effective_owner: int | None = None
-    if is_migration:
-        effective_owner = owner_user_id
-        if effective_owner is None:
-            effective_owner = infer_owner_user_id(saved_users)
-        if effective_owner is not None and saved_users:
-            saved_ids = {int(str(row[0])) for row in saved_users}
-            if int(effective_owner) not in saved_ids:
-                raise OctopError(
-                    ErrorCode.SLASH_BAD_ARGS,
-                    f"owner_user_id={effective_owner} is not among current users",
-                    status=400,
-                )
-
-    ownership_remap: dict[str, int] | None = None
     with tempfile.TemporaryDirectory() as tmp:
+        extracted = Path(tmp) / "extracted"
+        _extract_archive(source, extracted)
+        manifest = _extract_manifest_from_dir(extracted)
+        is_migration = _is_migration_backup(manifest)
+
+        # Resolve effective preserve_users flag before touching the DB.
+        effective_preserve_users = is_migration if preserve_users is None else preserve_users
+
+        archive_driver = manifest.database_driver or "sqlite"
+        if archive_driver != pool.dialect:
+            raise OctopError(
+                ErrorCode.BACKUP_DRIVER_MISMATCH,
+                f"backup database_driver={archive_driver!r} does not match "
+                f"runtime dialect={pool.dialect!r}; cross-engine restore is refused",
+                status=400,
+                details={"archive_driver": archive_driver, "runtime_driver": pool.dialect},
+            )
+
+        db_path = extracted / manifest.db_file
+        if not db_path.is_file():
+            raise OctopError(ErrorCode.SLASH_BAD_ARGS, "backup archive missing database file")
+
+        # Capture current login credentials before overwriting the DB (only when needed).
+        saved_users: list[tuple[object, ...]] = []
+        saved_jwt: bytes | None = None
+        if effective_preserve_users and pool is not None:
+            saved_users = capture_users_from_pool(pool)
+            saved_jwt = capture_jwt_secret_from_pool(pool)
+
+        effective_owner: int | None = None
+        if is_migration:
+            effective_owner = owner_user_id
+            if effective_owner is None:
+                effective_owner = infer_owner_user_id(saved_users)
+            if effective_owner is not None and saved_users:
+                saved_ids = {int(str(row[0])) for row in saved_users}
+                if int(effective_owner) not in saved_ids:
+                    raise OctopError(
+                        ErrorCode.SLASH_BAD_ARGS,
+                        f"owner_user_id={effective_owner} is not among current users",
+                        status=400,
+                    )
+
+        ownership_remap: dict[str, int] | None = None
         if pool.dialect == "postgresql":
-            dump_path = Path(tmp) / "octop.dump"
-            dump_path.write_bytes(db_blob)
-            restore_postgres(db_config.postgresql_conninfo(), dump_path)
+            restore_postgres(db_config.postgresql_conninfo(), db_path)
         else:
-            backup_db = Path(tmp) / "octop.db"
-            backup_db.write_bytes(db_blob)
             if isinstance(pool, SqlitePool):
-                restore_sqlite_into_pool(backup_db, pool)
+                restore_sqlite_into_pool(db_path, pool)
             else:
                 raise OctopError(ErrorCode.INTERNAL_ERROR, "sqlite restore requires SqlitePool")
 
         if restore_config:
-            cfg_blob = members.get(f"{_CONFIG_DIR}/config.json")
-            if cfg_blob is not None:
+            cfg_path = extracted / _CONFIG_DIR / "config.json"
+            if cfg_path.is_file():
                 paths.config.parent.mkdir(parents=True, exist_ok=True)
-                paths.config.write_bytes(cfg_blob)
-            env_blob = members.get(f"{_CONFIG_DIR}/env")
-            if env_blob is not None:
+                shutil.copy2(cfg_path, paths.config)
+            env_blob_path = extracted / _CONFIG_DIR / "env"
+            if env_blob_path.is_file():
                 env_path = env_file_path(paths.root)
                 env_path.parent.mkdir(parents=True, exist_ok=True)
-                env_path.write_bytes(env_blob)
+                shutil.copy2(env_blob_path, env_path)
 
         # Migration ownership remap must run after the target owner exists and
         # before pruning backup placeholder users (avoids ON DELETE CASCADE).
@@ -303,14 +383,12 @@ def restore_system_backup(
         prefix = f"{_WORKSPACES_DIR}/"
         agent_repo = AgentRepo(pool)
         workspace_by_agent: dict[str, Path] = {}
-        for name, blob in members.items():
-            if not name.startswith(prefix):
+        for rel, src_file in _iter_extracted_files(extracted, _WORKSPACES_DIR):
+            file_rel = rel[len(prefix) :]
+            if "/" not in file_rel:
                 continue
-            rel = name[len(prefix) :]
-            if "/" not in rel:
-                continue
-            agent_id, _, file_rel = rel.partition("/")
-            if not agent_id or not file_rel:
+            agent_id, _, rest = file_rel.partition("/")
+            if not agent_id or not rest:
                 continue
             dest_root = workspace_by_agent.get(agent_id)
             if dest_root is None:
@@ -321,9 +399,9 @@ def restore_system_backup(
                     agent_id=agent_id,
                 )
                 workspace_by_agent[agent_id] = dest_root
-            dest = dest_root / file_rel
+            dest = dest_root / rest
             dest.parent.mkdir(parents=True, exist_ok=True)
-            dest.write_bytes(blob)
+            shutil.copy2(src_file, dest)
             restored_workspaces += 1
 
         # Replace skill-package files wholesale so leftover package dirs cannot
@@ -333,15 +411,13 @@ def restore_system_backup(
         paths.skill_packages_dir.mkdir(parents=True, exist_ok=True)
         restored_skill_package_files = 0
         skill_packages_prefix = f"{_SKILL_PACKAGES_DIR}/"
-        for name, blob in members.items():
-            if not name.startswith(skill_packages_prefix):
-                continue
-            rel = name[len(skill_packages_prefix) :]
-            if not rel:
+        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 / rel
+            dest = paths.skill_packages_dir / rest
             dest.parent.mkdir(parents=True, exist_ok=True)
-            dest.write_bytes(blob)
+            shutil.copy2(src_file, dest)
             restored_skill_package_files += 1
 
         # LightClaw migration exports (and older Octop backups) may ship schema v1
diff --git a/src/octop/infra/connectors/builder.py b/src/octop/infra/connectors/builder.py
index e4354004..a7521c8e 100644
--- a/src/octop/infra/connectors/builder.py
+++ b/src/octop/infra/connectors/builder.py
@@ -5,7 +5,7 @@
 import re
 import secrets
 from typing import Any
-from urllib.parse import quote
+from urllib.parse import quote, urlsplit, urlunsplit
 
 from octop.config import OctopConfig
 from octop.infra.connectors.catalog import (
@@ -13,6 +13,7 @@
     get_catalog_entry,
     is_mcp_oauth_remote,
 )
+from octop.infra.connectors.custom_mcp import validate_mcp_http_url
 from octop.infra.connectors.mail_servers import resolve_mail_servers
 from octop.infra.utils.ulid import new_ulid
 
@@ -38,6 +39,18 @@ def normalize_weiyun_mcp_token(raw: str) -> str:
     return text
 
 
+def normalize_weknora_base_url(raw: str) -> str:
+    """Normalize a WeKnora origin or API base to its `/api/v1` root."""
+    url = validate_mcp_http_url(raw)
+    parsed = urlsplit(url)
+    if parsed.query or parsed.fragment:
+        raise ValueError("base_url must not contain a query string or fragment")
+    path = parsed.path.rstrip("/")
+    if not path.endswith("/api/v1"):
+        path = f"{path}/api/v1"
+    return urlunsplit((parsed.scheme, parsed.netloc, path, "", ""))
+
+
 def mcp_server_name(kind: str, instance_id: str) -> str:
     return f"{kind}__{instance_id}"
 
@@ -73,6 +86,13 @@ def build_http_mcp_spec(
 
 
 def _build_remote_spec(entry: ConnectorCatalogEntry, creds: dict[str, Any]) -> dict[str, Any]:
+    if entry.kind == "dify":
+        url = validate_mcp_http_url(str(creds.get("mcp_url") or ""))
+        return {
+            "transport": "http",
+            "url": url,
+            "headers": _mcp_http_headers(),
+        }
     if entry.kind == "tencent-docs":
         token = str(creds.get("token") or "")
         spec: dict[str, Any] = {
@@ -362,6 +382,34 @@ def validate_create_credentials(
             "internal_token": internal_token,
         }
 
+    if entry.auth_kind == "custom_fields":
+        if entry.kind == "weknora":
+            base_url = normalize_weknora_base_url(str(credentials.get("base_url") or ""))
+            out = {
+                "base_url": base_url,
+                "internal_token": new_internal_token(),
+            }
+            api_key = str(credentials.get("api_key") or "").strip()
+            tenant_id = str(credentials.get("tenant_id") or "").strip()
+            raw_ids = credentials.get("knowledge_base_ids")
+            if api_key:
+                out["api_key"] = api_key
+            if tenant_id:
+                out["tenant_id"] = tenant_id
+            if isinstance(raw_ids, list):
+                ids = [str(item).strip() for item in raw_ids if str(item).strip()]
+            else:
+                ids = [part.strip() for part in str(raw_ids or "").split(",") if part.strip()]
+            if ids:
+                out["knowledge_base_ids"] = list(dict.fromkeys(ids))
+            return out
+        if entry.kind == "dify":
+            mcp_url = validate_mcp_http_url(str(credentials.get("mcp_url") or ""))
+            if "/mcp/server/" not in mcp_url or not mcp_url.rstrip("/").endswith("/mcp"):
+                raise ValueError("mcp_url must be a Dify MCP Server URL ending in /mcp")
+            return {"mcp_url": mcp_url}
+        raise ValueError(f"unsupported custom_fields connector kind: {kind}")
+
     raise ValueError(f"unsupported auth_kind: {entry.auth_kind}")
 
 
@@ -375,6 +423,8 @@ def _redact_mcp_configs_for_log(configs: dict[str, Any]) -> dict[str, Any]:
         url = str(entry.get("url") or "")
         if "token=" in url:
             entry["url"] = url.split("token=", 1)[0] + "token=***"
+        elif "/mcp/server/" in url:
+            entry["url"] = re.sub(r"(/mcp/server/)[^/?#]+", r"\1***", url)
         headers = entry.get("headers")
         if isinstance(headers, dict):
             redacted = dict(headers)
diff --git a/src/octop/infra/connectors/catalog.py b/src/octop/infra/connectors/catalog.py
index ddbc3430..f51b2014 100644
--- a/src/octop/infra/connectors/catalog.py
+++ b/src/octop/infra/connectors/catalog.py
@@ -13,8 +13,23 @@
     "imap_app_password",
     "session_cookie",
     "api_credentials",
+    "custom_fields",
 ]
 
+CredentialFieldType = Literal["text", "password", "url", "tags"]
+RemoteTransport = Literal["raw_http", "streamable_http", "sse"]
+
+
+@dataclass(frozen=True)
+class ConnectorCredentialField:
+    key: str
+    label: str
+    field_type: CredentialFieldType = "text"
+    required: bool = True
+    placeholder: str | None = None
+    help: str | None = None
+    secret: bool = False
+
 
 @dataclass(frozen=True)
 class ConnectorCatalogEntry:
@@ -43,6 +58,8 @@ class ConnectorCatalogEntry:
     oauth_resource: str | None = None
     oauth_scopes: str | None = None
     mcp_user_agent: str | None = None
+    credential_fields: tuple[ConnectorCredentialField, ...] = ()
+    remote_transport: RemoteTransport = "raw_http"
 
 
 def is_mcp_oauth_remote(entry: ConnectorCatalogEntry) -> bool:
@@ -395,6 +412,73 @@ def get_mcp_oauth_remote(kind: str) -> ConnectorCatalogEntry | None:
         manual_url="https://open.work.weixin.qq.com/help2/pc/cat?doc_id=21677",
         auth_hint="填写长连接智能机器人 Bot ID 与 Secret；主机需已安装 @wecom/cli（wecom-cli）",
     ),
+    ConnectorCatalogEntry(
+        kind="weknora",
+        name="WeKnora",
+        description="连接 WeKnora 私有知识库，提供只读检索与文档阅读",
+        auth_kind="custom_fields",
+        doc_url="https://github.com/Tencent/WeKnora",
+        icon="weknora",
+        color="#0052d9",
+        phase="available",
+        mcp_mode="gateway",
+        guide_url="https://github.com/Tencent/WeKnora/blob/main/docs/api/README.md",
+        auth_hint="填写 WeKnora 服务地址；API Key 与 Tenant ID 按部署的鉴权设置填写。",
+        credential_fields=(
+            ConnectorCredentialField(
+                key="base_url",
+                label="服务地址",
+                field_type="url",
+                placeholder="http://127.0.0.1:8080 或 https://weknora.example.com",
+                help="未包含 /api/v1 时会自动补齐",
+            ),
+            ConnectorCredentialField(
+                key="api_key",
+                label="API Key",
+                field_type="password",
+                required=False,
+                placeholder="sk-...（无鉴权部署可留空）",
+                secret=True,
+            ),
+            ConnectorCredentialField(
+                key="tenant_id",
+                label="Tenant ID",
+                required=False,
+                help="平台级 API Key 需要指定工作空间时填写",
+            ),
+            ConnectorCredentialField(
+                key="knowledge_base_ids",
+                label="默认知识库 ID",
+                field_type="tags",
+                required=False,
+                placeholder="kb-123, kb-456",
+                help="留空时检索当前凭证可见的全部知识库",
+            ),
+        ),
+    ),
+    ConnectorCatalogEntry(
+        kind="dify",
+        name="Dify",
+        description="连接 Dify 已发布应用或工作流的 MCP 服务",
+        auth_kind="custom_fields",
+        doc_url="https://docs.dify.ai/",
+        icon="dify",
+        color="#1c64f2",
+        phase="available",
+        mcp_mode="remote",
+        auth_hint="在 Dify 应用的访问点中启用 MCP，然后粘贴完整的 MCP Server URL。",
+        credential_fields=(
+            ConnectorCredentialField(
+                key="mcp_url",
+                label="MCP Server URL",
+                field_type="url",
+                placeholder="https://dify.example.com/mcp/server/<server_code>/mcp",
+                help="完整 URL 含访问标识，将按密钥加密保存",
+                secret=True,
+            ),
+        ),
+        remote_transport="streamable_http",
+    ),
 )
 
 
@@ -432,5 +516,17 @@ def catalog_entry_to_dict(
         "auth_hint": entry.auth_hint,
         "oauth_mode": oauth_mode,
         "oauth_ready": oauth_ready,
+        "credential_fields": [
+            {
+                "key": field.key,
+                "label": field.label,
+                "field_type": field.field_type,
+                "required": field.required,
+                "placeholder": field.placeholder,
+                "help": field.help,
+                "secret": field.secret,
+            }
+            for field in entry.credential_fields
+        ],
         "supports_quick_auth": entry.phase == "available" and entry.auth_kind != "api_credentials",
     }
diff --git a/src/octop/infra/connectors/custom_mcp.py b/src/octop/infra/connectors/custom_mcp.py
index 95ea281d..7ffb4385 100644
--- a/src/octop/infra/connectors/custom_mcp.py
+++ b/src/octop/infra/connectors/custom_mcp.py
@@ -13,6 +13,9 @@
 
 _SERVER_NAME_RE = re.compile(r"^[A-Za-z0-9_-]+$")
 _META_KEYS = frozenset({"enabled", "display_name", "default_open"})
+_OAUTH_KEY = "oauth"
+_SECRET_KEYS = frozenset({_OAUTH_KEY})
+_HARNESS_STRIP_KEYS = _META_KEYS | _SECRET_KEYS
 _DISPLAY_NAME_MAX = 64
 _MCP_STREAMABLE_HTTP_ACCEPT = "application/json, text/event-stream"
 
@@ -99,7 +102,12 @@ def _normalize_args(raw: Any) -> list[str]:
     return [str(item) for item in raw]
 
 
-def _validate_http_url(url: str) -> str:
+def validate_mcp_http_url(url: str) -> str:
+    """Validate a user-configured MCP/connector URL.
+
+    Local loopback deployments may use HTTP. Remote deployments must use
+    public HTTPS and pass the shared SSRF guard.
+    """
     text = url.strip()
     if not text:
         raise ValueError("url is required")
@@ -147,7 +155,7 @@ def normalize_server_spec(name: str, raw: Any) -> dict[str, Any]:
         spec["display_name"] = display_name
 
     if transport == "streamable_http":
-        url = _validate_http_url(str(raw.get("url") or ""))
+        url = validate_mcp_http_url(str(raw.get("url") or ""))
         spec["url"] = url
         headers = _normalize_headers(raw.get("headers"))
         if headers:
@@ -164,6 +172,13 @@ def normalize_server_spec(name: str, raw: Any) -> dict[str, Any]:
         if env:
             spec["env"] = env
 
+    oauth = raw.get(_OAUTH_KEY)
+    if isinstance(oauth, dict):
+        if str(oauth.get("access_token") or "").strip():
+            spec[_OAUTH_KEY] = dict(oauth)
+        elif oauth.get("required") is True:
+            spec[_OAUTH_KEY] = {"required": True}
+
     return spec
 
 
@@ -199,15 +214,134 @@ def validate_servers_map(
     return out
 
 
+def oauth_tokens_from_spec(spec: dict[str, Any]) -> dict[str, Any]:
+    raw = spec.get(_OAUTH_KEY)
+    return dict(raw) if isinstance(raw, dict) else {}
+
+
+def oauth_configured(spec: dict[str, Any]) -> bool:
+    oauth = oauth_tokens_from_spec(spec)
+    return bool(str(oauth.get("access_token") or "").strip())
+
+
+def oauth_required(spec: dict[str, Any]) -> bool:
+    if oauth_configured(spec):
+        return False
+    oauth = oauth_tokens_from_spec(spec)
+    return oauth.get("required") is True
+
+
+def mark_oauth_reauth_required(spec: dict[str, Any]) -> dict[str, Any]:
+    """Drop stale OAuth tokens and flag the dashboard to prompt re-authorization."""
+    out = {k: v for k, v in spec.items() if k != _OAUTH_KEY}
+    out[_OAUTH_KEY] = {"required": True}
+    return out
+
+
+def set_oauth_required_in_spec(spec: dict[str, Any], *, required: bool) -> dict[str, Any]:
+    """Persist or clear the dashboard hint that OAuth is needed (no tokens)."""
+    out = dict(spec)
+    if oauth_configured(out):
+        return out
+    oauth = dict(oauth_tokens_from_spec(out))
+    if required:
+        oauth["required"] = True
+        oauth.pop("access_token", None)
+        oauth.pop("refresh_token", None)
+        out[_OAUTH_KEY] = oauth
+        return out
+    oauth.pop("required", None)
+    if str(oauth.get("access_token") or "").strip():
+        out[_OAUTH_KEY] = oauth
+    else:
+        out.pop(_OAUTH_KEY, None)
+    return out
+
+
+def build_oauth_storage(
+    tokens: dict[str, Any],
+    *,
+    issuer: str,
+    resource: str | None,
+) -> dict[str, Any]:
+    out: dict[str, Any] = {
+        "access_token": str(tokens["access_token"]),
+        "oauth_issuer": issuer.rstrip("/"),
+    }
+    refresh = str(tokens.get("refresh_token") or "").strip()
+    if refresh:
+        out["refresh_token"] = refresh
+    if tokens.get("expires_at") is not None:
+        out["expires_at"] = int(tokens["expires_at"])
+    if resource:
+        out["oauth_resource"] = resource
+    client_id = str(tokens.get("oauth_client_id") or "").strip()
+    if client_id:
+        out["oauth_client_id"] = client_id
+    client_secret = tokens.get("oauth_client_secret")
+    if client_secret:
+        out["oauth_client_secret"] = str(client_secret)
+    return out
+
+
+def redact_server_for_api(spec: dict[str, Any]) -> dict[str, Any]:
+    """Remove secrets; expose oauth preview for the dashboard."""
+    out = {k: v for k, v in spec.items() if k != _OAUTH_KEY}
+    if oauth_configured(spec):
+        oauth = oauth_tokens_from_spec(spec)
+        preview: dict[str, Any] = {"configured": True}
+        if oauth.get("expires_at") is not None:
+            preview["expires_at"] = oauth["expires_at"]
+        out[_OAUTH_KEY] = preview
+    elif oauth_required(spec):
+        out[_OAUTH_KEY] = {"configured": False, "required": True}
+    return out
+
+
+def redact_servers_for_api(servers: dict[str, Any]) -> dict[str, Any]:
+    return {
+        name: redact_server_for_api(spec)
+        for name, spec in servers.items()
+        if isinstance(spec, dict)
+    }
+
+
+def merge_preserved_oauth(
+    new_servers: dict[str, Any],
+    existing: dict[str, Any],
+) -> dict[str, Any]:
+    """Drop client-supplied oauth blobs; keep stored tokens per server name."""
+    out: dict[str, Any] = {}
+    for name, raw in new_servers.items():
+        if not isinstance(raw, dict):
+            out[name] = raw
+            continue
+        spec = dict(raw)
+        spec.pop(_OAUTH_KEY, None)
+        old = existing.get(name)
+        if isinstance(old, dict):
+            old_oauth = old.get(_OAUTH_KEY)
+            if isinstance(old_oauth, dict) and str(old_oauth.get("access_token") or "").strip():
+                spec[_OAUTH_KEY] = dict(old_oauth)
+            elif isinstance(old_oauth, dict) and old_oauth.get("required") is True:
+                spec[_OAUTH_KEY] = {"required": True}
+        out[name] = spec
+    return out
+
+
 def harness_spec_for_server(spec: dict[str, Any]) -> dict[str, Any]:
     """Strip Octop meta keys; keep langchain-mcp-adapters connection fields."""
-    out = {k: v for k, v in spec.items() if k not in _META_KEYS}
+    out = {k: v for k, v in spec.items() if k not in _HARNESS_STRIP_KEYS}
     # Ensure stdio always has args list for adapters.
     if out.get("transport") == "stdio" and "args" not in out:
         out["args"] = []
     # Streamable HTTP MCP requires both content types (same as built-in remote).
     if out.get("transport") == "streamable_http":
         headers = {str(k): str(v) for k, v in dict(out.get("headers") or {}).items()}
+        oauth = oauth_tokens_from_spec(spec)
+        token = str(oauth.get("access_token") or "").strip()
+        if token:
+            headers["Authorization"] = f"Bearer {token}"
         headers.setdefault("Accept", _MCP_STREAMABLE_HTTP_ACCEPT)
         out["headers"] = headers
     return out
diff --git a/src/octop/infra/connectors/gateway/adapters/weknora.py b/src/octop/infra/connectors/gateway/adapters/weknora.py
new file mode 100644
index 00000000..bb062502
--- /dev/null
+++ b/src/octop/infra/connectors/gateway/adapters/weknora.py
@@ -0,0 +1,239 @@
+"""Read-only WeKnora knowledge-base gateway adapter."""
+
+from __future__ import annotations
+
+import json
+from typing import Any
+from urllib.parse import quote
+
+import httpx
+
+from octop.infra.connectors.builder import normalize_weknora_base_url
+
+_MAX_RESULTS = 8
+_MAX_CHUNK_CHARS = 1200
+
+TOOLS: list[dict[str, Any]] = [
+    {
+        "name": "list_knowledge_bases",
+        "description": "List WeKnora knowledge bases visible to the configured credential.",
+        "inputSchema": {"type": "object", "properties": {}},
+    },
+    {
+        "name": "search",
+        "description": (
+            "Search WeKnora knowledge bases and return ranked source passages. "
+            "Use the returned knowledge_id with read_document for surrounding context."
+        ),
+        "inputSchema": {
+            "type": "object",
+            "properties": {
+                "query": {"type": "string", "description": "Search query"},
+                "knowledge_base_ids": {
+                    "type": "array",
+                    "items": {"type": "string"},
+                    "description": "Optional knowledge-base scope; defaults to connector config",
+                },
+                "max_results": {
+                    "type": "integer",
+                    "minimum": 1,
+                    "maximum": _MAX_RESULTS,
+                    "description": f"Maximum passages (1-{_MAX_RESULTS})",
+                },
+            },
+            "required": ["query"],
+        },
+    },
+    {
+        "name": "read_document",
+        "description": "Read one WeKnora document and its ordered chunks by knowledge_id.",
+        "inputSchema": {
+            "type": "object",
+            "properties": {
+                "knowledge_id": {"type": "string", "description": "Document knowledge ID"},
+                "page": {"type": "integer", "minimum": 1, "description": "Page, default 1"},
+                "page_size": {
+                    "type": "integer",
+                    "minimum": 1,
+                    "maximum": 50,
+                    "description": "Chunks per page, default 20",
+                },
+            },
+            "required": ["knowledge_id"],
+        },
+    },
+]
+
+
+def list_tools() -> list[dict[str, Any]]:
+    return TOOLS
+
+
+def _headers(creds: dict[str, Any]) -> dict[str, str]:
+    headers = {"Accept": "application/json"}
+    api_key = str(creds.get("api_key") or "").strip()
+    tenant_id = str(creds.get("tenant_id") or "").strip()
+    if api_key:
+        headers["X-API-Key"] = api_key
+    if tenant_id:
+        headers["X-Tenant-ID"] = tenant_id
+    return headers
+
+
+def _request(
+    creds: dict[str, Any],
+    method: str,
+    path: str,
+    *,
+    params: dict[str, Any] | None = None,
+    body: dict[str, Any] | None = None,
+) -> dict[str, Any]:
+    base_url = normalize_weknora_base_url(str(creds.get("base_url") or ""))
+    try:
+        with httpx.Client(timeout=30.0, follow_redirects=False) as client:
+            response = client.request(
+                method,
+                f"{base_url}{path}",
+                headers=_headers(creds),
+                params=params,
+                json=body,
+            )
+        response.raise_for_status()
+        payload = response.json()
+    except httpx.HTTPStatusError as exc:
+        status = exc.response.status_code
+        raise ValueError(f"WeKnora request failed: HTTP {status}") from exc
+    except (httpx.HTTPError, ValueError) as exc:
+        if isinstance(exc, ValueError) and str(exc).startswith("WeKnora request failed"):
+            raise
+        raise ValueError(f"WeKnora request failed: {exc}") from exc
+    if not isinstance(payload, dict):
+        raise ValueError("WeKnora returned an invalid JSON response")
+    if payload.get("success") is False:
+        reason = payload.get("message") or payload.get("error") or "request rejected"
+        raise ValueError(f"WeKnora request failed: {reason}")
+    return payload
+
+
+def _data_list(payload: dict[str, Any]) -> list[dict[str, Any]]:
+    data = payload.get("data")
+    if isinstance(data, list):
+        return [item for item in data if isinstance(item, dict)]
+    return []
+
+
+def _configured_ids(creds: dict[str, Any], raw: Any = None) -> list[str]:
+    value = raw if raw is not None else creds.get("knowledge_base_ids")
+    if isinstance(value, list):
+        ids = [str(item).strip() for item in value if str(item).strip()]
+    else:
+        ids = [part.strip() for part in str(value or "").split(",") if part.strip()]
+    return list(dict.fromkeys(ids))
+
+
+def _visible_knowledge_base_ids(creds: dict[str, Any]) -> list[str]:
+    ids: list[str] = []
+    for item in _data_list(_request(creds, "GET", "/knowledge-bases")):
+        kb_id = str(item.get("id") or "").strip()
+        if kb_id:
+            ids.append(kb_id)
+    return ids
+
+
+def _clip_passage(item: dict[str, Any]) -> dict[str, Any]:
+    content = str(item.get("content") or "")
+    clipped = content[:_MAX_CHUNK_CHARS]
+    return {
+        "knowledge_id": item.get("knowledge_id"),
+        "knowledge_title": item.get("knowledge_title") or item.get("knowledge_filename"),
+        "chunk_index": item.get("chunk_index"),
+        "score": item.get("score"),
+        "content": clipped,
+        "truncated": len(content) > len(clipped),
+    }
+
+
+def _list_knowledge_bases(creds: dict[str, Any]) -> dict[str, Any]:
+    rows = _data_list(_request(creds, "GET", "/knowledge-bases"))
+    return {
+        "knowledge_bases": [
+            {
+                "id": item.get("id"),
+                "name": item.get("name"),
+                "description": item.get("description"),
+                "knowledge_count": item.get("knowledge_count"),
+                "chunk_count": item.get("chunk_count"),
+            }
+            for item in rows
+        ]
+    }
+
+
+def _search(creds: dict[str, Any], args: dict[str, Any]) -> dict[str, Any]:
+    query = str(args.get("query") or "").strip()
+    if not query:
+        raise ValueError("query is required")
+    ids = _configured_ids(creds, args.get("knowledge_base_ids"))
+    if not ids:
+        ids = _visible_knowledge_base_ids(creds)
+    if not ids:
+        raise ValueError("no visible WeKnora knowledge bases")
+    max_results = max(1, min(int(args.get("max_results") or _MAX_RESULTS), _MAX_RESULTS))
+    payload = _request(
+        creds,
+        "POST",
+        "/knowledge-search",
+        params={"resource_urls": "handle"},
+        body={"query": query, "knowledge_base_ids": ids},
+    )
+    passages = [_clip_passage(item) for item in _data_list(payload)[:max_results]]
+    return {"query": query, "knowledge_base_ids": ids, "passages": passages}
+
+
+def _read_document(creds: dict[str, Any], args: dict[str, Any]) -> dict[str, Any]:
+    knowledge_id = str(args.get("knowledge_id") or "").strip()
+    if not knowledge_id:
+        raise ValueError("knowledge_id is required")
+    page = max(1, int(args.get("page") or 1))
+    page_size = max(1, min(int(args.get("page_size") or 20), 50))
+    escaped_id = quote(knowledge_id, safe="")
+    detail_payload = _request(creds, "GET", f"/knowledge/{escaped_id}")
+    chunks_payload = _request(
+        creds,
+        "GET",
+        f"/chunks/{escaped_id}",
+        params={"page": page, "page_size": page_size},
+    )
+    detail = detail_payload.get("data")
+    if not isinstance(detail, dict):
+        detail = {}
+    chunks = sorted(
+        _data_list(chunks_payload),
+        key=lambda item: int(item.get("chunk_index") or 0),
+    )
+    return {
+        "knowledge_id": knowledge_id,
+        "title": detail.get("title") or detail.get("file_name"),
+        "description": detail.get("description"),
+        "summary": detail.get("summary"),
+        "page": chunks_payload.get("page", page),
+        "page_size": chunks_payload.get("page_size", page_size),
+        "total": chunks_payload.get("total"),
+        "chunks": [_clip_passage(item) for item in chunks],
+    }
+
+
+def call_tool(creds: dict[str, Any], name: str, args: dict[str, Any]) -> str:
+    if name == "list_knowledge_bases":
+        result = _list_knowledge_bases(creds)
+    elif name == "search":
+        result = _search(creds, args)
+    elif name == "read_document":
+        result = _read_document(creds, args)
+    else:
+        raise ValueError(f"unknown tool: {name}")
+    return json.dumps(result, ensure_ascii=False)
+
+
+def probe_credentials(creds: dict[str, Any]) -> None:
+    _request(creds, "GET", "/knowledge-bases")
diff --git a/src/octop/infra/connectors/gateway/registry.py b/src/octop/infra/connectors/gateway/registry.py
index 82456ee0..92c29f3e 100644
--- a/src/octop/infra/connectors/gateway/registry.py
+++ b/src/octop/infra/connectors/gateway/registry.py
@@ -16,6 +16,7 @@
     tencent_news,
     wechat_reading,
     wecom_cli,
+    weknora,
     yuandian,
 )
 
@@ -41,6 +42,7 @@ def probe_credentials(self, creds: dict[str, Any]) -> None: ...
     "wechat-reading": wechat_reading,
     "feishu-cli": feishu_cli,
     "wecom-cli": wecom_cli,
+    "weknora": weknora,
 }
 
 
diff --git a/src/octop/infra/connectors/oauth/__init__.py b/src/octop/infra/connectors/oauth/__init__.py
index 255c8311..c1937f6b 100644
--- a/src/octop/infra/connectors/oauth/__init__.py
+++ b/src/octop/infra/connectors/oauth/__init__.py
@@ -13,6 +13,7 @@
     refresh_oauth_credentials,
     save_oauth_ctx,
     start_oauth,
+    start_oauth_for_target,
 )
 
 __all__ = [
@@ -28,4 +29,5 @@
     "refresh_oauth_credentials",
     "save_oauth_ctx",
     "start_oauth",
+    "start_oauth_for_target",
 ]
diff --git a/src/octop/infra/connectors/oauth/discovery.py b/src/octop/infra/connectors/oauth/discovery.py
new file mode 100644
index 00000000..78b7efdd
--- /dev/null
+++ b/src/octop/infra/connectors/oauth/discovery.py
@@ -0,0 +1,214 @@
+"""Discover MCP OAuth issuers from a remote MCP URL (RFC 9728 + MCP authorization)."""
+
+from __future__ import annotations
+
+import re
+import time
+from typing import Any
+from urllib.parse import urljoin, urlparse
+
+from octop.infra.connectors.oauth.mcp import fetch_authorization_metadata
+from octop.infra.utils.ssrf_guard import UnsafeOutboundUrl, safe_request, validate_https_url
+
+_RESOURCE_METADATA_PARAM = re.compile(
+    r'resource_metadata\s*=\s*"([^"]+)"',
+    re.IGNORECASE,
+)
+
+_DISCOVERY_CACHE_TTL_SEC = 3600.0
+_discovery_cache: dict[str, tuple[float, dict[str, Any]]] = {}
+
+
+def clear_oauth_discovery_cache() -> None:
+    """Clear the in-process OAuth discovery cache (tests only)."""
+    _discovery_cache.clear()
+
+
+def _mcp_url_host(url: str) -> str:
+    return (urlparse(url).hostname or "").lower().rstrip(".")
+
+
+def _is_loopback_mcp_url(url: str) -> bool:
+    host = _mcp_url_host(url)
+    return host in {"localhost", "127.0.0.1", "::1"}
+
+
+def build_protected_resource_metadata_urls(
+    mcp_url: str,
+    *,
+    www_auth_resource_metadata: str | None = None,
+) -> list[str]:
+    """Ordered PRM discovery URLs per MCP authorization / RFC 9728."""
+    urls: list[str] = []
+    if www_auth_resource_metadata:
+        urls.append(www_auth_resource_metadata.strip())
+    parsed = urlparse(mcp_url)
+    base = f"{parsed.scheme}://{parsed.netloc}"
+    path = parsed.path or ""
+    if path and path != "/":
+        urls.append(urljoin(base, f"/.well-known/oauth-protected-resource{path}"))
+    urls.append(urljoin(base, "/.well-known/oauth-protected-resource"))
+    # De-dupe while preserving order.
+    seen: set[str] = set()
+    out: list[str] = []
+    for item in urls:
+        if item and item not in seen:
+            seen.add(item)
+            out.append(item)
+    return out
+
+
+def parse_www_authenticate_resource_metadata(header_value: str | None) -> str | None:
+    if not header_value:
+        return None
+    match = _RESOURCE_METADATA_PARAM.search(header_value)
+    if not match:
+        return None
+    return match.group(1).strip() or None
+
+
+async def _fetch_prm_document(url: str) -> dict[str, Any] | None:
+    try:
+        validate_https_url(url, field="resource_metadata")
+    except UnsafeOutboundUrl:
+        return None
+    try:
+        resp = await safe_request("GET", url, timeout=15.0)
+    except Exception:
+        return None
+    if resp.status_code >= 400:
+        return None
+    try:
+        data = resp.json()
+    except Exception:
+        return None
+    if not isinstance(data, dict):
+        return None
+    servers = data.get("authorization_servers")
+    if not isinstance(servers, list) or not servers:
+        return None
+    return data
+
+
+async def _probe_401_resource_metadata(mcp_url: str) -> str | None:
+    """Unauthenticated MCP initialize may return WWW-Authenticate with PRM URL."""
+    parsed = urlparse(mcp_url)
+    if parsed.scheme not in ("http", "https"):
+        return None
+    if _is_loopback_mcp_url(mcp_url):
+        return None
+    if parsed.scheme != "https":
+        return None
+    try:
+        validate_https_url(mcp_url, field="mcp_url")
+    except UnsafeOutboundUrl:
+        return None
+    try:
+        resp = await safe_request(
+            "POST",
+            mcp_url,
+            json={
+                "jsonrpc": "2.0",
+                "id": 1,
+                "method": "initialize",
+                "params": {
+                    "protocolVersion": "2024-11-05",
+                    "capabilities": {},
+                    "clientInfo": {"name": "octop", "version": "0.1"},
+                },
+            },
+            headers={"Accept": "application/json, text/event-stream"},
+            timeout=15.0,
+        )
+    except Exception:
+        return None
+    if resp.status_code not in (401, 403):
+        return None
+    return parse_www_authenticate_resource_metadata(resp.headers.get("WWW-Authenticate"))
+
+
+def _normalize_issuer(raw: str, *, mcp_url: str) -> str:
+    text = raw.strip().rstrip("/")
+    if text.startswith("http://") or text.startswith("https://"):
+        return text
+    base = f"{urlparse(mcp_url).scheme}://{urlparse(mcp_url).netloc}"
+    return urljoin(base, text).rstrip("/")
+
+
+async def discover_oauth_from_mcp_url(
+    mcp_url: str,
+    *,
+    use_cache: bool = True,
+) -> dict[str, Any]:
+    """Return OAuth discovery details for a remote MCP HTTP endpoint.
+
+    Result shape::
+
+        {
+          "available": bool,
+          "issuer": str | None,
+          "resource": str | None,
+          "metadata": dict | None,  # AS metadata when available
+          "scopes_supported": list[str] | None,
+          "error": str | None,
+        }
+    """
+    url = mcp_url.strip()
+    if use_cache:
+        cached = _discovery_cache.get(url)
+        if cached is not None and cached[0] > time.time():
+            return cached[1]
+    result = await _discover_oauth_from_mcp_url_uncached(url)
+    if use_cache and result.get("available"):
+        _discovery_cache[url] = (time.time() + _DISCOVERY_CACHE_TTL_SEC, result)
+    return result
+
+
+async def _discover_oauth_from_mcp_url_uncached(url: str) -> dict[str, Any]:
+    if not url:
+        return {"available": False, "error": "empty mcp url"}
+    if _is_loopback_mcp_url(url):
+        return {"available": False, "error": "loopback MCP does not use remote OAuth"}
+
+    www_auth_prm = await _probe_401_resource_metadata(url)
+    prm_doc: dict[str, Any] | None = None
+    for candidate in build_protected_resource_metadata_urls(
+        url,
+        www_auth_resource_metadata=www_auth_prm,
+    ):
+        prm_doc = await _fetch_prm_document(candidate)
+        if prm_doc is not None:
+            break
+
+    if prm_doc is None:
+        return {"available": False, "error": "protected resource metadata not found"}
+
+    resource = str(prm_doc.get("resource") or "").strip() or url
+    servers = prm_doc.get("authorization_servers")
+    if not isinstance(servers, list) or not servers:
+        return {"available": False, "error": "authorization_servers missing"}
+
+    issuer = _normalize_issuer(str(servers[0]), mcp_url=url)
+    try:
+        metadata = await fetch_authorization_metadata(issuer)
+    except Exception as exc:
+        return {"available": False, "error": str(exc), "issuer": issuer, "resource": resource}
+
+    if not metadata.get("registration_endpoint"):
+        return {
+            "available": False,
+            "error": "authorization server does not support dynamic client registration",
+            "issuer": issuer,
+            "resource": resource,
+        }
+
+    scopes_raw = metadata.get("scopes_supported")
+    scopes = [str(s) for s in scopes_raw if s] if isinstance(scopes_raw, list) else None
+    return {
+        "available": True,
+        "issuer": issuer,
+        "resource": resource,
+        "metadata": metadata,
+        "scopes_supported": scopes,
+        "error": None,
+    }
diff --git a/src/octop/infra/connectors/oauth/registry.py b/src/octop/infra/connectors/oauth/registry.py
index 9a9f9fa3..969807d7 100644
--- a/src/octop/infra/connectors/oauth/registry.py
+++ b/src/octop/infra/connectors/oauth/registry.py
@@ -6,6 +6,8 @@
 from typing import Any
 
 from octop.infra.connectors.catalog import get_catalog_entry, get_mcp_oauth_remote
+from octop.infra.connectors.custom_mcp import CUSTOM_MCP_KIND
+from octop.infra.connectors.oauth.discovery import discover_oauth_from_mcp_url
 from octop.infra.connectors.oauth.mcp import (
     build_authorize_url,
     exchange_authorization_code,
@@ -119,6 +121,49 @@ async def exchange_pasted_auth_code(
     raise ValueError(f"auth code exchange not supported for {kind}")
 
 
+async def _start_mcp_oauth_from_discovery(
+    *,
+    flow: str,
+    kind: str,
+    redirect_uri: str,
+    state: str,
+    issuer: str,
+    resource: str | None,
+    metadata: dict[str, Any],
+    server_name: str | None = None,
+    mcp_url: str | None = None,
+    scope: str | None = None,
+) -> tuple[str, str, dict[str, Any]]:
+    verifier, challenge = new_pkce_pair()
+    reg = await register_dynamic_client(metadata, issuer=issuer, redirect_uri=redirect_uri)
+    client_id = str(reg["client_id"])
+    client_secret = str(reg.get("client_secret") or "") or None
+    url = build_authorize_url(
+        metadata,
+        client_id=client_id,
+        redirect_uri=redirect_uri,
+        state=state,
+        code_challenge=challenge,
+        scope=scope,
+        resource=resource,
+    )
+    ctx: dict[str, Any] = {
+        "flow": flow,
+        "kind": kind,
+        "metadata": metadata,
+        "client_id": client_id,
+        "client_secret": client_secret,
+        "resource": resource,
+        "redirect_uri": redirect_uri,
+        "issuer": issuer,
+    }
+    if server_name:
+        ctx["server_name"] = server_name
+    if mcp_url:
+        ctx["mcp_url"] = mcp_url
+    return url, verifier, ctx
+
+
 async def start_oauth(
     *,
     kind: str,
@@ -126,38 +171,136 @@ async def start_oauth(
     state: str,
     settings_repo: Any,
 ) -> tuple[str, str, dict[str, Any]]:
-    """Return authorize_url, code_verifier, ctx to persist for callback."""
+    """Return authorize_url, code_verifier, ctx for a catalog connector kind."""
     del settings_repo
-    verifier, challenge = new_pkce_pair()
-
-    if kind in mcp_oauth_kinds():
-        issuer = issuer_for_kind(kind)
-        metadata = await fetch_authorization_metadata(issuer)
-        reg = await register_dynamic_client(metadata, issuer=issuer, redirect_uri=redirect_uri)
-        client_id = str(reg["client_id"])
-        client_secret = str(reg.get("client_secret") or "") or None
-        resource = resource_for_kind(kind)
-        url = build_authorize_url(
-            metadata,
-            client_id=client_id,
+    if kind not in mcp_oauth_kinds():
+        raise ValueError(f"oauth not supported for {kind}")
+    issuer = issuer_for_kind(kind)
+    metadata = await fetch_authorization_metadata(issuer)
+    resource = resource_for_kind(kind)
+    return await _start_mcp_oauth_from_discovery(
+        flow="mcp",
+        kind=kind,
+        redirect_uri=redirect_uri,
+        state=state,
+        issuer=issuer,
+        resource=resource,
+        metadata=metadata,
+        scope=_scopes_for_kind(kind, metadata),
+    )
+
+
+async def start_oauth_for_target(
+    *,
+    target: dict[str, Any],
+    redirect_uri: str,
+    state: str,
+    settings_repo: Any,
+    mcp_url: str | None = None,
+) -> tuple[str, str, dict[str, Any]]:
+    """Unified OAuth start for catalog connectors and custom MCP servers."""
+    target_type = str(target.get("type") or "").strip()
+    if target_type == "catalog":
+        kind = str(target.get("kind") or "").strip()
+        if not kind:
+            raise ValueError("catalog target requires kind")
+        return await start_oauth(
+            kind=kind,
             redirect_uri=redirect_uri,
             state=state,
-            code_challenge=challenge,
-            scope=_scopes_for_kind(kind, metadata),
-            resource=resource,
+            settings_repo=settings_repo,
         )
-        ctx = {
-            "flow": "mcp",
-            "kind": kind,
-            "metadata": metadata,
-            "client_id": client_id,
-            "client_secret": client_secret,
-            "resource": resource,
-            "redirect_uri": redirect_uri,
-        }
-        return url, verifier, ctx
+    if target_type == "custom_mcp":
+        server_name = str(target.get("server_name") or "").strip()
+        url = str(mcp_url or target.get("mcp_url") or "").strip()
+        if not server_name:
+            raise ValueError("custom_mcp target requires server_name")
+        if not url:
+            raise ValueError("custom MCP server url is required; save the server first")
+        return await start_custom_mcp_oauth(
+            server_name=server_name,
+            mcp_url=url,
+            redirect_uri=redirect_uri,
+            state=state,
+        )
+    raise ValueError(f"unsupported oauth target type: {target_type!r}")
+
 
-    raise ValueError(f"oauth not supported for {kind}")
+def oauth_state_kind_for_target(target: dict[str, Any]) -> str:
+    target_type = str(target.get("type") or "").strip()
+    if target_type == "catalog":
+        return str(target.get("kind") or "").strip()
+    if target_type == "custom_mcp":
+        return CUSTOM_MCP_KIND
+    raise ValueError(f"unsupported oauth target type: {target_type!r}")
+
+
+def oauth_target_requires_https(target: dict[str, Any]) -> bool:
+    target_type = str(target.get("type") or "").strip()
+    if target_type == "catalog":
+        kind = str(target.get("kind") or "").strip()
+        return get_mcp_oauth_remote(kind) is not None
+    return target_type == "custom_mcp"
+
+
+async def start_custom_mcp_oauth(
+    *,
+    server_name: str,
+    mcp_url: str,
+    redirect_uri: str,
+    state: str,
+    discovery: dict[str, Any] | None = None,
+) -> tuple[str, str, dict[str, Any]]:
+    """Start OAuth for a user-defined MCP server (issuer discovered from MCP URL)."""
+    found = discovery if discovery is not None else await discover_oauth_from_mcp_url(mcp_url)
+    if not found.get("available"):
+        raise ValueError(str(found.get("error") or "OAuth not available for this MCP URL"))
+    issuer = str(found["issuer"])
+    resource = str(found.get("resource") or "").strip() or None
+    metadata = found.get("metadata")
+    if not isinstance(metadata, dict):
+        metadata = await fetch_authorization_metadata(issuer)
+    scopes_raw = metadata.get("scopes_supported")
+    scope = (
+        " ".join(str(s) for s in scopes_raw if s)
+        if isinstance(scopes_raw, list) and scopes_raw
+        else None
+    )
+    return await _start_mcp_oauth_from_discovery(
+        flow="custom_mcp",
+        kind=CUSTOM_MCP_KIND,
+        redirect_uri=redirect_uri,
+        state=state,
+        issuer=issuer,
+        resource=resource,
+        metadata=metadata,
+        server_name=server_name,
+        mcp_url=mcp_url,
+        scope=scope,
+    )
+
+
+async def refresh_custom_mcp_oauth(oauth: dict[str, Any]) -> dict[str, Any]:
+    refresh = str(oauth.get("refresh_token") or "").strip()
+    issuer = str(oauth.get("oauth_issuer") or "").strip()
+    client_id = str(oauth.get("oauth_client_id") or "").strip()
+    if not refresh or not issuer or not client_id:
+        return oauth
+    metadata = await fetch_authorization_metadata(issuer)
+    client_secret_raw = oauth.get("oauth_client_secret")
+    secret = str(client_secret_raw) if client_secret_raw else None
+    resource = str(oauth.get("oauth_resource") or "").strip() or None
+    refreshed = await refresh_access_token(
+        metadata,
+        issuer=issuer,
+        client_id=client_id,
+        client_secret=secret,
+        refresh_token=refresh,
+        resource=resource,
+    )
+    merged = dict(oauth)
+    merged.update(refreshed)
+    return merged
 
 
 async def exchange_oauth_code(
@@ -172,6 +315,32 @@ async def exchange_oauth_code(
     ctx = load_oauth_ctx(settings_repo, state_id)
     flow = ctx.get("flow")
 
+    if flow == "custom_mcp":
+        metadata = ctx.get("metadata")
+        if not isinstance(metadata, dict):
+            issuer = str(ctx.get("issuer") or "")
+            if not issuer:
+                raise ValueError("missing custom MCP oauth issuer")
+            metadata = await fetch_authorization_metadata(issuer)
+        client_id = str(ctx.get("client_id") or "")
+        client_secret_raw = ctx.get("client_secret")
+        secret = str(client_secret_raw) if client_secret_raw else None
+        if not client_id:
+            raise ValueError("missing custom MCP oauth client_id")
+        resource = str(ctx.get("resource") or "") or None
+        exchange_redirect = str(ctx.get("redirect_uri") or "").strip() or redirect_uri
+        issuer = str(ctx.get("issuer") or "")
+        return await exchange_authorization_code(
+            metadata,
+            issuer=issuer,
+            client_id=client_id,
+            client_secret=secret,
+            code=code,
+            redirect_uri=exchange_redirect,
+            code_verifier=code_verifier,
+            resource=resource,
+        )
+
     if flow == "mcp" or kind in mcp_oauth_kinds():
         metadata = ctx.get("metadata")
         if not isinstance(metadata, dict):
diff --git a/src/octop/infra/connectors/probe.py b/src/octop/infra/connectors/probe.py
index 1ac5dd82..8f26da54 100644
--- a/src/octop/infra/connectors/probe.py
+++ b/src/octop/infra/connectors/probe.py
@@ -23,10 +23,39 @@
 )
 from octop.infra.connectors.gateway.protocol import handle_mcp_request
 from octop.infra.connectors.gateway.registry import probe_gateway_credentials
+from octop.infra.connectors.oauth.discovery import discover_oauth_from_mcp_url
 from octop.infra.utils.ssrf_guard import UnsafeOutboundUrl, safe_request
 
 logger = logging.getLogger(__name__)
 
+_LOCAL_WEKNORA_API_URL = "http://127.0.0.1:8080"
+_LOCAL_WEKNORA_CONSOLE_URL = "http://127.0.0.1"
+
+
+async def detect_local_weknora() -> dict[str, Any]:
+    """Detect a default host-side WeKnora deployment without persisting data.
+
+    The target is deliberately fixed to loopback.  This keeps the convenience
+    endpoint from becoming an arbitrary server-side URL fetch while matching
+    WeKnora's default Docker ports (UI 80, API 8080).
+    """
+    try:
+        async with httpx.AsyncClient(
+            timeout=httpx.Timeout(2.0),
+            follow_redirects=False,
+            trust_env=False,
+        ) as client:
+            response = await client.get(f"{_LOCAL_WEKNORA_API_URL}/health")
+    except httpx.HTTPError:
+        return {"found": False}
+    if not response.is_success:
+        return {"found": False}
+    return {
+        "found": True,
+        "base_url": f"{_LOCAL_WEKNORA_API_URL}/api/v1",
+        "console_url": _LOCAL_WEKNORA_CONSOLE_URL,
+    }
+
 
 def normalize_tools(raw: list[Any] | None) -> list[dict[str, str]]:
     out: list[dict[str, str]] = []
@@ -124,6 +153,30 @@ def _probe_mcp_http_error(exc: httpx.HTTPStatusError, *, kind: str) -> dict[str,
     }
 
 
+async def _maybe_attach_oauth_discovery(
+    result: dict[str, Any],
+    *,
+    url: str,
+    headers: dict[str, str],
+) -> dict[str, Any]:
+    """When auth fails without a bearer token, try MCP OAuth discovery."""
+    if result.get("ok") is not False or result.get("error_type") != "auth":
+        return result
+    auth_header = str(headers.get("Authorization") or "").strip()
+    if auth_header.lower().startswith("bearer ") and len(auth_header) > 7:
+        return result
+    discovery = await discover_oauth_from_mcp_url(url)
+    if discovery.get("available"):
+        result["oauth"] = {
+            "available": True,
+            "issuer": discovery.get("issuer"),
+            "resource": discovery.get("resource"),
+        }
+    else:
+        result["oauth"] = {"available": False}
+    return result
+
+
 def _probe_mcp_mcp_error(exc: McpError, *, kind: str) -> dict[str, Any]:
     """Map an MCP-level error (e.g. server closing the initialize stream).
 
@@ -359,7 +412,7 @@ async def probe_connector(
     headers = dict(spec.get("headers") or {})
     url = str(spec["url"])
 
-    if is_mcp_oauth_remote(entry):
+    if is_mcp_oauth_remote(entry) or entry.remote_transport == "streamable_http":
         return await probe_streamable_http_mcp(url, headers, kind=entry.kind)
 
     try:
@@ -431,6 +484,16 @@ async def probe_connector(
     }
 
 
+def format_probe_exception(exc: BaseException) -> str:
+    """Flatten TaskGroup / ExceptionGroup errors for API responses."""
+    if isinstance(exc, BaseExceptionGroup):
+        parts = [format_probe_exception(sub) for sub in exc.exceptions]
+        joined = "; ".join(part for part in parts if part)
+        return joined or str(exc)
+    msg = str(exc).strip()
+    return msg or type(exc).__name__
+
+
 async def probe_custom_mcp_server(spec: dict[str, Any]) -> dict[str, Any]:
     """Probe one user-defined MCP server (streamable_http or stdio)."""
     from octop.infra.connectors.custom_mcp import harness_spec_for_server, normalize_server_spec
@@ -448,7 +511,8 @@ async def probe_custom_mcp_server(spec: dict[str, Any]) -> dict[str, Any]:
         headers = {str(k): str(v) for k, v in dict(connection.get("headers") or {}).items()}
         # Ensure streamable Accept if caller omitted it.
         headers.setdefault("Accept", "application/json, text/event-stream")
-        return await probe_streamable_http_mcp(url, headers, kind="custom-mcp")
+        result = await probe_streamable_http_mcp(url, headers, kind="custom-mcp")
+        return await _maybe_attach_oauth_discovery(result, url=url, headers=headers)
 
     if transport == "stdio":
         return await _probe_stdio_mcp(connection)
@@ -485,4 +549,4 @@ async def _probe_stdio_mcp(connection: dict[str, Any]) -> dict[str, Any]:
         return {"ok": False, "error": "stdio MCP probe timed out"}
     except Exception as exc:
         logger.exception("stdio MCP probe failed")
-        return {"ok": False, "error": str(exc)}
+        return {"ok": False, "error": format_probe_exception(exc)}
diff --git a/src/octop/infra/connectors/service.py b/src/octop/infra/connectors/service.py
index c4c1eae2..a012e7e4 100644
--- a/src/octop/infra/connectors/service.py
+++ b/src/octop/infra/connectors/service.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import asyncio
+import logging
 import time
 from pathlib import Path
 from typing import Any
@@ -14,11 +15,18 @@
 from octop.infra.connectors.custom_mcp import (
     CUSTOM_MCP_DISPLAY_NAME,
     CUSTOM_MCP_KIND,
+    build_oauth_storage,
     enabled_harness_configs,
     expand_custom_instances,
     extract_servers,
     is_custom_mcp_kind,
+    mark_oauth_reauth_required,
+    merge_preserved_oauth,
+    oauth_configured,
+    oauth_tokens_from_spec,
+    redact_servers_for_api,
     server_enabled,
+    set_oauth_required_in_spec,
     validate_servers_map,
     wrap_servers,
 )
@@ -29,12 +37,17 @@
     start_user_device_login,
 )
 from octop.infra.connectors.oauth import refresh_oauth_credentials
+from octop.infra.connectors.oauth.registry import refresh_custom_mcp_oauth
 from octop.infra.db.repos.connectors import ConnectorRepo, ConnectorRow
 from octop.infra.db.repos.secrets import SecretRepo
 from octop.infra.errors import ErrorCode, OctopError
 from octop.infra.utils.paths import PathLayout
 from octop.infra.utils.ulid import new_ulid
 
+logger = logging.getLogger(__name__)
+
+_OAUTH_REFRESH_SKEW_SEC = 120
+
 
 def list_user_connector_instances(
     repo: ConnectorRepo,
@@ -140,7 +153,15 @@ def get_custom_servers(self, user_id: int) -> dict[str, Any]:
             return {}
         return extract_servers(self.decrypt(row.instance_id))
 
+    def get_custom_servers_for_api(self, user_id: int) -> dict[str, Any]:
+        return redact_servers_for_api(self.get_custom_servers(user_id))
+
     def put_custom_servers(self, user_id: int, servers: dict[str, Any]) -> dict[str, Any]:
+        existing = self.get_custom_servers(user_id)
+        merged = merge_preserved_oauth(servers, existing)
+        return self._save_custom_servers(user_id, merged)
+
+    def _save_custom_servers(self, user_id: int, servers: dict[str, Any]) -> dict[str, Any]:
         normalized = validate_servers_map(
             servers,
             reserved_names=self.reserved_builtin_mcp_names(user_id),
@@ -167,38 +188,124 @@ def put_custom_servers(self, user_id: int, servers: dict[str, Any]) -> dict[str,
         )
         return normalized
 
+    def apply_custom_server_oauth(
+        self,
+        user_id: int,
+        server_name: str,
+        tokens: dict[str, Any],
+        *,
+        issuer: str,
+        resource: str | None,
+    ) -> dict[str, Any]:
+        servers = dict(self.get_custom_servers(user_id))
+        if server_name not in servers:
+            raise KeyError(server_name)
+        access = str(tokens.get("access_token") or "").strip()
+        if not access:
+            raise ValueError("missing access_token")
+        spec = dict(servers[server_name])
+        spec["oauth"] = build_oauth_storage(tokens, issuer=issuer, resource=resource)
+        spec = set_oauth_required_in_spec(spec, required=False)
+        servers[server_name] = spec
+        return self._save_custom_servers(user_id, servers)
+
+    async def ensure_fresh_custom_servers(self, user_id: int) -> dict[str, Any]:
+        servers = dict(self.get_custom_servers(user_id))
+        changed = False
+        now = int(time.time())
+        for name, raw in list(servers.items()):
+            if not isinstance(raw, dict):
+                continue
+            oauth = oauth_tokens_from_spec(raw)
+            if not oauth_configured(raw):
+                continue
+            expires_at_raw = oauth.get("expires_at")
+            expires_at = int(expires_at_raw) if expires_at_raw is not None else None
+            refresh = str(oauth.get("refresh_token") or "").strip()
+            if expires_at is not None and expires_at <= now and not refresh:
+                servers[name] = mark_oauth_reauth_required(dict(raw))
+                changed = True
+                continue
+            if not refresh:
+                continue
+            if expires_at is not None and expires_at > now + _OAUTH_REFRESH_SKEW_SEC:
+                continue
+            try:
+                refreshed = await refresh_custom_mcp_oauth(oauth)
+            except Exception:
+                logger.warning(
+                    "custom MCP oauth refresh failed for %r (user_id=%s)",
+                    name,
+                    user_id,
+                    exc_info=True,
+                )
+                if expires_at is not None and expires_at <= now:
+                    servers[name] = mark_oauth_reauth_required(dict(raw))
+                    changed = True
+                continue
+            spec = dict(raw)
+            spec["oauth"] = refreshed
+            servers[name] = spec
+            changed = True
+        if not changed:
+            return servers
+        return self._save_custom_servers(user_id, servers)
+
     def patch_custom_server_enabled(
         self,
         user_id: int,
         server_name: str,
         *,
         enabled: bool,
+    ) -> dict[str, Any]:
+        return self.patch_custom_server(user_id, server_name, enabled=enabled)
+
+    def patch_custom_server(
+        self,
+        user_id: int,
+        server_name: str,
+        *,
+        enabled: bool | None = None,
+        default_open: bool | None = None,
     ) -> dict[str, Any]:
         servers = dict(self.get_custom_servers(user_id))
         if server_name not in servers:
             raise KeyError(server_name)
         spec = dict(servers[server_name])
-        spec["enabled"] = enabled
+        if enabled is not None:
+            spec["enabled"] = enabled
+            if not enabled:
+                spec.pop("default_open", None)
+        if default_open is not None:
+            if default_open:
+                spec["default_open"] = True
+            else:
+                spec.pop("default_open", None)
         servers[server_name] = spec
         return self.put_custom_servers(user_id, servers)
 
-    def patch_custom_server_default_open(
+    def note_custom_server_oauth_required(
         self,
         user_id: int,
         server_name: str,
         *,
-        default_open: bool,
+        required: bool,
     ) -> dict[str, Any]:
         servers = dict(self.get_custom_servers(user_id))
         if server_name not in servers:
             raise KeyError(server_name)
         spec = dict(servers[server_name])
-        if default_open:
-            spec["default_open"] = True
-        else:
-            spec.pop("default_open", None)
-        servers[server_name] = spec
-        return self.put_custom_servers(user_id, servers)
+        servers[server_name] = set_oauth_required_in_spec(spec, required=required)
+        return self._save_custom_servers(user_id, servers)
+
+    def patch_custom_server_default_open(
+        self,
+        user_id: int,
+        server_name: str,
+        *,
+        default_open: bool,
+    ) -> dict[str, Any]:
+        return self.patch_custom_server(user_id, server_name, default_open=default_open)
 
     def list_instances_for_api(self, user_id: int) -> list[dict[str, Any]]:
         """Built-in rows + expanded custom servers (hide parent custom-mcp row)."""
@@ -307,6 +414,7 @@ async def mcp_configs_for_user(self, user_id: int) -> dict[str, Any]:
                 creds=creds,
                 config=self._config,
             )
+        await self.ensure_fresh_custom_servers(user_id)
         configs.update(self.custom_harness_configs(user_id))
         return configs
 
diff --git a/src/octop/infra/db/migrate.py b/src/octop/infra/db/migrate.py
index 9928b828..0343dc42 100644
--- a/src/octop/infra/db/migrate.py
+++ b/src/octop/infra/db/migrate.py
@@ -48,6 +48,15 @@ def _discover(dialect: str = "sqlite") -> list[tuple[int, Path]]:
             m = re.match(r"^(\d{3})_.*\.sql$", name)
         if m:
             out.append((int(m.group(1)), entry))
+    seen: dict[int, Path] = {}
+    for version, path in out:
+        prior = seen.get(version)
+        if prior is not None:
+            raise RuntimeError(
+                f"Duplicate migration version {version:03d}: {prior.name} and {path.name}. "
+                "Fold unreleased schema into a single NNN_*.sql / NNN_*.pg.sql pair."
+            )
+        seen[version] = path
     return out
 
 
@@ -637,6 +646,8 @@ def _ensure_knowledge_bases_schema(db: DatabasePool) -> None:
     """Create or rebuild knowledge tables to the integer-PK identity schema."""
     _rebuild_knowledge_identity_schema(db)
     _drop_knowledge_base_members(db)
+    # Schema v10: per-knowledge-base configurable document limit.
+    _ensure_column(db, "knowledge_bases", "max_documents", "INTEGER NOT NULL DEFAULT 100")
 
 
 def _ensure_sso_oidc_schema(db: DatabasePool) -> None:
@@ -811,6 +822,97 @@ def _ensure_user_invites_schema(db: DatabasePool) -> None:
         )
 
 
+def _ensure_thread_message_projection_schema(db: DatabasePool) -> None:
+    """Create dashboard history projection tables if missing (schema v10).
+
+    Idempotent repair for installs that bumped ``_schema_version`` to 10 via a
+    colliding parallel ``010_*.sql`` without applying the projection DDL.
+    """
+    if not _table_exists(db, "threads"):
+        return
+    if _table_exists(db, "thread_messages") and _table_exists(db, "thread_history_projection"):
+        return
+    if db.dialect == "postgresql":
+        with db.connect() as conn, conn.transaction():
+            conn.execute(
+                """
+                CREATE TABLE IF NOT EXISTS thread_messages (
+                  id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+                  thread_id TEXT NOT NULL REFERENCES threads(thread_id) ON DELETE CASCADE,
+                  seq BIGINT NOT NULL,
+                  message_id TEXT,
+                  role TEXT NOT NULL,
+                  message_json TEXT NOT NULL,
+                  created_at BIGINT NOT NULL,
+                  UNIQUE(thread_id, seq),
+                  UNIQUE(thread_id, message_id)
+                )
+                """
+            )
+            conn.execute(
+                """
+                CREATE INDEX IF NOT EXISTS idx_thread_messages_thread_seq
+                  ON thread_messages(thread_id, seq DESC)
+                """
+            )
+            conn.execute(
+                """
+                CREATE TABLE IF NOT EXISTS thread_history_projection (
+                  thread_id TEXT PRIMARY KEY REFERENCES threads(thread_id) ON DELETE CASCADE,
+                  status TEXT NOT NULL,
+                  updated_at BIGINT NOT NULL,
+                  error TEXT
+                )
+                """
+            )
+            conn.execute(
+                """
+                INSERT INTO thread_history_projection(thread_id, status, updated_at, error)
+                SELECT thread_id,
+                       CASE WHEN last_active > 0 OR title IS NOT NULL
+                            THEN 'pending' ELSE 'ready' END,
+                       EXTRACT(EPOCH FROM NOW())::BIGINT,
+                       NULL
+                FROM threads
+                ON CONFLICT(thread_id) DO NOTHING
+                """
+            )
+        return
+    with db.connect() as conn:
+        conn.executescript(
+            """
+            CREATE TABLE IF NOT EXISTS thread_messages (
+              id            INTEGER PRIMARY KEY AUTOINCREMENT,
+              thread_id     TEXT NOT NULL REFERENCES threads(thread_id) ON DELETE CASCADE,
+              seq           INTEGER NOT NULL,
+              message_id    TEXT,
+              role          TEXT NOT NULL,
+              message_json  TEXT NOT NULL,
+              created_at    INTEGER NOT NULL,
+              UNIQUE(thread_id, seq),
+              UNIQUE(thread_id, message_id)
+            );
+
+            CREATE INDEX IF NOT EXISTS idx_thread_messages_thread_seq
+              ON thread_messages(thread_id, seq DESC);
+
+            CREATE TABLE IF NOT EXISTS thread_history_projection (
+              thread_id    TEXT PRIMARY KEY REFERENCES threads(thread_id) ON DELETE CASCADE,
+              status       TEXT NOT NULL,
+              updated_at   INTEGER NOT NULL,
+              error        TEXT
+            );
+
+            INSERT OR IGNORE INTO thread_history_projection(thread_id, status, updated_at, error)
+            SELECT thread_id,
+                   CASE WHEN last_active > 0 OR title IS NOT NULL THEN 'pending' ELSE 'ready' END,
+                   CAST(strftime('%s', 'now') AS INTEGER),
+                   NULL
+            FROM threads;
+            """
+        )
+
+
 def _repair_legacy_schema(db: DatabasePool) -> None:
     """Idempotent compatibility repairs for local databases from old builds."""
     if _table_exists(db, "users"):
@@ -892,6 +994,8 @@ def _reconcile_pre_squash_schema_version(db: DatabasePool) -> None:
                 _ensure_usage_cache_schema(db)
             if max_version >= 9:
                 _ensure_user_invites_schema(db)
+            if max_version >= 10:
+                _ensure_thread_message_projection_schema(db)
             with db.connect() as conn:
                 conn.execute("UPDATE _schema_version SET version = %s", (max_version,))
             return
@@ -919,6 +1023,8 @@ def _reconcile_pre_squash_schema_version(db: DatabasePool) -> None:
         _ensure_usage_cache_schema(db)
     if max_version >= 9:
         _ensure_user_invites_schema(db)
+    if max_version >= 10:
+        _ensure_thread_message_projection_schema(db)
     with db.connect() as conn:
         conn.execute("UPDATE _schema_version SET version = ?", (max_version,))
 
@@ -946,8 +1052,10 @@ 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 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.
     """
     if version == 2:
         if _table_exists(db, "cron_jobs"):
@@ -1019,6 +1127,13 @@ 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 == 10 and not _table_exists(db, "threads"):
+        # Some very old/partial installs only contain ``users``. They still
+        # need the version watermark to advance, but there is no history to
+        # project and the migration's INSERT ... SELECT threads cannot run.
+        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)
@@ -1052,3 +1167,4 @@ def run_migrations(db: DatabasePool) -> None:
     _ensure_published_experts_schema(db)
     _ensure_usage_cache_schema(db)
     _ensure_user_invites_schema(db)
+    _ensure_thread_message_projection_schema(db)
diff --git a/src/octop/infra/db/migrations/010_thread_message_projection.pg.sql b/src/octop/infra/db/migrations/010_thread_message_projection.pg.sql
new file mode 100644
index 00000000..825a0aa5
--- /dev/null
+++ b/src/octop/infra/db/migrations/010_thread_message_projection.pg.sql
@@ -0,0 +1,37 @@
+-- Schema v10: dashboard history read model.
+-- knowledge_bases.max_documents is applied by migrate.py::_ensure_knowledge_bases_schema
+-- (not a separate 010_*.sql — duplicate version numbers skip later files).
+-- Existing message-bearing threads are backfilled lazily; new/empty threads can use
+-- the projection immediately.
+
+CREATE TABLE IF NOT EXISTS thread_messages (
+  id            BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+  thread_id     TEXT NOT NULL REFERENCES threads(thread_id) ON DELETE CASCADE,
+  seq           BIGINT NOT NULL,
+  message_id    TEXT,
+  role          TEXT NOT NULL,
+  message_json  TEXT NOT NULL,
+  created_at    BIGINT NOT NULL,
+  UNIQUE(thread_id, seq),
+  UNIQUE(thread_id, message_id)
+);
+
+CREATE INDEX IF NOT EXISTS idx_thread_messages_thread_seq
+  ON thread_messages(thread_id, seq DESC);
+
+CREATE TABLE IF NOT EXISTS thread_history_projection (
+  thread_id    TEXT PRIMARY KEY REFERENCES threads(thread_id) ON DELETE CASCADE,
+  status       TEXT NOT NULL,
+  updated_at   BIGINT NOT NULL,
+  error        TEXT
+);
+
+INSERT INTO thread_history_projection(thread_id, status, updated_at, error)
+SELECT thread_id,
+       CASE WHEN last_active > 0 OR title IS NOT NULL THEN 'pending' ELSE 'ready' END,
+       EXTRACT(EPOCH FROM NOW())::BIGINT,
+       NULL
+FROM threads
+ON CONFLICT(thread_id) DO NOTHING;
+
+UPDATE _schema_version SET version = 10;
diff --git a/src/octop/infra/db/migrations/010_thread_message_projection.sql b/src/octop/infra/db/migrations/010_thread_message_projection.sql
new file mode 100644
index 00000000..922a1f38
--- /dev/null
+++ b/src/octop/infra/db/migrations/010_thread_message_projection.sql
@@ -0,0 +1,36 @@
+-- Schema v10: dashboard history read model.
+-- knowledge_bases.max_documents is applied by migrate.py::_ensure_knowledge_bases_schema
+-- (not a separate 010_*.sql — duplicate version numbers skip later files).
+-- Existing message-bearing threads are backfilled lazily; new/empty threads can use
+-- the projection immediately.
+
+CREATE TABLE IF NOT EXISTS thread_messages (
+  id            INTEGER PRIMARY KEY AUTOINCREMENT,
+  thread_id     TEXT NOT NULL REFERENCES threads(thread_id) ON DELETE CASCADE,
+  seq           INTEGER NOT NULL,
+  message_id    TEXT,
+  role          TEXT NOT NULL,
+  message_json  TEXT NOT NULL,
+  created_at    INTEGER NOT NULL,
+  UNIQUE(thread_id, seq),
+  UNIQUE(thread_id, message_id)
+);
+
+CREATE INDEX IF NOT EXISTS idx_thread_messages_thread_seq
+  ON thread_messages(thread_id, seq DESC);
+
+CREATE TABLE IF NOT EXISTS thread_history_projection (
+  thread_id    TEXT PRIMARY KEY REFERENCES threads(thread_id) ON DELETE CASCADE,
+  status       TEXT NOT NULL,
+  updated_at   INTEGER NOT NULL,
+  error        TEXT
+);
+
+INSERT OR IGNORE INTO thread_history_projection(thread_id, status, updated_at, error)
+SELECT thread_id,
+       CASE WHEN last_active > 0 OR title IS NOT NULL THEN 'pending' ELSE 'ready' END,
+       CAST(strftime('%s', 'now') AS INTEGER),
+       NULL
+FROM threads;
+
+UPDATE _schema_version SET version = 10;
diff --git a/src/octop/infra/db/repos/knowledge.py b/src/octop/infra/db/repos/knowledge.py
index 2455c4cf..c5b28fa5 100644
--- a/src/octop/infra/db/repos/knowledge.py
+++ b/src/octop/infra/db/repos/knowledge.py
@@ -31,11 +31,16 @@ class KnowledgeBaseRow:
     embedding_model: str
     embedding_dim: int
     doc_count: int
+    max_documents: int
     created_at: int
     updated_at: int
 
     @classmethod
     def from_row(cls, r: DbRow) -> KnowledgeBaseRow:
+        # Schema v10 adds max_documents. Fall back to 100 for pre-v10 DBs.
+        # sqlite3.Row has no __contains__; use keys() (like users.py).
+        keys = frozenset(r.keys()) if hasattr(r, "keys") else frozenset()
+        max_doc = int(r["max_documents"]) if "max_documents" in keys else 100
         return cls(
             id=str(r["knowledge_base_id"]),
             pk=int(r["id"]),
@@ -48,6 +53,7 @@ def from_row(cls, r: DbRow) -> KnowledgeBaseRow:
             embedding_model=r["embedding_model"],
             embedding_dim=r["embedding_dim"],
             doc_count=r["doc_count"],
+            max_documents=max_doc,
             created_at=r["created_at"],
             updated_at=r["updated_at"],
         )
@@ -112,29 +118,54 @@ def create_base(
         icon_name: str = "",
         embedding_model: str = "",
         embedding_dim: int = 0,
+        max_documents: int | None = None,
     ) -> KnowledgeBaseRow:
         kb_id = self._allocate_base_id()
         ts = now_ts()
         with self._db.transaction() as conn:
-            conn.execute(
-                "INSERT INTO knowledge_bases("
-                "knowledge_base_id, owner_user_id, name, description, default_open, shared, "
-                "icon_name, embedding_model, embedding_dim, doc_count, created_at, updated_at"
-                ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 0, ?, ?)",
-                (
-                    kb_id,
-                    owner_user_id,
-                    name,
-                    description,
-                    bool_int(default_open),
-                    bool_int(shared),
-                    icon_name,
-                    embedding_model,
-                    embedding_dim,
-                    ts,
-                    ts,
-                ),
-            )
+            if max_documents is None:
+                # Rely on the column DEFAULT (100) for max_documents.
+                conn.execute(
+                    "INSERT INTO knowledge_bases("
+                    "knowledge_base_id, owner_user_id, name, description, default_open, shared, "
+                    "icon_name, embedding_model, embedding_dim, doc_count, created_at, updated_at"
+                    ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 0, ?, ?)",
+                    (
+                        kb_id,
+                        owner_user_id,
+                        name,
+                        description,
+                        bool_int(default_open),
+                        bool_int(shared),
+                        icon_name,
+                        embedding_model,
+                        embedding_dim,
+                        ts,
+                        ts,
+                    ),
+                )
+            else:
+                conn.execute(
+                    "INSERT INTO knowledge_bases("
+                    "knowledge_base_id, owner_user_id, name, description, default_open, shared, "
+                    "icon_name, embedding_model, embedding_dim, doc_count, max_documents, "
+                    "created_at, updated_at"
+                    ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 0, ?, ?, ?)",
+                    (
+                        kb_id,
+                        owner_user_id,
+                        name,
+                        description,
+                        bool_int(default_open),
+                        bool_int(shared),
+                        icon_name,
+                        embedding_model,
+                        embedding_dim,
+                        max_documents,
+                        ts,
+                        ts,
+                    ),
+                )
         row = self.get_base(kb_id)
         if row is None:
             raise RuntimeError(f"knowledge base insert failed: {kb_id}")
@@ -183,6 +214,7 @@ def update_base(
         embedding_model: str | None = None,
         embedding_dim: int | None = None,
         doc_count: int | None = None,
+        max_documents: int | None = None,
     ) -> None:
         fields, params = partial_updates(
             [
@@ -194,6 +226,7 @@ def update_base(
                 ("embedding_model", embedding_model),
                 ("embedding_dim", embedding_dim),
                 ("doc_count", doc_count),
+                ("max_documents", max_documents),
             ]
         )
         if not fields:
@@ -264,8 +297,12 @@ def create_document(
             self.ensure_folder(kb_id, folder)
         doc_id = new_ulid()
         ts = now_ts()
+        # Treat both None (caller did not specify) and 0 (per-base "unlimited"
+        # sentinel) as unbounded. Otherwise 0 would be enforced literally as
+        # "at most 0 documents" and reject every create.
+        enforce_limit = max_documents is not None and max_documents > 0
         with self._db.transaction() as conn:
-            if max_documents is not None:
+            if enforce_limit:
                 cursor = conn.execute(
                     "UPDATE knowledge_bases SET doc_count = doc_count + 1, updated_at = ? "
                     "WHERE knowledge_base_id = ? AND doc_count < ?",
@@ -280,7 +317,7 @@ def create_document(
                 ") VALUES (?, ?, ?, ?, 0, ?, ?, ?, ?, '', 0, ?, ?)",
                 (doc_id, kb_id, rel, name, content_type, byte_size, content_hash, status, ts, ts),
             )
-            if max_documents is None:
+            if not enforce_limit:
                 conn.execute(
                     "UPDATE knowledge_bases SET doc_count = doc_count + 1, updated_at = ? "
                     "WHERE knowledge_base_id = ?",
diff --git a/src/octop/infra/db/repos/thread_messages.py b/src/octop/infra/db/repos/thread_messages.py
new file mode 100644
index 00000000..09e6ce33
--- /dev/null
+++ b/src/octop/infra/db/repos/thread_messages.py
@@ -0,0 +1,250 @@
+"""Projection rows used by the dashboard history API."""
+
+from __future__ import annotations
+
+from collections.abc import Sequence
+from dataclasses import dataclass
+
+from octop.infra.db.pool import DatabasePool
+from octop.infra.db.repos._base import DbRow, now_ts
+
+
+@dataclass(frozen=True)
+class ThreadMessageInput:
+    message_id: str | None
+    role: str
+    message_json: str
+    created_at: int
+
+
+@dataclass(frozen=True)
+class ThreadMessageRow:
+    seq: int
+    message_id: str | None
+    role: str
+    message_json: str
+    created_at: int
+
+    @classmethod
+    def from_row(cls, row: DbRow) -> ThreadMessageRow:
+        return cls(
+            seq=int(row["seq"]),
+            message_id=str(row["message_id"]) if row["message_id"] else None,
+            role=str(row["role"]),
+            message_json=str(row["message_json"]),
+            created_at=int(row["created_at"]),
+        )
+
+
+@dataclass(frozen=True)
+class ThreadProjectionCandidate:
+    thread_id: str
+    status: str
+
+
+@dataclass(frozen=True)
+class ThreadProjectionSummary:
+    pending: int = 0
+    queued: int = 0
+    running: int = 0
+    failed: int = 0
+
+    @property
+    def remaining(self) -> int:
+        return self.pending + self.queued + self.running + self.failed
+
+
+class ThreadMessageRepo:
+    """Keep checkpoint-sized data out of normal dashboard history reads."""
+
+    def __init__(self, db: DatabasePool) -> None:
+        self._db = db
+
+    def projection_status(self, thread_id: str) -> str:
+        with self._db.connect() as conn:
+            row = conn.execute(
+                "SELECT status FROM thread_history_projection WHERE thread_id = ?",
+                (thread_id,),
+            ).fetchone()
+        return str(row["status"]) if row else "pending"
+
+    def mark_projection(
+        self,
+        thread_id: str,
+        status: str,
+        *,
+        error: str | None = None,
+    ) -> None:
+        with self._db.transaction() as conn:
+            conn.execute(
+                "INSERT INTO thread_history_projection(thread_id, status, updated_at, error) "
+                "VALUES (?, ?, ?, ?) "
+                "ON CONFLICT(thread_id) DO UPDATE SET "
+                "status = excluded.status, updated_at = excluded.updated_at, error = excluded.error",
+                (thread_id, status, now_ts(), error),
+            )
+
+    def migration_summary(self, *, agent_id: str, user_id: int) -> ThreadProjectionSummary:
+        """Count legacy threads that still need a history projection."""
+        counts = {"pending": 0, "queued": 0, "running": 0, "failed": 0}
+        with self._db.connect() as conn:
+            rows = conn.execute(
+                "SELECT COALESCE(p.status, 'pending') AS status, COUNT(*) AS total "
+                "FROM threads t LEFT JOIN thread_history_projection p "
+                "ON p.thread_id = t.thread_id "
+                "WHERE t.agent_id = ? AND t.user_id = ? "
+                "AND COALESCE(p.status, 'pending') != 'ready' "
+                "GROUP BY COALESCE(p.status, 'pending')",
+                (agent_id, user_id),
+            ).fetchall()
+        for row in rows:
+            status = str(row["status"])
+            if status in counts:
+                counts[status] = int(row["total"])
+            else:
+                counts["pending"] += int(row["total"])
+        return ThreadProjectionSummary(**counts)
+
+    def migration_candidates(
+        self,
+        *,
+        agent_id: str,
+        user_id: int,
+        limit: int,
+    ) -> list[ThreadProjectionCandidate]:
+        """Return recent legacy threads first without reading checkpoint blobs."""
+        if limit <= 0:
+            return []
+        with self._db.connect() as conn:
+            rows = conn.execute(
+                "SELECT t.thread_id, COALESCE(p.status, 'pending') AS status "
+                "FROM threads t LEFT JOIN thread_history_projection p "
+                "ON p.thread_id = t.thread_id "
+                "WHERE t.agent_id = ? AND t.user_id = ? "
+                "AND COALESCE(p.status, 'pending') != 'ready' "
+                "ORDER BY t.last_active DESC, t.thread_id DESC LIMIT ?",
+                (agent_id, user_id, limit),
+            ).fetchall()
+        return [
+            ThreadProjectionCandidate(thread_id=str(row["thread_id"]), status=str(row["status"]))
+            for row in rows
+        ]
+
+    def migration_active_thread_ids(self, *, agent_id: str, user_id: int) -> list[str]:
+        """Persisted queued/running IDs, used to distinguish live work from restart residue."""
+        with self._db.connect() as conn:
+            rows = conn.execute(
+                "SELECT t.thread_id FROM threads t "
+                "JOIN thread_history_projection p ON p.thread_id = t.thread_id "
+                "WHERE t.agent_id = ? AND t.user_id = ? "
+                "AND p.status IN ('queued', 'running')",
+                (agent_id, user_id),
+            ).fetchall()
+        return [str(row["thread_id"]) for row in rows]
+
+    def page(
+        self,
+        thread_id: str,
+        *,
+        limit: int,
+        offset: int = 0,
+    ) -> tuple[list[ThreadMessageRow], bool]:
+        with self._db.connect() as conn:
+            rows = conn.execute(
+                "SELECT seq, message_id, role, message_json, created_at "
+                "FROM thread_messages WHERE thread_id = ? "
+                "ORDER BY seq DESC LIMIT ? OFFSET ?",
+                (thread_id, limit + 1, max(0, offset)),
+            ).fetchall()
+        has_more = len(rows) > limit
+        page = [ThreadMessageRow.from_row(row) for row in rows[:limit]]
+        page.reverse()
+        return page, has_more
+
+    def append_if_ready(
+        self,
+        thread_id: str,
+        messages: Sequence[ThreadMessageInput],
+    ) -> int:
+        """Append one completed turn. Pending legacy threads wait for backfill."""
+        if not messages:
+            return 0
+        inserted = 0
+        with self._db.transaction() as conn:
+            state = conn.execute(
+                "SELECT status FROM thread_history_projection WHERE thread_id = ?",
+                (thread_id,),
+            ).fetchone()
+            if state is None or str(state["status"]) != "ready":
+                return 0
+            if self._db.dialect == "postgresql":
+                conn.execute(
+                    "SELECT thread_id FROM threads WHERE thread_id = ? FOR UPDATE",
+                    (thread_id,),
+                ).fetchone()
+            row = conn.execute(
+                "SELECT COALESCE(MAX(seq), 0) AS max_seq FROM thread_messages WHERE thread_id = ?",
+                (thread_id,),
+            ).fetchone()
+            seq = int(row["max_seq"]) if row else 0
+            for message in messages:
+                if message.message_id:
+                    duplicate = conn.execute(
+                        "SELECT 1 FROM thread_messages WHERE thread_id = ? AND message_id = ?",
+                        (thread_id, message.message_id),
+                    ).fetchone()
+                    if duplicate is not None:
+                        continue
+                seq += 1
+                conn.execute(
+                    "INSERT INTO thread_messages("
+                    "thread_id, seq, message_id, role, message_json, created_at"
+                    ") VALUES (?, ?, ?, ?, ?, ?)",
+                    (
+                        thread_id,
+                        seq,
+                        message.message_id,
+                        message.role,
+                        message.message_json,
+                        message.created_at,
+                    ),
+                )
+                inserted += 1
+        return inserted
+
+    def replace_all(
+        self,
+        thread_id: str,
+        messages: Sequence[ThreadMessageInput],
+    ) -> int:
+        """Publish a decoded legacy checkpoint using short write batches.
+
+        Readers are gated by ``status != ready``, so the batches stay invisible
+        without holding SQLite's writer lock for the entire transcript.
+        """
+        with self._db.transaction() as conn:
+            if self._db.dialect == "postgresql":
+                conn.execute(
+                    "SELECT thread_id FROM threads WHERE thread_id = ? FOR UPDATE",
+                    (thread_id,),
+                ).fetchone()
+            conn.execute("DELETE FROM thread_messages WHERE thread_id = ?", (thread_id,))
+        batch_size = 200
+        for start in range(0, len(messages), batch_size):
+            with self._db.transaction() as conn:
+                for index, message in enumerate(messages[start : start + batch_size], start=start):
+                    conn.execute(
+                        "INSERT INTO thread_messages("
+                        "thread_id, seq, message_id, role, message_json, created_at"
+                        ") VALUES (?, ?, ?, ?, ?, ?)",
+                        (
+                            thread_id,
+                            index + 1,
+                            message.message_id,
+                            message.role,
+                            message.message_json,
+                            message.created_at,
+                        ),
+                    )
+        self.mark_projection(thread_id, "ready")
+        return len(messages)
diff --git a/src/octop/infra/db/repos/threads.py b/src/octop/infra/db/repos/threads.py
index 50b54a89..a1edb3e7 100644
--- a/src/octop/infra/db/repos/threads.py
+++ b/src/octop/infra/db/repos/threads.py
@@ -184,6 +184,11 @@ def insert(
                     ts,
                 ),
             )
+            conn.execute(
+                "INSERT INTO thread_history_projection(thread_id, status, updated_at, error) "
+                "VALUES (?, 'ready', ?, NULL) ON CONFLICT(thread_id) DO NOTHING",
+                (thread_id, ts),
+            )
 
     def get(self, thread_id: str) -> ThreadRow | None:
         with self._db.connect() as conn:
diff --git a/src/octop/infra/db/services.py b/src/octop/infra/db/services.py
index 1898264c..11c587e8 100644
--- a/src/octop/infra/db/services.py
+++ b/src/octop/infra/db/services.py
@@ -23,6 +23,7 @@
 from octop.infra.db.repos.settings import SettingsRepo
 from octop.infra.db.repos.skill_packages import SkillPackageRepo
 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.usage import UsageRepo
 from octop.infra.db.repos.users import UserRepo
@@ -42,6 +43,7 @@ class RepoBundle:
     cron_repo: CronJobRepo
     session_repo: SessionRepo
     thread_repo: ThreadRepo
+    thread_message_repo: ThreadMessageRepo
     secret_repo: SecretRepo
     audit_repo: AuditRepo
     usage_repo: UsageRepo
@@ -68,6 +70,7 @@ def from_pool(cls, db: DatabasePool) -> RepoBundle:
             cron_repo=CronJobRepo(db),
             session_repo=SessionRepo(db),
             thread_repo=ThreadRepo(db),
+            thread_message_repo=ThreadMessageRepo(db),
             secret_repo=SecretRepo(db),
             audit_repo=AuditRepo(db),
             usage_repo=UsageRepo(db),
@@ -126,6 +129,10 @@ def session_repo(self) -> SessionRepo:
     def thread_repo(self) -> ThreadRepo:
         return self.repos.thread_repo
 
+    @property
+    def thread_message_repo(self) -> ThreadMessageRepo:
+        return self.repos.thread_message_repo
+
     @property
     def secret_repo(self) -> SecretRepo:
         return self.repos.secret_repo
diff --git a/src/octop/infra/gateway/channels/dingtalk_registration.py b/src/octop/infra/gateway/channels/dingtalk_registration.py
new file mode 100644
index 00000000..007e4eef
--- /dev/null
+++ b/src/octop/infra/gateway/channels/dingtalk_registration.py
@@ -0,0 +1,57 @@
+"""DingTalk Device Flow helpers for one-click application registration."""
+
+from __future__ import annotations
+
+from typing import Any
+
+import httpx
+
+_BASE_URL = "https://oapi.dingtalk.com"
+_TIMEOUT_SECONDS = 15.0
+
+
+def _require_success(data: Any, operation: str) -> dict[str, Any]:
+    if not isinstance(data, dict):
+        raise RuntimeError(f"DingTalk {operation} returned an invalid response")
+    if data.get("errcode") != 0:
+        message = str(data.get("errmsg") or "unknown error")
+        raise RuntimeError(f"DingTalk {operation} failed: {message}")
+    return data
+
+
+async def generate() -> dict[str, Any]:
+    """Initialize Device Flow and return the public QR-code metadata."""
+    async with httpx.AsyncClient(base_url=_BASE_URL, timeout=_TIMEOUT_SECONDS) as client:
+        init_response = await client.post("/app/registration/init", json={})
+        init_response.raise_for_status()
+        initialized = _require_success(init_response.json(), "registration init")
+        nonce = initialized.get("nonce")
+        if not isinstance(nonce, str) or not nonce:
+            raise RuntimeError("DingTalk registration init response is missing nonce")
+
+        begin_response = await client.post(
+            "/app/registration/begin",
+            json={"nonce": nonce},
+        )
+        begin_response.raise_for_status()
+        started = _require_success(begin_response.json(), "registration begin")
+
+    required = (
+        "device_code",
+        "user_code",
+        "verification_uri_complete",
+    )
+    if any(not isinstance(started.get(key), str) or not started[key] for key in required):
+        raise RuntimeError("DingTalk registration begin response is incomplete")
+    return started
+
+
+async def poll(device_code: str) -> dict[str, Any]:
+    """Poll a DingTalk Device Flow registration without exposing its device code."""
+    async with httpx.AsyncClient(base_url=_BASE_URL, timeout=_TIMEOUT_SECONDS) as client:
+        response = await client.post(
+            "/app/registration/poll",
+            json={"device_code": device_code},
+        )
+        response.raise_for_status()
+    return _require_success(response.json(), "registration poll")
diff --git a/src/octop/infra/gateway/gateway.py b/src/octop/infra/gateway/gateway.py
index 37ff0fd4..be37465d 100644
--- a/src/octop/infra/gateway/gateway.py
+++ b/src/octop/infra/gateway/gateway.py
@@ -20,6 +20,7 @@
 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.processor import GlobalProcessor
 from octop.infra.gateway.process.response_mode import (
@@ -33,6 +34,7 @@
     WebSocketChannel,
     WebSocketHub,
 )
+from octop.infra.utils.llm_text import strip_thinking
 from octop.infra.utils.locale import DEFAULT_LOCALE, Locale
 
 if TYPE_CHECKING:
@@ -116,6 +118,7 @@ def __init__(
         self._ws_channel: WebSocketChannel | None = None
         self._cli_channel: CliChannel | None = None
         self._runtime_status: dict[str, ChannelRuntimeStatus] = {}
+        self._history_backfill = HistoryBackfillQueue()
 
     def replace_repos(self, repos: RepoBundle) -> None:
         """Point channel/thread persistence at a rebound control-plane pool."""
@@ -124,6 +127,8 @@ def replace_repos(self, repos: RepoBundle) -> None:
             session_repo=repos.session_repo,
             thread_repo=repos.thread_repo,
         )
+        if self._processor is not None:
+            self._processor.replace_thread_message_repo(repos.thread_message_repo)
 
     @property
     def ws_hub(self) -> WebSocketHub:
@@ -155,6 +160,10 @@ def processor(self) -> GlobalProcessor:
             raise RuntimeError("gateway not booted")
         return self._processor
 
+    @property
+    def history_backfill(self) -> HistoryBackfillQueue:
+        return self._history_backfill
+
     @property
     def slash_meta(self) -> SlashRuntimeMeta | None:
         return self._slash_meta
@@ -199,6 +208,7 @@ async def boot(self) -> None:
             provider_repo=self._repos.provider_repo,
             dispatcher=self._dispatcher,
             usage_repo=self._repos.usage_repo,
+            thread_message_repo=self._repos.thread_message_repo,
             gateway=self,
         )
 
@@ -270,6 +280,7 @@ async def reload_channels_from_db(self) -> None:
         logger.info("Gateway channels reloaded from DB (%d enabled)", len(rows))
 
     async def shutdown(self) -> None:
+        await self._history_backfill.close()
         if self._channel_manager:
             await self._channel_manager.stop()
         self._channel_manager = None
@@ -442,7 +453,7 @@ async def push_text_from_session(
             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 = "".join(parts).strip() or "(empty)"
+            outbound = strip_thinking("".join(parts)) or "(empty)"
 
         if virtual_stream:
             self._bump_dashboard_session(session, session_key, text)
diff --git a/src/octop/infra/gateway/history_backfill.py b/src/octop/infra/gateway/history_backfill.py
new file mode 100644
index 00000000..e3611ea4
--- /dev/null
+++ b/src/octop/infra/gateway/history_backfill.py
@@ -0,0 +1,66 @@
+"""Bounded single-worker queue for legacy checkpoint history projection."""
+
+from __future__ import annotations
+
+import asyncio
+import contextlib
+import logging
+from collections.abc import Awaitable, Callable
+
+BackfillWork = Callable[[], Awaitable[None]]
+logger = logging.getLogger(__name__)
+
+
+class HistoryBackfillQueue:
+    """Deduplicate jobs and ensure only one huge checkpoint is decoded at once."""
+
+    def __init__(self, *, max_pending: int = 100) -> None:
+        self._max_pending = max_pending
+        self._queue: asyncio.Queue[tuple[str, BackfillWork]] = asyncio.Queue(maxsize=max_pending)
+        self._known: set[str] = set()
+        self._worker: asyncio.Task[None] | None = None
+
+    def enqueue(self, key: str, work: BackfillWork) -> bool:
+        if key in self._known:
+            return True
+        if self._queue.full():
+            return False
+        self._known.add(key)
+        self._queue.put_nowait((key, work))
+        if self._worker is None or self._worker.done():
+            self._worker = asyncio.create_task(self._run(), name="history-backfill")
+        return True
+
+    @property
+    def available_slots(self) -> int:
+        """Number of bounded waiting slots available to bulk migration."""
+        return max(0, self._max_pending - self._queue.qsize())
+
+    @property
+    def active_jobs(self) -> int:
+        """Queued plus currently running deduplicated jobs."""
+        return len(self._known)
+
+    def contains(self, key: str) -> bool:
+        """Whether this process is actively responsible for a persisted job."""
+        return key in self._known
+
+    async def _run(self) -> None:
+        while True:
+            key, work = await self._queue.get()
+            try:
+                await work()
+            except Exception:
+                logger.exception("legacy history backfill job failed: %s", key)
+            finally:
+                self._known.discard(key)
+                self._queue.task_done()
+
+    async def close(self) -> None:
+        worker = self._worker
+        self._worker = None
+        if worker is None:
+            return
+        worker.cancel()
+        with contextlib.suppress(asyncio.CancelledError):
+            await worker
diff --git a/src/octop/infra/gateway/hitl/coordinator.py b/src/octop/infra/gateway/hitl/coordinator.py
index b5db90be..40dd6b5d 100644
--- a/src/octop/infra/gateway/hitl/coordinator.py
+++ b/src/octop/infra/gateway/hitl/coordinator.py
@@ -10,7 +10,14 @@
 from harness_gateway.models import MessageEvent
 
 from octop.i18n.domains.slash import tr
-from octop.infra.gateway.hitl.format import parse_action_requests, parse_review_configs
+from octop.infra.gateway.hitl.format import (
+    extract_questions,
+    format_ask_card,
+    is_ask_action_requests,
+    parse_action_requests,
+    parse_ask_reply,
+    parse_review_configs,
+)
 from octop.infra.gateway.hitl.store import HitlPendingRecord, HitlPendingStore
 from octop.infra.gateway.process.usage_record import UsageTracker
 from octop.infra.gateway.slash.ctx import ensure_thread_id
@@ -38,6 +45,14 @@ class HitlSlashOutcome:
     completed_turn: bool = False
 
 
+@dataclass
+class HitlAnswerOutcome:
+    """Whether an IM answer resumed the graph or only advanced the form."""
+
+    completed_turn: bool = False
+    awaiting_more: bool = False
+
+
 def pending_hitl_payload(
     store: HitlPendingStore,
     *,
@@ -59,6 +74,41 @@ def pending_hitl_payload(
     }
 
 
+def decision_rejection_reason(
+    record: HitlPendingRecord,
+    decisions: list[dict[str, Any]],
+) -> str | None:
+    """Check decisions against the pause's ``allowed_decisions``.
+
+    The agent middleware raises deep inside the graph when a decision type is
+    not allowed for its tool, which surfaces to the user as an opaque "model
+    retry failed". Catching it at the API boundary turns a stale or buggy client
+    into an actionable 400 instead.
+
+    Returns an error message, or ``None`` when the decisions are acceptable.
+    """
+    actions = record.action_requests
+    if len(decisions) != len(actions):
+        return f"expected {len(actions)} decision(s) for this pause, got {len(decisions)}"
+    allowed_by_action: dict[str, set[str]] = {}
+    for config in record.review_configs or []:
+        name = config.get("action_name")
+        allowed = config.get("allowed_decisions")
+        if isinstance(name, str) and isinstance(allowed, list):
+            allowed_by_action[name] = {str(item) for item in allowed}
+    for action, decision in zip(actions, decisions, strict=True):
+        allowed = allowed_by_action.get(str(action.get("name")))
+        if not allowed:
+            continue
+        kind = str(decision.get("type"))
+        if kind not in allowed:
+            return (
+                f"decision '{kind}' is not allowed for tool "
+                f"'{action.get('name')}' (allowed: {', '.join(sorted(allowed))})"
+            )
+    return None
+
+
 class HitlChannelCoordinator:
     def __init__(self, store: HitlPendingStore | None = None) -> None:
         self._store = store or HitlPendingStore()
@@ -96,6 +146,169 @@ def build_decisions(
         reject_message = message or "Rejected by user"
         return [{"type": "reject", "message": reject_message} for _ in range(count)]
 
+    def resolve_ask_pending(
+        self,
+        session_key: str,
+        *,
+        agent_id: str,
+        user_id: int,
+    ) -> HitlPendingRecord | None:
+        """Return the open ``ask_user_question`` pause this user may answer.
+
+        Returns ``None`` for approval pauses (those keep using ``/approve``) and
+        for questions addressed to a different user in the same group chat.
+        """
+        record = self._store.resolve_for_session(session_key, agent_id=agent_id)
+        if record is None or record.status != "pending":
+            return None
+        if record.user_id != user_id:
+            return None
+        if not is_ask_action_requests(record.action_requests):
+            return None
+        return record
+
+    @staticmethod
+    def build_answer_decisions(
+        record: HitlPendingRecord,
+        text: str,
+        *,
+        locale: str,
+    ) -> list[dict[str, Any]]:
+        """Build ``respond`` decisions carrying the user's answer to the model."""
+        message = parse_ask_reply(
+            text,
+            extract_questions(record.action_requests),
+            locale=locale,
+        )
+        count = len(record.action_requests) or 1
+        return [{"type": "respond", "message": message} for _ in range(count)]
+
+    @staticmethod
+    def _answer_decisions(
+        record: HitlPendingRecord,
+        message: str,
+    ) -> list[dict[str, Any]]:
+        count = len(record.action_requests) or 1
+        return [{"type": "respond", "message": message} for _ in range(count)]
+
+    @staticmethod
+    def _collected_answer_message(
+        questions: list[dict[str, Any]],
+        answers: list[str],
+        *,
+        locale: Locale,
+    ) -> str:
+        lines = [tr("ask.answered_prefix", locale).rstrip()]
+        for index, answer in enumerate(answers):
+            question = questions[index] if index < len(questions) else {}
+            header = str(question.get("header") or "").strip()
+            prompt = str(question.get("question") or "").strip()
+            label = header or prompt or str(index + 1)
+            lines.append(f"- {label}: {answer}")
+        return "\n".join(lines)
+
+    def collect_ask_reply(
+        self,
+        record: HitlPendingRecord,
+        text: str,
+        *,
+        locale: str | Locale,
+    ) -> tuple[str | None, str | None]:
+        """Collect one IM answer; return ``(resume_message, next_card)``."""
+        lang = normalize_locale(str(locale))
+        questions = extract_questions(record.action_requests)
+        if not questions:
+            return parse_ask_reply(text, questions, locale=lang), None
+
+        current = min(record.ask_question_index, len(questions) - 1)
+        answer = parse_ask_reply(text, [questions[current]], locale=lang)
+        prefix = tr("ask.answered_prefix", lang)
+        if answer.startswith(prefix):
+            answer = answer[len(prefix) :].strip()
+        updated = self._store.append_ask_answer(record.pending_id, answer)
+        if updated is None:
+            return None, None
+
+        if updated.ask_question_index < len(questions):
+            next_card = format_ask_card(
+                questions,
+                pending_id=record.pending_id,
+                locale=lang,
+                question_index=updated.ask_question_index,
+            )
+            return None, next_card
+
+        return (
+            self._collected_answer_message(
+                questions,
+                updated.ask_answers,
+                locale=lang,
+            ),
+            None,
+        )
+
+    async def iter_answer_resolution(
+        self,
+        record: HitlPendingRecord,
+        text: str,
+        *,
+        agent_manager: AgentManager,
+        locale: str,
+        usage_tracker: UsageTracker | None = None,
+        history_tracker: Any | None = None,
+        projection_state: Any | None = None,
+        outcome: HitlAnswerOutcome | None = None,
+    ) -> AsyncIterator[MessageEvent]:
+        """Collect one IM answer and resume only after the final question."""
+        from octop.infra.gateway.process.stream_project import (
+            StreamProjectionState,
+            project_resume_stream,
+        )
+
+        lang = normalize_locale(locale)
+        resume_message, next_card = self.collect_ask_reply(record, text, locale=lang)
+        if next_card is not None:
+            if outcome is not None:
+                outcome.awaiting_more = True
+            yield MessageEvent.text(f"{tr('ask.answer_recorded', lang)}\n\n{next_card}")
+            return
+        if resume_message is None:
+            yield MessageEvent.error_event(tr("hitl.expired", lang))
+            return
+
+        yield MessageEvent.typing()
+        decisions = self._answer_decisions(record, resume_message)
+        hitl_ctx = HitlStreamContext(
+            thread_id=record.thread_id,
+            agent_id=record.agent_id,
+            user_id=record.user_id,
+            session_key=record.session_key,
+            channel_type=record.channel_type,
+        )
+        state = projection_state if projection_state is not None else StreamProjectionState()
+        # Resolve before streaming: a follow-up question registered mid-stream
+        # must not be clobbered by a late mark_resolved on the old record.
+        self._store.mark_resolved(record.pending_id, "approved")
+        try:
+            async for ev in project_resume_stream(
+                agent_manager,
+                record.agent_id,
+                record.thread_id,
+                decisions,
+                usage_tracker=usage_tracker or UsageTracker(),
+                history_tracker=history_tracker,
+                locale=lang,
+                projection_state=state,
+                hitl_coordinator=self,
+                hitl_ctx=hitl_ctx,
+            ):
+                yield ev
+        except Exception as exc:
+            yield MessageEvent.error_event(tr("hitl.resume_failed", lang, error=str(exc)))
+            return
+        if outcome is not None:
+            outcome.completed_turn = True
+
     async def iter_slash_resolution(
         self,
         cmd: SlashCommand,
diff --git a/src/octop/infra/gateway/hitl/format.py b/src/octop/infra/gateway/hitl/format.py
index d4304862..e1a9f603 100644
--- a/src/octop/infra/gateway/hitl/format.py
+++ b/src/octop/infra/gateway/hitl/format.py
@@ -3,11 +3,22 @@
 from __future__ import annotations
 
 import json
+import re
+import string
 from typing import Any
 
 from octop.i18n import tool_display_name, tr
 from octop.infra.utils.locale import Locale, normalize_locale
 
+# Tool whose HITL interrupt is a question for the user rather than an approval.
+ASK_USER_TOOL_NAME = "ask_user_question"
+
+# Option keys shown in IM cards: a) b) c) d)
+_OPTION_KEYS = string.ascii_lowercase
+
+# `1`, `a`, `1,3`, `a c`, `b、d` — a pure selection reply.
+_SELECTION_RE = re.compile(r"^[0-9a-z]+(?:[,，、/\s]+[0-9a-z]+)*$")
+
 
 def parse_action_requests(raw: dict[str, Any]) -> list[dict[str, Any]]:
     requests = raw.get("action_requests")
@@ -35,6 +46,33 @@ def parse_review_configs(raw: dict[str, Any]) -> list[dict[str, Any]] | None:
     return out or None
 
 
+def is_ask_action_requests(action_requests: list[dict[str, Any]]) -> bool:
+    """True when this HITL pause is an ``ask_user_question`` interrupt."""
+    return any(isinstance(a, dict) and a.get("name") == ASK_USER_TOOL_NAME for a in action_requests)
+
+
+def extract_questions(action_requests: list[dict[str, Any]]) -> list[dict[str, Any]]:
+    """Pull the normalized ``questions`` list out of an ask action request."""
+    for action in action_requests:
+        if not isinstance(action, dict) or action.get("name") != ASK_USER_TOOL_NAME:
+            continue
+        args = action.get("args")
+        if not isinstance(args, dict):
+            continue
+        raw = args.get("questions")
+        if not isinstance(raw, list):
+            continue
+        return [q for q in raw if isinstance(q, dict)]
+    return []
+
+
+def _options_of(question: dict[str, Any]) -> list[dict[str, Any]]:
+    raw = question.get("options")
+    if not isinstance(raw, list):
+        return []
+    return [o for o in raw if isinstance(o, dict)]
+
+
 def _format_args(args: dict[str, Any], *, limit: int = 400) -> str:
     try:
         text = json.dumps(args, ensure_ascii=False, indent=2)
@@ -51,6 +89,13 @@ def format_hitl_card(
     pending_id: str,
     locale: str | Locale,
 ) -> str:
+    """Render the IM card for a paused turn (approval or question)."""
+    if is_ask_action_requests(record_action_requests):
+        return format_ask_card(
+            extract_questions(record_action_requests),
+            pending_id=pending_id,
+            locale=locale,
+        )
     loc = normalize_locale(str(locale))
     lines = [
         tr("slash.hitl.card_title", loc),
@@ -79,3 +124,152 @@ def format_hitl_card(
         ]
     )
     return "\n".join(lines).strip()
+
+
+def format_ask_card(
+    questions: list[dict[str, Any]],
+    *,
+    pending_id: str,
+    locale: str | Locale,
+    question_index: int = 0,
+) -> str:
+    """Render one ``ask_user_question`` item as a plain-text IM card.
+
+    IM clients do not provide the dashboard's interactive multi-question card.
+    Showing one item at a time also lets letter/number replies map unambiguously
+    to the visible option list.
+    """
+    loc = normalize_locale(str(locale))
+    lines = [tr("slash.ask.card_title", loc), ""]
+    total = len(questions)
+    if total == 0:
+        lines.extend(
+            [
+                tr("slash.ask.open_hint", loc),
+                "",
+                tr("slash.ask.card_footer", loc),
+                tr("slash.ask.card_pending_id", loc, pending_id=pending_id),
+            ]
+        )
+        return "\n".join(lines).strip()
+
+    current = min(max(question_index, 0), total - 1)
+    if total > 1:
+        lines.extend(
+            [
+                tr("slash.ask.progress", loc, current=current + 1, total=total),
+                "",
+            ]
+        )
+
+    question = questions[current]
+    idx = current + 1
+    text = str(question.get("question") or "").strip()
+    header = question.get("header")
+    if isinstance(header, str) and header.strip():
+        lines.append(
+            tr(
+                "slash.ask.question_line_headed",
+                loc,
+                index=idx,
+                header=header.strip(),
+                question=text,
+            )
+        )
+    else:
+        lines.append(tr("slash.ask.question_line", loc, index=idx, question=text))
+    lines.append("")
+    options = _options_of(question)
+    for opt_idx, option in enumerate(options):
+        if opt_idx >= len(_OPTION_KEYS):
+            break
+        label = str(option.get("label") or "").strip()
+        description = str(option.get("description") or "").strip()
+        opt = _OPTION_KEYS[opt_idx]
+        if description:
+            lines.append(
+                tr(
+                    "slash.ask.option_line_desc",
+                    loc,
+                    opt=opt,
+                    label=label,
+                    description=description,
+                )
+            )
+        else:
+            lines.append(tr("slash.ask.option_line", loc, opt=opt, label=label))
+        # A blank paragraph is preserved by plain-text IM clients such as Weixin,
+        # while a single newline may be collapsed into one dense line.
+        lines.append("")
+    if not options:
+        lines.append(tr("slash.ask.open_hint", loc))
+        lines.append("")
+    elif question.get("multi_select"):
+        lines.append(tr("slash.ask.multi_hint", loc))
+        lines.append("")
+    lines.extend(
+        [
+            tr("slash.ask.card_footer", loc),
+            tr("slash.ask.card_pending_id", loc, pending_id=pending_id),
+        ]
+    )
+    return "\n".join(lines).strip()
+
+
+def _resolve_selection(token: str, options: list[dict[str, Any]]) -> str | None:
+    """Map one reply token (``a`` / ``1``) to an option label, if it matches."""
+    if not options:
+        return None
+    index: int | None = None
+    if token.isdigit():
+        index = int(token) - 1
+    elif len(token) == 1 and token in _OPTION_KEYS:
+        index = _OPTION_KEYS.index(token)
+    if index is None or not (0 <= index < len(options)):
+        return None
+    label = str(options[index].get("label") or "").strip()
+    return label or None
+
+
+def parse_ask_reply(
+    text: str,
+    questions: list[dict[str, Any]],
+    *,
+    locale: str | Locale,
+) -> str:
+    """Turn a plain IM reply into the ``respond`` message sent back to the model.
+
+    Selection shorthands (``a``, ``2``, ``a,c``) are expanded to their option
+    labels so the model sees the semantic choice rather than an index. Anything
+    else is forwarded verbatim — free-form answers, counter-proposals and even
+    topic switches are all valid replies, and the model handles them better than
+    any parser could.
+    """
+    loc = normalize_locale(str(locale))
+    stripped = text.strip()
+    # Shorthand selection only makes sense against a single option list.
+    if len(questions) == 1:
+        options = _options_of(questions[0])
+        candidate = stripped.lower()
+        if options and _SELECTION_RE.match(candidate):
+            tokens = [t for t in re.split(r"[,，、/\s]+", candidate) if t]
+            labels = [_resolve_selection(t, options) for t in tokens]
+            picked = [label for label in labels if label]
+            if picked and len(picked) == len(tokens):
+                if not questions[0].get("multi_select") and len(picked) > 1:
+                    picked = picked[:1]
+                return tr("slash.ask.answered_prefix", loc) + "; ".join(picked)
+
+    return stripped
+
+
+__all__ = [
+    "ASK_USER_TOOL_NAME",
+    "extract_questions",
+    "format_ask_card",
+    "format_hitl_card",
+    "is_ask_action_requests",
+    "parse_action_requests",
+    "parse_ask_reply",
+    "parse_review_configs",
+]
diff --git a/src/octop/infra/gateway/hitl/store.py b/src/octop/infra/gateway/hitl/store.py
index 5b66828c..ed65fc8f 100644
--- a/src/octop/infra/gateway/hitl/store.py
+++ b/src/octop/infra/gateway/hitl/store.py
@@ -24,6 +24,8 @@ class HitlPendingRecord:
     review_configs: list[dict[str, Any]] | None
     created_at: float
     status: HitlPendingStatus = "pending"
+    ask_question_index: int = 0
+    ask_answers: list[str] = field(default_factory=list)
 
 
 @dataclass
@@ -165,6 +167,15 @@ def mark_resolved(self, pending_id: str, status: Literal["approved", "rejected"]
         if record is not None:
             record.status = status
 
+    def append_ask_answer(self, pending_id: str, answer: str) -> HitlPendingRecord | None:
+        """Record one IM answer and advance to the next question."""
+        record = self.get(pending_id)
+        if record is None or record.status != "pending":
+            return None
+        record.ask_answers.append(answer)
+        record.ask_question_index += 1
+        return record
+
     def _gc(self) -> None:
         now = time.time()
         stale_ids: list[str] = []
diff --git a/src/octop/infra/gateway/process/history_projection.py b/src/octop/infra/gateway/process/history_projection.py
new file mode 100644
index 00000000..70979ceb
--- /dev/null
+++ b/src/octop/infra/gateway/process/history_projection.py
@@ -0,0 +1,112 @@
+"""Capture the current turn from harness stream state for cheap UI history."""
+
+from __future__ import annotations
+
+import hashlib
+import json
+from dataclasses import dataclass, field
+from typing import Any
+
+from langchain_core.messages import convert_to_messages, message_to_dict
+
+from octop.infra.db.repos._base import now_ts
+from octop.infra.db.repos.thread_messages import ThreadMessageInput
+
+_USER_ROLES = frozenset({"human", "user"})
+
+
+def _role(message: Any) -> str:
+    if isinstance(message, dict):
+        return str(message.get("role") or message.get("type") or "").lower()
+    return str(getattr(message, "type", None) or getattr(message, "role", "")).lower()
+
+
+def _chunk_messages(chunk: dict[str, Any]) -> list[Any]:
+    data = chunk.get("data")
+    if isinstance(data, dict) and isinstance(data.get("messages"), list):
+        return list(data["messages"])
+    if isinstance(data, list):
+        return list(data)
+    return []
+
+
+def message_input(message: Any) -> ThreadMessageInput | None:
+    """Serialize one LangChain/dict message before entering a DB transaction."""
+    try:
+        converted = convert_to_messages([message])[0] if isinstance(message, dict) else message
+        wire = message_to_dict(converted)
+        role = _role(converted)
+        if role in ("", "system"):
+            return None
+        return ThreadMessageInput(
+            message_id=str(getattr(converted, "id", "") or "") or None,
+            role=role,
+            message_json=json.dumps(wire, ensure_ascii=False, default=str),
+            created_at=now_ts(),
+        )
+    except Exception:
+        return None
+
+
+def message_inputs(
+    messages: list[Any],
+    *,
+    dedupe_missing_ids: bool = False,
+) -> list[ThreadMessageInput]:
+    """Serialize and de-duplicate replays within one stream/backfill batch."""
+    out: list[ThreadMessageInput] = []
+    seen: set[str] = set()
+    for message in messages:
+        item = message_input(message)
+        if item is None:
+            continue
+        key = f"id:{item.message_id}" if item.message_id else ""
+        if not key and dedupe_missing_ids:
+            key = "wire:" + hashlib.sha256(item.message_json.encode()).hexdigest()
+        if not key:
+            out.append(item)
+            continue
+        if key in seen:
+            continue
+        seen.add(key)
+        out.append(item)
+    return out
+
+
+@dataclass
+class TurnHistoryTracker:
+    """Keep only the current user turn from replay-prone state chunks."""
+
+    seed_messages: list[Any] = field(default_factory=list)
+    _state_messages: list[Any] = field(default_factory=list, init=False)
+
+    @classmethod
+    def from_request(cls, request: dict[str, Any]) -> TurnHistoryTracker:
+        raw = request.get("messages")
+        return cls(seed_messages=list(raw) if isinstance(raw, list) else [])
+
+    def observe(self, chunk: dict[str, Any]) -> None:
+        if chunk.get("type") not in ("state_snapshot", "state_update"):
+            return
+        messages = _chunk_messages(chunk)
+        if not messages:
+            return
+        last_user = max(
+            (index for index, msg in enumerate(messages) if _role(msg) in _USER_ROLES),
+            default=-1,
+        )
+        if last_user >= 0:
+            self._state_messages = messages[last_user:]
+        else:
+            self._state_messages.extend(messages)
+
+    @property
+    def inputs(self) -> list[ThreadMessageInput]:
+        state_has_user = any(_role(msg) in _USER_ROLES for msg in self._state_messages)
+        source = (
+            self._state_messages if state_has_user else [*self.seed_messages, *self._state_messages]
+        )
+        return message_inputs(
+            source,
+            dedupe_missing_ids=True,
+        )
diff --git a/src/octop/infra/gateway/process/processor.py b/src/octop/infra/gateway/process/processor.py
index 443bf137..146da747 100644
--- a/src/octop/infra/gateway/process/processor.py
+++ b/src/octop/infra/gateway/process/processor.py
@@ -20,6 +20,7 @@
 from octop.i18n.domains.stream import format_stream_error
 from octop.infra.agents.providers.reasoning import reasoning_request_parameters
 from octop.infra.gateway.hitl.coordinator import (
+    HitlAnswerOutcome,
     HitlChannelCoordinator,
     HitlSlashOutcome,
     HitlStreamContext,
@@ -38,6 +39,7 @@
     build_content_from_message,
     build_harness_request,
 )
+from octop.infra.gateway.process.history_projection import TurnHistoryTracker
 from octop.infra.gateway.process.message_keys import (
     resolve_user_id_for_message,
     sanitize_im_metadata,
@@ -102,6 +104,7 @@ def __init__(
         provider_repo: Any | None = None,
         dispatcher: SlashDispatcher,
         usage_repo: Any | None = None,
+        thread_message_repo: Any | None = None,
         gateway: Any | None = None,
         hitl: HitlChannelCoordinator | None = None,
     ) -> None:
@@ -122,6 +125,7 @@ def __init__(
         )
         self._dispatcher = dispatcher
         self._usage_repo = usage_repo
+        self._thread_message_repo = thread_message_repo
         self._gateway = gateway
         self._hitl = hitl or HitlChannelCoordinator()
 
@@ -129,6 +133,10 @@ def __init__(
     def hitl_coordinator(self) -> HitlChannelCoordinator:
         return self._hitl
 
+    def replace_thread_message_repo(self, repo: Any) -> None:
+        """Rebind projection writes after a control-plane restore."""
+        self._thread_message_repo = repo
+
     # -- TeamProcessor (harness inbox async peer collaboration) ----------------
 
     def compose_followup(
@@ -384,6 +392,41 @@ async def __call__(self, msg: InboundMessage) -> AsyncIterator[MessageEvent]:
             yield MessageEvent.completed()
             return
 
+        # An open ``ask_user_question`` pause turns the user's next message into
+        # the answer for that paused turn instead of starting a new one.
+        if cmd is None and msg.text.strip():
+            ask_record = self._hitl.resolve_ask_pending(
+                session_key,
+                agent_id=agent_id,
+                user_id=user_id,
+            )
+            if ask_record is not None:
+                usage_tracker = UsageTracker()
+                history_tracker = TurnHistoryTracker()
+                answer_outcome = HitlAnswerOutcome()
+                async for ev in self._hitl.iter_answer_resolution(
+                    ask_record,
+                    msg.text,
+                    agent_manager=self._agent_manager,
+                    locale=locale,
+                    usage_tracker=usage_tracker,
+                    history_tracker=history_tracker,
+                    outcome=answer_outcome,
+                ):
+                    yield ev
+                if answer_outcome.completed_turn:
+                    self._touch_thread_after_turn(ask_record.thread_id, msg.text)
+                    if usage_tracker.usage:
+                        self._record_turn_usage(
+                            agent_id=agent_id,
+                            user_id=user_id,
+                            thread_id=ask_record.thread_id,
+                            usage=usage_tracker.usage,
+                        )
+                    self._record_turn_history(ask_record.thread_id, history_tracker)
+                yield MessageEvent.completed()
+                return
+
         if cmd is not None:
             sink = _MessageEventSink()
             handled = await self._dispatcher.handle(
@@ -474,6 +517,7 @@ async def __call__(self, msg: InboundMessage) -> AsyncIterator[MessageEvent]:
         stream_ok = False
         hitl_paused = False
         usage_tracker = UsageTracker()
+        history_tracker = TurnHistoryTracker.from_request(request)
         projection_state = StreamProjectionState()
         try:
             async for ev in project_stream(
@@ -482,6 +526,7 @@ async def __call__(self, msg: InboundMessage) -> AsyncIterator[MessageEvent]:
                 request,
                 media_backend=media_backend,
                 usage_tracker=usage_tracker,
+                history_tracker=history_tracker,
                 locale=locale,
                 projection_state=projection_state,
                 hitl_coordinator=self._hitl,
@@ -508,6 +553,7 @@ async def __call__(self, msg: InboundMessage) -> AsyncIterator[MessageEvent]:
                     thread_id=thread_id,
                     usage=usage_tracker.usage,
                 )
+                self._record_turn_history(thread_id, history_tracker)
         yield MessageEvent.completed()
 
     # -- Raw harness-chunk stream (Dashboard WS, etc.) -------------------------
@@ -585,6 +631,7 @@ async def iter_turn_chunks(self, msg: InboundMessage) -> AsyncIterator[dict[str,
         stream_ok = False
         harness_workspace = harness_workspace_for_agent(self._agent_manager, agent_id)
         usage_tracker = UsageTracker()
+        history_tracker = TurnHistoryTracker.from_request(request)
         locale = resolve_user_locale(
             user_repo=self._user_repo,
             user_id=user_id,
@@ -595,6 +642,7 @@ async def iter_turn_chunks(self, msg: InboundMessage) -> AsyncIterator[dict[str,
         try:
             async for chunk in self._agent_manager.stream(agent_id, request):
                 usage_tracker.observe(chunk)
+                history_tracker.observe(chunk)
                 if chunk.get("type") == "hitl_required":
                     request_payload = chunk.get("request")
                     if isinstance(request_payload, dict):
@@ -648,8 +696,42 @@ async def iter_turn_chunks(self, msg: InboundMessage) -> AsyncIterator[dict[str,
                 thread_id=thread_id,
                 usage=usage_tracker.usage,
             )
+            self._record_turn_history(thread_id, history_tracker)
         yield {"type": "done"}
 
+    async def iter_hitl_resume_chunks(
+        self,
+        *,
+        agent_id: str,
+        thread_id: str,
+        user_id: int,
+        decisions: list[dict[str, Any]],
+    ) -> AsyncIterator[dict[str, Any]]:
+        """Resume a dashboard HITL turn with the normal history bookkeeping."""
+        usage_tracker = UsageTracker()
+        history_tracker = TurnHistoryTracker()
+        completed = False
+        try:
+            async for chunk in self._agent_manager.resume_hitl(
+                agent_id,
+                thread_id,
+                decisions,
+            ):
+                usage_tracker.observe(chunk)
+                history_tracker.observe(chunk)
+                yield chunk
+            completed = True
+        finally:
+            if completed:
+                self._touch_thread_after_turn(thread_id, None)
+                self._record_turn_usage(
+                    agent_id=agent_id,
+                    user_id=user_id,
+                    thread_id=thread_id,
+                    usage=usage_tracker.usage,
+                )
+                self._record_turn_history(thread_id, history_tracker)
+
     async def _build_dashboard_request(
         self,
         msg: InboundMessage,
@@ -883,3 +965,21 @@ def _record_turn_usage(
             thread_id=thread_id,
             usage=usage,
         )
+
+    def _record_turn_history(
+        self,
+        thread_id: str,
+        tracker: TurnHistoryTracker,
+    ) -> None:
+        if self._thread_message_repo is None:
+            return
+        try:
+            self._thread_message_repo.append_if_ready(thread_id, tracker.inputs)
+        except Exception:
+            # History projection is a read optimization and must never turn a
+            # successful model response into a failed chat turn.
+            logger.warning(
+                "failed to append thread history projection for thread=%s",
+                thread_id,
+                exc_info=True,
+            )
diff --git a/src/octop/infra/gateway/process/response_mode.py b/src/octop/infra/gateway/process/response_mode.py
index 93cc79a0..13f83bc5 100644
--- a/src/octop/infra/gateway/process/response_mode.py
+++ b/src/octop/infra/gateway/process/response_mode.py
@@ -14,6 +14,8 @@
     TextContent,
 )
 
+from octop.infra.utils.llm_text import strip_thinking
+
 ChannelResponseMode = Literal["invoke", "stream"]
 
 DEFAULT_CHANNEL_RESPONSE_MODE: ChannelResponseMode = "invoke"
@@ -81,7 +83,7 @@ async def collapse_to_invoke_response(
 
         if event.type == MessageEventType.COMPLETED:
             content: list[ContentPart] = []
-            final_text = text_buffer.strip()
+            final_text = strip_thinking(text_buffer)
             if final_text:
                 content.append(TextContent(text=final_text))
             content.extend(media_buffer)
diff --git a/src/octop/infra/gateway/process/stream_project.py b/src/octop/infra/gateway/process/stream_project.py
index bcf8f24f..63360632 100644
--- a/src/octop/infra/gateway/process/stream_project.py
+++ b/src/octop/infra/gateway/process/stream_project.py
@@ -13,6 +13,7 @@
 from octop.infra.gateway.hitl.format import format_hitl_card
 from octop.infra.gateway.media.tool_media import media_events_from_tool_result
 from octop.infra.gateway.process.agent_resolve import harness_workspace_for_agent
+from octop.infra.gateway.process.history_projection import TurnHistoryTracker
 from octop.infra.gateway.process.usage_record import UsageTracker
 from octop.infra.utils.locale import DEFAULT_LOCALE, Locale, normalize_locale
 
@@ -113,6 +114,7 @@ async def _project_chunks(
     agent_id: str,
     locale: str | Locale,
     usage_tracker: UsageTracker | None,
+    history_tracker: TurnHistoryTracker | None,
     projection_state: StreamProjectionState | None,
     hitl_coordinator: HitlChannelCoordinator | None,
     hitl_ctx: HitlStreamContext | None,
@@ -141,6 +143,8 @@ def _tool_end(raw: str) -> MessageEvent:
     async for chunk in chunks:
         if usage_tracker is not None:
             usage_tracker.observe(chunk)
+        if history_tracker is not None:
+            history_tracker.observe(chunk)
         ctype: str = chunk.get("type", "")
         node: str | None = chunk.get("node")
 
@@ -231,6 +235,7 @@ async def project_stream(
     *,
     media_backend: MediaBackend | None = None,
     usage_tracker: UsageTracker | None = None,
+    history_tracker: TurnHistoryTracker | None = None,
     locale: str | Locale = DEFAULT_LOCALE,
     projection_state: StreamProjectionState | None = None,
     hitl_coordinator: HitlChannelCoordinator | None = None,
@@ -243,6 +248,7 @@ async def project_stream(
         agent_id=agent_id,
         locale=locale,
         usage_tracker=usage_tracker,
+        history_tracker=history_tracker,
         projection_state=projection_state,
         hitl_coordinator=hitl_coordinator,
         hitl_ctx=hitl_ctx,
@@ -257,6 +263,7 @@ async def project_resume_stream(
     decisions: list[dict[str, Any]],
     *,
     usage_tracker: UsageTracker | None = None,
+    history_tracker: TurnHistoryTracker | None = None,
     locale: str | Locale = DEFAULT_LOCALE,
     projection_state: StreamProjectionState | None = None,
     hitl_coordinator: HitlChannelCoordinator | None = None,
@@ -268,6 +275,7 @@ async def project_resume_stream(
         agent_id=agent_id,
         locale=locale,
         usage_tracker=usage_tracker,
+        history_tracker=history_tracker,
         projection_state=projection_state,
         hitl_coordinator=hitl_coordinator,
         hitl_ctx=hitl_ctx,
diff --git a/src/octop/infra/gateway/slash/runtime_bridge.py b/src/octop/infra/gateway/slash/runtime_bridge.py
index 78f1b4b6..5d8d13a6 100644
--- a/src/octop/infra/gateway/slash/runtime_bridge.py
+++ b/src/octop/infra/gateway/slash/runtime_bridge.py
@@ -41,7 +41,12 @@ def _cancel(agent_id: str, tid: str) -> None:
         cancel_stream = _cancel
 
         async def _list_skills() -> list[dict[str, Any]]:
-            return await am.list_skill_summaries(ctx.agent_id)
+            from octop.infra.utils.locale import normalize_locale
+
+            return await am.list_skill_summaries(
+                ctx.agent_id,
+                locale=normalize_locale(ctx.locale),
+            )
 
         list_skills = _list_skills
 
diff --git a/src/octop/infra/knowledge/service.py b/src/octop/infra/knowledge/service.py
index a6a5ab5e..d6e9d56e 100644
--- a/src/octop/infra/knowledge/service.py
+++ b/src/octop/infra/knowledge/service.py
@@ -24,6 +24,8 @@
 MAX_DOCS_PER_KB = 100
 MAX_BASES_PER_OWNER = 20
 MAX_DOCUMENT_BYTES = upload_mb_to_bytes(DEFAULT_MAX_UPLOAD_MB)
+# Upper bound for the per-base max_documents field. Mirrors Field(le=10000).
+MAX_KB_MAX_DOCUMENTS = 10_000
 _MAX_PREVIEW_CHARS = 200_000
 _EXT_TO_CONTENT_TYPE = {
     ".txt": "text/plain",
@@ -73,10 +75,13 @@ def create_base(
         default_open: bool = False,
         shared: bool = False,
         icon_name: str = "",
+        max_documents: int = MAX_DOCS_PER_KB,
     ) -> KnowledgeBaseRow:
         assert_knowledge_usable(
             self._services.settings_repo.get, getattr(self._services, "provider_repo", None)
         )
+        if max_documents < 0 or max_documents > MAX_KB_MAX_DOCUMENTS:
+            raise ValueError(f"max_documents must be between 0 and {MAX_KB_MAX_DOCUMENTS}")
         owned = self._repo.count_bases_for_owner(owner_user_id)
         if owned >= MAX_BASES_PER_OWNER:
             raise ValueError(f"a user can own at most {MAX_BASES_PER_OWNER} knowledge bases")
@@ -91,6 +96,7 @@ def create_base(
                 shared=shared,
                 icon_name=icon_name,
                 embedding_model=model,
+                max_documents=max_documents,
             ),
         )
 
@@ -111,9 +117,14 @@ def update_base(
         default_open: bool | None = None,
         shared: bool | None = None,
         icon_name: str | None = None,
+        max_documents: int | None = None,
         is_admin: bool = False,
     ) -> KnowledgeBaseRow:
         self.require_owner(kb_id, actor_user_id=actor_user_id, is_admin=is_admin)
+        if max_documents is not None and (
+            max_documents < 0 or max_documents > MAX_KB_MAX_DOCUMENTS
+        ):
+            raise ValueError(f"max_documents must be between 0 and {MAX_KB_MAX_DOCUMENTS}")
         self._repo.update_base(
             kb_id,
             name=name,
@@ -121,6 +132,7 @@ def update_base(
             default_open=default_open,
             shared=shared,
             icon_name=icon_name,
+            max_documents=max_documents,
         )
         return self._require_base(kb_id)
 
@@ -294,7 +306,7 @@ def upload_document(
         assert_knowledge_usable(
             self._services.settings_repo.get, getattr(self._services, "provider_repo", None)
         )
-        self.get_writable_base(kb_id, actor_user_id=actor_user_id, is_admin=is_admin)
+        base = self.get_writable_base(kb_id, actor_user_id=actor_user_id, is_admin=is_admin)
         limit = self._max_document_bytes()
         if len(content) > limit:
             raise ValueError(f"knowledge document size exceeds maximum of {limit} bytes")
@@ -305,13 +317,14 @@ def upload_document(
         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}")
+        # The per-base limit lives on the KB row (schema v10). 0 = unlimited.
         document = self._repo.create_document(
             kb_id=kb_id,
             filename=name,
             path=rel,
             content_type=resolved_type,
             byte_size=len(content),
-            max_documents=MAX_DOCS_PER_KB,
+            max_documents=base.max_documents,
         )
         try:
             write_document(kb_id, document.id, name, content)
diff --git a/src/octop/infra/setup/self_update.py b/src/octop/infra/setup/self_update.py
index 6d760d60..55de3162 100644
--- a/src/octop/infra/setup/self_update.py
+++ b/src/octop/infra/setup/self_update.py
@@ -277,7 +277,170 @@ def get_installed_version(python_exe: str) -> str | None:
     return None
 
 
+def get_version_in_dir(python_exe: str, target: str) -> str | None:
+    """Return the octop version installed in *target* (a ``pip --target`` dir)."""
+    try:
+        code = (
+            "import sys; sys.path.insert(0, sys.argv[1]); "
+            "from importlib.metadata import version; print(version('octop'))"
+        )
+        result = subprocess.run(
+            [python_exe, "-c", code, target],
+            capture_output=True,
+            text=True,
+            check=False,
+        )
+        if result.returncode == 0:
+            return result.stdout.strip() or None
+    except Exception:
+        pass
+    return None
+
+
+def _verify_fpk_upgrade(
+    local_ver: str,
+    site_packages: str,
+    python_exe: str,
+    mirror_errors: list[str],
+) -> UpgradeResult:
+    actual_ver: str | None = None
+    for attempt in range(3):
+        actual_ver = get_version_in_dir(python_exe, site_packages)
+        if actual_ver and actual_ver != local_ver:
+            break
+        if attempt < 2:
+            time.sleep(0.5)
+
+    if actual_ver and is_newer(actual_ver, local_ver):
+        return UpgradeResult(
+            success=True,
+            message=f"已升级到 {actual_ver}，请重启服务生效（应用中心托管的服务重启后加载新版）。",
+            installed_version=actual_ver,
+            mirror_errors=mirror_errors,
+        )
+    if actual_ver == local_ver:
+        return UpgradeResult(
+            success=False,
+            error=(
+                f"安装完成但版本仍为 {actual_ver}；"
+                "请确认新版已发布，或改用飞牛应用中心安装新版 FPK。"
+            ),
+            installed_version=actual_ver,
+            mirror_errors=mirror_errors,
+        )
+    return UpgradeResult(
+        success=True,
+        message="upgrade completed",
+        installed_version=actual_ver,
+        mirror_errors=mirror_errors,
+    )
+
+
+def _run_fpk_upgrade(site_packages: str, *, verbose: bool = False) -> UpgradeResult:
+    """FnOS FPK 部署下的在线升级：把新版安装到 launcher 实际加载的打包目录。
+
+    launcher 通过 PYTHONPATH 从应用中心托管的打包 site-packages 加载 octop，
+    在线安装到系统 Python 永远不会被加载（重启后仍是旧版）。本函数把新版
+    安装到该打包目录本身，重启服务后即加载新版，升级真正生效。
+
+    与普通部署不同，FPK 首次在线升级需要从零解析并下载完整依赖树
+    （octop 依赖 orcakit-harness-agent 等大包），故超时显著放宽；且某镜像
+    可能滞后（装到同版本旧版），此时继续尝试下一个镜像，最后以 pypi.org
+    兜底，避免「镜像有货但版本不新」导致升级假成功。
+    """
+    if not os.path.isdir(site_packages):
+        return UpgradeResult(
+            success=False,
+            error=f"FPK site-packages 目录不存在：{site_packages}",
+        )
+    local_ver = get_local_version()
+    mirror_errors: list[str] = []
+    per_mirror_timeout = 900  # FPK 首次升级需下载完整依赖树，180s 不够
+
+    def _run_install(cmd: list[str], label: str) -> tuple[int | None, str]:
+        logger.debug("running %s: %s", label, " ".join(cmd))
+        try:
+            # NOCA:DangerousSubprocessUseAudit(argv list with shell=False; installer paths and mirrors are trusted)
+            result = subprocess.run(
+                cmd,
+                check=False,
+                capture_output=not verbose,
+                text=True,
+                timeout=per_mirror_timeout,
+            )
+        except subprocess.TimeoutExpired:
+            return None, f"timed out after {per_mirror_timeout}s"
+        if result.returncode == 0:
+            return 0, ""
+        snippet = (result.stderr or result.stdout or "")[:300]
+        return result.returncode, snippet
+
+    python_exe = sys.executable
+    installer = detect_installer()  # uv 优先：pip 对 orcakit-harness-agent[all] 依赖树解析会卡死
+
+    def _build_cmd(index_url: str = "") -> list[str]:
+        if installer == "uv":
+            cmd = [
+                find_uv_executable(),
+                "pip",
+                "install",
+                "--python",
+                python_exe,
+                "--target",
+                site_packages,
+                "--upgrade-package",
+                _PACKAGE_NAME,
+            ]
+            if index_url:
+                cmd.extend(["--index-url", index_url])
+            cmd.append(_PACKAGE_NAME)
+            return cmd
+        cmd = [
+            python_exe,
+            "-m",
+            "pip",
+            "install",
+            "--upgrade",
+            "--upgrade-strategy",
+            "only-if-needed",
+            "--target",
+            site_packages,
+        ]
+        if index_url:
+            cmd.extend(["-i", index_url])
+        cmd.append(_PACKAGE_NAME)
+        return cmd
+
+    for mirror in _MIRRORS:
+        rc, err_snippet = _run_install(_build_cmd(mirror), mirror)
+        if rc != 0:
+            mirror_errors.append(f"{mirror}: {err_snippet}")
+            continue
+        res = _verify_fpk_upgrade(local_ver, site_packages, python_exe, mirror_errors)
+        if res.success:
+            return res
+        # 镜像装到了同版本/旧版（同步滞后）：继续尝试下一个镜像
+        mirror_errors.append(f"{mirror}: {res.error or 'version unchanged'}")
+
+    rc, err_snippet = _run_install(_build_cmd(), "pypi.org")
+    if rc != 0:
+        mirror_errors.append(f"pypi.org: {err_snippet or 'unknown error'}")
+        return UpgradeResult(
+            success=False,
+            error="upgrade failed on all mirrors",
+            mirror_errors=mirror_errors,
+        )
+    return _verify_fpk_upgrade(local_ver, site_packages, python_exe, mirror_errors)
+
+
 def run_upgrade(*, verbose: bool = False) -> UpgradeResult:
+    # [FPK] FnOS FPK 部署：launcher 通过 PYTHONPATH 从应用中心托管的打包
+    # site-packages 加载 octop，在线安装到系统 Python 永远不会被加载（重启
+    # 无效）。launcher 导出 OCTOP_FPK_SITE_PACKAGES 指向该打包目录，升级即
+    # 安装到此目录并提示重启服务生效——升级真正可用，而非禁止升级。
+    _fpk_site = os.environ.get("OCTOP_FPK_SITE_PACKAGES", "").strip()
+    if _fpk_site:
+        return _run_fpk_upgrade(_fpk_site, verbose=verbose)
     installer = detect_installer()
     venv_python = resolve_venv_python()
     local_ver = get_local_version()
diff --git a/src/octop/infra/skills/install.py b/src/octop/infra/skills/install.py
index 7b8efd40..53c7b2a8 100644
--- a/src/octop/infra/skills/install.py
+++ b/src/octop/infra/skills/install.py
@@ -46,9 +46,11 @@ def with_skillhub_presentation_metadata(
     *,
     display_name: str,
     icon_url: str,
+    label: dict[str, str] | None = None,
+    summary: dict[str, str] | None = None,
 ) -> str:
     """Persist SkillHub presentation fields without changing the stable skill id."""
-    if not display_name and not icon_url:
+    if not display_name and not icon_url and not label and not summary:
         return content
 
     meta, body = parse_frontmatter(content)
@@ -58,10 +60,14 @@ def with_skillhub_presentation_metadata(
     octop_meta = {} if not isinstance(octop_meta, dict) else dict(octop_meta)
 
     octop_meta["source"] = "skillhub"
-    if display_name:
-        octop_meta["display_name"] = display_name
     if icon_url:
         octop_meta["icon_url"] = icon_url
+    if label:
+        octop_meta["label"] = {key: value for key, value in label.items() if value}
+    elif display_name:
+        octop_meta["display_name"] = display_name
+    if summary:
+        octop_meta["summary"] = {key: value for key, value in summary.items() if value}
     metadata["octop"] = octop_meta
     meta["metadata"] = metadata
 
@@ -85,6 +91,8 @@ def prepare_skillhub_package(
     *,
     display_name: str = "",
     icon_url: str = "",
+    label: dict[str, str] | None = None,
+    summary: dict[str, str] | None = None,
 ) -> ResolvedSkillPackage:
     """Normalize SkillHub download files into a canonical package."""
     safe_name = validate_skill_slug(skill_name)
@@ -102,6 +110,8 @@ def prepare_skillhub_package(
                     manifest,
                     display_name=display_name,
                     icon_url=icon_url,
+                    label=label,
+                    summary=summary,
                 ).encode("utf-8")
         transformed.append((normalized, content))
     return resolve_skill_package(
@@ -169,6 +179,8 @@ async def install_skill_from_skillhub(
     files: list[tuple[str, bytes]],
     display_name: str = "",
     icon_url: str = "",
+    label: dict[str, str] | None = None,
+    summary: dict[str, str] | None = None,
     overwrite: bool = False,
     enable: bool | None = None,
 ) -> ResolvedSkillPackage:
@@ -180,6 +192,8 @@ async def install_skill_from_skillhub(
         files,
         display_name=display_name,
         icon_url=icon_url,
+        label=label,
+        summary=summary,
     )
     return await commit_skill_install(
         target,
diff --git a/src/octop/infra/skills/presentation.py b/src/octop/infra/skills/presentation.py
new file mode 100644
index 00000000..98bd707f
--- /dev/null
+++ b/src/octop/infra/skills/presentation.py
@@ -0,0 +1,91 @@
+"""Skill presentation metadata shared by catalogs and HTTP adapters."""
+
+from __future__ import annotations
+
+from collections.abc import Mapping
+from typing import Any
+from urllib.parse import urlparse
+
+from octop.infra.utils.locale import Locale
+
+# Keep in sync with harness_agent.skills.catalog._summary_dict.
+_EXTENSION_NAMESPACES = ("octop", "harness", "lightclaw", "orca", "openclaw")
+
+
+def _text(value: object) -> str:
+    return str(value or "").strip()
+
+
+def _localized_text(value: object, locale: Locale) -> str:
+    if not isinstance(value, Mapping):
+        return _text(value)
+    for key in (locale, "en", "zh"):
+        text = _text(value.get(key))
+        if text:
+            return text
+    return ""
+
+
+def _valid_icon_url(value: str) -> bool:
+    parsed = urlparse(value)
+    return parsed.scheme in {"http", "https"} and bool(parsed.netloc)
+
+
+def apply_skill_presentation(
+    summary: Mapping[str, Any],
+    frontmatter: Mapping[str, Any] | None = None,
+    *,
+    locale: Locale | None = None,
+) -> dict[str, Any]:
+    """Overlay optional UI metadata without changing the stable skill slug.
+
+    Without ``locale``, ``name`` / ``description`` stay the frontmatter identity
+    used for disable matching and chat skill filters. ``label``, ``summary``,
+    and legacy ``display_name`` are copied through so a later localize pass can
+    fill UI copy. Compatible namespaces may still contribute emoji / icon_url.
+    """
+    out = dict(summary)
+    metadata = (frontmatter or {}).get("metadata")
+    extensions = metadata if isinstance(metadata, Mapping) else {}
+
+    display_name = ""
+    for namespace in _EXTENSION_NAMESPACES:
+        extension = extensions.get(namespace)
+        if not isinstance(extension, Mapping):
+            continue
+        if namespace == "octop":
+            label = extension.get("label")
+            short_summary = extension.get("summary")
+            if isinstance(label, Mapping):
+                out["label"] = dict(label)
+            if isinstance(short_summary, Mapping):
+                out["summary"] = dict(short_summary)
+        if not display_name:
+            display_name = _text(extension.get("display_name"))
+        emoji = _text(extension.get("emoji"))
+        if emoji and not _text(out.get("emoji")):
+            out["emoji"] = emoji
+        icon_url = _text(extension.get("icon_url"))
+        if icon_url and "icon_url" not in out and _valid_icon_url(icon_url):
+            out["icon_url"] = icon_url
+    if display_name:
+        out["display_name"] = display_name
+    if locale is not None:
+        return localize_skill_summary(out, locale)
+    return out
+
+
+def localize_skill_summary(summary: Mapping[str, Any], locale: Locale) -> dict[str, Any]:
+    """Resolve raw localized fields already returned by an upstream catalog."""
+    out = dict(summary)
+    label = _localized_text(out.get("label"), locale)
+    short_summary = _localized_text(out.get("summary"), locale)
+    display_name = _text(out.get("display_name"))
+    if label or display_name:
+        out["name"] = label or display_name
+    if short_summary:
+        out["description"] = short_summary
+    return out
+
+
+__all__ = ["apply_skill_presentation", "localize_skill_summary"]
diff --git a/src/octop/infra/skills/skill_package_store.py b/src/octop/infra/skills/skill_package_store.py
index 7ae1c8f3..ec9ffac4 100644
--- a/src/octop/infra/skills/skill_package_store.py
+++ b/src/octop/infra/skills/skill_package_store.py
@@ -14,7 +14,7 @@
 
 from octop.infra.db.repos.skill_packages import SkillPackageRepo, SkillPackageRow
 from octop.infra.errors import ErrorCode, OctopError
-from octop.infra.skills.install import valid_skillhub_icon_url
+from octop.infra.skills.presentation import apply_skill_presentation
 from octop.infra.skills.skill_packages import (
     SkillPackageError,
     normalize_skill_files,
@@ -22,6 +22,7 @@
 )
 from octop.infra.users.identity import User
 from octop.infra.utils.frontmatter import parse_frontmatter
+from octop.infra.utils.locale import Locale
 from octop.infra.utils.ulid import new_short_id
 
 
@@ -44,28 +45,6 @@ def raise_skill_package_name_taken(name: str) -> None:
     )
 
 
-def _apply_presentation_metadata(summary: dict[str, Any], metadata: dict[str, Any]) -> None:
-    """Apply display_name / emoji / icon_url from SKILL.md extension namespaces."""
-    extensions = metadata.get("metadata")
-    if not isinstance(extensions, dict):
-        return
-    has_display_name = False
-    for key in ("octop", "lightclaw", "orca", "harness", "openclaw"):
-        extension = extensions.get(key)
-        if not isinstance(extension, dict):
-            continue
-        display_name = str(extension.get("display_name") or "").strip()
-        if display_name and not has_display_name:
-            summary["name"] = display_name
-            has_display_name = True
-        emoji = str(extension.get("emoji") or "").strip()
-        if emoji and "emoji" not in summary:
-            summary["emoji"] = emoji
-        icon_url = str(extension.get("icon_url") or "").strip()
-        if icon_url and "icon_url" not in summary and valid_skillhub_icon_url(icon_url):
-            summary["icon_url"] = icon_url
-
-
 def _allocate_package_id(repo: SkillPackageRepo) -> str:
     for _ in range(16):
         package_id = new_short_id()
@@ -104,7 +83,12 @@ def create(
     def package_skills_dir(self, pack_id: str) -> Path:
         return self.root / pack_id / "skills"
 
-    def list_skill_summaries(self, pack_id: str) -> list[dict[str, Any]]:
+    def list_skill_summaries(
+        self,
+        pack_id: str,
+        *,
+        locale: Locale | None = None,
+    ) -> list[dict[str, Any]]:
         skills_dir = self.package_skills_dir(pack_id)
         if not skills_dir.is_dir():
             return []
@@ -129,8 +113,7 @@ def list_skill_summaries(self, pack_id: str) -> list[dict[str, Any]]:
                 "kind": "package",
                 "package_id": pack_id,
             }
-            _apply_presentation_metadata(summary, metadata)
-            summaries.append(summary)
+            summaries.append(apply_skill_presentation(summary, metadata, locale=locale))
         return summaries
 
     def write_skill(
diff --git a/src/octop/infra/skills/workspace_catalog.py b/src/octop/infra/skills/workspace_catalog.py
index 439ff2b5..fd3fa208 100644
--- a/src/octop/infra/skills/workspace_catalog.py
+++ b/src/octop/infra/skills/workspace_catalog.py
@@ -8,6 +8,7 @@
 from typing import Any
 
 from octop.infra.agents.workspace_dir import skills_discovery_roots
+from octop.infra.skills.presentation import apply_skill_presentation
 from octop.infra.utils.frontmatter import parse_frontmatter
 
 logger = logging.getLogger(__name__)
@@ -19,13 +20,16 @@ def _summary_dict(
     *,
     enabled: bool,
 ) -> dict[str, Any]:
-    return {
-        "slug": slug,
-        "name": str(meta.get("name") or slug),
-        "description": str(meta.get("description") or ""),
-        "enabled": enabled,
-        "kind": "workspace",
-    }
+    return apply_skill_presentation(
+        {
+            "slug": slug,
+            "name": str(meta.get("name") or slug),
+            "description": str(meta.get("description") or ""),
+            "enabled": enabled,
+            "kind": "workspace",
+        },
+        meta,
+    )
 
 
 def _read_manifest(skill_dir: Path) -> str | None:
diff --git a/src/octop/infra/utils/llm_text.py b/src/octop/infra/utils/llm_text.py
index 9f0630d7..dd34c1f9 100644
--- a/src/octop/infra/utils/llm_text.py
+++ b/src/octop/infra/utils/llm_text.py
@@ -11,14 +11,36 @@
 from typing import Any
 
 _THINKING_RE = re.compile(
-    r"<think>[\s\S]*?</think>\s*",
+    r"<(?:think|thinking)>[\s\S]*?</(?:think|thinking)>\s*",
     re.IGNORECASE,
 )
+_THINKING_OPEN_RE = re.compile(r"<(?:think|thinking)>", re.IGNORECASE)
+_THINKING_CLOSE_RE = re.compile(r"</(?:think|thinking)>", re.IGNORECASE)
 
 
 def strip_thinking(text: str) -> str:
-    """Remove ``<think>...</think>`` blocks from model output."""
-    return _THINKING_RE.sub("", text).strip()
+    """Remove tagged or malformed thinking prefixes from model output.
+
+    Some OpenAI-compatible model routers return reasoning in ordinary
+    ``content`` and only emit the closing ``</think>`` marker.  Treat a
+    closing marker that appears before any opening marker as the boundary
+    between the hidden prefix and the user-visible answer.
+    """
+    cleaned = _THINKING_RE.sub("", text)
+
+    while True:
+        close_match = _THINKING_CLOSE_RE.search(cleaned)
+        if close_match is None:
+            break
+        open_match = _THINKING_OPEN_RE.search(cleaned)
+        if open_match is not None and open_match.start() < close_match.start():
+            break
+        cleaned = cleaned[close_match.end() :]
+
+    open_match = _THINKING_OPEN_RE.search(cleaned)
+    if open_match is not None:
+        cleaned = cleaned[: open_match.start()]
+    return cleaned.strip()
 
 
 def llm_text_content(result: Any) -> str:
diff --git a/tests/integration/test_bwrap_jail.py b/tests/integration/test_bwrap_jail.py
index 232ae385..89c460d5 100644
--- a/tests/integration/test_bwrap_jail.py
+++ b/tests/integration/test_bwrap_jail.py
@@ -2,8 +2,9 @@
 
 ``BubbledLocalShellBackend`` is constructed only when Linux + ``virtual_mode`` +
 non-host ``root_dir`` + ``bwrap`` are available (factory routes before any
-backend I/O). Otherwise ``HarnessLocalShellBackend`` (deepagents local shell +
-workspace ``.env`` refresh) is used — no execute path rewrite.
+backend I/O). Otherwise ``HarnessLocalShellBackend`` runs on the host; with
+``virtual_mode`` and a scoped ``root_dir`` it still rewrites virtual absolute
+paths in ``execute`` onto that root (harness-agent >= 1.0).
 
 Cross-platform cases run on Windows, macOS, and Linux. POSIX-shell and real
 ``bwrap`` jail cases are skipped where the host cannot run them (see markers).
@@ -115,11 +116,16 @@ def test_read_virtual_path_from_scoped_root(tmp_path: Path) -> None:
     assert "read-me" in read.file_data.get("content", "")
 
 
-def test_execute_without_jail_does_not_rewrite_command(tmp_path: Path) -> None:
-    """Non-jail local shell passes the command through unchanged (no path rewrite)."""
-    from deepagents.backends.local_shell import LocalShellBackend
+def test_execute_without_jail_rewrites_virtual_command_paths(tmp_path: Path) -> None:
+    """Non-jail scoped shell still maps virtual absolute paths onto ``root_dir``.
 
-    spec, _scoped, workspace = _scoped_spec(tmp_path)
+    harness-agent 1.0 no longer delegates ``execute`` to deepagents
+    ``LocalShellBackend.execute``; it rewrites then calls ``_execute_on_host``.
+    Env mapping is stubbed so inaccessible ``PATH`` entries (common on CI)
+    cannot raise ``PermissionError`` from ``Path.exists``.
+    """
+    spec, scoped, workspace = _scoped_spec(tmp_path)
+    (scoped / "out").mkdir()
     with patch(
         "harness_agent.backends.bwrap_shell.resolve_bubbled_bwrap",
         return_value=None,
@@ -127,15 +133,22 @@ def test_execute_without_jail_does_not_rewrite_command(tmp_path: Path) -> None:
         backend = resolve_backend(spec, workspace_dir=workspace)
     assert isinstance(backend, HarnessLocalShellBackend)
 
-    with patch.object(
-        LocalShellBackend,
-        "execute",
-        return_value=ExecuteResponse(output="ok", exit_code=0, truncated=False),
-    ) as base_exec:
+    expected = str((scoped / "out" / "mapped.txt").resolve())
+    with (
+        patch.object(
+            HarnessLocalShellBackend,
+            "_execute_on_host",
+            return_value=ExecuteResponse(output="ok", exit_code=0, truncated=False),
+        ) as host_exec,
+        patch(
+            "harness_agent.backends.local_shell.map_virtual_paths_in_env",
+            side_effect=lambda env, *_a, **_k: env,
+        ),
+    ):
         result = backend.execute("echo x > /out/mapped.txt")
 
     assert result.exit_code == 0
-    assert base_exec.call_args.args[0] == "echo x > /out/mapped.txt"
+    assert host_exec.call_args.args[0] == f"echo x > {expected}"
 
 
 # ---------------------------------------------------------------------------
diff --git a/tests/integration/test_connectors_api.py b/tests/integration/test_connectors_api.py
index 1f377958..aaf56936 100644
--- a/tests/integration/test_connectors_api.py
+++ b/tests/integration/test_connectors_api.py
@@ -7,8 +7,11 @@
 
 import pytest
 
+from octop.infra.connectors.custom_mcp import CUSTOM_MCP_KIND
+from octop.infra.connectors.oauth.registry import save_oauth_ctx
+from octop.infra.utils.ulid import new_ulid
 from tests.support.app import octop_client, write_octop_config
-from tests.support.auth import auth_header, bootstrap_admin, create_user
+from tests.support.auth import auth_header, bootstrap_admin, create_user, resolve_user_id
 from tests.support.http import ws_chat_turn
 
 
@@ -206,7 +209,7 @@ async def test_oauth_start_public_http_notion_error_is_actionable(tmp_octop_home
         await bootstrap_admin(c, tmp_octop_home)
         auth = await auth_header(c)
         mocked_start = AsyncMock()
-        with patch("octop.api.routers.connectors.start_oauth", mocked_start):
+        with patch("octop.api.routers.connectors.start_oauth_for_target", mocked_start):
             r = await c.post(
                 "/api/connectors/oauth/notion/start",
                 headers={**auth, "host": "58.87.70.170"},
@@ -241,14 +244,16 @@ async def test_patch_instance_status(env):
     assert r2.json()["status"] == "disabled"
 
 
-async def test_catalog_cli_connectors_last(env):
+async def test_catalog_weknora_dify_last(env):
     c, _, auth, _ = env
     r = await c.get("/api/connectors/catalog", headers=auth)
     assert r.status_code == 200
     kinds = [e["kind"] for e in r.json()]
     assert "feishu-cli" in kinds
     assert "wecom-cli" in kinds
-    assert kinds[-2:] == ["feishu-cli", "wecom-cli"]
+    assert kinds.index("feishu-cli") < kinds.index("weknora")
+    assert kinds.index("wecom-cli") < kinds.index("dify")
+    assert kinds[-2:] == ["weknora", "dify"]
 
 
 async def test_install_cli_forbidden_for_non_admin(env):
@@ -305,3 +310,159 @@ async def test_cli_status_available_to_non_admin(env, monkeypatch: pytest.Monkey
     r = await c.get("/api/connectors/feishu-cli/cli-status", headers=user_auth)
     assert r.status_code == 200
     assert r.json()["installed"] is False
+
+
+async def test_patch_custom_mcp_server_default_open_only(env):
+    c, _, auth, _ = env
+    put = await c.put(
+        "/api/connectors/custom-mcp",
+        headers=auth,
+        json={
+            "servers": {
+                "linear": {
+                    "transport": "streamable_http",
+                    "url": "https://mcp.linear.app/mcp",
+                    "enabled": True,
+                }
+            }
+        },
+    )
+    assert put.status_code == 200
+
+    patch = await c.patch(
+        "/api/connectors/custom-mcp/servers/linear",
+        headers=auth,
+        json={"default_open": True},
+    )
+    assert patch.status_code == 200
+    servers = patch.json()["servers"]
+    assert servers["linear"]["default_open"] is True
+    assert servers["linear"]["enabled"] is True
+
+    patch_off = await c.patch(
+        "/api/connectors/custom-mcp/servers/linear",
+        headers=auth,
+        json={"default_open": False},
+    )
+    assert patch_off.status_code == 200
+    assert "default_open" not in patch_off.json()["servers"]["linear"]
+
+
+async def test_custom_mcp_oauth_callback_applies_tokens(env):
+    c, srv, auth, _ = env
+    user_id = await resolve_user_id(c, auth, "admin")
+
+    put = await c.put(
+        "/api/connectors/custom-mcp",
+        headers=auth,
+        json={
+            "servers": {
+                "my-oauth-mcp": {
+                    "transport": "streamable_http",
+                    "url": "https://mcp.example.com/mcp",
+                    "enabled": False,
+                }
+            }
+        },
+    )
+    assert put.status_code == 200
+
+    oauth_state = "test-oauth-state-xyz"
+    state_id = new_ulid()
+    srv.services.repos.connector_repo.create_oauth_state(
+        state_id=state_id,
+        state=oauth_state,
+        user_id=user_id,
+        kind=CUSTOM_MCP_KIND,
+        code_verifier="verifier123",
+        redirect_after="/connectors",
+    )
+    save_oauth_ctx(
+        srv.services.settings_repo,
+        state_id,
+        {
+            "flow": "custom_mcp",
+            "kind": CUSTOM_MCP_KIND,
+            "server_name": "my-oauth-mcp",
+            "issuer": "https://auth.example.com",
+            "resource": "https://mcp.example.com/mcp",
+            "client_id": "cid",
+            "client_secret": None,
+            "redirect_uri": "http://testserver/api/connectors/oauth/callback",
+            "metadata": {
+                "authorization_endpoint": "https://auth.example.com/authorize",
+                "token_endpoint": "https://auth.example.com/token",
+            },
+        },
+    )
+
+    with patch(
+        "octop.api.routers.connectors.exchange_oauth_code",
+        new_callable=AsyncMock,
+        return_value={
+            "access_token": "new-access-token",
+            "refresh_token": "refresh-tok",
+            "expires_at": 9_999_999_999,
+        },
+    ):
+        callback = await c.get(
+            f"/api/connectors/oauth/callback?code=authcode&state={oauth_state}",
+            follow_redirects=False,
+        )
+    assert callback.status_code == 200
+    assert "octop:connector-oauth" in callback.text
+
+    stored = await c.get("/api/connectors/custom-mcp", headers=auth)
+    assert stored.status_code == 200
+    assert stored.json()["servers"]["my-oauth-mcp"]["oauth"]["configured"] is True
+
+    pending = await c.get(f"/api/connectors/oauth/pending/{state_id}", headers=auth)
+    assert pending.status_code == 200
+    body = pending.json()
+    assert body["applied"] is True
+    assert body["server_name"] == "my-oauth-mcp"
+
+
+async def test_custom_mcp_oauth_start_unified(env):
+    c, _, auth, _ = env
+    put = await c.put(
+        "/api/connectors/custom-mcp",
+        headers=auth,
+        json={
+            "servers": {
+                "oauth-srv": {
+                    "transport": "streamable_http",
+                    "url": "https://mcp.example.com/mcp",
+                }
+            }
+        },
+    )
+    assert put.status_code == 200
+
+    mocked_start = AsyncMock(
+        return_value=(
+            "https://auth.example.com/authorize?state=x",
+            "verifier",
+            {"flow": "custom_mcp"},
+        )
+    )
+    with (
+        patch("octop.api.routers.connectors._is_public_http_uri", return_value=False),
+        patch("octop.api.routers.connectors.start_oauth_for_target", mocked_start),
+    ):
+        r = await c.post(
+            "/api/connectors/oauth/start",
+            headers=auth,
+            json={
+                "target": {"type": "custom_mcp", "server_name": "oauth-srv"},
+                "redirect_after": "/connectors",
+            },
+        )
+    assert r.status_code == 200
+    data = r.json()
+    assert data["authorize_url"].startswith("https://auth.example.com/")
+    assert data["state_id"]
+    mocked_start.assert_awaited_once()
+    call_kwargs = mocked_start.await_args.kwargs
+    assert call_kwargs["target"] == {"type": "custom_mcp", "server_name": "oauth-srv"}
+    assert call_kwargs["mcp_url"] == "https://mcp.example.com/mcp"
diff --git a/tests/integration/test_postgresql_control_plane.py b/tests/integration/test_postgresql_control_plane.py
index 249dcd0e..9ddba0dc 100644
--- a/tests/integration/test_postgresql_control_plane.py
+++ b/tests/integration/test_postgresql_control_plane.py
@@ -208,17 +208,19 @@ class Row:
             agent_id = "agent01"
             name = "Test"
 
-        data, _ = create_system_backup(
+        archive = tmp_path / "pg-backup.tar.gz"
+        create_system_backup(
             paths=layout,
             agent_rows=[Row()],
             pool=pool,
             db_config=db_config,
+            dest=archive,
         )
 
         _reset_public_schema(pool)
         run_migrations(pool)
         result = restore_system_backup(
-            data,
+            archive,
             paths=layout,
             pool=pool,
             db_config=db_config,
diff --git a/tests/integration/test_provider_test_endpoint.py b/tests/integration/test_provider_test_endpoint.py
index 425c0cc7..4cc9f7bb 100644
--- a/tests/integration/test_provider_test_endpoint.py
+++ b/tests/integration/test_provider_test_endpoint.py
@@ -48,10 +48,15 @@ async def test_provider_test_embedding_skips_chat_probe(
     c, _srv, auth, pid = env_with_provider_record
 
     async def fake_probe(
-        row: Any, *, model_id: str | None = None, embedding: bool | None = None
+        row: Any,
+        *,
+        model_id: str | None = None,
+        embedding: bool | None = None,
+        locale: str = "en",
     ) -> dict[str, Any]:
         assert embedding is True
         assert model_id == "text-embedding-3-small"
+        _ = locale
         return {"ok": True, "latency_ms": 12}
 
     with patch(
diff --git a/tests/integration/test_skills_api.py b/tests/integration/test_skills_api.py
index 796f7c40..f591f69d 100644
--- a/tests/integration/test_skills_api.py
+++ b/tests/integration/test_skills_api.py
@@ -89,6 +89,48 @@ async def test_create_then_list(env: Any) -> None:
     assert "file-reader" in names
 
 
+async def test_list_localizes_octop_presentation_metadata(env: Any) -> None:
+    c, _srv, auth, aid = env
+    content = """---
+name: pdf-reader
+description: Agent trigger description
+metadata:
+  octop:
+    label:
+      zh: PDF 阅读
+      en: PDF Reader
+    summary:
+      zh: 阅读和处理 PDF
+      en: Read and process PDFs
+    emoji: 📄
+---
+"""
+    created = await c.post(
+        f"/api/agents/{aid}/skills",
+        headers=auth,
+        json={"name": "pdf-reader", "content": content},
+    )
+    assert created.status_code == 201, created.text
+
+    zh_rows = (
+        await c.get(
+            f"/api/agents/{aid}/skills",
+            headers={**auth, "Accept-Language": "zh-CN"},
+        )
+    ).json()
+    en_rows = (
+        await c.get(
+            f"/api/agents/{aid}/skills",
+            headers={**auth, "Accept-Language": "en-US"},
+        )
+    ).json()
+
+    zh = next(row for row in zh_rows if row["slug"] == "pdf-reader")
+    en = next(row for row in en_rows if row["slug"] == "pdf-reader")
+    assert (zh["name"], zh["description"]) == ("PDF 阅读", "阅读和处理 PDF")
+    assert (en["name"], en["description"]) == ("PDF Reader", "Read and process PDFs")
+
+
 async def test_list_empty_when_no_workspace_skills(env: Any) -> None:
     c, _srv, auth, aid = env
     r = await c.get(f"/api/agents/{aid}/skills", headers=auth)
@@ -111,9 +153,10 @@ async def test_list_includes_builtin_skills(env: Any) -> None:
     assert ws["enabled"] is True
     assert ws["emoji"] == "🔍"
 
-    manager = next(row for row in builtin if row["name"] == "skill-manager")
+    manager = next(row for row in builtin if row["slug"] == "skill-manager")
     assert manager["enabled"] is True
-    assert "SkillHub" in manager["description"]
+    assert manager["name"] in {"技能管理", "Skill Manager"}
+    assert manager["description"]
 
 
 async def test_get_builtin_skill_detail(env: Any) -> None:
diff --git a/tests/integration/test_skills_hub.py b/tests/integration/test_skills_hub.py
index ee8fee27..456e8bbe 100644
--- a/tests/integration/test_skills_hub.py
+++ b/tests/integration/test_skills_hub.py
@@ -201,6 +201,8 @@ async def unexpected_cli() -> str:
             "enable": True,
             "display_name": "中文展示名称",
             "icon_url": icon_url,
+            "label": {"zh": "中文展示名称", "en": "Friendly Name"},
+            "summary": {"zh": "中文短描述", "en": "Short description"},
         },
     )
     assert r.status_code == 201, r.text
@@ -219,8 +221,9 @@ async def unexpected_cli() -> str:
     assert payload["frontmatter"]["name"] == "english-package-name"
     assert payload["frontmatter"]["metadata"]["octop"] == {
         "source": "skillhub",
-        "display_name": "中文展示名称",
         "icon_url": icon_url,
+        "label": {"zh": "中文展示名称", "en": "Friendly Name"},
+        "summary": {"zh": "中文短描述", "en": "Short description"},
     }
 
 
diff --git a/tests/live/test_channel_probe.py b/tests/live/test_channel_probe.py
new file mode 100644
index 00000000..56067052
--- /dev/null
+++ b/tests/live/test_channel_probe.py
@@ -0,0 +1,87 @@
+"""Live channel credential probes (WeChat iLink + Feishu).
+
+Exercises the same ``ChannelManager.probe_channel`` path the dashboard uses
+via ``Gateway.probe_config`` / ``POST …/channels/test`` — so a green result
+means the real app credentials reach the real upstream.
+
+Credentials come from the repo-root ``.env`` (loaded by ``tests/live/conftest.py``)
+or from CI GitHub Secrets mapped in ``.github/workflows/ci.yml``. Missing vars
+auto-skip that case so CI stays green when a channel is not configured.
+
+Run locally::
+
+    uv run pytest tests/live/test_channel_probe.py -m live -v
+"""
+
+from __future__ import annotations
+
+import aiohttp
+import pytest
+from harness_gateway.channels.weixin.api import WeixinAPIClient
+from harness_gateway.channels.weixin.types import WeixinAPIError
+from harness_gateway.manager import ChannelManager
+from tests.support.secrets import optional_env, require_env
+
+pytestmark = pytest.mark.live
+
+_DEFAULT_WEIXIN_BASE_URL = "https://ilinkai.weixin.qq.com"
+
+
+async def _noop_processor(_msg: object) -> None:
+    return None
+
+
+@pytest.mark.asyncio
+async def test_feishu_probe_accepts_app_credentials() -> None:
+    """Feishu ``start()`` refreshes tenant_access_token — validates app id/secret."""
+    app_id = require_env("FEISHU_APP_ID")
+    app_secret = require_env("FEISHU_APP_SECRET")
+
+    manager = ChannelManager(processor=_noop_processor)
+    await manager.probe_channel(
+        "feishu",
+        {"app_id": app_id, "app_secret": app_secret},
+        tenant_id="live-probe",
+        channel_id="live-feishu-probe",
+    )
+
+
+@pytest.mark.asyncio
+async def test_weixin_ilink_token_accepted() -> None:
+    """WeChat iLink getUpdates with a short poll validates bot token + UIN."""
+    bot_uin = require_env("WEIXIN_BOT_UIN")
+    token = require_env("WEIXIN_TOKEN")
+    base_url = optional_env("WEIXIN_BASE_URL", _DEFAULT_WEIXIN_BASE_URL) or _DEFAULT_WEIXIN_BASE_URL
+
+    # Product probe only starts the long-poll loop; hit getUpdates once so a
+    # bad token fails the live test instead of silently succeeding.
+    async with aiohttp.ClientSession() as session:
+        client = WeixinAPIClient(base_url, token, session, timeout_s=20.0)
+        try:
+            await client.get_updates(sync_cursor="", timeout_ms=1000)
+        except WeixinAPIError as exc:
+            pytest.fail(
+                f"weixin getUpdates rejected credentials "
+                f"(bot_uin={bot_uin!r} base_url={base_url!r}): "
+                f"ret={exc.ret} errcode={exc.errcode} errmsg={exc.errmsg}"
+            )
+        except (TimeoutError, aiohttp.ClientError) as exc:
+            # GitHub-hosted runners often cannot finish iLink long-poll within
+            # the client timeout; that is reachability, not a bad token.
+            pytest.skip(f"weixin getUpdates unreachable ({base_url}): {exc}")
+
+    manager = ChannelManager(processor=_noop_processor)
+    try:
+        await manager.probe_channel(
+            "weixin",
+            {
+                "bot_uin": bot_uin,
+                "token": token,
+                "base_url": base_url,
+                "account_id": bot_uin,
+            },
+            tenant_id="live-probe",
+            channel_id="live-weixin-probe",
+        )
+    except (TimeoutError, aiohttp.ClientError) as exc:
+        pytest.skip(f"weixin probe_channel unreachable ({base_url}): {exc}")
diff --git a/tests/support/fakes.py b/tests/support/fakes.py
index baa1f339..9277d823 100644
--- a/tests/support/fakes.py
+++ b/tests/support/fakes.py
@@ -220,6 +220,7 @@ async def list_skill_summaries(self) -> list[dict[str, Any]]:
         tests, or the real disk-backed backend). Enumerate from whichever store holds
         them so the listed summaries match what the routers persisted.
         """
+        from octop.infra.skills.presentation import apply_skill_presentation
         from octop.infra.utils.frontmatter import parse_frontmatter
 
         collected: dict[str, str] = {}
@@ -274,15 +275,18 @@ async def list_skill_summaries(self) -> list[dict[str, Any]]:
                 slug = skill_dir.name
                 name = str(meta.get("name") or slug)
                 is_disabled = slug in disabled or name in disabled
-                merged[slug] = {
-                    "slug": slug,
-                    "name": name,
-                    "description": str(meta.get("description") or ""),
-                    "kind": "package",
-                    "package_id": package_id,
-                    "enabled": not is_disabled,
-                    "disabled": is_disabled,
-                }
+                merged[slug] = apply_skill_presentation(
+                    {
+                        "slug": slug,
+                        "name": name,
+                        "description": str(meta.get("description") or ""),
+                        "kind": "package",
+                        "package_id": package_id,
+                        "enabled": not is_disabled,
+                        "disabled": is_disabled,
+                    },
+                    meta,
+                )
         for path in sorted(collected):
             meta, _ = parse_frontmatter(collected[path])
             # Slug is the skill directory name (parent of SKILL.md), matching the
@@ -300,24 +304,18 @@ async def list_skill_summaries(self) -> list[dict[str, Any]]:
                 continue
             name = str(meta.get("name") or slug)
             is_disabled = slug in disabled or name in disabled
-            row: dict[str, Any] = {
-                "slug": slug,
-                "name": name,
-                "description": str(meta.get("description") or ""),
-                "path": path,
-                "kind": kind,
-                "enabled": not is_disabled,
-                "disabled": is_disabled,
-            }
-            # Mirror harness: emoji lives under metadata.{octop,lightclaw,orca,harness}.
-            metadata = meta.get("metadata") or {}
-            if isinstance(metadata, dict):
-                for key in ("octop", "lightclaw", "orca", "harness"):
-                    ext = metadata.get(key) or {}
-                    if isinstance(ext, dict) and "emoji" in ext:
-                        row["emoji"] = str(ext["emoji"])
-                        break
-            merged[slug] = row
+            merged[slug] = apply_skill_presentation(
+                {
+                    "slug": slug,
+                    "name": name,
+                    "description": str(meta.get("description") or ""),
+                    "path": path,
+                    "kind": kind,
+                    "enabled": not is_disabled,
+                    "disabled": is_disabled,
+                },
+                meta,
+            )
         return sorted(
             merged.values(),
             key=lambda row: (
diff --git a/tests/unit/agents/test_agent_manager.py b/tests/unit/agents/test_agent_manager.py
index 014a2764..470573fc 100644
--- a/tests/unit/agents/test_agent_manager.py
+++ b/tests/unit/agents/test_agent_manager.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import asyncio
 import json
 import os
 from collections.abc import AsyncIterator
@@ -27,6 +28,16 @@
 # Linux/Docker sandbox concept; on Windows they are not absolute paths.
 posix_only = pytest.mark.skipif(os.name != "posix", reason="POSIX rootfs workspace paths")
 
+# Real HarnessAgentManager starts memory maintenance (GC/vacuum) on a daemon
+# thread. Closing the agent while that tick holds the SQLite handle races on
+# Windows (access violation under pytest-xdist). Unit tests here only need
+# workspace/config behavior — keep memory off.
+_MEMORY_OFF: dict[str, Any] = {"memory": {"memory_enabled": False}}
+
+
+async def _collect_async(iterator: AsyncIterator[Any]) -> list[Any]:
+    return [item async for item in iterator]
+
 
 def _expected_default_backend(manager: AgentManager, agent_id: str) -> dict[str, Any]:
     from octop.infra.agents.execute_env import inject_agent_execute_env
@@ -430,6 +441,70 @@ async def fake_stream(*_args: Any, **_kwargs: Any) -> AsyncIterator[dict[str, st
     assert agent_id not in manager._bootstrap_graph_refresh_pending
 
 
+@pytest.mark.asyncio
+async def test_history_backfill_refuses_while_agent_stream_is_active(
+    manager: AgentManager,
+) -> None:
+    agent_id = "AGT_BUSY"
+    started = asyncio.Event()
+    release = asyncio.Event()
+    harness_manager = MagicMock()
+
+    async def fake_stream(*_args: Any, **_kwargs: Any) -> AsyncIterator[dict[str, str]]:
+        started.set()
+        await release.wait()
+        yield {"type": "done"}
+
+    harness_manager.stream = fake_stream
+    manager._harness_manager = harness_manager
+
+    task = asyncio.create_task(_collect_async(manager.stream(agent_id, {"thread_id": "thr-busy"})))
+    await started.wait()
+
+    assert manager.is_agent_active(agent_id) is True
+    assert manager.try_begin_history_backfill(agent_id) is False
+
+    release.set()
+    await task
+    assert manager.is_agent_active(agent_id) is False
+
+
+@pytest.mark.asyncio
+async def test_waiting_agent_stream_prevents_next_history_backfill(
+    manager: AgentManager,
+) -> None:
+    agent_id = "AGT_PRIORITY"
+    stream_started = asyncio.Event()
+    stream_release = asyncio.Event()
+    harness_manager = MagicMock()
+
+    async def fake_stream(*_args: Any, **_kwargs: Any) -> AsyncIterator[dict[str, str]]:
+        stream_started.set()
+        await stream_release.wait()
+        yield {"type": "done"}
+
+    harness_manager.stream = fake_stream
+    manager._harness_manager = harness_manager
+    assert manager.try_begin_history_backfill(agent_id) is True
+
+    task = asyncio.create_task(
+        _collect_async(manager.stream(agent_id, {"thread_id": "thr-priority"}))
+    )
+    await asyncio.sleep(0)
+    assert stream_started.is_set() is False
+    assert manager.try_begin_history_backfill(agent_id) is False
+
+    manager.end_history_backfill(agent_id)
+    await stream_started.wait()
+    assert manager.is_agent_active(agent_id) is True
+    assert manager.try_begin_history_backfill(agent_id) is False
+
+    stream_release.set()
+    await task
+    assert manager.try_begin_history_backfill(agent_id) is True
+    manager.end_history_backfill(agent_id)
+
+
 @pytest.mark.asyncio
 async def test_reload_agent_clears_bootstrap_refresh_pending(manager: AgentManager) -> None:
     agent_id = "AGT_RELOAD"
@@ -706,7 +781,12 @@ async def test_start_agent_real_harness_seeds_agents_md(manager: AgentManager) -
     manager._harness_manager = HarnessAgentManager(
         providers=manager.providers.build_harness_configs(),
     )
-    row = manager._repos.agent_repo.create(agent_id="REAL01", user_id=None, name="real")
+    row = manager._repos.agent_repo.create(
+        agent_id="REAL01",
+        user_id=None,
+        name="real",
+        config_json=json.dumps(_MEMORY_OFF),
+    )
     row = manager._repos.agent_repo.get("REAL01")
     assert row is not None
 
@@ -731,7 +811,12 @@ async def test_stop_and_start_round_trip(manager: AgentManager) -> None:
     manager._harness_manager = HarnessAgentManager(
         providers=manager.providers.build_harness_configs(),
     )
-    manager._repos.agent_repo.create(agent_id="STOP01", user_id=None, name="stop-me")
+    manager._repos.agent_repo.create(
+        agent_id="STOP01",
+        user_id=None,
+        name="stop-me",
+        config_json=json.dumps(_MEMORY_OFF),
+    )
     row = manager.get_row("STOP01")
     assert row is not None
     await manager._start_agent(row)
@@ -761,7 +846,12 @@ async def test_save_security_rebuilds_running_harness_agent(manager: AgentManage
     manager._harness_manager = HarnessAgentManager(
         providers=manager.providers.build_harness_configs(),
     )
-    manager._repos.agent_repo.create(agent_id="SEC01", user_id=None, name="sec")
+    manager._repos.agent_repo.create(
+        agent_id="SEC01",
+        user_id=None,
+        name="sec",
+        config_json=json.dumps(_MEMORY_OFF),
+    )
     row = manager.get_row("SEC01")
     assert row is not None
     await manager._start_agent(row)
@@ -784,7 +874,12 @@ async def test_reload_skips_stopped_agent(manager: AgentManager) -> None:
     manager._harness_manager = HarnessAgentManager(
         providers=manager.providers.build_harness_configs(),
     )
-    manager._repos.agent_repo.create(agent_id="SKIP01", user_id=None, name="skip")
+    manager._repos.agent_repo.create(
+        agent_id="SKIP01",
+        user_id=None,
+        name="skip",
+        config_json=json.dumps(_MEMORY_OFF),
+    )
     row = manager.get_row("SKIP01")
     assert row is not None
     await manager._start_agent(row)
@@ -811,7 +906,7 @@ async def test_create_seeds_bootstrap_files(manager: AgentManager) -> None:
     manager._harness_manager = HarnessAgentManager(
         providers=manager.providers.build_harness_configs(),
     )
-    row = await manager.create(AgentCreateSpec(name="seeded"))
+    row = await manager.create(AgentCreateSpec(name="seeded", config=dict(_MEMORY_OFF)))
     agent = manager.get_agent(row.agent_id)
     assert agent.workspace.exists("BOOTSTRAP.md")
     assert agent.workspace.exists("AGENTS.md")
@@ -850,6 +945,7 @@ async def test_create_keeps_user_workspace_dir(
             AgentCreateSpec(
                 name="user-ws",
                 config={
+                    **_MEMORY_OFF,
                     "backend": {
                         "type": "local_shell",
                         "root_dir": str(tmp_path),
@@ -889,11 +985,12 @@ async def test_create_persists_rootfs_workspace_under_scoped_root(
             AgentCreateSpec(
                 name="scoped-ws",
                 config={
+                    **_MEMORY_OFF,
                     "backend": {
                         "type": "local_shell",
                         "root_dir": str(tmp_path),
                         "virtual_mode": True,
-                    }
+                    },
                 },
             )
         )
@@ -954,7 +1051,11 @@ async def test_templated_agent_keeps_expert_soul_on_reload(manager: AgentManager
         providers=manager.providers.build_harness_configs(),
     )
     row = await manager.create(
-        AgentCreateSpec(name="tpl-bot", template_name="general-assistant"),
+        AgentCreateSpec(
+            name="tpl-bot",
+            template_name="general-assistant",
+            config=dict(_MEMORY_OFF),
+        ),
     )
     agent = manager.get_agent(row.agent_id)
     expected_soul = (default_library_root() / "general-assistant" / "SOUL.md").read_text(
diff --git a/tests/unit/agents/test_context_breakdown.py b/tests/unit/agents/test_context_breakdown.py
index 5aa1ae04..d4422b12 100644
--- a/tests/unit/agents/test_context_breakdown.py
+++ b/tests/unit/agents/test_context_breakdown.py
@@ -61,8 +61,10 @@ def _registry(usage: object | None, *, history: list[object] | None = None) -> M
     registry = MagicMock()
     registry.get_row.return_value = MagicMock()
     harness = MagicMock()
-    # None → older harness without aget_context_usage
-    harness.aget_context_usage = None if usage is None else AsyncMock(return_value=usage)
+    harness._context_usage_mw = (
+        None if usage is None else SimpleNamespace(get_snapshot=MagicMock(return_value=usage))
+    )
+    harness.aget_context_usage = AsyncMock(side_effect=AssertionError("must not read checkpoint"))
     harness.aget_history = AsyncMock(return_value=list(history or []))
     registry.get_agent.return_value = harness
     return registry
@@ -149,7 +151,7 @@ async def test_empty_without_stream_tokens() -> None:
 
 
 @pytest.mark.asyncio
-async def test_recovers_response_metadata_token_usage() -> None:
+async def test_does_not_recover_response_metadata_from_checkpoint() -> None:
     empty = _usage(used=0, segments={}, source="empty")
     history = [
         {
@@ -164,13 +166,11 @@ async def test_recovers_response_metadata_token_usage() -> None:
         thread_id="t1",
         max_tokens=128_000,
     )
-    assert result.used_tokens == 8800
-    assert result.segments["conversation"] == 8800
+    assert result.used_tokens == 0
 
 
 @pytest.mark.asyncio
-async def test_reads_additional_kwargs_context_usage_without_source() -> None:
-    """Stock snapshots live on additional_kwargs; older stamps omit source."""
+async def test_does_not_read_checkpoint_context_stamp() -> None:
     empty = _usage(used=0, segments={}, source="empty")
     history = [
         {
@@ -196,14 +196,12 @@ async def test_reads_additional_kwargs_context_usage_without_source() -> None:
         thread_id="t1",
         max_tokens=1_000_000,
     )
-    assert result.max_tokens == 128_000
-    assert result.used_tokens == 15_400
-    assert result.segments["system_prompt"] == 2_000
-    assert result.segments["conversation"] == 13_400
+    assert result.max_tokens == 1_000_000
+    assert result.used_tokens == 0
 
 
 @pytest.mark.asyncio
-async def test_recovers_usage_metadata_when_snapshot_empty() -> None:
+async def test_empty_snapshot_uses_usage_ledger_without_checkpoint() -> None:
     empty = _usage(used=0, segments={}, source="empty")
     history = [
         {"role": "user", "content": "hi"},
@@ -213,14 +211,19 @@ async def test_recovers_usage_metadata_when_snapshot_empty() -> None:
             "usage_metadata": {"input_tokens": 4200, "output_tokens": 12},
         },
     ]
+    registry = _registry(empty, history=history)
+    usage_repo = MagicMock()
+    usage_repo.last_thread_input_tokens.return_value = 4200
     result = await compute_context_breakdown(
-        _registry(empty, history=history),
+        registry,
         agent_id="agt",
         thread_id="t1",
         max_tokens=128_000,
+        usage_repo=usage_repo,
     )
     assert result.used_tokens == 4200
     assert result.segments["conversation"] == 4200
+    registry.get_agent.return_value.aget_history.assert_not_awaited()
 
 
 @pytest.mark.asyncio
diff --git a/tests/unit/agents/test_onnx_service.py b/tests/unit/agents/test_onnx_service.py
index 2581f68d..3657cc0f 100644
--- a/tests/unit/agents/test_onnx_service.py
+++ b/tests/unit/agents/test_onnx_service.py
@@ -344,6 +344,9 @@ def test_is_downloaded_finds_nested_onnx_weights(tmp_path, monkeypatch) -> None:
     from octop.infra.agents.providers import onnx_service as mod
 
     mid = "jinaai/jina-clip-v1"
+    # Keep this cache-layout regression independent of whether the optional
+    # fastembed package is installed and contributes this model to the catalog.
+    monkeypatch.setattr(mod, "list_onnx_catalog_models", lambda: [{"id": mid}])
     snap = mod.model_cache_dir(mid) / "snapshots" / "abc123"
     (snap / "onnx").mkdir(parents=True)
     (snap / "config.json").write_text("{}", encoding="utf-8")
diff --git a/tests/unit/agents/test_provider_reasoning.py b/tests/unit/agents/test_provider_reasoning.py
index f4677e4e..633cb6df 100644
--- a/tests/unit/agents/test_provider_reasoning.py
+++ b/tests/unit/agents/test_provider_reasoning.py
@@ -28,18 +28,22 @@ def test_minimax_token_plan_reasoning_is_always_on() -> None:
 
 
 def test_deepseek_v4_uses_nested_effort_parameter() -> None:
-    capability = reasoning_capability(
-        {
-            "id": "deepseek-v4-pro-202606",
-            "options": {"thinking": {"type": "enabled"}},
-        },
-        base_url="https://api.lkeap.cloud.tencent.com/plan/v3",
-    )
-    assert capability is not None
-    assert capability["efforts"] == ["high", "max"]
-    assert reasoning_request_parameters(capability, mode="enabled", effort="max") == {
-        "extra_body": {"thinking": {"type": "enabled", "reasoning_effort": "max"}}
-    }
+    for base_url in (
+        "https://api.lkeap.cloud.tencent.com/plan/v3",
+        "https://tokenhub.tencentmaas.com/plan/v3",
+    ):
+        capability = reasoning_capability(
+            {
+                "id": "deepseek-v4-pro-202606",
+                "options": {"thinking": {"type": "enabled"}},
+            },
+            base_url=base_url,
+        )
+        assert capability is not None
+        assert capability["efforts"] == ["high", "max"]
+        assert reasoning_request_parameters(capability, mode="enabled", effort="max") == {
+            "extra_body": {"thinking": {"type": "enabled", "reasoning_effort": "max"}}
+        }
 
 
 def test_explicit_capability_filters_unsupported_effort() -> None:
diff --git a/tests/unit/agents/test_skill_package_store.py b/tests/unit/agents/test_skill_package_store.py
index d0ed706e..567b731e 100644
--- a/tests/unit/agents/test_skill_package_store.py
+++ b/tests/unit/agents/test_skill_package_store.py
@@ -65,11 +65,12 @@ def test_write_and_delete_skill_updates_disk_summaries_and_count(
     assert store.list_skill_summaries(row.id) == [
         {
             "slug": "pdf",
-            "name": "PDF Reader",
+            "name": "PDF",
             "description": "",
             "path": "skills/pdf/SKILL.md",
             "kind": "package",
             "package_id": row.id,
+            "display_name": "PDF Reader",
             "emoji": "\U0001f4c4",
             "icon_url": "https://cdn.example.com/pdf.png",
         }
@@ -134,6 +135,39 @@ def test_write_skill_recreates_empty_directories(store: SkillPackageStore) -> No
     assert list((skill_dir / "ai").iterdir()) == []
 
 
+def test_list_skill_summaries_localizes_octop_metadata(store: SkillPackageStore) -> None:
+    row = store.create(name="P", description="", created_by="42")
+    store.write_skill(
+        row.id,
+        "pdf-reader",
+        [
+            (
+                "SKILL.md",
+                (
+                    "---\n"
+                    "name: pdf-reader\n"
+                    "description: Agent trigger\n"
+                    "metadata:\n"
+                    "  octop:\n"
+                    "    label:\n"
+                    "      zh: PDF 阅读\n"
+                    "      en: PDF Reader\n"
+                    "    summary:\n"
+                    "      zh: 读取 PDF\n"
+                    "      en: Read PDFs\n"
+                    "---\n"
+                ).encode(),
+            )
+        ],
+    )
+
+    zh = store.list_skill_summaries(row.id, locale="zh")[0]
+    en = store.list_skill_summaries(row.id, locale="en")[0]
+
+    assert (zh["name"], zh["description"]) == ("PDF 阅读", "读取 PDF")
+    assert (en["name"], en["description"]) == ("PDF Reader", "Read PDFs")
+
+
 def test_skill_count_excludes_skills_hidden_from_summaries(store: SkillPackageStore) -> None:
     row = store.create(name="P", description="", created_by="42")
     skills_dir = store.package_skills_dir(row.id)
diff --git a/tests/unit/api/test_backup_restore_rehydrate.py b/tests/unit/api/test_backup_restore_rehydrate.py
index fcefb722..b71e82fd 100644
--- a/tests/unit/api/test_backup_restore_rehydrate.py
+++ b/tests/unit/api/test_backup_restore_rehydrate.py
@@ -1,4 +1,4 @@
-"""Unit tests for admin backup restore rehydrate."""
+"""Unit tests for admin backup restore rehydrate and non-blocking paths."""
 
 from __future__ import annotations
 
@@ -8,6 +8,9 @@
 import pytest
 
 from octop.api.routers import backup as backup_router
+from octop.infra.backup.auto import BACKUP_LOCK
+from octop.infra.backup.store import BackupFileInfo
+from octop.infra.errors import ErrorCode, OctopError
 
 
 @pytest.mark.asyncio
@@ -27,11 +30,10 @@ async def test_restore_backup_file_rehydrates_providers_channels_and_cron(
     }
 
     monkeypatch.setattr(backup_router, "normalize_backup_filename", lambda name: name)
-    monkeypatch.setattr(backup_router, "read_backup_file", lambda *_a, **_k: b"fake-archive")
     monkeypatch.setattr(
         backup_router,
-        "restore_system_backup",
-        lambda *_a, **_k: restored,
+        "_restore_stored_backup",
+        lambda **_k: restored,
     )
 
     server = MagicMock()
@@ -72,11 +74,10 @@ async def test_restore_backup_file_skips_rehydrate_without_runtime(
         "restore_config": False,
     }
     monkeypatch.setattr(backup_router, "normalize_backup_filename", lambda name: name)
-    monkeypatch.setattr(backup_router, "read_backup_file", lambda *_a, **_k: b"fake-archive")
     monkeypatch.setattr(
         backup_router,
-        "restore_system_backup",
-        lambda *_a, **_k: restored,
+        "_restore_stored_backup",
+        lambda **_k: restored,
     )
 
     server = MagicMock()
@@ -115,3 +116,74 @@ async def test_rehydrate_reloads_channels_and_cron_even_if_provider_rehydrate_fa
     on_provider_changed.assert_awaited_once_with()
     reload_channels.assert_awaited_once_with()
     reload_cron.assert_awaited_once_with()
+
+
+@pytest.mark.asyncio
+async def test_create_backup_offloads_to_thread(monkeypatch: pytest.MonkeyPatch) -> None:
+    """Manual create must not run tar/sqlite work on the event loop."""
+    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 = MagicMock()
+    server.services.db = object()
+    server.services.config.database = object()
+    server.paths = object()
+    server.app_runtime = MagicMock()
+
+    result = await backup_router.create_backup(_=None, server=server)
+
+    assert result == {"ok": True, "item": entry.to_dict()}
+    assert called["pool"] is server.services.db
+
+
+@pytest.mark.asyncio
+async def test_create_backup_rejects_when_lock_held() -> None:
+    await BACKUP_LOCK.acquire()
+    try:
+        with pytest.raises(OctopError) as exc_info:
+            await backup_router.create_backup(_=None, server=MagicMock(services=MagicMock()))
+        assert exc_info.value.code == ErrorCode.BACKUP_IN_PROGRESS
+    finally:
+        BACKUP_LOCK.release()
+
+
+@pytest.mark.asyncio
+async def test_restore_backup_rejects_when_lock_held(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setattr(backup_router, "normalize_backup_filename", lambda name: name)
+    await BACKUP_LOCK.acquire()
+    try:
+        with pytest.raises(OctopError) as exc_info:
+            await backup_router.restore_backup_file(
+                filename="octop-backup.tar.gz",
+                restore_config=True,
+                user=MagicMock(id=1, username="admin"),
+                server=MagicMock(services=MagicMock()),
+            )
+        assert exc_info.value.code == ErrorCode.BACKUP_IN_PROGRESS
+    finally:
+        BACKUP_LOCK.release()
+
+
+@pytest.mark.asyncio
+async def test_backup_status_reports_idle_and_busy() -> None:
+    from octop.infra.backup.auto import hold_backup_lock
+
+    idle = await backup_router.get_backup_status(_=None)
+    assert idle == {"busy": False, "operation": None}
+
+    async with hold_backup_lock("create"):
+        busy = await backup_router.get_backup_status(_=None)
+        assert busy == {"busy": True, "operation": "create"}
diff --git a/tests/unit/api/test_chat_history.py b/tests/unit/api/test_chat_history.py
index b9fd2a89..3dd6ca01 100644
--- a/tests/unit/api/test_chat_history.py
+++ b/tests/unit/api/test_chat_history.py
@@ -2,8 +2,10 @@
 
 from __future__ import annotations
 
+from pathlib import Path
+from types import SimpleNamespace
 from typing import Any
-from unittest.mock import AsyncMock, MagicMock
+from unittest.mock import MagicMock, call
 
 import pytest
 from langchain_core.messages import HumanMessage
@@ -13,9 +15,14 @@
     HISTORY_DEFAULT_LIMIT,
     HISTORY_MAX_LIMIT,
     _clamp_history_limit,
+    _isolated_sqlite_checkpoint_messages,
     _load_checkpoint_messages,
     _slice_message_page,
 )
+from octop.infra.db.repos.thread_messages import (
+    ThreadProjectionCandidate,
+    ThreadProjectionSummary,
+)
 from octop.infra.db.repos.threads import ThreadRow
 from octop.infra.gateway.threads import thread_row_has_messages
 
@@ -63,6 +70,41 @@ def test_slice_message_page_long_thread_no_gaps_or_overlaps() -> None:
     assert collected == raw
 
 
+def test_isolated_sqlite_history_supports_pypi_memory_0_9_7(tmp_path: Path) -> None:
+    from harness_memory import Memory
+    from langchain_core.messages import AIMessage
+    from langgraph.checkpoint.base import empty_checkpoint
+
+    db_path = tmp_path / "checkpoint.db"
+    memory = Memory(
+        "agent_test",
+        backend="sqlite",
+        backend_config={"db_path": str(db_path)},
+    )
+    checkpoint = empty_checkpoint()
+    checkpoint["channel_values"] = {
+        "messages": [HumanMessage(content="hi", id="u1"), AIMessage(content="ok", id="a1")]
+    }
+    checkpoint["channel_versions"] = {"messages": 1}
+    memory.put(
+        {"configurable": {"thread_id": "thr", "checkpoint_ns": ""}},
+        checkpoint,
+        {},
+        {"messages": 1},
+    )
+    # Prove the migration opens its own read-only connection rather than using
+    # harness-memory 0.9.7's live synchronous saver connection.
+    memory._checkpointer.conn.close()
+    try:
+        harness = SimpleNamespace(_checkpointer_instance=memory)
+        messages = _isolated_sqlite_checkpoint_messages(harness, "thr")
+    finally:
+        memory._backend.close()
+
+    assert messages is not None
+    assert [message.id for message in messages] == ["u1", "a1"]
+
+
 def test_thread_row_has_messages_uses_title_or_last_active() -> None:
     empty = ThreadRow(
         id=1,
@@ -157,10 +199,11 @@ async def test_get_thread_history_returns_has_more(monkeypatch: pytest.MonkeyPat
     row = MagicMock(agent_id="agt_1", user_id=1, artifacts=())
     server.app_runtime.gateway.thread_registry.get_thread.return_value = row
 
+    server.services.thread_message_repo.projection_status.return_value = "ready"
     monkeypatch.setattr(
         history_mod,
-        "_load_thread_messages",
-        AsyncMock(return_value=([{"role": "user", "content": "hi"}], True)),
+        "_load_projected_thread_messages",
+        MagicMock(return_value=([{"role": "user", "content": "hi"}], True)),
     )
     out = await history_mod.get_thread_history(
         "agt_1",
@@ -175,6 +218,152 @@ async def test_get_thread_history_returns_has_more(monkeypatch: pytest.MonkeyPat
     assert out["limit"] == HISTORY_DEFAULT_LIMIT
     assert out["offset"] == 0
     assert out["messages"][0]["role"] == "user"
+    assert out["history_loading"] is False
+
+
+@pytest.mark.asyncio
+async def test_get_legacy_history_enqueues_without_reading_checkpoint(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    server = MagicMock()
+    row = MagicMock(agent_id="agt_1", user_id=1, artifacts=())
+    server.app_runtime.gateway.thread_registry.get_thread.return_value = row
+    server.services.thread_message_repo.projection_status.return_value = "pending"
+    server.app_runtime.gateway.history_backfill.enqueue.return_value = True
+    load_projection = MagicMock(side_effect=AssertionError("must not read projection yet"))
+    monkeypatch.setattr(history_mod, "_load_projected_thread_messages", load_projection)
+
+    out = await history_mod.get_thread_history(
+        "agt_1",
+        "thr_legacy",
+        user=MagicMock(id=1),
+        server=server,
+    )
+
+    assert out["messages"] == []
+    assert out["history_loading"] is True
+    assert out["history_status"] == "queued"
+    server.app_runtime.gateway.history_backfill.enqueue.assert_called_once()
+    load_projection.assert_not_called()
+
+
+@pytest.mark.asyncio
+async def test_history_migration_status_is_scoped_to_effective_user() -> None:
+    server = MagicMock()
+    server.services.thread_message_repo.migration_summary.return_value = ThreadProjectionSummary(
+        pending=2, queued=1, running=1, failed=3
+    )
+    server.services.thread_message_repo.migration_active_thread_ids.return_value = ["thr_live"]
+    queue = server.app_runtime.gateway.history_backfill
+    queue.contains.return_value = True
+    queue.available_slots = 10
+    user = MagicMock(id=7, is_admin=False)
+
+    out = await history_mod.get_history_migration_status(
+        "agt_1",
+        user=user,
+        server=server,
+    )
+
+    assert out == {
+        "remaining": 7,
+        "pending": 2,
+        "queued": 1,
+        "running": 1,
+        "failed": 3,
+        "processing": True,
+        "agent_busy": False,
+        "can_start": True,
+    }
+    server.services.thread_message_repo.migration_summary.assert_called_once_with(
+        agent_id="agt_1",
+        user_id=7,
+    )
+
+
+@pytest.mark.asyncio
+async def test_start_history_migration_queues_bounded_candidates() -> None:
+    server = MagicMock()
+    queue = server.app_runtime.gateway.history_backfill
+    queue.available_slots = 2
+    queue.active_jobs = 0
+    queue.enqueue.return_value = True
+    repo = server.services.thread_message_repo
+    repo.migration_candidates.return_value = [
+        ThreadProjectionCandidate(thread_id="thr_a", status="pending"),
+        ThreadProjectionCandidate(thread_id="thr_b", status="failed"),
+    ]
+    repo.migration_summary.return_value = ThreadProjectionSummary(queued=2)
+    repo.migration_active_thread_ids.return_value = ["thr_a", "thr_b"]
+    queue.contains.side_effect = [False, False, True, True]
+    user = MagicMock(id=7, is_admin=False)
+
+    out = await history_mod.start_history_migration(
+        "agt_1",
+        user=user,
+        server=server,
+    )
+
+    assert out["accepted"] == 2
+    assert out["remaining"] == 2
+    repo.migration_candidates.assert_called_once_with(agent_id="agt_1", user_id=7, limit=2)
+    assert repo.mark_projection.call_args_list == [
+        call("thr_a", "queued"),
+        call("thr_b", "queued"),
+    ]
+    assert queue.enqueue.call_count == 2
+
+
+@pytest.mark.asyncio
+async def test_history_migration_waits_while_agent_is_active() -> None:
+    server = MagicMock()
+    server.app_runtime.agent_registry.is_agent_active.return_value = True
+    server.services.thread_message_repo.migration_summary.return_value = ThreadProjectionSummary(
+        pending=1
+    )
+    server.services.thread_message_repo.migration_active_thread_ids.return_value = []
+    server.app_runtime.gateway.history_backfill.available_slots = 10
+    server.app_runtime.gateway.history_backfill.contains.return_value = False
+    row = MagicMock(agent_id="agt_1", user_id=7, artifacts=())
+    server.app_runtime.gateway.thread_registry.get_thread.return_value = row
+    server.services.thread_message_repo.projection_status.return_value = "pending"
+    user = MagicMock(id=7, is_admin=False)
+
+    status = await history_mod.get_history_migration_status(
+        "agt_1",
+        user=user,
+        server=server,
+    )
+    history = await history_mod.get_thread_history(
+        "agt_1",
+        "thr_legacy",
+        user=user,
+        server=server,
+    )
+
+    assert status["agent_busy"] is True
+    assert status["can_start"] is False
+    assert history["history_status"] == "pending"
+    server.app_runtime.gateway.history_backfill.enqueue.assert_not_called()
+
+
+@pytest.mark.asyncio
+async def test_backfill_requeues_thread_when_agent_became_busy() -> None:
+    server = MagicMock()
+    registry = server.app_runtime.agent_registry
+    registry.try_begin_history_backfill.return_value = False
+
+    await history_mod._backfill_thread_projection(
+        server,
+        "agt_1",
+        "thr_legacy",
+        user=MagicMock(id=7),
+    )
+
+    server.services.thread_message_repo.mark_projection.assert_called_once_with(
+        "thr_legacy", "pending"
+    )
+    registry.get_agent.assert_not_called()
 
 
 @pytest.mark.asyncio
diff --git a/tests/unit/api/test_chat_hitl_resume.py b/tests/unit/api/test_chat_hitl_resume.py
index 5f62fa9d..8101d787 100644
--- a/tests/unit/api/test_chat_hitl_resume.py
+++ b/tests/unit/api/test_chat_hitl_resume.py
@@ -43,8 +43,8 @@ async def _resume(*_args: object, **_kwargs: object):
             },
         }
 
-    agent_registry = MagicMock()
-    agent_registry.resume_hitl = _resume
+    processor = MagicMock()
+    processor.iter_hitl_resume_chunks = _resume
     hitl = HitlChannelCoordinator()
     first = hitl.store.register(
         thread_id="thr-follow",
@@ -58,7 +58,7 @@ async def _resume(*_args: object, **_kwargs: object):
 
     frames: list[str] = []
     async for frame in iter_dashboard_hitl_resume_sse(
-        agent_registry=agent_registry,
+        processor=processor,
         hitl_coordinator=hitl,
         agent_id="agent-1",
         thread_id="thr-follow",
@@ -98,12 +98,12 @@ async def _resume(*_args: object, **_kwargs: object):
             },
         }
 
-    agent_registry = MagicMock()
-    agent_registry.resume_hitl = _resume
+    processor = MagicMock()
+    processor.iter_hitl_resume_chunks = _resume
     hitl = HitlChannelCoordinator()
 
     async for _ in iter_dashboard_hitl_resume_sse(
-        agent_registry=agent_registry,
+        processor=processor,
         hitl_coordinator=hitl,
         agent_id="agent-1",
         thread_id="thr-orphan",
@@ -124,3 +124,37 @@ async def _resume(*_args: object, **_kwargs: object):
     )
     assert pending is not None
     assert pending.action_requests[0]["args"]["command"] == "echo hi"
+
+
+@pytest.mark.asyncio
+async def test_dashboard_hitl_resume_finishes_after_client_disconnect() -> None:
+    completed = False
+
+    async def _resume(*_args: object, **_kwargs: object):
+        nonlocal completed
+        yield {"type": "token", "content": "hidden after disconnect"}
+        completed = True
+
+    processor = MagicMock()
+    processor.iter_hitl_resume_chunks = _resume
+    hitl = HitlChannelCoordinator()
+
+    frames = [
+        frame
+        async for frame in iter_dashboard_hitl_resume_sse(
+            processor=processor,
+            hitl_coordinator=hitl,
+            agent_id="agent-1",
+            thread_id="thr-disconnected",
+            user_id=9,
+            decisions=[{"type": "respond", "message": "answer"}],
+            pending=None,
+            session_key="sk-disconnected",
+            channel_type="dashboard",
+            locale="en",
+            is_disconnected=AsyncMock(return_value=True),
+        )
+    ]
+
+    assert completed is True
+    assert frames == []
diff --git a/tests/unit/api/test_chat_polish.py b/tests/unit/api/test_chat_polish.py
index a1a32833..9f1e0f47 100644
--- a/tests/unit/api/test_chat_polish.py
+++ b/tests/unit/api/test_chat_polish.py
@@ -107,6 +107,16 @@ def test_strip_thinking_removes_redacted_block() -> None:
     assert _strip_thinking(raw) == "Polished prompt"
 
 
+def test_strip_thinking_removes_orphan_closing_prefix() -> None:
+    raw = "internal reasoning without an opening tag</think>\nVisible answer"
+    assert _strip_thinking(raw) == "Visible answer"
+
+
+def test_strip_thinking_removes_unclosed_thinking_suffix() -> None:
+    raw = "Visible answer\n<thinking>truncated internal reasoning"
+    assert _strip_thinking(raw) == "Visible answer"
+
+
 def test_llm_text_content_strips_thinking_from_string_message() -> None:
     class Msg:
         content = "<think>plan</think>Final text"
diff --git a/tests/unit/api/test_hitl_resume_validation.py b/tests/unit/api/test_hitl_resume_validation.py
new file mode 100644
index 00000000..e8335ddf
--- /dev/null
+++ b/tests/unit/api/test_hitl_resume_validation.py
@@ -0,0 +1,74 @@
+"""Validation for the HITL resume request body."""
+
+from __future__ import annotations
+
+import pytest
+from pydantic import ValidationError
+
+from octop.api.routers.chat.models import HitlResumeBody
+
+
+def _body(decisions: list[dict]) -> HitlResumeBody:
+    return HitlResumeBody(thread_id="thr1", decisions=decisions)
+
+
+class TestAccepted:
+    def test_approve(self) -> None:
+        assert _body([{"type": "approve"}]).decisions[0]["type"] == "approve"
+
+    def test_reject_with_message(self) -> None:
+        assert _body([{"type": "reject", "message": "no"}]).decisions[0]["message"] == "no"
+
+    def test_reject_without_message(self) -> None:
+        assert _body([{"type": "reject"}]).decisions[0]["type"] == "reject"
+
+    def test_respond(self) -> None:
+        assert (
+            _body([{"type": "respond", "message": "PostgreSQL"}]).decisions[0]["message"]
+            == "PostgreSQL"
+        )
+
+    def test_edit(self) -> None:
+        decision = {"type": "edit", "edited_action": {"name": "execute", "args": {}}}
+        assert _body([decision]).decisions[0]["type"] == "edit"
+
+    def test_multiple_decisions(self) -> None:
+        assert len(_body([{"type": "approve"}, {"type": "approve"}]).decisions) == 2
+
+
+class TestRejected:
+    def test_empty_decisions(self) -> None:
+        with pytest.raises(ValidationError):
+            _body([])
+
+    def test_unknown_type(self) -> None:
+        with pytest.raises(ValidationError, match="unsupported decision type"):
+            _body([{"type": "detonate"}])
+
+    def test_missing_type(self) -> None:
+        with pytest.raises(ValidationError, match="unsupported decision type"):
+            _body([{"message": "hi"}])
+
+    def test_respond_without_message(self) -> None:
+        with pytest.raises(ValidationError, match="non-empty 'message'"):
+            _body([{"type": "respond"}])
+
+    def test_respond_with_blank_message(self) -> None:
+        with pytest.raises(ValidationError, match="non-empty 'message'"):
+            _body([{"type": "respond", "message": "   "}])
+
+    def test_edit_without_edited_action(self) -> None:
+        with pytest.raises(ValidationError, match="edited_action"):
+            _body([{"type": "edit"}])
+
+    def test_non_string_message(self) -> None:
+        with pytest.raises(ValidationError, match="must be a string"):
+            _body([{"type": "reject", "message": 42}])
+
+    def test_oversized_message(self) -> None:
+        with pytest.raises(ValidationError, match="exceeds"):
+            _body([{"type": "respond", "message": "x" * 8001}])
+
+    def test_too_many_decisions(self) -> None:
+        with pytest.raises(ValidationError):
+            _body([{"type": "approve"}] * 17)
diff --git a/tests/unit/api/test_knowledge_bases.py b/tests/unit/api/test_knowledge_bases.py
index 839e4a5f..d0a50968 100644
--- a/tests/unit/api/test_knowledge_bases.py
+++ b/tests/unit/api/test_knowledge_bases.py
@@ -39,6 +39,7 @@ class _Base:
     embedding_model: str = "model"
     embedding_dim: int = 0
     doc_count: int = 0
+    max_documents: int = 100
     created_at: int = 1
     updated_at: int = 1
 
@@ -199,6 +200,7 @@ async def test_create_base_uses_selected_model_when_usable(
         "default_open": False,
         "shared": False,
         "icon_name": "",
+        "max_documents": 100,
     }
 
 
@@ -550,3 +552,42 @@ def fail(*_args: object, **_kwargs: object) -> None:
         )
 
     assert raised.value.code == ErrorCode.KNOWLEDGE_NAME_INVALID
+
+
+@pytest.mark.asyncio
+async def test_update_base_accepts_max_documents(monkeypatch: pytest.MonkeyPatch) -> None:
+    from octop.api.routers import knowledge_bases
+
+    received: dict[str, object] = {}
+
+    class _StubSvc:
+        def update_base(self, *_: object, **kw: object) -> object:
+            received.update(kw)
+            return _Base(max_documents=42)
+
+    monkeypatch.setattr(knowledge_bases, "_knowledge_service", lambda _s: _StubSvc())
+
+    response = await knowledge_bases.update_base(
+        kb_id="kb-1",
+        body=knowledge_bases.UpdateBaseBody(max_documents=42),
+        request=_request(),
+        server=SimpleNamespace(services=_services()),
+        user=SimpleNamespace(id=1, is_admin=False),
+    )
+    assert received["max_documents"] == 42
+    assert response["max_documents"] == 42
+
+
+@pytest.mark.asyncio
+async def test_update_base_rejects_max_documents_out_of_range() -> None:
+    from pydantic import ValidationError
+
+    from octop.api.routers import knowledge_bases
+
+    with pytest.raises(ValidationError):
+        knowledge_bases.UpdateBaseBody(max_documents=-1)
+    with pytest.raises(ValidationError):
+        knowledge_bases.UpdateBaseBody(max_documents=10_001)
+    assert knowledge_bases.UpdateBaseBody(max_documents=0).max_documents == 0
+    assert knowledge_bases.UpdateBaseBody(max_documents=10_000).max_documents == 10_000
+    assert knowledge_bases.UpdateBaseBody().max_documents is None
diff --git a/tests/unit/backup/test_system_archive.py b/tests/unit/backup/test_system_archive.py
index 9c6df61f..400fc501 100644
--- a/tests/unit/backup/test_system_archive.py
+++ b/tests/unit/backup/test_system_archive.py
@@ -42,7 +42,7 @@ def test_manifest_roundtrip_includes_driver_fields() -> None:
     assert loaded.db_file == "db/octop.dump"
 
 
-def test_roundtrip_backup(layout: PathLayout) -> None:
+def test_roundtrip_backup(layout: PathLayout, tmp_path: Path) -> None:
     db_path = layout.db
     pool = SqlitePool(db_path)
     run_migrations(pool)
@@ -63,11 +63,13 @@ class Row:
         agent_id = "agent01"
         name = "Test"
 
-    data, _name = create_system_backup(
+    archive = tmp_path / "roundtrip.tar.gz"
+    create_system_backup(
         paths=layout,
         agent_rows=[Row()],
         pool=pool,
         db_config=DatabaseConfig(),
+        dest=archive,
     )
     pool.close()
 
@@ -78,7 +80,7 @@ class Row:
     run_migrations(restore_pool)
 
     result = restore_system_backup(
-        data,
+        archive,
         paths=restore_layout,
         pool=restore_pool,
         db_config=DatabaseConfig(),
@@ -98,7 +100,7 @@ class Row:
     )
     assert json.loads(restore_layout.config.read_text(encoding="utf-8"))["port"] == 8088
 
-    with tarfile.open(fileobj=BytesIO(data), mode="r:gz") as tf:
+    with tarfile.open(archive, mode="r:gz") as tf:
         manifest = json.loads(tf.extractfile("manifest.json").read().decode("utf-8"))
     assert manifest["manifest_version"] == MANIFEST_VERSION
     assert manifest["database_driver"] == "sqlite"
@@ -117,21 +119,54 @@ class Row:
         name = "Test"
         config_json = json.dumps({"workspace_dir": str(custom)})
 
-    data, _name = create_system_backup(
+    archive = tmp_path / "custom-ws-backup.tar.gz"
+    create_system_backup(
         paths=layout,
         agent_rows=[Row()],
         pool=pool,
         db_config=DatabaseConfig(),
+        dest=archive,
     )
     pool.close()
 
-    with tarfile.open(fileobj=BytesIO(data), mode="r:gz") as tf:
+    with tarfile.open(archive, mode="r:gz") as tf:
         names = tf.getnames()
     assert "workspaces/agent01/SOUL.md" in names
     assert not (layout.agent_workspace("agent01") / "SOUL.md").exists()
 
 
-def test_restore_replaces_stale_skill_package_files(layout: PathLayout) -> None:
+def test_backup_skips_junk_directories(layout: PathLayout, tmp_path: Path) -> None:
+    pool = SqlitePool(layout.db)
+    run_migrations(pool)
+    ws = layout.ensure_agent_workspace("agent01")
+    (ws / "keep.txt").write_text("ok", encoding="utf-8")
+    (ws / "node_modules").mkdir()
+    (ws / "node_modules" / "pkg.js").write_text("skip", encoding="utf-8")
+    (ws / ".git").mkdir()
+    (ws / ".git" / "config").write_text("skip", encoding="utf-8")
+
+    class Row:
+        agent_id = "agent01"
+        name = "Test"
+
+    archive = tmp_path / "skip-junk.tar.gz"
+    create_system_backup(
+        paths=layout,
+        agent_rows=[Row()],
+        pool=pool,
+        db_config=DatabaseConfig(),
+        dest=archive,
+    )
+    pool.close()
+
+    with tarfile.open(archive, mode="r:gz") as tf:
+        names = set(tf.getnames())
+    assert "workspaces/agent01/keep.txt" in names
+    assert "workspaces/agent01/node_modules/pkg.js" not in names
+    assert "workspaces/agent01/.git/config" not in names
+
+
+def test_restore_replaces_stale_skill_package_files(layout: PathLayout, tmp_path: Path) -> None:
     pool = SqlitePool(layout.db)
     run_migrations(pool)
     with pool.connect() as conn:
@@ -148,11 +183,13 @@ class Row:
         agent_id = "agent01"
         name = "Test"
 
-    data, _ = create_system_backup(
+    archive = tmp_path / "packages.tar.gz"
+    create_system_backup(
         paths=layout,
         agent_rows=[Row()],
         pool=pool,
         db_config=DatabaseConfig(),
+        dest=archive,
     )
     pool.close()
 
@@ -164,7 +201,7 @@ class Row:
     stale.write_text("---\nname: old\ndescription: stale\n---\n", encoding="utf-8")
 
     restore_system_backup(
-        data,
+        archive,
         paths=restore_layout,
         pool=restore_pool,
         db_config=DatabaseConfig(),
@@ -178,11 +215,12 @@ class Row:
 
 def _make_migration_backup(
     layout: PathLayout,
+    dest: Path,
     *,
     username: str = "lc_user",
     jwt_secret: bytes | None = b"foreign-jwt-from-migration-backup!!!!",
-) -> tuple[bytes, SqlitePool]:
-    """Build a fake LightClaw migration backup and return (data, source_pool)."""
+) -> SqlitePool:
+    """Build a fake LightClaw migration backup at *dest*; return source_pool."""
     pool = SqlitePool(layout.db)
     run_migrations(pool)
     with pool.connect() as conn:
@@ -238,15 +276,16 @@ class Row:
         agent_id = "agent-lc"
         name = "LC Agent"
 
-    data, _ = create_system_backup(
+    create_system_backup(
         paths=layout,
         agent_rows=[Row()],
         pool=pool,
         db_config=DatabaseConfig(),
+        dest=dest,
     )
     # Rewrite octop_version to signal a LightClaw migration backup.
     members: dict[str, bytes] = {}
-    with tarfile.open(fileobj=BytesIO(data), mode="r:gz") as tf:
+    with tarfile.open(dest, mode="r:gz") as tf:
         for m in tf.getmembers():
             if m.isfile():
                 f = tf.extractfile(m)
@@ -255,13 +294,12 @@ class Row:
     manifest_obj = json.loads(members["manifest.json"])
     manifest_obj["octop_version"] = manifest_obj["octop_version"] + "-migrated-from-lightclaw"
     members["manifest.json"] = json.dumps(manifest_obj).encode()
-    buf = BytesIO()
-    with tarfile.open(fileobj=buf, mode="w:gz") as tf:
+    with tarfile.open(dest, 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))
-    return buf.getvalue(), pool
+    return pool
 
 
 def test_migration_restore_preserves_current_users_and_imported_agents(
@@ -283,7 +321,8 @@ def test_migration_restore_preserves_current_users_and_imported_agents(
     # --- source: simulate a LightClaw migration export with one agent ---
     src_layout = PathLayout(tmp_path / "src")
     src_layout.root.mkdir()
-    migration_data, src_pool = _make_migration_backup(src_layout, username="lc_user")
+    migration_archive = tmp_path / "migration.tar.gz"
+    src_pool = _make_migration_backup(src_layout, migration_archive, username="lc_user")
     src_pool.close()
 
     # --- target: a fresh Octop instance with its own admin user + JWT ---
@@ -303,7 +342,7 @@ def test_migration_restore_preserves_current_users_and_imported_agents(
         )
 
     result = restore_system_backup(
-        migration_data,
+        migration_archive,
         paths=tgt_layout,
         pool=tgt_pool,
         db_config=DatabaseConfig(),
@@ -350,7 +389,8 @@ def test_migration_restore_remaps_ownership_to_admin_user_id_2(tmp_path: Path) -
     """Migration import assigns agents/channels/cron to the restoring admin (id=2)."""
     src_layout = PathLayout(tmp_path / "src")
     src_layout.root.mkdir()
-    migration_data, src_pool = _make_migration_backup(src_layout, username="lc_user")
+    migration_archive = tmp_path / "migration-remap.tar.gz"
+    src_pool = _make_migration_backup(src_layout, migration_archive, username="lc_user")
     src_pool.close()
 
     tgt_layout = PathLayout(tmp_path / "tgt")
@@ -366,7 +406,7 @@ def test_migration_restore_remaps_ownership_to_admin_user_id_2(tmp_path: Path) -
         )
 
     result = restore_system_backup(
-        migration_data,
+        migration_archive,
         paths=tgt_layout,
         pool=tgt_pool,
         db_config=DatabaseConfig(),
@@ -425,7 +465,8 @@ def test_migration_restore_via_none_autodetect(tmp_path: Path) -> None:
     """preserve_users=None auto-detects the migration flag from octop_version."""
     src_layout = PathLayout(tmp_path / "src")
     src_layout.root.mkdir()
-    migration_data, src_pool = _make_migration_backup(src_layout, username="lc_auto")
+    migration_archive = tmp_path / "migration-auto.tar.gz"
+    src_pool = _make_migration_backup(src_layout, migration_archive, username="lc_auto")
     src_pool.close()
 
     tgt_layout = PathLayout(tmp_path / "tgt")
@@ -440,7 +481,7 @@ def test_migration_restore_via_none_autodetect(tmp_path: Path) -> None:
 
     # preserve_users=None — should auto-detect and preserve
     result = restore_system_backup(
-        migration_data,
+        migration_archive,
         paths=tgt_layout,
         pool=tgt_pool,
         db_config=DatabaseConfig(),
@@ -458,7 +499,7 @@ def test_migration_restore_via_none_autodetect(tmp_path: Path) -> None:
     tgt_pool.close()
 
 
-def test_refuse_cross_engine_restore(layout: PathLayout) -> None:
+def test_refuse_cross_engine_restore(layout: PathLayout, tmp_path: Path) -> None:
     pool = SqlitePool(layout.db)
     run_migrations(pool)
 
@@ -466,15 +507,17 @@ class Row:
         agent_id = "a1"
         name = "n"
 
-    data, _ = create_system_backup(
+    archive = tmp_path / "cross-engine.tar.gz"
+    create_system_backup(
         paths=layout,
         agent_rows=[Row()],
         pool=pool,
         db_config=DatabaseConfig(),
+        dest=archive,
     )
     # Rewrite manifest to pretend it's a postgres dump.
     members: dict[str, bytes] = {}
-    with tarfile.open(fileobj=BytesIO(data), mode="r:gz") as tf:
+    with tarfile.open(archive, mode="r:gz") as tf:
         for m in tf.getmembers():
             if m.isfile():
                 f = tf.extractfile(m)
@@ -483,15 +526,14 @@ class Row:
     manifest = json.loads(members["manifest.json"])
     manifest["database_driver"] = "postgresql"
     members["manifest.json"] = json.dumps(manifest).encode()
-    buf = BytesIO()
-    with tarfile.open(fileobj=buf, mode="w:gz") as tf:
+    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 pytest.raises(OctopError) as excinfo:
         restore_system_backup(
-            buf.getvalue(),
+            archive,
             paths=layout,
             pool=pool,
             db_config=DatabaseConfig(),
diff --git a/tests/unit/cli/test_init_cmd.py b/tests/unit/cli/test_init_cmd.py
index c646288d..c9492eb1 100644
--- a/tests/unit/cli/test_init_cmd.py
+++ b/tests/unit/cli/test_init_cmd.py
@@ -14,8 +14,13 @@
 
 @pytest.fixture
 def fake_home(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> Path:
+    octop_home = tmp_path / ".octop"
     monkeypatch.setenv("HOME", str(tmp_path))
+    monkeypatch.setenv("OCTOP_HOME", str(octop_home))
     monkeypatch.setattr(Path, "home", classmethod(lambda cls: tmp_path))
+    for key in list(os.environ):
+        if key.startswith("OCTOP_DATABASE_"):
+            monkeypatch.delenv(key, raising=False)
     return tmp_path
 
 
@@ -90,9 +95,10 @@ def test_init_force_resets(fake_home: Path) -> None:
         "TestPass34",
         "--yes",
     ]
-    runner.invoke(cli, args_a)
+    r1 = runner.invoke(cli, args_a)
+    assert r1.exit_code == 0, r1.output or str(r1.exception)
     r2 = runner.invoke(cli, args_b)
-    assert r2.exit_code == 0, r2.output
+    assert r2.exit_code == 0, r2.output or str(r2.exception)
 
     from octop.infra.db.pool import SqlitePool
     from octop.infra.db.repos.users import UserRepo
diff --git a/tests/unit/cli/test_registry.py b/tests/unit/cli/test_registry.py
new file mode 100644
index 00000000..2ff54680
--- /dev/null
+++ b/tests/unit/cli/test_registry.py
@@ -0,0 +1,29 @@
+"""Lazy CLI registry integrity — every COMMANDS attr must resolve."""
+
+from __future__ import annotations
+
+import importlib
+
+import click
+from click.testing import CliRunner
+
+from octop.cli.main import cli
+from octop.cli.registry import COMMANDS
+
+
+def test_all_registry_attrs_are_click_commands() -> None:
+    for name, (module_path, attr, _help) in COMMANDS.items():
+        mod = importlib.import_module(module_path, package="octop.cli")
+        assert hasattr(mod, attr), f"{name}: module {module_path} missing attr {attr!r}"
+        result = getattr(mod, attr)
+        assert isinstance(result, click.Command), (
+            f"{name}: {module_path}.{attr} is {type(result).__name__}, not click.Command"
+        )
+
+
+def test_acp_help_loads() -> None:
+    """Regression for #486: registry must point at acp_cmd, not missing attr acp."""
+    runner = CliRunner()
+    result = runner.invoke(cli, ["acp", "--help"])
+    assert result.exit_code == 0, result.output or result.exception
+    assert "ACP" in result.output or "acp" in result.output.lower()
diff --git a/tests/unit/connectors/test_custom_mcp.py b/tests/unit/connectors/test_custom_mcp.py
index 1ff9aac6..531db4cf 100644
--- a/tests/unit/connectors/test_custom_mcp.py
+++ b/tests/unit/connectors/test_custom_mcp.py
@@ -357,3 +357,90 @@ def test_list_default_open_mcp_server_names(svc: ConnectorService, db: SqlitePoo
     assert mcp_server_name("tencent-docs", iid) in names
     assert "always" in names
     assert "opt" not in names
+
+
+@pytest.mark.asyncio
+async def test_ensure_fresh_custom_servers_marks_reauth_when_refresh_fails_expired(
+    svc: ConnectorService,
+    db: SqlitePool,
+) -> None:
+    import time
+    from unittest.mock import AsyncMock, patch
+
+    uid = _ensure_user(db)
+    expired_at = int(time.time()) - 60
+    svc.put_custom_servers(
+        uid,
+        {
+            "srv": {
+                "transport": "streamable_http",
+                "url": "https://example.com/mcp",
+            }
+        },
+    )
+    svc.apply_custom_server_oauth(
+        uid,
+        "srv",
+        {
+            "access_token": "old",
+            "refresh_token": "refresh-me",
+            "expires_at": expired_at,
+            "oauth_client_id": "cid",
+        },
+        issuer="https://example.com",
+        resource="https://example.com/mcp",
+    )
+    with patch(
+        "octop.infra.connectors.service.refresh_custom_mcp_oauth",
+        new_callable=AsyncMock,
+        side_effect=ValueError("refresh failed"),
+    ):
+        await svc.ensure_fresh_custom_servers(uid)
+
+    preview = svc.get_custom_servers_for_api(uid)
+    assert preview["srv"]["oauth"] == {"configured": False, "required": True}
+    stored = svc.get_custom_servers(uid)["srv"]["oauth"]
+    assert stored == {"required": True}
+
+
+@pytest.mark.asyncio
+async def test_ensure_fresh_custom_servers_keeps_valid_token_when_refresh_fails(
+    svc: ConnectorService,
+    db: SqlitePool,
+) -> None:
+    import time
+    from unittest.mock import AsyncMock, patch
+
+    uid = _ensure_user(db)
+    expires_at = int(time.time()) + 60
+    svc.put_custom_servers(
+        uid,
+        {
+            "srv": {
+                "transport": "streamable_http",
+                "url": "https://example.com/mcp",
+            }
+        },
+    )
+    svc.apply_custom_server_oauth(
+        uid,
+        "srv",
+        {
+            "access_token": "still-valid",
+            "refresh_token": "refresh-me",
+            "expires_at": expires_at,
+            "oauth_client_id": "cid",
+        },
+        issuer="https://example.com",
+        resource="https://example.com/mcp",
+    )
+    with patch(
+        "octop.infra.connectors.service.refresh_custom_mcp_oauth",
+        new_callable=AsyncMock,
+        side_effect=ValueError("refresh failed"),
+    ):
+        await svc.ensure_fresh_custom_servers(uid)
+
+    preview = svc.get_custom_servers_for_api(uid)
+    assert preview["srv"]["oauth"]["configured"] is True
+    assert svc.get_custom_servers(uid)["srv"]["oauth"]["access_token"] == "still-valid"
diff --git a/tests/unit/connectors/test_oauth_discovery.py b/tests/unit/connectors/test_oauth_discovery.py
new file mode 100644
index 00000000..39b84211
--- /dev/null
+++ b/tests/unit/connectors/test_oauth_discovery.py
@@ -0,0 +1,160 @@
+"""Unit tests for MCP OAuth discovery and unified oauth targets."""
+
+from __future__ import annotations
+
+import pytest
+
+from octop.infra.connectors.custom_mcp import (
+    build_oauth_storage,
+    harness_spec_for_server,
+    mark_oauth_reauth_required,
+    merge_preserved_oauth,
+    redact_server_for_api,
+)
+from octop.infra.connectors.oauth.discovery import (
+    build_protected_resource_metadata_urls,
+    clear_oauth_discovery_cache,
+    discover_oauth_from_mcp_url,
+    parse_www_authenticate_resource_metadata,
+)
+from octop.infra.connectors.oauth.registry import (
+    oauth_state_kind_for_target,
+    oauth_target_requires_https,
+)
+
+
+def test_build_protected_resource_metadata_urls_path_and_root():
+    urls = build_protected_resource_metadata_urls("https://example.com/mcp")
+    assert urls == [
+        "https://example.com/.well-known/oauth-protected-resource/mcp",
+        "https://example.com/.well-known/oauth-protected-resource",
+    ]
+
+
+def test_build_protected_resource_metadata_urls_prefers_www_auth_header():
+    header_url = "https://example.com/.well-known/oauth-protected-resource/custom"
+    urls = build_protected_resource_metadata_urls(
+        "https://example.com/mcp",
+        www_auth_resource_metadata=header_url,
+    )
+    assert urls[0] == header_url
+
+
+def test_parse_www_authenticate_resource_metadata():
+    raw = 'Bearer error="invalid_token", resource_metadata="https://mcp.example.com/prm"'
+    assert parse_www_authenticate_resource_metadata(raw) == "https://mcp.example.com/prm"
+
+
+def test_oauth_target_helpers():
+    assert oauth_state_kind_for_target({"type": "catalog", "kind": "notion"}) == "notion"
+    assert oauth_state_kind_for_target({"type": "custom_mcp", "server_name": "x"}) == ("custom-mcp")
+    assert oauth_target_requires_https({"type": "catalog", "kind": "notion"}) is True
+    assert oauth_target_requires_https({"type": "custom_mcp", "server_name": "x"}) is True
+    assert oauth_target_requires_https({"type": "catalog", "kind": "tencent-docs"}) is False
+
+
+def test_merge_preserved_oauth_and_redaction():
+    existing = {
+        "srv": {
+            "transport": "streamable_http",
+            "url": "https://example.com/mcp",
+            "oauth": {"access_token": "secret", "expires_at": 123},
+        }
+    }
+    incoming = {
+        "srv": {
+            "transport": "streamable_http",
+            "url": "https://example.com/mcp",
+            "oauth": {"access_token": "client-sent"},
+        }
+    }
+    merged = merge_preserved_oauth(incoming, existing)
+    assert merged["srv"]["oauth"]["access_token"] == "secret"
+    preview = redact_server_for_api(merged["srv"])
+    assert preview["oauth"] == {"configured": True, "expires_at": 123}
+    assert "access_token" not in preview["oauth"]
+
+
+def test_oauth_required_hint_redaction_and_merge():
+    existing = {
+        "srv": {
+            "transport": "streamable_http",
+            "url": "https://example.com/mcp",
+            "oauth": {"required": True},
+        }
+    }
+    incoming = {"srv": {"transport": "streamable_http", "url": "https://example.com/mcp"}}
+    merged = merge_preserved_oauth(incoming, existing)
+    assert merged["srv"]["oauth"] == {"required": True}
+    preview = redact_server_for_api(merged["srv"])
+    assert preview["oauth"] == {"configured": False, "required": True}
+
+
+def test_harness_spec_injects_oauth_bearer():
+    spec = {
+        "transport": "streamable_http",
+        "url": "https://example.com/mcp",
+        "oauth": build_oauth_storage(
+            {"access_token": "tok123", "refresh_token": "r", "expires_at": 1},
+            issuer="https://example.com",
+            resource="https://example.com/mcp",
+        ),
+    }
+    harness = harness_spec_for_server(spec)
+    assert harness["headers"]["Authorization"] == "Bearer tok123"
+
+
+def test_oauth_state_kind_invalid():
+    with pytest.raises(ValueError, match="unsupported oauth target"):
+        oauth_state_kind_for_target({"type": "unknown"})
+
+
+def test_mark_oauth_reauth_required_clears_tokens():
+    spec = {
+        "transport": "streamable_http",
+        "url": "https://example.com/mcp",
+        "oauth": build_oauth_storage(
+            {"access_token": "secret", "refresh_token": "r", "expires_at": 1},
+            issuer="https://example.com",
+            resource="https://example.com/mcp",
+        ),
+    }
+    marked = mark_oauth_reauth_required(spec)
+    assert marked["oauth"] == {"required": True}
+    preview = redact_server_for_api(marked)
+    assert preview["oauth"] == {"configured": False, "required": True}
+
+
+@pytest.mark.asyncio
+async def test_discover_oauth_from_mcp_url_uses_cache(monkeypatch: pytest.MonkeyPatch) -> None:
+    clear_oauth_discovery_cache()
+    calls = 0
+    cached_result = {
+        "available": True,
+        "issuer": "https://auth.example.com",
+        "resource": "https://example.com/mcp",
+        "metadata": {"registration_endpoint": "https://auth.example.com/reg"},
+        "scopes_supported": None,
+        "error": None,
+    }
+
+    async def fake_uncached(url: str) -> dict[str, object]:
+        nonlocal calls
+        calls += 1
+        assert url == "https://example.com/mcp"
+        return cached_result
+
+    monkeypatch.setattr(
+        "octop.infra.connectors.oauth.discovery._discover_oauth_from_mcp_url_uncached",
+        fake_uncached,
+    )
+
+    first = await discover_oauth_from_mcp_url("https://example.com/mcp")
+    second = await discover_oauth_from_mcp_url("https://example.com/mcp")
+    assert first == cached_result
+    assert second == cached_result
+    assert calls == 1
+
+    bypass = await discover_oauth_from_mcp_url("https://example.com/mcp", use_cache=False)
+    assert bypass == cached_result
+    assert calls == 2
diff --git a/tests/unit/db/test_agent_profile_columns.py b/tests/unit/db/test_agent_profile_columns.py
index be5f95cd..1b373b61 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 == 9
+    assert version == 10
     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 8afe0c67..d916cb1b 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 == 9
+    assert v == 10
     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 7d7a1789..1fa6f505 100644
--- a/tests/unit/db/test_db_pool.py
+++ b/tests/unit/db/test_db_pool.py
@@ -85,13 +85,14 @@ def test_run_migrations_idempotent(db: SqlitePool):
         doc_cols = {
             r["name"] for r in conn.execute("PRAGMA table_info(knowledge_documents)").fetchall()
         }
-    assert v == 9
+    assert v == 10
     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 "task_type" in cron_cols
     assert "mcp_servers" in cron_cols
     assert {"model_ref", "reasoning_mode", "reasoning_effort", "artifacts"}.issubset(thread_cols)
@@ -143,7 +144,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 == 9
+    assert v == 10
     assert "mcp_servers" in cron_cols
     assert "skill_packages" in {
         r["name"]
@@ -280,10 +281,35 @@ 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 == 9
+    assert version == 10
     assert "permissions" in cols
 
 
+def test_schema_v10_without_projection_tables_is_repaired(tmp_path: Path) -> None:
+    """DBs that bumped to v10 via a colliding 010 file still get projection tables."""
+    db_path = tmp_path / "octop.db"
+    pool = SqlitePool(db_path)
+    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 = 10")
+    run_migrations(pool)
+    with pool.connect() as conn:
+        version = conn.execute("SELECT version FROM _schema_version").fetchone()[0]
+        table_names = {
+            r["name"]
+            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)
+    assert "max_documents" in kb_cols
+
+
 def test_ahead_of_max_schema_version_clamps_to_max(tmp_path: Path) -> None:
     """A DB whose watermark is ahead of discovered migrations clamps on boot.
 
@@ -311,7 +337,7 @@ 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 == 9
+    assert version == 10
     assert "skill_package_id" in pkg_cols
     assert "published_expert_id" in pub_cols
     assert "user_invites" in invite_tables
@@ -350,7 +376,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 == 9
+    assert version == 10
     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 5ac92957..4705d7f2 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 == 9
+    assert v == 10
     assert "published_expert_id" in cols
 
 
diff --git a/tests/unit/db/test_repo_knowledge.py b/tests/unit/db/test_repo_knowledge.py
index 7b81ee73..00d38a4f 100644
--- a/tests/unit/db/test_repo_knowledge.py
+++ b/tests/unit/db/test_repo_knowledge.py
@@ -50,11 +50,11 @@ def test_knowledge_tables_migrated(db: SqlitePool) -> None:
         "knowledge_bases",
         "knowledge_documents",
     }.issubset(names)
-    assert v == 9
+    assert v == 10
     assert "knowledge_base_members" not in names
-    assert "knowledge_base_id" in {
-        r["name"] for r in conn.execute("PRAGMA table_info(knowledge_bases)").fetchall()
-    }
+    cols = {r["name"] for r in conn.execute("PRAGMA table_info(knowledge_bases)").fetchall()}
+    assert "knowledge_base_id" in cols
+    assert "max_documents" in cols
 
 
 def test_path_layout_knowledge_dir(tmp_path: Path) -> None:
@@ -296,3 +296,53 @@ def test_rename_document_missing_or_wrong_kb_returns_none(
     assert repo.rename_document("missing-kb", folder.id, "x") is None
     assert repo.rename_document(other.id, folder.id, "x") is None
     assert repo.rename_document(kb.id, "missing-doc", "x") is None
+
+
+def test_update_base_persists_max_documents(repo: KnowledgeRepo, owner_id: int) -> None:
+    kb = repo.create_base(owner_user_id=owner_id, name="Docs")
+    assert kb.max_documents == 100
+    repo.update_base(kb.id, max_documents=42)
+    refreshed = repo.get_base(kb.id)
+    assert refreshed is not None
+    assert refreshed.max_documents == 42
+    repo.update_base(kb.id, description="unchanged")
+    assert repo.get_base(kb.id).max_documents == 42  # type: ignore[union-attr]
+
+
+def test_create_document_uses_kb_max_documents_for_limit(
+    repo: KnowledgeRepo, owner_id: int
+) -> None:
+    # The repo enforces whatever max_documents the caller passes (the service
+    # layer forwards kb.max_documents). A cap of 2 must reject the 3rd.
+    kb = repo.create_base(owner_user_id=owner_id, name="Tiny", max_documents=2)
+    assert kb.max_documents == 2
+    for i in range(2):
+        repo.create_document(
+            kb_id=kb.id,
+            filename=f"d{i}.md",
+            content_type="text/markdown",
+            byte_size=2,
+            max_documents=kb.max_documents,
+        )
+    with pytest.raises(ValueError, match="at most 2 documents"):
+        repo.create_document(
+            kb_id=kb.id,
+            filename="d2.md",
+            content_type="text/markdown",
+            byte_size=2,
+            max_documents=kb.max_documents,
+        )
+
+
+def test_create_document_zero_max_means_unlimited(repo: KnowledgeRepo, owner_id: int) -> None:
+    kb = repo.create_base(owner_user_id=owner_id, name="Unbounded", max_documents=0)
+    assert kb.max_documents == 0
+    for i in range(150):
+        repo.create_document(
+            kb_id=kb.id,
+            filename=f"d{i:03}.md",
+            content_type="text/markdown",
+            byte_size=2,
+            max_documents=kb.max_documents,
+        )
+    assert repo.get_base(kb.id).doc_count == 150  # type: ignore[union-attr]
diff --git a/tests/unit/db/test_skill_package_icons.py b/tests/unit/db/test_skill_package_icons.py
index 9eb8d1fe..27ac3646 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 == 9
+    assert v == 10
     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 == 9
+    assert v == 10
     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 04259d7d..67d7cc58 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 == 9
+    assert v == 10
     assert "skill_package_id" in cols
 
 
diff --git a/tests/unit/db/test_thread_messages_repo.py b/tests/unit/db/test_thread_messages_repo.py
new file mode 100644
index 00000000..8a7ff748
--- /dev/null
+++ b/tests/unit/db/test_thread_messages_repo.py
@@ -0,0 +1,108 @@
+from __future__ import annotations
+
+from pathlib import Path
+
+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.thread_messages import ThreadMessageInput, ThreadMessageRepo
+from octop.infra.db.repos.threads import ThreadRepo
+from octop.infra.db.repos.users import UserRepo
+
+
+def _repos(tmp_path: Path) -> tuple[SqlitePool, ThreadRepo, ThreadMessageRepo]:
+    db = SqlitePool(tmp_path / "octop.db")
+    run_migrations(db)
+    user_id = UserRepo(db).create(username="u", password_hash="hash", role="user")
+    AgentRepo(db).create(agent_id="agt", user_id=user_id, name="Agent")
+    return db, ThreadRepo(db), ThreadMessageRepo(db)
+
+
+def _message(mid: str | None, text: str) -> ThreadMessageInput:
+    return ThreadMessageInput(
+        message_id=mid,
+        role="human",
+        message_json=f'{{"text":"{text}"}}',
+        created_at=1,
+    )
+
+
+def test_new_thread_projection_appends_and_pages(tmp_path: Path) -> None:
+    _db, threads, messages = _repos(tmp_path)
+    threads.insert(
+        thread_id="thr",
+        agent_id="agt",
+        user_id=1,
+        channel_type="dashboard",
+        session_key="sk",
+        last_active=0,
+    )
+
+    assert messages.projection_status("thr") == "ready"
+    assert (
+        messages.append_if_ready(
+            "thr",
+            [_message("m1", "one"), _message("m2", "two"), _message("m3", "three")],
+        )
+        == 3
+    )
+    assert messages.append_if_ready("thr", [_message("m3", "replay")]) == 0
+
+    recent, more = messages.page("thr", limit=2)
+    older, older_more = messages.page("thr", limit=2, offset=2)
+    assert [row.message_id for row in recent] == ["m2", "m3"]
+    assert more is True
+    assert [row.message_id for row in older] == ["m1"]
+    assert older_more is False
+
+
+def test_pending_legacy_thread_only_publishes_after_replace(tmp_path: Path) -> None:
+    _db, threads, messages = _repos(tmp_path)
+    threads.insert(
+        thread_id="legacy",
+        agent_id="agt",
+        user_id=1,
+        channel_type="dashboard",
+        session_key="legacy-sk",
+        last_active=10,
+    )
+    messages.mark_projection("legacy", "pending")
+
+    assert messages.append_if_ready("legacy", [_message("new", "new")]) == 0
+    assert (
+        messages.replace_all(
+            "legacy",
+            [_message("old", "old"), _message("new", "new")],
+        )
+        == 2
+    )
+    page, more = messages.page("legacy", limit=25)
+    assert messages.projection_status("legacy") == "ready"
+    assert [row.message_id for row in page] == ["old", "new"]
+    assert more is False
+
+
+def test_migration_summary_and_candidates_are_scoped(tmp_path: Path) -> None:
+    _db, threads, messages = _repos(tmp_path)
+    for thread_id, last_active in (("old-1", 10), ("old-2", 20), ("empty", 0)):
+        threads.insert(
+            thread_id=thread_id,
+            agent_id="agt",
+            user_id=1,
+            channel_type="dashboard",
+            session_key=thread_id,
+            last_active=last_active,
+        )
+    messages.mark_projection("old-1", "pending")
+    messages.mark_projection("old-2", "failed", error="boom")
+
+    summary = messages.migration_summary(agent_id="agt", user_id=1)
+    candidates = messages.migration_candidates(agent_id="agt", user_id=1, limit=10)
+
+    assert summary.remaining == 2
+    assert summary.pending == 1
+    assert summary.failed == 1
+    assert [(row.thread_id, row.status) for row in candidates] == [
+        ("old-2", "failed"),
+        ("old-1", "pending"),
+    ]
diff --git a/tests/unit/gateway/test_channels_qr.py b/tests/unit/gateway/test_channels_qr.py
index 8ac5edef..386ec4a4 100644
--- a/tests/unit/gateway/test_channels_qr.py
+++ b/tests/unit/gateway/test_channels_qr.py
@@ -2,7 +2,8 @@
 
 from __future__ import annotations
 
-from unittest.mock import AsyncMock, MagicMock, patch
+import asyncio
+from unittest.mock import AsyncMock, MagicMock, call, patch
 
 import pytest
 from fastapi.testclient import TestClient
@@ -12,7 +13,7 @@
 def mock_server_and_user():
     """Minimal server/user mock for channel QR endpoints."""
     user = MagicMock()
-    user.id = "user1"
+    user.id = 1
     user.is_admin = True
 
     registry = MagicMock()
@@ -138,6 +139,160 @@ def test_qq_qrcode_poll_returns_credentials(mock_server_and_user):
     assert resp.json() == result
 
 
+def test_dingtalk_qrcode_generate_keeps_device_code_server_side(mock_server_and_user):
+    """Only an opaque Octop registration ID and public QR metadata reach the browser."""
+    server, user = mock_server_and_user
+    from octop.api.routers import channels as ch_module
+
+    ch_module._dingtalk_registration_sessions.clear()
+    result = {
+        "device_code": "device-secret",
+        "user_code": "ABCD-EFGH-IJKL",
+        "verification_uri_complete": "https://open-dev.dingtalk.com/scan?code=public",
+        "expires_in": 7200,
+        "interval": 5,
+    }
+    with patch(
+        "octop.api.routers.channels.dingtalk_registration.generate",
+        new=AsyncMock(return_value=result),
+    ):
+        client = TestClient(_make_app(server, user))
+        resp = client.post("/agents/agent1/channels/dingtalk/qrcode/generate")
+
+    assert resp.status_code == 200
+    data = resp.json()
+    assert data["qrcode_url"] == result["verification_uri_complete"]
+    assert data["user_code"] == result["user_code"]
+    assert data["interval"] == 5
+    assert "device_code" not in data
+    stored = ch_module._dingtalk_registration_sessions[data["registration_id"]]
+    assert stored.device_code == "device-secret"
+
+
+def test_dingtalk_qrcode_poll_creates_channel_without_returning_secret(
+    mock_server_and_user,
+):
+    """Successful authorization probes and persists credentials only on the server."""
+    server, user = mock_server_and_user
+    from octop.api.routers import channels as ch_module
+
+    ch_module._dingtalk_registration_sessions.clear()
+    gateway = server.app_runtime.gateway
+    gateway.probe_config = AsyncMock(return_value={"ok": True})
+    gateway.create_channel = AsyncMock(return_value=MagicMock(channel_id="channel-1"))
+    generated = {
+        "device_code": "device-secret",
+        "user_code": "ABCD-EFGH-IJKL",
+        "verification_uri_complete": "https://open-dev.dingtalk.com/scan?code=public",
+        "expires_in": 7200,
+        "interval": 5,
+    }
+    authorized = {
+        "status": "SUCCESS",
+        "client_id": "ding-client",
+        "client_secret": "ding-secret",
+    }
+    with (
+        patch(
+            "octop.api.routers.channels.dingtalk_registration.generate",
+            new=AsyncMock(return_value=generated),
+        ),
+        patch(
+            "octop.api.routers.channels.dingtalk_registration.poll",
+            new=AsyncMock(return_value=authorized),
+        ),
+    ):
+        client = TestClient(_make_app(server, user))
+        generated_resp = client.post("/agents/agent1/channels/dingtalk/qrcode/generate")
+        registration_id = generated_resp.json()["registration_id"]
+        resp = client.post(
+            "/agents/agent1/channels/dingtalk/qrcode/poll",
+            json={"registration_id": registration_id},
+        )
+        repeated_resp = client.post(
+            "/agents/agent1/channels/dingtalk/qrcode/poll",
+            json={"registration_id": registration_id},
+        )
+
+    assert resp.status_code == 200
+    assert resp.json() == {"status": "success", "channel_id": "channel-1"}
+    assert repeated_resp.json() == resp.json()
+    assert "ding-secret" not in resp.text
+    probe_config = gateway.probe_config.await_args.kwargs["config"]
+    assert probe_config["client_id"] == "ding-client"
+    assert probe_config["client_secret"] == "ding-secret"
+    spec = gateway.create_channel.await_args.args[0]
+    assert spec.kind == "dingtalk"
+    assert spec.config["client_secret"] == "ding-secret"
+    gateway.create_channel.assert_awaited_once()
+    session = ch_module._dingtalk_registration_sessions[registration_id]
+    assert session.credentials is None
+    assert session.device_code == ""
+
+
+def test_dingtalk_qrcode_poll_rejects_different_user(mock_server_and_user):
+    server, user = mock_server_and_user
+    from octop.api.routers import channels as ch_module
+
+    ch_module._dingtalk_registration_sessions.clear()
+    generated = {
+        "device_code": "device-secret",
+        "user_code": "ABCD-EFGH-IJKL",
+        "verification_uri_complete": "https://open-dev.dingtalk.com/scan?code=public",
+        "expires_in": 7200,
+        "interval": 5,
+    }
+    with patch(
+        "octop.api.routers.channels.dingtalk_registration.generate",
+        new=AsyncMock(return_value=generated),
+    ):
+        client = TestClient(_make_app(server, user))
+        generated_resp = client.post("/agents/agent1/channels/dingtalk/qrcode/generate")
+        registration_id = generated_resp.json()["registration_id"]
+
+    user.id = 2
+    resp = client.post(
+        "/agents/agent1/channels/dingtalk/qrcode/poll",
+        json={"registration_id": registration_id},
+    )
+    assert resp.status_code == 404
+
+
+def test_dingtalk_registration_client_uses_official_device_flow_endpoints():
+    from octop.infra.gateway.channels import dingtalk_registration
+
+    init_response = MagicMock()
+    init_response.json.return_value = {
+        "errcode": 0,
+        "errmsg": "ok",
+        "nonce": "nonce-1",
+        "expires_in": 300,
+    }
+    begin_response = MagicMock()
+    begin_response.json.return_value = {
+        "errcode": 0,
+        "errmsg": "ok",
+        "device_code": "device-1",
+        "user_code": "ABCD-EFGH-IJKL",
+        "verification_uri_complete": "https://open-dev.dingtalk.com/scan",
+        "expires_in": 7200,
+        "interval": 5,
+    }
+    post = AsyncMock(side_effect=[init_response, begin_response])
+    context = MagicMock()
+    context.__aenter__ = AsyncMock(return_value=MagicMock(post=post))
+    context.__aexit__ = AsyncMock(return_value=False)
+
+    with patch.object(dingtalk_registration.httpx, "AsyncClient", return_value=context):
+        result = asyncio.run(dingtalk_registration.generate())
+
+    assert result["device_code"] == "device-1"
+    assert post.await_args_list == [
+        call("/app/registration/init", json={}),
+        call("/app/registration/begin", json={"nonce": "nonce-1"}),
+    ]
+
+
 def test_pkill_chrome_profile_accepts_resolved_path(monkeypatch: pytest.MonkeyPatch, tmp_path):
     """pkill pattern must not fail validation on the '=' separator."""
     from octop.api.routers.channels import _pkill_chrome_profile, _safe_profile_directory
diff --git a/tests/unit/gateway/test_gateway_push.py b/tests/unit/gateway/test_gateway_push.py
index 67c2487d..d3dcb794 100644
--- a/tests/unit/gateway/test_gateway_push.py
+++ b/tests/unit/gateway/test_gateway_push.py
@@ -229,6 +229,48 @@ async def stream_with_token(_agent_id, _request):
     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:
     sk = ThreadRegistry.dashboard_key(agent_id="a1", user_id=1)
diff --git a/tests/unit/gateway/test_history_projection.py b/tests/unit/gateway/test_history_projection.py
new file mode 100644
index 00000000..ab4d4831
--- /dev/null
+++ b/tests/unit/gateway/test_history_projection.py
@@ -0,0 +1,58 @@
+from __future__ import annotations
+
+import asyncio
+
+import pytest
+
+from octop.infra.gateway.history_backfill import HistoryBackfillQueue
+from octop.infra.gateway.process.history_projection import TurnHistoryTracker
+
+
+def test_turn_tracker_keeps_only_latest_user_turn_and_dedupes_replay() -> None:
+    tracker = TurnHistoryTracker.from_request(
+        {"messages": [{"role": "user", "content": "latest", "id": "u2"}]}
+    )
+    state = [
+        {"role": "user", "content": "old", "id": "u1"},
+        {"role": "assistant", "content": "old answer", "id": "a1"},
+        {"role": "user", "content": "latest", "id": "u2"},
+        {"role": "assistant", "content": "new answer", "id": "a2"},
+    ]
+    tracker.observe({"type": "state_snapshot", "data": {"messages": state}})
+    tracker.observe({"type": "state_update", "data": {"messages": state}})
+
+    assert [item.message_id for item in tracker.inputs] == ["u2", "a2"]
+
+
+@pytest.mark.asyncio
+async def test_backfill_queue_runs_one_job_at_a_time_and_dedupes() -> None:
+    queue = HistoryBackfillQueue(max_pending=2)
+    first_started = asyncio.Event()
+    release_first = asyncio.Event()
+    order: list[str] = []
+
+    async def first() -> None:
+        order.append("first:start")
+        first_started.set()
+        await release_first.wait()
+        order.append("first:end")
+
+    async def second() -> None:
+        order.append("second")
+
+    assert queue.enqueue("thr-1", first) is True
+    assert queue.enqueue("thr-1", first) is True
+    assert queue.enqueue("thr-2", second) is True
+    assert queue.available_slots == 0
+    assert queue.active_jobs == 2
+    assert queue.contains("thr-1") is True
+    await first_started.wait()
+    assert order == ["first:start"]
+    assert queue.available_slots == 1
+    release_first.set()
+    await asyncio.wait_for(queue._queue.join(), timeout=1)  # noqa: SLF001
+    assert order == ["first:start", "first:end", "second"]
+    assert queue.active_jobs == 0
+    assert queue.available_slots == 2
+    assert queue.contains("thr-1") is False
+    await queue.close()
diff --git a/tests/unit/gateway/test_hitl_ask_user.py b/tests/unit/gateway/test_hitl_ask_user.py
new file mode 100644
index 00000000..6e77eaad
--- /dev/null
+++ b/tests/unit/gateway/test_hitl_ask_user.py
@@ -0,0 +1,338 @@
+"""Unit tests for the ``ask_user_question`` HITL channel."""
+
+from __future__ import annotations
+
+import pytest
+
+from octop.infra.gateway.hitl.coordinator import (
+    HitlChannelCoordinator,
+    decision_rejection_reason,
+)
+from octop.infra.gateway.hitl.format import (
+    extract_questions,
+    format_ask_card,
+    format_hitl_card,
+    is_ask_action_requests,
+    parse_ask_reply,
+)
+from octop.infra.gateway.hitl.store import HitlPendingStore
+
+SINGLE_CHOICE = [
+    {
+        "name": "ask_user_question",
+        "args": {
+            "questions": [
+                {
+                    "header": "Storage",
+                    "question": "Which database should we use?",
+                    "options": [
+                        {"label": "PostgreSQL", "description": "Concurrent writes"},
+                        {"label": "SQLite", "description": "Zero ops"},
+                    ],
+                }
+            ]
+        },
+    }
+]
+
+MULTI_CHOICE = [
+    {
+        "name": "ask_user_question",
+        "args": {
+            "questions": [
+                {
+                    "question": "Which channels should be enabled?",
+                    "multi_select": True,
+                    "options": [
+                        {"label": "Feishu"},
+                        {"label": "Slack"},
+                        {"label": "Telegram"},
+                    ],
+                }
+            ]
+        },
+    }
+]
+
+OPEN_ENDED = [
+    {
+        "name": "ask_user_question",
+        "args": {"questions": [{"question": "What should the report cover?"}]},
+    }
+]
+
+THREE_QUESTIONS = [
+    {
+        "name": "ask_user_question",
+        "args": {
+            "questions": [
+                {
+                    "header": "Destination",
+                    "question": "Where should we go?",
+                    "options": [{"label": "Mountains"}, {"label": "City"}],
+                },
+                {
+                    "header": "Budget",
+                    "question": "What is the budget?",
+                    "options": [{"label": "Economy"}, {"label": "Premium"}],
+                },
+                {
+                    "header": "Transport",
+                    "question": "How should we travel?",
+                    "options": [{"label": "Train"}, {"label": "Drive"}],
+                },
+            ]
+        },
+    }
+]
+
+APPROVAL = [{"name": "execute", "args": {"command": "ls"}}]
+
+
+def _questions(actions: list[dict]) -> list[dict]:
+    return extract_questions(actions)
+
+
+class TestDetection:
+    def test_ask_actions_detected(self) -> None:
+        assert is_ask_action_requests(SINGLE_CHOICE)
+
+    def test_approval_actions_not_detected(self) -> None:
+        assert not is_ask_action_requests(APPROVAL)
+
+    def test_empty_actions_not_detected(self) -> None:
+        assert not is_ask_action_requests([])
+
+    def test_extract_questions(self) -> None:
+        questions = _questions(SINGLE_CHOICE)
+        assert len(questions) == 1
+        assert questions[0]["question"] == "Which database should we use?"
+
+    def test_extract_questions_ignores_malformed(self) -> None:
+        actions = [{"name": "ask_user_question", "args": {"questions": "nope"}}]
+        assert extract_questions(actions) == []
+
+
+class TestCard:
+    def test_hitl_card_dispatches_to_ask(self) -> None:
+        card = format_hitl_card(SINGLE_CHOICE, pending_id="p1", locale="en")
+        assert "PostgreSQL" in card
+        assert "a) PostgreSQL" in card
+        assert "b) SQLite" in card
+        assert "p1" in card
+
+    def test_ask_card_shows_header(self) -> None:
+        card = format_ask_card(_questions(SINGLE_CHOICE), pending_id="p1", locale="en")
+        assert "[Storage]" in card
+
+    def test_multi_select_hint(self) -> None:
+        card = format_ask_card(_questions(MULTI_CHOICE), pending_id="p1", locale="en")
+        assert "multiple allowed" in card
+
+    def test_open_ended_hint(self) -> None:
+        card = format_ask_card(_questions(OPEN_ENDED), pending_id="p1", locale="en")
+        assert "answer in a sentence" in card
+
+    def test_approval_card_unchanged(self) -> None:
+        card = format_hitl_card(APPROVAL, pending_id="p1", locale="en")
+        assert "command" in card
+
+    def test_zh_locale(self) -> None:
+        card = format_hitl_card(SINGLE_CHOICE, pending_id="p1", locale="zh")
+        assert "拍板" in card
+
+    def test_im_card_shows_only_current_question(self) -> None:
+        questions = _questions(THREE_QUESTIONS)
+        first = format_ask_card(questions, pending_id="p1", locale="en")
+        assert "Question 1 of 3" in first
+        assert "Where should we go?" in first
+        assert "What is the budget?" not in first
+
+        second = format_ask_card(
+            questions,
+            pending_id="p1",
+            locale="en",
+            question_index=1,
+        )
+        assert "Question 2 of 3" in second
+        assert "What is the budget?" in second
+        assert "Where should we go?" not in second
+
+    def test_im_options_are_separated_by_blank_lines(self) -> None:
+        card = format_ask_card(_questions(SINGLE_CHOICE), pending_id="p1", locale="en")
+        assert "a) PostgreSQL — Concurrent writes\n\n" in card
+
+
+class TestReplyParsing:
+    @pytest.mark.parametrize("reply", ["a", "1"])
+    def test_letter_and_digit_select_first_option(self, reply: str) -> None:
+        answer = parse_ask_reply(reply, _questions(SINGLE_CHOICE), locale="en")
+        assert "PostgreSQL" in answer
+
+    def test_second_option(self) -> None:
+        answer = parse_ask_reply("b", _questions(SINGLE_CHOICE), locale="en")
+        assert "SQLite" in answer
+
+    def test_multi_select_expands_all(self) -> None:
+        answer = parse_ask_reply("a,c", _questions(MULTI_CHOICE), locale="en")
+        assert "Feishu" in answer
+        assert "Telegram" in answer
+
+    def test_single_select_keeps_one(self) -> None:
+        answer = parse_ask_reply("a,b", _questions(SINGLE_CHOICE), locale="en")
+        assert "SQLite" not in answer
+        assert "PostgreSQL" in answer
+
+    def test_out_of_range_forwarded_verbatim(self) -> None:
+        answer = parse_ask_reply("z", _questions(SINGLE_CHOICE), locale="en")
+        assert answer == "z"
+
+    def test_free_text_forwarded_verbatim(self) -> None:
+        text = "SQLite, but enable WAL mode"
+        assert parse_ask_reply(text, _questions(SINGLE_CHOICE), locale="en") == text
+
+    def test_topic_switch_forwarded_verbatim(self) -> None:
+        text = "actually, show me the logs first"
+        assert parse_ask_reply(text, _questions(SINGLE_CHOICE), locale="en") == text
+
+    def test_open_ended_forwarded_verbatim(self) -> None:
+        assert parse_ask_reply("a", _questions(OPEN_ENDED), locale="en") == "a"
+
+    def test_multi_question_forwarded_verbatim(self) -> None:
+        questions = _questions(SINGLE_CHOICE) + _questions(MULTI_CHOICE)
+        assert parse_ask_reply("a", questions, locale="en") == "a"
+
+
+class TestCoordinatorRouting:
+    def _register(self, store: HitlPendingStore, actions: list[dict]) -> None:
+        store.register(
+            thread_id="thr1",
+            agent_id="agent1",
+            user_id=7,
+            session_key="sk1",
+            channel_type="feishu",
+            action_requests=actions,
+            review_configs=None,
+        )
+
+    def test_resolves_ask_pending(self) -> None:
+        coordinator = HitlChannelCoordinator(HitlPendingStore())
+        self._register(coordinator.store, SINGLE_CHOICE)
+        record = coordinator.resolve_ask_pending("sk1", agent_id="agent1", user_id=7)
+        assert record is not None
+        assert record.thread_id == "thr1"
+
+    def test_approval_pending_not_routed(self) -> None:
+        coordinator = HitlChannelCoordinator(HitlPendingStore())
+        self._register(coordinator.store, APPROVAL)
+        assert coordinator.resolve_ask_pending("sk1", agent_id="agent1", user_id=7) is None
+
+    def test_other_user_cannot_answer(self) -> None:
+        coordinator = HitlChannelCoordinator(HitlPendingStore())
+        self._register(coordinator.store, SINGLE_CHOICE)
+        assert coordinator.resolve_ask_pending("sk1", agent_id="agent1", user_id=99) is None
+
+    def test_other_agent_not_routed(self) -> None:
+        coordinator = HitlChannelCoordinator(HitlPendingStore())
+        self._register(coordinator.store, SINGLE_CHOICE)
+        assert coordinator.resolve_ask_pending("sk1", agent_id="other", user_id=7) is None
+
+    def test_no_pending(self) -> None:
+        coordinator = HitlChannelCoordinator(HitlPendingStore())
+        assert coordinator.resolve_ask_pending("sk1", agent_id="agent1", user_id=7) is None
+
+    def test_build_answer_decisions(self) -> None:
+        coordinator = HitlChannelCoordinator(HitlPendingStore())
+        self._register(coordinator.store, SINGLE_CHOICE)
+        record = coordinator.resolve_ask_pending("sk1", agent_id="agent1", user_id=7)
+        assert record is not None
+        decisions = coordinator.build_answer_decisions(record, "a", locale="en")
+        assert len(decisions) == 1
+        assert decisions[0]["type"] == "respond"
+        assert "PostgreSQL" in decisions[0]["message"]
+
+    def test_resolved_pending_not_routed(self) -> None:
+        coordinator = HitlChannelCoordinator(HitlPendingStore())
+        self._register(coordinator.store, SINGLE_CHOICE)
+        record = coordinator.resolve_ask_pending("sk1", agent_id="agent1", user_id=7)
+        assert record is not None
+        coordinator.store.mark_resolved(record.pending_id, "approved")
+        assert coordinator.resolve_ask_pending("sk1", agent_id="agent1", user_id=7) is None
+
+    def test_multiple_questions_are_collected_before_resume(self) -> None:
+        coordinator = HitlChannelCoordinator(HitlPendingStore())
+        self._register(coordinator.store, THREE_QUESTIONS)
+        record = coordinator.resolve_ask_pending("sk1", agent_id="agent1", user_id=7)
+        assert record is not None
+
+        resume, next_card = coordinator.collect_ask_reply(record, "a", locale="en")
+        assert resume is None
+        assert next_card is not None
+        assert "Question 2 of 3" in next_card
+        assert record.ask_answers == ["Mountains"]
+
+        resume, next_card = coordinator.collect_ask_reply(record, "b", locale="en")
+        assert resume is None
+        assert next_card is not None
+        assert "Question 3 of 3" in next_card
+        assert record.ask_answers == ["Mountains", "Premium"]
+
+        resume, next_card = coordinator.collect_ask_reply(record, "a", locale="en")
+        assert next_card is None
+        assert resume is not None
+        assert "Destination: Mountains" in resume
+        assert "Budget: Premium" in resume
+        assert "Transport: Train" in resume
+
+
+ASK_REVIEW = [{"action_name": "ask_user_question", "allowed_decisions": ["respond"]}]
+APPROVAL_REVIEW = [{"action_name": "execute", "allowed_decisions": ["approve", "reject"]}]
+
+
+class TestDecisionValidation:
+    """A stale client must fail fast at the API, not deep inside the graph."""
+
+    def _record(self, actions: list[dict], review: list[dict] | None):
+        store = HitlPendingStore()
+        return store.register(
+            thread_id="thr1",
+            agent_id="agent1",
+            user_id=7,
+            session_key="sk1",
+            channel_type="dashboard",
+            action_requests=actions,
+            review_configs=review,
+        )
+
+    def test_approve_on_ask_tool_rejected(self) -> None:
+        record = self._record(SINGLE_CHOICE, ASK_REVIEW)
+        reason = decision_rejection_reason(record, [{"type": "approve"}])
+        assert reason is not None
+        assert "not allowed" in reason
+        assert "ask_user_question" in reason
+
+    def test_respond_on_ask_tool_accepted(self) -> None:
+        record = self._record(SINGLE_CHOICE, ASK_REVIEW)
+        decisions = [{"type": "respond", "message": "PostgreSQL"}]
+        assert decision_rejection_reason(record, decisions) is None
+
+    def test_respond_on_approval_tool_rejected(self) -> None:
+        record = self._record(APPROVAL, APPROVAL_REVIEW)
+        reason = decision_rejection_reason(record, [{"type": "respond", "message": "x"}])
+        assert reason is not None
+        assert "not allowed" in reason
+
+    def test_approve_on_approval_tool_accepted(self) -> None:
+        record = self._record(APPROVAL, APPROVAL_REVIEW)
+        assert decision_rejection_reason(record, [{"type": "approve"}]) is None
+
+    def test_count_mismatch_rejected(self) -> None:
+        record = self._record(SINGLE_CHOICE, ASK_REVIEW)
+        decisions = [{"type": "respond", "message": "a"}, {"type": "respond", "message": "b"}]
+        reason = decision_rejection_reason(record, decisions)
+        assert reason is not None
+        assert "expected 1 decision" in reason
+
+    def test_missing_review_configs_allows_anything(self) -> None:
+        record = self._record(SINGLE_CHOICE, None)
+        assert decision_rejection_reason(record, [{"type": "approve"}]) is None
diff --git a/tests/unit/gateway/test_hitl_resume_projection.py b/tests/unit/gateway/test_hitl_resume_projection.py
new file mode 100644
index 00000000..b2851e26
--- /dev/null
+++ b/tests/unit/gateway/test_hitl_resume_projection.py
@@ -0,0 +1,84 @@
+"""Dashboard HITL resume keeps the thread-history projection complete."""
+
+from __future__ import annotations
+
+import json
+from unittest.mock import MagicMock
+
+import pytest
+from langchain_core.messages import AIMessage, HumanMessage, ToolMessage
+
+from octop.infra.gateway.process.processor import GlobalProcessor
+from octop.infra.gateway.slash.dispatcher import SlashDispatcher
+
+
+@pytest.mark.asyncio
+async def test_hitl_resume_records_final_answer_in_thread_history() -> None:
+    messages = [
+        HumanMessage(content="plan a trip", id="user-1"),
+        AIMessage(
+            content="",
+            id="ask-1",
+            tool_calls=[
+                {
+                    "name": "ask_user_question",
+                    "args": {"questions": []},
+                    "id": "call-1",
+                    "type": "tool_call",
+                }
+            ],
+        ),
+        ToolMessage(content="nature, premium, mixed", tool_call_id="call-1", id="answer-1"),
+        AIMessage(content="Here is the completed itinerary.", id="final-1"),
+    ]
+
+    async def _resume(*_args: object, **_kwargs: object):
+        yield {"type": "state_snapshot", "data": {"messages": messages}}
+        yield {
+            "type": "usage",
+            "usage": {"input_tokens": 100, "output_tokens": 20, "total_tokens": 120},
+        }
+
+    agent_manager = MagicMock()
+    agent_manager.resume_hitl = _resume
+    thread_registry = MagicMock()
+    history_repo = MagicMock()
+    usage_repo = MagicMock()
+    processor = GlobalProcessor(
+        agent_manager=agent_manager,
+        thread_registry=thread_registry,
+        audit_repo=MagicMock(),
+        agent_repo=MagicMock(),
+        user_repo=MagicMock(),
+        connector_repo=MagicMock(),
+        dispatcher=SlashDispatcher(),
+        usage_repo=usage_repo,
+        thread_message_repo=history_repo,
+        gateway=None,
+    )
+
+    chunks = [
+        chunk
+        async for chunk in processor.iter_hitl_resume_chunks(
+            agent_id="agent-1",
+            thread_id="thread-1",
+            user_id=7,
+            decisions=[{"type": "respond", "message": "nature, premium, mixed"}],
+        )
+    ]
+
+    assert [chunk["type"] for chunk in chunks] == ["state_snapshot", "usage"]
+    thread_registry.touch_last_active.assert_called_once_with("thread-1")
+    history_repo.append_if_ready.assert_called_once()
+    thread_id, projected = history_repo.append_if_ready.call_args.args
+    assert thread_id == "thread-1"
+    assert [item.message_id for item in projected] == [
+        "user-1",
+        "ask-1",
+        "answer-1",
+        "final-1",
+    ]
+    assert json.loads(projected[-1].message_json)["data"]["content"] == (
+        "Here is the completed itinerary."
+    )
+    usage_repo.record.assert_called_once()
diff --git a/tests/unit/gateway/test_response_mode.py b/tests/unit/gateway/test_response_mode.py
index 7bbe1777..0aee5044 100644
--- a/tests/unit/gateway/test_response_mode.py
+++ b/tests/unit/gateway/test_response_mode.py
@@ -49,6 +49,27 @@ async def test_invoke_discards_progress_before_tool_and_emits_final_once() -> No
     assert text.text == "这是最终答案。"
 
 
+@pytest.mark.asyncio
+async def test_invoke_strips_orphan_thinking_prefix_from_final_text() -> None:
+    source = _events(
+        MessageEvent.delta("Let me inspect another source. "),
+        MessageEvent.delta("This is internal reasoning."),
+        MessageEvent.delta("</think>"),
+        MessageEvent.delta("【每日指南学习】最终内容"),
+        MessageEvent.completed(),
+    )
+
+    result = [event async for event in collapse_to_invoke_response(source)]
+
+    assert [event.type for event in result] == [
+        MessageEventType.MESSAGE,
+        MessageEventType.COMPLETED,
+    ]
+    text = result[0].content[0]
+    assert isinstance(text, TextContent)
+    assert text.text == "【每日指南学习】最终内容"
+
+
 @pytest.mark.asyncio
 async def test_invoke_preserves_tool_media_with_final_text() -> None:
     attachment = FileContent(filename="report.pdf", data="cGRm")
diff --git a/tests/unit/i18n/test_stream.py b/tests/unit/i18n/test_stream.py
index b2bc75c6..9e756757 100644
--- a/tests/unit/i18n/test_stream.py
+++ b/tests/unit/i18n/test_stream.py
@@ -33,6 +33,22 @@ def test_classify_rate_limit() -> None:
     )
 
 
+def test_classify_insufficient_balance() -> None:
+    msg = (
+        "Error code: 402 - {'error': {'message': 'Insufficient Balance', "
+        "'type': 'unknown_error', 'param': None, 'code': 'invalid_request_error'}}"
+    )
+    assert classify_stream_error_message(msg) == "octop:stream_errors.insufficient_balance"
+    assert (
+        classify_stream_error_message("HTTP 402 POST https://api.example.com/v1/embeddings: quota")
+        == "octop:stream_errors.insufficient_balance"
+    )
+    assert (
+        classify_stream_error_message("You exceeded your current quota, please check billing")
+        == "octop:stream_errors.insufficient_balance"
+    )
+
+
 def test_classify_auth() -> None:
     assert (
         classify_stream_error_message("Error code: 401 - Incorrect API key provided")
@@ -40,6 +56,17 @@ def test_classify_auth() -> None:
     )
 
 
+def test_classify_provider_unavailable_http_status() -> None:
+    assert (
+        classify_stream_error_message("HTTP 503 POST https://api.example.com/v1/embeddings")
+        == "octop:stream_errors.provider_unavailable"
+    )
+    assert (
+        classify_stream_error_message("Error code: 502 - Bad Gateway")
+        == "octop:stream_errors.provider_unavailable"
+    )
+
+
 def test_classify_context_length() -> None:
     assert (
         classify_stream_error_message(
@@ -85,6 +112,14 @@ def test_format_stream_error_zh_guidance() -> None:
     assert "LANGCHAIN" not in text
 
 
+def test_format_insufficient_balance_zh() -> None:
+    msg = "Error code: 402 - {'error': {'message': 'Insufficient Balance'}}"
+    text = format_stream_error(msg, "zh")
+    assert "余额" in text or "额度" in text
+    assert "402" not in text
+    assert "Insufficient Balance" not in text
+
+
 def test_format_recursion_limit_zh_guides_to_config() -> None:
     msg = (
         "Recursion limit of 2 reached without hitting a stop condition. "
diff --git a/tests/unit/knowledge/test_service_acl.py b/tests/unit/knowledge/test_service_acl.py
index 35c1676d..7c6bdcc0 100644
--- a/tests/unit/knowledge/test_service_acl.py
+++ b/tests/unit/knowledge/test_service_acl.py
@@ -256,3 +256,24 @@ def test_shared_reader_cannot_rename(service: KnowledgeService) -> None:
 
     with pytest.raises(PermissionError, match="write"):
         service.rename_document(kb.id, folder.id, actor_user_id=viewer, new_name="b")
+
+
+def test_update_base_validates_max_documents_range(service: KnowledgeService) -> None:
+    users = service._services.user_repo
+    owner = users.create(username="ow", password_hash="h", role="user")
+    kb = service.create_base(owner_user_id=owner, name="Docs")
+    # In range
+    service.update_base(kb.id, actor_user_id=owner, max_documents=0)
+    assert service.get_readable_base(kb.id, actor_user_id=owner).max_documents == 0
+    service.update_base(kb.id, actor_user_id=owner, max_documents=500)
+    assert service.get_readable_base(kb.id, actor_user_id=owner).max_documents == 500
+    service.update_base(kb.id, actor_user_id=owner, max_documents=10_000)
+    assert service.get_readable_base(kb.id, actor_user_id=owner).max_documents == 10_000
+    # Out of range
+    with pytest.raises(ValueError, match="max_documents must be between"):
+        service.update_base(kb.id, actor_user_id=owner, max_documents=-1)
+    with pytest.raises(ValueError, match="max_documents must be between"):
+        service.update_base(kb.id, actor_user_id=owner, max_documents=10_001)
+    # Omit keeps value
+    service.update_base(kb.id, actor_user_id=owner, description="keep")
+    assert service.get_readable_base(kb.id, actor_user_id=owner).max_documents == 10_000
diff --git a/tests/unit/skills/test_presentation.py b/tests/unit/skills/test_presentation.py
new file mode 100644
index 00000000..cb753087
--- /dev/null
+++ b/tests/unit/skills/test_presentation.py
@@ -0,0 +1,73 @@
+from __future__ import annotations
+
+from octop.infra.skills.presentation import (
+    apply_skill_presentation,
+    localize_skill_summary,
+)
+
+
+def test_apply_skill_presentation_exposes_localized_copy_and_assets() -> None:
+    summary = {"slug": "pdf-reader", "name": "pdf-reader", "description": "Agent trigger"}
+    frontmatter = {
+        "metadata": {
+            "octop": {
+                "label": {"zh": "PDF 阅读", "en": "PDF Reader"},
+                "summary": {"zh": "读取 PDF", "en": "Read PDFs"},
+                "emoji": "📄",
+                "icon_url": "https://cdn.example.com/pdf.png",
+            }
+        }
+    }
+
+    raw = apply_skill_presentation(summary, frontmatter)
+    localized = apply_skill_presentation(summary, frontmatter, locale="zh")
+
+    assert raw["name"] == "pdf-reader"
+    assert raw["description"] == "Agent trigger"
+    assert raw["label"] == {"zh": "PDF 阅读", "en": "PDF Reader"}
+    assert raw["summary"] == {"zh": "读取 PDF", "en": "Read PDFs"}
+    assert raw["emoji"] == "📄"
+    assert raw["icon_url"] == "https://cdn.example.com/pdf.png"
+    assert localized["name"] == "PDF 阅读"
+    assert localized["description"] == "读取 PDF"
+    assert localized["slug"] == "pdf-reader"
+
+
+def test_apply_skill_presentation_keeps_identity_without_locale() -> None:
+    raw = apply_skill_presentation(
+        {"name": "pdf-reader", "description": "Agent trigger"},
+        {"metadata": {"octop": {"display_name": "PDF Reader"}}},
+    )
+
+    assert raw["name"] == "pdf-reader"
+    assert raw["display_name"] == "PDF Reader"
+
+
+def test_localize_skill_summary_uses_english_then_chinese_fallback() -> None:
+    summary = {
+        "name": "stable-name",
+        "description": "Agent trigger",
+        "label": {"zh": "中文名"},
+        "summary": {"zh": "中文简介"},
+    }
+
+    localized = localize_skill_summary(summary, "en")
+
+    assert localized["name"] == "中文名"
+    assert localized["description"] == "中文简介"
+
+
+def test_legacy_display_name_and_compatible_emoji_remain_supported() -> None:
+    localized = apply_skill_presentation(
+        {"name": "stable-name", "description": "Agent trigger"},
+        {
+            "metadata": {
+                "octop": {"display_name": "Friendly Name"},
+                "openclaw": {"emoji": "📦"},
+            }
+        },
+        locale="en",
+    )
+
+    assert localized["name"] == "Friendly Name"
+    assert localized["emoji"] == "📦"
diff --git a/tests/unit/test_connectors.py b/tests/unit/test_connectors.py
index 7758caf8..ce9c26fa 100644
--- a/tests/unit/test_connectors.py
+++ b/tests/unit/test_connectors.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import asyncio
+import json
 from pathlib import Path
 
 import pytest
@@ -170,6 +171,241 @@ def test_build_dida365_remote_spec():
     assert spec["headers"]["Accept"] == "application/json, text/event-stream"
 
 
+def test_weknora_catalog_and_credentials():
+    from octop.infra.connectors.catalog import catalog_entry_to_dict
+
+    entry = get_catalog_entry("weknora")
+    assert entry is not None
+    assert entry.mcp_mode == "gateway"
+    data = catalog_entry_to_dict(entry)
+    fields = {item["key"]: item for item in data["credential_fields"]}
+    assert fields["base_url"]["field_type"] == "url"
+    assert fields["api_key"]["secret"] is True
+
+    payload = validate_create_credentials(
+        "weknora",
+        {
+            "base_url": "http://127.0.0.1:8080/",
+            "api_key": "sk-secret",
+            "tenant_id": "tenant-1",
+            "knowledge_base_ids": "kb-1, kb-2, kb-1",
+        },
+    )
+    assert payload["base_url"] == "http://127.0.0.1:8080/api/v1"
+    assert payload["api_key"] == "sk-secret"
+    assert payload["tenant_id"] == "tenant-1"
+    assert payload["knowledge_base_ids"] == ["kb-1", "kb-2"]
+    assert payload["internal_token"]
+
+
+def test_weknora_rejects_non_https_remote_url():
+    with pytest.raises(ValueError, match="non-local url must use https"):
+        validate_create_credentials(
+            "weknora",
+            {"base_url": "http://weknora.example.com", "api_key": "sk-secret"},
+        )
+    with pytest.raises(ValueError, match="query string or fragment"):
+        validate_create_credentials(
+            "weknora",
+            {"base_url": "https://weknora.example.com?token=secret"},
+        )
+
+
+def test_dify_builds_streamable_http_spec():
+    entry = get_catalog_entry("dify")
+    assert entry is not None
+    assert entry.remote_transport == "streamable_http"
+    creds = validate_create_credentials(
+        "dify",
+        {"mcp_url": "https://dify.example.com/mcp/server/server-code/mcp"},
+    )
+    spec = build_http_mcp_spec(
+        entry=entry,
+        instance_id="x",
+        creds=creds,
+        config=OctopConfig(),
+    )
+    assert spec == {
+        "transport": "http",
+        "url": "https://dify.example.com/mcp/server/server-code/mcp",
+        "headers": {"Accept": "application/json, text/event-stream"},
+    }
+
+
+def test_dify_rejects_non_server_url():
+    with pytest.raises(ValueError, match="Dify MCP Server URL"):
+        validate_create_credentials("dify", {"mcp_url": "https://dify.example.com/v1/chat"})
+
+
+def test_dify_server_code_is_redacted_from_logs():
+    from octop.infra.connectors.builder import _redact_mcp_configs_for_log
+
+    redacted = _redact_mcp_configs_for_log(
+        {
+            "dify__x": {
+                "transport": "http",
+                "url": "https://dify.example.com/mcp/server/secret-code/mcp",
+            }
+        }
+    )
+    assert redacted["dify__x"]["url"] == "https://dify.example.com/mcp/server/***/mcp"
+
+
+def test_custom_field_preview_redacts_secrets():
+    from octop.api.routers.connectors import _credentials_preview
+
+    weknora = _credentials_preview(
+        "weknora",
+        {
+            "base_url": "https://weknora.example.com/api/v1",
+            "api_key": "sk-secret",
+            "tenant_id": "tenant-1",
+            "knowledge_base_ids": ["kb-1"],
+        },
+    )
+    assert weknora == {
+        "base_url": "https://weknora.example.com/api/v1",
+        "api_key_configured": True,
+        "tenant_id": "tenant-1",
+        "knowledge_base_ids": ["kb-1"],
+    }
+    dify = _credentials_preview(
+        "dify",
+        {"mcp_url": "https://dify.example.com/mcp/server/secret-code/mcp"},
+    )
+    assert dify == {"mcp_url_configured": True}
+
+
+def test_gateway_weknora_tools_and_search(monkeypatch: pytest.MonkeyPatch):
+    from octop.infra.connectors.gateway.adapters import weknora
+
+    calls: list[tuple[str, str, dict[str, object] | None]] = []
+
+    def _fake_request(
+        _creds: dict[str, object],
+        method: str,
+        path: str,
+        *,
+        params: dict[str, object] | None = None,
+        body: dict[str, object] | None = None,
+    ) -> dict[str, object]:
+        calls.append((method, path, body))
+        if path == "/knowledge-bases":
+            return {"success": True, "data": [{"id": "kb-1", "name": "Docs"}]}
+        assert params == {"resource_urls": "handle"}
+        return {
+            "success": True,
+            "data": [
+                {
+                    "knowledge_id": "doc-1",
+                    "knowledge_title": "Guide",
+                    "chunk_index": 2,
+                    "score": 0.9,
+                    "content": "x" * 1300,
+                }
+            ],
+        }
+
+    monkeypatch.setattr(weknora, "_request", _fake_request)
+    listed = handle_mcp_request(
+        kind="weknora",
+        creds={"base_url": "http://127.0.0.1:8080/api/v1"},
+        body={"jsonrpc": "2.0", "id": 1, "method": "tools/list", "params": {}},
+    )
+    assert [tool["name"] for tool in listed["result"]["tools"]] == [
+        "list_knowledge_bases",
+        "search",
+        "read_document",
+    ]
+    result = json.loads(
+        weknora.call_tool(
+            {"base_url": "http://127.0.0.1:8080/api/v1"},
+            "search",
+            {"query": "install"},
+        )
+    )
+    assert result["knowledge_base_ids"] == ["kb-1"]
+    assert len(result["passages"][0]["content"]) == 1200
+    assert result["passages"][0]["truncated"] is True
+    assert calls[-1][2] == {"query": "install", "knowledge_base_ids": ["kb-1"]}
+
+
+@pytest.mark.asyncio
+async def test_dify_probe_uses_streamable_http(monkeypatch: pytest.MonkeyPatch):
+    from octop.infra.connectors.probe import probe_connector
+
+    seen: dict[str, object] = {}
+
+    async def _probe(url: str, headers: dict[str, str], *, kind: str) -> dict[str, object]:
+        seen.update(url=url, headers=headers, kind=kind)
+        return {"ok": True, "tool_count": 1, "tools": [{"name": "run", "description": ""}]}
+
+    monkeypatch.setattr("octop.infra.connectors.probe.probe_streamable_http_mcp", _probe)
+    entry = get_catalog_entry("dify")
+    assert entry is not None
+    result = await probe_connector(
+        entry,
+        {"mcp_url": "https://dify.example.com/mcp/server/code/mcp"},
+        instance_id="probe",
+        config=OctopConfig(),
+    )
+    assert result["ok"] is True
+    assert seen == {
+        "url": "https://dify.example.com/mcp/server/code/mcp",
+        "headers": {"Accept": "application/json, text/event-stream"},
+        "kind": "dify",
+    }
+
+
+@pytest.mark.asyncio
+async def test_detect_local_weknora_uses_fixed_loopback(monkeypatch: pytest.MonkeyPatch):
+    import httpx
+
+    from octop.infra.connectors import probe
+
+    seen: list[str] = []
+    real_client = httpx.AsyncClient
+
+    def handler(request: httpx.Request) -> httpx.Response:
+        seen.append(str(request.url))
+        return httpx.Response(200, json={"status": "ok"})
+
+    def client_factory(**kwargs: object) -> httpx.AsyncClient:
+        kwargs.pop("trust_env", None)
+        return real_client(transport=httpx.MockTransport(handler), **kwargs)
+
+    monkeypatch.setattr(probe.httpx, "AsyncClient", client_factory)
+    result = await probe.detect_local_weknora()
+
+    assert result == {
+        "found": True,
+        "base_url": "http://127.0.0.1:8080/api/v1",
+        "console_url": "http://127.0.0.1",
+    }
+    assert seen == ["http://127.0.0.1:8080/health"]
+
+
+@pytest.mark.asyncio
+async def test_detect_local_weknora_returns_not_found_on_unhealthy_host(
+    monkeypatch: pytest.MonkeyPatch,
+):
+    import httpx
+
+    from octop.infra.connectors import probe
+
+    real_client = httpx.AsyncClient
+
+    def handler(request: httpx.Request) -> httpx.Response:
+        return httpx.Response(503, request=request)
+
+    def client_factory(**kwargs: object) -> httpx.AsyncClient:
+        kwargs.pop("trust_env", None)
+        return real_client(transport=httpx.MockTransport(handler), **kwargs)
+
+    monkeypatch.setattr(probe.httpx, "AsyncClient", client_factory)
+    assert await probe.detect_local_weknora() == {"found": False}
+
+
 def test_gateway_tools_list():
     resp = handle_mcp_request(
         kind="qq-mail",
diff --git a/tests/unit/test_provider_fetch_models.py b/tests/unit/test_provider_fetch_models.py
index 13c8896d..949d0fee 100644
--- a/tests/unit/test_provider_fetch_models.py
+++ b/tests/unit/test_provider_fetch_models.py
@@ -93,7 +93,28 @@ async def test_fetch_models_auth_error() -> None:
         )
 
     assert result["ok"] is False
-    assert "401" in result["error"] or "invalid" in result["error"].lower()
+    assert "API key" in result["error"]
+    assert "401" not in result["error"]
+
+
+@pytest.mark.asyncio
+async def test_fetch_models_insufficient_balance_zh() -> None:
+    response = _mock_response(402, {"error": {"message": "Insufficient Balance"}})
+    mock_client = AsyncMock()
+    mock_client.get = AsyncMock(return_value=response)
+    mock_client.__aenter__ = AsyncMock(return_value=mock_client)
+    mock_client.__aexit__ = AsyncMock(return_value=None)
+
+    with patch("octop.infra.agents.providers.probe.httpx.AsyncClient", return_value=mock_client):
+        result = await fetch_openai_compatible_models(
+            base_url="https://api.example.com/v1",
+            api_key="sk-test",
+            locale="zh",
+        )
+
+    assert result["ok"] is False
+    assert "余额" in result["error"] or "额度" in result["error"]
+    assert "402" not in result["error"]
 
 
 @pytest.mark.asyncio
@@ -131,3 +152,25 @@ async def test_fetch_models_connection_error() -> None:
 
     assert result["ok"] is False
     assert result["error"]
+    # ConnectError string often includes "connection" → timeout_network guidance
+    assert "401" not in result["error"]
+
+
+@pytest.mark.asyncio
+async def test_fetch_models_server_error_friendly() -> None:
+    response = _mock_response(503, {"error": {"message": "overloaded"}})
+    mock_client = AsyncMock()
+    mock_client.get = AsyncMock(return_value=response)
+    mock_client.__aenter__ = AsyncMock(return_value=mock_client)
+    mock_client.__aexit__ = AsyncMock(return_value=None)
+
+    with patch("octop.infra.agents.providers.probe.httpx.AsyncClient", return_value=mock_client):
+        result = await fetch_openai_compatible_models(
+            base_url="https://api.example.com/v1",
+            api_key="sk-test",
+            locale="en",
+        )
+
+    assert result["ok"] is False
+    assert "temporarily unavailable" in result["error"].lower()
+    assert "503" not in result["error"]
diff --git a/tests/unit/test_provider_preset_expansion.py b/tests/unit/test_provider_preset_expansion.py
index f81155a5..7ad08e16 100644
--- a/tests/unit/test_provider_preset_expansion.py
+++ b/tests/unit/test_provider_preset_expansion.py
@@ -28,11 +28,37 @@ def test_load_provider_presets_integration() -> None:
     # over time, so assert the model family is present rather than an exact id.
     assert any(mid.startswith("deepseek-v4-flash") for mid in token_ids)
     assert any(mid.startswith("deepseek-v4-pro") for mid in token_ids)
+    assert "tc-code-latest" in token_ids
     assert token_plan.get("vendor") == "tencent"
     assert token_plan.get("provider_group") == "tencent"
+    assert token_plan.get("provider_variant") == "token_plan"
     token_deepseek = next(m for m in token_plan["models"] if m["id"].startswith("deepseek-v4"))
     assert token_deepseek["reasoning_config"]["adapter"] == "thinking_nested_effort"
 
+    enterprise = next(p for p in presets if p["id"] == "tencent-token-plan-enterprise-cn")
+    enterprise_ids = {m["id"] for m in enterprise["models"]}
+    assert enterprise["base_url"] == "https://tokenhub.tencentmaas.com/plan/v3"
+    assert enterprise.get("provider_group") == "tencent"
+    assert enterprise.get("provider_variant") == "token_plan_enterprise_cn"
+    assert {"auto", "deepseek-v4-flash", "deepseek-v4-pro", "kimi-k2.5"} <= enterprise_ids
+    assert any(mid.startswith("glm-5") for mid in enterprise_ids)
+    assert any(mid.startswith("minimax-m") for mid in enterprise_ids)
+    # Enterprise ids are bare model names, not vendor-prefixed routes.
+    assert not any("/" in model_id for model_id in enterprise_ids)
+    enterprise_deepseek = next(
+        m for m in enterprise["models"] if m["id"].startswith("deepseek-v4-pro")
+    )
+    assert enterprise_deepseek["reasoning_config"]["adapter"] == "thinking_nested_effort"
+
+    hy_plan = next(p for p in presets if p["id"] == "tencent-hy-token-plan")
+    assert hy_plan["base_url"] == "https://api.lkeap.cloud.tencent.com/plan/v3"
+    assert hy_plan.get("provider_group") == "tencent"
+    assert hy_plan.get("provider_variant") == "hy_token_plan"
+    hy_ids = {m["id"] for m in hy_plan["models"]}
+    assert {"hy3", "hy3-preview"} <= hy_ids
+    hy3 = next(m for m in hy_plan["models"] if m["id"] == "hy3")
+    assert hy3["reasoning_config"]["adapter"] == "status_only"
+
     coding_plan = next(p for p in presets if p["id"] == "tencent-coding-plan")
     assert "kimi-k2.5" in {m["id"] for m in coding_plan["models"]}
 
diff --git a/tests/unit/test_provider_probe.py b/tests/unit/test_provider_probe.py
index 7ca1e43c..19ec9989 100644
--- a/tests/unit/test_provider_probe.py
+++ b/tests/unit/test_provider_probe.py
@@ -116,8 +116,37 @@ async def test_embedding_probe_reports_http_error() -> None:
         result = await probe_provider_row(_embedding_row())
 
     assert result["ok"] is False
-    assert "401" in result["error"]
-    assert "POST https://api.example.com/v1/embeddings" in result["error"]
+    assert "API key" in result["error"]
+    assert "401" not in result["error"]
+
+
+@pytest.mark.asyncio
+async def test_chat_probe_maps_insufficient_balance() -> None:
+    row = SimpleNamespace(
+        name="HAI",
+        kind="openai",
+        base_url="https://api.example.com/v1",
+        api_key="sk-test",
+        extra_json=None,
+        get_models=lambda: [{"id": "gpt-4o-mini", "name": "gpt-4o-mini"}],
+    )
+    fake = AsyncMock()
+    fake.ainvoke = AsyncMock(
+        side_effect=RuntimeError(
+            "Error code: 402 - {'error': {'message': 'Insufficient Balance', "
+            "'type': 'unknown_error', 'param': None, 'code': 'invalid_request_error'}}"
+        )
+    )
+    with patch(
+        "octop.infra.agents.providers.probe.build_probe_chat_model",
+        return_value=fake,
+    ):
+        result = await probe_provider_row(row, model_id="gpt-4o-mini", locale="zh")
+
+    assert result["ok"] is False
+    assert "余额" in result["error"] or "额度" in result["error"]
+    assert "402" not in result["error"]
+    assert "Insufficient Balance" not in result["error"]
 
 
 @pytest.mark.asyncio
diff --git a/tests/unit/test_skillhub_install_metadata.py b/tests/unit/test_skillhub_install_metadata.py
index 29d58469..87037a3e 100644
--- a/tests/unit/test_skillhub_install_metadata.py
+++ b/tests/unit/test_skillhub_install_metadata.py
@@ -3,8 +3,8 @@
 from octop.api.routers.skills import (
     _summary_dict,
     _valid_skillhub_icon_url,
-    _with_skillhub_presentation_metadata,
 )
+from octop.infra.skills.install import with_skillhub_presentation_metadata
 
 
 def test_summary_prefers_octop_display_metadata_and_supports_openclaw_emoji() -> None:
@@ -25,7 +25,8 @@ def test_summary_prefers_octop_display_metadata_and_supports_openclaw_emoji() ->
     )
 
     assert summary["slug"] == "stable-slug"
-    assert summary["name"] == "中文名称"
+    assert summary["name"] == "english-name"
+    assert summary["display_name"] == "中文名称"
     assert summary["icon_url"] == "https://cdn.example.com/icon.png"
     assert summary["emoji"] == "📦"
 
@@ -35,7 +36,7 @@ def test_with_skillhub_metadata_preserves_skill_identity_and_body() -> None:
         "---\nname: english-name\nmetadata:\n  openclaw:\n    emoji: '📦'\n---\n\n# Original body\n"
     )
 
-    rendered = _with_skillhub_presentation_metadata(
+    rendered = with_skillhub_presentation_metadata(
         original,
         display_name="中文名称",
         icon_url="https://cdn.example.com/icon.png",
@@ -48,6 +49,21 @@ def test_with_skillhub_metadata_preserves_skill_identity_and_body() -> None:
     assert rendered.endswith("# Original body\n")
 
 
+def test_skillhub_metadata_writes_localized_label_and_summary() -> None:
+    rendered = with_skillhub_presentation_metadata(
+        "---\nname: pdf-reader\ndescription: Read PDFs\n---\n",
+        display_name="PDF 阅读",
+        icon_url="",
+        label={"zh": "PDF 阅读", "en": "PDF Reader"},
+        summary={"zh": "读取 PDF", "en": "Read PDFs"},
+    )
+    assert "zh: PDF 阅读" in rendered
+    assert "en: PDF Reader" in rendered
+    assert "zh: 读取 PDF" in rendered
+    assert "en: Read PDFs" in rendered
+    assert "display_name:" not in rendered
+
+
 def test_skillhub_icon_url_allows_only_http_urls() -> None:
     assert _valid_skillhub_icon_url("https://cdn.example.com/icon.png")
     assert _valid_skillhub_icon_url("http://cdn.example.com/icon.png")
diff --git a/uv.lock b/uv.lock
index ec62161b..16427776 100644
--- a/uv.lock
+++ b/uv.lock
@@ -838,7 +838,7 @@ wheels = [
 
 [[package]]
 name = "deepagents"
-version = "0.6.12"
+version = "0.7.9"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "langchain" },
@@ -846,11 +846,12 @@ dependencies = [
     { name = "langchain-core" },
     { name = "langchain-google-genai" },
     { name = "langsmith" },
+    { name = "packaging" },
     { name = "wcmatch" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/e0/db/a6acdc72a9e90c3f07ed10de35c951734a02d4facb693bb59684ad368801/deepagents-0.6.12.tar.gz", hash = "sha256:1f281c0bc5a63132f62e2ee345c1dc593b23188da6e23016401f6879fbe54b5f", size = 211364, upload-time = "2026-06-25T17:26:52.775Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/c4/4b/359aa09b9fb378b9cd10b69cb7bdd75847da03c110939ad01f1db715d0e4/deepagents-0.7.9.tar.gz", hash = "sha256:e62311fe73a752d36b830b2f48352aa63afbd56f47176d924065230d983b248e", size = 287549, upload-time = "2026-08-25T21:02:41.431Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/98/49/af7219b3c13520fee047bb807cfaefba17f8e4584c551d946773589a4f08/deepagents-0.6.12-py3-none-any.whl", hash = "sha256:28b8fa0119ca0a689e3e18e288c4634e4046062acfc87a1cb34289d3af3a1c88", size = 236120, upload-time = "2026-06-25T17:26:51.736Z" },
+    { url = "https://files.pythonhosted.org/packages/56/5d/6333620e6c9f519f23d85201d9e0ad346be7134fb0039555fabb3ce38e67/deepagents-0.7.9-py3-none-any.whl", hash = "sha256:fb5b382cc98ec132a6e30e5be2cacc60888231e358368aadc12f88efdec5d847", size = 314350, upload-time = "2026-08-25T21:02:39.789Z" },
 ]
 
 [[package]]
@@ -1635,30 +1636,30 @@ wheels = [
 
 [[package]]
 name = "langchain"
-version = "1.3.15"
+version = "1.3.18"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "langchain-core" },
     { name = "langgraph" },
     { name = "pydantic" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/6a/1c/b84579174a8e82ed79f4c3e0cd5a7f2323facc5ccd4d1b8390e7d175b663/langchain-1.3.15.tar.gz", hash = "sha256:ab4b775b9703f7e37babe0b325dbbaef25573bda60ecf79f7850bc875f252795", size = 665047, upload-time = "2026-08-11T19:10:52.455Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/31/e9/0e5425e522b624d7c5c0911957b467b82890b36b0099bf727951f2ee3059/langchain-1.3.18.tar.gz", hash = "sha256:74ce99294f6f2c82ee64c3df39daa6a22085ee1449a718065b3604a88d78bf4d", size = 637052, upload-time = "2026-08-27T17:33:12.702Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/09/8d/ae721f4d68ff79a17110cabc9cb39b4568b0e3f1fe0a379b926c3f81d175/langchain-1.3.15-py3-none-any.whl", hash = "sha256:c0d2d0d51ed7da249e8ab7487173872059a9dd46fb071d905957485b7334f987", size = 147001, upload-time = "2026-08-11T19:10:50.846Z" },
+    { url = "https://files.pythonhosted.org/packages/f7/04/374f6014ed6959dbdab92962c2b09e4d0223ed6a82f65694870b46d2c13f/langchain-1.3.18-py3-none-any.whl", hash = "sha256:f29cbef985848e5cfff5398f3c8c1568994a3a6f2a8f4fa720df30b6e0668b9c", size = 148007, upload-time = "2026-08-27T17:33:11.23Z" },
 ]
 
 [[package]]
 name = "langchain-anthropic"
-version = "1.6.0"
+version = "1.7.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "anthropic" },
     { name = "langchain-core" },
     { name = "pydantic" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/ef/db/1ff8c1ceaf0bb8febe1d3b16d8b7213d47bc7113328e68dbf46ebcf5fc38/langchain_anthropic-1.6.0.tar.gz", hash = "sha256:0307ec98b24566c747e91bac4158bc4f1510bae4b45f0d25107636cc1b616328", size = 722670, upload-time = "2026-08-19T21:39:40.395Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/56/fc/52f6d1d6069bafb08626e204c89c49c8dd4a536eedbb94f0b7e78668594d/langchain_anthropic-1.7.0.tar.gz", hash = "sha256:d48e3c118ff8d3eea83f17b50234a2d2ff491a2375d565f212eb990e7e3856cb", size = 750068, upload-time = "2026-08-27T15:23:59.261Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/f1/f2/c62b91a0663c668ffe5bd1cc83c90c603c4423b65e74d53f01d2b4329df5/langchain_anthropic-1.6.0-py3-none-any.whl", hash = "sha256:a85df4aa8f91a201703a4276e599ff3bcc498ade64294a85f79a96d6991f3154", size = 57151, upload-time = "2026-08-19T21:39:39.415Z" },
+    { url = "https://files.pythonhosted.org/packages/8e/ce/e4367713080bc750e1dba845409c058f196543d1a0dc99683e2ef062f581/langchain_anthropic-1.7.0-py3-none-any.whl", hash = "sha256:68b34369aa01dad0c67bc690b8c47e09d06bd30fb28f320ad19ddc71c4445dc0", size = 60475, upload-time = "2026-08-27T15:23:57.989Z" },
 ]
 
 [[package]]
@@ -1739,7 +1740,7 @@ wheels = [
 
 [[package]]
 name = "langchain-google-genai"
-version = "4.2.6"
+version = "4.3.6"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "filetype" },
@@ -1747,9 +1748,9 @@ dependencies = [
     { name = "langchain-core" },
     { name = "pydantic" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/4c/08/68e4f90b273d1d8dc3a7a948e6535e60baac726adbb2a8341dcf17662f54/langchain_google_genai-4.2.6.tar.gz", hash = "sha256:653dc331e691ddd79784d9ff6a4082749e0f873394c6dc782c414eb4409850eb", size = 280074, upload-time = "2026-06-26T06:18:58.807Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/14/2e/7410d35d5a073a8a5d4942d49dfc386e79e11c09c66f02429ffcaeb57a5c/langchain_google_genai-4.3.6.tar.gz", hash = "sha256:d123cd8007ae63fc989bd869ef3853312b912007e63c2815b9aa2f089cfa6a05", size = 301130, upload-time = "2026-08-26T23:53:56.92Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/85/3c/9a6b43bced0238f95640555e14423fe4a8268e3f4f536f67e26e79e633d4/langchain_google_genai-4.2.6-py3-none-any.whl", hash = "sha256:c40db0c2d033a5fb6db8e2cc3fb6d49c5678b89b337a64da095fb73ec9f72021", size = 70457, upload-time = "2026-06-26T06:18:57.781Z" },
+    { url = "https://files.pythonhosted.org/packages/d3/d5/dd74fb715bea978e14c8ba706e228a3637951477525b182553a37a138b1a/langchain_google_genai-4.3.6-py3-none-any.whl", hash = "sha256:00b75df114a519e434b304daabcd98ea885af87a78a4b059b3063490f65feb44", size = 78524, upload-time = "2026-08-26T23:53:55.893Z" },
 ]
 
 [[package]]
@@ -1928,7 +1929,7 @@ wheels = [
 
 [[package]]
 name = "langsmith"
-version = "0.9.3"
+version = "0.11.2"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "anyio" },
@@ -1946,9 +1947,9 @@ dependencies = [
     { name = "xxhash" },
     { name = "zstandard" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/7e/b7/43f80940a758ceb48714ccc10c7acb9564be4f0d4786e8ed5d46deb0be39/langsmith-0.9.3.tar.gz", hash = "sha256:868a007b3ecda002914b21212a953c77fcb1d71a8a09a94562c3b57941d3df3a", size = 4577380, upload-time = "2026-06-26T15:56:30.45Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/c9/0a/1acb2a3ffbccbe8f8dc358778967c9d2979e8a59b67ceba6eb54474324ab/langsmith-0.11.2.tar.gz", hash = "sha256:927694c939c9fb44187e0126cf718413c45ffce2324d480438e70eb0526e1380", size = 4841592, upload-time = "2026-08-27T22:31:34.004Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/9e/fb/dc9f70b5581371fba7b01ba0704fe859bfcd12c4dad82b42ec12bd4160b1/langsmith-0.9.3-py3-none-any.whl", hash = "sha256:aac85686868a7e61d77858b880230e510583c61ea48ac0a197e6ceff64ffb22b", size = 619927, upload-time = "2026-06-26T15:56:28.301Z" },
+    { url = "https://files.pythonhosted.org/packages/00/d9/cec0c1d24dda8c67a23ad204d0167e50aee202460e9388488661d94513f5/langsmith-0.11.2-py3-none-any.whl", hash = "sha256:75258142d27dffcc5df331479704b23fc3fd812cfca0469119bb9055a842882f", size = 753928, upload-time = "2026-08-27T22:31:31.644Z" },
 ]
 
 [[package]]
@@ -2474,7 +2475,7 @@ wheels = [
 
 [[package]]
 name = "octop"
-version = "0.9.28"
+version = "0.9.30"
 source = { editable = "." }
 dependencies = [
     { name = "acme" },
@@ -2570,7 +2571,7 @@ requires-dist = [
     { 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 = ">=0.9.27" },
+    { name = "orcakit-harness-agent", extras = ["all"], specifier = ">=1.0.1" },
     { name = "pillow", specifier = ">=10.0" },
     { name = "playwright", specifier = ">=1.40" },
     { name = "playwright", marker = "extra == 'browser'", specifier = ">=1.40" },
@@ -2744,7 +2745,7 @@ wheels = [
 
 [[package]]
 name = "orcakit-harness-agent"
-version = "0.9.27"
+version = "1.0.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "deepagents" },
@@ -2762,9 +2763,9 @@ dependencies = [
     { name = "mcp" },
     { name = "pyyaml" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/d2/b1/bd9e23e840bf48d8cea12e0d24bae2caaecaf8e2364893466846f5f427e4/orcakit_harness_agent-0.9.27.tar.gz", hash = "sha256:40c7816f4a47ed610131c1442cc391198ca5519fcd650752803f14a85a075e54", size = 1182826, upload-time = "2026-08-26T10:50:24.475Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/b7/0a/cd60b1ec78030fae248cf85f6e3f7d577edb10d7e60816eb254312f59257/orcakit_harness_agent-1.0.1.tar.gz", hash = "sha256:8fa20de7b94e8f359ec53f6153469bf2396cbb00380737e327356aab87ae1404", size = 1197195, upload-time = "2026-08-30T12:05:04.682Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/c8/16/446c4fc6c5a6f0c9f84b8c742ec325cb48b4c1e59572811cef17157811e4/orcakit_harness_agent-0.9.27-py3-none-any.whl", hash = "sha256:328898750cff1d98db3ac36ce5e8a776b47f8288955b8e2a79bdfabd52a90659", size = 1407139, upload-time = "2026-08-26T10:50:20.842Z" },
+    { url = "https://files.pythonhosted.org/packages/65/c2/b8ff3af0af69efcf25ab46e05f9240e64829069d7f2edec16bf4bcc84b09/orcakit_harness_agent-1.0.1-py3-none-any.whl", hash = "sha256:1a0b09d2c2a4c48d390ee4c0ff376674ddef5340eda728a1b8a13bfdea912d97", size = 1424622, upload-time = "2026-08-30T12:05:00.855Z" },
 ]
 
 [package.optional-dependencies]
@@ -4699,14 +4700,14 @@ wheels = [
 
 [[package]]
 name = "wcmatch"
-version = "10.2"
+version = "11.0.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "bracex" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/45/98/eb989c3113908e2ef46d940a53695a1ebb4be5a732c4a4f700be8f8d682b/wcmatch-10.2.tar.gz", hash = "sha256:92204839e3e9c945e1e71d7e1e4edeab2601ed50a5c51ff4f3f97ca711eeb738", size = 132499, upload-time = "2026-06-30T00:50:07.198Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/57/43/30e407989e313677dbb9d5f045f966549a7254834571e342eaa4b55cc67b/wcmatch-11.0.1.tar.gz", hash = "sha256:1ea2b4fa678b8ca268253798d5963935df39132d47c3e241c0a0732224005e7d", size = 144662, upload-time = "2026-08-14T15:20:40.477Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/d4/73/aef4aaf16b8d785762e2b14cf321a9178cc84a1bf4c40f58320f499a2d65/wcmatch-10.2-py3-none-any.whl", hash = "sha256:f1a79e80ccbe296907b7eaf57d8d3bc49eab0b428d35f7d09986b5079b6e4a5d", size = 39742, upload-time = "2026-06-30T00:50:05.927Z" },
+    { url = "https://files.pythonhosted.org/packages/ce/77/7a02b0f05b3ffcdbef9719ce3ee0b508d6a29b58e95299f1580055671db3/wcmatch-11.0.1-py3-none-any.whl", hash = "sha256:fd149ecddb9f0a88ea780017d6dde17c994e494e7f7303d4e3c9d6251f978f4b", size = 43449, upload-time = "2026-08-14T15:20:39.379Z" },
 ]
 
 [[package]]