From 296c01c7c0edc487b81e0603b73c1eedeab5d961 Mon Sep 17 00:00:00 2001 From: Jubaoliang Date: Thu, 5 Nov 2026 16:51:55 +0800 Subject: [PATCH 1/9] fix: persist team sample avatars when editing a team (#2844) PATCH /teams ignored icon_url, so choosing a sample portrait never updated the team card. --- .../pages/Experts/components/TeamDrawer.tsx | 90 +++++++++++++------ dashboard/src/pages/Experts/index.tsx | 9 ++ docs/expert-teams.md | 4 +- src/octop/api/routers/teams.py | 3 + tests/integration/test_teams_api.py | 59 ++++++++++++ tests/unit/agents/test_team_service.py | 1 + 6 files changed, 135 insertions(+), 31 deletions(-) create mode 100644 tests/integration/test_teams_api.py diff --git a/dashboard/src/pages/Experts/components/TeamDrawer.tsx b/dashboard/src/pages/Experts/components/TeamDrawer.tsx index cc136df5a5..2f9d70d1ce 100644 --- a/dashboard/src/pages/Experts/components/TeamDrawer.tsx +++ b/dashboard/src/pages/Experts/components/TeamDrawer.tsx @@ -1,4 +1,4 @@ -import { useEffect, useMemo, useState } from "react"; +import { useEffect, useMemo, useRef, useState } from "react"; import { useTranslation } from "react-i18next"; import { Alert, Collapse, Drawer, Form, Input, Select, Spin } from "antd"; import { message } from "@/utils/antdMessage"; @@ -44,6 +44,8 @@ interface TeamDrawerProps { experts: OctopAgent[]; onClose: () => void; onSaved: (team: TeamRecord) => void; + /** Edit mode: sample icon / upload already persisted; refresh the team card. */ + onIconUrlChange?: (agentId: string, iconUrl: string) => void; } interface TeamFormValues { @@ -61,6 +63,7 @@ export default function TeamDrawer({ experts, onClose, onSaved, + onIconUrlChange, }: TeamDrawerProps) { const { t } = useTranslation(); const [form] = Form.useForm(); @@ -72,6 +75,7 @@ export default function TeamDrawer({ const [iconUrl, setIconUrl] = useState(TEAM_AVATAR_URL); const [avatarFile, setAvatarFile] = useState(null); const [avatarBusy, setAvatarBusy] = useState(false); + const iconTouchedRef = useRef(false); const pickerExperts = useMemo( () => mergeTeamPickerExperts(experts, rosterExtras), [experts, rosterExtras], @@ -79,9 +83,11 @@ export default function TeamDrawer({ useEffect(() => { if (!open) { + iconTouchedRef.current = false; setRosterExtras([]); return; } + iconTouchedRef.current = false; if (mode === "edit" && team) { form.setFieldsValue({ name: team.name, @@ -104,7 +110,9 @@ export default function TeamDrawer({ welcome_message: record.welcome_message ?? "", member_ids: record.members.map((member) => member.agent_id), }); - setIconUrl(record.icon_url?.trim() || TEAM_AVATAR_URL); + if (!iconTouchedRef.current) { + setIconUrl(record.icon_url?.trim() || TEAM_AVATAR_URL); + } setRosterExtras( record.members.map((member) => ({ agent_id: member.agent_id, @@ -266,6 +274,7 @@ export default function TeamDrawer({ onPick={(file) => { if (mode === "edit" && team) { void (async () => { + iconTouchedRef.current = true; setAvatarBusy(true); try { const result = await octopAgentsApi.uploadAvatar( @@ -274,6 +283,7 @@ export default function TeamDrawer({ ); setIconUrl(result.icon_url); setAvatarFile(null); + onIconUrlChange?.(team.agent_id, result.icon_url); } catch (err) { message.error( apiErrorMessage(err, t("experts.avatarUploadFailed"), t), @@ -285,52 +295,74 @@ export default function TeamDrawer({ })(); return; } + iconTouchedRef.current = true; setAvatarFile(file); setIconUrl(URL.createObjectURL(file)); }} onSelectPreset={(id) => { void (async () => { const nextUrl = id ? expertPresetSrc(id) : TEAM_AVATAR_URL; + const previousUrl = iconUrl; + iconTouchedRef.current = true; setAvatarFile(null); - if (mode === "edit" && team && isUploadedAvatarUrl(iconUrl)) { - setAvatarBusy(true); - try { - await octopAgentsApi.deleteAvatar(team.agent_id); - } catch { - // Preset path still wins on save / local state. - } finally { - setAvatarBusy(false); + setIconUrl(nextUrl); + if (!(mode === "edit" && team)) return; + setAvatarBusy(true); + try { + if (isUploadedAvatarUrl(previousUrl)) { + try { + await octopAgentsApi.deleteAvatar(team.agent_id); + } catch { + // Preset path still wins when the portrait is saved. + } } + const saved = await teamsApi.update(team.agent_id, { + icon_url: nextUrl, + }); + const applied = saved.icon_url?.trim() || nextUrl; + setIconUrl(applied); + onIconUrlChange?.(team.agent_id, applied); + } catch (err) { + setIconUrl(previousUrl); + message.error( + apiErrorMessage(err, t("experts.avatarUploadFailed"), t), + ); + } finally { + setAvatarBusy(false); } - setIconUrl(nextUrl); })(); }} onRemove={ imageUrl || avatarFile ? () => { void (async () => { + const previousUrl = iconUrl; + iconTouchedRef.current = true; setAvatarFile(null); - if ( - mode === "edit" && - team && - isUploadedAvatarUrl(iconUrl) - ) { - setAvatarBusy(true); - try { + setIconUrl(TEAM_AVATAR_URL); + if (!(mode === "edit" && team)) return; + setAvatarBusy(true); + try { + if (isUploadedAvatarUrl(previousUrl)) { await octopAgentsApi.deleteAvatar(team.agent_id); - } catch (err) { - message.error( - apiErrorMessage( - err, - t("experts.avatarRemoveFailed"), - t, - ), - ); - } finally { - setAvatarBusy(false); + } else { + await teamsApi.update(team.agent_id, { + icon_url: TEAM_AVATAR_URL, + }); } + onIconUrlChange?.(team.agent_id, TEAM_AVATAR_URL); + } catch (err) { + setIconUrl(previousUrl); + message.error( + apiErrorMessage( + err, + t("experts.avatarRemoveFailed"), + t, + ), + ); + } finally { + setAvatarBusy(false); } - setIconUrl(TEAM_AVATAR_URL); })(); } : undefined diff --git a/dashboard/src/pages/Experts/index.tsx b/dashboard/src/pages/Experts/index.tsx index 6651441239..9b0a89a0db 100644 --- a/dashboard/src/pages/Experts/index.tsx +++ b/dashboard/src/pages/Experts/index.tsx @@ -817,6 +817,14 @@ export default function ExpertsPage() { team={teamDrawer?.mode === "edit" ? teamDrawer.team : null} experts={localTeamMembers} onClose={() => setTeamDrawer(null)} + onIconUrlChange={(agentId, iconUrl) => { + setLocalAgents((prev) => + prev.map((item) => + item.agent_id === agentId ? { ...item, icon_url: iconUrl } : item, + ), + ); + void refreshAgents({ silent: true }); + }} onSaved={(saved: TeamRecord) => { setTeamDrawer(null); setActiveTab("teams"); @@ -830,6 +838,7 @@ export default function ExpertsPage() { default_model: saved.default_model ?? null, color: saved.color ?? item.color, icon_name: saved.icon_name ?? item.icon_name, + icon_url: saved.icon_url ?? item.icon_url, welcome_message: saved.welcome_message ?? item.welcome_message, member_ids: saved.member_ids, diff --git a/docs/expert-teams.md b/docs/expert-teams.md index 94d7667bc4..1256234cbf 100644 --- a/docs/expert-teams.md +++ b/docs/expert-teams.md @@ -132,7 +132,7 @@ conversation_id = 主持人 thread_id | GET | `/api/teams` | 当前用户的团队(含成员摘要) | | POST | `/api/teams` | 创建主持人 + 至少 2 名成员 | | GET | `/api/teams/{team_id}` | 详情 | -| PATCH | `/api/teams/{team_id}` | 改名称/模型/欢迎语/成员(在途则拒改该成员) | +| PATCH | `/api/teams/{team_id}` | 改名称/模型/欢迎语/头像 `icon_url`/成员(在途则拒改该成员) | | DELETE | `/api/teams/{team_id}` | 删除团队主持人 | `GET /api/agents` 增加 `kind`;团队行带 `member_ids`。`kind=team` 不可 `is_shared`。 @@ -144,7 +144,7 @@ conversation_id = 主持人 thread_id 专家页 tab:`我的专家 | 我的团队 | 专家市场`。专家市场包含门户目录,以及本实例用户发布的模板。 - 我的专家:过滤 `kind !== team` -- 我的团队:卡片/空态指引;创建/编辑只要名称、模型、颜色、欢迎语、成员;通道走现有通道配置(绑在主持人) +- 我的团队:卡片/空态指引;创建/编辑只要名称、模型、头像、颜色、欢迎语、成员;通道走现有通道配置(绑在主持人) - 侧栏:团队带团队徽章 - 团队聊天右侧:成员条(不含主持人) - 气泡:`speaker_agent_id` 对应专家头像/名称;主持人用自己的头像 diff --git a/src/octop/api/routers/teams.py b/src/octop/api/routers/teams.py index b080486630..74fd5c6317 100644 --- a/src/octop/api/routers/teams.py +++ b/src/octop/api/routers/teams.py @@ -40,6 +40,7 @@ class TeamPatchBody(BaseModel): default_model: str | None = None color: str | None = None icon_name: str | None = None + icon_url: str | None = None welcome_message: str | None = None member_ids: list[str] | None = None @@ -151,6 +152,8 @@ async def patch_team( updates["color"] = body.color if body.icon_name is not None: updates["icon_name"] = body.icon_name + if "icon_url" in body.model_fields_set: + updates["icon_url"] = team_icon_url(body.icon_url) if body.welcome_message is not None: updates["welcome_message"] = body.welcome_message if updates: diff --git a/tests/integration/test_teams_api.py b/tests/integration/test_teams_api.py new file mode 100644 index 0000000000..4e80e6e70f --- /dev/null +++ b/tests/integration/test_teams_api.py @@ -0,0 +1,59 @@ +"""Team HTTP API.""" + +from __future__ import annotations + +import pytest + +_LEAD = "/experts/avatars/team-lead.svg" +_CIRCLE = "/experts/avatars/team-circle.svg" + + +@pytest.fixture +async def env(env_with_provider): + yield env_with_provider + + +async def _expert(c, auth, name: str) -> str: + created = await c.post("/api/agents", headers=auth, json={"name": name}) + assert created.status_code == 201, created.text + return created.json()["agent_id"] + + +async def test_patch_team_icon_url_persists_sample_portrait(env): + c, _, auth = env + alpha = await _expert(c, auth, "alpha") + beta = await _expert(c, auth, "beta") + created = await c.post( + "/api/teams", + headers=auth, + json={ + "name": "squad", + "member_ids": [alpha, beta], + "icon_url": _LEAD, + }, + ) + assert created.status_code == 200, created.text + team_id = created.json()["agent_id"] + assert created.json()["icon_url"] == _LEAD + + renamed = await c.patch( + f"/api/teams/{team_id}", + headers=auth, + json={"name": "squad renamed"}, + ) + assert renamed.status_code == 200, renamed.text + assert renamed.json()["name"] == "squad renamed" + assert renamed.json()["icon_url"] == _LEAD + + patched = await c.patch( + f"/api/teams/{team_id}", + headers=auth, + json={"icon_url": _CIRCLE}, + ) + assert patched.status_code == 200, patched.text + assert patched.json()["icon_url"] == _CIRCLE + + listed = await c.get("/api/agents", headers=auth) + assert listed.status_code == 200, listed.text + row = next(item for item in listed.json() if item["agent_id"] == team_id) + assert row["icon_url"] == _CIRCLE diff --git a/tests/unit/agents/test_team_service.py b/tests/unit/agents/test_team_service.py index 58f2b984b2..9618ca1060 100644 --- a/tests/unit/agents/test_team_service.py +++ b/tests/unit/agents/test_team_service.py @@ -167,6 +167,7 @@ def test_team_icon_url_falls_back_to_cartoon() -> None: assert team_icon_url(None) == TEAM_AVATAR_URL assert team_icon_url(" ") == TEAM_AVATAR_URL assert team_icon_url("/experts/avatars/multi-agent-orchestrator.svg") == TEAM_AVATAR_URL + assert team_icon_url("/experts/avatars/team-lead.svg") == "/experts/avatars/team-lead.svg" assert team_icon_url("/custom.png") == "/custom.png" From dd1b8efbbe0a6f9ca66ad21a648819893ccc72e6 Mon Sep 17 00:00:00 2001 From: Jubaoliang Date: Thu, 5 Nov 2026 17:26:40 +0800 Subject: [PATCH 2/9] fix: let Docker publish finish when the compiler is already removed (#2842) * fix: let Docker publish finish when the compiler is already removed Lite builds purged build-essential after the apt lists were gone, and the boot test loaded the integration conftest without httpx. A manual rerun checks out the selected ref so the Dockerfile fix is what gets tagged. Co-authored-by: Cursor * fix: publish the lite image on the default Docker tag : and :latest were the full image, so a plain pull included desktop, OCR, and local embedding. Those extras now require :-full and :full. Co-authored-by: Cursor --------- Co-authored-by: jubaoliang Co-authored-by: Cursor --- .github/workflows/docker-publish.yml | 23 ++++---- .github/workflows/fnos-build-fpk.yml | 54 +++++++++---------- CHANGELOG.md | 3 ++ docker/Dockerfile | 5 +- docker/README.md | 2 +- docker/README_CN.md | 2 +- fnos/README.md | 6 +-- scripts/build-fpk.sh | 6 +-- scripts/release_download_links.py | 25 +++++---- tests/unit/test_docker_image_arch.py | 2 + .../test_docker_knowledge_dependencies.py | 15 ++++++ tests/unit/test_fnos_docker_persist.py | 9 ++-- tests/unit/test_release_download_links.py | 9 ++-- 13 files changed, 97 insertions(+), 64 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index f2637eb152..2c4a6b3e5c 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -6,15 +6,16 @@ name: Docker Publish # # 架构:ubuntu-latest 打 linux/amd64,ubuntu-24.04-arm 打 linux/arm64。 # 每个架构先在本机启动镜像并跑 live 启动测试,通过后才推送该架构 tag, -# 再合并为 :{version} / :latest 多架构清单。精简版同样打 :{version}-lite / :lite, -# 不含桌面、本地向量和 OCR。飞牛 Docker 版 FPK 各用一个标签, +# 再合并为 :{version} / :latest(精简版,不含桌面、本地向量和 OCR)。 +# 完整版打 :{version}-full / :full。飞牛 Docker 版 FPK 各用一个标签, # NAS 按本机架构拉取对应镜像层。某一架构启动失败(例如 ARM 上 Illegal # instruction / 退出码 132)只丢掉该架构,不挡住另一架构和后续 FPK。 # # 触发路径: # 1. 人工推送 v* tag → on.push.tags # 2. Auto Tag 用 GITHUB_TOKEN 推 tag 后显式 workflow_dispatch(token push 不会触发 push 工作流) -# 3. 在任意分支 Run workflow,填 tag=vX.Y.Z(用该分支的 workflow 文件,checkout 指定 tag) +# 3. 在修复分支 Run workflow,填 tag=vX.Y.Z。workflow_dispatch 检出所选 ref, +# 补构建能带上 Dockerfile 修复;tag 只决定镜像版本。tag push 仍检出该 tag。 # # 注意:workflow_dispatch 下 metadata-action 的 type=semver 不可靠, # 必须从 tag / 输入显式解析版本号。 @@ -26,7 +27,7 @@ name: Docker Publish # 拉取示例: # docker pull ghcr.io/tencentcloud/octop:latest # docker pull ghcr.io/tencentcloud/octop:0.9.28 -# docker pull ghcr.io/tencentcloud/octop:0.9.28-lite +# docker pull ghcr.io/tencentcloud/octop:0.9.28-full on: push: tags: @@ -112,7 +113,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 with: - ref: ${{ needs.prepare.outputs.tag }} + ref: ${{ github.event_name == 'workflow_dispatch' && github.sha || needs.prepare.outputs.tag }} fetch-depth: 0 - name: Set up Docker Buildx @@ -139,9 +140,9 @@ jobs: images: | ${{ env.DOCKERHUB_USER != '' && format('{0}/octop', env.DOCKERHUB_USER) || '' }} ${{ needs.prepare.outputs.ghcr }} - # 单架构中间 tag。full → :{version}-{arch};lite → :{version}-lite-{arch}。 + # 单架构中间 tag。lite → :{version}-{arch};full → :{version}-full-{arch}。 tags: | - type=raw,value=${{ needs.prepare.outputs.version }}${{ matrix.variant == 'lite' && '-lite' || '' }}-${{ matrix.arch }} + type=raw,value=${{ needs.prepare.outputs.version }}${{ matrix.variant == 'full' && '-full' || '' }}-${{ matrix.arch }} # load 与 registry 导出不能同时开。先载入本机做启动测试,通过后再 docker push。 # docker 导出不支持 provenance,这里关掉,避免 --load 失败。 @@ -181,9 +182,10 @@ jobs: set -euo pipefail uv venv /tmp/octop-docker-test uv pip install --python /tmp/octop-docker-test/bin/python pytest pytest-asyncio + # 启动测试只调 docker。--noconftest 避免加载 integration conftest(需要 httpx / octop)。 /tmp/octop-docker-test/bin/pytest \ tests/integration/test_docker_image_boot.py::test_docker_image_runs_on_this_cpu_and_stays_disabled \ - -q --tb=short + -q --tb=short --noconftest - name: Push image env: @@ -254,7 +256,7 @@ jobs: fi if [ "${#sources[@]}" -lt 2 ]; then echo "::warning:::${tag_a} is not multi-arch. A package on the missing CPU will not run." - # 精简版对外是一份 x86/ARM 通用标签。缺任一架构就不要发,避免装上后拉取失败。 + # 完整版对外是一份 x86/ARM 通用标签。缺任一架构就不要发,避免装上后拉取失败。 if [ "$required" != "yes" ]; then echo "::warning::skip ${reg}:${tag_a} until both amd64 and arm64 exist" continue @@ -268,5 +270,6 @@ jobs: docker buildx imagetools inspect "${reg}:${tag_a}" done } + # 默认标签是精简版。完整版必须显式带 -full,且两个架构都在才发布。 publish_variant "" "$VER" latest yes - publish_variant "-lite" "${VER}-lite" lite no + publish_variant "-full" "${VER}-full" full no diff --git a/.github/workflows/fnos-build-fpk.yml b/.github/workflows/fnos-build-fpk.yml index 5e0dc241fc..91c55cae7b 100644 --- a/.github/workflows/fnos-build-fpk.yml +++ b/.github/workflows/fnos-build-fpk.yml @@ -78,7 +78,7 @@ jobs: needs: version runs-on: ubuntu-latest outputs: - lite: ${{ steps.wait.outputs.lite }} + full: ${{ steps.wait.outputs.full }} steps: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -97,40 +97,40 @@ jobs: VER: ${{ needs.version.outputs.version }} run: | set -euo pipefail - full="${IMAGE}:${VER}" - lite="${IMAGE}:${VER}-lite" - echo "Waiting for ${full}. ${lite} is optional and must already be multi-arch." - # 完整版清单要等两个架构 merge。精简版在完整版出现后再等几轮;缺了就只打完整包。 - lite_wait=0 + lite="${IMAGE}:${VER}" + full="${IMAGE}:${VER}-full" + echo "Waiting for ${lite}. ${full} is optional and must already be multi-arch." + # 默认标签是精简版。完整版在精简版出现后再等几轮;缺了就只打精简包。 + full_wait=0 for i in $(seq 1 120); do - full_ok=0 lite_ok=0 - if docker buildx imagetools inspect "$full" >/dev/null 2>&1; then - full_ok=1 - fi + full_ok=0 if docker buildx imagetools inspect "$lite" >/dev/null 2>&1; then lite_ok=1 fi - if [ "$full_ok" -eq 1 ] && [ "$lite_ok" -eq 1 ]; then - echo "lite=true" >> "$GITHUB_OUTPUT" - echo "Images ready: ${full} and ${lite}" - docker buildx imagetools inspect "$full" | head -20 + if docker buildx imagetools inspect "$full" >/dev/null 2>&1; then + full_ok=1 + fi + if [ "$lite_ok" -eq 1 ] && [ "$full_ok" -eq 1 ]; then + echo "full=true" >> "$GITHUB_OUTPUT" + echo "Images ready: ${lite} and ${full}" docker buildx imagetools inspect "$lite" | head -20 + docker buildx imagetools inspect "$full" | head -20 exit 0 fi - if [ "$full_ok" -eq 1 ]; then - lite_wait=$((lite_wait + 1)) - if [ "$lite_wait" -ge 6 ]; then - echo "lite=false" >> "$GITHUB_OUTPUT" - echo "::warning::${lite} was not published. The full FnOS package will still be built." - docker buildx imagetools inspect "$full" | head -20 + if [ "$lite_ok" -eq 1 ]; then + full_wait=$((full_wait + 1)) + if [ "$full_wait" -ge 6 ]; then + echo "full=false" >> "$GITHUB_OUTPUT" + echo "::warning::${full} was not published. The lite FnOS package will still be built." + docker buildx imagetools inspect "$lite" | head -20 exit 0 fi fi - echo "[$i/120] full=${full_ok} lite=${lite_ok}" + echo "[$i/120] lite=${lite_ok} full=${full_ok}" sleep 20 done - echo "::error::Timed out waiting for ${full}. Ensure Docker Publish finished for v${VER}." + echo "::error::Timed out waiting for ${lite}. Ensure Docker Publish finished for v${VER}." exit 1 fpk: @@ -151,13 +151,13 @@ jobs: - name: Build Docker FPKs env: FPK_NAME_PREFIX: Octop-fnos - LITE: ${{ needs.ensure-image.outputs.lite }} + FULL: ${{ needs.ensure-image.outputs.full }} run: | - bash scripts/build-fpk.sh docker - if [ "$LITE" = "true" ]; then - bash scripts/build-fpk.sh docker-lite + bash scripts/build-fpk.sh docker-lite + if [ "$FULL" = "true" ]; then + bash scripts/build-fpk.sh docker else - echo "::warning::Skipping the lite FnOS package because its image tag was not published." + echo "::warning::Skipping the full FnOS package because its image tag was not published." fi - name: Upload docker fpk artifact diff --git a/CHANGELOG.md b/CHANGELOG.md index 39332b7edd..10f567eb91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ ## [Unreleased] +### 变更 +- 默认 Docker 标签 `:` 和 `:latest` 改为精简版。完整版使用 `:-full` 和 `:full` + ## [1.0.3b3] - 2026-11-04 ### 新增 diff --git a/docker/Dockerfile b/docker/Dockerfile index c9d76fcac7..ec5ab44a4d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -169,7 +169,10 @@ RUN --mount=type=cache,target=/root/.cache/uv \ && .venv/bin/python -c "import cv2, fastembed, huggingface_hub, mss, rapidocr, onnxruntime, pymupdf; import importlib.util; assert importlib.util.find_spec('pynput')" \ && apt-get update && apt-get install -y --no-install-recommends fonts-noto-cjk; \ fi \ - && apt-get purge -y --auto-remove build-essential \ + && if dpkg -s build-essential >/dev/null 2>&1; then \ + # 依赖层已卸掉编译器。lite 没有 apt 列表,未安装就跳过。 + apt-get purge -y --auto-remove build-essential; \ + fi \ && rm -rf /var/lib/apt/lists/* /tmp/* # full 只装桌面包,不启动 Xvnc。lite 写明未捆绑桌面和浏览器。 diff --git a/docker/README.md b/docker/README.md index f8433834a4..a75dc9f11e 100644 --- a/docker/README.md +++ b/docker/README.md @@ -44,7 +44,7 @@ docker run -d \ octop:latest ``` -Published tags: `ghcr.io/tencentcloud/octop:` and `:latest` are the full image (desktop, OCR, local embedding). `:-lite` and `:lite` omit those extras. Build locally with `--build-arg OCTOP_IMAGE_VARIANT=lite`. +Published tags: `ghcr.io/tencentcloud/octop:` and `:latest` are the lite image. `:-full` and `:full` add desktop, OCR, and local embedding. A local build is full unless you pass `--build-arg OCTOP_IMAGE_VARIANT=lite`. ### Faster downloads (China mirrors) diff --git a/docker/README_CN.md b/docker/README_CN.md index ebaa4ca42d..626dc0deb8 100644 --- a/docker/README_CN.md +++ b/docker/README_CN.md @@ -44,7 +44,7 @@ docker run -d \ octop:latest ``` -已发布标签:`ghcr.io/tencentcloud/octop:` 和 `:latest` 是完整镜像(桌面、OCR、本地向量)。`:-lite` 和 `:lite` 不含这些重依赖。本地构建精简版:`--build-arg OCTOP_IMAGE_VARIANT=lite`。 +已发布标签:`ghcr.io/tencentcloud/octop:` 和 `:latest` 是精简版。`:-full` 和 `:full` 才带桌面、OCR 和本地向量。本地构建默认是完整版,精简版要加 `--build-arg OCTOP_IMAGE_VARIANT=lite`。 ### 国内镜像加速 diff --git a/fnos/README.md b/fnos/README.md index 7a4b66b4ce..25f1bbd57d 100644 --- a/fnos/README.md +++ b/fnos/README.md @@ -33,8 +33,8 @@ octop backup --help # 备份/恢复 | 版本 | 包名 | 体积 | 运行方式 | 依赖 | |------|------|------|----------|------| -| **Docker 精简版** | `Octop-fnos-docker-lite-.fpk` | ~340 KB | 飞牛拉取 `ghcr.io/tencentcloud/octop:<本包版本>-lite` | 宿主需有 Docker。不含虚拟桌面、本地向量和 OCR | -| **Docker 完整版** | `Octop-fnos-docker-.fpk` | ~340 KB | 飞牛拉取 `ghcr.io/tencentcloud/octop:<本包版本>`(`amd64` / `arm64` 多架构),重启不再重拉 | 宿主需有 Docker,且能访问 `ghcr.io`。含桌面、OCR 和本地向量 | +| **Docker 精简版** | `Octop-fnos-docker-lite-.fpk` | ~340 KB | 飞牛拉取 `ghcr.io/tencentcloud/octop:<本包版本>`(默认标签,`amd64` / `arm64`) | 宿主需有 Docker。不含虚拟桌面、本地向量和 OCR | +| **Docker 完整版** | `Octop-fnos-docker-.fpk` | ~340 KB | 飞牛拉取 `ghcr.io/tencentcloud/octop:<本包版本>-full`,重启不再重拉 | 宿主需有 Docker,且能访问 `ghcr.io`。含桌面、OCR 和本地向量 | | **本地版 x86_64** | `Octop-fnos-native-amd64-.fpk` | ~200 MB | 复用飞牛「Python 3.12」+ 包内核心依赖与前端 | 无需 Docker | | **本地版 ARM64** | `Octop-fnos-native-arm64-.fpk` | ~200 MB | 同上,site-packages 为 aarch64;勿装到 x86 | 无需 Docker;ARM 飞牛无 Docker 时再用 | @@ -109,7 +109,7 @@ Octop 发版号是 PEP 440,beta 写成 `X.Y.ZbN`。`scripts/fnos/store_version ## 工作机制 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 推送到 GHCR / Docker Hub 的 amd64+arm64 清单)。精简版 `:{version}-lite` 只有 amd64 和 arm64 都推送成功才会出现;缺了它仍会打完整版飞牛包,并在 Release 下载区去掉对应链接。Docker 版 `.fpk` 仅打包 compose,运行时拉取该镜像。 +2. **镜像复用**:不再重新 build 镜像。`ensure-image` 等待默认精简版 `ghcr.io/tencentcloud/octop:{version}`(docker-publish 推送到 GHCR / Docker Hub 的 amd64+arm64 清单)。完整版 `:{version}-full` 只有 amd64 和 arm64 都推送成功才会出现;缺了它仍会打精简版飞牛包,并在 Release 下载区去掉对应链接。Docker 版 `.fpk` 仅打包 compose,运行时拉取该镜像。 3. **Wheel 复用**:Native 版优先从同版本 GitHub Release(`v*`)下载 `octop-*.whl`;若缺失再回退源码构建前端 + wheel。 4. **安装包发布**:`fpk` / `native` / `native-arm64` job 用 `scripts/build-fpk.sh` 打包。官方 fnpack 只有 linux-amd64,ARM 本地版先在 `ubuntu-24.04-arm` 上装好 aarch64 `site-packages`,再回到 amd64 runner 打包。`.fpk` 挂到同一个 `v*` GitHub Release(与 wheel、桌面包并列),再上传到 COS `octop/release//`。 diff --git a/scripts/build-fpk.sh b/scripts/build-fpk.sh index 693b550a9e..a852a956b0 100644 --- a/scripts/build-fpk.sh +++ b/scripts/build-fpk.sh @@ -173,14 +173,14 @@ build_one() { echo "[build-fpk] native cmd/fpk-arch=$packed_arch" fi - # Docker 版 compose 钉镜像标签。完整版 :,精简版 :-lite。 + # Docker 版 compose 钉镜像标签。精简版是默认 :,完整版 :-full。 # 测试包可用 FPK_IMAGE_TAG 覆盖。 if [ "$KIND" = "docker" ] || [ "$KIND" = "docker-lite" ]; then local compose="$BUILD/app/docker/docker-compose.yaml" image_tag if [ "$KIND" = "docker-lite" ]; then - image_tag="${FPK_IMAGE_TAG:-${VER}-lite}" - else image_tag="${FPK_IMAGE_TAG:-$VER}" + else + image_tag="${FPK_IMAGE_TAG:-${VER}-full}" fi if [ -f "$compose" ]; then sed -i.bak -E "s#ghcr.io/tencentcloud/octop:[^[:space:]]+#ghcr.io/tencentcloud/octop:${image_tag}#" "$compose" diff --git a/scripts/release_download_links.py b/scripts/release_download_links.py index 7a226c3d1c..5345e9667d 100644 --- a/scripts/release_download_links.py +++ b/scripts/release_download_links.py @@ -57,14 +57,14 @@ def fnos_assets(version: str) -> tuple[tuple[str, str], ...]: ) -def docker_image_section(version: str, *, lite: bool) -> str: - lines = [ - "### Docker image", - "", - f"- Full: `ghcr.io/tencentcloud/octop:{version}` (`:latest`)", - ] +def docker_image_section(version: str, *, lite: bool, full: bool) -> str: + lines = ["### Docker image", ""] if lite: - lines.append(f"- Lite: `ghcr.io/tencentcloud/octop:{version}-lite` (`:lite`)") + lines.append(f"- Lite: `ghcr.io/tencentcloud/octop:{version}` (`:latest`)") + if full: + lines.append(f"- Full: `ghcr.io/tencentcloud/octop:{version}-full` (`:full`)") + if len(lines) == 2: + return "" return "\n".join(lines) @@ -124,7 +124,7 @@ def render_download_section(raw_version: str) -> str: "#### Portable", f"- {linux64_zip} | {linux_arm_zip}", "", - docker_image_section(version, lite=True), + docker_image_section(version, lite=True, full=True), "", fnos_section(version, None), "", @@ -156,14 +156,17 @@ def _replace_section(body: str, heading: str, replacement: str) -> str: def patch_release_body(body: str, raw_version: str, present: Iterable[str]) -> str: """Keep desktop links, and keep only the FnOS packages that were uploaded. - The lite image line follows the lite FnOS package: that tag is published - only when both CPU architectures exist, which is also when the package is built. + The default tag is the lite image. The full tag is published only when + both CPU architectures exist, which is also when the full package is built. """ _tag, version = split_tag(raw_version) names = {Path(name).name for name in present} lite_name = f"Octop-fnos-docker-lite-{version}.fpk" + full_name = f"Octop-fnos-docker-{version}.fpk" updated = _replace_section( - body, "Docker image", docker_image_section(version, lite=lite_name in names) + body, + "Docker image", + docker_image_section(version, lite=lite_name in names, full=full_name in names), ) return _replace_section(updated, "fnOS NAS", fnos_section(version, names)) diff --git a/tests/unit/test_docker_image_arch.py b/tests/unit/test_docker_image_arch.py index a00f2bdcc1..9ac95bc118 100644 --- a/tests/unit/test_docker_image_arch.py +++ b/tests/unit/test_docker_image_arch.py @@ -65,5 +65,7 @@ def test_docker_publish_still_builds_arm64() -> None: boot = text.index("test_docker_image_runs_on_this_cpu_and_stays_disabled") push = text.index('docker push "$tag"') assert boot < push + assert "--noconftest" in text + assert "github.event_name == 'workflow_dispatch' && github.sha" in text assert "load: true" in text assert "fail-fast: false" in text diff --git a/tests/unit/test_docker_knowledge_dependencies.py b/tests/unit/test_docker_knowledge_dependencies.py index b4bbd551f9..888232e0c0 100644 --- a/tests/unit/test_docker_knowledge_dependencies.py +++ b/tests/unit/test_docker_knowledge_dependencies.py @@ -71,6 +71,21 @@ def test_variant_is_validated_and_compiler_is_purged_in_the_install_layer() -> N assert "apt-get purge" in install +def test_project_sync_purges_compiler_only_when_it_is_installed() -> None: + """The source layer must not purge a compiler the dependency layer already removed. + + Lite does not run apt-get update here. An unconditional purge then fails + with ``Unable to locate package build-essential``. + """ + repo = Path(__file__).resolve().parents[2] + text = (repo / "docker" / "Dockerfile").read_text(encoding="utf-8") + layers = [layer for layer in text.split("\nRUN ") if "uv sync " in layer] + assert len(layers) == 2 + project = layers[1] + assert "dpkg -s build-essential" in project + assert "apt-get purge -y --auto-remove build-essential" in project + + def test_images_bake_desktop_without_starting_or_downloading_laya() -> None: """Both images install the desktop stack and leave Xvnc stopped.""" repo = Path(__file__).resolve().parents[2] diff --git a/tests/unit/test_fnos_docker_persist.py b/tests/unit/test_fnos_docker_persist.py index f776bb0ba5..d9daeed948 100644 --- a/tests/unit/test_fnos_docker_persist.py +++ b/tests/unit/test_fnos_docker_persist.py @@ -44,15 +44,16 @@ def test_fnos_manifest_version_is_placeholder(manifest: Path) -> None: def test_build_fpk_lite_pins_the_lite_image_tag() -> None: text = (REPO / "scripts" / "build-fpk.sh").read_text(encoding="utf-8") assert 'OUTNAME="${PREFIX}-docker-lite-${VER}${ITER_SUFFIX}.fpk"' in text - assert 'image_tag="${FPK_IMAGE_TAG:-${VER}-lite}"' in text + assert 'image_tag="${FPK_IMAGE_TAG:-$VER}"' in text + assert 'image_tag="${FPK_IMAGE_TAG:-${VER}-full}"' in text -def test_publish_workflows_keep_full_when_lite_is_incomplete() -> None: +def test_publish_workflows_keep_lite_when_full_is_incomplete() -> None: docker = (REPO / ".github/workflows/docker-publish.yml").read_text(encoding="utf-8") fnos = (REPO / ".github/workflows/fnos-build-fpk.yml").read_text(encoding="utf-8") assert "until both amd64 and arm64 exist" in docker - assert 'echo "lite=false"' in fnos - assert "Skipping the lite FnOS package" in fnos + assert 'echo "full=false"' in fnos + assert "Skipping the full FnOS package" in fnos assert "--sync-notes" in fnos diff --git a/tests/unit/test_release_download_links.py b/tests/unit/test_release_download_links.py index 2be5d7bb5c..b115b417a1 100644 --- a/tests/unit/test_release_download_links.py +++ b/tests/unit/test_release_download_links.py @@ -42,7 +42,8 @@ def test_render_download_section_matches_github_asset_names() -> None: assert f"{base}/Octop-fnos-docker-lite-0.9.31.fpk" in body assert f"{base}/Octop-fnos-native-amd64-0.9.31.fpk" in body assert f"{base}/Octop-fnos-native-arm64-0.9.31.fpk" in body - assert "ghcr.io/tencentcloud/octop:0.9.31-lite" in body + assert "ghcr.io/tencentcloud/octop:0.9.31` (`:latest`)" in body + assert "ghcr.io/tencentcloud/octop:0.9.31-full" in body assert "Docker lite (x86 and ARM)" in body assert "Docker full (desktop, OCR, local models; x86 and ARM)" in body assert "Native x86_64" in body @@ -61,7 +62,8 @@ def test_patch_release_body_drops_unpublished_fnos_packages() -> None: ] patched = mod.patch_release_body(body, "0.9.31", present) assert "Octop-fnos-docker-lite-0.9.31.fpk" not in patched - assert "ghcr.io/tencentcloud/octop:0.9.31-lite" not in patched + assert "ghcr.io/tencentcloud/octop:0.9.31` (`:latest`)" not in patched + assert "ghcr.io/tencentcloud/octop:0.9.31-full" in patched assert "Octop-fnos-docker-0.9.31.fpk" in patched assert "Octop-fnos-native-amd64-0.9.31.fpk" in patched assert "Native ARM64" not in patched @@ -76,4 +78,5 @@ def test_patch_release_body_keeps_lite_when_its_package_shipped() -> None: names = [filename for filename, _label in mod.fnos_assets("0.9.31")] patched = mod.patch_release_body(body, "v0.9.31", names) assert patched == body if body.endswith("\n") else patched == body + "\n" - assert "ghcr.io/tencentcloud/octop:0.9.31-lite" in patched + assert "ghcr.io/tencentcloud/octop:0.9.31` (`:latest`)" in patched + assert "ghcr.io/tencentcloud/octop:0.9.31-full" in patched From a9cbff1d8096178467bda2fa792a9bded195e27e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E7=94=9F?= <67680641+Bosheng0422@users.noreply.github.com> Date: Thu, 5 Nov 2026 19:17:06 +0800 Subject: [PATCH 3/9] feat(providers): sync new preset models on startup and support HY4 (#2830) * feat(providers): enable HY4 thinking controls for Tencent channels * fix(providers): scope Tencent package models to their own catalogs * fix(providers): simplify plan model discovery to preset name and URL * feat(providers): enable new preset models during startup sync * build(deps): require octop-harness 1.0.8 --- pyproject.toml | 2 +- src/octop/infra/agents/providers/presets.py | 12 ++ src/octop/infra/agents/providers/probe.py | 17 +- src/octop/infra/agents/providers/store.py | 46 ++++- src/octop/infra/server.py | 7 + .../test_provider_preset_upgrade.py | 122 ++++++++++++++ tests/unit/agents/test_provider_store.py | 157 ++++++++++++++++++ tests/unit/test_provider_fetch_models.py | 64 +++++++ uv.lock | 8 +- 9 files changed, 428 insertions(+), 7 deletions(-) create mode 100644 tests/integration/test_provider_preset_upgrade.py diff --git a/pyproject.toml b/pyproject.toml index 9c4f6932ba..714f1709ff 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ dependencies = [ "apscheduler>=3.10,<4", "argon2-cffi>=23.1", "pyjwt>=2.8", - "octop-harness[all]>=1.0.7", + "octop-harness[all]>=1.0.8", "octop-memory>=1.0.3", "lark-oapi>=1.7.3", "octop-gateway>=1.0.3", diff --git a/src/octop/infra/agents/providers/presets.py b/src/octop/infra/agents/providers/presets.py index d5dbb08e86..64c8c23c55 100644 --- a/src/octop/infra/agents/providers/presets.py +++ b/src/octop/infra/agents/providers/presets.py @@ -60,6 +60,18 @@ def _reasoning_profile(provider_id: str, model_id: str) -> dict[str, Any] | None } if provider.startswith("tencent-"): + if model == "hy4" and provider in { + "tencent-tokenhub", + "tencent-token-plan", + "tencent-token-plan-enterprise-cn", + "tencent-hy-token-plan", + }: + return { + "supported": True, + "adapter": "thinking", + "toggle": True, + "default_mode": "enabled", + } if model.startswith("minimax-"): return { "supported": True, diff --git a/src/octop/infra/agents/providers/probe.py b/src/octop/infra/agents/providers/probe.py index 54f1af0977..1b9d0614f7 100644 --- a/src/octop/infra/agents/providers/probe.py +++ b/src/octop/infra/agents/providers/probe.py @@ -13,6 +13,7 @@ from octop.infra.agents.providers import KIND_TO_PROTOCOL from octop.infra.agents.providers.opencode_session import ensure_opencode_session_header +from octop.infra.agents.providers.presets import load_provider_presets logger = logging.getLogger(__name__) @@ -304,8 +305,22 @@ async def fetch_openai_compatible_models( locale: str = "en", provider_name: str | None = None, ) -> dict[str, Any]: - """List models via OpenAI-compatible ``GET {base}/models``.""" + """Use Tencent plan catalogs; otherwise list models via ``GET {base}/models``.""" url = _models_list_url(base_url) + # Token Plan and HY Token Plan share a URL, so also match the selected preset. + for preset in load_provider_presets(): + if ( + preset["id"] + in { + "tencent-coding-plan", + "tencent-token-plan", + "tencent-token-plan-enterprise-cn", + "tencent-hy-token-plan", + } + and provider_name in {preset["id"], preset["name"]} + and url == _models_list_url(preset.get("base_url")) + ): + return {"ok": True, "models": preset["models"]} headers: dict[str, str] = {"Authorization": f"Bearer {api_key}"} extra_headers = ensure_opencode_session_header(provider_name, extra_headers, base_url=base_url) if extra_headers: diff --git a/src/octop/infra/agents/providers/store.py b/src/octop/infra/agents/providers/store.py index b50c6d9e66..6036b73907 100644 --- a/src/octop/infra/agents/providers/store.py +++ b/src/octop/infra/agents/providers/store.py @@ -9,7 +9,11 @@ from octop_harness.config import ModelConfig, ProviderConfig -from octop.infra.agents.providers.model_flags import is_chat_eligible_model, is_vision_model +from octop.infra.agents.providers.model_flags import ( + is_chat_eligible_model, + is_local_runtime_provider, + is_vision_model, +) from octop.infra.agents.providers.opencode_session import session_header_for_provider from octop.infra.agents.providers.reasoning import reasoning_capability @@ -150,6 +154,46 @@ def _provider_extra_dict(row: Any) -> dict[str, Any]: return extra if isinstance(extra, dict) else {} +def sync_provider_preset_models(provider_repo: ProviderRepo | SealedProviderRepo) -> int: + """Append newly bundled cloud models, enabled, without replacing user settings.""" + from octop.infra.agents.providers.presets import load_provider_presets + + presets = load_provider_presets() + added = 0 + for row in provider_repo.list_all(): + if is_local_runtime_provider(row.name, provider_api_key=row.api_key): + continue + models = row.get_models() + purpose = resolve_provider_purpose( + provider_name=row.name, + provider_api_key=row.api_key, + extra=_provider_extra_dict(row), + models=models, + ) + preset = next( + ( + p + for p in presets + if row.name in {p["id"], p["name"]} + and KIND_TO_PROTOCOL.get(row.kind, row.kind) == p["protocol"] + and (row.base_url or "").strip().rstrip("/") + == (p.get("base_url") or "").strip().rstrip("/") + and purpose == (p.get("purpose") or "chat") + ), + None, + ) + if preset is None: + continue + existing = {model["id"] for model in models} + missing = [ + dict(model, enabled=True) for model in preset["models"] if model["id"] not in existing + ] + if missing: + provider_repo.update(row.id, models_json=json.dumps([*models, *missing])) + added += len(missing) + return added + + @dataclass(frozen=True) class AutoRouteCandidate: """One usable model and its effective prompt capacity.""" diff --git a/src/octop/infra/server.py b/src/octop/infra/server.py index 23001769ab..5b159a7f97 100644 --- a/src/octop/infra/server.py +++ b/src/octop/infra/server.py @@ -23,6 +23,7 @@ from octop.infra.agents.experts.catalog import ExpertCatalog, default_library_root from octop.infra.agents.manager import AgentManager from octop.infra.agents.plugins.manager import PluginManager +from octop.infra.agents.providers.store import sync_provider_preset_models from octop.infra.agents.subagents.catalog import SubagentCatalog, default_package_root from octop.infra.control.mobile.config_probe import ensure_mobile_capabilities_probed from octop.infra.cron.manager import CronManager @@ -491,6 +492,12 @@ async def _boot_runtime(self, config: OctopConfig) -> None: assert self.expert_catalog is not None assert self.plugin_manager is not None + added = await asyncio.get_running_loop().run_in_executor( + None, sync_provider_preset_models, self.services.provider_repo + ) + if added: + logger.info("Added %d newly bundled provider models", added) + from octop.infra.agents.experts.snapshot_store import ( # noqa: PLC0415 adopt_local_snapshots, ) diff --git a/tests/integration/test_provider_preset_upgrade.py b/tests/integration/test_provider_preset_upgrade.py new file mode 100644 index 0000000000..05cb90219c --- /dev/null +++ b/tests/integration/test_provider_preset_upgrade.py @@ -0,0 +1,122 @@ +"""A catalog upgrade reaches existing dashboards and runtime without reconfiguration.""" + +from __future__ import annotations + +from pathlib import Path +from typing import Any +from unittest.mock import patch + +import pytest + +from octop.infra.agents.providers import store +from octop.infra.agents.providers.presets import load_provider_presets +from octop.infra.agents.providers.store import ProviderStore +from tests.support.app import octop_client +from tests.support.auth import auth_header, bootstrap_admin, create_user + + +async def test_restart_adds_enabled_models_and_preserves_user_choices( + tmp_octop_home: Path, monkeypatch: pytest.MonkeyPatch +) -> None: + monkeypatch.setattr(store, "_PRESET_PROVIDER_KEYS", None) + bundled = load_provider_presets() + name = "Example API" + base_url = "https://api.example.com/v1" + old_models: list[dict[str, Any]] = [ + {"id": "old-enabled", "name": "My default", "enabled": True, "context_window": 1234}, + {"id": "old-disabled", "enabled": False}, + {"id": "user-added", "enabled": True}, + ] + old_preset = { + "id": "example-preset", + "name": name, + "protocol": "openai", + "base_url": base_url, + "models": old_models[:2], + } + with patch( + "octop.infra.agents.providers.presets.load_provider_presets", + return_value=[*bundled, old_preset], + ): + async with octop_client(tmp_octop_home) as (client, srv): + await bootstrap_admin(client, tmp_octop_home) + auth = await auth_header(client) + await create_user(client, auth, username="model-sync-user") + response = await client.post( + "/api/admin/providers", + headers=auth, + json={ + "name": name, + "kind": "openai", + "base_url": base_url, + "api_key": "keep-key", + "models": old_models, + }, + ) + response.raise_for_status() + provider_id = response.json()["id"] + srv.services.settings_repo.set_active_model(name, "old-enabled") + agent_id = srv.services.agent_repo.list_all()[0].agent_id + default_model = f"{name}/old-enabled" + srv.services.agent_repo.update_config(agent_id, default_model=default_model) + + new_model = { + "id": "new-model", + "name": "New model", + "enabled": False, + "context_window": 100000, + "max_input_tokens": 96000, + "max_output_tokens": 4000, + } + upgraded = { + **old_preset, + "models": [ + {"id": "old-enabled", "context_window": 99999}, + {"id": "old-disabled", "enabled": True}, + new_model, + ], + } + with patch( + "octop.infra.agents.providers.presets.load_provider_presets", + return_value=[*bundled, upgraded], + ): + async with octop_client(tmp_octop_home) as (client, srv): + auth = await auth_header(client) + user_auth = await auth_header(client, username="model-sync-user") + rows = (await client.get("/api/admin/providers", headers=auth)).json() + row = next(r for r in rows if r["id"] == provider_id) + assert [m["id"] for m in row["models"]] == [ + "old-enabled", + "old-disabled", + "user-added", + "new-model", + ] + stored = srv.services.provider_repo.get(provider_id).get_models() + assert stored == [*old_models, {**new_model, "enabled": True}] + assert srv.services.settings_repo.get_active_model() == (name, "old-enabled") + assert srv.services.agent_repo.get(agent_id).default_model == default_model + resolved = (await client.get("/api/providers/resolved", headers=user_auth)).json() + assert {m["model"] for m in resolved if m["provider_name"] == name} == { + "old-enabled", + "user-added", + "new-model", + } + configs = ProviderStore( + provider_repo=srv.services.provider_repo + ).build_harness_configs() + provider = next(p for p in configs if p.name == name) + assert {m.id for m in provider.models} == {"old-enabled", "user-added", "new-model"} + + stored[-1]["enabled"] = False + response = await client.patch( + f"/api/admin/providers/{provider_id}", headers=auth, json={"models": stored} + ) + response.raise_for_status() + + async with octop_client(tmp_octop_home) as (client, srv): + assert srv.services.provider_repo.get(provider_id).get_models() == stored + assert srv.services.settings_repo.get_active_model() == (name, "old-enabled") + assert srv.services.agent_repo.get(agent_id).default_model == default_model + user_auth = await auth_header(client, username="model-sync-user") + resolved = (await client.get("/api/providers/resolved", headers=user_auth)).json() + assert "new-model" not in {m["model"] for m in resolved if m["provider_name"] == name} diff --git a/tests/unit/agents/test_provider_store.py b/tests/unit/agents/test_provider_store.py index f183387e22..c280a8fdc4 100644 --- a/tests/unit/agents/test_provider_store.py +++ b/tests/unit/agents/test_provider_store.py @@ -4,6 +4,7 @@ import json from pathlib import Path +from typing import Any import pytest @@ -16,6 +17,7 @@ resolve_provider_purpose, resolve_provider_stream_usage, stamp_embedding_models, + sync_provider_preset_models, ) from octop.infra.db.migrate import run_migrations from octop.infra.db.pool import SqlitePool @@ -59,6 +61,161 @@ def _row( ) +@pytest.mark.parametrize("provider_name", ["example-preset", "Example API"]) +def test_sync_preset_models_enables_additions_and_preserves_saved_settings( + store: ProviderStore, monkeypatch: pytest.MonkeyPatch, provider_name: str +) -> None: + new_model = { + "id": "new-model", + "name": "New model", + "enabled": False, + "context_window": 100000, + "max_input_tokens": 96000, + "max_output_tokens": 4000, + "input": ["text", "image"], + "reasoning_config": {"supported": True, "adapter": "thinking", "toggle": True}, + } + monkeypatch.setattr( + "octop.infra.agents.providers.presets.load_provider_presets", + lambda: [ + { + "id": "example-preset", + "name": "Example API", + "protocol": "openai", + "base_url": "https://api.example.com/v1", + "models": [new_model], + } + ], + ) + original = [ + {"id": "old-model", "name": "My old model", "enabled": False, "context_window": 1234}, + {"id": "custom-model", "enabled": True}, + ] + repo = store._provider_repo + pid = repo.create( + name=provider_name, + kind="openai", + api_key="keep-key", + base_url="https://api.example.com/v1/", + models_json=json.dumps(original), + extra_json='{"headers":{"X-Test":"keep"}}', + note="keep-note", + ) + repo.update(pid, enabled=False) + before = repo.get(pid) + + assert sync_provider_preset_models(repo) == 1 + saved = repo.get(pid) + assert saved.get_models() == [*original, {**new_model, "enabled": True}] + assert (saved.api_key, saved.extra_json, saved.note, saved.enabled) == ( + before.api_key, + before.extra_json, + before.note, + before.enabled, + ) + assert sync_provider_preset_models(repo) == 0 + assert repo.get(pid).models_json == saved.models_json + + +@pytest.mark.parametrize( + ("name", "url", "kind", "extra"), + [ + ("Custom relay", "https://api.example.com/v1", "openai", None), + ("Example API", "https://proxy.example.com/v1", "openai", None), + ("Example API", "https://api.example.com/v1", "anthropic", None), + ("Example API", "https://api.example.com/v1", "openai", '{"purpose":"embedding"}'), + ("Ollama (Local)", "http://localhost:11434/v1", "openai", None), + ], +) +def test_sync_preset_models_leaves_other_providers_and_local_runtimes_alone( + store: ProviderStore, + monkeypatch: pytest.MonkeyPatch, + name: str, + url: str, + kind: str, + extra: str | None, +) -> None: + presets = [ + { + "id": "example-preset", + "name": "Example API", + "protocol": "openai", + "base_url": "https://api.example.com/v1", + "models": [{"id": "cloud-model"}], + }, + { + "id": "ollama", + "name": "Ollama (Local)", + "protocol": "openai", + "base_url": "http://localhost:11434/v1", + "models": [{"id": "not-installed"}], + }, + ] + monkeypatch.setattr( + "octop.infra.agents.providers.presets.load_provider_presets", lambda: presets + ) + repo = store._provider_repo + pid = repo.create(name=name, base_url=url, kind=kind, api_key="test-key", extra_json=extra) + assert sync_provider_preset_models(repo) == 0 + assert repo.get(pid).models_json is None + + +def test_sync_preset_models_separates_packages_sharing_a_url( + store: ProviderStore, monkeypatch: pytest.MonkeyPatch +) -> None: + presets: list[dict[str, Any]] = [ + { + "id": f"plan-{plan}", + "name": f"Plan {plan}", + "protocol": "openai", + "base_url": "https://api.example.com/plan/v1", + "models": [{"id": f"model-{plan}"}], + } + for plan in ("a", "b") + ] + monkeypatch.setattr( + "octop.infra.agents.providers.presets.load_provider_presets", lambda: presets + ) + repo = store._provider_repo + ids = [ + repo.create(name=p["name"], base_url=p["base_url"], kind="openai", api_key="test-key") + for p in presets + ] + assert sync_provider_preset_models(repo) == 2 + assert repo.get(ids[0]).get_models() == [{"id": "model-a", "enabled": True}] + assert repo.get(ids[1]).get_models() == [{"id": "model-b", "enabled": True}] + + +def test_sync_embedding_preset_models_stays_in_embedding_lane( + store: ProviderStore, monkeypatch: pytest.MonkeyPatch +) -> None: + model = {"id": "new-embedding", "embedding": True, "task": "embedding"} + monkeypatch.setattr( + "octop.infra.agents.providers.presets.load_provider_presets", + lambda: [ + { + "id": "embedding-preset", + "name": "Example Embeddings", + "protocol": "openai", + "purpose": "embedding", + "base_url": "https://api.example.com/v1", + "models": [model], + } + ], + ) + repo = store._provider_repo + pid = repo.create( + name="Example Embeddings", + kind="openai", + api_key="test-key", + base_url="https://api.example.com/v1", + extra_json='{"purpose":"embedding"}', + ) + assert sync_provider_preset_models(repo) == 1 + assert repo.get(pid).get_models() == [{**model, "enabled": True}] + assert store.resolve_first_model_ref() is None + + def test_resolve_provider_stream_usage_defaults_custom_off() -> None: assert resolve_provider_stream_usage(provider_name="mindie-arm") is False assert resolve_provider_stream_usage(provider_name="私有化") is False diff --git a/tests/unit/test_provider_fetch_models.py b/tests/unit/test_provider_fetch_models.py index 949d0fee1b..c5a8d90ef4 100644 --- a/tests/unit/test_provider_fetch_models.py +++ b/tests/unit/test_provider_fetch_models.py @@ -16,6 +16,70 @@ def _mock_response(status: int, payload: Any) -> httpx.Response: return httpx.Response(status, json=payload, request=request) +@pytest.mark.parametrize( + ("provider_name", "expected_ids"), + [ + ("tencent-hy-token-plan", {"hy4", "hy3", "hy3-preview"}), + ("Tencent Cloud Hy Token Plan", {"hy4", "hy3", "hy3-preview"}), + ("tencent-token-plan", {"hy4", "glm-5"}), + ("Tencent Cloud Token Plan", {"hy4", "glm-5"}), + ], +) +async def test_shared_plan_url_uses_selected_catalog( + provider_name: str, expected_ids: set[str] +) -> None: + base_url = "https://api.lkeap.cloud.tencent.com/plan/v3" + presets = [ + { + "id": "tencent-token-plan", + "name": "Tencent Cloud Token Plan", + "base_url": base_url, + "models": [{"id": "hy4"}, {"id": "glm-5"}], + }, + { + "id": "tencent-hy-token-plan", + "name": "Tencent Cloud Hy Token Plan", + "base_url": base_url, + "models": [{"id": "hy4"}, {"id": "hy3"}, {"id": "hy3-preview"}], + }, + ] + with ( + patch("octop.infra.agents.providers.probe.load_provider_presets", return_value=presets), + patch("octop.infra.agents.providers.probe.httpx.AsyncClient") as remote, + ): + result = await fetch_openai_compatible_models( + base_url=f"{base_url}/", + api_key="test-key", + provider_name=provider_name, + ) + assert result["ok"] is True + assert {model["id"] for model in result["models"]} == expected_ids + remote.assert_not_called() + + +@pytest.mark.parametrize( + ("provider_name", "base_url"), + [ + ("Custom provider", "https://api.lkeap.cloud.tencent.com/plan/v3"), + ("Tencent Cloud Hy Token Plan", "https://proxy.example.com/v1"), + ("tencent-tokenhub", "https://tokenhub.tencentmaas.com/v1"), + ("tencent-hai", "https://api.model.haihub.cn/v1"), + ], +) +async def test_other_provider_or_url_keeps_remote_discovery( + provider_name: str, base_url: str +) -> None: + client = AsyncMock() + client.__aenter__.return_value = client + client.get.return_value = _mock_response(200, {"data": [{"id": "remote-model"}]}) + with patch("octop.infra.agents.providers.probe.httpx.AsyncClient", return_value=client): + result = await fetch_openai_compatible_models( + base_url=base_url, api_key="test-key", provider_name=provider_name + ) + assert result == {"ok": True, "models": [{"id": "remote-model", "name": "remote-model"}]} + assert client.get.await_args.args[0] == f"{base_url}/models" + + @pytest.mark.asyncio async def test_fetch_models_parses_openai_list() -> None: response = _mock_response( diff --git a/uv.lock b/uv.lock index 13914cb12b..4000aace1f 100644 --- a/uv.lock +++ b/uv.lock @@ -2703,7 +2703,7 @@ requires-dist = [ { name = "mypy", marker = "extra == 'dev'", specifier = ">=1.10" }, { name = "octop-browser", specifier = ">=1.0.0" }, { name = "octop-gateway", specifier = ">=1.0.3" }, - { name = "octop-harness", extras = ["all"], specifier = ">=1.0.7" }, + { name = "octop-harness", extras = ["all"], specifier = ">=1.0.8" }, { name = "octop-memory", specifier = ">=1.0.3" }, { name = "onnxruntime", marker = "extra == 'knowledge-ocr'", specifier = ">=1.17" }, { name = "openpyxl", specifier = ">=3.1" }, @@ -2796,7 +2796,7 @@ wheels = [ [[package]] name = "octop-harness" -version = "1.0.7" +version = "1.0.8" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "deepagents" }, @@ -2814,9 +2814,9 @@ dependencies = [ { name = "octop-memory" }, { name = "pyyaml" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/6f/f5/ae9e96393557285832f75166d2c387f0c7b94e98cb8992dd043448c91444/octop_harness-1.0.7.tar.gz", hash = "sha256:c74f0e979ed6b1a3272a911c0da2abe4825b632073573bdd211c375d2c4fad1b", size = 1003695, upload-time = "2026-11-04T11:15:29.379Z" } +sdist = { url = "https://files.pythonhosted.org/packages/b1/30/5ec8fa8250c9c3f7c973dc35f70625b8a35037808c8b9f2aa2aac0f19fa9/octop_harness-1.0.8.tar.gz", hash = "sha256:fa586d69952eda010452a431093e46ad7685b55189e651c2a5810d2af340b83b", size = 1011918, upload-time = "2026-11-05T09:30:23.468Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/47/ae/34effffa522fead286ae91d93bfd68f07431222773e173ac51ed9cd57637/octop_harness-1.0.7-py3-none-any.whl", hash = "sha256:b10eb908b789b08fabc3e9e2e295cfcd5fbcff5d7c2fb020feeefe2e5f4b3559", size = 1202445, upload-time = "2026-11-04T11:15:27.832Z" }, + { url = "https://files.pythonhosted.org/packages/f9/88/186c8fdca2ba2d37a28e3800e401c660bdd945dbe2d0ca5a585cba2420f1/octop_harness-1.0.8-py3-none-any.whl", hash = "sha256:3b7b40063d5cebbe4d47ee3a94f2c392d2cff8b4554c2208fbb5c51cdb77b94c", size = 1210813, upload-time = "2026-11-05T09:30:21.849Z" }, ] [package.optional-dependencies] From dcc41228b32bfcbc70dca81fbed9ee5f977c2e79 Mon Sep 17 00:00:00 2001 From: Jubaoliang Date: Thu, 5 Nov 2026 20:33:17 +0800 Subject: [PATCH 4/9] fix: map shared custom MCP names onto the expert harness (#2848) A shared expert only registers the owner's short MCP name, so a viewer's collision-safe catalog name never reached that server. Translate names for the model request, keep history chips in the viewer's vocabulary, and replace tools when the same short name switches users. Also filter connectors by category and abbreviate large token counts. --- dashboard/src/assets/storage/tos.svg | 12 +- dashboard/src/locales/en.json | 2 + dashboard/src/locales/zh.json | 2 + .../ConnectorsPage.category.test.tsx | 174 ++++++++++++++++++ .../Connectors/connectorCategories.test.ts | 57 ++++++ .../Agent/Connectors/connectorCategories.ts | 54 ++++++ .../pages/Agent/Connectors/index.module.less | 4 + .../src/pages/Agent/Connectors/index.tsx | 89 ++++++++- .../Control/TokenUsage/UsageStats.test.tsx | 42 +++++ .../pages/Control/TokenUsage/UsageStats.tsx | 32 ++-- .../TokenUsage/formatUsageCount.test.ts | 54 ++++++ .../Control/TokenUsage/formatUsageCount.ts | 85 +++++++++ .../Control/TokenUsage/index.module.less | 27 ++- .../src/pages/Control/TokenUsage/index.tsx | 68 ++++--- src/octop/api/routers/agents.py | 32 +++- src/octop/infra/agents/manager.py | 161 +++++++++++++++- src/octop/infra/connectors/service.py | 122 +++++++++++- src/octop/infra/cron/delivery.py | 50 ++--- src/octop/infra/gateway/process/processor.py | 42 ++++- tests/unit/agents/test_agent_manager.py | 145 +++++++++++++++ tests/unit/connectors/test_custom_mcp.py | 135 ++++++++++++++ tests/unit/cron/test_cron_composer_context.py | 6 +- .../gateway/test_processor_default_open.py | 4 +- 23 files changed, 1296 insertions(+), 103 deletions(-) create mode 100644 dashboard/src/pages/Agent/Connectors/ConnectorsPage.category.test.tsx create mode 100644 dashboard/src/pages/Agent/Connectors/connectorCategories.test.ts create mode 100644 dashboard/src/pages/Agent/Connectors/connectorCategories.ts create mode 100644 dashboard/src/pages/Control/TokenUsage/formatUsageCount.test.ts create mode 100644 dashboard/src/pages/Control/TokenUsage/formatUsageCount.ts diff --git a/dashboard/src/assets/storage/tos.svg b/dashboard/src/assets/storage/tos.svg index f93aa75665..50800c96b9 100644 --- a/dashboard/src/assets/storage/tos.svg +++ b/dashboard/src/assets/storage/tos.svg @@ -1,5 +1,9 @@ - - - - + + + + + + + + diff --git a/dashboard/src/locales/en.json b/dashboard/src/locales/en.json index dd0e77426f..df105441b0 100644 --- a/dashboard/src/locales/en.json +++ b/dashboard/src/locales/en.json @@ -6559,6 +6559,8 @@ "professional": "Professional", "self_hosted": "Self-hosted" }, + "categoryAll": "All", + "categoryEmpty": "No connectors in this category", "listSummary": "{{total}} connectors available, {{configured}} configured", "enabledSummary": "{{count}} connector instances enabled", "emptyGuideTitle": "No enabled connectors yet", diff --git a/dashboard/src/locales/zh.json b/dashboard/src/locales/zh.json index 10a8ac1fb7..fba8327806 100644 --- a/dashboard/src/locales/zh.json +++ b/dashboard/src/locales/zh.json @@ -6559,6 +6559,8 @@ "professional": "专业工具", "self_hosted": "自托管 / 扩展" }, + "categoryAll": "全部", + "categoryEmpty": "这个分类下没有连接器", "listSummary": "当前支持 {{total}} 个连接器,已配置 {{configured}} 个", "enabledSummary": "已启用 {{count}} 个连接器实例", "emptyGuideTitle": "还没有已启用的连接器", diff --git a/dashboard/src/pages/Agent/Connectors/ConnectorsPage.category.test.tsx b/dashboard/src/pages/Agent/Connectors/ConnectorsPage.category.test.tsx new file mode 100644 index 0000000000..26158c335d --- /dev/null +++ b/dashboard/src/pages/Agent/Connectors/ConnectorsPage.category.test.tsx @@ -0,0 +1,174 @@ +import { describe, expect, it, vi } from "vitest"; +import { render, screen } from "@testing-library/react"; +import userEvent from "@testing-library/user-event"; +import { MemoryRouter } from "react-router-dom"; + +import type { + ConnectorCatalogEntry, + ConnectorInstance, +} from "../../../api/modules/connectors"; + +const { catalog, instances } = vi.hoisted(() => { + const catalog: ConnectorCatalogEntry[] = [ + { + kind: "notion", + name: "Notion", + description: "", + auth_kind: "oauth", + doc_url: "", + icon: "", + color: "#000", + phase: "available", + mcp_mode: "gateway", + category: "knowledge", + }, + { + kind: "amap", + name: "Amap", + description: "", + auth_kind: "api_key", + doc_url: "", + icon: "", + color: "#000", + phase: "available", + mcp_mode: "gateway", + category: "travel", + }, + { + kind: "docs", + name: "Docs", + description: "", + auth_kind: "api_key", + doc_url: "", + icon: "", + color: "#000", + phase: "available", + mcp_mode: "gateway", + category: "office", + }, + ]; + const instances: ConnectorInstance[] = [ + { + instance_id: "notes", + kind: "notion", + display_name: "My Notion", + status: "ready", + mcp_server_name: "notion", + has_credentials: true, + shared: false, + owner_user_id: 1, + can_manage: true, + created_at: 0, + updated_at: 0, + }, + { + instance_id: "maps", + kind: "amap", + display_name: "My Maps", + status: "ready", + mcp_server_name: "amap", + has_credentials: true, + shared: false, + owner_user_id: 1, + can_manage: true, + created_at: 0, + updated_at: 0, + }, + ]; + return { catalog, instances }; +}); + +vi.mock("react-i18next", () => ({ + useTranslation: () => ({ + t: (key: string) => key, + i18n: { language: "zh", changeLanguage: () => Promise.resolve() }, + }), +})); + +vi.mock("@/utils/antdMessage", () => ({ + message: { error: vi.fn(), success: vi.fn(), warning: vi.fn() }, +})); + +vi.mock("./useConnectors", () => ({ + useConnectorInstances: () => ({ + catalog, + instances, + loading: false, + refresh: vi.fn(), + }), +})); + +vi.mock("../../../hooks/useCurrentUser", () => ({ + useCurrentUser: () => ({ + id: 1, + username: "admin", + role: "admin", + display_name: "Admin", + locale: "zh", + }), +})); + +vi.mock("./CustomMcpTab", () => ({ + CustomMcpTab: () =>
custom-tab
, +})); + +import ConnectorsPage from "./index"; + +function renderPage() { + return render( + + + , + ); +} + +describe("ConnectorsPage category pills", () => { + it("filters enabled instances and the built-in catalog", async () => { + const user = userEvent.setup(); + renderPage(); + + expect(screen.getByText("My Notion")).toBeInTheDocument(); + expect(screen.getByText("My Maps")).toBeInTheDocument(); + + await user.click( + screen.getByRole("button", { name: "connectors.category.knowledge" }), + ); + expect(screen.getByText("My Notion")).toBeInTheDocument(); + expect(screen.queryByText("My Maps")).not.toBeInTheDocument(); + expect( + screen.queryByText("connectors.categoryEmpty"), + ).not.toBeInTheDocument(); + + await user.click( + screen.getByRole("button", { name: "connectors.category.office" }), + ); + expect(screen.queryByText("My Notion")).not.toBeInTheDocument(); + expect(screen.getByText("connectors.categoryEmpty")).toBeInTheDocument(); + + await user.click( + screen.getByRole("button", { name: "connectors.categoryAll" }), + ); + expect(screen.getByText("My Notion")).toBeInTheDocument(); + expect(screen.getByText("My Maps")).toBeInTheDocument(); + + await user.click( + screen.getByRole("tab", { name: "connectors.tabBuiltin" }), + ); + expect(screen.getByText("Notion")).toBeInTheDocument(); + expect(screen.getByText("Amap")).toBeInTheDocument(); + expect(screen.getByText("Docs")).toBeInTheDocument(); + + await user.click( + screen.getByRole("button", { name: "connectors.category.travel" }), + ); + expect(screen.queryByText("Notion")).not.toBeInTheDocument(); + expect(screen.queryByText("Docs")).not.toBeInTheDocument(); + expect(screen.getByText("Amap")).toBeInTheDocument(); + + await user.click(screen.getByRole("tab", { name: "connectors.tabCustom" })); + expect( + screen.queryByRole("button", { name: "connectors.categoryAll" }), + ).not.toBeInTheDocument(); + expect(screen.getByText("custom-tab")).toBeInTheDocument(); + }); +}); diff --git a/dashboard/src/pages/Agent/Connectors/connectorCategories.test.ts b/dashboard/src/pages/Agent/Connectors/connectorCategories.test.ts new file mode 100644 index 0000000000..0db585a04f --- /dev/null +++ b/dashboard/src/pages/Agent/Connectors/connectorCategories.test.ts @@ -0,0 +1,57 @@ +import { describe, expect, it } from "vitest"; + +import { + CONNECTOR_CATEGORY_ALL, + connectorCategoryOptions, + matchesConnectorCategory, +} from "./connectorCategories"; + +describe("connectorCategoryOptions", () => { + const labelFor = (category: string) => category; + + it("puts All first and follows the catalog order", () => { + const options = connectorCategoryOptions( + ["travel", "office", "knowledge"], + labelFor, + "All", + ); + expect(options.map((option) => option.value)).toEqual([ + CONNECTOR_CATEGORY_ALL, + "office", + "knowledge", + "travel", + ]); + expect(options[0]?.label).toBe("All"); + }); + + it("appends unknown categories after the known ones", () => { + const options = connectorCategoryOptions( + ["zeta", "office", "alpha"], + labelFor, + "All", + ); + expect(options.map((option) => option.value)).toEqual([ + "", + "office", + "alpha", + "zeta", + ]); + }); + + it("returns no pills when the catalog has no categories", () => { + expect(connectorCategoryOptions([], labelFor, "All")).toEqual([]); + }); +}); + +describe("matchesConnectorCategory", () => { + it("keeps every item when All is selected", () => { + expect(matchesConnectorCategory("office", "")).toBe(true); + expect(matchesConnectorCategory(undefined, "")).toBe(true); + }); + + it("keeps only the selected category", () => { + expect(matchesConnectorCategory("office", "office")).toBe(true); + expect(matchesConnectorCategory("travel", "office")).toBe(false); + expect(matchesConnectorCategory(undefined, "office")).toBe(false); + }); +}); diff --git a/dashboard/src/pages/Agent/Connectors/connectorCategories.ts b/dashboard/src/pages/Agent/Connectors/connectorCategories.ts new file mode 100644 index 0000000000..e09e317b41 --- /dev/null +++ b/dashboard/src/pages/Agent/Connectors/connectorCategories.ts @@ -0,0 +1,54 @@ +import type { ConnectorCategory } from "../../../api/modules/connectors"; + +/** Empty value means every category, matching the expert-market "all" pill. */ +export const CONNECTOR_CATEGORY_ALL = ""; + +/** Stable pill order. Categories missing from the catalog are omitted. */ +export const CONNECTOR_CATEGORY_ORDER: readonly ConnectorCategory[] = [ + "office", + "knowledge", + "travel", + "productivity", + "media", + "professional", + "self_hosted", +]; + +export interface ConnectorCategoryOption { + value: string; + label: string; +} + +export function connectorCategoryOptions( + present: Iterable, + labelFor: (category: string) => string, + allLabel: string, +): ConnectorCategoryOption[] { + const have = new Set(present); + const ordered = CONNECTOR_CATEGORY_ORDER.filter((category) => + have.has(category), + ); + const extras = [...have] + .filter( + (category) => + !CONNECTOR_CATEGORY_ORDER.includes(category as ConnectorCategory), + ) + .sort((a, b) => a.localeCompare(b)); + const categories = [...ordered, ...extras]; + if (categories.length === 0) return []; + return [ + { value: CONNECTOR_CATEGORY_ALL, label: allLabel }, + ...categories.map((category) => ({ + value: category, + label: labelFor(category), + })), + ]; +} + +export function matchesConnectorCategory( + category: string | undefined, + active: string, +): boolean { + if (!active) return true; + return category === active; +} diff --git a/dashboard/src/pages/Agent/Connectors/index.module.less b/dashboard/src/pages/Agent/Connectors/index.module.less index bcae8dcf62..c56eb7e174 100644 --- a/dashboard/src/pages/Agent/Connectors/index.module.less +++ b/dashboard/src/pages/Agent/Connectors/index.module.less @@ -722,6 +722,10 @@ color: var(--fn-text-primary); } +.categoryScroller { + margin-bottom: 14px; +} + .listToolbar { display: flex; align-items: center; diff --git a/dashboard/src/pages/Agent/Connectors/index.tsx b/dashboard/src/pages/Agent/Connectors/index.tsx index ac1af89af2..573fe45dd7 100644 --- a/dashboard/src/pages/Agent/Connectors/index.tsx +++ b/dashboard/src/pages/Agent/Connectors/index.tsx @@ -21,6 +21,7 @@ import { useTranslation } from "react-i18next"; import { useSearchParams } from "react-router-dom"; import PageShell from "../../../layouts/PageShell"; +import PillScroller from "../../../components/PillScroller"; import TabBar, { type TabBarItem } from "../../../components/TabLabel/TabBar"; import StreamSetupGuide from "../../../components/StreamSetupGuide/StreamSetupGuide"; import { OctopEmptyMascot } from "../../../components/EmptyState/OctopEmptyMascot"; @@ -65,6 +66,11 @@ import { MAIL_PROVIDERS, mailProviderById, } from "./connectorDefs"; +import { + CONNECTOR_CATEGORY_ALL, + connectorCategoryOptions, + matchesConnectorCategory, +} from "./connectorCategories"; import { notifyConnectorsChanged } from "./customMcpUtils"; import { extractHttpUrl, @@ -2360,6 +2366,7 @@ export default function ConnectorsPage() { const { t } = useTranslation(); const [searchParams, setSearchParams] = useSearchParams(); const [activeTab, setActiveTab] = useState("enabled"); + const [activeCategory, setActiveCategory] = useState(CONNECTOR_CATEGORY_ALL); const [drawerEntry, setDrawerEntry] = useState( null, ); @@ -2398,6 +2405,68 @@ export default function ConnectorsPage() { return instances.filter((instance) => instance.has_credentials).length; }, [instances]); + const categoryOptions = useMemo( + () => + connectorCategoryOptions( + catalog.map((entry) => entry.category), + (category) => t(`connectors.category.${category}`, category), + t("connectors.categoryAll"), + ), + [catalog, t], + ); + const showCategoryPills = categoryOptions.length > 1; + + useEffect(() => { + if ( + activeCategory && + !categoryOptions.some((option) => option.value === activeCategory) + ) { + setActiveCategory(CONNECTOR_CATEGORY_ALL); + } + }, [activeCategory, categoryOptions]); + + const catalogByKind = useMemo(() => { + const byKind = new Map(); + for (const entry of catalog) byKind.set(entry.kind, entry); + return byKind; + }, [catalog]); + + const visibleCatalog = useMemo( + () => + catalog.filter((entry) => + matchesConnectorCategory(entry.category, activeCategory), + ), + [activeCategory, catalog], + ); + const categoryInstances = useMemo( + () => + visibleInstances.filter((instance) => + matchesConnectorCategory( + catalogByKind.get(instance.kind)?.category, + activeCategory, + ), + ), + [activeCategory, catalogByKind, visibleInstances], + ); + const visibleConfiguredCount = useMemo(() => { + if (!activeCategory) return configuredCount; + const kinds = new Set(visibleCatalog.map((entry) => entry.kind)); + return instances.filter( + (instance) => instance.has_credentials && kinds.has(instance.kind), + ).length; + }, [activeCategory, configuredCount, instances, visibleCatalog]); + + const categoryPills = showCategoryPills ? ( + + ) : null; + useEffect(() => { const oauthState = searchParams.get("oauth_state"); if (!oauthState) return; @@ -2528,7 +2597,7 @@ export default function ConnectorsPage() {
{t("connectors.enabledSummary", { - count: visibleInstances.length, + count: categoryInstances.length, defaultValue: "已启用 {{count}} 个连接器实例", })} @@ -2547,13 +2616,18 @@ export default function ConnectorsPage() { {t("common.refresh")}
+ {categoryPills} {visibleInstances.length === 0 ? (
{t("resourceAudience.empty")}
+ ) : categoryInstances.length === 0 ? ( +
+ {t("connectors.categoryEmpty")} +
) : (
- {visibleInstances.map((instance) => ( + {categoryInstances.map((instance) => ( {t("connectors.listSummary", { - total: catalog.length, - configured: configuredCount, + total: visibleCatalog.length, + configured: visibleConfiguredCount, defaultValue: "当前支持 {{total}} 个连接器,已配置 {{configured}} 个", })} @@ -2599,13 +2673,18 @@ export default function ConnectorsPage() { {t("common.refresh")}
+ {categoryPills} {loading ? (
+ ) : activeCategory && visibleCatalog.length === 0 ? ( +
+ {t("connectors.categoryEmpty")} +
) : (
- {catalog.map((entry) => ( + {visibleCatalog.map((entry) => ( { expect(screen.getByText("185,898")).toBeInTheDocument(); }); + it("prints the exact count under an abbreviated card", () => { + render( + , + ); + + expect(screen.getByText("278.8万")).toBeInTheDocument(); + expect(screen.getByText("2,788,473")).toBeInTheDocument(); + }); + + it("shows the exact count for an abbreviated metric in the overflow list", async () => { + const user = userEvent.setup(); + render( + , + ); + + await user.click(screen.getByRole("button", { name: "common.viewMore" })); + + expect(await screen.findByText("1.23M")).toBeInTheDocument(); + expect(screen.getByText("1,234,567")).toBeInTheDocument(); + }); + it("does not hide metrics behind overflow on mobile", () => { render(); diff --git a/dashboard/src/pages/Control/TokenUsage/UsageStats.tsx b/dashboard/src/pages/Control/TokenUsage/UsageStats.tsx index 551fce0c4c..9fc1327d10 100644 --- a/dashboard/src/pages/Control/TokenUsage/UsageStats.tsx +++ b/dashboard/src/pages/Control/TokenUsage/UsageStats.tsx @@ -8,6 +8,8 @@ export interface UsageStatItem { key: string; label: string; value: string | number; + /** Exact figure shown under `value` when the card text is abbreviated. */ + exact?: string; } const STAT_CARD_MIN_PX = 160; @@ -27,26 +29,26 @@ export function visibleStatCount(width: number, total: number): number { return Math.max(1, Math.min(total - 1, withMore)); } -function StatBlock({ - label, - value, -}: { - label: string; - value: string | number; -}) { +function StatBlock({ label, value, exact }: Omit) { return (
{label}
{value}
+ {exact ?
{exact}
: null}
); } -function StatRow({ label, value }: { label: string; value: string | number }) { +function StatRow({ label, value, exact }: Omit) { return (
{label} - {value} + + {value} + {exact ? ( + {exact} + ) : null} +
); } @@ -107,8 +109,8 @@ export function UsageStats({ : undefined } > - {shown.map((item) => ( - + {shown.map(({ key, ...item }) => ( + ))}
{overflow.length > 0 ? ( @@ -117,12 +119,8 @@ export function UsageStats({ placement="bottomRight" content={
- {overflow.map((item) => ( - + {overflow.map(({ key, ...item }) => ( + ))}
} diff --git a/dashboard/src/pages/Control/TokenUsage/formatUsageCount.test.ts b/dashboard/src/pages/Control/TokenUsage/formatUsageCount.test.ts new file mode 100644 index 0000000000..ebfd7335da --- /dev/null +++ b/dashboard/src/pages/Control/TokenUsage/formatUsageCount.test.ts @@ -0,0 +1,54 @@ +import { describe, expect, it } from "vitest"; +import { + formatCompactCount, + formatExactCount, + usageCountDisplay, +} from "./formatUsageCount"; + +describe("formatCompactCount", () => { + it("keeps counts that fit the card exact", () => { + expect(formatCompactCount(15, "zh")).toBe("15"); + expect(formatCompactCount(24_315, "zh")).toBe("24,315"); + expect(formatCompactCount(185_898, "en")).toBe("185,898"); + expect(formatCompactCount(999_999, "zh")).toBe("999,999"); + }); + + it("uses 万 and 亿 for Chinese", () => { + expect(formatCompactCount(1_000_000, "zh")).toBe("100万"); + expect(formatCompactCount(2_788_473, "zh")).toBe("278.8万"); + expect(formatCompactCount(12_345_678_901, "zh")).toBe("123.5亿"); + expect(formatCompactCount(1_230_000_000_000, "zh")).toBe("1.23万亿"); + }); + + it("uses M, B, and T for English", () => { + expect(formatCompactCount(1_000_000, "en")).toBe("1M"); + expect(formatCompactCount(2_788_473, "en")).toBe("2.79M"); + expect(formatCompactCount(12_345_678_901, "en")).toBe("12.3B"); + expect(formatCompactCount(1_230_000_000_000, "en")).toBe("1.23T"); + }); + + it("promotes a rounded 1000 of a smaller unit", () => { + expect(formatCompactCount(999_950_000, "en")).toBe("1B"); + expect(formatCompactCount(99_999_999, "zh")).toBe("1亿"); + }); + + it("keeps the sign and rejects non-finite values", () => { + expect(formatCompactCount(-2_788_473, "en")).toBe("-2.79M"); + expect(formatCompactCount(Number.NaN, "zh")).toBe("0"); + }); +}); + +describe("usageCountDisplay", () => { + it("omits the exact line when the card already shows the full number", () => { + expect(usageCountDisplay(15, "zh")).toEqual({ value: "15" }); + expect(usageCountDisplay(185_898, "en")).toEqual({ value: "185,898" }); + }); + + it("pairs the compact card text with a grouped exact count", () => { + expect(usageCountDisplay(2_788_473, "zh")).toEqual({ + value: "278.8万", + exact: "2,788,473", + }); + expect(formatExactCount(2_788_473.4, "en")).toBe("2,788,473.4"); + }); +}); diff --git a/dashboard/src/pages/Control/TokenUsage/formatUsageCount.ts b/dashboard/src/pages/Control/TokenUsage/formatUsageCount.ts new file mode 100644 index 0000000000..85cec99978 --- /dev/null +++ b/dashboard/src/pages/Control/TokenUsage/formatUsageCount.ts @@ -0,0 +1,85 @@ +/** + * Stat-card and chart-axis figures for token usage. + * Counts that still fit a 22px card stay exact. From about one million + * the card shows a compact unit, and the exact grouped number sits under it. + */ + +/** ~7 grouped digits still fit; 1,000,000 (9 chars at 22px) does not. */ +const COMPACT_FROM = 1_000_000; + +const ZH_UNITS = [ + { value: 1e12, suffix: "万亿" }, + { value: 1e8, suffix: "亿" }, + { value: 1e4, suffix: "万" }, +] as const; + +const EN_UNITS = [ + { value: 1e12, suffix: "T" }, + { value: 1e9, suffix: "B" }, + { value: 1e6, suffix: "M" }, +] as const; + +function intlTag(locale: string): string { + return locale.toLowerCase().startsWith("zh") ? "zh-CN" : "en-US"; +} + +function isZh(locale: string): boolean { + return locale.toLowerCase().startsWith("zh"); +} + +/** Grouped exact count, e.g. 2788473 → "2,788,473". */ +export function formatExactCount(n: number, locale: string): string { + if (!Number.isFinite(n)) return "0"; + return n.toLocaleString(intlTag(locale), { + maximumFractionDigits: Number.isInteger(n) ? 0 : 1, + }); +} + +function trimScaled(scaled: number): string { + const digits = scaled >= 1000 ? 0 : scaled >= 10 ? 1 : 2; + return scaled + .toFixed(digits) + .replace(/\.0+$/, "") + .replace(/(\.\d*[1-9])0+$/, "$1"); +} + +function formatWithUnits( + abs: number, + units: readonly { value: number; suffix: string }[], +): string { + for (let i = 0; i < units.length; i++) { + const unit = units[i]; + if (abs < unit.value) continue; + const text = trimScaled(abs / unit.value); + if (Number(text) >= 1000 && i > 0) { + const promoted = trimScaled(abs / units[i - 1].value); + if (Number(promoted) >= 1) { + return promoted + units[i - 1].suffix; + } + } + return text + unit.suffix; + } + return trimScaled(abs); +} + +/** + * Compact label once the full figure no longer fits a stat card. + * zh: 278.8万 / 1.23亿. en: 2.79M / 1.23B. + */ +export function formatCompactCount(n: number, locale: string): string { + if (!Number.isFinite(n)) return "0"; + const abs = Math.abs(n); + if (abs < COMPACT_FROM) return formatExactCount(n, locale); + const text = formatWithUnits(abs, isZh(locale) ? ZH_UNITS : EN_UNITS); + return n < 0 ? `-${text}` : text; +} + +/** Card text, plus the exact figure shown under it when abbreviated. */ +export function usageCountDisplay( + n: number, + locale: string, +): { value: string; exact?: string } { + const exact = formatExactCount(n, locale); + const value = formatCompactCount(n, locale); + return value === exact ? { value } : { value, exact }; +} diff --git a/dashboard/src/pages/Control/TokenUsage/index.module.less b/dashboard/src/pages/Control/TokenUsage/index.module.less index 10e45d37d3..2c4ff83585 100644 --- a/dashboard/src/pages/Control/TokenUsage/index.module.less +++ b/dashboard/src/pages/Control/TokenUsage/index.module.less @@ -147,7 +147,7 @@ .statsDrawerRow { display: flex; - align-items: baseline; + align-items: center; justify-content: space-between; gap: 12px; padding: 12px 14px; @@ -156,6 +156,13 @@ border-radius: 6px; } +.statsDrawerFigures { + display: flex; + flex-direction: column; + align-items: flex-end; + min-width: 0; +} + .statsDrawerLabel { font-size: 13px; color: var(--fn-text-tertiary); @@ -167,6 +174,22 @@ font-variant-numeric: tabular-nums; color: var(--fn-text-primary); text-align: right; + white-space: nowrap; +} + +.statsDrawerExact, +.statExact { + font-size: 12px; + line-height: 1.3; + color: var(--fn-text-tertiary); + font-variant-numeric: tabular-nums; + white-space: nowrap; +} + +.statExact { + margin-top: 2px; + overflow: hidden; + text-overflow: ellipsis; } .statBlock { @@ -193,6 +216,8 @@ margin-top: 4px; font-variant-numeric: tabular-nums; white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .pieGrid, diff --git a/dashboard/src/pages/Control/TokenUsage/index.tsx b/dashboard/src/pages/Control/TokenUsage/index.tsx index 4b0ee37ca1..8093593b73 100644 --- a/dashboard/src/pages/Control/TokenUsage/index.tsx +++ b/dashboard/src/pages/Control/TokenUsage/index.tsx @@ -47,6 +47,11 @@ import { useTheme } from "../../../context/ThemeContext"; import { brandPrimary } from "../../../styles/themePalettes"; import { message } from "../../../utils/antdMessage"; import { saveBlobAsFile } from "../../../utils/saveBlobAsFile"; +import { + formatCompactCount, + formatExactCount, + usageCountDisplay, +} from "./formatUsageCount"; import styles from "./index.module.less"; interface UsageUserOption { @@ -132,10 +137,6 @@ const CHART_HEIGHT = { bar: 280, } as const; -function formatNumber(n: number): string { - return n.toLocaleString(); -} - function formatDayTick(label: string): string { if (/^\d{4}-\d{2}-\d{2}$/.test(label)) return label.slice(5); return label; @@ -170,6 +171,8 @@ function UsageBarChart({ showLegend?: boolean; tickFormatter?: (label: string) => string; }) { + const { i18n } = useTranslation(); + const locale = i18n.language; return (
+ formatCompactCount(Number(value), locale) + } + /> + formatExactCount(Number(value ?? 0), locale)} + contentStyle={CHART_TOOLTIP_STYLE} /> - {showLegend ? ( string, + locale: string, ): UsageStatItem[] { + const count = (n: number) => usageCountDisplay(n, locale); return [ { key: "total", label: t("tokenUsage.totalTokens"), - value: formatNumber(totals.total_tokens), + ...count(totals.total_tokens), }, { key: "input", label: t("tokenUsage.input"), - value: formatNumber(totals.input_tokens), + ...count(totals.input_tokens), }, { key: "output", label: t("tokenUsage.output"), - value: formatNumber(totals.output_tokens), + ...count(totals.output_tokens), }, { key: "cacheRead", label: t("tokenUsage.cacheRead"), - value: formatNumber(totals.cache_read_tokens), + ...count(totals.cache_read_tokens), }, { key: "cacheHit", label: t("tokenUsage.cacheHit"), value: `${totals.cache_hit_percent.toFixed(1)}%`, }, - { key: "turns", label: t("tokenUsage.turns"), value: totals.turns }, + { + key: "turns", + label: t("tokenUsage.turns"), + ...count(totals.turns), + }, { key: "avg", label: t("tokenUsage.avgPerTurn"), - value: formatNumber(totals.avg_per_turn), + ...count(totals.avg_per_turn), }, ]; } @@ -492,6 +507,8 @@ function DonutCard({ emptyText: string; colors?: string[] | Record; }) { + const { i18n } = useTranslation(); + const locale = i18n.language; const colorFor = (name: string, index: number) => { if (Array.isArray(colors)) return colors[index % colors.length]; return colors[name] ?? CHART_COLORS[index % CHART_COLORS.length]; @@ -529,7 +546,9 @@ function DonutCard({ ))} formatNumber(Number(value ?? 0))} + formatter={(value) => + formatExactCount(Number(value ?? 0), locale) + } contentStyle={CHART_TOOLTIP_STYLE} /> @@ -566,7 +585,7 @@ function SummaryView({ byDay: UsageBucket[]; isMobile: boolean; }) { - const { t } = useTranslation(); + const { t, i18n } = useTranslation(); const ioData = useMemo( () => [ @@ -583,7 +602,7 @@ function SummaryView({ return (
@@ -663,7 +682,8 @@ function DimensionView({ totals: UsageSummary; isMobile: boolean; }) { - const { t } = useTranslation(); + const { t, i18n } = useTranslation(); + const locale = i18n.language; const chartBuckets = useMemo(() => { if (granularity === "by_day") return [...buckets].reverse(); @@ -679,7 +699,7 @@ function DimensionView({ return (
@@ -758,15 +778,17 @@ function DimensionView({
{b.label} - {formatNumber(b.total_tokens)} + {formatExactCount(b.total_tokens, locale)}
- {t("tokenUsage.input")} {formatNumber(b.input_tokens)} + {t("tokenUsage.input")}{" "} + {formatExactCount(b.input_tokens, locale)} - {t("tokenUsage.output")} {formatNumber(b.output_tokens)} + {t("tokenUsage.output")}{" "} + {formatExactCount(b.output_tokens, locale)} {t("tokenUsage.turnsCount", { count: b.turns })}
@@ -791,21 +813,21 @@ function DimensionView({ { title: t("tokenUsage.input"), dataIndex: "input_tokens", - render: formatNumber, + render: (value: number) => formatExactCount(value, locale), sorter: (a, b) => a.input_tokens - b.input_tokens, align: "right", }, { title: t("tokenUsage.output"), dataIndex: "output_tokens", - render: formatNumber, + render: (value: number) => formatExactCount(value, locale), sorter: (a, b) => a.output_tokens - b.output_tokens, align: "right", }, { title: t("tokenUsage.total"), dataIndex: "total_tokens", - render: formatNumber, + render: (value: number) => formatExactCount(value, locale), sorter: (a, b) => a.total_tokens - b.total_tokens, defaultSortOrder: "descend", align: "right", diff --git a/src/octop/api/routers/agents.py b/src/octop/api/routers/agents.py index 65e3d580e3..f4c4dbf933 100644 --- a/src/octop/api/routers/agents.py +++ b/src/octop/api/routers/agents.py @@ -145,6 +145,32 @@ def _agent_icon_url(row: Any, cfg: dict[str, Any]) -> str | None: return team_icon_url(stored) +def _viewer_mcp_servers( + row: Any, + *, + viewer_user_id: int | None, + server: Any | None, +) -> list[str]: + """MCP names for this viewer. Shared custom servers use the catalog name.""" + if (getattr(row, "kind", None) or "expert") == "team": + return [] + names = id_list_from_row(row, "mcp_servers") + owner_id = getattr(row, "user_id", None) + if ( + not names + or viewer_user_id is None + or not isinstance(owner_id, int) + or owner_id == viewer_user_id + or server is None + ): + return names + registry = getattr(getattr(server, "app_runtime", None), "agent_registry", None) + present = getattr(registry, "present_mcp_names_for_viewer", None) + if not callable(present): + return names + return list(present(owner_id, viewer_user_id, names)) + + def _row_dict( row: Any, *, @@ -190,11 +216,7 @@ def _row_dict( "color": row.color or cfg.get("color"), "skill_package_ids": packages, "knowledge_base_ids": id_list_from_row(row, "knowledge_base_ids"), - "mcp_servers": ( - [] - if (getattr(row, "kind", None) or "expert") == "team" - else id_list_from_row(row, "mcp_servers") - ), + "mcp_servers": _viewer_mcp_servers(row, viewer_user_id=viewer_user_id, server=server), "published_expert_id": row.published_expert_id, "welcome_message": welcome_from_row(row), "is_shared": bool(int(getattr(row, "is_shared", 0) or 0)), diff --git a/src/octop/infra/agents/manager.py b/src/octop/infra/agents/manager.py index 7143ebbd87..aa4263cffa 100644 --- a/src/octop/infra/agents/manager.py +++ b/src/octop/infra/agents/manager.py @@ -445,6 +445,46 @@ def _sanitize_bound_mcp_tools(agent: Any) -> None: agent.replace_mcp_tools(tools) +def _bind_custom_mcp_tools( + agent: Any, + name: str, + tools: list[Any], + *, + user_id: int | None, +) -> None: + """Attach custom MCP tools, replacing that server when another user owns the slot. + + A shared expert's harness has one short name. The owner's tools and a + viewer's same-named server both land on ``{name}_*``, and ``append`` keeps + the first set. Record who was bound so the next turn can swap. + """ + prefix = f"{name}_" + current_names: Any = getattr(agent, "_mcp_tool_name_set", frozenset()) + occupied = isinstance(current_names, frozenset) and any( + isinstance(tool_name, str) and tool_name.startswith(prefix) for tool_name in current_names + ) + if occupied: + existing = getattr(agent, "_mcp_tools", None) + kept = ( + [ + tool + for tool in existing + if not str(getattr(tool, "name", "") or "").startswith(prefix) + ] + if isinstance(existing, list) + else [] + ) + agent.replace_mcp_tools([*kept, *tools]) + else: + agent.append_mcp_tools(tools) + if user_id is None: + return + book = getattr(agent, "_mcp_attached_user", None) + attached: dict[str, int] = book if isinstance(book, dict) else {} + attached[name] = user_id + agent._mcp_attached_user = attached + + # --------------------------------------------------------------------------- # AgentManager # --------------------------------------------------------------------------- @@ -2355,6 +2395,7 @@ def merge_turn_mcp_servers( *, apply_defaults: bool | None = None, extra_defaults: list[str] | None = None, + agent_owner_id: int | None = None, ) -> list[str] | None: """Resolve turn MCP servers vs default_open plus optional expert defaults.""" return self._connector_svc.merge_turn_mcp_servers( @@ -2362,6 +2403,48 @@ def merge_turn_mcp_servers( explicit, apply_defaults=apply_defaults, extra_defaults=extra_defaults, + agent_owner_id=agent_owner_id, + ) + + def present_mcp_names_for_viewer( + self, + owner_user_id: int, + viewer_user_id: int, + names: list[str], + ) -> list[str]: + """Catalog names a non-owner selects for this expert's stored MCP picks.""" + return self._connector_svc.present_mcp_names_for_viewer( + owner_user_id=owner_user_id, + viewer_user_id=viewer_user_id, + names=names, + ) + + def align_mcp_names_to_harness( + self, + owner_user_id: int, + viewer_user_id: int, + names: list[str], + ) -> list[str]: + """Viewer catalog names → names registered on the expert owner's harness.""" + return self._connector_svc.align_mcp_names_to_harness( + owner_user_id=owner_user_id, + viewer_user_id=viewer_user_id, + names=names, + ) + + def mcp_names_for_chips( + self, + owner_user_id: int, + viewer_user_id: int, + requested: list[str], + harness_names: list[str], + ) -> list[str]: + """History-chip names for the MCP servers actually attached to the turn.""" + return self._connector_svc.mcp_names_for_chips( + owner_user_id=owner_user_id, + viewer_user_id=viewer_user_id, + requested=requested, + harness_names=harness_names, ) def default_mcp_servers(self, agent_id: str) -> list[str]: @@ -2405,9 +2488,51 @@ async def prepare_chat_mcp( uid = self._connector_uid_for(row, connector_user_id=connector_user_id) if row else None if uid is None and connector_user_id is not None: uid = connector_user_id + owner_raw = getattr(row, "user_id", None) if row is not None else None + owner_id = owner_raw if isinstance(owner_raw, int) else None + requested = list(names) + aliases: dict[str, str] = {} + if owner_id is not None and uid is not None and owner_id != uid: + aliases = self._connector_svc.shared_custom_harness_aliases(owner_id) + names = [] + for name in requested: + mapped = aliases.get(name, name) + if mapped not in names: + names.append(mapped) + + custom_configs: dict[str, Any] = {} + load_user: dict[str, int] = {} + if uid is not None: + custom_configs = self._connector_svc.custom_harness_configs(uid) + load_user = dict.fromkeys(custom_configs, uid) + if aliases and uid is not None and owner_id is not None: + # Load the owner's spec when the turn asked for the shared server. + # A viewer's own server with the same short name stays theirs unless + # the collision-safe name was selected too. + viewer_own = set(self._connector_svc.get_custom_servers(uid)) + owner_backed = { + short + for long_name, short in aliases.items() + if long_name in requested or (short in requested and short not in viewer_own) + } + if owner_backed: + owner_configs = self._connector_svc.custom_harness_configs(owner_id) + for name in owner_backed: + spec = owner_configs.get(name) + if isinstance(spec, dict): + custom_configs[name] = spec + load_user[name] = owner_id tool_set: frozenset[str] = getattr(agent, "_mcp_tool_name_set", frozenset()) - missing_tools = [n for n in names if not any(t.startswith(f"{n}_") for t in tool_set)] + attached_raw = getattr(agent, "_mcp_attached_user", None) + attached: dict[str, int] = attached_raw if isinstance(attached_raw, dict) else {} + missing_tools: list[str] = [] + for name in names: + has_tools = any(tool_name.startswith(f"{name}_") for tool_name in tool_set) + expected = load_user.get(name) + if has_tools and (expected is None or attached.get(name) == expected): + continue + missing_tools.append(name) logger.info( "prepare_chat_mcp agent=%s connector_user_id=%s requested=%s tool_count=%d missing=%s", agent_id, @@ -2425,10 +2550,6 @@ async def prepare_chat_mcp( ) return [] - custom_configs: dict[str, Any] = {} - if uid is not None: - custom_configs = self._connector_svc.custom_harness_configs(uid) - custom_missing = [n for n in missing_tools if n in custom_configs] builtin_missing = [n for n in missing_tools if n not in custom_configs] @@ -2438,7 +2559,7 @@ async def prepare_chat_mcp( if not isinstance(spec, dict) or not spec.get("transport"): continue try: - tools = await self._get_or_load_mcp_tools(uid, name, spec) + tools = await self._get_or_load_mcp_tools(load_user.get(name, uid), name, spec) except Exception: logger.exception( "prepare_chat_mcp agent=%s: failed loading custom MCP %s", @@ -2448,7 +2569,13 @@ async def prepare_chat_mcp( continue if tools: try: - agent.append_mcp_tools(tools) + bound_user = load_user.get(name, uid) + _bind_custom_mcp_tools( + agent, + name, + tools, + user_id=bound_user if isinstance(bound_user, int) else None, + ) except Exception: logger.exception( "prepare_chat_mcp agent=%s: append_mcp_tools failed for %s", @@ -2538,7 +2665,9 @@ async def prepare_chat_mcp( if not isinstance(spec, dict) or not spec.get("transport"): continue try: - tools = await self._get_or_load_mcp_tools(uid, name, spec) + tools = await self._get_or_load_mcp_tools( + load_user.get(name, uid), name, spec + ) except Exception: logger.exception( "prepare_chat_mcp agent=%s: re-inject custom MCP %s failed", @@ -2547,7 +2676,13 @@ async def prepare_chat_mcp( ) continue if tools: - agent.append_mcp_tools(tools) + bound_user = load_user.get(name, uid) + _bind_custom_mcp_tools( + agent, + name, + tools, + user_id=bound_user if isinstance(bound_user, int) else None, + ) agent.config.mcp_server_configs[name] = dict(spec) tool_set = getattr(agent, "_mcp_tool_name_set", frozenset()) @@ -2560,6 +2695,14 @@ async def prepare_chat_mcp( agent_id, still_missing, ) + if aliases: + short_to_long = {short: long for long, short in aliases.items()} + still_missing = [ + short_to_long[name] + if name in short_to_long and short_to_long[name] in requested + else name + for name in still_missing + ] return still_missing async def _attach_gateway_tools( diff --git a/src/octop/infra/connectors/service.py b/src/octop/infra/connectors/service.py index e5dfbd9559..67d1d542f6 100644 --- a/src/octop/infra/connectors/service.py +++ b/src/octop/infra/connectors/service.py @@ -513,6 +513,108 @@ def list_instances_for_api(self, user_id: int) -> list[dict[str, Any]]: item["usable"] = True return out + def shared_custom_harness_aliases(self, owner_user_id: int) -> dict[str, str]: + """Map a viewer's collision-safe name to the owner's harness server name. + + The owner's custom server is registered as ``doris``. Everyone else + addresses the same shared server as ``custom__{instance}__doris``. + A shared expert's harness only knows the short name. + """ + if not self._repo.connector_feature_allows(owner_user_id): + return {} + parent = self._repo.get_by_user_kind(owner_user_id, CUSTOM_MCP_KIND) + if parent is None or not parent.has_credentials: + return {} + aliases: dict[str, str] = {} + for name, spec in extract_servers(self.decrypt(parent.instance_id)).items(): + if ( + not isinstance(spec, dict) + or spec.get("shared") is not True + or not server_enabled(spec) + ): + continue + aliases[shared_mcp_server_name(parent.instance_id, name)] = name + return aliases + + def align_mcp_names_to_harness( + self, + *, + owner_user_id: int | None, + viewer_user_id: int, + names: list[str], + ) -> list[str]: + """Rewrite viewer-facing shared custom names onto the agent's harness. + + Other names are left unchanged. The owner already speaks harness names. + """ + if owner_user_id is None or owner_user_id == viewer_user_id or not names: + return list(names) + aliases = self.shared_custom_harness_aliases(owner_user_id) + if not aliases: + return list(names) + out: list[str] = [] + for name in names: + mapped = aliases.get(name, name) + if mapped not in out: + out.append(mapped) + return out + + def present_mcp_names_for_viewer( + self, + *, + owner_user_id: int | None, + viewer_user_id: int, + names: list[str], + ) -> list[str]: + """Show a non-owner the catalog names they can actually select. + + Owner short names of shared custom servers become the collision-safe + name. Servers the viewer cannot use are omitted. + """ + if owner_user_id is None or owner_user_id == viewer_user_id: + return list(names) + aliases = self.shared_custom_harness_aliases(owner_user_id) + reverse: dict[str, str] = {} + for long_name, short_name in aliases.items(): + reverse.setdefault(short_name, long_name) + allowed = set(self.list_active_mcp_server_names(viewer_user_id)) + out: list[str] = [] + for name in names: + shown = reverse.get(name, name) + if shown in allowed and shown not in out: + out.append(shown) + return out + + def mcp_names_for_chips( + self, + *, + owner_user_id: int | None, + viewer_user_id: int, + requested: list[str], + harness_names: list[str], + ) -> list[str]: + """Catalog names for the servers that will actually run this turn. + + A viewer's own server keeps its short name. The owner's shared server + shows the collision-safe name when that is what was selected. Selecting + both collapses to the shared server, so only that chip is returned. + """ + if owner_user_id is None or owner_user_id == viewer_user_id: + return list(requested) + aliases = self.shared_custom_harness_aliases(owner_user_id) + short_to_long = {short: long for long, short in aliases.items()} + active = set(harness_names) + out: list[str] = [] + for name in requested: + mapped = aliases.get(name, name) + if mapped not in active: + continue + shared_label = short_to_long.get(mapped) + shown = shared_label if shared_label is not None and shared_label in requested else name + if shown not in out: + out.append(shown) + return out + def list_active_mcp_server_names(self, user_id: int) -> list[str]: if not self._repo.connector_feature_allows(user_id): return [] @@ -560,6 +662,7 @@ def merge_turn_mcp_servers( *, apply_defaults: bool | None = None, extra_defaults: list[str] | None = None, + agent_owner_id: int | None = None, ) -> list[str] | None: """Resolve turn MCP servers vs the user's default_open set. @@ -568,13 +671,30 @@ def merge_turn_mcp_servers( defaults when the job has no picks; explicit Cron picks win as-is. ``extra_defaults`` (expert composer picks) are unioned with default_open when defaults apply, but only names still available to *user_id*. + + When ``agent_owner_id`` is another user, an expert pick stored under the + owner's short custom-MCP name is returned as the viewer's catalog name + (``custom__...``) when that server is shared. Callers translate to the + harness short name only when building the model request. """ + aliases: dict[str, str] = {} + if agent_owner_id is not None and agent_owner_id != user_id: + aliases = self.shared_custom_harness_aliases(agent_owner_id) defaults = list(self.list_default_open_mcp_server_names(user_id)) if extra_defaults: allowed = set(self.list_active_mcp_server_names(user_id)) + short_to_long = {short: long for long, short in aliases.items()} for name in extra_defaults: text = str(name).strip() - if text and text in allowed and text not in defaults: + if not text: + continue + viewer_name = short_to_long.get(text) + # The viewer's own server can share the short name. Keep the + # shared server under its catalog name instead of skipping it. + if viewer_name is not None and viewer_name in allowed: + if viewer_name not in defaults: + defaults.append(viewer_name) + elif text in allowed and text not in defaults: defaults.append(text) return merge_mcp_servers_with_defaults( explicit, diff --git a/src/octop/infra/cron/delivery.py b/src/octop/infra/cron/delivery.py index 2e17156776..a06fe6630f 100644 --- a/src/octop/infra/cron/delivery.py +++ b/src/octop/infra/cron/delivery.py @@ -198,35 +198,39 @@ async def _build_agent_request( ) -> dict[str, Any]: from octop.infra.agents.teams import is_team_agent - if is_team_agent(self._agent_manager.get_row(command.agent_id)): + row = self._agent_manager.get_row(command.agent_id) + if is_team_agent(row): + requested: list[str] = [] servers: list[str] = [] + shown_servers: list[str] = [] else: - servers = [name.strip() for name in command.mcp_servers if name.strip()] + owner_raw = getattr(row, "user_id", None) if row is not None else None + owner_id = owner_raw if isinstance(owner_raw, int) else None + picked = [name.strip() for name in command.mcp_servers if name.strip()] extra_defaults = self._agent_manager.default_mcp_servers(command.agent_id) - if servers: - servers = ( - self._agent_manager.merge_turn_mcp_servers( - session.user_id, - servers, - apply_defaults=False, - extra_defaults=extra_defaults, - ) - or [] + requested = ( + self._agent_manager.merge_turn_mcp_servers( + session.user_id, + picked or None, + apply_defaults=not picked, + extra_defaults=extra_defaults, + agent_owner_id=owner_id, ) - else: - servers = ( - self._agent_manager.merge_turn_mcp_servers( - session.user_id, - None, - apply_defaults=True, - extra_defaults=extra_defaults, - ) - or [] + or [] + ) + servers = requested + shown_servers = requested + if owner_id is not None and owner_id != session.user_id and requested: + servers = self._agent_manager.align_mcp_names_to_harness( + owner_id, session.user_id, requested ) - if servers: + shown_servers = self._agent_manager.mcp_names_for_chips( + owner_id, session.user_id, requested, servers + ) + if requested: failed = await self._agent_manager.prepare_chat_mcp( command.agent_id, - servers, + requested, connector_user_id=session.user_id, ) if failed: @@ -235,7 +239,7 @@ async def _build_agent_request( row = self._agent_manager.get_row(command.agent_id) default_model = (row.default_model if row is not None else None) or None composer = build_composer_context( - mcp_servers=servers or None, + mcp_servers=shown_servers or None, skills=None, target_agent_ids=None, model_ref=command.model, diff --git a/src/octop/infra/gateway/process/processor.py b/src/octop/infra/gateway/process/processor.py index 7a99fe5a6e..1676b8678e 100644 --- a/src/octop/infra/gateway/process/processor.py +++ b/src/octop/infra/gateway/process/processor.py @@ -8,7 +8,7 @@ from collections.abc import AsyncIterator from dataclasses import dataclass from types import SimpleNamespace -from typing import TYPE_CHECKING, Any, Literal +from typing import TYPE_CHECKING, Any, Literal, NamedTuple from langchain_core.messages import AIMessage, BaseMessage, HumanMessage from octop_gateway.models import ( @@ -161,6 +161,13 @@ class _ResolvedModelRoute: automatic: bool +class _ResolvedTurnMcp(NamedTuple): + """Harness names go to the model; shown names go on history chips.""" + + harness: list[str] + shown: list[str] + + class GlobalProcessor: """Routes InboundMessages by ``tenant_id`` to the correct HarnessAgent.""" @@ -1064,13 +1071,15 @@ async def __call__(self, msg: InboundMessage) -> AsyncIterator[MessageEvent]: needs_multimodal=content_blocks_need_vision(content), ) model_ref = model_route.model_ref - mcp_servers = await self._resolve_turn_mcp_servers( + resolved_mcp = await self._resolve_turn_mcp_servers( agent_id=agent_id, user_id=user_id, explicit=None, apply_defaults=True, raise_on_failure=False, ) + mcp_servers = resolved_mcp.harness if resolved_mcp is not None else None + shown_mcp = resolved_mcp.shown if resolved_mcp is not None else None message_kwargs: dict[str, Any] = {} attachments = inbound_attachments_from_parts(msg.content) if attachments: @@ -1084,7 +1093,7 @@ async def __call__(self, msg: InboundMessage) -> AsyncIterator[MessageEvent]: row = self._agent_repo.get(agent_id) default_model = (row.default_model if row is not None else None) or None composer = build_composer_context( - mcp_servers=mcp_servers, + mcp_servers=shown_mcp, skills=None, target_agent_ids=None, model_ref=model_ref, @@ -1740,17 +1749,21 @@ async def _build_dashboard_request( else: explicit_mcp = None apply_defaults = True - mcp_servers = await self._resolve_turn_mcp_servers( + resolved_mcp = await self._resolve_turn_mcp_servers( agent_id=agent_id, user_id=user_id, explicit=explicit_mcp, apply_defaults=apply_defaults, ) + mcp_servers = resolved_mcp.harness if resolved_mcp is not None else None + shown_mcp = resolved_mcp.shown if resolved_mcp is not None else None if mcp_servers: - # Keep history chips aligned with the servers actually injected. + # History chips use the viewer's catalog names. The harness request + # below keeps the names registered on the shared expert. + shown = shown_mcp if shown_mcp is not None else mcp_servers if isinstance(composer, dict) and composer: stamped = dict(composer) - stamped["connectors"] = list(mcp_servers) + stamped["connectors"] = list(shown) message_kwargs[COMPOSER_CTX_KEY] = stamped else: from octop.infra.gateway.process.message_keys import ( # noqa: PLC0415 @@ -1760,7 +1773,7 @@ async def _build_dashboard_request( row = self._agent_repo.get(agent_id) default_model = (row.default_model if row is not None else None) or None built = build_composer_context( - mcp_servers=mcp_servers, + mcp_servers=shown, skills=meta.get("skills") if isinstance(meta.get("skills"), list) else None, target_agent_ids=None, model_ref=model_ref, @@ -1949,7 +1962,7 @@ async def _resolve_turn_mcp_servers( explicit: list[str] | None, apply_defaults: bool | None = None, raise_on_failure: bool = True, - ) -> list[str] | None: + ) -> _ResolvedTurnMcp | None: """Merge turn picks with default_open and ensure tools are loaded. Dashboard / HTTP paths should keep ``raise_on_failure=True`` so the @@ -1960,8 +1973,11 @@ async def _resolve_turn_mcp_servers( from octop.infra.errors import ErrorCode, OctopError # noqa: PLC0415 # Team hosts only dispatch — never attach MCP tools. - if is_team_agent(self._agent_manager.get_row(agent_id)): + row = self._agent_manager.get_row(agent_id) + if is_team_agent(row): return None + owner_raw = getattr(row, "user_id", None) if row is not None else None + owner_id = owner_raw if isinstance(owner_raw, int) else None extra_defaults = self._agent_manager.default_mcp_servers(agent_id) merged = self._agent_manager.merge_turn_mcp_servers( @@ -1969,9 +1985,15 @@ async def _resolve_turn_mcp_servers( explicit, apply_defaults=apply_defaults, extra_defaults=extra_defaults, + agent_owner_id=owner_id, ) if not merged: return None + harness = list(merged) + shown = list(merged) + if owner_id is not None and owner_id != user_id: + harness = self._agent_manager.align_mcp_names_to_harness(owner_id, user_id, merged) + shown = self._agent_manager.mcp_names_for_chips(owner_id, user_id, merged, harness) failed = await self._agent_manager.prepare_chat_mcp( agent_id, merged, @@ -1988,7 +2010,7 @@ async def _resolve_turn_mcp_servers( detail, ) return None - return merged + return _ResolvedTurnMcp(harness=harness, shown=shown) async def _record_stream_error( self, diff --git a/tests/unit/agents/test_agent_manager.py b/tests/unit/agents/test_agent_manager.py index b269cf0139..3ff9950648 100644 --- a/tests/unit/agents/test_agent_manager.py +++ b/tests/unit/agents/test_agent_manager.py @@ -2674,6 +2674,151 @@ def test_mcp_tool_filter_uses_server_prefix(manager: AgentManager) -> None: assert len(filtered) == 2 +def _seed_user(manager: AgentManager, username: str) -> int: + with manager._repos.db.transaction() as conn: + conn.execute( + "INSERT INTO users(username, password_hash, role, created_at) VALUES (?, ?, ?, 0)", + (username, "h", "user"), + ) + row = conn.execute("SELECT id FROM users WHERE username = ?", (username,)).fetchone() + assert row is not None + return int(row["id"]) + + +@pytest.mark.asyncio +async def test_prepare_chat_mcp_loads_shared_server_as_owner( + manager: AgentManager, + monkeypatch: pytest.MonkeyPatch, +) -> None: + """A viewer's catalog name loads the owner's tools under the harness short name.""" + owner_id = _seed_user(manager, "mcp-owner") + viewer_id = _seed_user(manager, "mcp-viewer") + manager._connector_svc.put_custom_servers( + owner_id, + { + "doris": { + "transport": "streamable_http", + "url": "https://doris.example.com/mcp", + "shared": True, + } + }, + ) + manager._connector_svc.put_custom_servers( + viewer_id, + { + "doris": { + "transport": "streamable_http", + "url": "https://viewer.example.com/mcp", + } + }, + ) + shared_name = next(iter(manager._connector_svc.shared_custom_harness_aliases(owner_id))) + agent_id = manager._repos.agent_repo.create( + agent_id="SHAREDMCP", + user_id=owner_id, + name="shared", + mcp_servers='["doris"]', + ) + agent = MagicMock() + agent._mcp_tools = [] + agent._mcp_tool_name_set = frozenset() + agent.config.mcp_server_configs = {"doris": {}} + loaded: list[tuple[int, str]] = [] + + def _tool_names() -> frozenset[str]: + return frozenset( + str(getattr(tool, "name", "")) + for tool in agent._mcp_tools + if getattr(tool, "name", None) + ) + + def _append(tools: list[Any]) -> None: + agent._mcp_tools = list(tools) + list(agent._mcp_tools) + agent._mcp_tool_name_set = _tool_names() + + def _replace(tools: list[Any]) -> None: + agent._mcp_tools = list(tools) + agent._mcp_tool_name_set = _tool_names() + + agent.append_mcp_tools = MagicMock(side_effect=_append) + agent.replace_mcp_tools = MagicMock(side_effect=_replace) + + async def fake_load(user_id: int, server_name: str, _spec: dict[str, Any]) -> list[Any]: + loaded.append((user_id, server_name)) + tool = MagicMock() + tool.name = f"{server_name}_ping_{user_id}" + return [tool] + + monkeypatch.setattr(manager, "get_agent", lambda _agent_id: agent) + monkeypatch.setattr(manager, "_get_or_load_mcp_tools", fake_load) + + missing = await manager.prepare_chat_mcp( + agent_id, + [shared_name], + connector_user_id=viewer_id, + ) + assert missing == [] + assert loaded == [(owner_id, "doris")] + agent.append_mcp_tools.assert_called_once() + agent.replace_mcp_tools.assert_not_called() + + # The owner's tools stay on the running expert. The viewer's own server + # must replace that slot instead of looking "already loaded". + missing_own = await manager.prepare_chat_mcp( + agent_id, + ["doris"], + connector_user_id=viewer_id, + ) + assert missing_own == [] + assert loaded == [(owner_id, "doris"), (viewer_id, "doris")] + assert agent._mcp_tool_name_set == {f"doris_ping_{viewer_id}"} + agent.replace_mcp_tools.assert_called_once() + + +@pytest.mark.asyncio +async def test_prepare_chat_mcp_reports_failure_in_caller_name( + manager: AgentManager, + monkeypatch: pytest.MonkeyPatch, +) -> None: + owner_id = _seed_user(manager, "mcp-owner-2") + viewer_id = _seed_user(manager, "mcp-viewer-2") + manager._connector_svc.put_custom_servers( + owner_id, + { + "doris": { + "transport": "streamable_http", + "url": "https://doris.example.com/mcp", + "shared": True, + } + }, + ) + shared_name = next(iter(manager._connector_svc.shared_custom_harness_aliases(owner_id))) + agent_id = manager._repos.agent_repo.create( + agent_id="SHAREFAIL", + user_id=owner_id, + name="shared", + ) + agent = MagicMock() + agent._mcp_tool_name_set = frozenset() + agent.config.mcp_server_configs = {} + + async def fake_load(_user_id: int, _server_name: str, _spec: dict[str, Any]) -> list[Any]: + raise RuntimeError("mcp down") + + monkeypatch.setattr(manager, "get_agent", lambda _agent_id: agent) + monkeypatch.setattr(manager, "_get_or_load_mcp_tools", fake_load) + monkeypatch.setattr(manager, "reload_connectors", AsyncMock()) + + missing = await manager.prepare_chat_mcp( + agent_id, + [shared_name, "notes"], + connector_user_id=viewer_id, + ) + assert shared_name in missing + assert "doris" not in missing + assert "notes" in missing + + def test_prepare_stream_request_maps_max_iters_to_recursion_limit( manager: AgentManager, monkeypatch: pytest.MonkeyPatch, diff --git a/tests/unit/connectors/test_custom_mcp.py b/tests/unit/connectors/test_custom_mcp.py index 85ffdb187b..ad1568a3fc 100644 --- a/tests/unit/connectors/test_custom_mcp.py +++ b/tests/unit/connectors/test_custom_mcp.py @@ -122,6 +122,141 @@ def test_shared_custom_server_uses_collision_safe_name_for_viewer( assert svc.list_active_mcp_server_names(viewer_id) == [shared_name] assert list(svc.custom_harness_configs(viewer_id)) == [shared_name] assert svc.list_default_open_mcp_server_names(viewer_id) == [] + assert svc.shared_custom_harness_aliases(owner_id) == {shared_name: "linear"} + assert svc.align_mcp_names_to_harness( + owner_user_id=owner_id, + viewer_user_id=viewer_id, + names=[shared_name, "linear"], + ) == ["linear"] + assert svc.present_mcp_names_for_viewer( + owner_user_id=owner_id, + viewer_user_id=viewer_id, + names=["linear", "private"], + ) == [shared_name] + # Explicit picks stay in the viewer's vocabulary. Harness translation is separate. + assert svc.merge_turn_mcp_servers( + viewer_id, + [shared_name], + apply_defaults=False, + extra_defaults=["linear", "private"], + agent_owner_id=owner_id, + ) == [shared_name] + assert ( + svc.merge_turn_mcp_servers( + viewer_id, + [], + apply_defaults=False, + extra_defaults=["linear"], + agent_owner_id=owner_id, + ) + is None + ) + assert svc.merge_turn_mcp_servers( + viewer_id, + None, + apply_defaults=True, + extra_defaults=["linear", "private"], + agent_owner_id=owner_id, + ) == [shared_name] + assert svc.merge_turn_mcp_servers( + owner_id, + None, + apply_defaults=True, + extra_defaults=["linear"], + agent_owner_id=owner_id, + ) == ["linear"] + + +def test_shared_custom_name_collision_keeps_viewer_server_distinct( + svc: ConnectorService, + db: SqlitePool, +) -> None: + """The viewer's own ``linear`` must not be rewritten to the owner's server.""" + owner_id = _ensure_user(db) + viewer_id = _ensure_second_user(db) + svc.put_custom_servers( + owner_id, + { + "linear": { + "transport": "streamable_http", + "url": "https://mcp.linear.app/mcp", + "shared": True, + }, + "paused": { + "transport": "streamable_http", + "url": "https://paused.example.com/mcp", + "shared": True, + "enabled": False, + }, + }, + ) + svc.put_custom_servers( + viewer_id, + { + "linear": { + "transport": "streamable_http", + "url": "https://viewer.example.com/mcp", + "default_open": True, + }, + "notes": { + "transport": "streamable_http", + "url": "https://notes.example.com/mcp", + }, + }, + ) + aliases = svc.shared_custom_harness_aliases(owner_id) + assert list(aliases.values()) == ["linear"] + shared_name = next(iter(aliases)) + + # IM/default path: expert pick is the shared server; viewer's default_open stays. + merged = svc.merge_turn_mcp_servers( + viewer_id, + None, + apply_defaults=True, + extra_defaults=["linear", "paused"], + agent_owner_id=owner_id, + ) + assert merged == ["linear", shared_name] + harness = svc.align_mcp_names_to_harness( + owner_user_id=owner_id, + viewer_user_id=viewer_id, + names=merged or [], + ) + # Both refer to a server named linear; the harness has one slot. + assert harness == ["linear"] + assert svc.mcp_names_for_chips( + owner_user_id=owner_id, + viewer_user_id=viewer_id, + requested=merged or [], + harness_names=harness, + ) == [shared_name] + + own_only = ["linear", "notes"] + assert svc.align_mcp_names_to_harness( + owner_user_id=owner_id, + viewer_user_id=viewer_id, + names=own_only, + ) == ["linear", "notes"] + assert svc.mcp_names_for_chips( + owner_user_id=owner_id, + viewer_user_id=viewer_id, + requested=own_only, + harness_names=["linear", "notes"], + ) == ["linear", "notes"] + + both = [shared_name, "linear", "notes"] + both_harness = svc.align_mcp_names_to_harness( + owner_user_id=owner_id, + viewer_user_id=viewer_id, + names=both, + ) + assert both_harness == ["linear", "notes"] + assert svc.mcp_names_for_chips( + owner_user_id=owner_id, + viewer_user_id=viewer_id, + requested=both, + harness_names=both_harness, + ) == [shared_name, "notes"] def test_rejects_public_http_and_allows_lan(): diff --git a/tests/unit/cron/test_cron_composer_context.py b/tests/unit/cron/test_cron_composer_context.py index 1247a6e1fe..16f7cb613f 100644 --- a/tests/unit/cron/test_cron_composer_context.py +++ b/tests/unit/cron/test_cron_composer_context.py @@ -81,7 +81,7 @@ async def _stream(_aid: str, request: dict): agent_manager = MagicMock() agent_manager.merge_turn_mcp_servers = MagicMock( - side_effect=lambda _uid, explicit, apply_defaults=None, extra_defaults=None: ( + side_effect=lambda _uid, explicit, apply_defaults=None, extra_defaults=None, agent_owner_id=None: ( list(explicit) if explicit else None ) ) @@ -143,7 +143,7 @@ async def _stream(_aid: str, request: dict): await service.deliver(_command(mcp_servers=())) agent_manager.merge_turn_mcp_servers.assert_called_once_with( - 1, None, apply_defaults=True, extra_defaults=[] + 1, None, apply_defaults=True, extra_defaults=[], agent_owner_id=None ) agent_manager.prepare_chat_mcp.assert_awaited() gateway.push_session_text.assert_awaited() @@ -216,7 +216,7 @@ async def _stream(_aid: str, request: dict): await service.deliver(_command(mcp_servers=("picked__1",))) agent_manager.merge_turn_mcp_servers.assert_called_once_with( - 1, ["picked__1"], apply_defaults=False, extra_defaults=[] + 1, ["picked__1"], apply_defaults=False, extra_defaults=[], agent_owner_id=None ) gateway.push_session_text.assert_awaited() diff --git a/tests/unit/gateway/test_processor_default_open.py b/tests/unit/gateway/test_processor_default_open.py index 1c5c64265e..f51c9cb400 100644 --- a/tests/unit/gateway/test_processor_default_open.py +++ b/tests/unit/gateway/test_processor_default_open.py @@ -71,7 +71,7 @@ async def fake_project_stream(_mgr, _aid, request, **_kwargs): assert events agent_manager.merge_turn_mcp_servers.assert_called_once_with( - 7, None, apply_defaults=True, extra_defaults=[] + 7, None, apply_defaults=True, extra_defaults=[], agent_owner_id=None ) agent_manager.prepare_chat_mcp.assert_awaited_once() assert captured["request"]["mcp_servers"] == ["docs__1"] @@ -233,7 +233,7 @@ async def test_dashboard_request_trusts_explicit_opt_out() -> None: ) assert "mcp_servers" not in request agent_manager.merge_turn_mcp_servers.assert_called_once_with( - 1, [], apply_defaults=False, extra_defaults=[] + 1, [], apply_defaults=False, extra_defaults=[], agent_owner_id=None ) From 901a134ab1328c177678bb665f32c2caf02eab08 Mon Sep 17 00:00:00 2001 From: seed30 <34020684+seed30@users.noreply.github.com> Date: Thu, 5 Nov 2026 21:28:31 +0800 Subject: [PATCH 5/9] Feat/cloud hosts console (#2778) * feat(cloud): add a Tencent CVM ops console with a resident expert The workbench can review instances, host metrics, and cluster trends after authorization, with a resident ops expert for patrol, diagnosis, and gated changes. * feat: bind the terminal to the ops engineer and align empty guides The terminal was still opening the previously selected expert's conversation. Bundle the ops engineer for the shell and its own chat, and use the same titled empty guides on skill packages, knowledge bases, and expert skills. * fix: give the bundled ops engineer a tech market scene Bundled experts other than the defaults must declare a scene from the market list. CI rejected ops-engineer because its manifest left scene empty. --- CHANGELOG.md | 3 + README.md | 1 + dashboard/package.json | 1 + dashboard/src/api/modules/octopThreads.ts | 6 +- dashboard/src/api/modules/terminalAi.ts | 30 +- dashboard/src/components/AgentSelector.tsx | 29 +- .../AssistantFrame/AssistantFrame.module.less | 256 +++ .../AssistantFrame/AssistantFrame.tsx | 461 +++++ .../src/components/BrowserAiPanel.module.less | 139 +- dashboard/src/components/BrowserAiPanel.tsx | 329 ++-- dashboard/src/hooks/useAgentThreadChat.ts | 267 ++- dashboard/src/hooks/useCvmOpsExpert.ts | 114 ++ dashboard/src/locales/en.json | 205 ++- dashboard/src/locales/zh.json | 205 ++- .../Channels/components/constants.test.ts | 1 - .../Skills/components/InstalledSkillsTab.tsx | 68 +- .../Skills/components/SkillPackagesTab.tsx | 60 +- .../components/HitlApprovalCard.module.less | 28 +- .../Chat/components/HitlApprovalCard.test.tsx | 13 +- .../Chat/components/HitlApprovalCard.tsx | 83 +- dashboard/src/pages/Chat/hooks/chatStore.ts | 42 +- dashboard/src/pages/Chat/hooks/useChat.ts | 25 +- .../components/CloudAiPanel.module.less | 493 ++++++ .../CloudHosts/components/CloudAiPanel.tsx | 874 +++++++++ .../components/CloudOverviewBoard.module.less | 877 +++++++++ .../components/CloudOverviewBoard.tsx | 867 +++++++++ .../components/ClusterDashboard.tsx | 278 +++ .../components/MetricHeatmap.module.less | 90 + .../CloudHosts/components/MetricHeatmap.tsx | 157 ++ .../components/MetricTrendChart.module.less | 187 ++ .../components/MetricTrendChart.tsx | 426 +++++ .../components/NodeDashboard.module.less | 237 +++ .../CloudHosts/components/NodeDashboard.tsx | 333 ++++ .../components/NodeDetailDrawer.module.less | 324 ++++ .../components/NodeDetailDrawer.tsx | 203 +++ .../components/NodeDetailView.module.less | 1294 ++++++++++++++ .../CloudHosts/components/NodeDetailView.tsx | 1480 ++++++++++++++++ .../components/NodeOverview.module.less | 334 ++++ .../CloudHosts/components/NodeOverview.tsx | 185 ++ .../Control/CloudHosts/index.module.less | 659 +++++++ .../src/pages/Control/CloudHosts/index.tsx | 1569 +++++++++++++++++ .../src/pages/Control/CloudHosts/theme.ts | 123 ++ .../Control/RemoteBrowser/index.module.less | 28 - .../src/pages/Control/RemoteBrowser/index.tsx | 209 +-- .../Control/RemoteDesktop/DesktopPanel.tsx | 73 +- .../Terminal/components/AiPanel.module.less | 148 +- .../Control/Terminal/components/AiPanel.tsx | 543 +++--- .../pages/Control/Terminal/index.module.less | 190 +- .../src/pages/Control/Terminal/index.tsx | 248 +-- .../pages/Control/Terminal/useOpsEngineer.ts | 95 + .../src/pages/Control/Workbench/index.tsx | 25 +- .../pages/KnowledgeBases/index.module.less | 17 +- dashboard/src/pages/KnowledgeBases/index.tsx | 101 +- .../src/pages/SkillPackages/index.module.less | 25 +- dashboard/src/pages/SkillPackages/index.tsx | 81 +- dashboard/vite.config.ts | 5 + pyproject.toml | 1 + src/octop/api/app.py | 2 + src/octop/api/routers/chat/history.py | 76 +- src/octop/api/routers/chat/ws.py | 36 +- src/octop/api/routers/cloud.py | 364 ++++ src/octop/api/routers/experts.py | 24 + src/octop/cli/commands/cloud.py | 125 ++ src/octop/cli/registry.py | 1 + src/octop/i18n/domains/stream.py | 14 + src/octop/i18n/en.json | 1 + src/octop/i18n/zh.json | 1 + .../experts/library/ops-engineer/IDENTITY.md | 24 + .../experts/library/ops-engineer/SOUL.md | 41 + .../library/ops-engineer/manifest.json | 138 ++ .../library/tencent-cvm-ops/HEARTBEAT.md | 54 + .../library/tencent-cvm-ops/IDENTITY.md | 38 + .../experts/library/tencent-cvm-ops/MEMORY.md | 42 + .../tencent-cvm-ops/RUNBOOK-common-issues.md | 160 ++ .../tencent-cvm-ops/RUNBOOK-disk-full.md | 143 ++ .../experts/library/tencent-cvm-ops/SOUL.md | 284 +++ ...06\347\272\247\346\240\207\345\207\206.md" | 67 + ...04\347\275\256\346\211\213\345\206\214.md" | 142 ++ ...36\346\273\232\350\247\204\350\214\203.md" | 64 + ...07\346\240\207\345\217\243\345\276\204.md" | 89 + ...63\350\201\224\346\250\241\345\274\217.md" | 69 + ...47\350\241\214\350\247\204\350\214\203.md" | 76 + .../library/tencent-cvm-ops/manifest.json | 143 ++ .../skills/cvm-ai-doctor/SKILL.md | 40 + .../references/cluster-deep-analysis.md | 464 +++++ .../references/cluster-discovery.md | 11 + .../references/cluster-health-score.md | 173 ++ .../references/cluster-quick-check.md | 229 +++ .../references/cluster-remediation.md | 215 +++ .../references/cvm-self-diagnosis-repair.md | 219 +++ .../resource-saturation-deep-combined.md | 345 ++++ .../resource-saturation-deep-cpu.md | 278 +++ .../resource-saturation-deep-disk.md | 343 ++++ .../resource-saturation-deep-memory.md | 282 +++ .../resource-saturation-deep-network.md | 297 ++++ .../references/resource-saturation-quick.md | 337 ++++ .../skill-collaboration-tencentcloud.md | 278 +++ .../references/system-logs-deep-auth.md | 111 ++ .../references/system-logs-deep-fs.md | 106 ++ .../references/system-logs-deep-kernel.md | 196 ++ .../references/system-logs-deep-oom.md | 176 ++ .../references/system-logs-deep-service.md | 102 ++ .../references/system-logs-quick.md | 327 ++++ .../cvm-ai-doctor/references/time-sync.md | 675 +++++++ .../skills/cvm-ai-doctor/scripts/README.md | 13 + .../cvm-ai-doctor/scripts/analyze_stats.sh | 287 +++ .../cvm-ai-doctor/scripts/cluster_deep_cpu.sh | 55 + .../scripts/cluster_deep_disk.sh | 56 + .../scripts/cluster_deep_memory.sh | 50 + .../scripts/cluster_deep_network.sh | 58 + .../cvm-ai-doctor/scripts/cluster_deep_ssh.sh | 53 + .../scripts/cluster_os_snapshot.sh | 39 + .../cvm-ai-doctor/scripts/cluster_score.sh | 292 +++ .../scripts/combined_analysis.sh | 259 +++ .../skills/cvm-ai-doctor/scripts/deep_scan.sh | 452 +++++ .../skills/cvm-ai-doctor/scripts/log_stats.sh | 36 + .../cvm-ai-doctor/scripts/quick_scan.ps1 | 182 ++ .../cvm-ai-doctor/scripts/quick_scan.sh | 415 +++++ .../skills/tencentcloud-infra/SKILL.md | 106 ++ .../skills/tencentcloud-infra/_meta.json | 6 + .../references/auto-check-resource.md | 90 + .../references/cbs-bindto-cvm.md | 437 +++++ .../references/cloud-service-healthcheck.md | 14 + .../references/cvm-security-check.md | 192 ++ .../references/diagnosis-report.html | 210 +++ .../references/diagnosis-report.md | 72 + .../tencentcloud-infra/scripts/cvm-patrol.sh | 116 ++ .../tencentcloud-infra/scripts/tat-exec.sh | 168 ++ .../scripts/tccli-oauth-helper.py | 548 ++++++ .../tencentcloud-infra/scripts/whoami.sh | 49 + src/octop/infra/cloud/__init__.py | 1 + src/octop/infra/cloud/tencent.py | 1015 +++++++++++ src/octop/infra/db/repos/thread_messages.py | 19 + src/octop/infra/gateway/hitl/coordinator.py | 24 + tests/integration/test_experts_api.py | 20 + tests/unit/agents/test_expert_catalog.py | 14 + tests/unit/gateway/test_hitl_channel.py | 49 + .../unit/infra/cloud/test_tencent_catalog.py | 171 ++ .../unit/infra/cloud/test_tencent_metrics.py | 127 ++ tests/unit/infra/cloud/test_tencent_mirror.py | 123 ++ tests/unit/infra/cloud/test_tencent_trend.py | 109 ++ uv.lock | 16 +- 142 files changed, 27074 insertions(+), 1436 deletions(-) create mode 100644 dashboard/src/components/AssistantFrame/AssistantFrame.module.less create mode 100644 dashboard/src/components/AssistantFrame/AssistantFrame.tsx create mode 100644 dashboard/src/hooks/useCvmOpsExpert.ts create mode 100644 dashboard/src/pages/Control/CloudHosts/components/CloudAiPanel.module.less create mode 100644 dashboard/src/pages/Control/CloudHosts/components/CloudAiPanel.tsx create mode 100644 dashboard/src/pages/Control/CloudHosts/components/CloudOverviewBoard.module.less create mode 100644 dashboard/src/pages/Control/CloudHosts/components/CloudOverviewBoard.tsx create mode 100644 dashboard/src/pages/Control/CloudHosts/components/ClusterDashboard.tsx create mode 100644 dashboard/src/pages/Control/CloudHosts/components/MetricHeatmap.module.less create mode 100644 dashboard/src/pages/Control/CloudHosts/components/MetricHeatmap.tsx create mode 100644 dashboard/src/pages/Control/CloudHosts/components/MetricTrendChart.module.less create mode 100644 dashboard/src/pages/Control/CloudHosts/components/MetricTrendChart.tsx create mode 100644 dashboard/src/pages/Control/CloudHosts/components/NodeDashboard.module.less create mode 100644 dashboard/src/pages/Control/CloudHosts/components/NodeDashboard.tsx create mode 100644 dashboard/src/pages/Control/CloudHosts/components/NodeDetailDrawer.module.less create mode 100644 dashboard/src/pages/Control/CloudHosts/components/NodeDetailDrawer.tsx create mode 100644 dashboard/src/pages/Control/CloudHosts/components/NodeDetailView.module.less create mode 100644 dashboard/src/pages/Control/CloudHosts/components/NodeDetailView.tsx create mode 100644 dashboard/src/pages/Control/CloudHosts/components/NodeOverview.module.less create mode 100644 dashboard/src/pages/Control/CloudHosts/components/NodeOverview.tsx create mode 100644 dashboard/src/pages/Control/CloudHosts/index.module.less create mode 100644 dashboard/src/pages/Control/CloudHosts/index.tsx create mode 100644 dashboard/src/pages/Control/CloudHosts/theme.ts create mode 100644 dashboard/src/pages/Control/Terminal/useOpsEngineer.ts create mode 100644 src/octop/api/routers/cloud.py create mode 100644 src/octop/cli/commands/cloud.py create mode 100644 src/octop/infra/agents/experts/library/ops-engineer/IDENTITY.md create mode 100644 src/octop/infra/agents/experts/library/ops-engineer/SOUL.md create mode 100644 src/octop/infra/agents/experts/library/ops-engineer/manifest.json create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/HEARTBEAT.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/IDENTITY.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/MEMORY.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/RUNBOOK-common-issues.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/RUNBOOK-disk-full.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/SOUL.md create mode 100644 "src/octop/infra/agents/experts/library/tencent-cvm-ops/kb/01-\345\267\241\346\243\200SOP\344\270\216\345\210\206\347\272\247\346\240\207\345\207\206.md" create mode 100644 "src/octop/infra/agents/experts/library/tencent-cvm-ops/kb/02-\345\270\270\350\247\201\346\225\205\351\232\234\345\244\204\347\275\256\346\211\213\345\206\214.md" create mode 100644 "src/octop/infra/agents/experts/library/tencent-cvm-ops/kb/03-\345\217\230\346\233\264\351\227\250\346\216\247\344\270\216\345\233\236\346\273\232\350\247\204\350\214\203.md" create mode 100644 "src/octop/infra/agents/experts/library/tencent-cvm-ops/kb/04-\350\205\276\350\256\257\344\272\221CVM\346\214\207\346\240\207\345\217\243\345\276\204.md" create mode 100644 "src/octop/infra/agents/experts/library/tencent-cvm-ops/kb/05-\350\257\212\346\226\255\346\226\271\346\263\225\350\256\272\344\270\216\351\233\206\347\276\244\345\205\263\350\201\224\346\250\241\345\274\217.md" create mode 100644 "src/octop/infra/agents/experts/library/tencent-cvm-ops/kb/06-TAT\350\277\234\347\250\213\346\211\247\350\241\214\350\247\204\350\214\203.md" create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/manifest.json create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/SKILL.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/references/cluster-deep-analysis.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/references/cluster-discovery.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/references/cluster-health-score.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/references/cluster-quick-check.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/references/cluster-remediation.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/references/cvm-self-diagnosis-repair.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/references/resource-saturation-deep-combined.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/references/resource-saturation-deep-cpu.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/references/resource-saturation-deep-disk.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/references/resource-saturation-deep-memory.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/references/resource-saturation-deep-network.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/references/resource-saturation-quick.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/references/skill-collaboration-tencentcloud.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/references/system-logs-deep-auth.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/references/system-logs-deep-fs.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/references/system-logs-deep-kernel.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/references/system-logs-deep-oom.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/references/system-logs-deep-service.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/references/system-logs-quick.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/references/time-sync.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/scripts/README.md create mode 100755 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/scripts/analyze_stats.sh create mode 100755 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/scripts/cluster_deep_cpu.sh create mode 100755 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/scripts/cluster_deep_disk.sh create mode 100755 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/scripts/cluster_deep_memory.sh create mode 100755 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/scripts/cluster_deep_network.sh create mode 100755 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/scripts/cluster_deep_ssh.sh create mode 100755 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/scripts/cluster_os_snapshot.sh create mode 100755 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/scripts/cluster_score.sh create mode 100755 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/scripts/combined_analysis.sh create mode 100755 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/scripts/deep_scan.sh create mode 100755 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/scripts/log_stats.sh create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/scripts/quick_scan.ps1 create mode 100755 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/cvm-ai-doctor/scripts/quick_scan.sh create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/tencentcloud-infra/SKILL.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/tencentcloud-infra/_meta.json create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/tencentcloud-infra/references/auto-check-resource.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/tencentcloud-infra/references/cbs-bindto-cvm.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/tencentcloud-infra/references/cloud-service-healthcheck.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/tencentcloud-infra/references/cvm-security-check.md create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/tencentcloud-infra/references/diagnosis-report.html create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/tencentcloud-infra/references/diagnosis-report.md create mode 100755 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/tencentcloud-infra/scripts/cvm-patrol.sh create mode 100755 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/tencentcloud-infra/scripts/tat-exec.sh create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/tencentcloud-infra/scripts/tccli-oauth-helper.py create mode 100644 src/octop/infra/agents/experts/library/tencent-cvm-ops/skills/tencentcloud-infra/scripts/whoami.sh create mode 100644 src/octop/infra/cloud/__init__.py create mode 100644 src/octop/infra/cloud/tencent.py create mode 100644 tests/unit/infra/cloud/test_tencent_catalog.py create mode 100644 tests/unit/infra/cloud/test_tencent_metrics.py create mode 100644 tests/unit/infra/cloud/test_tencent_mirror.py create mode 100644 tests/unit/infra/cloud/test_tencent_trend.py diff --git a/CHANGELOG.md b/CHANGELOG.md index 10f567eb91..01a668b79a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ ## [Unreleased] +### 新增 +- 工作台增加云主机页:授权腾讯云后查看 CVM 实例总览、单机指标与趋势,并由常驻运维专家做巡检、诊断和风险门控变更 + ### 变更 - 默认 Docker 标签 `:` 和 `:latest` 改为精简版。完整版使用 `:-full` 和 `:full` diff --git a/README.md b/README.md index 6c35a4c43f..9789ad100e 100644 --- a/README.md +++ b/README.md @@ -451,6 +451,7 @@ After `octop run`, open **http://127.0.0.1:8088**.

- **Chat** — real-time conversation with experts and teams +- **Cloud** — Tencent CVM fleet overview, instance metrics, and a resident ops expert - **Experts** — create experts, pick templates / MBTI personas, share or publish experts, configure providers - **AgentTeams** *(Beta)* — coordinator + member experts for multi-step work - **Connectors** — OAuth apps and MCP gateways diff --git a/dashboard/package.json b/dashboard/package.json index d1d3e6340c..8320c9ccb0 100644 --- a/dashboard/package.json +++ b/dashboard/package.json @@ -6,6 +6,7 @@ "scripts": { "dev": "vite --host", "build": "tsc -b && vite build", + "build:fast": "BUILD_FAST=1 vite build", "build:docker": "vite build", "build:prod": "tsc -b && vite build --mode production", "build:test": "tsc -b && vite build --mode test", diff --git a/dashboard/src/api/modules/octopThreads.ts b/dashboard/src/api/modules/octopThreads.ts index 1c7bc33945..75fa014ec7 100644 --- a/dashboard/src/api/modules/octopThreads.ts +++ b/dashboard/src/api/modules/octopThreads.ts @@ -166,9 +166,11 @@ export const octopThreadsApi = { `/agents/${encodeURIComponent(agentId)}/threads?limit=${limit}`, ), - create: (agentId: string) => + create: (agentId: string, options?: { rebind?: boolean }) => request<{ thread_id: string; session_key: string }>( - `/agents/${encodeURIComponent(agentId)}/threads`, + `/agents/${encodeURIComponent(agentId)}/threads${ + options?.rebind === false ? "?rebind=false" : "" + }`, { method: "POST" }, ), diff --git a/dashboard/src/api/modules/terminalAi.ts b/dashboard/src/api/modules/terminalAi.ts index d973e6c22f..8689509f99 100644 --- a/dashboard/src/api/modules/terminalAi.ts +++ b/dashboard/src/api/modules/terminalAi.ts @@ -11,20 +11,28 @@ export interface TerminalContext { agent_name: string; } +/** Bundled terminal expert. Distinct from the Tencent CVM ops expert. */ +export const OPS_ENGINEER_EXPERT_ID = "ops-engineer"; + +export interface CreatedOpsEngineer { + id: number; + agent_id: string; + name: string; + description: string; + state: string; + expert_id: string; +} + export const terminalAiApi = { getContext: (agentId: string) => request(`/agents/${agentId}/terminal/context`), createOpsEngineer: () => - request<{ - id: number; - agent_id: string; - name: string; - description: string; - state: string; - expert_id: string; - }>("/agents/from-expert/ops-engineer", { - method: "POST", - body: JSON.stringify({}), - }), + request( + `/agents/from-expert/${OPS_ENGINEER_EXPERT_ID}`, + { + method: "POST", + body: JSON.stringify({}), + }, + ), }; diff --git a/dashboard/src/components/AgentSelector.tsx b/dashboard/src/components/AgentSelector.tsx index e40f226582..e6412415ce 100644 --- a/dashboard/src/components/AgentSelector.tsx +++ b/dashboard/src/components/AgentSelector.tsx @@ -30,6 +30,12 @@ interface AgentSelectorProps { * expert-only. */ showTeams?: boolean; + /** + * 受控模式:只改这个面板自己的专家,不写入全局当前 Agent。 + * 传入 onChange 即生效。 + */ + value?: string | null; + onChange?: (agentId: string) => void; } function agentAccent(agent: OctopAgent): string { @@ -162,9 +168,17 @@ export default function AgentSelector({ variant = "auto", showLabel = true, showTeams = false, + value, + onChange, }: AgentSelectorProps) { const { t } = useTranslation(); const { agents, activeAgentId, setActiveAgent, loading } = useAgent(); + const controlled = onChange !== undefined; + const chosenId = controlled ? value ?? null : activeAgentId; + const commit = (id: string) => { + if (onChange) onChange(id); + else setActiveAgent(id); + }; const soloSelectable = useMemo(() => ownedSoloExperts(agents), [agents]); const allTeams = useMemo(() => ownedTeamAgents(agents), [agents]); const teamSelectable = useMemo( @@ -204,22 +218,23 @@ export default function AgentSelector({ teamSelectable.length, ); const labeledGroups = [...expertGroups, ...teamGroups]; - const activeAgent = agents.find((agent) => agent.agent_id === activeAgentId); + const activeAgent = agents.find((agent) => agent.agent_id === chosenId); const activeIsHiddenTeam = Boolean( activeAgent && isTeamAgent(activeAgent) && !showTeams, ); const useBar = variant !== "select"; - const currentId = activeAgentId ?? selectable[0]?.agent_id; + const currentId = + chosenId ?? (controlled ? undefined : selectable[0]?.agent_id); const barRef = useRef(null); const measureRef = useRef(null); const [hiddenIds, setHiddenIds] = useState([]); useEffect(() => { - if (loading) return; + if (controlled || loading) return; const next = nextPickerSelection(activeAgentId, agents, selectable); if (next === undefined) return; setActiveAgent(next); - }, [activeAgentId, agents, loading, selectable, setActiveAgent]); + }, [activeAgentId, agents, controlled, loading, selectable, setActiveAgent]); useLayoutEffect(() => { if (!useBar) return; @@ -337,7 +352,7 @@ export default function AgentSelector({ key={agent.agent_id} agent={agent} active={agent.agent_id === currentId} - onSelect={setActiveAgent} + onSelect={commit} measure={measure} groupKey={groupKey} /> @@ -377,7 +392,7 @@ export default function AgentSelector({ menu={{ className: styles.moreMenu, items: moreItems, - onClick: ({ key }) => setActiveAgent(key), + onClick: ({ key }) => commit(key), }} >
+
+ {children} +
+
+ + ); + + const frame = floating ? ( +
+ {shell} +
+ ) : dock === "overlay" ? ( +
+ {shell} +
+ ) : ( +
+ {shell} +
+ ); + + // 下拉和选择器默认叠在 1050,会落到浮动窗下面。 + const hosted = ( + + {frame} + + ); + + return overlay ? createPortal(hosted, document.body) : hosted; +} diff --git a/dashboard/src/components/BrowserAiPanel.module.less b/dashboard/src/components/BrowserAiPanel.module.less index 1a88d2c49e..88727b46e9 100644 --- a/dashboard/src/components/BrowserAiPanel.module.less +++ b/dashboard/src/components/BrowserAiPanel.module.less @@ -3,54 +3,24 @@ .panel { display: flex; flex-direction: column; + gap: 10px; + box-sizing: border-box; height: 100%; min-width: 0; + min-height: 0; flex: 1; - background: var(--fn-bg-primary); - border-left: 1px solid var(--fn-border-primary, rgba(0, 0, 0, 0.08)); + padding: 12px 16px 16px; + background: transparent; overflow: hidden; } -.panelBottom { - border-left: none; -} - -// ── Panel header ─────────────────────────────────────────────────────────── - -.header { - display: flex; - align-items: center; - justify-content: space-between; - padding: 8px 12px; - flex-shrink: 0; - border-bottom: 1px solid var(--fn-border-primary, rgba(0, 0, 0, 0.08)); - background: var(--fn-bg-secondary); - gap: 8px; -} - -.headerTitle { - display: flex; - align-items: center; - gap: 6px; - min-width: 0; - font-size: 13px; - font-weight: 600; - color: var(--fn-text-primary); -} - -.headerActions { - display: flex; - align-items: center; - gap: 2px; - flex-shrink: 0; -} - // ── Context section ──────────────────────────────────────────────────────── .contextSection { - padding: 8px 12px; - border-bottom: 1px solid var(--fn-border-primary, rgba(0, 0, 0, 0.08)); flex-shrink: 0; + padding: 9px 10px 10px; + background: var(--fn-bg-secondary); + border-radius: 10px; } .contextGrid { @@ -156,95 +126,34 @@ margin-top: 8px; } -// ── Send bar (bottom of panel — matches Terminal AiPanel style) ────────── - -.sendBar { - padding: 8px 12px; - border-top: 1px solid var(--fn-border-primary, rgba(0, 0, 0, 0.08)); - flex-shrink: 0; +.composer { display: flex; - flex-direction: row; - align-items: flex-end; + flex: 0 0 auto; + flex-direction: column; gap: 6px; + padding-top: 10px; + border-top: 1px solid var(--fn-border-secondary); } -.sendRow { - flex: 1; - min-width: 0; +.composerActions { display: flex; - align-items: flex-end; gap: 8px; + align-items: center; + justify-content: space-between; } -.sendTextarea { +.composerLead { + display: flex; flex: 1; + gap: 8px; + align-items: center; min-width: 0; - min-height: 32px; - max-height: 120px; - padding: 6px 10px; - border: 1px solid var(--fn-border-primary, rgba(0, 0, 0, 0.12)); - border-radius: 10px; - background: var(--fn-bg-primary); - color: var(--fn-text-primary); - font-size: 13px; - line-height: 1.4; - resize: none; - font-family: inherit; - overflow-y: auto; - scrollbar-width: none; /* Firefox */ - - &::-webkit-scrollbar { - display: none; /* Safari & Chrome */ - } - - &::placeholder { - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - } - - &:focus { - outline: none; - border-color: var(--fn-color-brand, #6366f1); - box-shadow: 0 0 0 2px rgba(99, 102, 241, 0.12); - } - - &:disabled { - opacity: 0.6; - cursor: not-allowed; - } } -.sendBtn { - display: inline-flex; - align-items: center; - justify-content: center; - width: 32px; - height: 32px; - flex-shrink: 0; - border-radius: 10px; - border: none; - background: linear-gradient( - 135deg, - var(--fn-color-brand), - var(--fn-color-brand-soft) - ); - color: #fff; - cursor: pointer; - transition: all 0.2s ease; - - &:hover:not(:disabled) { - transform: scale(1.05); - box-shadow: 0 4px 12px - color-mix(in srgb, var(--fn-color-brand) 35%, transparent); - } - - &:disabled { - opacity: 0.45; - cursor: not-allowed; - transform: none; - box-shadow: none; - } +.hint { + min-width: 0; + font-size: 11px; + opacity: 0.5; } // ── Recording indicator ───────────────────────────────────────────────── diff --git a/dashboard/src/components/BrowserAiPanel.tsx b/dashboard/src/components/BrowserAiPanel.tsx index 231035075b..819858aab7 100644 --- a/dashboard/src/components/BrowserAiPanel.tsx +++ b/dashboard/src/components/BrowserAiPanel.tsx @@ -5,13 +5,16 @@ import React, { useRef, useState, } from "react"; -import { Button, Tooltip, Tag, Spin } from "antd"; +import { Button, Input, Tooltip, Tag, Spin } from "antd"; import { message as antMessage } from "@/utils/antdMessage"; -import { Bot, X, Square, Play, Loader2, Send } from "lucide-react"; +import { Bot, Square, Play, Loader2, Send } from "lucide-react"; +import AssistantFrame, { + type AssistantPlacement, +} from "./AssistantFrame/AssistantFrame"; import { useTranslation } from "react-i18next"; import cx from "classnames"; -import type { OctopAgent } from "../context/AgentContext"; +import { useAgent } from "../context/AgentContext"; import AgentSelector from "../components/AgentSelector"; import { useAgentThreadChat } from "../hooks/useAgentThreadChat"; import { browserApi } from "../api/modules/browser"; @@ -28,13 +31,26 @@ export interface BrowserAiTabContext { active: boolean; } +const BROWSER_AI_AGENT_KEY = "octop:remote-browser:ai-agent"; + +function readBrowserAgentId(): string | null { + try { + return localStorage.getItem(BROWSER_AI_AGENT_KEY); + } catch { + return null; + } +} + interface BrowserAiPanelProps { - activeAgent: OctopAgent | null; tabs: BrowserAiTabContext[]; currentUrl: string; profileId?: string | null; onClose: () => void; - layout?: "right" | "bottom"; + placement: AssistantPlacement; + placementLocked?: boolean; + onPlacementChange: (placement: AssistantPlacement) => void; + /** 工作台切走时收起窗口,会话仍留在这个面板里。 */ + hidden?: boolean; /** Skill recording state from parent (RemoteBrowserPage) */ browserRecording?: boolean; browserRecordingId?: string | null; @@ -67,12 +83,14 @@ type RecordingPhase = | "recording"; export default function BrowserAiPanel({ - activeAgent, tabs, currentUrl, profileId, onClose, - layout = "right", + placement, + placementLocked = false, + onPlacementChange, + hidden = false, browserRecording = false, browserRecordingId = null, browserLastRecordingId = null, @@ -83,10 +101,6 @@ export default function BrowserAiPanel({ onSkillNameSet, }: BrowserAiPanelProps) { const { t } = useTranslation(); - const panelClassName = cx( - styles.panel, - layout === "bottom" && styles.panelBottom, - ); const [inputValue, setInputValue] = useState(""); const [browserReplayBusy, setBrowserReplayBusy] = useState(false); const [pendingSkillContent, setPendingSkillContent] = useState( @@ -95,17 +109,51 @@ export default function BrowserAiPanel({ const [pendingSkillName, setPendingSkillName] = useState(null); const [, setPendingSkillRecordingId] = useState(null); const workflowBusyRef = useRef(false); - const textareaRef = useRef(null); const imeComposingRef = useRef(false); // Recording workflow phase const [recordingPhase, setRecordingPhase] = useState("idle"); + const recordingTag = + browserRecording && recordingPhase !== "idle" ? ( + + ● REC{" "} + {skillName && recordingPhase === "recording" ? `— ${skillName}` : ""} + + ) : null; // Saved skill names for keyword-trigger replay const [savedSkillNames, setSavedSkillNames] = useState([]); + const { agents, activeAgentId } = useAgent(); + const [agentId, setAgentId] = useState(readBrowserAgentId); + const activeAgent = + agents.find((agent) => agent.agent_id === agentId) ?? null; const activeTab = useMemo(() => tabs.find((tab) => tab.active), [tabs]); - const agentId = activeAgent?.agent_id ?? null; + + useEffect(() => { + if (agentId && agents.some((agent) => agent.agent_id === agentId)) return; + if (!agents.length) return; + const fromGlobal = + activeAgentId && agents.some((agent) => agent.agent_id === activeAgentId) + ? activeAgentId + : null; + const next = fromGlobal ?? agents[0].agent_id; + setAgentId(next); + try { + localStorage.setItem(BROWSER_AI_AGENT_KEY, next); + } catch { + /* 忽略写入失败 */ + } + }, [agentId, agents, activeAgentId]); + + const chooseAgent = (id: string) => { + setAgentId(id); + try { + localStorage.setItem(BROWSER_AI_AGENT_KEY, id); + } catch { + /* 忽略写入失败 */ + } + }; // Load saved skill names from API on mount / agent change useEffect(() => { @@ -135,7 +183,7 @@ export default function BrowserAiPanel({ isStreaming, send, cancelStream, - } = useAgentThreadChat(agentId); + } = useAgentThreadChat(agentId, { pinKey: "octop:remote-browser:ai-thread" }); // When browserRecording transitions, sync phase useEffect(() => { @@ -190,7 +238,6 @@ export default function BrowserAiPanel({ const objective = text.trim(); if (!objective) return; setInputValue(""); - if (textareaRef.current) textareaRef.current.style.height = "auto"; setPendingSkillName(objective); if (onSkillNameSet) onSkillNameSet(objective); setRecordingPhase("awaitDescription"); @@ -205,7 +252,6 @@ export default function BrowserAiPanel({ (text: string) => { const description = text.trim(); setInputValue(""); - if (textareaRef.current) textareaRef.current.style.height = "auto"; setRecordingPhase("recording"); send(description); }, @@ -443,7 +489,6 @@ export default function BrowserAiPanel({ const text = inputValue.trim(); if (!text || isStreaming || !activeAgent) return; setInputValue(""); - if (textareaRef.current) textareaRef.current.style.height = "auto"; if (recordingPhase === "awaitObjective") { void handleObjectiveInput(text); @@ -501,16 +546,6 @@ export default function BrowserAiPanel({ [handleSend], ); - const handleTextareaInput = useCallback( - (e: React.ChangeEvent) => { - setInputValue(e.target.value); - const el = e.target; - el.style.height = "auto"; - el.style.height = `${Math.min(el.scrollHeight, 120)}px`; - }, - [], - ); - // When recording is active and agent stream just finished, append reminder const prevStreamingRef = useRef(false); useEffect(() => { @@ -576,75 +611,66 @@ export default function BrowserAiPanel({ ]); // No agent → show empty state + const frame = (content: React.ReactNode) => ( + + ); + if (!activeAgent) { - return ( -
-
-
- - {t("remoteBrowser.ai.title", "AI 助手")} -
- -
-
- -
- {t("remoteBrowser.ai.noAgentTitle", "请选择一个 Agent")} -
-
- {t( - "remoteBrowser.ai.noAgentDesc", - "浏览器右侧助手会复用当前 Agent 的对话能力。", - )} -
-
- -
+ return frame( +
+ +
+ {t("remoteBrowser.ai.noAgentTitle", "请选择一个 Agent")}
-
- ); - } - - return ( -
-
-
- - {t("remoteBrowser.ai.title", "AI 助手")} - {browserRecording && recordingPhase !== "idle" && ( - - ● REC{" "} - {skillName && recordingPhase === "recording" - ? `— ${skillName}` - : ""} - +
+ {t( + "remoteBrowser.ai.noAgentDesc", + "这里的专家和对话只属于浏览器,不会改到其他页签。", )}
-
- -
+
, + ); + } + return frame( + <>
{t("remoteBrowser.ai.expert", "专家")} - +
@@ -679,70 +705,81 @@ export default function BrowserAiPanel({ )}
-
- {/* Recording action buttons before the send row */} - {browserRecording && recordingPhase === "recording" && ( - - + + )} + {!browserRecording && + browserLastRecordingId && + !browserReplayBusy && ( + + + + )} + {browserReplayBusy && ( + + )} + {t("chat.composerHint")} + + {isStreaming ? ( + - - )} - {!browserRecording && browserLastRecordingId && !browserReplayBusy && ( - - - - )} - {browserReplayBusy && } -
-