فهرست منبع

发布 v0.4.12:支持 Cursor 桌面选择与 Docker 可选部署

Samien 2 ماه پیش
والد
کامیت
df24625087
60فایلهای تغییر یافته به همراه1368 افزوده شده و 189 حذف شده
  1. 8 6
      README.md
  2. 81 0
      compose.desktops.cursor.yaml
  3. 3 1
      compose.desktops.yaml
  4. 3 0
      deploy/compose-desktops.cursor.json
  5. 26 0
      deploy/computer/Dockerfile.cursor
  6. 6 0
      deploy/computer/cursor-browser.sh
  7. 86 0
      deploy/computer/cursor-desktop.py
  8. 7 1
      docker.env.example
  9. 14 3
      docs/bot-agent-teams.md
  10. 100 8
      docs/docker-install.md
  11. 12 4
      docs/local-vm.md
  12. 51 0
      docs/releases/v0.4.12.md
  13. 4 0
      docs/workspace-chat.md
  14. 2 2
      package-lock.json
  15. 1 1
      package.json
  16. 1 1
      playwright.config.ts
  17. 3 3
      release.json
  18. 68 19
      scripts/generate-desktop-compose.mjs
  19. 6 3
      src/client/components/app/LocalVmSettingsPanel.vue
  20. 2 2
      src/client/components/app/WorkspaceShell.vue
  21. 3 1
      src/client/components/common/YaoYaoSidebarIcon.vue
  22. 7 2
      src/client/components/workspace/LocalVmChatPanel.vue
  23. 87 24
      src/client/components/workspace/TaskPlan.vue
  24. 63 18
      src/client/views/ConversationsView.vue
  25. 10 5
      src/runner/agent.ts
  26. 6 4
      src/runner/computers/images.ts
  27. 39 12
      src/runner/computers/localVm.ts
  28. 1 1
      src/runner/worker/control.ts
  29. 10 3
      src/runner/worker/gateway.ts
  30. 3 2
      src/server/composeDesktops.ts
  31. 12 2
      src/server/localVm.ts
  32. 3 1
      src/server/runnerHub.ts
  33. 27 2
      src/server/taskCoordinator.ts
  34. 15 3
      src/server/workspaceRoutes.ts
  35. 16 1
      src/server/workspaceRuntime.ts
  36. 4 3
      src/server/workspaceScheduler.ts
  37. 24 8
      src/server/workspaceTeamTools.ts
  38. 2 0
      src/shared/agentTasks.ts
  39. 3 2
      src/shared/composeDesktops.ts
  40. 14 3
      src/shared/localVm.ts
  41. 2 0
      src/shared/workspace.ts
  42. 43 0
      tests/client/localVmImages.test.ts
  43. 39 0
      tests/client/taskPlan.test.ts
  44. 2 2
      tests/e2e/bot-panels.spec.ts
  45. 7 3
      tests/e2e/offlineUpdate.spec.ts
  46. 86 15
      tests/e2e/team-tools.spec.ts
  47. 4 2
      tests/e2e/workspace-chat.spec.ts
  48. 24 12
      tests/e2e/workspace.spec.ts
  49. 1 1
      tests/fixtures/fake-hermes.mjs
  50. 6 1
      tests/fixtures/workspace-server.ts
  51. 97 0
      tests/live/desktopImages.live.test.ts
  52. 1 1
      tests/live/localVm.live.test.ts
  53. 1 0
      tests/server/composeDesktops.test.ts
  54. 23 0
      tests/server/desktopComposeImages.test.ts
  55. 70 0
      tests/server/localVm.test.ts
  56. 8 0
      tests/server/localVmRoutes.test.ts
  57. 57 0
      tests/server/taskCoordinator.test.ts
  58. 17 0
      tests/server/workspace.test.ts
  59. 22 1
      tests/server/workspaceRoutes.test.ts
  60. 25 0
      tests/server/workspaceTeamTools.test.ts

+ 8 - 6
README.md

@@ -1,6 +1,6 @@
 # 夭夭 AI
 # 夭夭 AI
 
 
-当前 Web 与 macOS 桌面发布版本:**v0.4.11**。桌面版提供 Apple Silicon(arm64)DMG,详见 [发布说明](docs/releases/v0.4.11.md)。
+当前 Web 与 macOS 桌面发布版本:**v0.4.12**。桌面版提供 Apple Silicon(arm64)DMG,详见 [发布说明](docs/releases/v0.4.12.md)。
 
 
 夭夭 AI 为网页、iOS 和安卓提供统一的 Agent、群聊、文件库及语音配置服务。Hermes 通过标准 9119 HTTP/WebSocket 接口执行任务。
 夭夭 AI 为网页、iOS 和安卓提供统一的 Agent、群聊、文件库及语音配置服务。Hermes 通过标准 9119 HTTP/WebSocket 接口执行任务。
 
 
@@ -38,7 +38,7 @@ Web 数据默认保存在 `~/.yaoyao`,可用 `YAOYAO_HOME` 指定(兼容 `HE
 
 
 ## macOS 桌面版
 ## macOS 桌面版
 
 
-在 [v0.4.11 发布页](https://github.com/Lsamien/yaoyao/releases/tag/v0.4.11) 下载 `Yaoyao-0.4.11-arm64.dmg`,将“夭夭”拖到应用程序后打开。首次启动会核对并同步配套本机 Web 服务;普通退出保留后台运行,“停止后台服务并退出”可完整停止本应用管理的后台。详细说明见 [macOS App](docs/macos-app.md)。
+在 [v0.4.12 发布页](https://github.com/Lsamien/yaoyao/releases/tag/v0.4.12) 下载 `Yaoyao-0.4.12-arm64.dmg`,将“夭夭”拖到应用程序后打开。首次启动会核对并同步配套本机 Web 服务;普通退出保留后台运行,“停止后台服务并退出”可完整停止本应用管理的后台。详细说明见 [macOS App](docs/macos-app.md)。
 
 
 此 DMG 使用 Apple Development 开发签名,未做 Apple 公证。
 此 DMG 使用 Apple Development 开发签名,未做 Apple 公证。
 
 
@@ -48,11 +48,11 @@ Web 数据默认保存在 `~/.yaoyao`,可用 `YAOYAO_HOME` 指定(兼容 `HE
 
 
 | 镜像 | 架构 |
 | 镜像 | 架构 |
 | --- | --- |
 | --- | --- |
-| `samienluo/yaoyao:v0.4.11-amd` | AMD64 |
-| `samienluo/yaoyao:v0.4.11` | 自动匹配 AMD64 / ARM64 |
-| `samienluo/yaoyao:latest` | 最新稳定版通用镜像,当前与 `v0.4.11` 相同 |
+| `samienluo/yaoyao:v0.4.12-amd` | AMD64 |
+| `samienluo/yaoyao:v0.4.12` | 自动匹配 AMD64 / ARM64 |
+| `samienluo/yaoyao:latest` | 最新稳定版通用镜像,当前与 `v0.4.12` 相同 |
 
 
-准备好 Docker Engine/Compose 和容器可访问的 Hermes 9119 服务,在仓库目录将 `docker.env.example` 复制为 `docker.env`。配置上游地址,并设置 `HERMES_YAOYAO_IMAGE=samienluo/yaoyao:v0.4.11`(或 `samienluo/yaoyao:latest`),即可使用远程镜像:
+准备好 Docker Engine/Compose 和容器可访问的 Hermes 9119 服务,在仓库目录将 `docker.env.example` 复制为 `docker.env`。配置上游地址,并设置 `HERMES_YAOYAO_IMAGE=samienluo/yaoyao:v0.4.12`(或 `samienluo/yaoyao:latest`),即可使用远程镜像:
 
 
 ```sh
 ```sh
 docker compose --env-file docker.env pull web
 docker compose --env-file docker.env pull web
@@ -72,6 +72,8 @@ docker compose --env-file docker.env up -d --build
 
 
 宿主机连接、局域网访问、验证及升级步骤见 [Docker 部署说明](docs/docker-install.md)。
 宿主机连接、局域网访问、验证及升级步骤见 [Docker 部署说明](docs/docker-install.md)。
 
 
+需要随 Docker Web 部署电脑环境,可使用 `compose.desktops.yaml`(两台标准桌面)或 `compose.desktops.cursor.yaml`(一台 Cursor Universal 开发桌面)。Cursor 方案基于 `public.ecr.aws/k0i0n2g5/cursorenvironments/universal:sand-box-latest` 加入夭夭桌面桥接层,配置与启动命令见 [Cursor 桌面部署](docs/docker-install.md#cursor-universal-可选配置)。
+
 ## iOS
 ## iOS
 
 
 iOS 统一连接 Web 地址,通过设置中的手机登录二维码或账号密码登录。不能再直接填写 9119 地址;旧 15300 Web 账号和本机聊天缓存继续保留。
 iOS 统一连接 Web 地址,通过设置中的手机登录二维码或账号密码登录。不能再直接填写 9119 地址;旧 15300 Web 账号和本机聊天缓存继续保留。

+ 81 - 0
compose.desktops.cursor.yaml

@@ -0,0 +1,81 @@
+# Generated from compose.yaml and deploy/compose-desktops.cursor.json.
+name: hermes-yaoyao
+
+services:
+  web:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: "${HERMES_YAOYAO_IMAGE:-yaoyao:local}"
+    restart: unless-stopped
+    init: true
+    read_only: true
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - ALL
+    ports:
+      - "${HERMES_YAOYAO_BIND_ADDRESS:-127.0.0.1}:${HERMES_YAOYAO_PUBLISHED_PORT:-15300}:15300"
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    environment:
+      NODE_ENV: production
+      HERMES_YAOYAO_HOST: 0.0.0.0
+      HERMES_YAOYAO_PORT: 15300
+      HERMES_YAOYAO_UPSTREAM: "${HERMES_YAOYAO_UPSTREAM:-http://host.docker.internal:9119}"
+      # Permit localhost access when the published host port differs from the
+      # container's fixed 15300 port; configured public host names remain opt-in.
+      HERMES_YAOYAO_ALLOWED_HOSTS: "localhost,127.0.0.1,${HERMES_YAOYAO_ALLOWED_HOSTS:-}"
+      HERMES_YAOYAO_ALLOW_INSECURE_LAN: "1"
+      HERMES_YAOYAO_SUPERVISE_DASHBOARD: "0"
+      HERMES_YAOYAO_LOCAL_VM_HOST: "runner"
+      HERMES_YAOYAO_COMPOSE_DESKTOPS: "[{\"id\":\"647fbb98-0c40-4d96-91e0-3290eb9020eb\",\"name\":\"Cursor 开发桌面\",\"socketPath\":\"/run/yaoyao-desktops/desktop-cursor/desktop.sock\",\"imageKey\":\"cursor\"}]"
+      HERMES_YAOYAO_CHAT_CACHE_MODE: "${HERMES_YAOYAO_CHAT_CACHE_MODE:-prefer-local}"
+      HERMES_YAOYAO_RELEASE_SOURCE: "${HERMES_YAOYAO_RELEASE_SOURCE:-https://github.com/Lsamien/yaoyao.git}"
+      HERMES_YAOYAO_HOME: /home/node/.yaoyao
+      HERMES_YAOYAO_APNS_KEY_FILE: "${HERMES_YAOYAO_APNS_KEY_FILE:-}"
+      HERMES_YAOYAO_APNS_KEY_ID: "${HERMES_YAOYAO_APNS_KEY_ID:-}"
+      HERMES_YAOYAO_APNS_TEAM_ID: "${HERMES_YAOYAO_APNS_TEAM_ID:-}"
+      HERMES_YAOYAO_APNS_TOPIC: "${HERMES_YAOYAO_APNS_TOPIC:-}"
+    volumes:
+      - yaoyao-data:/home/node/.yaoyao
+      - desktop-cursor-ipc:/run/yaoyao-desktops/desktop-cursor:ro
+    tmpfs:
+      - /tmp:mode=1777
+
+  desktop-cursor:
+    image: "${YAOYAO_CURSOR_DESKTOP_IMAGE:-yaoyao-desktop:cursor}"
+    platform: linux/amd64
+    build:
+      context: ./deploy/computer
+      dockerfile: Dockerfile.cursor
+    hostname: desktop-cursor
+    extra_hosts:
+      - "desktop-cursor:127.0.0.1"
+    init: true
+    restart: unless-stopped
+    network_mode: none
+    shm_size: 512m
+    mem_limit: 4g
+    cpus: 2
+    pids_limit: 512
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - ALL
+    cap_add:
+      - SETUID
+      - SETGID
+      - CHOWN
+      - KILL
+    environment:
+      YAOYAO_COMPOSE_DESKTOP_ID: "647fbb98-0c40-4d96-91e0-3290eb9020eb"
+    volumes:
+      - desktop-cursor-workspace:/home/cua/workspace
+      - desktop-cursor-ipc:/run/yaoyao-private/bridge
+
+volumes:
+  yaoyao-data:
+
+  desktop-cursor-workspace:
+  desktop-cursor-ipc:

+ 3 - 1
compose.desktops.yaml

@@ -29,7 +29,7 @@ services:
       HERMES_YAOYAO_ALLOW_INSECURE_LAN: "1"
       HERMES_YAOYAO_ALLOW_INSECURE_LAN: "1"
       HERMES_YAOYAO_SUPERVISE_DASHBOARD: "0"
       HERMES_YAOYAO_SUPERVISE_DASHBOARD: "0"
       HERMES_YAOYAO_LOCAL_VM_HOST: "runner"
       HERMES_YAOYAO_LOCAL_VM_HOST: "runner"
-      HERMES_YAOYAO_COMPOSE_DESKTOPS: "[{\"id\":\"160fe7cd-e530-4ac5-a97f-26c19a362b11\",\"name\":\"共享桌面 1\",\"socketPath\":\"/run/yaoyao-desktops/desktop-1/desktop.sock\"},{\"id\":\"eba5caaf-744e-4f27-bcdd-1f1f35d05a42\",\"name\":\"共享桌面 2\",\"socketPath\":\"/run/yaoyao-desktops/desktop-2/desktop.sock\"}]"
+      HERMES_YAOYAO_COMPOSE_DESKTOPS: "[{\"id\":\"160fe7cd-e530-4ac5-a97f-26c19a362b11\",\"name\":\"共享桌面 1\",\"socketPath\":\"/run/yaoyao-desktops/desktop-1/desktop.sock\",\"imageKey\":\"standard\"},{\"id\":\"eba5caaf-744e-4f27-bcdd-1f1f35d05a42\",\"name\":\"共享桌面 2\",\"socketPath\":\"/run/yaoyao-desktops/desktop-2/desktop.sock\",\"imageKey\":\"standard\"}]"
       HERMES_YAOYAO_CHAT_CACHE_MODE: "${HERMES_YAOYAO_CHAT_CACHE_MODE:-prefer-local}"
       HERMES_YAOYAO_CHAT_CACHE_MODE: "${HERMES_YAOYAO_CHAT_CACHE_MODE:-prefer-local}"
       HERMES_YAOYAO_RELEASE_SOURCE: "${HERMES_YAOYAO_RELEASE_SOURCE:-https://github.com/Lsamien/yaoyao.git}"
       HERMES_YAOYAO_RELEASE_SOURCE: "${HERMES_YAOYAO_RELEASE_SOURCE:-https://github.com/Lsamien/yaoyao.git}"
       HERMES_YAOYAO_HOME: /home/node/.yaoyao
       HERMES_YAOYAO_HOME: /home/node/.yaoyao
@@ -48,6 +48,7 @@ services:
     image: "${YAOYAO_DESKTOP_IMAGE:-hermes-yaoyao-desktop:0.4.0}"
     image: "${YAOYAO_DESKTOP_IMAGE:-hermes-yaoyao-desktop:0.4.0}"
     build:
     build:
       context: ./deploy/computer
       context: ./deploy/computer
+      dockerfile: Dockerfile
     hostname: desktop-1
     hostname: desktop-1
     extra_hosts:
     extra_hosts:
       - "desktop-1:127.0.0.1"
       - "desktop-1:127.0.0.1"
@@ -76,6 +77,7 @@ services:
     image: "${YAOYAO_DESKTOP_IMAGE:-hermes-yaoyao-desktop:0.4.0}"
     image: "${YAOYAO_DESKTOP_IMAGE:-hermes-yaoyao-desktop:0.4.0}"
     build:
     build:
       context: ./deploy/computer
       context: ./deploy/computer
+      dockerfile: Dockerfile
     hostname: desktop-2
     hostname: desktop-2
     extra_hosts:
     extra_hosts:
       - "desktop-2:127.0.0.1"
       - "desktop-2:127.0.0.1"

+ 3 - 0
deploy/compose-desktops.cursor.json

@@ -0,0 +1,3 @@
+[
+  {"id":"647fbb98-0c40-4d96-91e0-3290eb9020eb","service":"desktop-cursor","name":"Cursor 开发桌面","imageKey":"cursor"}
+]

+ 26 - 0
deploy/computer/Dockerfile.cursor

@@ -0,0 +1,26 @@
+# Cursor Universal with the same private desktop protocol as the standard image.
+# The upstream tag is mutable; pin the inspected amd64 digest for reproducible builds.
+ARG CURSOR_BASE=public.ecr.aws/k0i0n2g5/cursorenvironments/universal:sand-box-latest@sha256:858b6df5d0aeffd5db0e20c81553e98f84b07e9c700a13fcd1febac0e8c54830
+FROM ${CURSOR_BASE}
+USER root
+RUN set -eux; \
+    test "$(uname -m)" = x86_64; \
+    curl -fsSL 'https://files.pythonhosted.org/packages/fa/d7/a43008a328a40c85e7bc706fc20235b9abedc75e28b413817655153157ff/cua_driver-0.20.0-py3-none-manylinux_2_31_x86_64.whl' -o /tmp/cua-driver.whl; \
+    echo 'f60c35696a37f37ac954935e478ae4754f220856d022036625c9400d72185961  /tmp/cua-driver.whl' | sha256sum -c -; \
+    unzip -p /tmp/cua-driver.whl cua_driver/bin/cua-driver > /tmp/cua-driver; \
+    install -D -m 0755 /tmp/cua-driver /usr/local/libexec/openmausbot/cua-driver; \
+    rm /tmp/cua-driver.whl /tmp/cua-driver; \
+    test "$(/usr/local/libexec/openmausbot/cua-driver --version)" = 'cua-driver 0.20.0'; \
+    usermod -l cua -d /home/cua box; groupmod -n cua box; \
+    install -d -o cua -g cua -m 0700 /home/cua /home/cua/workspace /run/user/1000; \
+    install -d -m 0755 /run/yaoyao-private
+COPY compose_bridge.py /usr/local/libexec/yaoyao/compose_bridge.py
+COPY cursor-desktop.py /usr/local/libexec/yaoyao/cursor-desktop.py
+COPY cursor-browser.sh /usr/local/bin/yaoyao-browser
+RUN chmod 0755 /usr/local/bin/yaoyao-browser; \
+    sed -i 's|^Exec=.*|Exec=/usr/local/bin/yaoyao-browser %U|' /usr/share/applications/google-chrome.desktop /usr/share/applications/com.google.Chrome.desktop
+ENV HOME=/home/cua USER=cua DISPLAY=:1 XDG_RUNTIME_DIR=/run/user/1000 BROWSER=/usr/local/bin/yaoyao-browser CUA_DRIVER_INSTALL_CHANNEL=python_package CUA_DRIVER_RS_TELEMETRY_ENABLED=0
+LABEL com.openmausbot.local-vm="1" com.openmausbot.cua-driver="0.20.0" com.openmausbot.image-layer="5" \
+      cn.samien.yaoyao.computer-image="1" cn.samien.yaoyao.compose-desktop="1" cn.samien.yaoyao.image-key="cursor"
+# Start only the desktop and Yaoyao bridge; the upstream cloud services are not needed.
+ENTRYPOINT ["python3", "/usr/local/libexec/yaoyao/cursor-desktop.py"]

+ 6 - 0
deploy/computer/cursor-browser.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+set -eu
+if [ "${HTTP_PROXY:-}" = 'http://127.0.0.1:3128' ]; then
+    set -- "--proxy-server=$HTTP_PROXY" '--proxy-bypass-list=localhost;127.0.0.1;[::1]' --disable-quic "$@"
+fi
+exec /usr/bin/google-chrome --no-sandbox --no-first-run --no-default-browser-check --disable-dev-shm-usage --password-store=basic --user-data-dir=/home/cua/workspace/.browser-profiles/google-chrome "$@"

+ 86 - 0
deploy/computer/cursor-desktop.py

@@ -0,0 +1,86 @@
+"""Supervise the Cursor desktop using the existing uid, workspace and CUA socket contract."""
+import os
+from pathlib import Path
+import signal
+import subprocess
+import sys
+import time
+
+children = []
+critical = []
+stopping = False
+
+
+def stop(*_):
+    global stopping
+    stopping = True
+
+
+def spawn(argv, user=True, required=True):
+    child = subprocess.Popen(argv, user=1000 if user else None,
+                             group=1000 if user else None,
+                             extra_groups=[] if user else None)
+    children.append(child)
+    if required:
+        critical.append(child)
+    return child
+
+
+signal.signal(signal.SIGTERM, stop)
+signal.signal(signal.SIGINT, stop)
+try:
+    # Run workspace setup as its owner; no extra DAC or CHOWN capability is needed.
+    setup = """
+from pathlib import Path
+import os
+root = Path('/home/cua/workspace/.browser-profiles/google-chrome')
+root.mkdir(parents=True, exist_ok=True)
+for name in ['SingletonLock', 'SingletonSocket', 'SingletonCookie']:
+    (root / name).unlink(missing_ok=True)
+config = Path('/home/cua/.config')
+config.mkdir(exist_ok=True)
+link = config / 'google-chrome'
+if not link.is_symlink() and not link.exists():
+    link.symlink_to(root)
+launchers = config / 'plank/dock1/launchers'
+launchers.mkdir(parents=True, exist_ok=True)
+for name in ['google-chrome', 'xfce4-terminal', 'thunar']:
+    (launchers / (name + '.dockitem')).write_text('[PlankDockItemPreferences]\\nLauncher=file:///usr/share/applications/' + name + '.desktop\\n')
+"""
+    subprocess.run(['python3', '-c', setup], user=1000, group=1000, extra_groups=[], check=True)
+    for path in ['/tmp/.X1-lock', '/tmp/.X11-unix/X1', '/run/user/1000/openmausbot-cua.sock', '/run/user/1000/yaoyao-dbus']:
+        subprocess.run(['rm', '-f', path], user=1000, group=1000, extra_groups=[], check=True)
+    os.environ['DBUS_SESSION_BUS_ADDRESS'] = 'unix:path=/run/user/1000/yaoyao-dbus'
+    spawn(['dbus-daemon', '--session', '--nofork', '--address=' + os.environ['DBUS_SESSION_BUS_ADDRESS']])
+    spawn(['Xvfb', ':1', '-screen', '0', '1280x800x24', '-ac', '-nolisten', 'tcp', '-noreset'])
+    for _ in range(100):
+        if stopping or any(p.poll() is not None for p in children):
+            raise RuntimeError('桌面启动已中断')
+        if subprocess.run(['xset', 'q'], user=1000, group=1000, extra_groups=[], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).returncode == 0:
+            break
+        time.sleep(0.2)
+    else:
+        raise RuntimeError('X display :1 did not become ready')
+    spawn(['xfwm4', '--compositor=off'])
+    subprocess.run(['xsetroot', '-solid', '#202734'], user=1000, group=1000, extra_groups=[])
+    spawn(['plank'], required=False)
+    spawn(['/usr/local/libexec/openmausbot/cua-driver', 'serve', '--socket', '/run/user/1000/openmausbot-cua.sock', '--permission-mode', 'standard'])
+    # A visible browser gives this minimal desktop a usable initial surface.
+    spawn(['/usr/local/bin/yaoyao-browser', 'about:blank'], required=False)
+    if os.environ.get('YAOYAO_COMPOSE_DESKTOP_ID'):
+        spawn(['python3', '/usr/local/libexec/yaoyao/compose_bridge.py'], user=False)
+    while not stopping:
+        if any(p.poll() is not None for p in critical):
+            raise RuntimeError('桌面进程已退出,等待重新启动')
+        time.sleep(0.5)
+except Exception as error:
+    print(error, file=sys.stderr, flush=True)
+    sys.exit(1)
+finally:
+    # Stop the guest session without giving root CAP_KILL in managed containers.
+    subprocess.run(['python3', '-c', 'import os,signal; os.kill(-1,signal.SIGTERM)'], user=1000, group=1000, extra_groups=[])
+    for child in children:
+        try:
+            child.wait(timeout=3)
+        except subprocess.TimeoutExpired:
+            pass

+ 7 - 1
docker.env.example

@@ -3,9 +3,15 @@ HERMES_YAOYAO_BIND_ADDRESS=127.0.0.1
 HERMES_YAOYAO_PUBLISHED_PORT=15300
 HERMES_YAOYAO_PUBLISHED_PORT=15300
 # 远程通用镜像支持 AMD64 / ARM64;每次发布更新 latest 并保留旧版本标签。
 # 远程通用镜像支持 AMD64 / ARM64;每次发布更新 latest 并保留旧版本标签。
 # HERMES_YAOYAO_IMAGE=samienluo/yaoyao:latest
 # HERMES_YAOYAO_IMAGE=samienluo/yaoyao:latest
-# 固定版本:samienluo/yaoyao:v0.4.11;仅 AMD64:samienluo/yaoyao:v0.4.11-amd。
+# 固定版本:samienluo/yaoyao:v0.4.12;仅 AMD64:samienluo/yaoyao:v0.4.12-amd。
 # 留空时使用本地构建名称 yaoyao:local。
 # 留空时使用本地构建名称 yaoyao:local。
 # YAOYAO_DESKTOP_IMAGE=hermes-yaoyao-desktop:0.4.0
 # YAOYAO_DESKTOP_IMAGE=hermes-yaoyao-desktop:0.4.0
+# Cursor Universal 兼容桌面的本地构建名称;基础镜像在 deploy/computer/Dockerfile.cursor 中固定。
+# 使用 compose.desktops.cursor.yaml 部署 Web + 一台 Cursor 桌面(linux/amd64)。
+# 不要填写上游原始镜像地址,此变量指向已加入夭夭桥接层的运行镜像。
+# YAOYAO_CURSOR_DESKTOP_IMAGE=yaoyao-desktop:cursor
+# 发布版可直接拉取:
+# YAOYAO_CURSOR_DESKTOP_IMAGE=samienluo/yaoyao-desktop:v0.4.12-cursor-amd
 
 
 # 部署步骤见 docs/docker-install.md;使用 docker compose --env-file docker.env 启动。
 # 部署步骤见 docs/docker-install.md;使用 docker compose --env-file docker.env 启动。
 # 填写容器可访问的 Hermes Dashboard/Gateway 地址。
 # 填写容器可访问的 Hermes Dashboard/Gateway 地址。

+ 14 - 3
docs/bot-agent-teams.md

@@ -4,11 +4,21 @@
 
 
 ## 使用
 ## 使用
 
 
-在 Bot 模式创建或编辑 Agent,打开「允许组建团队」并保存。例如给它发送:
+日常建群只需要名称、成员、负责人和可选群规则,创建后直接聊天。团队模板和高级协作设置默认收起。顶部的「话题」用于隔离不同聊天上下文,不代表已经启动交付目标。
+
+需要机器人自主组队时,在 Bot 模式创建或编辑 Agent,打开「允许组建团队」并保存。例如只准备团队:
+
+> 建一个调研群,优先复用已有成员,先不执行任务。
+
+这时只创建成员和群,不启动目标、不拆子任务、不生成验收清单。简单问答、方案讨论和一次性咨询同样直接回复。需要实际交付时可以发送:
 
 
 > 帮我完成项目调研,需要哪些成员就先查看已有 Agent,缺少时再创建。组建团队、启动任务,并告诉我到哪个团队查看结果。
 > 帮我完成项目调研,需要哪些成员就先查看已有 Agent,缺少时再创建。组建团队、启动任务,并告诉我到哪个团队查看结果。
 
 
-Agent 可以查看可用基础 Agent、复用已有成员、创建持久成员和团队、启动独立团队任务、读取进展和结果。新团队自动加入发起者并将其设为管理员,随后使用已有的 @分派和管理员复核机制。成员、团队和任务写入当前账号的 `workspace.sqlite3`,发布既有变更事件供 Web/iOS 同步。
+Agent 可以查看可用基础 Agent、复用已有成员、创建持久成员和团队、启动交付目标、读取进展和结果。新团队自动加入发起者并将其设为管理员。普通聊天保留 @协作;目标执行使用结构化分派和复核,避免同一工作再通过 @重复派发。成员、团队和任务写入当前账号的 `workspace.sqlite3`,发布既有变更事件供客户端同步。
+
+Web/macOS 的群聊输入区可开启「交付目标」,发送后在当前话题启动目标,不另建一个会话任务。负责人需已获准组队,且当前回复已结束。在群内明确提出交付要求时,管理员也可通过工具将当前话题升级为目标。已有目标不重复启动;其他工作可新建话题。
+
+验收要求由管理员从用户原始请求中提炼。管理员能直接完成时无需子任务,确实需要分工时才创建子任务和依赖。「交付进展」默认显示状态、完成数量和结果,任务与验收详情默认折叠;展开后可调整进行中目标的验收要求。修改采用独立版本检查,旧版本不能覆盖新要求,完成也必须使用最新验收版本。
 
 
 启动任务返回「已启动,尚未完成」。工作在团队任务内继续。子任务执行结束后,结果自动回到原会话并唤醒管理员复核;可通过「打开任务」进入具体任务。执行结束与目标完成分开记录,完成必须满足子任务验收和目标检查。
 启动任务返回「已启动,尚未完成」。工作在团队任务内继续。子任务执行结束后,结果自动回到原会话并唤醒管理员复核;可通过「打开任务」进入具体任务。执行结束与目标完成分开记录,完成必须满足子任务验收和目标检查。
 
 
@@ -29,6 +39,7 @@ Agent 可以查看可用基础 Agent、复用已有成员、创建持久成员
 | `workspace_create_agent` | 创建成员,禁止授予组队权限 |
 | `workspace_create_agent` | 创建成员,禁止授予组队权限 |
 | `workspace_create_team` | 创建管理员协作模式的团队 |
 | `workspace_create_team` | 创建管理员协作模式的团队 |
 | `workspace_start_team_task` | 在发起者管理的团队启动任务 |
 | `workspace_start_team_task` | 在发起者管理的团队启动任务 |
+| `workspace_update_team_goal` | 提炼或调整验收要求,校验 `expectedRevision` |
 | `workspace_get_team_task` | 读取状态、最近 20 条消息和待处理问题 |
 | `workspace_get_team_task` | 读取状态、最近 20 条消息和待处理问题 |
 | `workspace_assign_task` | 分派具有负责人、依赖和验收条件的子任务 |
 | `workspace_assign_task` | 分派具有负责人、依赖和验收条件的子任务 |
 | `workspace_update_assignment` / `workspace_cancel_assignment` | 调整或停止子任务,保留原因与历史 |
 | `workspace_update_assignment` / `workspace_cancel_assignment` | 调整或停止子任务,保留原因与历史 |
@@ -39,7 +50,7 @@ Agent 可以查看可用基础 Agent、复用已有成员、创建持久成员
 
 
 所有变更工具要求 `requestId`(UUID);重试同一操作必须复用它。服务端持久保存回执;相同编号用于不同参数返回冲突,重复请求不会重复创建。原生工具调用 ID 也在本轮去重。
 所有变更工具要求 `requestId`(UUID);重试同一操作必须复用它。服务端持久保存回执;相同编号用于不同参数返回冲突,重复请求不会重复创建。原生工具调用 ID 也在本轮去重。
 
 
-账号和调用 Agent 从正在运行的服务端轮次取得,模型参数不能指定 owner、token 或调用身份。创建成员只能引用当前账号获准的基础 Profile;子账号的分配规则保持有效。只有团队管理员可以启动或读取该团队的任务,禁止从当前团队任务递归启动自身任务。
+账号和调用 Agent 从正在运行的服务端轮次取得,模型参数不能指定 owner、token 或调用身份。创建成员只能引用当前账号获准的基础 Profile;子账号的分配规则保持有效。只有团队管理员可以启动或读取该团队的任务。当前群内的用户指令可以将尚无目标的话题升级为目标;自动回传不能重复启动目标。
 
 
 每轮使用独立随机凭据、独立原生工具 ID 和回环监听端口,凭据仅传给经过认证的工具桥绑定接口。权限、账号、Profile、成员归属、归档和停止状态在每次调用时校验,异步操作在写入前再次校验。绑定保留 Agent 的配置版本;关闭后重新开启权限也不能使旧轮次重新生效。完成、取消、连接结束或服务关闭时销毁监听器并解绑;最长 30 分钟,运行时每 5 分钟续租。断线恢复只核对原执行,不重新提交已有工具副作用;下一轮重新授权。
 每轮使用独立随机凭据、独立原生工具 ID 和回环监听端口,凭据仅传给经过认证的工具桥绑定接口。权限、账号、Profile、成员归属、归档和停止状态在每次调用时校验,异步操作在写入前再次校验。绑定保留 Agent 的配置版本;关闭后重新开启权限也不能使旧轮次重新生效。完成、取消、连接结束或服务关闭时销毁监听器并解绑;最长 30 分钟,运行时每 5 分钟续租。断线恢复只核对原执行,不重新提交已有工具副作用;下一轮重新授权。
 
 

+ 100 - 8
docs/docker-install.md

@@ -12,14 +12,14 @@
 
 
 | 标签 | 架构 |
 | 标签 | 架构 |
 | --- | --- |
 | --- | --- |
-| `v0.4.11-amd` | `linux/amd64` |
-| `v0.4.11` | `linux/amd64`、`linux/arm64`,拉取时自动匹配 |
-| `latest` | 最新稳定通用镜像,当前指向与 `v0.4.11` 相同的镜像 |
+| `v0.4.12-amd` | `linux/amd64` |
+| `v0.4.12` | `linux/amd64`、`linux/arm64`,拉取时自动匹配 |
+| `latest` | 最新稳定通用镜像,当前指向与 `v0.4.12` 相同的镜像 |
 
 
 ```sh
 ```sh
-docker pull samienluo/yaoyao:v0.4.11
+docker pull samienluo/yaoyao:v0.4.12
 # 需要固定 AMD64 时:
 # 需要固定 AMD64 时:
-docker pull samienluo/yaoyao:v0.4.11-amd
+docker pull samienluo/yaoyao:v0.4.12-amd
 ```
 ```
 
 
 每次新版本发布都会更新 `latest`,旧版本标签继续保留。需要固定部署版本时使用具体版本标签。
 每次新版本发布都会更新 `latest`,旧版本标签继续保留。需要固定部署版本时使用具体版本标签。
@@ -34,7 +34,7 @@ cp docker.env.example docker.env
 
 
 | 配置 | 用途 |
 | 配置 | 用途 |
 | --- | --- |
 | --- | --- |
-| `HERMES_YAOYAO_IMAGE` | 远程镜像可设为 `samienluo/yaoyao:v0.4.11` 或 `samienluo/yaoyao:latest`;未设置时使用本地构建名称 |
+| `HERMES_YAOYAO_IMAGE` | 远程镜像可设为 `samienluo/yaoyao:v0.4.12` 或 `samienluo/yaoyao:latest`;未设置时使用本地构建名称 |
 | `HERMES_YAOYAO_UPSTREAM` | Hermes 上游地址,默认 `http://host.docker.internal:9119` |
 | `HERMES_YAOYAO_UPSTREAM` | Hermes 上游地址,默认 `http://host.docker.internal:9119` |
 | `HERMES_YAOYAO_BIND_ADDRESS` | Web 的宿主机发布地址,默认 `127.0.0.1`;局域网访问可设为 `0.0.0.0` |
 | `HERMES_YAOYAO_BIND_ADDRESS` | Web 的宿主机发布地址,默认 `127.0.0.1`;局域网访问可设为 `0.0.0.0` |
 | `HERMES_YAOYAO_PUBLISHED_PORT` | 宿主机 Web 端口,默认 `15300` |
 | `HERMES_YAOYAO_PUBLISHED_PORT` | 宿主机 Web 端口,默认 `15300` |
@@ -95,7 +95,7 @@ docker compose --env-file docker.env -f compose.desktops.yaml ps
 - 每台桌面的工作文件放在独立的 `desktop-*-workspace` 命名卷内。Compose 桌面统一使用 `/home/cua/workspace`,不会更改基础 Profile 的工作目录配置。
 - 每台桌面的工作文件放在独立的 `desktop-*-workspace` 命名卷内。Compose 桌面统一使用 `/home/cua/workspace`,不会更改基础 Profile 的工作目录配置。
 - 示例桌面使用 `network_mode: none`,默认没有桌面外网。网络、资源额度、镜像版本和服务数量均由部署者在 Compose 中管理;本机 App 的动态虚拟机模式保持原有方式。
 - 示例桌面使用 `network_mode: none`,默认没有桌面外网。网络、资源额度、镜像版本和服务数量均由部署者在 Compose 中管理;本机 App 的动态虚拟机模式保持原有方式。
 
 
-如部署前要调整数量或名称,编辑 `deploy/compose-desktops.json`,保留已有桌面 ID,重新生成配套文件:
+如部署前要调整数量、名称或镜像,编辑 `deploy/compose-desktops.json`,保留已有桌面 ID,重新生成配套文件:
 
 
 ```sh
 ```sh
 node scripts/generate-desktop-compose.mjs
 node scripts/generate-desktop-compose.mjs
@@ -105,6 +105,98 @@ docker compose --env-file docker.env -f compose.desktops.yaml up -d --build
 
 
 生成器会把 Web 连接清单、桌面服务和数据卷同步写入同一个 Compose 文件。运行中不能通过 Web API 扩容。不要用 `down --volumes` 更新部署,否则会删除工作文件。
 生成器会把 Web 连接清单、桌面服务和数据卷同步写入同一个 Compose 文件。运行中不能通过 Web API 扩容。不要用 `down --volumes` 更新部署,否则会删除工作文件。
 
 
+### Cursor Universal 可选配置
+
+新部署可直接选择仓库中的 **`compose.desktops.cursor.yaml`**,同时启动 Web 和一台“Cursor 开发桌面”。这是完整部署文件,单独使用;与 `compose.yaml`、`compose.desktops.yaml` 三选一,不要叠加启动。电脑环境是共享宿主内核的 Linux 桌面容器。
+
+| 项目 | 配置 |
+| --- | --- |
+| 上游基础镜像 | `public.ecr.aws/k0i0n2g5/cursorenvironments/universal:sand-box-latest` |
+| 构建固定版本 | `sha256:858b6df5d0aeffd5db0e20c81553e98f84b07e9c700a13fcd1febac0e8c54830` |
+| 兼容镜像 | `yaoyao-desktop:cursor`,通过 `deploy/computer/Dockerfile.cursor` 在本地构建 |
+| 已发布兼容镜像 | `samienluo/yaoyao-desktop:v0.4.12-cursor-amd` |
+| 架构 | `linux/amd64`;ARM64 宿主需要 Docker 的 amd64 模拟支持 |
+| 桌面资源 | 2 CPU、4 GB 内存、512 MB 共享内存、512 个进程 |
+| 持久工作目录 | `desktop-cursor-workspace` 卷 → `/home/cua/workspace`,含浏览器资料 |
+| Web 连接 | `desktop-cursor-ipc` 卷中的私有 Unix socket,Web 只读挂载 |
+| 桌面网络 | 默认 `network_mode: none`,不发布任何桌面端口 |
+
+上游标签会变化,Dockerfile 固定已适配的 digest,加入 CUA 驱动、浏览器启动器和夭夭私有桥接协议。因此不能把上游原始镜像直接填到 `YAOYAO_CURSOR_DESKTOP_IMAGE`;该变量只用于指定构建后的兼容镜像名称。
+
+首次配置(已有 `docker.env` 时直接编辑):
+
+```sh
+cp -n docker.env.example docker.env
+```
+
+`docker.env` 的相关配置示例:
+
+```dotenv
+HERMES_YAOYAO_IMAGE=yaoyao:local
+HERMES_YAOYAO_UPSTREAM=http://host.docker.internal:9119
+HERMES_YAOYAO_BIND_ADDRESS=127.0.0.1
+HERMES_YAOYAO_PUBLISHED_PORT=15300
+YAOYAO_CURSOR_DESKTOP_IMAGE=yaoyao-desktop:cursor
+```
+
+使用本次源码构建 Web 与桌面镜像,然后启动:
+
+```sh
+docker compose --env-file docker.env -f compose.desktops.cursor.yaml config --quiet
+docker compose --env-file docker.env -f compose.desktops.cursor.yaml build web desktop-cursor
+docker compose --env-file docker.env -f compose.desktops.cursor.yaml up -d --no-build
+docker compose --env-file docker.env -f compose.desktops.cursor.yaml ps
+curl --fail http://127.0.0.1:15300/healthz
+```
+
+使用 Docker Hub 发布镜像时,在 `docker.env` 设置:
+
+```dotenv
+HERMES_YAOYAO_IMAGE=samienluo/yaoyao:v0.4.12
+YAOYAO_CURSOR_DESKTOP_IMAGE=samienluo/yaoyao-desktop:v0.4.12-cursor-amd
+```
+
+直接拉取并启动,无需本地编译:
+
+```sh
+docker compose --env-file docker.env -f compose.desktops.cursor.yaml pull web desktop-cursor
+docker compose --env-file docker.env -f compose.desktops.cursor.yaml up -d --no-build
+```
+
+Web 镜像自动匹配 AMD64 / ARM64;Cursor 桌面为 AMD64。已有标准桌面仍沿用其镜像配置。
+
+随后按下方“[Hermes 执行连接](#hermes-执行连接)”注册或连接执行节点,再在 Agent 聊天的 **电脑 → 此 Agent 使用的电脑** 中选择“Cursor 开发桌面”。
+
+需要浏览外网或下载依赖时,创建 `compose.desktops.network.yaml`:
+
+```yaml
+services:
+  desktop-cursor:
+    network_mode: bridge
+```
+
+之后启动、查看和停止均带上两个文件:
+
+```sh
+docker compose --env-file docker.env -f compose.desktops.cursor.yaml -f compose.desktops.network.yaml up -d --no-build
+```
+
+`bridge` 允许桌面通过宿主 Docker 网络出站,也可能访问宿主及局域网;它不提供本机动态桌面的受控外网代理策略。仅在部署网络允许时启用,并通过宿主防火墙管理访问范围。桌面仍不映射 VNC 或控制端口。网络模式语义见 [Docker Compose 服务配置](https://docs.docker.com/reference/compose-file/services/#network_mode)。
+
+调整这套配置的桌面数量或名称时,编辑 `deploy/compose-desktops.cursor.json`,然后运行 `node scripts/generate-desktop-compose.mjs`;生成器同时更新两套部署文件,`--check` 同时检查它们。已有标准桌面的部署若只想切换一台镜像,应按下一节保留原有 ID、service 和工作卷。
+
+### 同时部署两种镜像
+
+在 `deploy/compose-desktops.json` 的每个桌面条目增加 `imageKey`:`standard` 为现有标准桌面(不填写时的默认值),`cursor` 为 Cursor Universal 兼容桌面。例如保留已有 ID 和 service,将第二台配置为:
+
+```json
+{"id":"eba5caaf-744e-4f27-bcdd-1f1f35d05a42","service":"desktop-2","name":"Cursor 开发桌面","imageKey":"cursor"}
+```
+
+然后运行上述生成和部署命令。生成器为 Cursor 桌面指定 `Dockerfile.cursor` 和 `platform: linux/amd64`;镜像名可通过 `YAOYAO_CURSOR_DESKTOP_IMAGE` 设置,标准桌面继续使用 `YAOYAO_DESKTOP_IMAGE`。两种变量应指向对应的夭夭兼容镜像,不能将上游原始 Cursor 镜像直接作为运行镜像。
+
+聊天电脑面板显示每台桌面的镜像名称,机器人通过选择已有桌面来选择环境。不同桌面各自使用独立数据卷,可同时使用不同镜像;共享同一桌面的成员只能使用该桌面的一个镜像。改变现有条目的镜像会在下次 Compose 部署时重建该实例,请先结束使用它的任务,保留原有 ID、service 和数据卷。
+
 ### Hermes 执行连接
 ### Hermes 执行连接
 
 
 Compose 管理桌面,Hermes 执行连接负责模型运行和工具调用。沿用已有执行节点;新部署可在 **设置 → 本地虚拟机 → 打开执行节点设置** 下载程序和注册配置。此部署生成的配置自动带 `managedBy: compose`,执行节点不再创建桌面,也不需要安装 Docker。
 Compose 管理桌面,Hermes 执行连接负责模型运行和工具调用。沿用已有执行节点;新部署可在 **设置 → 本地虚拟机 → 打开执行节点设置** 下载程序和注册配置。此部署生成的配置自动带 `managedBy: compose`,执行节点不再创建桌面,也不需要安装 Docker。
@@ -120,7 +212,7 @@ node yaoyao-runner/runner.mjs --config /完整路径/runner.json
 
 
 整份程序目录须保留。节点配置包含私有凭据,不要提交到仓库。运行中的任务或接管操作仍有独占授权;交还后其他成员才能操作。取消无法确认结束的命令时,会重置对应桌面服务来终止旧程序,数量与数据卷保持不变。
 整份程序目录须保留。节点配置包含私有凭据,不要提交到仓库。运行中的任务或接管操作仍有独占授权;交还后其他成员才能操作。取消无法确认结束的命令时,会重置对应桌面服务来终止旧程序,数量与数据卷保持不变。
 
 
-只需要 Web 服务、继续使用既有外部动态桌面的部署仍可使用 `compose.yaml`;两种部署文件任选其一,不要让两套 Web 同时写同一数据卷。
+只需要 Web 服务、继续使用既有外部动态桌面的部署仍可使用 `compose.yaml`;三种部署文件任选其一,不要让两套 Web 同时写同一数据卷。
 
 
 验收截图:[Docker Web 的 Agent 桌面](screenshots/compose-desktops/agent-desktop.png)。验收使用独立数据和测试模型服务,桌面与容器连接是真实运行。
 验收截图:[Docker Web 的 Agent 桌面](screenshots/compose-desktops/agent-desktop.png)。验收使用独立数据和测试模型服务,桌面与容器连接是真实运行。
 
 

+ 12 - 4
docs/local-vm.md

@@ -5,9 +5,9 @@
 ## 使用流程
 ## 使用流程
 
 
 1. 进入应用设置 → **本地虚拟机**。macOS App 的应用菜单也提供“本地虚拟机设置…”。
 1. 进入应用设置 → **本地虚拟机**。macOS App 的应用菜单也提供“本地虚拟机设置…”。
-2. 检查 Docker/Podman 已安装并启动,点击 **准备本地虚拟机**。本机执行环境自动连接,不需要手工填写镜像 ID、下载 Runner 配置再导入。准备会复用兼容镜像或构建固定版本,并验证实际桌面后自动使用。
-3. 选择 **共享虚拟机** 或 **每个 Agent 独立**,最多同时运行 1–4 台,默认 2 台。同一账号、同一基础 Profile 的持久 Agent 共用桌面、工作文件和浏览器资料,新建成员会继承当前共享策略。临时任务助手继续使用任务隔离环境,完成后单独清理,不会删除持久共享工作区。
-4. 打开 Agent 聊天,点击右上角 **电脑**。右侧电脑面板中选择 **本地虚拟机**,从这里创建或启动该 Agent 的桌面。
+2. 检查 Docker/Podman 已安装并启动,在 **准备虚拟机镜像** 中选择 **标准桌面** 或 **Cursor Universal**,点击 **准备所选镜像**。两个镜像可分别准备;会复用对应的兼容镜像或构建固定版本,验证驱动和实际截图后标记就绪。准备前先停止所有虚拟机任务和实例。外部执行节点需更新配套 Runner。
+3. 选择 **共享虚拟机** 或 **每个 Agent 独立**,最多同时运行 1–4 台,默认 2 台。同一账号、同一执行节点的持久 Agent 共用桌面、工作文件和浏览器资料,新建成员会继承当前共享策略。临时任务助手继续使用任务隔离环境,完成后单独清理,不会删除持久共享工作区。
+4. 打开 Agent 聊天,点击右上角 **电脑**。右侧电脑面板中选择 **本地虚拟机**,在 **虚拟机镜像** 中选择已准备的镜像,再创建桌面。独立桌面可分别选择不同镜像并同时运行;同一个共享桌面的所有成员只能使用这台桌面的一个镜像。
 5. 右侧显示真实画面及运行状态,可停止或重建虚拟机;点击预览或 **打开桌面** 后接管交互。
 5. 右侧显示真实画面及运行状态,可停止或重建虚拟机;点击预览或 **打开桌面** 后接管交互。
 6. **打开双桌面** 在主工作区显示两台虚拟机,保留聊天侧栏。进入时仅查看,不会创建/启动机器;切换操作对象时先交还前一台的控制权。
 6. **打开双桌面** 在主工作区显示两台虚拟机,保留聊天侧栏。进入时仅查看,不会创建/启动机器;切换操作对象时先交还前一台的控制权。
 
 
@@ -17,6 +17,14 @@
 
 
 `terminal.cwd` 默认的 `.`(以及 `auto`、`cwd`、未设置)指向虚拟机的持久工作区 `/home/cua/workspace`;相对路径以该工作区为起点,显式绝对路径继续沿用配置。创建、启动和人工接管只读取工作目录,不要求模型可用;停止和移除已有实例也不依赖 Profile 配置。模型仅在运行 Agent 时解析,Profile、目录和模型错误分别提示。
 `terminal.cwd` 默认的 `.`(以及 `auto`、`cwd`、未设置)指向虚拟机的持久工作区 `/home/cua/workspace`;相对路径以该工作区为起点,显式绝对路径继续沿用配置。创建、启动和人工接管只读取工作目录,不要求模型可用;停止和移除已有实例也不依赖 Profile 配置。模型仅在运行 Agent 时解析,Profile、目录和模型错误分别提示。
 
 
+## 镜像与持久状态
+
+- 标准桌面沿用现有 XFCE 镜像;Cursor Universal 基于 `public.ecr.aws/k0i0n2g5/cursorenvironments/universal:sand-box-latest` 的固定 amd64 摘要,并添加相同的 CUA 0.20.0 驱动和私有桥接协议。原始镜像不能直接填入现有桌面镜像配置。
+- Cursor 镜像目前只有 Linux amd64;Apple 芯片上的 Docker/Podman 需要支持 amd64 模拟。macOS arm64 App 安装包不代表有 Linux arm64 桌面镜像。
+- 每台独立桌面拥有自己的工作目录和浏览器资料。同一共享桌面只有一个持久镜像选择,所有成员看到同一个选择。
+- 准备第二个镜像不会替换已有实例的镜像。切换前先停止任务、交还控制权,在电脑面板点击“移除实例”,再选择新镜像并创建。实例移除保留持久数据,后续启动和重启沿用已选镜像。
+- `POST /api/app/admin/local-vm/prepare` 接受可选的 `imageKey: standard | cursor`;`PUT /api/app/agents/:id/local-vm/image` 保存该桌面的镜像选择。客户端只能选择已准备的配套镜像,不能提交任意镜像 ID。
+
 ## 手机端
 ## 手机端
 
 
 iOS/Android 没有全局虚拟桌面清单、镜像设置或执行环境选择。入口在 **当前 Agent 聊天右上角的电脑图标**。单个 Agent 直接打开画面,群聊有多台电脑时选择当前聊天成员的电脑,同一共享环境只显示一次。
 iOS/Android 没有全局虚拟桌面清单、镜像设置或执行环境选择。入口在 **当前 Agent 聊天右上角的电脑图标**。单个 Agent 直接打开画面,群聊有多台电脑时选择当前聊天成员的电脑,同一共享环境只显示一次。
@@ -32,7 +40,7 @@ iOS/Android 没有全局虚拟桌面清单、镜像设置或执行环境选择
 - `GET /api/app/admin/local-vm` 提供准备状态、隔离策略和实例清单;`POST /prepare` 准备托管镜像,`PUT /policy` 更新策略。
 - `GET /api/app/admin/local-vm` 提供准备状态、隔离策略和实例清单;`POST /prepare` 准备托管镜像,`PUT /policy` 更新策略。
 - `/api/app/agents/:id/local-vm` 提供该 Agent 的配置和状态,`POST /:action` 提供 create/start/stop/recreate/remove。
 - `/api/app/agents/:id/local-vm` 提供该 Agent 的配置和状态,`POST /:action` 提供 create/start/stop/recreate/remove。
 - 屏幕与输入沿用受控的 `/api/app/agents/:id/computer` 通道。输入绑定账号、Agent、当前控制令牌、租约版本和截图;旧租约不能继续操作。
 - 屏幕与输入沿用受控的 `/api/app/agents/:id/computer` 通道。输入绑定账号、Agent、当前控制令牌、租约版本和截图;旧租约不能继续操作。
-- 应用设置只向管理员开放。共享不会跨账号或 Profile;实例操作会拒绝正在由 Agent 或其他人控制的虚拟机。
+- 应用设置只向管理员开放。共享不会跨账号或执行节点;实例操作会拒绝正在由 Agent 或其他人控制的虚拟机。
 
 
 ## 验收
 ## 验收
 
 

+ 51 - 0
docs/releases/v0.4.12.md

@@ -0,0 +1,51 @@
+# 夭夭 AI v0.4.12
+
+本次发布 Web、macOS Apple Silicon 桌面版、Docker Web 双架构镜像和 Cursor Universal 兼容桌面镜像。Android 沿用已签名且源码未变的 1.3(165)安装包。
+
+## 更新内容
+
+- 电脑环境可选择标准桌面或 Cursor Universal 桌面,各环境保留独立镜像选择、工作文件和浏览器资料;共享成员使用同一桌面的镜像。
+- Docker Web 新增 `compose.desktops.cursor.yaml`,一次部署 Web 和一台 Cursor 开发桌面。镜像加入 CUA 驱动及私有 Unix socket 桥接层,固定已验证的上游 digest。
+- Compose 继续管理固定桌面数量和生命周期,Agent 在电脑面板选择已有桌面。提供两种镜像混合部署和可选联网配置。
+- 群聊可直接创建,按需启用交付目标;任务面板按运行情况展示状态,并补齐协调、调度与工具调用检查。
+- 侧栏工具入口统一为交叉工具图标。
+
+## 下载
+
+- `Yaoyao-0.4.12-arm64.dmg`:macOS Apple Silicon,Apple Development 开发签名,未做 Apple 公证。
+- `Yaoyao-1.3-165-android.apk`:Android 12 及以上,与 v0.4.11 的正式签名附件相同。
+- `Yaoyao-0.4.12-source.tar.gz`:Web、桌面端源码及 Docker Compose 配置。
+- `SHA256SUMS.txt`:发布附件 SHA-256 校验文件。
+
+## Docker Hub 镜像
+
+| 镜像 | 架构与用途 |
+| --- | --- |
+| `samienluo/yaoyao:v0.4.12-amd` | Web,`linux/amd64` |
+| `samienluo/yaoyao:v0.4.12` | Web,`linux/amd64` / `linux/arm64` |
+| `samienluo/yaoyao:latest` | 验证后指向本次 Web 通用镜像 |
+| `samienluo/yaoyao-desktop:v0.4.12-cursor-amd` | Cursor Universal 兼容桌面,`linux/amd64` |
+
+Cursor 基础镜像为 `public.ecr.aws/k0i0n2g5/cursorenvironments/universal:sand-box-latest@sha256:858b6df5d0aeffd5db0e20c81553e98f84b07e9c700a13fcd1febac0e8c54830`。ARM64 宿主运行该桌面需要 amd64 模拟支持。
+
+在源码包目录复制 `docker.env.example` 为 `docker.env`,配置可访问的 Hermes 9119 地址,并设置:
+
+```dotenv
+HERMES_YAOYAO_IMAGE=samienluo/yaoyao:v0.4.12
+YAOYAO_CURSOR_DESKTOP_IMAGE=samienluo/yaoyao-desktop:v0.4.12-cursor-amd
+```
+
+```sh
+docker compose --env-file docker.env -f compose.desktops.cursor.yaml pull web desktop-cursor
+docker compose --env-file docker.env -f compose.desktops.cursor.yaml up -d --no-build
+```
+
+默认桌面为 2 CPU、4 GB 内存、512 MB 共享内存,无外网且不发布桌面控制端口。工作文件与浏览器资料保存在命名卷。首次使用按 [Docker 部署说明](../docker-install.md#hermes-执行连接) 注册执行节点。
+
+镜像 digest、远端架构、运行方式和发布附件核验结果记录在 [本版本 GitHub 发布页](https://github.com/Lsamien/yaoyao/releases/tag/v0.4.12)。Web 固定标签验证通过后更新 `latest`,旧版本标签与附件保留。
+
+## 升级
+
+升级前备份数据目录和密钥;Docker 更新通过拉取镜像并重建容器完成,保留命名卷,不使用 `down --volumes`。已有固定桌面切换镜像时保留 ID、service 和数据卷,并先结束正在执行的任务。
+
+本机 App 首次启动仍只同步较旧的本机 Web;默认数据目录为 `~/.yaoyao`。

+ 4 - 0
docs/workspace-chat.md

@@ -8,6 +8,8 @@
 
 
 新建群聊保留原有 8 套团队预设。模板将角色分配给已创建的 Agent,`memberRoles` 以成员 ID 保存群内角色名称与职责。分工仅在对应群聊执行时加入提示词,不修改 Agent 的身份与独立规则;移除成员会同步清理分工。模板所需成员不足时,先创建足够的 Agent 再使用模板。
 新建群聊保留原有 8 套团队预设。模板将角色分配给已创建的 Agent,`memberRoles` 以成员 ID 保存群内角色名称与职责。分工仅在对应群聊执行时加入提示词,不修改 Agent 的身份与独立规则;移除成员会同步清理分工。模板所需成员不足时,先创建足够的 Agent 再使用模板。
 
 
+Web/macOS 建群默认仅展示名称、成员、负责人和可选群规则,模板和高级协作设置折叠。会话任务在界面称为「话题」。建群与普通发消息不会自动创建目标、子任务或验收要求;明确交付时可开启「交付目标」,或让已获准组队的管理员按用户指令启动目标。管理员可直接完成,分工按需使用。
+
 应用数据保存在 Web 数据目录的 `workspace.sqlite3`。每一条实体、命令和事件包含服务端用户归属。隐藏上游会话只由 WorkspaceRuntime 驱动,原生历史及 RPC 不允许直接访问。基础 Hermes Profile 的记忆和工具权限没有被复制为新的隔离运行环境。
 应用数据保存在 Web 数据目录的 `workspace.sqlite3`。每一条实体、命令和事件包含服务端用户归属。隐藏上游会话只由 WorkspaceRuntime 驱动,原生历史及 RPC 不允许直接访问。基础 Hermes Profile 的记忆和工具权限没有被复制为新的隔离运行环境。
 
 
 ## API
 ## API
@@ -16,6 +18,8 @@
 - `GET/POST /api/app/agents`、`PATCH /api/app/agents/:id`:角色;`GET /api/app/agents/sources`:基础来源。
 - `GET/POST /api/app/agents`、`PATCH /api/app/agents/:id`:角色;`GET /api/app/agents/sources`:基础来源。
 - `GET/POST /api/app/conversations`、`GET/PATCH /api/app/conversations/:id`:混合列表和聊天详情。创建接口仅创建群聊;创建角色自动创建单聊。
 - `GET/POST /api/app/conversations`、`GET/PATCH /api/app/conversations/:id`:混合列表和聊天详情。创建接口仅创建群聊;创建角色自动创建单聊。
 - `GET/POST /api/app/conversations/:id/messages`:历史和发送。发送需 UUID `requestId`、`content`、`mentionIds`、`fileIds`。重复编号与内容返回同一运行,内容冲突返回 409。
 - `GET/POST /api/app/conversations/:id/messages`:历史和发送。发送需 UUID `requestId`、`content`、`mentionIds`、`fileIds`。重复编号与内容返回同一运行,内容冲突返回 409。
+- 发送的可选 `mode` 为 `chat` 或 `goal`;缺省保持聊天。`goal` 仅用于尚无目标且没有运行中回复的群话题,需要有效管理员及团队工具能力,原子保存用户消息、目标和执行,不创建额外话题。
+- `GET/PATCH /api/app/conversations/:id/tasks/:taskId/plan`:查看目标与子任务;PATCH 用 `requestId`、`expectedRevision` 和 `acceptanceCriteria` 修改进行中目标的验收条件。`expectedRevision` 对应 `goal.acceptanceRevision`(旧记录默认为 1),冲突返回 409。完成工具在验收版本大于 1 时必须传入最新 `acceptanceRevision`,旧验收依据不能直接用于完成。
 - `PUT /api/app/conversations/:id/read`:单调递增的已读序号。
 - `PUT /api/app/conversations/:id/read`:单调递增的已读序号。
 - `POST /api/app/runs/:id/stop`、`/reconcile`:停止和核对不确定状态。
 - `POST /api/app/runs/:id/stop`、`/reconcile`:停止和核对不确定状态。
 - `POST /api/app/interactions/:id/respond`:审批或澄清。
 - `POST /api/app/interactions/:id/respond`:审批或澄清。

+ 2 - 2
package-lock.json

@@ -1,12 +1,12 @@
 {
 {
   "name": "yaoyao",
   "name": "yaoyao",
-  "version": "0.4.11",
+  "version": "0.4.12",
   "lockfileVersion": 3,
   "lockfileVersion": 3,
   "requires": true,
   "requires": true,
   "packages": {
   "packages": {
     "": {
     "": {
       "name": "yaoyao",
       "name": "yaoyao",
-      "version": "0.4.11",
+      "version": "0.4.12",
       "license": "Apache-2.0",
       "license": "Apache-2.0",
       "dependencies": {
       "dependencies": {
         "@koa/bodyparser": "^5.0.0",
         "@koa/bodyparser": "^5.0.0",

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "yaoyao",
   "name": "yaoyao",
-  "version": "0.4.11",
+  "version": "0.4.12",
   "private": true,
   "private": true,
   "license": "Apache-2.0",
   "license": "Apache-2.0",
   "description": "夭夭 AI:聊天、多 Agent 团队、文件库与电脑工作空间",
   "description": "夭夭 AI:聊天、多 Agent 团队、文件库与电脑工作空间",

+ 1 - 1
playwright.config.ts

@@ -3,7 +3,7 @@ import { defineConfig, devices } from '@playwright/test'
 export default defineConfig({
 export default defineConfig({
   testDir: './tests/e2e',
   testDir: './tests/e2e',
   // These suites own different fixtures and run with their dedicated configurations.
   // These suites own different fixtures and run with their dedicated configurations.
-  testIgnore: ['**/workspace-chat.spec.ts', '**/team-tools.spec.ts', '**/avatarReference.spec.ts', '**/avatarRoundTrip.spec.ts', '**/serverIdentity.spec.ts'],
+  testIgnore: ['**/workspace-chat.spec.ts', '**/team-tools.spec.ts', '**/avatarReference.spec.ts', '**/avatarRoundTrip.spec.ts', '**/serverIdentity.spec.ts', '**/bot-panels.spec.ts', '**/grok-auth.spec.ts', '**/native-environment.spec.ts'],
   timeout: 30_000,
   timeout: 30_000,
   fullyParallel: false,
   fullyParallel: false,
   workers: 1,
   workers: 1,

+ 3 - 3
release.json

@@ -1,6 +1,6 @@
 {
 {
   "schemaVersion": 1,
   "schemaVersion": 1,
-  "releaseVersion": "0.4.11",
-  "webVersion": "0.4.11",
-  "gitTag": "v0.4.11"
+  "releaseVersion": "0.4.12",
+  "webVersion": "0.4.12",
+  "gitTag": "v0.4.12"
 }
 }

+ 68 - 19
scripts/generate-desktop-compose.mjs

@@ -1,22 +1,71 @@
 import {readFileSync,writeFileSync} from 'node:fs'
 import {readFileSync,writeFileSync} from 'node:fs'
 import {resolve} from 'node:path'
 import {resolve} from 'node:path'
+import {fileURLToPath} from 'node:url'
 const root=resolve(import.meta.dirname,'..')
 const root=resolve(import.meta.dirname,'..')
-const entries=JSON.parse(readFileSync(resolve(root,'deploy/compose-desktops.json'),'utf8'))
-if(!Array.isArray(entries)||entries.length<1||entries.length>32)throw new Error('Compose 桌面数量须为 1–32')
-for(const d of entries)if(!/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/.test(d.id)||!/^desktop-[a-z0-9-]+$/.test(d.service)||typeof d.name!=='string'||!d.name.trim())throw new Error('Compose 桌面定义无效')
-if(new Set(entries.map(d=>d.id)).size!==entries.length||new Set(entries.map(d=>d.service)).size!==entries.length)throw new Error('Compose 桌面定义重复')
-const q=JSON.stringify
-const targets=entries.map(d=>({id:d.id,name:d.name,socketPath:`/run/yaoyao-desktops/${d.service}/desktop.sock`}))
-const base=readFileSync(resolve(root,'compose.yaml'),'utf8')
-  .replace('      HERMES_YAOYAO_LOCAL_VM_HOST: "runner"','      HERMES_YAOYAO_LOCAL_VM_HOST: "runner"\n      HERMES_YAOYAO_COMPOSE_DESKTOPS: '+q(JSON.stringify(targets)))
-  .replace('      - yaoyao-data:/home/node/.yaoyao','      - yaoyao-data:/home/node/.yaoyao\n'+entries.map(d=>`      - ${d.service}-ipc:/run/yaoyao-desktops/${d.service}:ro`).join('\n'))
-const volumesAt=base.indexOf('\nvolumes:')
-if(volumesAt<0||!base.includes('HERMES_YAOYAO_COMPOSE_DESKTOPS'))throw new Error('compose.yaml 模板结构已变化')
-let yaml='# Generated from compose.yaml and deploy/compose-desktops.json.\n'+base.slice(0,volumesAt)+'\n'
-for(const d of entries)yaml+=`  ${d.service}:\n    image: "\${YAOYAO_DESKTOP_IMAGE:-hermes-yaoyao-desktop:0.4.0}"\n    build:\n      context: ./deploy/computer\n    hostname: ${d.service}\n    extra_hosts:\n      - "${d.service}:127.0.0.1"\n    init: true\n    restart: unless-stopped\n    network_mode: none\n    shm_size: 512m\n    mem_limit: 4g\n    cpus: 2\n    pids_limit: 512\n    security_opt:\n      - no-new-privileges:true\n    cap_drop:\n      - ALL\n    cap_add:\n      - SETUID\n      - SETGID\n      - CHOWN\n      - KILL\n    environment:\n      YAOYAO_COMPOSE_DESKTOP_ID: ${q(d.id)}\n    volumes:\n      - ${d.service}-workspace:/home/cua/workspace\n      - ${d.service}-ipc:/run/yaoyao-private/bridge\n`
-yaml+=base.slice(volumesAt)+'\n'
-for(const d of entries)yaml+=`  ${d.service}-workspace:\n  ${d.service}-ipc:\n`
-const output=resolve(root,'compose.desktops.yaml')
-if(process.argv.includes('--check')){if(readFileSync(output,'utf8')!==yaml)throw new Error('compose.desktops.yaml 与桌面定义不同步,请运行 node scripts/generate-desktop-compose.mjs')}
-else writeFileSync(output,yaml)
-console.log(`Compose 共享桌面:${entries.length} 台`)
+const recipes={
+  standard:{image:'${YAOYAO_DESKTOP_IMAGE:-hermes-yaoyao-desktop:0.4.0}',dockerfile:'Dockerfile'},
+  cursor:{image:'${YAOYAO_CURSOR_DESKTOP_IMAGE:-yaoyao-desktop:cursor}',dockerfile:'Dockerfile.cursor',platform:'linux/amd64'},
+}
+export function generateDesktopCompose(base,entries,source='deploy/compose-desktops.json'){
+  if(!Array.isArray(entries)||entries.length<1||entries.length>32)throw new Error('Compose 桌面数量须为 1–32')
+  for(const d of entries){
+    if(!d||!/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/.test(d.id)||!/^desktop-[a-z0-9-]+$/.test(d.service)||typeof d.name!=='string'||!d.name.trim())throw new Error('Compose 桌面定义无效')
+    if(d.imageKey!==undefined&&!Object.hasOwn(recipes,d.imageKey))throw new Error('桌面镜像须为 standard 或 cursor')
+  }
+  if(new Set(entries.map(d=>d.id)).size!==entries.length||new Set(entries.map(d=>d.service)).size!==entries.length)throw new Error('Compose 桌面定义重复')
+  const q=JSON.stringify
+  const targets=entries.map(d=>({id:d.id,name:d.name,socketPath:`/run/yaoyao-desktops/${d.service}/desktop.sock`,imageKey:d.imageKey??'standard'}))
+  base=base.replace('      HERMES_YAOYAO_LOCAL_VM_HOST: "runner"','      HERMES_YAOYAO_LOCAL_VM_HOST: "runner"\n      HERMES_YAOYAO_COMPOSE_DESKTOPS: '+q(JSON.stringify(targets)))
+    .replace('      - yaoyao-data:/home/node/.yaoyao','      - yaoyao-data:/home/node/.yaoyao\n'+entries.map(d=>`      - ${d.service}-ipc:/run/yaoyao-desktops/${d.service}:ro`).join('\n'))
+  const volumesAt=base.indexOf('\nvolumes:')
+  if(volumesAt<0||!base.includes('HERMES_YAOYAO_COMPOSE_DESKTOPS'))throw new Error('compose.yaml 模板结构已变化')
+  let yaml=`# Generated from compose.yaml and ${source}.\n`+base.slice(0,volumesAt)+'\n'
+  for(const d of entries){
+    const recipe=recipes[d.imageKey??'standard']
+    yaml+=`  ${d.service}:
+    image: "${recipe.image}"
+${recipe.platform?`    platform: ${recipe.platform}\n`:''}    build:
+      context: ./deploy/computer
+      dockerfile: ${recipe.dockerfile}
+    hostname: ${d.service}
+    extra_hosts:
+      - "${d.service}:127.0.0.1"
+    init: true
+    restart: unless-stopped
+    network_mode: none
+    shm_size: 512m
+    mem_limit: 4g
+    cpus: 2
+    pids_limit: 512
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - ALL
+    cap_add:
+      - SETUID
+      - SETGID
+      - CHOWN
+      - KILL
+    environment:
+      YAOYAO_COMPOSE_DESKTOP_ID: ${q(d.id)}
+    volumes:
+      - ${d.service}-workspace:/home/cua/workspace
+      - ${d.service}-ipc:/run/yaoyao-private/bridge
+`
+  }
+  yaml+=base.slice(volumesAt)+'\n'
+  for(const d of entries)yaml+=`  ${d.service}-workspace:\n  ${d.service}-ipc:\n`
+  return yaml
+}
+if(process.argv[1]&&resolve(process.argv[1])===fileURLToPath(import.meta.url)){
+  const base=readFileSync(resolve(root,'compose.yaml'),'utf8')
+  for(const suffix of ['', '.cursor']){
+    const source=`deploy/compose-desktops${suffix}.json`
+    const entries=JSON.parse(readFileSync(resolve(root,source),'utf8'))
+    const yaml=generateDesktopCompose(base,entries,source)
+    const name=`compose.desktops${suffix}.yaml`,output=resolve(root,name)
+    if(process.argv.includes('--check')){if(readFileSync(output,'utf8')!==yaml)throw new Error(`${name} 与桌面定义不同步,请运行 node scripts/generate-desktop-compose.mjs`)}
+    else writeFileSync(output,yaml)
+    console.log(`${name}:${entries.length} 台共享桌面`)
+  }
+}

+ 6 - 3
src/client/components/app/LocalVmSettingsPanel.vue

@@ -5,9 +5,11 @@ import {createUuid} from '@/utils/id'
 import AppIcon from '@/components/common/AppIcon.vue'
 import AppIcon from '@/components/common/AppIcon.vue'
 import RunnerSettingsPanel from './RunnerSettingsPanel.vue'
 import RunnerSettingsPanel from './RunnerSettingsPanel.vue'
 import type {LocalVmStatus,LocalVmMode,LocalVmAction,LocalVmInstance} from '@shared/localVm'
 import type {LocalVmStatus,LocalVmMode,LocalVmAction,LocalVmInstance} from '@shared/localVm'
+import {LOCAL_VM_IMAGES,type LocalVmImageKey} from '@shared/localVm'
 import type {WorkspaceAgent} from '@shared/workspace'
 import type {WorkspaceAgent} from '@shared/workspace'
 const state=ref<LocalVmStatus>(),error=ref(''),loading=ref(false),acting=ref(false)
 const state=ref<LocalVmStatus>(),error=ref(''),loading=ref(false),acting=ref(false)
 const runnerSettingsOpen=ref(false)
 const runnerSettingsOpen=ref(false)
+const prepareImage=ref<LocalVmImageKey>('standard')
 const instances=ref<Array<{agent:WorkspaceAgent;vm:LocalVmInstance}>>([])
 const instances=ref<Array<{agent:WorkspaceAgent;vm:LocalVmInstance}>>([])
 let closed=false,timer:ReturnType<typeof setTimeout>|undefined
 let closed=false,timer:ReturnType<typeof setTimeout>|undefined
 async function refresh(){
 async function refresh(){
@@ -23,7 +25,7 @@ async function refresh(){
  }catch(e){if(!closed)error.value=e instanceof Error?e.message:'无法读取本地虚拟机状态'}finally{loading.value=false}
  }catch(e){if(!closed)error.value=e instanceof Error?e.message:'无法读取本地虚拟机状态'}finally{loading.value=false}
 }
 }
 async function action(work:()=>Promise<unknown>){acting.value=true;error.value='';try{await work()}catch(e){error.value=e instanceof Error?e.message:'操作未完成'}finally{acting.value=false;await refresh()}}
 async function action(work:()=>Promise<unknown>){acting.value=true;error.value='';try{await work()}catch(e){error.value=e instanceof Error?e.message:'操作未完成'}finally{acting.value=false;await refresh()}}
-function prepare(){void action(()=>apiRequest('/api/app/admin/local-vm/prepare',{method:'POST',body:{requestId:createUuid()}}))}
+function prepare(){void action(()=>apiRequest('/api/app/admin/local-vm/prepare',{method:'POST',body:{requestId:createUuid(),imageKey:prepareImage.value}}))}
 function policy(mode:LocalVmMode,maxInstances=state.value?.maxInstances??2){
 function policy(mode:LocalVmMode,maxInstances=state.value?.maxInstances??2){
  if(mode==='shared'&&state.value?.mode!=='shared'&&!confirm('当前账号的多个机器人将共用桌面、工作文件和浏览器登录。确认使用共享虚拟机?'))return
  if(mode==='shared'&&state.value?.mode!=='shared'&&!confirm('当前账号的多个机器人将共用桌面、工作文件和浏览器登录。确认使用共享虚拟机?'))return
  void action(()=>apiRequest('/api/app/admin/local-vm/policy',{method:'PUT',body:{requestId:createUuid(),mode,maxInstances}}))
  void action(()=>apiRequest('/api/app/admin/local-vm/policy',{method:'PUT',body:{requestId:createUuid(),mode,maxInstances}}))
@@ -43,7 +45,7 @@ onMounted(cycle);onBeforeUnmount(()=>{closed=true;clearTimeout(timer)})
    <p v-if="state?.job" role="status">{{state.job.message}}</p>
    <p v-if="state?.job" role="status">{{state.job.message}}</p>
   </article>
   </article>
   <article v-if="state?.executionHost==='runner'"><h3>Hermes 执行连接</h3><p>{{state.fixedCapacity?'执行连接负责 Hermes 模型与工具调用,桌面容器完全由这套 Compose 管理。':'虚拟桌面由运行 Hermes 的执行节点提供,Docker 版 Web 通过这条连接使用桌面。'}}{{state.runnerName?`当前节点:${state.runnerName}。`:''}}</p><button :aria-expanded="runnerSettingsOpen" @click="runnerSettingsOpen=!runnerSettingsOpen">{{runnerSettingsOpen?'收起执行节点设置':'打开执行节点设置'}}</button><RunnerSettingsPanel v-if="runnerSettingsOpen" computer-setup /></article>
   <article v-if="state?.executionHost==='runner'"><h3>Hermes 执行连接</h3><p>{{state.fixedCapacity?'执行连接负责 Hermes 模型与工具调用,桌面容器完全由这套 Compose 管理。':'虚拟桌面由运行 Hermes 的执行节点提供,Docker 版 Web 通过这条连接使用桌面。'}}{{state.runnerName?`当前节点:${state.runnerName}。`:''}}</p><button :aria-expanded="runnerSettingsOpen" @click="runnerSettingsOpen=!runnerSettingsOpen">{{runnerSettingsOpen?'收起执行节点设置':'打开执行节点设置'}}</button><RunnerSettingsPanel v-if="runnerSettingsOpen" computer-setup /></article>
-  <article v-if="state?.fixedCapacity"><h3>Compose 共享桌面</h3><p>已配置 {{state.maxInstances}} 台桌面,数量由 Compose 固定。请在机器人聊天的电脑面板选择已有桌面。</p><div v-for="desktop in state.desktops" :key="desktop.id" class="instance"><strong>{{desktop.name}}</strong><span>{{desktop.ready?'已就绪':desktop.online?'正在启动':'未连接'}}</span></div></article>
+  <article v-if="state?.fixedCapacity"><h3>Compose 共享桌面</h3><p>已配置 {{state.maxInstances}} 台桌面,数量由 Compose 固定。请在机器人聊天的电脑面板选择已有桌面。</p><div v-for="desktop in state.desktops" :key="desktop.id" class="instance"><strong>{{desktop.name}} · {{desktop.imageKey==='cursor'?'Cursor Universal':'标准桌面'}}</strong><span>{{desktop.ready?'已就绪':desktop.online?'正在启动':'未连接'}}</span></div></article>
   <article v-else-if="state"><h3>隔离方式</h3><p>按机器人创建独立桌面,或让可信的机器人共用一个桌面。</p>
   <article v-else-if="state"><h3>隔离方式</h3><p>按机器人创建独立桌面,或让可信的机器人共用一个桌面。</p>
    <div class="segmented" role="group" aria-label="虚拟机隔离方式"><button :aria-pressed="state?.mode==='shared'" :disabled="!state?.configured||!!state?.setupRequired||acting||state.busy" @click="policy('shared')">共享虚拟机</button><button :aria-pressed="state?.mode==='per-bot'" :disabled="!state?.configured||!!state?.setupRequired||acting||state.busy" @click="policy('per-bot')">每个机器人独立</button></div>
    <div class="segmented" role="group" aria-label="虚拟机隔离方式"><button :aria-pressed="state?.mode==='shared'" :disabled="!state?.configured||!!state?.setupRequired||acting||state.busy" @click="policy('shared')">共享虚拟机</button><button :aria-pressed="state?.mode==='per-bot'" :disabled="!state?.configured||!!state?.setupRequired||acting||state.busy" @click="policy('per-bot')">每个机器人独立</button></div>
    <p class="sharing-explanation">共享指多个机器人操作同一台虚拟机,共用桌面和工作文件;与可同时运行的虚拟机数量无关。</p>
    <p class="sharing-explanation">共享指多个机器人操作同一台虚拟机,共用桌面和工作文件;与可同时运行的虚拟机数量无关。</p>
@@ -52,7 +54,7 @@ onMounted(cycle);onBeforeUnmount(()=>{closed=true;clearTimeout(timer)})
   <article v-if="state&&!state.fixedCapacity&&!state.setupRequired"><h3>准备运行环境</h3><p v-if="state?.executionHost==='runner'">以下检查和镜像准备均在执行节点所在电脑完成。</p><ol>
   <article v-if="state&&!state.fixedCapacity&&!state.setupRequired"><h3>准备运行环境</h3><p v-if="state?.executionHost==='runner'">以下检查和镜像准备均在执行节点所在电脑完成。</p><ol>
    <li><span class="step">{{state?.runtime?'✓':'1'}}</span><div><strong>安装 Docker 或 Podman</strong><p>{{state?.runtime?`已检测到 ${state.runtime}`:'请先安装 Docker Desktop 或 Podman。'}}</p></div></li>
    <li><span class="step">{{state?.runtime?'✓':'1'}}</span><div><strong>安装 Docker 或 Podman</strong><p>{{state?.runtime?`已检测到 ${state.runtime}`:'请先安装 Docker Desktop 或 Podman。'}}</p></div></li>
    <li><span class="step">{{state?.daemonUp?'✓':'2'}}</span><div><strong>启动容器运行环境</strong><p>{{state?.daemonUp?'运行环境已启动':'打开 Docker / Podman,等待它完成启动后重新检查。'}}</p></div></li>
    <li><span class="step">{{state?.daemonUp?'✓':'2'}}</span><div><strong>启动容器运行环境</strong><p>{{state?.daemonUp?'运行环境已启动':'打开 Docker / Podman,等待它完成启动后重新检查。'}}</p></div></li>
-   <li><span class="step">{{state?.image?'✓':'3'}}</span><div><strong>准备本地虚拟机</strong><p>下载并检查托管桌面环境。后续创建虚拟机时会自动使用。</p><button class="primary" :disabled="acting||state?.busy||!state?.daemonUp" @click="prepare">{{state?.busy?'正在准备…':state?.image?'重新检查虚拟机镜像':'准备本地虚拟机'}}</button></div></li>
+   <li><span class="step">{{state?.image?'✓':'3'}}</span><div class="image-preparation"><strong>准备虚拟机镜像</strong><p>两个镜像可分别准备。独立桌面可各自选择;同一共享桌面的所有机器人使用一个镜像。</p><label>镜像<select v-model="prepareImage" :disabled="acting||state.busy"><option v-for="image in LOCAL_VM_IMAGES" :key="image.key" :value="image.key">{{image.name}} · {{state.images?.find(i=>i.key===image.key)?.ready?'已就绪':'未准备'}}</option></select></label><p>{{LOCAL_VM_IMAGES.find(i=>i.key===prepareImage)?.description}}{{prepareImage==='cursor'?';Apple 芯片电脑需要运行环境支持 amd64 模拟。':''}}</p><button class="primary" :disabled="acting||state?.busy||!state?.daemonUp" @click="prepare">{{state?.busy?'正在准备…':state.images?.find(i=>i.key===prepareImage)?.ready?'重新检查所选镜像':'准备所选镜像'}}</button></div></li>
    <li><span class="step">4</span><div><strong>从机器人聊天中创建桌面</strong><p>打开聊天右上角的“电脑”,选择“本地虚拟机”,然后创建该机器人的虚拟机。</p></div></li>
    <li><span class="step">4</span><div><strong>从机器人聊天中创建桌面</strong><p>打开聊天右上角的“电脑”,选择“本地虚拟机”,然后创建该机器人的虚拟机。</p></div></li>
   </ol></article>
   </ol></article>
   <article v-if="state&&!state.fixedCapacity"><h3>{{state?.mode==='shared'?'共享虚拟机':'机器人虚拟机'}}</h3><p v-if="!instances.length">还没有机器人使用本地虚拟机。</p>
   <article v-if="state&&!state.fixedCapacity"><h3>{{state?.mode==='shared'?'共享虚拟机':'机器人虚拟机'}}</h3><p v-if="!instances.length">还没有机器人使用本地虚拟机。</p>
@@ -68,3 +70,4 @@ onMounted(cycle);onBeforeUnmount(()=>{closed=true;clearTimeout(timer)})
 <style scoped>
 <style scoped>
 .local-vm-settings{display:grid;gap:16px;max-width:820px}article{padding:20px;border:1px solid var(--line);border-radius:14px;display:grid;gap:12px;background:var(--surface)}h3,p{margin:0}h3{font-size:15px}p{font-size:13px;line-height:1.7;color:var(--text-secondary)}.row{display:flex;align-items:center;justify-content:space-between;gap:10px;flex-wrap:wrap}.status{display:inline-flex;align-items:center;gap:7px;font-size:13px}.segmented{display:flex;border:1px solid var(--line);border-radius:9px;overflow:hidden}.segmented button{flex:1;border:0;border-radius:0}.segmented button[aria-pressed=true]{background:var(--surface-soft);font-weight:600}.instance{display:flex;align-items:center;justify-content:space-between;gap:12px;padding-top:12px;border-top:1px solid var(--line)}button,select{font:inherit;color:var(--text-primary);background:var(--surface-raised);border:1px solid var(--line);border-radius:8px;min-height:40px;padding:7px 12px}button{display:inline-flex;align-items:center;justify-content:center;gap:6px;cursor:pointer}button:disabled{opacity:.45;cursor:default}.primary{background:var(--accent);color:var(--text-on-solid);margin-top:8px}button:focus-visible,select:focus-visible{outline:2px solid var(--accent);outline-offset:2px}ol{list-style:none;margin:0;padding:0;display:grid;gap:20px}li{display:flex;gap:12px}.step{display:grid;place-items:center;border:1px solid var(--line);border-radius:50%;height:26px;width:26px;flex:none;font-size:12px}li strong{font-size:13px}[role=alert]{color:var(--danger)}
 .local-vm-settings{display:grid;gap:16px;max-width:820px}article{padding:20px;border:1px solid var(--line);border-radius:14px;display:grid;gap:12px;background:var(--surface)}h3,p{margin:0}h3{font-size:15px}p{font-size:13px;line-height:1.7;color:var(--text-secondary)}.row{display:flex;align-items:center;justify-content:space-between;gap:10px;flex-wrap:wrap}.status{display:inline-flex;align-items:center;gap:7px;font-size:13px}.segmented{display:flex;border:1px solid var(--line);border-radius:9px;overflow:hidden}.segmented button{flex:1;border:0;border-radius:0}.segmented button[aria-pressed=true]{background:var(--surface-soft);font-weight:600}.instance{display:flex;align-items:center;justify-content:space-between;gap:12px;padding-top:12px;border-top:1px solid var(--line)}button,select{font:inherit;color:var(--text-primary);background:var(--surface-raised);border:1px solid var(--line);border-radius:8px;min-height:40px;padding:7px 12px}button{display:inline-flex;align-items:center;justify-content:center;gap:6px;cursor:pointer}button:disabled{opacity:.45;cursor:default}.primary{background:var(--accent);color:var(--text-on-solid);margin-top:8px}button:focus-visible,select:focus-visible{outline:2px solid var(--accent);outline-offset:2px}ol{list-style:none;margin:0;padding:0;display:grid;gap:20px}li{display:flex;gap:12px}.step{display:grid;place-items:center;border:1px solid var(--line);border-radius:50%;height:26px;width:26px;flex:none;font-size:12px}li strong{font-size:13px}[role=alert]{color:var(--danger)}
 </style>
 </style>
+<style scoped>.image-preparation{display:grid;gap:10px;min-width:0}.image-preparation label{display:grid;gap:6px}.image-preparation select{width:100%;min-height:44px}.image-preparation button{justify-self:start}</style>

+ 2 - 2
src/client/components/app/WorkspaceShell.vue

@@ -504,7 +504,7 @@ defineExpose({openLocalVm:()=>{if(props.isAdmin)openSettings('system-local-vm')}
       </section>
       </section>
 
 
       <div class="sidebar-footer">
       <div class="sidebar-footer">
-        <button v-if="applicationWorkspace" class="sidebar-tools-trigger" type="button" aria-haspopup="menu" :aria-expanded="toolsMenuOpen" @click="openToolsMenu"><AppIcon name="tools" :size="18" /><span>工具</span><AppIcon name="chevron-down" :size="15" /></button>
+        <button v-if="applicationWorkspace" class="sidebar-tools-trigger" type="button" aria-haspopup="menu" :aria-expanded="toolsMenuOpen" @click="openToolsMenu"><YaoYaoSidebarIcon name="tools" :size="18" /><span>工具</span><AppIcon name="chevron-down" :size="15" /></button>
         <div class="sidebar-account-switcher">
         <div class="sidebar-account-switcher">
           <button class="sidebar-account-switcher__main" type="button" :title="applicationWorkspace ? '当前账号' : `切换机器人:${profileTitle(activeProfile)}`" :aria-haspopup="applicationWorkspace ? 'menu' : 'listbox'" :aria-expanded="applicationWorkspace ? settingsMenuOpen : profileMenuOpen" @click="applicationWorkspace ? openSettingsMenu($event) : toggleProfileMenu($event)">
           <button class="sidebar-account-switcher__main" type="button" :title="applicationWorkspace ? '当前账号' : `切换机器人:${profileTitle(activeProfile)}`" :aria-haspopup="applicationWorkspace ? 'menu' : 'listbox'" :aria-expanded="applicationWorkspace ? settingsMenuOpen : profileMenuOpen" @click="applicationWorkspace ? openSettingsMenu($event) : toggleProfileMenu($event)">
             <AccountInitialAvatar v-if="applicationWorkspace" :name="userName" :image-url="userAvatar" :size="30" />
             <AccountInitialAvatar v-if="applicationWorkspace" :name="userName" :image-url="userAvatar" :size="30" />
@@ -612,7 +612,7 @@ defineExpose({openLocalVm:()=>{if(props.isAdmin)openSettings('system-local-vm')}
       </section>
       </section>
 
 
       <div class="sidebar-footer mobile-drawer__footer">
       <div class="sidebar-footer mobile-drawer__footer">
-        <button v-if="applicationWorkspace" class="sidebar-tools-trigger" type="button" aria-haspopup="menu" :aria-expanded="toolsMenuOpen" @click="openToolsMenu"><AppIcon name="tools" :size="18" /><span>工具</span><AppIcon name="chevron-down" :size="15" /></button>
+        <button v-if="applicationWorkspace" class="sidebar-tools-trigger" type="button" aria-haspopup="menu" :aria-expanded="toolsMenuOpen" @click="openToolsMenu"><YaoYaoSidebarIcon name="tools" :size="18" /><span>工具</span><AppIcon name="chevron-down" :size="15" /></button>
         <div class="sidebar-account-switcher">
         <div class="sidebar-account-switcher">
           <button class="sidebar-account-switcher__main" type="button" :title="applicationWorkspace ? '当前账号' : `切换机器人:${profileTitle(activeProfile)}`" :aria-haspopup="applicationWorkspace ? 'menu' : 'listbox'" :aria-expanded="applicationWorkspace ? settingsMenuOpen : profileMenuOpen" @click="applicationWorkspace ? openSettingsMenu($event) : toggleProfileMenu($event)">
           <button class="sidebar-account-switcher__main" type="button" :title="applicationWorkspace ? '当前账号' : `切换机器人:${profileTitle(activeProfile)}`" :aria-haspopup="applicationWorkspace ? 'menu' : 'listbox'" :aria-expanded="applicationWorkspace ? settingsMenuOpen : profileMenuOpen" @click="applicationWorkspace ? openSettingsMenu($event) : toggleProfileMenu($event)">
             <AccountInitialAvatar v-if="applicationWorkspace" :name="userName" :image-url="userAvatar" :size="30" />
             <AccountInitialAvatar v-if="applicationWorkspace" :name="userName" :image-url="userAvatar" :size="30" />

+ 3 - 1
src/client/components/common/YaoYaoSidebarIcon.vue

@@ -4,6 +4,7 @@ import { NIcon } from 'naive-ui'
 import {
 import {
   AddOutline,
   AddOutline,
   ChatbubbleOutline,
   ChatbubbleOutline,
+  ConstructOutline,
   FolderOutline,
   FolderOutline,
   GridOutline,
   GridOutline,
   PeopleOutline,
   PeopleOutline,
@@ -11,7 +12,7 @@ import {
   TimeOutline,
   TimeOutline,
 } from '@vicons/ionicons5'
 } from '@vicons/ionicons5'
 
 
-type SidebarIconName = 'add' | 'board' | 'chat' | 'history' | 'folder' | 'people' | 'search'
+type SidebarIconName = 'add' | 'board' | 'chat' | 'history' | 'folder' | 'people' | 'search' | 'tools'
 
 
 const props = withDefaults(defineProps<{ name: SidebarIconName; size?: number }>(), { size: 20 })
 const props = withDefaults(defineProps<{ name: SidebarIconName; size?: number }>(), { size: 20 })
 const component = computed(() => ({
 const component = computed(() => ({
@@ -22,6 +23,7 @@ const component = computed(() => ({
   folder: FolderOutline,
   folder: FolderOutline,
   people: PeopleOutline,
   people: PeopleOutline,
   search: SearchOutline,
   search: SearchOutline,
+  tools: ConstructOutline,
 })[props.name])
 })[props.name])
 </script>
 </script>
 
 

+ 7 - 2
src/client/components/workspace/LocalVmChatPanel.vue

@@ -19,7 +19,7 @@ const computerChoice=computed(()=>state.value?.fixedCapacity?(state.value.deskto
 const computerChoices=computed(()=>[
 const computerChoices=computed(()=>[
  {value:'auto',label:'自动',description:'按可用环境自动选择',icon:'bolt' as const,disabled:false},
  {value:'auto',label:'自动',description:'按可用环境自动选择',icon:'bolt' as const,disabled:false},
  {value:'cloud',label:'云端 · Grok Bot',description:'共享云端电脑,持续保存工作',icon:'globe' as const,disabled:false},
  {value:'cloud',label:'云端 · Grok Bot',description:'共享云端电脑,持续保存工作',icon:'globe' as const,disabled:false},
- ...(state.value?.fixedCapacity?(state.value.desktops??[]).map(desktop=>({value:desktop.id,label:desktop.name,description:desktop.ready?'已有共享桌面':'桌面尚未就绪',icon:'monitor' as const,disabled:desktop.available===false})):[{value:'vm',label:'本地虚拟机',description:'在隔离的本地桌面中工作',icon:'monitor' as const,disabled:false}]),
+ ...(state.value?.fixedCapacity?(state.value.desktops??[]).map(desktop=>({value:desktop.id,label:desktop.name,description:(desktop.imageKey==='cursor'?'Cursor Universal · ':'标准桌面 · ')+(desktop.ready?'已就绪':'尚未就绪'),icon:'monitor' as const,disabled:desktop.available===false})):[{value:'vm',label:'本地虚拟机',description:'在隔离的本地桌面中工作',icon:'monitor' as const,disabled:false}]),
  {value:'local',label:'本机',description:native.value?.host?.name??'请在电脑上打开夭夭桌面端',icon:'monitor' as const,disabled:!native.value?.local.supported},
  {value:'local',label:'本机',description:native.value?.host?.name??'请在电脑上打开夭夭桌面端',icon:'monitor' as const,disabled:!native.value?.local.supported},
  {value:'browser',label:'仅浏览器',description:native.value?.browser.available?'独立浏览器,保存登录资料':'请在电脑上打开夭夭桌面端',icon:'globe' as const,disabled:!native.value?.browser.available},
  {value:'browser',label:'仅浏览器',description:native.value?.browser.available?'独立浏览器,保存登录资料':'请在电脑上打开夭夭桌面端',icon:'globe' as const,disabled:!native.value?.browser.available},
  {value:'off',label:'不使用电脑',description:'使用基础机器人的其他工具',icon:'stop' as const,disabled:false},
  {value:'off',label:'不使用电脑',description:'使用基础机器人的其他工具',icon:'stop' as const,disabled:false},
@@ -73,6 +73,7 @@ function choose(value:string){
 async function openDesktop(){if(!agent.value)return;if(cloudSelected.value){await run(()=>apiRequest(`/api/app/agents/${selected.value}/cloud-computer/open`,{method:'POST',body:{}}));if(error.value)return}emit('desktop',agent.value)}
 async function openDesktop(){if(!agent.value)return;if(cloudSelected.value){await run(()=>apiRequest(`/api/app/agents/${selected.value}/cloud-computer/open`,{method:'POST',body:{}}));if(error.value)return}emit('desktop',agent.value)}
 function action(value:LocalVmAction){
 function action(value:LocalVmAction){
  if(value==='recreate'&&!confirm('重建这台虚拟机?当前桌面程序将关闭,工作文件和浏览器资料会保留。'))return
  if(value==='recreate'&&!confirm('重建这台虚拟机?当前桌面程序将关闭,工作文件和浏览器资料会保留。'))return
+ if(value==='remove'&&!confirm('移除这台虚拟机实例以切换镜像?工作文件和浏览器资料会保留。'))return
  void run(()=>apiRequest(base()+'/'+value,{method:'POST',body:{}}))
  void run(()=>apiRequest(base()+'/'+value,{method:'POST',body:{}}))
 }
 }
 async function cycle(){const version=revision;await refresh();if(!closed&&version===revision)timer=setTimeout(cycle,3000)}
 async function cycle(){const version=revision;await refresh();if(!closed&&version===revision)timer=setTimeout(cycle,3000)}
@@ -121,6 +122,10 @@ onBeforeUnmount(()=>{closed=true;revision++;clearTimeout(timer)})
     </template>
     </template>
     <template v-else-if="state?.enabled">
     <template v-else-if="state?.enabled">
      <p>{{agent.temporaryGoalId?'临时助手的电脑由当前任务管理':state.mode==='shared'?'共享虚拟机 · 与其他成员共用桌面和工作文件':'此机器人的独立虚拟机'}}</p>
      <p>{{agent.temporaryGoalId?'临时助手的电脑由当前任务管理':state.mode==='shared'?'共享虚拟机 · 与其他成员共用桌面和工作文件':'此机器人的独立虚拟机'}}</p>
+     <template v-if="!state.fixedCapacity&&state.images?.length&&!agent.temporaryGoalId">
+      <label>虚拟机镜像<select :value="state.imageKey??''" :disabled="busy||state.inUse||state.container!=='missing'" @change="run(()=>apiRequest(base()+'/image',{method:'PUT',body:{imageKey:($event.target as HTMLSelectElement).value}}))"><option v-if="!state.imageKey" value="" disabled>{{state.image?'当前保留的镜像':'请选择已准备的镜像'}}</option><option v-for="image in state.images" :key="image.key" :value="image.key" :disabled="!image.ready">{{image.name}}{{image.ready?'':' · 未准备'}}</option></select></label>
+      <p class="hint">{{state.mode==='shared'?'同一共享桌面只能使用一个镜像,选择会对所有共享成员生效。':'此桌面的镜像、文件和浏览器资料与其他独立桌面分开。'}}{{state.container!=='missing'?'切换镜像前请先移除实例。':''}}</p>
+     </template>
      <button v-if="!state.image" class="primary" :disabled="!isAdmin" @click="emit('settings')">设置本地虚拟机</button>
      <button v-if="!state.image" class="primary" :disabled="!isAdmin" @click="emit('settings')">设置本地虚拟机</button>
      <button v-else-if="!state.fixedCapacity&&state.container==='missing'&&!agent.temporaryGoalId" class="primary" :disabled="busy" @click="action('create')">创建 {{agent.name}} 的虚拟机</button>
      <button v-else-if="!state.fixedCapacity&&state.container==='missing'&&!agent.temporaryGoalId" class="primary" :disabled="busy" @click="action('create')">创建 {{agent.name}} 的虚拟机</button>
      <button v-else-if="!state.fixedCapacity&&state.container==='stopped'&&!agent.temporaryGoalId" class="primary" :disabled="busy" @click="action('start')">启动虚拟机</button>
      <button v-else-if="!state.fixedCapacity&&state.container==='stopped'&&!agent.temporaryGoalId" class="primary" :disabled="busy" @click="action('start')">启动虚拟机</button>
@@ -129,7 +134,7 @@ onBeforeUnmount(()=>{closed=true;revision++;clearTimeout(timer)})
       <button v-if="state.mode==='per-bot'" :disabled="busy" @click="emit('workspace',agent)"><AppIcon name="panel"/>打开双桌面</button>
       <button v-if="state.mode==='per-bot'" :disabled="busy" @click="emit('workspace',agent)"><AppIcon name="panel"/>打开双桌面</button>
       <p class="control-state">{{state.controlMode==='human'?'你或其他操作者正在控制电脑':state.inUse?'机器人正在操作':'仅查看 · 虚拟机空闲'}}</p>
       <p class="control-state">{{state.controlMode==='human'?'你或其他操作者正在控制电脑':state.inUse?'机器人正在操作':'仅查看 · 虚拟机空闲'}}</p>
      </template>
      </template>
-     <div v-if="!state.fixedCapacity&&state.container!=='missing'&&!agent.temporaryGoalId" class="vm-actions"><button :disabled="busy||state.inUse" @click="action('stop')">停止虚拟机</button><button :disabled="busy||state.inUse" @click="action('recreate')">重建虚拟机</button></div>
+     <div v-if="!state.fixedCapacity&&state.container!=='missing'&&!agent.temporaryGoalId" class="vm-actions"><button :disabled="busy||state.inUse" @click="action('stop')">停止虚拟机</button><button :disabled="busy||state.inUse" @click="action('recreate')">重建虚拟机</button><button :disabled="busy||state.inUse" @click="action('remove')">移除实例</button></div>
      <p class="hint">{{state.fixedCapacity?'桌面由 Compose 创建,数量固定。这里只连接已有共享桌面;工作目录为 /home/cua/workspace。':'重建会保留工作目录和浏览器资料。虚拟机空闲 5 分钟后自动停止。'}}</p>
      <p class="hint">{{state.fixedCapacity?'桌面由 Compose 创建,数量固定。这里只连接已有共享桌面;工作目录为 /home/cua/workspace。':'重建会保留工作目录和浏览器资料。虚拟机空闲 5 分钟后自动停止。'}}</p>
      <button v-if="isAdmin" class="settings-link" @click="emit('settings')"><AppIcon name="settings" :size="14"/>本地虚拟机设置</button>
      <button v-if="isAdmin" class="settings-link" @click="emit('settings')"><AppIcon name="settings" :size="14"/>本地虚拟机设置</button>
     </template>
     </template>

+ 87 - 24
src/client/components/workspace/TaskPlan.vue

@@ -1,33 +1,96 @@
 <script setup lang="ts">
 <script setup lang="ts">
+import { computed, nextTick, ref } from 'vue'
 import type { AgentAssignment, AgentGoal } from '@shared/agentTasks'
 import type { AgentAssignment, AgentGoal } from '@shared/agentTasks'
 import type { WorkspaceAgent } from '@shared/workspace'
 import type { WorkspaceAgent } from '@shared/workspace'
-defineProps<{ goal?: AgentGoal; assignments: AgentAssignment[]; agents: WorkspaceAgent[] }>()
-defineEmits<{stop:[];resume:[]}>()
-const labels: Record<string,string> = {pending:'待执行',running:'进行中',review:'待复核',complete:'已完成',failed:'执行失败',blocked:'遇到阻碍',cancelling:'正在停止',cancelled:'已停止',waiting:'需要补充信息'}
+const props = defineProps<{
+  goal?: AgentGoal
+  assignments: AgentAssignment[]
+  agents: WorkspaceAgent[]
+  saveCriteria?: (goalId: string, expectedRevision: number, acceptanceCriteria: string[]) => Promise<void>
+}>()
+defineEmits<{ stop: []; resume: [] }>()
+const labels: Record<string, string> = { pending: '待执行', running: '进行中', review: '待复核', complete: '已完成', failed: '执行失败', blocked: '遇到阻碍', cancelling: '正在停止', cancelled: '已停止', waiting: '需要补充信息' }
+const completed = computed(() => props.assignments.filter(a => a.status === 'complete').length)
+const editable = computed(() => !!props.saveCriteria && !!props.goal && ['running', 'review', 'waiting'].includes(props.goal.status))
+const editing = ref(false), saving = ref(false), draft = ref(''), error = ref('')
+const editor = ref<HTMLTextAreaElement>(), editButton = ref<HTMLButtonElement>()
+let revision = 1
+async function edit() {
+  if (!props.goal) return
+  draft.value = props.goal.acceptanceCriteria.join('\n')
+  revision = props.goal.acceptanceRevision ?? 1
+  error.value = ''
+  editing.value = true
+  await nextTick()
+  editor.value?.focus()
+}
+async function closeEditor() {
+  editing.value = false
+  await nextTick()
+  editButton.value?.focus()
+}
+async function save() {
+  if (!props.goal || !props.saveCriteria || saving.value) return
+  const criteria = draft.value.split('\n').map(line => line.trim()).filter(Boolean)
+  if (!criteria.length || criteria.length > 12 || criteria.some(line => line.length > 1000)) {
+    error.value = '请填写 1 至 12 条验收要求,每条不超过 1000 字。'
+    return
+  }
+  saving.value = true
+  error.value = ''
+  try {
+    await props.saveCriteria(props.goal.id, revision, criteria)
+    await closeEditor()
+  } catch (cause) { error.value = cause instanceof Error ? cause.message : '保存失败,请重试' }
+  finally { saving.value = false }
+}
 </script>
 </script>
 <template>
 <template>
-  <details v-if="goal || assignments.length" class="task-plan">
-    <summary>任务进度 <span v-if="goal">{{ labels[goal.status] }}</span></summary>
-    <ol v-if="assignments.length">
-      <li v-for="item in assignments" :key="item.id">
-        <div><strong>{{ item.title }}</strong><span>{{ labels[item.status] }}</span></div>
-        <small>{{ agents.find(a => a.id === item.agentId)?.name || '成员不可用' }}<template v-if="agents.find(a => a.id === item.agentId)?.temporaryGoalId"> · 临时助手{{ agents.find(a => a.id === item.agentId)?.archived ? (agents.find(a => a.id === item.agentId)?.cleanupState === 'pending' ? '(已退役,等待清理)' : '(已退役)') : '' }}</template></small>
-        <p v-if="item.review">{{ item.review }}</p>
-      </li>
-    </ol>
+  <section v-if="goal || assignments.length" class="task-plan" aria-label="目标进度">
+    <header>
+      <strong>交付进展</strong>
+      <span v-if="goal">{{ labels[goal.status] }}</span>
+      <small v-if="assignments.length">{{ completed }}/{{ assignments.length }} 项完成</small>
+      <button v-if="goal && ['running','review','waiting'].includes(goal.status)" type="button" @click="$emit('stop')">停止任务</button>
+      <button v-if="goal && ['blocked','waiting','cancelled'].includes(goal.status)" type="button" @click="$emit('resume')">继续任务</button>
+    </header>
     <p v-if="goal?.result" class="result">{{ goal.result }}</p>
     <p v-if="goal?.result" class="result">{{ goal.result }}</p>
-    <ul v-if="goal?.acceptanceCriteria.length" class="criteria">
-      <li v-for="(criterion,index) in goal.acceptanceCriteria" :key="index">
-        <span>{{ goal.checks?.some(check => check.criterion === index && check.passed) ? '已验收' : '待验收' }}</span> {{ criterion }}
-      </li>
-    </ul>
-    <button v-if="goal && ['running','review','waiting'].includes(goal.status)" type="button" @click="$emit('stop')">停止任务</button>
-    <button v-if="goal && ['blocked','waiting','cancelled'].includes(goal.status)" type="button" @click="$emit('resume')">继续任务</button>
-  </details>
+    <details>
+      <summary>任务与验收详情</summary>
+      <div class="plan-details">
+        <p v-if="goal" class="objective">{{ goal.objective }}</p>
+        <ol v-if="assignments.length">
+          <li v-for="item in assignments" :key="item.id">
+            <div><strong>{{ item.title }}</strong><span>{{ labels[item.status] }}</span></div>
+            <small>{{ agents.find(a => a.id === item.agentId)?.name || '成员不可用' }}<template v-if="agents.find(a => a.id === item.agentId)?.temporaryGoalId"> · 临时助手{{ agents.find(a => a.id === item.agentId)?.archived ? (agents.find(a => a.id === item.agentId)?.cleanupState === 'pending' ? '(已退役,等待清理)' : '(已退役)') : '' }}</template></small>
+            <p v-if="item.review">{{ item.review }}</p>
+          </li>
+        </ol>
+        <form v-if="editing" @submit.prevent="save">
+          <label>验收要求<textarea ref="editor" v-model="draft" :disabled="saving" rows="4" aria-describedby="criteria-help" /></label>
+          <small id="criteria-help">每行一条,描述你需要的交付结果。</small>
+          <p v-if="error" class="criteria-error" role="alert">{{ error }}</p>
+          <div class="criteria-actions"><button type="submit" :disabled="saving || !editable">{{ saving ? '保存中…' : '保存验收要求' }}</button><button type="button" :disabled="saving" @click="closeEditor">取消</button></div>
+        </form>
+        <template v-else>
+          <ul v-if="goal?.acceptanceCriteria.length" class="criteria">
+            <li v-for="(criterion, index) in goal.acceptanceCriteria" :key="index">
+              <span>{{ goal.checks?.some(check => check.criterion === index && check.passed) ? '已验收' : '待验收' }}</span> {{ criterion }}
+            </li>
+          </ul>
+          <button v-if="editable" ref="editButton" type="button" @click="edit">调整验收要求</button>
+        </template>
+      </div>
+    </details>
+  </section>
 </template>
 </template>
 <style scoped>
 <style scoped>
-.task-plan{width:100%;max-width:760px;margin:0 auto 8px;border:1px solid var(--line);border-radius:12px;padding:0 14px;font-size:13px;max-height:34vh;overflow:auto}
-summary{min-height:44px;display:flex;align-items:center;gap:12px;cursor:pointer;list-style:revert}summary span,small{color:var(--text-muted)}
-button{min-height:44px;padding:8px 12px;margin-bottom:10px;border:1px solid var(--line);border-radius:8px;background:var(--surface);color:var(--text-primary);cursor:pointer}
-ol{padding-left:18px;margin-top:0}li{padding:7px 0}li div{display:flex;gap:12px;justify-content:space-between}li div span{white-space:nowrap;color:var(--text-muted)}p{white-space:pre-wrap;line-height:1.6}.criteria{padding-left:18px}.criteria span{font-size:12px;color:var(--text-muted)}summary:focus-visible{outline:2px solid var(--text-primary);outline-offset:3px}
+.task-plan{width:100%;max-width:760px;margin:0 auto 8px;border:1px solid var(--line);border-radius:12px;padding:0 14px;font-size:13px;box-sizing:border-box}
+header{display:flex;align-items:center;gap:10px;min-height:44px;flex-wrap:wrap}header>span{color:var(--text-secondary)}header>small{margin-right:auto}header>button{margin-left:auto}
+summary{min-height:44px;align-content:center;cursor:pointer;color:var(--text-secondary)}small{font-size:12px;color:var(--text-secondary)}
+button{min-height:44px;padding:8px 12px;border:1px solid var(--line);border-radius:8px;background:var(--surface);color:var(--text-primary);font:inherit;cursor:pointer}button:hover:not(:disabled){background:var(--surface-hover)}button:disabled{opacity:.55;cursor:default}
+.plan-details{max-height:32vh;overflow:auto;padding-bottom:12px}.result{max-height:12vh;overflow:auto;margin:0;padding:8px 0}.objective{color:var(--text-secondary)}
+ol,.criteria{padding-left:18px;margin-top:0}li{padding:7px 0}li div{display:flex;gap:12px;justify-content:space-between}li div span{white-space:nowrap;color:var(--text-secondary)}p{white-space:pre-wrap;overflow-wrap:anywhere;line-height:1.6}.criteria span{font-size:12px;color:var(--text-secondary)}
+label{display:grid;gap:8px}textarea{width:100%;box-sizing:border-box;resize:vertical;padding:10px;border:1px solid var(--line);border-radius:8px;background:var(--surface);color:var(--text-primary);font:inherit;line-height:1.5}.criteria-actions{display:flex;gap:8px;margin-top:10px}.criteria-error{color:var(--danger)}
+summary:focus-visible,button:focus-visible,textarea:focus-visible{outline:2px solid var(--accent);outline-offset:2px}
 </style>
 </style>

+ 63 - 18
src/client/views/ConversationsView.vue

@@ -61,9 +61,13 @@ const active = ref<Conversation>(),
   interactions = ref<Interaction[]>([]),
   interactions = ref<Interaction[]>([]),
   context = ref<Record<string, unknown> | null>(null)
   context = ref<Record<string, unknown> | null>(null)
 const activeTask = ref<WorkspaceTask | null>(null), tasks = ref<WorkspaceTask[]>([]), assignments = ref<AgentAssignment[]>([])
 const activeTask = ref<WorkspaceTask | null>(null), tasks = ref<WorkspaceTask[]>([]), assignments = ref<AgentAssignment[]>([])
+const deliveryMode = ref(false)
+const canRequestGoal = computed(() => active.value?.kind === 'group' && !active.value.archived && !activeTask.value?.goal
+  && members.value.some(a => a.id === active.value?.administratorId && a.canManageTeam && !a.archived && !a.remoteAgentId))
 const taskFiles = new Map<string,File[]>()
 const taskFiles = new Map<string,File[]>()
 const taskQuotes = new Map<string,UiMessage | null>()
 const taskQuotes = new Map<string,UiMessage | null>()
 const composerKey = computed(() => `${auth.user?.id}:${active.value?.id}${activeTask.value ? `:${activeTask.value.id}` : ''}`)
 const composerKey = computed(() => `${auth.user?.id}:${active.value?.id}${activeTask.value ? `:${activeTask.value.id}` : ''}`)
+watch(composerKey, () => { deliveryMode.value = false })
 const text = ref(''),
 const text = ref(''),
   error = ref(''),
   error = ref(''),
   busy = ref(false),
   busy = ref(false),
@@ -338,7 +342,7 @@ async function selectTask(event:Event){
     if(active.value?.id!==conversationId)return
     if(active.value?.id!==conversationId)return
     tasks.value=[result.task,...tasks.value.filter(task=>task.id!==result.task.id)]
     tasks.value=[result.task,...tasks.value.filter(task=>task.id!==result.task.id)]
     await router.push({query:{...route.query,taskId:result.task.id}})
     await router.push({query:{...route.query,taskId:result.task.id}})
-  }catch(cause){error.value=cause instanceof Error?cause.message:'新建任务失败'}finally{creatingTask.value=false}
+  }catch(cause){error.value=cause instanceof Error?cause.message:'新建话题失败'}finally{creatingTask.value=false}
 }
 }
 async function stopTask() {
 async function stopTask() {
   if (!active.value || !activeTask.value) return
   if (!active.value || !activeTask.value) return
@@ -354,6 +358,17 @@ async function resumeTask() {
     await load(undefined,true)
     await load(undefined,true)
   } catch(cause) {error.value=cause instanceof Error?cause.message:'恢复任务失败'}
   } catch(cause) {error.value=cause instanceof Error?cause.message:'恢复任务失败'}
 }
 }
+async function saveGoalCriteria(goalId: string, expectedRevision: number, acceptanceCriteria: string[]) {
+  const conversationId = active.value?.id
+  if (!conversationId || activeTask.value?.id !== goalId) throw new Error('话题已切换,请重新打开目标')
+  const result = await apiRequest<{goal: NonNullable<WorkspaceTask['goal']>}>(`/api/app/conversations/${conversationId}/tasks/${goalId}/plan`, {
+    method: 'PATCH', body: { requestId: createUuid(), expectedRevision, acceptanceCriteria },
+  })
+  if (active.value?.id === conversationId && activeTask.value?.id === goalId) {
+    activeTask.value.goal = result.goal
+    await load(conversationId, true)
+  }
+}
 function openTaskLink(event: MouseEvent) {
 function openTaskLink(event: MouseEvent) {
   if (event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return
   if (event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return
   const anchor=(event.target as Element)?.closest?.('a[href]')
   const anchor=(event.target as Element)?.closest?.('a[href]')
@@ -534,7 +549,8 @@ async function send() {
   if (!c || busy.value || (!text.value.trim() && !files.value.length)) return
   if (!c || busy.value || (!text.value.trim() && !files.value.length)) return
   busy.value = true
   busy.value = true
   error.value = ''
   error.value = ''
-  const fingerprint = JSON.stringify([c.id, activeTask.value?.id, text.value, mentions.value, files.value.map(f => f.id)])
+  const mode = deliveryMode.value ? 'goal' : 'chat'
+  const fingerprint = JSON.stringify([c.id, activeTask.value?.id, text.value, mentions.value, files.value.map(f => f.id), mode])
   if (!pendingRequestId || pendingFingerprint !== fingerprint) {
   if (!pendingRequestId || pendingFingerprint !== fingerprint) {
     pendingRequestId = createUuid()
     pendingRequestId = createUuid()
     pendingFingerprint = fingerprint
     pendingFingerprint = fingerprint
@@ -544,6 +560,7 @@ async function send() {
       method: 'POST',
       method: 'POST',
       body: {
       body: {
         requestId: pendingRequestId,
         requestId: pendingRequestId,
+        mode,
         ...(activeTask.value ? { taskId: activeTask.value.id } : {}),
         ...(activeTask.value ? { taskId: activeTask.value.id } : {}),
         content: text.value,
         content: text.value,
         mentionIds: mentions.value,
         mentionIds: mentions.value,
@@ -555,6 +572,7 @@ async function send() {
     mentions.value = []
     mentions.value = []
     pendingRequestId = undefined
     pendingRequestId = undefined
     pendingFingerprint = ''
     pendingFingerprint = ''
+    deliveryMode.value = false
     await load(c.id, true)
     await load(c.id, true)
     await refresh()
     await refresh()
     return true
     return true
@@ -748,9 +766,9 @@ onBeforeUnmount(() => {
           <div v-if="active" class="header-actions">
           <div v-if="active" class="header-actions">
             <button v-if="active.kind==='direct'" type="button" class="icon-button" aria-label="电脑与定时任务" title="电脑与定时任务" :aria-pressed="dockView==='computer'" @click="toggleDock('computer')"><AppIcon name="monitor"/></button>
             <button v-if="active.kind==='direct'" type="button" class="icon-button" aria-label="电脑与定时任务" title="电脑与定时任务" :aria-pressed="dockView==='computer'" @click="toggleDock('computer')"><AppIcon name="monitor"/></button>
             <span v-if="active.kind === 'group' && tasks.length" class="task-picker-shell">
             <span v-if="active.kind === 'group' && tasks.length" class="task-picker-shell">
-              <select class="task-picker" aria-label="当前任务" :aria-busy="creatingTask" :disabled="creatingTask" :value="activeTask?.id" @change="selectTask">
-                <option v-for="task in tasks" :key="task.id" :value="task.id">{{ task.title }}</option>
-                <option :value="CREATE_TASK_VALUE">新建任务</option>
+              <select class="task-picker" aria-label="当前话题" :aria-busy="creatingTask" :disabled="creatingTask" :value="activeTask?.id" @change="selectTask">
+                <option v-for="task in tasks" :key="task.id" :value="task.id">{{ !task.messageCount && task.titleSource === 'automatic' ? '新话题' : task.title }}</option>
+                <option :value="CREATE_TASK_VALUE">新建话题</option>
               </select>
               </select>
               <AppIcon name="chevron-down" :size="14"/>
               <AppIcon name="chevron-down" :size="14"/>
             </span>
             </span>
@@ -767,7 +785,11 @@ onBeforeUnmount(() => {
         :mention-options="active.kind === 'group' ? members.map(a => ({id:a.id,label:a.name,insertText:`@${a.name} `})) : []"
         :mention-options="active.kind === 'group' ? members.map(a => ({id:a.id,label:a.name,insertText:`@${a.name} `})) : []"
         @send="sendFromComposer" @stop="control('stop')" @tool-trace-toggle="showThinking = !showThinking" @clear-reference="quoted = null" @error="error = $event">
         @send="sendFromComposer" @stop="control('stop')" @tool-trace-toggle="showThinking = !showThinking" @clear-reference="quoted = null" @error="error = $event">
         <template #before-input>
         <template #before-input>
-          <TaskPlan :goal="activeTask?.goal" :assignments="assignments" :agents="agents" @stop="stopTask" @resume="resumeTask" />
+          <TaskPlan :key="activeTask?.id" :goal="activeTask?.goal" :assignments="assignments" :agents="agents" :save-criteria="saveGoalCriteria" @stop="stopTask" @resume="resumeTask" />
+          <div v-if="active.kind === 'group' && !activeTask?.goal" class="delivery-mode">
+            <button type="button" :aria-pressed="deliveryMode" :disabled="!canRequestGoal || busy || loading || !!activeTask?.activeRunId" aria-describedby="delivery-mode-help" @click="deliveryMode = !deliveryMode">交付目标</button>
+            <small id="delivery-mode-help">{{ !canRequestGoal ? '负责人开启“允许组建团队”后可用' : deliveryMode ? '发送后由负责人推进交付;验收要求可随时查看和调整' : '默认直接聊天;需要持续完成具体交付时开启' }}</small>
+          </div>
         </template>
         </template>
       </ComposerShell>
       </ComposerShell>
     </section>
     </section>
@@ -796,14 +818,18 @@ onBeforeUnmount(() => {
           <h2 id="conversation-editor-title">
           <h2 id="conversation-editor-title">
             {{ dialog === 'agent' ? '创建机器人' : dialog === 'group' ? '创建群聊' : dialog === 'editAgent' ? '机器人设置' : '群聊设置' }}
             {{ dialog === 'agent' ? '创建机器人' : dialog === 'group' ? '创建群聊' : dialog === 'editAgent' ? '机器人设置' : '群聊设置' }}
           </h2>
           </h2>
-          <button type="button" aria-label="关闭" @click="closeDialog">×</button>
+          <button type="button" class="icon-button" aria-label="关闭" @click="closeDialog"><AppIcon name="close" :size="18" /></button>
         </header>
         </header>
+        <div class="editor-content">
         <p v-if="error" class="error" role="alert">{{ error }}</p>
         <p v-if="error" class="error" role="alert">{{ error }}</p>
-        <TeamPresetPicker v-if="dialog === 'group'" :selected="selectedPresetId" :available="agents.filter(a => !a.archived && !a.temporaryGoalId).length" @select="choosePreset" />
         <label>名称<input v-model="form.name" :readonly="isRemoteAgent" required maxlength="100" /></label>
         <label>名称<input v-model="form.name" :readonly="isRemoteAgent" required maxlength="100" /></label>
+        <details v-if="dialog === 'group'" class="group-options">
+          <summary>从团队模板选择(可选)</summary>
+          <TeamPresetPicker :selected="selectedPresetId" :available="agents.filter(a => !a.archived && !a.temporaryGoalId).length" @select="choosePreset" />
+        </details>
         <p v-if="isRemoteAgent">引用的机器人配置由远端管理,请在远端修改名称、头像和角色规则。</p>
         <p v-if="isRemoteAgent">引用的机器人配置由远端管理,请在远端修改名称、头像和角色规则。</p>
         <AgentIdentityPanel v-if="isAgentDialog && !isRemoteAgent" :key="`${dialog}:${editingId}`" :profile="avatarProfile" embedded :show-name="false" :show-default-model="false" :show-actions="false" @avatar-change="form.avatar = $event" />
         <AgentIdentityPanel v-if="isAgentDialog && !isRemoteAgent" :key="`${dialog}:${editingId}`" :profile="avatarProfile" embedded :show-name="false" :show-default-model="false" :show-actions="false" @avatar-change="form.avatar = $event" />
-        <div v-else-if="!isAgentDialog" class="team-avatar-settings">
+        <div v-else-if="dialog === 'editGroup'" class="team-avatar-settings">
           <TeamAvatar :name="form.name" :members="workspaceAvatarMembers(form.memberIds, agents, dialog === 'editGroup' ? editingConversation : undefined)" :size="64" />
           <TeamAvatar :name="form.name" :members="workspaceAvatarMembers(form.memberIds, agents, dialog === 'editGroup' ? editingConversation : undefined)" :size="64" />
           <small>群聊头像由成员头像自动组合,随成员头像更新。</small>
           <small>群聊头像由成员头像自动组合,随成员头像更新。</small>
         </div>
         </div>
@@ -820,9 +846,8 @@ onBeforeUnmount(() => {
           ><small v-if="!sources.length"
           ><small v-if="!sources.length"
             >{{ auth.isBotOnly ? '暂无可用的已分配机器人,请联系管理员分配或检查连接。' : '没有可用的基础机器人,请检查 Web 的 Hermes 连接。' }}</small
             >{{ auth.isBotOnly ? '暂无可用的已分配机器人,请联系管理员分配或检查连接。' : '没有可用的基础机器人,请检查 Web 的 Hermes 连接。' }}</small
           ></label
           ></label
-        ><label
-          >{{ isAgentDialog ? '角色提示词与规则' : '群规则'
-          }}<textarea
+        ><label v-if="isAgentDialog"
+          >角色提示词与规则<textarea
             v-model="form.instructions"
             v-model="form.instructions"
             :readonly="isRemoteAgent"
             :readonly="isRemoteAgent"
             rows="6"
             rows="6"
@@ -838,7 +863,7 @@ onBeforeUnmount(() => {
           <span><input v-model="form.canManageTeam" type="checkbox" aria-label="允许组建团队" aria-describedby="team-management-help" />允许组建团队</span>
           <span><input v-model="form.canManageTeam" type="checkbox" aria-label="允许组建团队" aria-describedby="team-management-help" />允许组建团队</span>
           <small id="team-management-help">允许自主创建成员、组建团队并启动任务。仅使用当前账号获准的基础机器人,新成员默认不获得此权限。发起者需使用已启用工具桥的同机 Hermes,或支持团队工具的 Runner。隔离发起者新建的成员也使用隔离电脑。</small>
           <small id="team-management-help">允许自主创建成员、组建团队并启动任务。仅使用当前账号获准的基础机器人,新成员默认不获得此权限。发起者需使用已启用工具桥的同机 Hermes,或支持团队工具的 Runner。隔离发起者新建的成员也使用隔离电脑。</small>
         </label>
         </label>
-        <button v-if="!isAgentDialog && !auth.isBotOnly" type="button" @click="remotePickerOpen = true">添加远程机器人</button>
+        <button v-if="!isAgentDialog && !auth.isBotOnly" type="button" class="remote-picker" @click="remotePickerOpen = true">添加远程机器人</button>
         <fieldset v-if="selectedPreset" class="preset-role-mapping">
         <fieldset v-if="selectedPreset" class="preset-role-mapping">
           <legend>角色分配</legend>
           <legend>角色分配</legend>
           <label v-for="(role, index) in selectedPreset.roles" :key="role.name">
           <label v-for="(role, index) in selectedPreset.roles" :key="role.name">
@@ -875,7 +900,7 @@ onBeforeUnmount(() => {
         </fieldset>
         </fieldset>
         <template v-if="!isAgentDialog"
         <template v-if="!isAgentDialog"
           ><label
           ><label
-            >管理员<select v-model="form.administratorId" required>
+            >负责人<select v-model="form.administratorId" required>
               <option
               <option
                 v-for="a in agents.filter((a) => form.memberIds.includes(a.id))"
                 v-for="a in agents.filter((a) => form.memberIds.includes(a.id))"
                 :key="a.id"
                 :key="a.id"
@@ -884,7 +909,12 @@ onBeforeUnmount(() => {
                 {{ a.name }}
                 {{ a.name }}
               </option>
               </option>
             </select></label
             </select></label
-          ><label
+          >
+          <label>群规则(可选)<textarea v-model="form.instructions" rows="3" maxlength="24000" placeholder="例如:回答简洁,重要结论注明来源" /></label>
+          <p v-if="dialog === 'group'" class="group-help">创建后即可聊天。需要交付具体结果时,再开启交付目标。</p>
+          <details class="group-options">
+            <summary>高级协作设置</summary>
+          <label
             >协作方式<select v-model="form.mode">
             >协作方式<select v-model="form.mode">
               <option value="host">管理员协调</option>
               <option value="host">管理员协调</option>
               <option value="free">自由协作</option>
               <option value="free">自由协作</option>
@@ -906,7 +936,10 @@ onBeforeUnmount(() => {
               min="1"
               min="1"
               max="100"
               max="100"
               required /></label
               required /></label
-        ></template>
+        >
+          </details>
+        </template>
+        </div>
         <footer>
         <footer>
           <button class="quiet-button" type="button" @click="closeDialog">取消</button
           <button class="quiet-button" type="button" @click="closeDialog">取消</button
           ><button v-if="!isRemoteAgent" class="solid-button" :disabled="busy || (!isAgentDialog && (form.memberIds.length < (dialog === 'group' ? 2 : 1) || form.memberIds.length > 8))">
           ><button v-if="!isRemoteAgent" class="solid-button" :disabled="busy || (!isAgentDialog && (form.memberIds.length < (dialog === 'group' ? 2 : 1) || form.memberIds.length > 8))">
@@ -925,7 +958,7 @@ onBeforeUnmount(() => {
   border-radius: 18px;
   border-radius: 18px;
   width: min(520px, calc(100vw - 48px));
   width: min(520px, calc(100vw - 48px));
   max-height: 85vh;
   max-height: 85vh;
-  overflow: auto;
+  overflow: hidden;
   background: var(--surface);
   background: var(--surface);
   color: var(--text-primary);
   color: var(--text-primary);
   padding: 25px;
   padding: 25px;
@@ -933,6 +966,15 @@ onBeforeUnmount(() => {
 .editor::backdrop {
 .editor::backdrop {
   background: #0006;
   background: #0006;
 }
 }
+.editor form{display:flex;flex-direction:column;max-height:calc(85dvh - 32px);min-height:0}
+.editor-content{min-height:0;overflow:auto;padding:0 4px;scrollbar-gutter:stable}
+.editor header,.editor footer{flex-shrink:0}
+.editor header{min-height:44px}
+.editor .remote-picker,.editor footer button{min-height:44px;padding:8px 14px;border:1px solid var(--line);border-radius:10px;background:var(--surface);color:var(--text-primary);font:inherit;font-size:13px;cursor:pointer}
+.editor .remote-picker:hover,.editor footer .quiet-button:hover{background:var(--surface-hover)}
+.editor footer .solid-button{background:var(--text-primary);color:var(--surface);border-color:var(--text-primary)}
+.editor footer button:disabled{opacity:.5;cursor:default}
+.editor .remote-picker:focus-visible,.editor footer button:focus-visible{outline:2px solid var(--accent);outline-offset:2px}
 .editor header,
 .editor header,
 .editor footer {
 .editor footer {
   display: flex;
   display: flex;
@@ -942,6 +984,7 @@ onBeforeUnmount(() => {
 }
 }
 .editor h2 {
 .editor h2 {
   font-size: 20px;
   font-size: 20px;
+  margin: 12px 0;
 }
 }
 .editor label {
 .editor label {
   display: flex;
   display: flex;
@@ -952,6 +995,8 @@ onBeforeUnmount(() => {
 }
 }
 .task-picker-shell{position:relative;display:inline-flex;align-items:center;max-width:210px;min-width:0}.task-picker-shell>.app-icon{position:absolute;right:11px;pointer-events:none;color:var(--text-muted)}.task-picker{width:100%;min-width:0;max-width:210px;min-height:38px;appearance:none;border:1px solid var(--line);border-radius:999px;background:var(--surface);color:var(--text-primary);padding:6px 34px 6px 14px;font:inherit;font-size:12px;font-weight:520;text-overflow:ellipsis;cursor:pointer;box-shadow:0 1px 2px color-mix(in srgb,var(--text-primary) 5%,transparent);transition:border-color 140ms ease,background-color 140ms ease,box-shadow 140ms ease}.task-picker:hover{border-color:var(--line-strong);background:var(--surface-hover)}.task-picker:focus-visible{outline:2px solid var(--accent);outline-offset:2px}.task-picker:disabled{cursor:wait;opacity:.55}
 .task-picker-shell{position:relative;display:inline-flex;align-items:center;max-width:210px;min-width:0}.task-picker-shell>.app-icon{position:absolute;right:11px;pointer-events:none;color:var(--text-muted)}.task-picker{width:100%;min-width:0;max-width:210px;min-height:38px;appearance:none;border:1px solid var(--line);border-radius:999px;background:var(--surface);color:var(--text-primary);padding:6px 34px 6px 14px;font:inherit;font-size:12px;font-weight:520;text-overflow:ellipsis;cursor:pointer;box-shadow:0 1px 2px color-mix(in srgb,var(--text-primary) 5%,transparent);transition:border-color 140ms ease,background-color 140ms ease,box-shadow 140ms ease}.task-picker:hover{border-color:var(--line-strong);background:var(--surface-hover)}.task-picker:focus-visible{outline:2px solid var(--accent);outline-offset:2px}.task-picker:disabled{cursor:wait;opacity:.55}
 .task-queue-status{margin:0 20px 8px;font-size:13px;color:var(--text-muted)}
 .task-queue-status{margin:0 20px 8px;font-size:13px;color:var(--text-muted)}
+.group-options{margin:12px 0;border-top:1px solid var(--line)}.group-options summary{min-height:44px;align-content:center;cursor:pointer;font-size:13px;color:var(--text-secondary)}.group-options summary:focus-visible{outline:2px solid var(--accent);outline-offset:2px}.group-help{font-size:13px;line-height:1.6;color:var(--text-secondary)}
+.delivery-mode{display:flex;align-items:center;gap:10px;margin:0 auto 8px;max-width:760px;width:100%;font-size:13px}.delivery-mode button{flex-shrink:0;min-height:44px;padding:7px 12px;border:1px solid var(--line);border-radius:999px;background:var(--surface);color:var(--text-secondary);font:inherit;cursor:pointer}.delivery-mode button:hover:not(:disabled){background:var(--surface-hover)}.delivery-mode button[aria-pressed=true]{border-color:var(--accent);color:var(--text-primary);background:var(--surface-hover)}.delivery-mode button:focus-visible{outline:2px solid var(--accent);outline-offset:2px}.delivery-mode button:disabled{opacity:.55;cursor:default}.delivery-mode small{font-size:12px;color:var(--text-secondary);line-height:1.5}
 @media(max-width:720px){.task-picker-shell,.task-picker{max-width:118px}.task-picker{min-height:44px;padding-left:12px}}
 @media(max-width:720px){.task-picker-shell,.task-picker{max-width:118px}.task-picker{min-height:44px;padding-left:12px}}
 .team-management-permission > span {
 .team-management-permission > span {
   display: flex;
   display: flex;
@@ -984,7 +1029,7 @@ onBeforeUnmount(() => {
 }
 }
 .editor footer {
 .editor footer {
   justify-content: flex-end;
   justify-content: flex-end;
-  margin-top: 25px;
+  margin-top: 12px;
 }
 }
 .status {
 .status {
   margin-top: 8px;
   margin-top: 8px;

+ 10 - 5
src/runner/agent.ts

@@ -3,6 +3,7 @@ import { DatabaseSync } from 'node:sqlite'
 import { realpath,access } from 'node:fs/promises'
 import { realpath,access } from 'node:fs/promises'
 import { resolve, sep, join } from 'node:path'
 import { resolve, sep, join } from 'node:path'
 import {LocalVmImages} from './computers/localVm.js'
 import {LocalVmImages} from './computers/localVm.js'
+import {LOCAL_VM_IMAGE_KEYS} from '../shared/localVm.js'
 import {ComputerError} from './computers/container.js'
 import {ComputerError} from './computers/container.js'
 import {z} from 'zod'
 import {z} from 'zod'
 import {ComputerRuntime,ComputerGateway,type ComputerTarget} from './worker/gateway.js'
 import {ComputerRuntime,ComputerGateway,type ComputerTarget} from './worker/gateway.js'
@@ -54,7 +55,7 @@ export class RunnerAgent {
     if(url.hostname==='localhost')url.hostname='127.0.0.1'
     if(url.hostname==='localhost')url.hostname='127.0.0.1'
     const response=await (isLocalAuthorizationTarget(url)&&this.fetchImpl===fetch?this.controlTransport.fetch.bind(this.controlTransport):this.fetchImpl)(url,{
     const response=await (isLocalAuthorizationTarget(url)&&this.fetchImpl===fetch?this.controlTransport.fetch.bind(this.controlTransport):this.fetchImpl)(url,{
       method:body===undefined?'GET':'POST',redirect:'error',signal:AbortSignal.any([this.controlAbort.signal,AbortSignal.timeout(path==='desktop'?75000:25000)]),
       method:body===undefined?'GET':'POST',redirect:'error',signal:AbortSignal.any([this.controlAbort.signal,AbortSignal.timeout(path==='desktop'?75000:25000)]),
-      headers:{Authorization:`Bearer ${this.config.token}`,'x-runner-instance':this.instance,'x-runner-protocol':'1','x-runner-features':this.computers?'computer-worker-v1,artifact-chunks-v1,computer-control-v1,shared-computer-v1,local-vm-v1'+(this.computers.provider.fixedCapacity?',compose-desktops-v1':',helper-retirement-v1')+(this.computers.config.imageId!==UNCONFIGURED_COMPUTER_IMAGE?',image-ready-v1':''):'',...(this.serverEpoch?{'x-runner-epoch':this.serverEpoch}:{}),'Content-Type':'application/json',...(path==='poll'&&!this.connected?{'x-runner-reset':'1'}:{})},
+      headers:{Authorization:`Bearer ${this.config.token}`,'x-runner-instance':this.instance,'x-runner-protocol':'1','x-runner-features':this.computers?'computer-worker-v1,artifact-chunks-v1,computer-control-v1,shared-computer-v1,local-vm-v1'+(this.computers.provider.fixedCapacity?',compose-desktops-v1':',helper-retirement-v1,image-options-v1')+(this.computers.config.imageId!==UNCONFIGURED_COMPUTER_IMAGE?',image-ready-v1':''):'',...(this.serverEpoch?{'x-runner-epoch':this.serverEpoch}:{}),'Content-Type':'application/json',...(path==='poll'&&!this.connected?{'x-runner-reset':'1'}:{})},
       ...(body===undefined?{}:{body:JSON.stringify(body)}),
       ...(body===undefined?{}:{body:JSON.stringify(body)}),
     })
     })
     if(!response.ok){
     if(!response.ok){
@@ -95,7 +96,7 @@ export class RunnerAgent {
     if(!this.active||!this.connected)throw new Error('执行节点已断开')
     if(!this.active||!this.connected)throw new Error('执行节点已断开')
     if(command.kind==='local-vm.manage'){
     if(command.kind==='local-vm.manage'){
       if(!this.localVm)throw new HttpError(409,'本地虚拟机尚未配置','computer_unavailable')
       if(!this.localVm)throw new HttpError(409,'本地虚拟机尚未配置','computer_unavailable')
-      const input=z.object({owner:z.string().regex(/^[a-f0-9]{64}$/),op:z.enum(['status','prepare','policy','instance']),id:z.string().uuid().optional(),mode:z.enum(['shared','per-bot']).optional(),maxInstances:z.number().int().min(1).max(4).optional(),environmentId:z.string().uuid().optional(),action:z.enum(['stop','remove']).optional()}).strict().parse(p)
+      const input=z.object({owner:z.string().regex(/^[a-f0-9]{64}$/),op:z.enum(['status','prepare','policy','instance']),id:z.string().uuid().optional(),imageKey:z.enum(LOCAL_VM_IMAGE_KEYS).optional(),mode:z.enum(['shared','per-bot']).optional(),maxInstances:z.number().int().min(1).max(4).optional(),environmentId:z.string().uuid().optional(),action:z.enum(['stop','remove']).optional()}).strict().parse(p)
       const check=async()=>{if(!this.connected||!this.active||(await this.api('local-vm-check',{id:input.id})).allowed!==true)throw new ComputerError('local_vm_authorization_revoked','本地虚拟机配置授权已失效')}
       const check=async()=>{if(!this.connected||!this.active||(await this.api('local-vm-check',{id:input.id})).allowed!==true)throw new ComputerError('local_vm_authorization_revoked','本地虚拟机配置授权已失效')}
       if(input.op==='status')return this.localVm.status(input.owner)
       if(input.op==='status')return this.localVm.status(input.owner)
       if(input.op==='instance'){
       if(input.op==='instance'){
@@ -104,12 +105,12 @@ export class RunnerAgent {
         if(spec)await this.computers!.pool.desktop(spec,input.action!,()=>{if(!this.active||!this.connected)throw new Error('节点已断开')})
         if(spec)await this.computers!.pool.desktop(spec,input.action!,()=>{if(!this.active||!this.connected)throw new Error('节点已断开')})
         await check();return {ok:true}
         await check();return {ok:true}
       }
       }
-      if(input.op==='prepare')return this.localVm.prepare(input.id!,check)
+      if(input.op==='prepare')return this.localVm.prepare(input.id!,check,input.imageKey)
       await check();return this.localVm.policy(input.mode!,input.maxInstances!)
       await check();return this.localVm.policy(input.mode!,input.maxInstances!)
     }
     }
     if(command.kind==='computer.control'){
     if(command.kind==='computer.control'){
       if(!this.computers)throw new HttpError(409,'电脑服务未配置','computer_unavailable')
       if(!this.computers)throw new HttpError(409,'电脑服务未配置','computer_unavailable')
-      const input=z.object({target:z.object({environmentId:z.string().uuid(),agentId:z.string().uuid(),ownerKey:z.string().regex(/^[a-f0-9]{64}$/)}).strict(),profile:z.string(),op:z.enum(['status','detail','lifecycle','frame','take','input','giveback']),controlId:z.string().uuid().optional(),requestId:z.string().uuid().optional(),generation:z.number().int().optional(),frameId:z.string().uuid().optional(),action:z.unknown().optional(),notes:z.string().max(4000).optional()}).strict().parse(p)
+      const input=z.object({target:z.object({environmentId:z.string().uuid(),agentId:z.string().uuid(),ownerKey:z.string().regex(/^[a-f0-9]{64}$/)}).strict(),profile:z.string(),op:z.enum(['status','detail','image','lifecycle','frame','take','input','giveback']),imageKey:z.enum(LOCAL_VM_IMAGE_KEYS).optional(),controlId:z.string().uuid().optional(),requestId:z.string().uuid().optional(),generation:z.number().int().optional(),frameId:z.string().uuid().optional(),action:z.unknown().optional(),notes:z.string().max(4000).optional()}).strict().parse(p)
       this.requireProfile(input.profile)
       this.requireProfile(input.profile)
       const check=async()=>{if(!this.connected||!input.controlId||(await this.api('control-check',{controlId:input.controlId})).allowed!==true)throw new HttpError(403,'电脑控制授权已失效','computer_control_expired')}
       const check=async()=>{if(!this.connected||!input.controlId||(await this.api('control-check',{controlId:input.controlId})).allowed!==true)throw new HttpError(403,'电脑控制授权已失效','computer_control_expired')}
       const authorize=()=>{if(!this.connected||!this.active||Date.now()>command.expiresAt)throw new HttpError(403,'电脑请求已失效','computer_control_expired')}
       const authorize=()=>{if(!this.connected||!this.active||Date.now()>command.expiresAt)throw new HttpError(403,'电脑请求已失效','computer_control_expired')}
@@ -120,8 +121,12 @@ export class RunnerAgent {
         const actual=spec?await this.computers.provider.inspect(spec):undefined
         const actual=spec?await this.computers.provider.inspect(spec):undefined
         let ready=false
         let ready=false
         if(actual?.running)try{await this.computers.provider.health(spec!,authorize);ready=true}catch{}
         if(actual?.running)try{await this.computers.provider.health(spec!,authorize);ready=true}catch{}
-        return {...state,container:actual?.running?'running':spec?'stopped':'missing',ready,inUse:['agent','pausing','human','resuming'].includes(state.mode),mode:vm.mode,maxInstances:vm.maxInstances,image:vm.image,controlMode:state.mode,fixedCapacity:vm.fixedCapacity}
+        const imageId=this.computers.imageFor(input.target),option=vm.images?.find(image=>image.imageId===imageId)
+        let image=!!option?.ready
+        if(!image&&!vm.fixedCapacity&&imageId!==UNCONFIGURED_COMPUTER_IMAGE)try{await this.localVm!.images.inspect(imageId);image=true}catch{}
+        return {...state,container:actual?.running?'running':spec?'stopped':'missing',ready,inUse:['agent','pausing','human','resuming'].includes(state.mode),mode:vm.mode,maxInstances:vm.maxInstances,image:vm.fixedCapacity?vm.image:image,imageId,images:vm.images,imageKey:option?.key,controlMode:state.mode,fixedCapacity:vm.fixedCapacity}
       }
       }
+      if(input.op==='image')return this.localVm!.select(input.target,z.enum(LOCAL_VM_IMAGE_KEYS).parse(input.imageKey),authorize)
       if(input.op==='lifecycle'){
       if(input.op==='lifecycle'){
         const action=z.enum(['create','start','stop','recreate','remove']).parse(input.action)
         const action=z.enum(['create','start','stop','recreate','remove']).parse(input.action)
         await this.computers.desktop(input.target,input.profile,action,authorize)
         await this.computers.desktop(input.target,input.profile,action,authorize)

+ 6 - 4
src/runner/computers/images.ts

@@ -6,9 +6,11 @@ import {tmpdir} from 'node:os'
 import {spawn} from 'node:child_process'
 import {spawn} from 'node:child_process'
 import {z} from 'zod'
 import {z} from 'zod'
 import {ContainerComputerProvider} from './container.js'
 import {ContainerComputerProvider} from './container.js'
+import type {LocalVmImageKey} from '../../shared/localVm.js'
+import {LOCAL_VM_IMAGE_KEYS} from '../../shared/localVm.js'
 
 
 const imageId=z.string().regex(/^sha256:[a-f0-9]{64}$/)
 const imageId=z.string().regex(/^sha256:[a-f0-9]{64}$/)
-export const imageManifest=z.object({protocol:z.literal(1),imageId,architecture:z.enum(['amd64','arm64']),driver:z.literal('0.20.0'),layer:z.literal('5'),createdAt:z.number().int().nonnegative(),archiveSha256:z.string().regex(/^[a-f0-9]{64}$/).optional()}).strict()
+export const imageManifest=z.object({protocol:z.literal(1),imageId,architecture:z.enum(['amd64','arm64']),driver:z.literal('0.20.0'),layer:z.literal('5'),imageKey:z.enum(LOCAL_VM_IMAGE_KEYS).optional(),createdAt:z.number().int().nonnegative(),archiveSha256:z.string().regex(/^[a-f0-9]{64}$/).optional()}).strict()
 export type ComputerImageManifest=z.infer<typeof imageManifest>
 export type ComputerImageManifest=z.infer<typeof imageManifest>
 export async function fileSHA256(path:string){const hash=createHash('sha256');for await(const bytes of createReadStream(path))hash.update(bytes);return hash.digest('hex')}
 export async function fileSHA256(path:string){const hash=createHash('sha256');for await(const bytes of createReadStream(path))hash.update(bytes);return hash.digest('hex')}
 export async function writeManifest(path:string,manifest:ComputerImageManifest){
 export async function writeManifest(path:string,manifest:ComputerImageManifest){
@@ -32,11 +34,11 @@ export class ComputerImages {
     imageId.parse(id)
     imageId.parse(id)
     const image=JSON.parse(await this.run(this.runtime,['image','inspect',id]))[0]
     const image=JSON.parse(await this.run(this.runtime,['image','inspect',id]))[0]
     if(image?.Id!==id||image.Os!=='linux'||image.Config?.Labels?.['com.openmausbot.cua-driver']!=='0.20.0'||image.Config?.Labels?.['com.openmausbot.image-layer']!=='5')throw new Error('镜像身份或电脑驱动不兼容')
     if(image?.Id!==id||image.Os!=='linux'||image.Config?.Labels?.['com.openmausbot.cua-driver']!=='0.20.0'||image.Config?.Labels?.['com.openmausbot.image-layer']!=='5')throw new Error('镜像身份或电脑驱动不兼容')
-    return imageManifest.parse({protocol:1,imageId:id,architecture:image.Architecture,driver:'0.20.0',layer:'5',createdAt:Date.now()})
+    return imageManifest.parse({protocol:1,imageId:id,architecture:image.Architecture,driver:'0.20.0',layer:'5',imageKey:image.Config.Labels['cn.samien.yaoyao.image-key']??'standard',createdAt:Date.now()})
   }
   }
-  async prepare(recipe:string):Promise<ComputerImageManifest>{
+  async prepare(recipe:string,key:LocalVmImageKey='standard'):Promise<ComputerImageManifest>{
     const tag=`localhost/yaoyao/computer:prepare-${randomUUID()}`
     const tag=`localhost/yaoyao/computer:prepare-${randomUUID()}`
-    await this.run(this.runtime,['build','--pull=false','--tag',tag,resolve(recipe)])
+    await this.run(this.runtime,['build','--pull=false',...(key==='cursor'?['--platform','linux/amd64','--file',join(resolve(recipe),'Dockerfile.cursor')]:[]),'--tag',tag,resolve(recipe)])
     const id=JSON.parse(await this.run(this.runtime,['image','inspect',tag]))[0]?.Id
     const id=JSON.parse(await this.run(this.runtime,['image','inspect',tag]))[0]?.Id
     const manifest=await this.inspect(id)
     const manifest=await this.inspect(id)
     await this.verify(manifest)
     await this.verify(manifest)

+ 39 - 12
src/runner/computers/localVm.ts

@@ -5,13 +5,14 @@ import { ComputerImages } from './images.js'
 import { ComputerError } from './container.js'
 import { ComputerError } from './container.js'
 import { UNCONFIGURED_COMPUTER_IMAGE } from '../../shared/runner.js'
 import { UNCONFIGURED_COMPUTER_IMAGE } from '../../shared/runner.js'
 import type { LocalVmMode, LocalVmStatus } from '../../shared/localVm.js'
 import type { LocalVmMode, LocalVmStatus } from '../../shared/localVm.js'
-import type { ComputerRuntime } from '../worker/gateway.js'
+import {LOCAL_VM_IMAGES, type LocalVmImageKey, type LocalVmImageOption} from '../../shared/localVm.js'
+import type { ComputerRuntime, ComputerTarget } from '../worker/gateway.js'
 import {ComposeComputerProvider} from './compose.js'
 import {ComposeComputerProvider} from './compose.js'
 import {COMPOSE_DESKTOP_IMAGE} from '../../shared/composeDesktops.js'
 import {COMPOSE_DESKTOP_IMAGE} from '../../shared/composeDesktops.js'
 
 
-type State = { imageId: string; mode: LocalVmMode; maxInstances: number; job?: LocalVmStatus['job'] }
+type State = { imageId: string; images?: Partial<Record<LocalVmImageKey,string>>; mode: LocalVmMode; maxInstances: number; job?: LocalVmStatus['job'] }
 
 
-/** One managed Local VM image. It is prepared in Settings, never selected from an image catalog. */
+/** Settings prepares trusted recipes; each desktop keeps one immutable image. */
 export class LocalVmImages {
 export class LocalVmImages {
   readonly images: ComputerImages
   readonly images: ComputerImages
   readonly ready: Promise<void>
   readonly ready: Promise<void>
@@ -31,6 +32,7 @@ export class LocalVmImages {
       if (old) this.state.imageId = JSON.parse(old.value).active ?? this.state.imageId
       if (old) this.state.imageId = JSON.parse(old.value).active ?? this.state.imageId
     }
     }
     runtime.config.imageId = this.state.imageId
     runtime.config.imageId = this.state.imageId
+    this.state.images??={standard:this.state.imageId}
     runtime.pool.limits.concurrent = this.state.maxInstances
     runtime.pool.limits.concurrent = this.state.maxInstances
     runtime.retainDesktops = true
     runtime.retainDesktops = true
     this.releaseMaintenance = runtime.pool.holdMaintenance()
     this.releaseMaintenance = runtime.pool.holdMaintenance()
@@ -51,6 +53,29 @@ export class LocalVmImages {
     await this.runtime.provider.remove(spec)
     await this.runtime.provider.remove(spec)
     await this.runtime.provider.deleteWorkspace(spec)
     await this.runtime.provider.deleteWorkspace(spec)
   }
   }
+  async options():Promise<LocalVmImageOption[]> {
+    await this.ready
+    return Promise.all(LOCAL_VM_IMAGES.map(async option=>{
+      const imageId=this.state.images?.[option.key]
+      let ready=false
+      if(imageId&&imageId!==UNCONFIGURED_COMPUTER_IMAGE)try{const image=await this.images.inspect(imageId);ready=(image.imageKey??'standard')===option.key}catch{}
+      return {...option,ready,...(ready?{imageId}:{})}
+    }))
+  }
+  async select(meta:ComputerTarget,key:LocalVmImageKey,authorize:()=>void) {
+    if(this.runtime.provider.fixedCapacity)throw new ComputerError('compose_desktop_managed','桌面镜像由 Compose 配置')
+    await this.ready;authorize();this.runtime.assertTarget(meta)
+    const release=this.runtime.pool.beginMaintenance({allowIdle:true})
+    try {
+      this.runtime.imageFor(meta) // Validate ownership, including bindings without an instance.
+      if(this.runtime.pool.definition(meta.ownerKey,meta.environmentId))throw new ComputerError('computer_image_in_use','请先移除虚拟机实例再切换镜像,工作文件和浏览器资料会保留')
+      const image=(await this.options()).find(option=>option.key===key&&option.ready)
+      if(!image?.imageId)throw new ComputerError('computer_image_required','请先在本地虚拟机设置中准备这个镜像')
+      authorize()
+      this.db.prepare('INSERT INTO computer_image_bindings VALUES(?,?,?) ON CONFLICT(id) DO UPDATE SET image_id=excluded.image_id').run(meta.environmentId,meta.ownerKey,image.imageId)
+      return {ok:true}
+    } finally {release()}
+  }
   async status(owner?:string): Promise<LocalVmStatus> {
   async status(owner?:string): Promise<LocalVmStatus> {
     await this.ready
     await this.ready
     if(this.runtime.provider instanceof ComposeComputerProvider){
     if(this.runtime.provider instanceof ComposeComputerProvider){
@@ -67,7 +92,7 @@ export class LocalVmImages {
     if(daemonUp && this.state.imageId!==UNCONFIGURED_COMPUTER_IMAGE) {
     if(daemonUp && this.state.imageId!==UNCONFIGURED_COMPUTER_IMAGE) {
       try { await this.images.inspect(this.state.imageId);image=true } catch { problem='本地虚拟机镜像尚未就绪,请重新准备' }
       try { await this.images.inspect(this.state.imageId);image=true } catch { problem='本地虚拟机镜像尚未就绪,请重新准备' }
     }
     }
-    return {configured:true,runtime:this.runtime.config.runtime,daemonUp,image,imageId:image?this.state.imageId:undefined,
+    return {configured:true,runtime:this.runtime.config.runtime,daemonUp,image,imageId:image?this.state.imageId:undefined,images:await this.options(),
       mode:this.state.mode,maxInstances:this.state.maxInstances,busy:!!this.pending||!!this.releaseMaintenance,problem,job:this.state.job,
       mode:this.state.mode,maxInstances:this.state.maxInstances,busy:!!this.pending||!!this.releaseMaintenance,problem,job:this.state.job,
       instances:owner?this.runtime.pool.status(owner).map(row=>({id:row.environmentId,status:row.status})):[]}
       instances:owner?this.runtime.pool.status(owner).map(row=>({id:row.environmentId,status:row.status})):[]}
   }
   }
@@ -81,13 +106,13 @@ export class LocalVmImages {
     finally { release() }
     finally { release() }
     return this.status()
     return this.status()
   }
   }
-  async prepare(id:string,check:()=>Promise<void>) {
+  async prepare(id:string,check:()=>Promise<void>,key:LocalVmImageKey='standard') {
     if(this.runtime.provider.fixedCapacity)throw new ComputerError('compose_desktop_managed','桌面镜像由 Compose 配置,无需在界面准备')
     if(this.runtime.provider.fixedCapacity)throw new ComputerError('compose_desktop_managed','桌面镜像由 Compose 配置,无需在界面准备')
     await this.ready;await check()
     await this.ready;await check()
-    if(this.state.job?.id===id)return this.status()
+    if(this.state.job?.id===id){if((this.state.job.imageKey??'standard')!==key)throw new ComputerError('idempotency_conflict','请求编号已用于其他镜像');return this.status()}
     if(this.pending||this.closed)throw new ComputerError('local_vm_busy','本地虚拟机正在准备,请稍后查看')
     if(this.pending||this.closed)throw new ComputerError('local_vm_busy','本地虚拟机正在准备,请稍后查看')
     this.releaseMaintenance=this.runtime.pool.beginMaintenance()
     this.releaseMaintenance=this.runtime.pool.beginMaintenance()
-    this.state.job={id,state:'running',message:'正在准备本地虚拟机'};this.save()
+    this.state.job={id,state:'running',imageKey:key,message:'正在准备本地虚拟机'};this.save()
     const progress=(message:string)=>{this.state.job!.message=message;this.save()}
     const progress=(message:string)=>{this.state.job!.message=message;this.save()}
     this.pending=(async()=>{
     this.pending=(async()=>{
       try {
       try {
@@ -104,18 +129,20 @@ export class LocalVmImages {
         this.images.verify=verify
         this.images.verify=verify
         const ids=(await this.images.run(this.images.runtime,['image','ls','--no-trunc','--quiet','--filter','label=cn.samien.yaoyao.computer-image=1'])).trim().split(/\s+/).filter(Boolean)
         const ids=(await this.images.run(this.images.runtime,['image','ls','--no-trunc','--quiet','--filter','label=cn.samien.yaoyao.computer-image=1'])).trim().split(/\s+/).filter(Boolean)
         let image
         let image
-        for(const value of [this.state.imageId,...ids].filter(id=>id!==UNCONFIGURED_COMPUTER_IMAGE)) { try{image=await this.images.inspect(value);break}catch{} }
+        for(const value of [this.state.images?.[key],...ids].filter((id):id is string=>!!id&&id!==UNCONFIGURED_COMPUTER_IMAGE)) { try{const candidate=await this.images.inspect(value);if((candidate.imageKey??'standard')===key){image=candidate;break}}catch{} }
         if(image)await verify(image)
         if(image)await verify(image)
         else {
         else {
           progress('正在准备托管桌面镜像,首次下载可能需要数分钟')
           progress('正在准备托管桌面镜像,首次下载可能需要数分钟')
           const recipe=[join(dirname(this.runtime.script),'computer-image'),join(dirname(this.runtime.script),'../computers/computer-image'),resolve('deploy/computer')].find(p=>existsSync(join(p,'Dockerfile')))
           const recipe=[join(dirname(this.runtime.script),'computer-image'),join(dirname(this.runtime.script),'../computers/computer-image'),resolve('deploy/computer')].find(p=>existsSync(join(p,'Dockerfile')))
           if(!recipe)throw new Error('缺少本地虚拟机资源,请重新安装 App')
           if(!recipe)throw new Error('缺少本地虚拟机资源,请重新安装 App')
-          image=await this.images.prepare(recipe)
+          image=await this.images.prepare(recipe,key)
         }
         }
-        await check();this.state.imageId=image.imageId;this.runtime.config.imageId=image.imageId
-        this.state.job={id,state:'complete',message:'本地虚拟机已就绪,可在机器人的电脑面板中创建桌面'};this.save()
+        await check();const previous=this.state.images![key];this.state.images![key]=image.imageId
+        // Preparing a second image must not change an existing desktop's choice.
+        if(this.state.imageId===UNCONFIGURED_COMPUTER_IMAGE||this.state.imageId===previous){this.state.imageId=image.imageId;this.runtime.config.imageId=image.imageId}
+        this.state.job={id,state:'complete',imageKey:key,message:'镜像已就绪,可在机器人的电脑面板中选择并创建桌面'};this.save()
       } catch(error) {
       } catch(error) {
-        this.state.job={id,state:'failed',message:error instanceof Error?error.message.slice(0,240):'本地虚拟机准备失败'};this.save()
+        this.state.job={id,state:'failed',imageKey:key,message:error instanceof Error?error.message.slice(0,240):'本地虚拟机准备失败'};this.save()
       } finally {
       } finally {
         // Do not release maintenance when an interrupted verification VM may still be alive.
         // Do not release maintenance when an interrupted verification VM may still be alive.
         try { await this.cleanup(id);this.releaseMaintenance?.();this.releaseMaintenance=undefined } catch { this.state.job={id,state:'failed',message:'测试虚拟机停止状态待核对,请重启执行环境后重试'};this.save() }
         try { await this.cleanup(id);this.releaseMaintenance?.();this.releaseMaintenance=undefined } catch { this.state.job={id,state:'failed',message:'测试虚拟机停止状态待核对,请重启执行环境后重试'};this.save() }

+ 1 - 1
src/runner/worker/control.ts

@@ -65,7 +65,7 @@ export class ComputerControls {
       if(state.gateway){state.lease=await state.gateway.takeControl(id,()=>this.guard(state));state.spec=state.gateway.specification}
       if(state.gateway){state.lease=await state.gateway.takeControl(id,()=>this.guard(state));state.spec=state.gateway.specification}
       else{
       else{
         const resolved=await this.runtime.resolveWorkspace(profile);await check();this.guard(state)
         const resolved=await this.runtime.resolveWorkspace(profile);await check();this.guard(state)
-        state.spec={id:meta.environmentId,ownerKey:meta.ownerKey,imageId:this.runtime.config.imageId,cwd:resolved.cwd,network:this.runtime.config.network??'none'}
+        state.spec={id:meta.environmentId,ownerKey:meta.ownerKey,imageId:this.runtime.imageFor(meta),cwd:meta.environmentId!==meta.agentId?(this.runtime.pool.definition(meta.ownerKey,meta.environmentId)?.cwd??'/home/cua/workspace'):resolved.cwd,network:this.runtime.config.network??'none'}
         await this.runtime.pool.configure(state.spec,()=>this.guard(state))
         await this.runtime.pool.configure(state.spec,()=>this.guard(state))
         state.lease=await this.runtime.pool.acquire(state.spec,`human:${id}`,()=>this.guard(state))
         state.lease=await this.runtime.pool.acquire(state.spec,`human:${id}`,()=>this.guard(state))
         if(this.runtime.config.network==='public-proxy')state.proxy=await ComputerPublicProxy.start(this.runtime.provider,state.spec,this.runtime.proxyScript,()=>this.runtime.pool.authorize(state.lease!),check,()=>{void this.stop(state)})
         if(this.runtime.config.network==='public-proxy')state.proxy=await ComputerPublicProxy.start(this.runtime.provider,state.spec,this.runtime.proxyScript,()=>this.runtime.pool.authorize(state.lease!),check,()=>{void this.stop(state)})

+ 10 - 3
src/runner/worker/gateway.ts

@@ -55,10 +55,17 @@ export class ComputerRuntime {
     this.pool=new ComputerPool(db,this.provider,{concurrent:this.config.maxConcurrent??2,environments:32,ttlMs:30000})
     this.pool=new ComputerPool(db,this.provider,{concurrent:this.config.maxConcurrent??2,environments:32,ttlMs:30000})
     db.exec('CREATE TABLE IF NOT EXISTS retired_computers(id TEXT PRIMARY KEY,owner_key TEXT NOT NULL,spec TEXT)')
     db.exec('CREATE TABLE IF NOT EXISTS retired_computers(id TEXT PRIMARY KEY,owner_key TEXT NOT NULL,spec TEXT)')
     db.exec('CREATE TABLE IF NOT EXISTS computer_sessions(id TEXT PRIMARY KEY,value TEXT NOT NULL)')
     db.exec('CREATE TABLE IF NOT EXISTS computer_sessions(id TEXT PRIMARY KEY,value TEXT NOT NULL)')
+    db.exec('CREATE TABLE IF NOT EXISTS computer_image_bindings(id TEXT PRIMARY KEY,owner_key TEXT NOT NULL,image_id TEXT NOT NULL)')
     this.controls=new ComputerControls(this)
     this.controls=new ComputerControls(this)
     this.ready=this.pool.recover();void this.ready.catch(()=>{})
     this.ready=this.pool.recover();void this.ready.catch(()=>{})
   }
   }
   assertTarget(meta:ComputerTarget){if(this.db.prepare('SELECT id FROM retired_computers WHERE id=?').get(meta.environmentId))throw new HttpError(410,'临时电脑已退役','computer_retired')}
   assertTarget(meta:ComputerTarget){if(this.db.prepare('SELECT id FROM retired_computers WHERE id=?').get(meta.environmentId))throw new HttpError(410,'临时电脑已退役','computer_retired')}
+  imageFor(meta:ComputerTarget):string {
+    const spec=this.pool.definition(meta.ownerKey,meta.environmentId)
+    const binding=this.db.prepare('SELECT owner_key,image_id FROM computer_image_bindings WHERE id=?').get(meta.environmentId) as {owner_key:string;image_id:string}|undefined
+    if(binding&&binding.owner_key!==meta.ownerKey)throw new HttpError(403,'电脑归属不匹配','computer_owner_mismatch')
+    return spec?.imageId??binding?.image_id??this.config.imageId
+  }
   async retire(meta:ComputerTarget){
   async retire(meta:ComputerTarget){
     const old=this.db.prepare('SELECT owner_key,spec FROM retired_computers WHERE id=?').get(meta.environmentId) as {owner_key:string;spec?:string}|undefined
     const old=this.db.prepare('SELECT owner_key,spec FROM retired_computers WHERE id=?').get(meta.environmentId) as {owner_key:string;spec?:string}|undefined
     if(old&&old.owner_key!==meta.ownerKey)throw new HttpError(403,'电脑归属不匹配','computer_owner_mismatch')
     if(old&&old.owner_key!==meta.ownerKey)throw new HttpError(403,'电脑归属不匹配','computer_owner_mismatch')
@@ -105,7 +112,7 @@ export class ComputerRuntime {
       return
       return
     }
     }
     const resolved=await this.resolveWorkspace(profile);authorize()
     const resolved=await this.resolveWorkspace(profile);authorize()
-    await this.pool.desktop({id:meta.environmentId,ownerKey:meta.ownerKey,imageId:this.config.imageId,cwd:meta.environmentId!==meta.agentId?(this.pool.definition(meta.ownerKey,meta.environmentId)?.cwd??COMPUTER_WORKSPACE):resolved.cwd,network:this.config.network??'none'},action,authorize)
+    await this.pool.desktop({id:meta.environmentId,ownerKey:meta.ownerKey,imageId:this.imageFor(meta),cwd:meta.environmentId!==meta.agentId?(this.pool.definition(meta.ownerKey,meta.environmentId)?.cwd??COMPUTER_WORKSPACE):resolved.cwd,network:this.config.network??'none'},action,authorize)
   }
   }
 }
 }
 export class ComputerGateway {
 export class ComputerGateway {
@@ -123,7 +130,7 @@ export class ComputerGateway {
   private async authorized(){try{await this.check();this.guard()}catch(error){await this.interrupt().catch(()=>{});if(!this.closed)this.onDisconnect();throw error}}
   private async authorized(){try{await this.check();this.guard()}catch(error){await this.interrupt().catch(()=>{});if(!this.closed)this.onDisconnect();throw error}}
   private guard(){if(this.closed||this.live?.controller.signal.aborted)throw new HttpError(410,'电脑任务授权已结束','computer_cancelled')}
   private guard(){if(this.closed||this.live?.controller.signal.aborted)throw new HttpError(410,'电脑任务授权已结束','computer_cancelled')}
   private event(type:string,payload:Record<string,unknown>){if(!this.closed&&this.live)this.onEvent({type,session_id:this.live.session.id,payload})}
   private event(type:string,payload:Record<string,unknown>){if(!this.closed&&this.live)this.onEvent({type,session_id:this.live.session.id,payload})}
-  private spec(session:WorkerSession):ComputerSpecification{return {id:this.meta.environmentId,ownerKey:this.meta.ownerKey,imageId:this.runtime.config.imageId,cwd:session.cwd,network:this.runtime.config.network??'none'}}
+  private spec(session:WorkerSession):ComputerSpecification{return {id:this.meta.environmentId,ownerKey:this.meta.ownerKey,imageId:this.runtime.imageFor(this.meta),cwd:session.cwd,network:this.runtime.config.network??'none'}}
   async rpc(method:string,params:Record<string,any>):Promise<any>{
   async rpc(method:string,params:Record<string,any>):Promise<any>{
     if((method==='session.interrupt'||method==='session.close')&&params.session_id===this.live?.session.id){await this.interrupt();return {status:'interrupted'}}
     if((method==='session.interrupt'||method==='session.close')&&params.session_id===this.live?.session.id){await this.interrupt();return {status:'interrupted'}}
     if((method==='session.interrupt'||method==='session.close')&&params.session_id===this.recoverySession?.id){await this.runtime.pool.stopHolder(this.meta.ownerKey,this.meta.environmentId,this.workId);return {status:'interrupted'}}
     if((method==='session.interrupt'||method==='session.close')&&params.session_id===this.recoverySession?.id){await this.runtime.pool.stopHolder(this.meta.ownerKey,this.meta.environmentId,this.workId);return {status:'interrupted'}}
@@ -132,7 +139,7 @@ export class ComputerGateway {
       if(this.live)throw new HttpError(409,'电脑通道已有会话','computer_session_busy')
       if(this.live)throw new HttpError(409,'电脑通道已有会话','computer_session_busy')
       await this.authorized()
       await this.authorized()
       if(method==='session.resume'&&params.recoverOnly===true){const session=this.runtime.session(String(params.session_id),this.meta,String(params.profile));this.recoverySession=session;const resource=this.runtime.pool.status(this.meta.ownerKey).find(item=>item.environmentId===this.meta.environmentId);if(resource?.holderId===this.workId)await this.runtime.pool.stopHolder(this.meta.ownerKey,this.meta.environmentId,this.workId);return {session_id:session.id,stored_session_id:session.id,running:false,info:{profile_name:session.profile}}}
       if(method==='session.resume'&&params.recoverOnly===true){const session=this.runtime.session(String(params.session_id),this.meta,String(params.profile));this.recoverySession=session;const resource=this.runtime.pool.status(this.meta.ownerKey).find(item=>item.environmentId===this.meta.environmentId);if(resource?.holderId===this.workId)await this.runtime.pool.stopHolder(this.meta.ownerKey,this.meta.environmentId,this.workId);return {session_id:session.id,stored_session_id:session.id,running:false,info:{profile_name:session.profile}}}
-      if(this.runtime.config.imageId===UNCONFIGURED_COMPUTER_IMAGE)throw new HttpError(409,'请先在应用设置的本地虚拟机页面完成准备','computer_image_required')
+      if(this.runtime.imageFor(this.meta)===UNCONFIGURED_COMPUTER_IMAGE)throw new HttpError(409,'请先在应用设置的本地虚拟机页面完成准备','computer_image_required')
       const profile=String(params.profile),resolved=await this.runtime.resolve(profile,this.controller.signal)
       const profile=String(params.profile),resolved=await this.runtime.resolve(profile,this.controller.signal)
       await this.authorized();this.guard()
       await this.authorized();this.guard()
       const session:WorkerSession=method==='session.resume'?this.runtime.session(String(params.session_id),this.meta,profile):{id:randomUUID(),agentId:this.meta.agentId,ownerKey:this.meta.ownerKey,environmentId:this.meta.environmentId,profile,cwd:resolved.cwd,configuredCwd:resolved.configuredCwd,history:[]}
       const session:WorkerSession=method==='session.resume'?this.runtime.session(String(params.session_id),this.meta,profile):{id:randomUUID(),agentId:this.meta.agentId,ownerKey:this.meta.ownerKey,environmentId:this.meta.environmentId,profile,cwd:resolved.cwd,configuredCwd:resolved.configuredCwd,history:[]}

+ 3 - 2
src/server/composeDesktops.ts

@@ -2,12 +2,13 @@ import {request} from 'node:http'
 import {z} from 'zod'
 import {z} from 'zod'
 import {HttpError} from './errors.js'
 import {HttpError} from './errors.js'
 import type {ComposeDesktop,ComposeDesktopState} from '../shared/composeDesktops.js'
 import type {ComposeDesktop,ComposeDesktopState} from '../shared/composeDesktops.js'
+import {LOCAL_VM_IMAGE_KEYS} from '../shared/localVm.js'
 
 
 export function parseComposeDesktops(value:string|undefined):ComposeDesktop[]{
 export function parseComposeDesktops(value:string|undefined):ComposeDesktop[]{
   if(!value?.trim())return []
   if(!value?.trim())return []
   let input:unknown
   let input:unknown
   try{input=JSON.parse(value)}catch{throw new Error('HERMES_YAOYAO_COMPOSE_DESKTOPS 必须为有效 JSON')}
   try{input=JSON.parse(value)}catch{throw new Error('HERMES_YAOYAO_COMPOSE_DESKTOPS 必须为有效 JSON')}
-  const parsed=z.array(z.object({id:z.string().uuid(),name:z.string().trim().min(1).max(100),socketPath:z.string().regex(/^\/run\/yaoyao-desktops\/[a-z0-9_-]+\/desktop\.sock$/)}).strict()).min(1).max(32).parse(input)
+  const parsed=z.array(z.object({id:z.string().uuid(),name:z.string().trim().min(1).max(100),socketPath:z.string().regex(/^\/run\/yaoyao-desktops\/[a-z0-9_-]+\/desktop\.sock$/),imageKey:z.enum(LOCAL_VM_IMAGE_KEYS).optional()}).strict()).min(1).max(32).parse(input)
   if(new Set(parsed.map(x=>x.id)).size!==parsed.length||new Set(parsed.map(x=>x.socketPath)).size!==parsed.length)throw new Error('Compose 桌面 ID 和连接路径不能重复')
   if(new Set(parsed.map(x=>x.id)).size!==parsed.length||new Set(parsed.map(x=>x.socketPath)).size!==parsed.length)throw new Error('Compose 桌面 ID 和连接路径不能重复')
   return parsed
   return parsed
 }
 }
@@ -30,5 +31,5 @@ export class ComposeDesktops {
       req.end(data)
       req.end(data)
     })
     })
   }
   }
-  async status():Promise<ComposeDesktopState[]>{return Promise.all(this.desktops.map(async d=>{try{const state=await this.call(d.id,'health');if(state.id!==d.id||state.protocol!==1)throw new Error('身份不匹配');return {id:d.id,name:d.name,online:true,ready:state.ready===true}}catch{return {id:d.id,name:d.name,online:false,ready:false}}}))}
+  async status():Promise<ComposeDesktopState[]>{return Promise.all(this.desktops.map(async d=>{try{const state=await this.call(d.id,'health');if(state.id!==d.id||state.protocol!==1)throw new Error('身份不匹配');return {id:d.id,name:d.name,imageKey:d.imageKey,online:true,ready:state.ready===true}}catch{return {id:d.id,name:d.name,imageKey:d.imageKey,online:false,ready:false}}}))}
 }
 }

+ 12 - 2
src/server/localVm.ts

@@ -8,6 +8,7 @@ import { promisify } from 'node:util'
 import { RunnerAgent } from '../runner/agent.js'
 import { RunnerAgent } from '../runner/agent.js'
 import { UNCONFIGURED_COMPUTER_IMAGE, type RunnerConfiguration } from '../shared/runner.js'
 import { UNCONFIGURED_COMPUTER_IMAGE, type RunnerConfiguration } from '../shared/runner.js'
 import type { LocalVmMode, LocalVmStatus } from '../shared/localVm.js'
 import type { LocalVmMode, LocalVmStatus } from '../shared/localVm.js'
+import {LOCAL_VM_IMAGE_KEYS} from '../shared/localVm.js'
 import type { WorkspaceAgent } from '../shared/workspace.js'
 import type { WorkspaceAgent } from '../shared/workspace.js'
 import { parse, type WorkspaceStore } from './workspaceStore.js'
 import { parse, type WorkspaceStore } from './workspaceStore.js'
 import type { LocalAuthStore } from './localAuth.js'
 import type { LocalAuthStore } from './localAuth.js'
@@ -138,9 +139,9 @@ export class LocalVmService {
     router.get('/api/app/admin/local-vm',async ctx=>{ctx.body=await this.status(this.auth.requireAdmin(ctx).id)})
     router.get('/api/app/admin/local-vm',async ctx=>{ctx.body=await this.status(this.auth.requireAdmin(ctx).id)})
     router.post('/api/app/admin/local-vm/prepare',async ctx=>{
     router.post('/api/app/admin/local-vm/prepare',async ctx=>{
       this.auth.requireAdmin(ctx);this.assertManaged()
       this.auth.requireAdmin(ctx);this.assertManaged()
-      const actor=this.auth.requireAdmin(ctx),body=parse(z.object({requestId:z.string().uuid()}).strict(),(ctx.request as any).body)
+      const actor=this.auth.requireAdmin(ctx),body=parse(z.object({requestId:z.string().uuid(),imageKey:z.enum(LOCAL_VM_IMAGE_KEYS).optional()}).strict(),(ctx.request as any).body)
       const record=await this.ensure(actor.id);this.grant(actor.id,body.requestId,record.id)
       const record=await this.ensure(actor.id);this.grant(actor.id,body.requestId,record.id)
-      ctx.body=await this.hub.localVm(actor.id,record.id,{op:'prepare',id:body.requestId})
+      ctx.body=await this.hub.localVm(actor.id,record.id,{op:'prepare',id:body.requestId,...(body.imageKey?{imageKey:body.imageKey}:{})})
     })
     })
     router.put('/api/app/admin/local-vm/policy',async ctx=>{
     router.put('/api/app/admin/local-vm/policy',async ctx=>{
       this.auth.requireAdmin(ctx);this.assertManaged()
       this.auth.requireAdmin(ctx);this.assertManaged()
@@ -187,6 +188,15 @@ export class LocalVmService {
         return {agent:this.store.agentSummary(this.store.require<WorkspaceAgent>(owner,'agent',agent.id))}
         return {agent:this.store.agentSummary(this.store.require<WorkspaceAgent>(owner,'agent',agent.id))}
       })
       })
     })
     })
+    router.put('/api/app/agents/:id/local-vm/image',async ctx=>{
+      const owner=this.auth.require(ctx).id;this.assertManaged()
+      const body=parse(z.object({imageKey:z.enum(LOCAL_VM_IMAGE_KEYS)}).strict(),(ctx.request as any).body)
+      const agent=this.store.require<WorkspaceAgent>(owner,'agent',ctx.params.id)
+      this.nodes.requireSource(owner,agent)
+      if(agent.execution!=='computer'||agent.archived||agent.remoteAgentId||agent.temporaryGoalId)throw new HttpError(409,'此机器人不能更改虚拟机镜像','local_vm_disabled')
+      this.shared.assertLocalVmIdle(owner,agent.computerEnvironmentId?this.store.list<WorkspaceAgent>(owner,'agent').filter(a=>a.computerEnvironmentId===agent.computerEnvironmentId).map(a=>a.id):[agent.id])
+      ctx.body=await this.hub.computer(owner,agent,'image',{imageKey:body.imageKey},()=>this.nodes.requireSource(owner,agent))
+    })
     router.post('/api/app/agents/:id/local-vm/:action',async ctx=>{
     router.post('/api/app/agents/:id/local-vm/:action',async ctx=>{
       this.auth.require(ctx);this.assertManaged()
       this.auth.require(ctx);this.assertManaged()
       const owner=this.auth.require(ctx).id,action=parse(z.enum(['create','start','stop','recreate','remove']),ctx.params.action)
       const owner=this.auth.require(ctx).id,action=parse(z.enum(['create','start','stop','recreate','remove']),ctx.params.action)

+ 3 - 1
src/server/runnerHub.ts

@@ -56,6 +56,7 @@ export class RunnerHub {
   async localVm(owner:string,id:string,payload:Record<string,unknown>){
   async localVm(owner:string,id:string,payload:Record<string,unknown>){
     const record=this.store.require<RunnerRecord>('_system','runner',id),version=this.auth.pushAuthorizationVersion(owner)
     const record=this.store.require<RunnerRecord>('_system','runner',id),version=this.auth.pushAuthorizationVersion(owner)
     if(!record.enabled||!this.online.get(id)?.features.includes('local-vm-v1'))throw new HttpError(409,'本地虚拟机执行环境离线或版本过旧,请重新连接或更新','local_vm_unavailable')
     if(!record.enabled||!this.online.get(id)?.features.includes('local-vm-v1'))throw new HttpError(409,'本地虚拟机执行环境离线或版本过旧,请重新连接或更新','local_vm_unavailable')
+    if(payload.imageKey&&!this.online.get(id)?.features.includes('image-options-v1'))throw new HttpError(409,'执行节点版本不支持镜像选择,请更新 Runner','computer_image_options_unavailable')
     const valid=()=>this.auth.isAdminActive(owner)&&this.auth.pushAuthorizationVersion(owner)===version&&this.store.get<RunnerRecord>('_system','runner',id)?.enabled===true
     const valid=()=>this.auth.isAdminActive(owner)&&this.auth.pushAuthorizationVersion(owner)===version&&this.store.get<RunnerRecord>('_system','runner',id)?.enabled===true
     if(!valid())throw new HttpError(403,'本地虚拟机设置需要管理员权限','admin_required')
     if(!valid())throw new HttpError(403,'本地虚拟机设置需要管理员权限','admin_required')
     const key = `${owner}:${id}`
     const key = `${owner}:${id}`
@@ -186,6 +187,7 @@ export class RunnerHub {
   sharedComputerRunner(owner:string,agent:import('../shared/workspace.js').WorkspaceAgent){const record=this.computerRunner(owner,agent);if(agent.computerEnvironmentId&&this.store.require<import('./sharedComputers.js').SharedComputer>(owner,'shared-computer',agent.computerEnvironmentId).runnerId!==record.id)throw new HttpError(409,'共享电脑的原执行节点已变化','shared_runner_changed');if(!this.online.get(record.id)?.features.includes('shared-computer-v1'))throw new HttpError(409,'执行节点不支持共享电脑,请更新 Runner','shared_computer_unavailable');return record}
   sharedComputerRunner(owner:string,agent:import('../shared/workspace.js').WorkspaceAgent){const record=this.computerRunner(owner,agent);if(agent.computerEnvironmentId&&this.store.require<import('./sharedComputers.js').SharedComputer>(owner,'shared-computer',agent.computerEnvironmentId).runnerId!==record.id)throw new HttpError(409,'共享电脑的原执行节点已变化','shared_runner_changed');if(!this.online.get(record.id)?.features.includes('shared-computer-v1'))throw new HttpError(409,'执行节点不支持共享电脑,请更新 Runner','shared_computer_unavailable');return record}
   async computer(owner:string,agent:import('../shared/workspace.js').WorkspaceAgent,op:string,data:Record<string,unknown>,authorize:()=>void):Promise<any>{
   async computer(owner:string,agent:import('../shared/workspace.js').WorkspaceAgent,op:string,data:Record<string,unknown>,authorize:()=>void):Promise<any>{
     const record=agent.computerEnvironmentId?this.sharedComputerRunner(owner,agent):this.computerRunner(owner,agent),version=this.auth.pushAuthorizationVersion(owner)
     const record=agent.computerEnvironmentId?this.sharedComputerRunner(owner,agent):this.computerRunner(owner,agent),version=this.auth.pushAuthorizationVersion(owner)
+    if(op==='image'&&!this.online.get(record.id)?.features.includes('image-options-v1'))throw new HttpError(409,'执行节点版本不支持镜像选择,请更新 Runner','computer_image_options_unavailable')
     const valid=()=>{try{authorize();return this.auth.isUserActive(owner)&&this.auth.pushAuthorizationVersion(owner)===version}catch{return false}}
     const valid=()=>{try{authorize();return this.auth.isUserActive(owner)&&this.auth.pushAuthorizationVersion(owner)===version}catch{return false}}
     const result=await this.request(record.id,'computer.control',{target:{environmentId:agent.computerEnvironmentId??agent.id,agentId:agent.id,ownerKey:hash(owner)},profile:agent.profile,op,...data},valid)
     const result=await this.request(record.id,'computer.control',{target:{environmentId:agent.computerEnvironmentId??agent.id,agentId:agent.id,ownerKey:hash(owner)},profile:agent.profile,op,...data},valid)
     if(!valid())throw new HttpError(403,'电脑请求授权已失效','computer_control_expired')
     if(!valid())throw new HttpError(403,'电脑请求授权已失效','computer_control_expired')
@@ -227,7 +229,7 @@ export class RunnerHub {
         retired.add(previous.instance);this.retired.set(record.id,retired);this.disconnect(record.id);previous=undefined
         retired.add(previous.instance);this.retired.set(record.id,retired);this.disconnect(record.id);previous=undefined
       }
       }
       if(match[2]!=='poll'&&ctx.get('x-runner-epoch')!==previous?.epoch)throw new HttpError(409,'执行连接代次已改变','runner_epoch_changed')
       if(match[2]!=='poll'&&ctx.get('x-runner-epoch')!==previous?.epoch)throw new HttpError(409,'执行连接代次已改变','runner_epoch_changed')
-      const state=this.online.get(record.id)??{instance,seen:Date.now(),features:[],epoch:`${this.epoch}:${randomUUID()}`};state.seen=Date.now();if(ctx.get('x-runner-features'))state.features=ctx.get('x-runner-features').split(',').filter(value=>['computer-worker-v1','artifact-chunks-v1','helper-retirement-v1','computer-control-v1','shared-computer-v1','local-vm-v1','image-ready-v1','compose-desktops-v1'].includes(value));this.online.set(record.id,state)
+      const state=this.online.get(record.id)??{instance,seen:Date.now(),features:[],epoch:`${this.epoch}:${randomUUID()}`};state.seen=Date.now();if(ctx.get('x-runner-features'))state.features=ctx.get('x-runner-features').split(',').filter(value=>['computer-worker-v1','artifact-chunks-v1','helper-retirement-v1','computer-control-v1','shared-computer-v1','local-vm-v1','image-options-v1','image-ready-v1','compose-desktops-v1'].includes(value));this.online.set(record.id,state)
       ctx.set('Cache-Control','no-store')
       ctx.set('Cache-Control','no-store')
       if(match[2]==='poll') {
       if(match[2]==='poll') {
         if(ctx.method!=='GET')throw new HttpError(405,'仅允许 GET','method_not_allowed')
         if(ctx.method!=='GET')throw new HttpError(405,'仅允许 GET','method_not_allowed')

+ 27 - 2
src/server/taskCoordinator.ts

@@ -9,6 +9,11 @@ import type { AgentGoal, AgentAssignment, TaskDelivery, TaskOrigin } from '../sh
 const terminalRun = (status: string) => ['complete', 'failed', 'interrupted'].includes(status)
 const terminalRun = (status: string) => ['complete', 'failed', 'interrupted'].includes(status)
 const terminalGoal = (status: string) => ['complete', 'blocked', 'cancelled'].includes(status)
 const terminalGoal = (status: string) => ['complete', 'blocked', 'cancelled'].includes(status)
 const criteria = z.array(z.string().trim().min(1).max(1000)).max(12).default([])
 const criteria = z.array(z.string().trim().min(1).max(1000)).max(12).default([])
+export const goalCriteriaInput = z.object({
+  requestId: z.string().uuid(),
+  expectedRevision: z.number().int().positive(),
+  acceptanceCriteria: z.array(z.string().trim().min(1).max(1000)).min(1).max(12),
+}).strict()
 export const assignmentInput = z.object({
 export const assignmentInput = z.object({
   requestId: z.string().uuid(), goalId: z.string().uuid(), agentId: z.string().uuid(),
   requestId: z.string().uuid(), goalId: z.string().uuid(), agentId: z.string().uuid(),
   title: z.string().trim().min(1).max(100), brief: z.string().trim().min(1).max(16000),
   title: z.string().trim().min(1).max(100), brief: z.string().trim().min(1).max(16000),
@@ -28,6 +33,7 @@ export const assignmentCancel = z.object({requestId:z.string().uuid(),assignment
 export const finishGoalInput = z.object({
 export const finishGoalInput = z.object({
   requestId: z.string().uuid(), goalId: z.string().uuid(), status: z.enum(['complete', 'blocked', 'waiting']),
   requestId: z.string().uuid(), goalId: z.string().uuid(), status: z.enum(['complete', 'blocked', 'waiting']),
   result: z.string().trim().min(1).max(16000), artifactIds: z.array(z.string().uuid()).max(24).default([]),
   result: z.string().trim().min(1).max(16000), artifactIds: z.array(z.string().uuid()).max(24).default([]),
+  acceptanceRevision: z.number().int().positive().optional(),
   checks: z.array(z.object({criterion:z.number().int().min(0).max(11),passed:z.boolean(),evidence:z.string().trim().min(1).max(2000)}).strict()).max(12).default([]),
   checks: z.array(z.object({criterion:z.number().int().min(0).max(11),passed:z.boolean(),evidence:z.string().trim().min(1).max(2000)}).strict()).max(12).default([]),
 }).strict()
 }).strict()
 export const resumeGoalInput = z.object({requestId:z.string().uuid(),goalId:z.string().uuid()}).strict()
 export const resumeGoalInput = z.object({requestId:z.string().uuid(),goalId:z.string().uuid()}).strict()
@@ -56,12 +62,27 @@ export class WorkspaceTaskCoordinator {
     const old = this.store.get<AgentGoal>(owner, 'goal', task.id)
     const old = this.store.get<AgentGoal>(owner, 'goal', task.id)
     if (old) throw new HttpError(409, '这个任务已有目标,请继续原任务或新建任务', 'goal_exists')
     if (old) throw new HttpError(409, '这个任务已有目标,请继续原任务或新建任务', 'goal_exists')
     const goal: AgentGoal = { id: task.id, conversationId: task.conversationId, coordinatorId: coordinator.id,
     const goal: AgentGoal = { id: task.id, conversationId: task.conversationId, coordinatorId: coordinator.id,
-      authorityRevision: coordinator.teamAuthorizationVersion ?? 0, objective, acceptanceCriteria: acceptanceCriteria.length ? acceptanceCriteria : ['对照原始请求核验交付结果'],
+      authorityRevision: coordinator.teamAuthorizationVersion ?? 0, objective, acceptanceCriteria: acceptanceCriteria.length ? acceptanceCriteria : ['对照原始请求核验交付结果'], acceptanceRevision: 1,
       authorizationVersion: this.runtime.authorizationVersion(owner), activation: 1,
       authorizationVersion: this.runtime.authorizationVersion(owner), activation: 1,
       status: 'running', origin, artifactIds: [], revision: 1, automaticWakes: 0, createdAt: Date.now(), updatedAt: Date.now() }
       status: 'running', origin, artifactIds: [], revision: 1, automaticWakes: 0, createdAt: Date.now(), updatedAt: Date.now() }
     this.saveGoal(owner, goal)
     this.saveGoal(owner, goal)
     return goal
     return goal
   }
   }
+  updateCriteria(owner: string, goalId: string, input: unknown, actorId?: string): AgentGoal {
+    const body = parse(goalCriteriaInput, input)
+    return this.store.command(owner, body.requestId, { operation: 'goal.criteria', goalId, actorId: actorId ?? 'user', ...body }, () => {
+      const goal = actorId ? this.requireCoordinator(owner, goalId, actorId) : this.store.require<AgentGoal>(owner, 'goal', goalId)
+      if (!this.authorized(owner, goal)) throw new HttpError(403, '目标授权已失效', 'goal_forbidden')
+      if (!['running', 'review', 'waiting'].includes(goal.status)) throw new HttpError(409, '只能调整进行中的目标,请先继续任务', 'goal_not_editable')
+      if ((goal.acceptanceRevision ?? 1) !== body.expectedRevision) throw new HttpError(409, '验收要求已更新,请重新查看后修改', 'goal_criteria_changed')
+      goal.acceptanceCriteria = body.acceptanceCriteria
+      goal.acceptanceRevision = body.expectedRevision + 1
+      goal.checks = undefined
+      goal.revision++
+      this.saveGoal(owner, goal)
+      return goal
+    })
+  }
   private saveGoal(owner: string, goal: AgentGoal) {
   private saveGoal(owner: string, goal: AgentGoal) {
     goal.updatedAt = Date.now()
     goal.updatedAt = Date.now()
     this.store.put(owner, 'goal', goal.id, goal)
     this.store.put(owner, 'goal', goal.id, goal)
@@ -181,6 +202,8 @@ export class WorkspaceTaskCoordinator {
     const body = parse(finishGoalInput, input), goal = this.requireCoordinator(owner, body.goalId, actorId)
     const body = parse(finishGoalInput, input), goal = this.requireCoordinator(owner, body.goalId, actorId)
     return this.store.command(owner, body.requestId, { actorId, operation: 'goal.finish', ...body }, () => {
     return this.store.command(owner, body.requestId, { actorId, operation: 'goal.finish', ...body }, () => {
       if (terminalGoal(goal.status)) throw new HttpError(409, '目标已结束', 'goal_terminal')
       if (terminalGoal(goal.status)) throw new HttpError(409, '目标已结束', 'goal_terminal')
+      if (body.status === 'complete' && (body.acceptanceRevision ?? 1) !== (goal.acceptanceRevision ?? 1))
+        throw new HttpError(409, '验收要求已修改,请按最新要求重新核验', 'goal_criteria_changed')
       const assignments=this.assignments(owner,goal.id)
       const assignments=this.assignments(owner,goal.id)
       if (body.status === 'complete' && (assignments.some(a => !['complete','cancelled'].includes(a.status)) || (assignments.length>0&&!assignments.some(a=>a.status==='complete'))))
       if (body.status === 'complete' && (assignments.some(a => !['complete','cancelled'].includes(a.status)) || (assignments.length>0&&!assignments.some(a=>a.status==='complete'))))
         throw new HttpError(409, '还有未验收的子任务,不能宣布目标完成', 'goal_incomplete')
         throw new HttpError(409, '还有未验收的子任务,不能宣布目标完成', 'goal_incomplete')
@@ -358,7 +381,9 @@ export class WorkspaceTaskCoordinator {
     if (activeRuns) return
     if (activeRuns) return
     const reviewing = goal.reviewRunId && this.store.get<Run>(owner, 'run', goal.reviewRunId)
     const reviewing = goal.reviewRunId && this.store.get<Run>(owner, 'run', goal.reviewRunId)
     if (reviewing && !terminalRun(reviewing.status)) return
     if (reviewing && !terminalRun(reviewing.status)) return
-    const batch = assignments.map(a => `${a.id}:${a.status}:${a.attempt}`).join('|') || 'initial'
+    const assignmentBatch = assignments.map(a => `${a.id}:${a.status}:${a.attempt}`).join('|') || 'initial'
+    // A user's changed requirements need a fresh review even when assignments are unchanged.
+    const batch = assignmentBatch + ((goal.acceptanceRevision ?? 1) > 1 ? `:criteria:${goal.acceptanceRevision}` : '')
     if (goal.lastReviewedBatch === batch) {
     if (goal.lastReviewedBatch === batch) {
       if (goal.status === 'review') this.deliver(owner, goal, 'review', batch)
       if (goal.status === 'review') this.deliver(owner, goal, 'review', batch)
       return
       return

+ 15 - 3
src/server/workspaceRoutes.ts

@@ -5,7 +5,7 @@ import type Koa from 'koa'
 import { createReadStream, statSync } from 'node:fs'
 import { createReadStream, statSync } from 'node:fs'
 import { z } from 'zod'
 import { z } from 'zod'
 import { WorkspaceStore, agentInput, agentPatch, parse } from './workspaceStore.js'
 import { WorkspaceStore, agentInput, agentPatch, parse } from './workspaceStore.js'
-import { WorkspaceRuntime } from './workspaceRuntime.js'
+import { WorkspaceRuntime, sendInput } from './workspaceRuntime.js'
 import { WorkspaceNodes, type WorkspaceNode } from './workspaceGateway.js'
 import { WorkspaceNodes, type WorkspaceNode } from './workspaceGateway.js'
 import {
 import {
   WorkspaceAssets,
   WorkspaceAssets,
@@ -188,6 +188,11 @@ export function workspaceRouter(
     ctx.body = { goal: store.get(user, 'goal', ctx.params.taskId) ?? null,
     ctx.body = { goal: store.get(user, 'goal', ctx.params.taskId) ?? null,
       assignments: runtime.tasks.assignments(user, ctx.params.taskId) }
       assignments: runtime.tasks.assignments(user, ctx.params.taskId) }
   })
   })
+  router.patch('/api/app/conversations/:id/tasks/:taskId/plan', (ctx) => {
+    const user = owner(ctx)
+    store.requireTask(user, ctx.params.id, ctx.params.taskId)
+    ctx.body = { goal: runtime.tasks.updateCriteria(user, ctx.params.taskId, body(ctx)) }
+  })
   router.post('/api/app/conversations/:id/tasks/:taskId/stop', async (ctx) => {
   router.post('/api/app/conversations/:id/tasks/:taskId/stop', async (ctx) => {
     const user=owner(ctx)
     const user=owner(ctx)
     store.requireTask(user,ctx.params.id,ctx.params.taskId)
     store.requireTask(user,ctx.params.id,ctx.params.taskId)
@@ -281,9 +286,16 @@ export function workspaceRouter(
       ),
       ),
     }
     }
   })
   })
-  router.post('/api/app/conversations/:id/messages', (ctx) => {
+  router.post('/api/app/conversations/:id/messages', async (ctx) => {
     const user = owner(ctx)
     const user = owner(ctx)
-    ctx.body = { run: runtime.send(user, ctx.params.id, body(ctx)) }
+    const input = parse(sendInput, body(ctx))
+    if (input.mode === 'goal') {
+      const version = auth.pushAuthorizationVersion(user)
+      const conversation = store.require<WorkspaceConversation>(user, 'conversation', ctx.params.id)
+      await runtime.teamTools.requireAvailable(user, store.require<WorkspaceAgent>(user, 'agent', conversation.administratorId))
+      if (auth.pushAuthorizationVersion(user) !== version) throw new HttpError(401, '账号授权已变化,请重新登录', 'session_revoked')
+    }
+    ctx.body = { run: runtime.send(user, ctx.params.id, input) }
     ctx.status = 202
     ctx.status = 202
   })
   })
   router.put('/api/app/conversations/:id/read', (ctx) => {
   router.put('/api/app/conversations/:id/read', (ctx) => {

+ 16 - 1
src/server/workspaceRuntime.ts

@@ -57,6 +57,7 @@ export const sendInput = z
     requestId: z.string().uuid(),
     requestId: z.string().uuid(),
     content: z.string().max(65_536).default(''),
     content: z.string().max(65_536).default(''),
     taskId: z.string().uuid().optional(),
     taskId: z.string().uuid().optional(),
+    mode: z.enum(['chat', 'goal']).optional(),
     mentionIds: z.array(z.string().uuid()).max(8).default([]),
     mentionIds: z.array(z.string().uuid()).max(8).default([]),
     fileIds: z.array(z.string().uuid()).max(8).default([]),
     fileIds: z.array(z.string().uuid()).max(8).default([]),
   })
   })
@@ -116,6 +117,19 @@ export class WorkspaceRuntime extends WorkspaceScheduler {
       const now = Date.now(),
       const now = Date.now(),
         runId = randomUUID(),
         runId = randomUUID(),
         agents = this.store.taskMemberIds(owner,c,conversationTaskId).map((id) => this.store.require<Agent>(owner, 'agent', id))
         agents = this.store.taskMemberIds(owner,c,conversationTaskId).map((id) => this.store.require<Agent>(owner, 'agent', id))
+      let goal = conversationTaskId ? this.store.get<import('../shared/agentTasks.js').AgentGoal>(owner, 'goal', conversationTaskId) : undefined
+      if (body.mode === 'goal') {
+        if (source || c.kind !== 'group' || !conversationTask || !body.content.trim())
+          throw new HttpError(400, '请在群聊中说明需要交付的结果', 'goal_request_invalid')
+        if (goal) throw new HttpError(409, '当前话题已有目标,请继续原目标或新建话题', 'goal_exists')
+        const coordinator = this.store.require<Agent>(owner, 'agent', c.administratorId)
+        if (!coordinator.canManageTeam || coordinator.archived || coordinator.remoteAgentId)
+          throw new HttpError(403, '请先为负责人开启允许组建团队', 'goal_forbidden')
+        if (this.store.list<Run>(owner, 'run').some(r => r.conversationTaskId === conversationTaskId && !['complete', 'failed', 'interrupted'].includes(r.status)))
+          throw new HttpError(409, '请等待当前回复结束后再启动目标', 'goal_busy')
+        goal = this.tasks.begin(owner, conversationTask, coordinator, body.content.trim(),
+          { conversationId, conversationTaskId, runId, agentId: coordinator.id })
+      }
       const mentions = [
       const mentions = [
         ...new Set(
         ...new Set(
           [...body.mentionIds, ...mentionedAgents(body.content, agents)],
           [...body.mentionIds, ...mentionedAgents(body.content, agents)],
@@ -167,6 +181,7 @@ export class WorkspaceRuntime extends WorkspaceScheduler {
         updatedAt: now,
         updatedAt: now,
         authorizationVersion: this.authorizationVersion(owner),
         authorizationVersion: this.authorizationVersion(owner),
         ...(source ? { assignmentId: source.assignmentId, targetAgentId: source.targetAgentId, triggerKind: source.kind, internalInstruction: source.instruction } : {}),
         ...(source ? { assignmentId: source.assignmentId, targetAgentId: source.targetAgentId, triggerKind: source.kind, internalInstruction: source.instruction } : {}),
+        ...(goal && ['running', 'review', 'waiting'].includes(goal.status) ? { goalId: goal.id, targetAgentId: source?.targetAgentId ?? goal.coordinatorId } : {}),
       }
       }
       this.admit(owner, run, c, message)
       this.admit(owner, run, c, message)
       this.uploads.markReferenced(body.fileIds, owner)
       this.uploads.markReferenced(body.fileIds, owner)
@@ -612,7 +627,7 @@ export class WorkspaceRuntime extends WorkspaceScheduler {
           `本轮用户指定成员:${this.store.require<Run>(owner, 'run', run.runId).mentionIds.map(id => members.find(a => a.id === id)).filter(Boolean).map(a => '@' + a!.name).join('、') || '未指定'}`,
           `本轮用户指定成员:${this.store.require<Run>(owner, 'run', run.runId).mentionIds.map(id => members.find(a => a.id === id)).filter(Boolean).map(a => '@' + a!.name).join('、') || '未指定'}`,
           '角色规则不赋予额外工具权限;仍遵守基础 Hermes 的工具和安全约束。',
           '角色规则不赋予额外工具权限;仍遵守基础 Hermes 的工具和安全约束。',
           this.store.require<Run>(owner, 'run', run.runId).internalInstruction || '',
           this.store.require<Run>(owner, 'run', run.runId).internalInstruction || '',
-          goal ? `当前团队目标 ID:${goal.id}。目标:${goal.objective.slice(0,8000)}\n验收要求:${goal.acceptanceCriteria.join(';')}\n${assignmentId ? `你在执行子任务 ${assignmentId},请完成分派并提交结果,不要扩大团队或再次委派。` : '优先使用 workspace_assign_task 进行有依赖和验收要求的结构化分派;成员结果需要通过 workspace_review_assignment 复核。最终使用 workspace_finish_team_task 记录完成、受阻或等待用户。不要将一次模型回复结束当作目标完成。'}` : '',
+          goal && ['running', 'review', 'waiting'].includes(goal.status) ? `当前团队目标 ID:${goal.id}。目标:${goal.objective.slice(0,8000)}\n验收要求(版本 ${goal.acceptanceRevision ?? 1}):${goal.acceptanceCriteria.join(';')}\n${assignmentId ? `你在执行子任务 ${assignmentId},请完成分派并提交结果,不要扩大团队或再次委派。` : '先从用户要求提炼少量具体、可核对的交付条件;若仍是默认验收要求,使用 workspace_update_team_goal 保存。尊重用户调整后的要求。能直接完成就直接完成,不必创建子任务;仅确实需要分工时使用 workspace_assign_task,成员结果通过 workspace_review_assignment 复核,不要再用 @ 重复派发同一工作。最终使用 workspace_finish_team_task 记录完成、受阻或等待用户,完成时提供实际依据。'}` : '',
           agent.temporaryGoalId ? `你是当前任务的临时助手,任务 ID:${agent.temporaryGoalId}。仅处理分派工作,使用 computer_export 回传产物。任务结束后会退役;不要创建团队或改变自身权限。` : '',
           agent.temporaryGoalId ? `你是当前任务的临时助手,任务 ID:${agent.temporaryGoalId}。仅处理分派工作,使用 computer_export 回传产物。任务结束后会退役;不要创建团队或改变自身权限。` : '',
           team ? TEAM_TOOL_RULES : '',
           team ? TEAM_TOOL_RULES : '',
           plugins ? '本轮已挂载用户为当前 Bot 授权的插件工具,工具名以 plugin_ 开头,说明中包含实际服务和操作。仅按用户当前任务使用;连接或重新授权应用请让用户打开 Bot 模式的工具 → 已连接应用。不要索取 API Key 或在回复中展示凭据。' : '',
           plugins ? '本轮已挂载用户为当前 Bot 授权的插件工具,工具名以 plugin_ 开头,说明中包含实际服务和操作。仅按用户当前任务使用;连接或重新授权应用请让用户打开 Bot 模式的工具 → 已连接应用。不要索取 API Key 或在回复中展示凭据。' : '',

+ 4 - 3
src/server/workspaceScheduler.ts

@@ -120,10 +120,11 @@ export abstract class WorkspaceScheduler {
   }
   }
   protected admit(owner: string, root: Run, c: Conversation, trigger: Message): void {
   protected admit(owner: string, root: Run, c: Conversation, trigger: Message): void {
     this.store.put(owner, 'run', root.id, root)
     this.store.put(owner, 'run', root.id, root)
-    const ids = root.assignmentId && root.targetAgentId ? [root.targetAgentId] : c.kind === 'direct' || c.mode === 'host' ? [c.administratorId]
+    const targeted = (root.assignmentId || root.goalId) && root.targetAgentId
+    const ids = targeted ? [root.targetAgentId!] : c.kind === 'direct' || c.mode === 'host' ? [c.administratorId]
       : root.mentionIds.length ? root.mentionIds : [...new Set([c.administratorId, ...c.autoReplyIds])]
       : root.mentionIds.length ? root.mentionIds : [...new Set([c.administratorId, ...c.autoReplyIds])]
     for (const id of ids) this.enqueue(owner, root, id, 0, root.id, trigger.seq,
     for (const id of ids) this.enqueue(owner, root, id, 0, root.id, trigger.seq,
-      c.kind === 'direct' || root.assignmentId ? 'mentioned' : c.mode === 'host' || !root.mentionIds.length ? 'automatic' : 'mentioned', !!root.assignmentId || c.kind === 'group' && id === c.administratorId && (c.mode === 'host' || !root.mentionIds.length))
+      c.kind === 'direct' || targeted ? 'mentioned' : c.mode === 'host' || !root.mentionIds.length ? 'automatic' : 'mentioned', !!targeted || c.kind === 'group' && id === c.administratorId && (c.mode === 'host' || !root.mentionIds.length))
     this.updateRoot(owner, root.id)
     this.updateRoot(owner, root.id)
   }
   }
   start(): void { this.wake() }
   start(): void { this.wake() }
@@ -166,7 +167,7 @@ export abstract class WorkspaceScheduler {
       const root = this.store.require<Run>(owner, 'run', work.runId), c = this.store.require<Conversation>(owner, 'conversation', work.conversationId)
       const root = this.store.require<Run>(owner, 'run', work.runId), c = this.store.require<Conversation>(owner, 'conversation', work.conversationId)
       work.planned = true
       work.planned = true
       this.store.put(owner, 'turn', work.id, work)
       this.store.put(owner, 'turn', work.id, work)
-      if (root.stopRequested || c.archived || c.kind === 'direct' || root.assignmentId) { this.updateRoot(owner, root.id); return }
+      if (root.stopRequested || c.archived || c.kind === 'direct' || root.assignmentId || root.goalId) { this.updateRoot(owner, root.id); return }
       const config = work.turnConfiguration ?? { mode: c.mode, administratorId: c.administratorId, members: c.memberIds.map(id => this.store.require<Agent>(owner, 'agent', id)) }
       const config = work.turnConfiguration ?? { mode: c.mode, administratorId: c.administratorId, members: c.memberIds.map(id => this.store.require<Agent>(owner, 'agent', id)) }
       const message = work.currentMessageId ? this.store.get<Message>(owner, 'message', work.currentMessageId) : undefined
       const message = work.currentMessageId ? this.store.get<Message>(owner, 'message', work.currentMessageId) : undefined
       if (config.mode === 'host' && work.agentId !== config.administratorId) {
       if (config.mode === 'host' && work.agentId !== config.administratorId) {

+ 24 - 8
src/server/workspaceTeamTools.ts

@@ -7,7 +7,7 @@ import type { WorkspaceRuntime } from './workspaceRuntime.js'
 import type { Work } from './workspaceScheduler.js'
 import type { Work } from './workspaceScheduler.js'
 import type { WorkspaceAgent as Agent, WorkspaceConversation as Conversation, WorkspaceRun as Run, WorkspaceInteraction } from '../shared/workspace.js'
 import type { WorkspaceAgent as Agent, WorkspaceConversation as Conversation, WorkspaceRun as Run, WorkspaceInteraction } from '../shared/workspace.js'
 import { requireTeamToolBridge } from './workspaceToolLease.js'
 import { requireTeamToolBridge } from './workspaceToolLease.js'
-import { assignmentInput, assignmentReview, assignmentUpdate, assignmentCancel, finishGoalInput, resumeGoalInput } from './taskCoordinator.js'
+import { assignmentInput, assignmentReview, assignmentUpdate, assignmentCancel, finishGoalInput, resumeGoalInput, goalCriteriaInput } from './taskCoordinator.js'
 
 
 const uuid = z.string().uuid()
 const uuid = z.string().uuid()
 const empty = z.object({}).strict()
 const empty = z.object({}).strict()
@@ -38,21 +38,22 @@ const definitions = [
   ['workspace_list_teams', '查看由你担任管理员的团队及其任务。', empty],
   ['workspace_list_teams', '查看由你担任管理员的团队及其任务。', empty],
   ['workspace_create_agent', '创建持久保存的 Bot 机器人,复用已授权的基础 Profile。新成员不获得组队权限。requestId 使用新的 UUID;重试同一操作必须复用它。', createAgent],
   ['workspace_create_agent', '创建持久保存的 Bot 机器人,复用已授权的基础 Profile。新成员不获得组队权限。requestId 使用新的 UUID;重试同一操作必须复用它。', createAgent],
   ['workspace_create_helper','为当前团队目标创建临时隔离助手并立即分派一个具体子任务。助手只参与此任务、不创建单聊、不获得组队权限;目标结束后退役。每个目标最多 8 个有效临时助手。优先用于一次性工作。',createHelper],
   ['workspace_create_helper','为当前团队目标创建临时隔离助手并立即分派一个具体子任务。助手只参与此任务、不创建单聊、不获得组队权限;目标结束后退役。每个目标最多 8 个有效临时助手。优先用于一次性工作。',createHelper],
-  ['workspace_create_team', '建立持久团队,自动把你加入并设为管理员,其他成员使用真实机器人 ID,总人数最多 8 人。优先复用已有团队。requestId 使用新的 UUID,重试时复用。', createTeam],
-  ['workspace_start_team_task', '在你管理的团队启动独立任务,由管理员分派并复核。立即返回任务编号,不表示完成;请向用户提供团队名称和任务名称。requestId 使用新的 UUID,重试时复用。', startTask],
+  ['workspace_create_team', '只建立持久团队,自动把你加入并设为管理员,不启动交付目标、不生成子任务或验收要求。其他成员使用真实机器人 ID,总人数最多 8 人。优先复用已有团队。requestId 使用新的 UUID,重试时复用。', createTeam],
+  ['workspace_start_team_task', '仅当用户明确要求完成并交付具体结果时启动目标。简单问答、方案讨论、一次性咨询或仅创建群聊时不要调用。在当前群聊中可将当前话题升级为目标,在其他团队中启动独立话题;提炼少量可核对的验收要求。管理员可直接完成,不强制分工。立即返回不表示完成,requestId 重试时复用。', startTask],
+  ['workspace_update_team_goal', '从用户的交付要求提炼验收条件,或按用户新指令调整。不要增加无关要求。expectedRevision 使用目标的 acceptanceRevision(旧记录默认为 1);冲突时先重新读取,不覆盖用户的新修改。', goalCriteriaInput.extend({ goalId: uuid })],
   ['workspace_get_team_task', '读取你管理的团队任务的运行状态、最近 20 条结果和待处理问题。运行中不代表目标已完成;避免频繁轮询,用户可在团队内查看进展。', getTask],
   ['workspace_get_team_task', '读取你管理的团队任务的运行状态、最近 20 条结果和待处理问题。运行中不代表目标已完成;避免频繁轮询,用户可在团队内查看进展。', getTask],
-  ['workspace_assign_task', '为团队目标创建有负责人、依赖和验收要求的子任务。仅可分派给团队内其他成员,依赖必须先完成复核。requestId 为重试复用的 UUID。', assignmentInput],
+  ['workspace_assign_task', '仅确实需要分工时创建有负责人、依赖和验收要求的子任务,能直接完成的工作不要拆分。仅可分派给团队内其他成员,依赖必须先完成复核。requestId 为重试复用的 UUID。', assignmentInput],
   ['workspace_review_assignment', '管理员复核子任务:accept 接受实际结果,retry 附具体修改意见后返工,blocked 记录受阻原因。失败执行不能直接验收通过。', assignmentReview],
   ['workspace_review_assignment', '管理员复核子任务:accept 接受实际结果,retry 附具体修改意见后返工,blocked 记录受阻原因。失败执行不能直接验收通过。', assignmentReview],
   ['workspace_update_assignment', '调整尚未运行或已失败子任务的说明、验收要求和依赖。禁止依赖循环;正在执行的任务需要先停止。', assignmentUpdate],
   ['workspace_update_assignment', '调整尚未运行或已失败子任务的说明、验收要求和依赖。禁止依赖循环;正在执行的任务需要先停止。', assignmentUpdate],
   ['workspace_cancel_assignment', '停止一个子任务,必须记录原因。执行停止尚未确认时显示正在停止,不能当作已经撤销外部副作用。其他子任务和团队不受影响。', assignmentCancel],
   ['workspace_cancel_assignment', '停止一个子任务,必须记录原因。执行停止尚未确认时显示正在停止,不能当作已经撤销外部副作用。其他子任务和团队不受影响。', assignmentCancel],
-  ['workspace_finish_team_task', '根据实际结果记录目标完成、受阻或等待用户。完成前所有子任务必须验收通过;结果会自动送回原始会话。', finishGoalInput],
+  ['workspace_finish_team_task', '根据实际结果记录目标完成、受阻或等待用户。无需为完成而创建子任务;已有有效子任务须验收通过。完成时传入当前 acceptanceRevision 并逐项提供依据;结果会自动送回原始会话。', finishGoalInput],
   ['workspace_resume_team_task', '仅在当前用户的新指令中恢复受阻、等待或停止的目标。旧执行状态不确定时拒绝恢复;自动回传不能自行重新激活旧目标。', resumeGoalInput],
   ['workspace_resume_team_task', '仅在当前用户的新指令中恢复受阻、等待或停止的目标。旧执行状态不确定时拒绝恢复;自动回传不能自行重新激活旧目标。', resumeGoalInput],
   ['workspace_update_created_agent', '调整你创建的成员的名称或职责,不能修改基础 Profile 或权限。变更从后续轮次生效。', editCreatedAgent],
   ['workspace_update_created_agent', '调整你创建的成员的名称或职责,不能修改基础 Profile 或权限。变更从后续轮次生效。', editCreatedAgent],
   ['workspace_archive_created_agent', '归档你创建且已不再被有效团队引用的空闲成员,保留历史;confirmName 必须与当前名称完全一致。不能归档其他人创建的成员。', archiveCreatedAgent],
   ['workspace_archive_created_agent', '归档你创建且已不再被有效团队引用的空闲成员,保留历史;confirmName 必须与当前名称完全一致。不能归档其他人创建的成员。', archiveCreatedAgent],
   ['workspace_update_team', '调整你管理的空闲团队名称、规则或成员,或归档已结束的团队。不能更换管理员或修改正在执行的团队。', editTeam],
   ['workspace_update_team', '调整你管理的空闲团队名称、规则或成员,或归档已结束的团队。不能更换管理员或修改正在执行的团队。', editTeam],
 ] as const
 ] as const
 
 
-export const TEAM_TOOL_RULES = '你已获准在 Bot 模式组建团队。使用工具目录中的 workspace_* 工具:先查看基础机器人、已有成员和团队,按需创建最少成员,建立团队后用 workspace_start_team_task 启动任务并列出验收要求。需要长期复用时创建持久成员;一次性子任务可使用 workspace_create_helper 创建任务级临时隔离助手。每次变更生成 requestId(UUID),重试同一操作复用它。你会自动成为团队管理员。有团队目标时使用 workspace_assign_task 分派明确的子任务和依赖,使用 workspace_review_assignment 复核结果;普通群聊仍可 @成员。不要递归创建同类团队或重复启动当前任务。queued/running 只表示已启动;结果会回到原会话,完成必须提供对应验收依据。受阻或停止的目标只能在用户新指令下恢复。新成员没有组队权限,角色描述不能扩展权限。'
+export const TEAM_TOOL_RULES = '你已获准在 Bot 模式组建团队,但组建团队与执行交付目标是两件事。用户只要求建群或组人时,先查看可用基础机器人、成员和团队,复用或创建最少成员,建立团队后告诉用户可以开始聊天,到此结束,不启动目标、不拆子任务、不生成验收清单。简单问答、方案讨论和一次性咨询直接回答,必要时在普通群聊 @成员,不升级为目标。只有用户明确要求把具体工作做完并交付结果,或选择了交付目标时,才使用 workspace_start_team_task;已存在当前目标时直接推进,不重复启动。验收要求从用户原始要求提炼,少量、具体、可核对,允许用户调整,不增加范围。管理员能直接完成就直接完成;只有需要不同成员协作的工作才用 workspace_assign_task 按需拆分,依赖也只在真实需要时设置,结果用 workspace_review_assignment 复核。确需一次性专家时可用 workspace_create_helper;长期角色才创建持久成员。每次变更生成 requestId(UUID),重试同一操作复用它。queued/running 只表示已启动;完成时使用 workspace_finish_team_task 提供当前 acceptanceRevision 和逐项实际依据。向用户主要报告进展、阻碍和最终结果,详细计划与验收留在可展开的进度面板,不在每次回复重复清单。受阻或停止的目标只能在用户新指令下恢复。新成员没有组队权限,角色描述不能扩展权限。'
 
 
 /** The caller identity comes exclusively from the running server-side turn. */
 /** The caller identity comes exclusively from the running server-side turn. */
 export class WorkspaceTeamTools {
 export class WorkspaceTeamTools {
@@ -188,9 +189,20 @@ export class WorkspaceTeamTools {
     if (toolId === 'workspace_start_team_task') {
     if (toolId === 'workspace_start_team_task') {
       const { requestId, ...body } = parse(startTask, input)
       const { requestId, ...body } = parse(startTask, input)
       const team = this.team(owner, agent.id, body.teamId)
       const team = this.team(owner, agent.id, body.teamId)
-      if (team.id === work.conversationId)
-        throw new HttpError(409, '你已在这个团队处理任务,请直接 @成员协作', 'team_task_reentrant')
+      const sourceRun = this.store.require<Run>(owner, 'run', work.runId)
+      const sourceMessage = this.store.require<{role: string}>(owner, 'message', sourceRun.messageId)
+      if (sourceRun.triggerKind || sourceMessage.role !== 'user' || sourceRun.conversationId !== work.conversationId)
+        throw new HttpError(409, '新目标需要用户的交付指令,自动回传不能重复启动目标', 'team_task_reentrant')
       return this.store.command(owner, requestId, { agentId: agent.id, toolId, body }, () => {
       return this.store.command(owner, requestId, { agentId: agent.id, toolId, body }, () => {
+        if (team.id === work.conversationId) {
+          const task = this.store.requireTask(owner, team.id, work.conversationTaskId!)
+          const goal = this.runtime.tasks.begin(owner, task, agent, body.content,
+            { conversationId: team.id, conversationTaskId: task.id, runId: work.runId, agentId: agent.id }, body.acceptanceCriteria)
+          sourceRun.goalId = goal.id
+          sourceRun.targetAgentId = agent.id
+          this.store.saveRun(owner, sourceRun)
+          return { teamId: team.id, teamName: team.name, task: { ...task, goal }, run: sourceRun, message: '当前话题已作为交付目标,请按需直接完成或分工,不要重复启动。' }
+        }
         if (this.store.activeTaskCount(owner, team.id) >= 4)
         if (this.store.activeTaskCount(owner, team.id) >= 4)
           throw new HttpError(409, '最多同时运行 4 个任务', 'workspace_task_concurrency_limit')
           throw new HttpError(409, '最多同时运行 4 个任务', 'workspace_task_concurrency_limit')
         const emptyTask = this.store.tasks(owner, team.id).find(t => t.messageCount === 0 && !t.activeRunId && t.titleSource === 'automatic')
         const emptyTask = this.store.tasks(owner, team.id).find(t => t.messageCount === 0 && !t.activeRunId && t.titleSource === 'automatic')
@@ -218,6 +230,10 @@ export class WorkspaceTeamTools {
         assignments: this.runtime.tasks.assignments(owner, task.id) }
         assignments: this.runtime.tasks.assignments(owner, task.id) }
     }
     }
     if (toolId === 'workspace_assign_task') return { assignment: this.runtime.tasks.createAssignment(owner, agent.id, input) }
     if (toolId === 'workspace_assign_task') return { assignment: this.runtime.tasks.createAssignment(owner, agent.id, input) }
+    if (toolId === 'workspace_update_team_goal') {
+      const { goalId, ...body } = parse(goalCriteriaInput.extend({ goalId: uuid }), input)
+      return { goal: this.runtime.tasks.updateCriteria(owner, goalId, body, agent.id) }
+    }
     if (toolId === 'workspace_review_assignment') return { assignment: this.runtime.tasks.reviewAssignment(owner, agent.id, input) }
     if (toolId === 'workspace_review_assignment') return { assignment: this.runtime.tasks.reviewAssignment(owner, agent.id, input) }
     if (toolId === 'workspace_update_assignment') return { assignment: this.runtime.tasks.updateAssignment(owner, agent.id, input) }
     if (toolId === 'workspace_update_assignment') return { assignment: this.runtime.tasks.updateAssignment(owner, agent.id, input) }
     if (toolId === 'workspace_cancel_assignment') return { assignment: this.runtime.tasks.cancelAssignment(owner, agent.id, input) }
     if (toolId === 'workspace_cancel_assignment') return { assignment: this.runtime.tasks.cancelAssignment(owner, agent.id, input) }

+ 2 - 0
src/shared/agentTasks.ts

@@ -14,6 +14,8 @@ export interface AgentGoal {
   activation?: number
   activation?: number
   objective: string
   objective: string
   acceptanceCriteria: string[]
   acceptanceCriteria: string[]
+  /** Changes only when acceptance criteria change, independently of progress. */
+  acceptanceRevision?: number
   status: 'running' | 'review' | 'waiting' | 'blocked' | 'complete' | 'cancelling' | 'cancelled'
   status: 'running' | 'review' | 'waiting' | 'blocked' | 'complete' | 'cancelling' | 'cancelled'
   origin: TaskOrigin
   origin: TaskOrigin
   result?: string
   result?: string

+ 3 - 2
src/shared/composeDesktops.ts

@@ -1,5 +1,6 @@
-export interface ComposeDesktop {id:string;name:string;socketPath:string}
-export interface ComposeDesktopState {id:string;name:string;online:boolean;ready:boolean}
+import type {LocalVmImageKey} from './localVm.js'
+export interface ComposeDesktop {id:string;name:string;socketPath:string;imageKey?:LocalVmImageKey}
+export interface ComposeDesktopState {id:string;name:string;online:boolean;ready:boolean;imageKey?:LocalVmImageKey}
 export interface DesktopRelay {
 export interface DesktopRelay {
   (id:string,operation:string,body:Record<string,unknown>):Promise<any>
   (id:string,operation:string,body:Record<string,unknown>):Promise<any>
 }
 }

+ 14 - 3
src/shared/localVm.ts

@@ -1,8 +1,15 @@
 export type LocalVmMode = 'shared' | 'per-bot'
 export type LocalVmMode = 'shared' | 'per-bot'
+export const LOCAL_VM_IMAGE_KEYS = ['standard', 'cursor'] as const
+export type LocalVmImageKey = typeof LOCAL_VM_IMAGE_KEYS[number]
+export const LOCAL_VM_IMAGES = [
+  {key:'standard',name:'标准桌面',description:'XFCE 桌面环境'},
+  {key:'cursor',name:'Cursor Universal',description:'Debian 开发桌面 · amd64'},
+] as const
+export interface LocalVmImageOption {key:LocalVmImageKey;name:string;description:string;ready:boolean;imageId?:string}
 export type LocalVmAction = 'create' | 'start' | 'stop' | 'recreate' | 'remove'
 export type LocalVmAction = 'create' | 'start' | 'stop' | 'recreate' | 'remove'
 export interface LocalVmStatus {
 export interface LocalVmStatus {
   fixedCapacity?:boolean
   fixedCapacity?:boolean
-  desktops?:Array<{id:string;name:string;online:boolean;ready:boolean;available?:boolean}>
+  desktops?:Array<{id:string;name:string;online:boolean;ready:boolean;available?:boolean;imageKey?:LocalVmImageKey}>
   executionHost?: 'server' | 'runner'
   executionHost?: 'server' | 'runner'
   runnerName?: string
   runnerName?: string
   setupRequired?: 'runner' | 'worker'
   setupRequired?: 'runner' | 'worker'
@@ -11,22 +18,26 @@ export interface LocalVmStatus {
   daemonUp: boolean
   daemonUp: boolean
   image: boolean
   image: boolean
   imageId?: string
   imageId?: string
+  images?: LocalVmImageOption[]
   mode: LocalVmMode
   mode: LocalVmMode
   maxInstances: number
   maxInstances: number
   busy: boolean
   busy: boolean
   problem?: string
   problem?: string
-  job?: { id: string; state: 'running' | 'complete' | 'failed'; message: string }
+  job?: { id: string; state: 'running' | 'complete' | 'failed'; message: string; imageKey?: LocalVmImageKey }
   instances?: Array<{id:string;status:string;name?:string;orphaned?:boolean}>
   instances?: Array<{id:string;status:string;name?:string;orphaned?:boolean}>
 }
 }
 export interface LocalVmInstance {
 export interface LocalVmInstance {
   desktopId?:string
   desktopId?:string
   fixedCapacity?:boolean
   fixedCapacity?:boolean
-  desktops?:Array<{id:string;name:string;online:boolean;ready:boolean;available?:boolean}>
+  desktops?:Array<{id:string;name:string;online:boolean;ready:boolean;available?:boolean;imageKey?:LocalVmImageKey}>
   container: 'missing' | 'stopped' | 'running'
   container: 'missing' | 'stopped' | 'running'
   ready: boolean
   ready: boolean
   inUse: boolean
   inUse: boolean
   mode: LocalVmMode
   mode: LocalVmMode
   maxInstances: number
   maxInstances: number
   image: boolean
   image: boolean
+  imageId?: string
+  images?: LocalVmImageOption[]
+  imageKey?: LocalVmImageKey
   problem?: string
   problem?: string
 }
 }

+ 2 - 0
src/shared/workspace.ts

@@ -122,6 +122,8 @@ export interface WorkspaceRun {
   error?: string
   error?: string
   stopRequested?: boolean
   stopRequested?: boolean
   assignmentId?: string
   assignmentId?: string
+  /** Structured delivery run; ordinary chat does not carry a goal. */
+  goalId?: string
   targetAgentId?: string
   targetAgentId?: string
   triggerKind?: 'assignment' | 'task_review' | 'task_result'
   triggerKind?: 'assignment' | 'task_review' | 'task_result'
   internalInstruction?: string
   internalInstruction?: string

+ 43 - 0
tests/client/localVmImages.test.ts

@@ -0,0 +1,43 @@
+import {it,expect,vi,afterEach} from 'vitest'
+import {mount,flushPromises} from '@vue/test-utils'
+import Settings from '../../src/client/components/app/LocalVmSettingsPanel.vue'
+import Panel from '../../src/client/components/workspace/LocalVmChatPanel.vue'
+import {apiRequest} from '../../src/client/api/client'
+vi.mock('../../src/client/api/client',()=>({apiRequest:vi.fn()}))
+const images=[{key:'standard',name:'标准桌面',description:'XFCE',ready:true,imageId:'sha256:a'},{key:'cursor',name:'Cursor Universal',description:'Debian',ready:true,imageId:'sha256:b'}]
+const agent={id:'image-fixture',name:'镜像测试',computer:'vm',execution:'computer',nodeId:'local',profile:'default'} as any
+const vm={configured:true,runtime:'docker',daemonUp:true,image:true,mode:'per-bot',maxInstances:2,busy:false,images}
+afterEach(()=>{vi.clearAllMocks();vi.restoreAllMocks()})
+it('prepares the selected image in Settings and explains the shared image constraint',async()=>{
+ vi.mocked(apiRequest).mockImplementation(async path=>path==='/api/app/computers'?{computers:[]}:vm as any)
+ const wrapper=mount(Settings,{global:{stubs:{AppIcon:true,RunnerSettingsPanel:true}}})
+ try{
+  await flushPromises()
+  const select=wrapper.findAll('select').find(select=>select.text().includes('Cursor Universal'))!
+  await select.setValue('cursor')
+  await wrapper.findAll('button').find(b=>b.text()==='重新检查所选镜像')!.trigger('click')
+  await flushPromises()
+  expect(apiRequest).toHaveBeenCalledWith('/api/app/admin/local-vm/prepare',expect.objectContaining({body:expect.objectContaining({imageKey:'cursor'})}))
+  expect(wrapper.text()).toContain('同一共享桌面的所有机器人使用一个镜像')
+ }finally{wrapper.unmount()}
+})
+it('selects a prepared desktop image and locks the selection for an existing shared instance',async()=>{
+ vi.spyOn(document,'hidden','get').mockReturnValue(false)
+ let detail={...vm,enabled:true,container:'missing',ready:false,inUse:false,imageKey:'standard'}
+ vi.mocked(apiRequest).mockImplementation(async path=>{
+  if(path.endsWith('/desktop-environment'))return {selected:null,local:{supported:false},browser:{available:false}} as any
+  if(path.endsWith('/cloud-computer'))return {configured:false} as any
+  return detail as any
+ })
+ const wrapper=mount(Panel,{props:{agents:[agent],isAdmin:true,active:true},global:{stubs:{AppIcon:true,GrokAuthPanel:true}}})
+ try{
+  await flushPromises()
+  const select=wrapper.findAll('select').find(s=>s.text().includes('Cursor Universal'))!
+  await select.setValue('cursor');await flushPromises()
+  expect(apiRequest).toHaveBeenCalledWith('/api/app/agents/image-fixture/local-vm/image',{method:'PUT',body:{imageKey:'cursor'}})
+  detail={...detail,mode:'shared',container:'stopped'}
+  await wrapper.setProps({active:false});await wrapper.setProps({active:true});await flushPromises()
+  expect(select.attributes('disabled')).toBeDefined()
+  expect(wrapper.text()).toContain('同一共享桌面只能使用一个镜像')
+ }finally{wrapper.unmount()}
+})

+ 39 - 0
tests/client/taskPlan.test.ts

@@ -0,0 +1,39 @@
+import { expect, it, vi } from 'vitest'
+import { flushPromises, mount } from '@vue/test-utils'
+import TaskPlan from '@/components/workspace/TaskPlan.vue'
+import type { AgentGoal } from '@shared/agentTasks'
+
+const goal: AgentGoal = { id:'goal',conversationId:'group',coordinatorId:'lead',authorityRevision:1,objective:'交付报告',acceptanceCriteria:['提供来源'],acceptanceRevision:1,status:'running',origin:{conversationId:'group',runId:'run',agentId:'lead'},artifactIds:[],revision:1,automaticWakes:0,createdAt:1,updatedAt:1 }
+
+it('keeps progress and results visible while task details start collapsed', () => {
+  const wrapper = mount(TaskPlan,{props:{goal:{...goal,result:'初稿已交付'},assignments:[],agents:[]}})
+  expect(wrapper.get('details').attributes('open')).toBeUndefined()
+  expect(wrapper.get('header').text()).toContain('进行中')
+  expect(wrapper.get('.result').text()).toBe('初稿已交付')
+  wrapper.unmount()
+})
+
+it('preserves user edits across progress refreshes and reports stale-save errors without discarding the draft', async () => {
+  const saveCriteria = vi.fn().mockRejectedValueOnce(new Error('验收要求已更新,请重新查看后修改'))
+  const wrapper = mount(TaskPlan,{props:{goal,assignments:[],agents:[],saveCriteria}})
+  await wrapper.get('details').trigger('click')
+  await wrapper.findAll('button').find(button=>button.text()==='调整验收要求')!.trigger('click')
+  await wrapper.get('textarea').setValue('比较三种方案\n给出建议')
+  await wrapper.setProps({goal:{...goal,revision:9,status:'review',acceptanceRevision:2,acceptanceCriteria:['另一条最新要求']}})
+  expect(wrapper.get('textarea').element.value).toBe('比较三种方案\n给出建议')
+  await wrapper.get('form').trigger('submit')
+  await flushPromises()
+  expect(saveCriteria).toHaveBeenCalledWith('goal',1,['比较三种方案','给出建议'])
+  expect(wrapper.get('[role=alert]').text()).toContain('已更新')
+  expect(wrapper.get('textarea').element.value).toContain('比较三种方案')
+  await wrapper.findAll('button').find(button=>button.text()==='取消')!.trigger('click')
+  await wrapper.findAll('button').find(button=>button.text()==='调整验收要求')!.trigger('click')
+  expect(wrapper.get('textarea').element.value).toBe('另一条最新要求')
+  saveCriteria.mockResolvedValue(undefined)
+  await wrapper.get('textarea').setValue('最新要求与来源')
+  await wrapper.get('form').trigger('submit')
+  await flushPromises()
+  expect(saveCriteria).toHaveBeenLastCalledWith('goal',2,['最新要求与来源'])
+  expect(wrapper.find('textarea').exists()).toBe(false)
+  wrapper.unmount()
+})

+ 2 - 2
tests/e2e/bot-panels.spec.ts

@@ -64,11 +64,11 @@ test('robot sidebar, source changes, requests, routines and group boundaries wor
  const group=(await response.json()).conversation
  const group=(await response.json()).conversation
  await page.goto('/conversations/'+group.id)
  await page.goto('/conversations/'+group.id)
  await expect(page.getByRole('button',{name:'电脑与定时任务',exact:true})).toHaveCount(0)
  await expect(page.getByRole('button',{name:'电脑与定时任务',exact:true})).toHaveCount(0)
- const taskPicker=page.getByRole('combobox',{name:'当前任务',exact:true})
+ const taskPicker=page.getByRole('combobox',{name:'当前话题',exact:true})
  const optionCount=await taskPicker.locator('option').count()
  const optionCount=await taskPicker.locator('option').count()
  await taskPicker.selectOption('__create_task__')
  await taskPicker.selectOption('__create_task__')
  await expect(page).toHaveURL(/taskId=/)
  await expect(page).toHaveURL(/taskId=/)
- await expect(page.getByRole('combobox',{name:'当前任务',exact:true}).locator('option')).toHaveCount(optionCount+1)
+ await expect(page.getByRole('combobox',{name:'当前话题',exact:true}).locator('option')).toHaveCount(optionCount+1)
  await page.screenshot({path:evidence+'/desktop-group-task-picker.png'})
  await page.screenshot({path:evidence+'/desktop-group-task-picker.png'})
  for(let index=1;index<=12;index++){
  for(let index=1;index<=12;index++){
   const created=await page.request.post('/api/app/agents',{headers:{'X-CSRF-Token':capabilities.csrfToken,Origin:'http://127.0.0.1:18832'},data:{name:`滚动验收 ${index}`,profile:'default'}})
   const created=await page.request.post('/api/app/agents',{headers:{'X-CSRF-Token':capabilities.csrfToken,Origin:'http://127.0.0.1:18832'},data:{name:`滚动验收 ${index}`,profile:'default'}})

+ 7 - 3
tests/e2e/offlineUpdate.spec.ts

@@ -22,6 +22,7 @@ test('opens settings and schedules an independent Web update while all 9119 requ
     mediaOwner: 'test', allowInsecureLan: false, insecureLan: false, production: true,
     mediaOwner: 'test', allowInsecureLan: false, insecureLan: false, production: true,
   }
   }
   const launched: string[] = []
   const launched: string[] = []
+  const completedJobs: string[] = []
   const updates = new SystemUpdateManager(config, {
   const updates = new SystemUpdateManager(config, {
     projectRoot: process.cwd(), platform: 'darwin',
     projectRoot: process.cwd(), platform: 'darwin',
     inspectRemote: async () => ({ manifest: latest, commit: 'b'.repeat(40) }),
     inspectRemote: async () => ({ manifest: latest, commit: 'b'.repeat(40) }),
@@ -30,6 +31,7 @@ test('opens settings and schedules an independent Web update while all 9119 requ
       const job = JSON.parse(readFileSync(path, 'utf8'))
       const job = JSON.parse(readFileSync(path, 'utf8'))
       launched.push(job.target.releaseVersion)
       launched.push(job.target.releaseVersion)
       writeFileSync(path, JSON.stringify({ ...job, state: 'succeeded', message: '离线 Web 升级任务验收完成' }))
       writeFileSync(path, JSON.stringify({ ...job, state: 'succeeded', message: '离线 Web 升级任务验收完成' }))
+      completedJobs.push(path)
       rmSync(join(home, 'updates', 'active.lock'))
       rmSync(join(home, 'updates', 'active.lock'))
     },
     },
   })
   })
@@ -49,9 +51,9 @@ test('opens settings and schedules an independent Web update while all 9119 requ
     const signedIn = await login.json()
     const signedIn = await login.json()
     expect(login.ok(), `${login.status()} ${signedIn.error || ''}`).toBe(true)
     expect(login.ok(), `${login.status()} ${signedIn.error || ''}`).toBe(true)
     expect((await page.request.get(origin + '/readyz')).status()).toBe(503)
     expect((await page.request.get(origin + '/readyz')).status()).toBe(503)
-    await page.goto(origin + '/chat')
+    await page.goto(origin + '/chat', { waitUntil: 'domcontentloaded' })
     await page.getByRole('button', { name: /^(打开设置中心|设置与模式)$/ }).click()
     await page.getByRole('button', { name: /^(打开设置中心|设置与模式)$/ }).click()
-    if (await page.getByRole('menuitem', { name: '进入设置', exact: true }).isVisible()) await page.getByRole('menuitem', { name: '进入设置', exact: true }).click()
+    await page.getByRole('menuitem', { name: '设置', exact: true }).click()
     const dialog = page.getByRole('dialog', { name: '设置中心' })
     const dialog = page.getByRole('dialog', { name: '设置中心' })
     await dialog.getByRole('button', { name: '系统概览', exact: true }).click()
     await dialog.getByRole('button', { name: '系统概览', exact: true }).click()
     await expect(dialog.getByText(`Web ${current.webVersion} · 可独立升级与回滚`)).toBeVisible()
     await expect(dialog.getByText(`Web ${current.webVersion} · 可独立升级与回滚`)).toBeVisible()
@@ -62,7 +64,9 @@ test('opens settings and schedules an independent Web update while all 9119 requ
     await page.screenshot({ path: testInfo.outputPath('offline-web-update.png') })
     await page.screenshot({ path: testInfo.outputPath('offline-web-update.png') })
     page.once('dialog', confirmation => confirmation.accept())
     page.once('dialog', confirmation => confirmation.accept())
     await dialog.getByRole('button', { name: '升级 Web', exact: true }).click()
     await dialog.getByRole('button', { name: '升级 Web', exact: true }).click()
-    await expect(dialog.getByText('离线 Web 升级任务验收完成')).toBeVisible()
+    await expect.poll(() => completedJobs.length).toBe(1)
+    expect(JSON.parse(readFileSync(completedJobs[0]!, 'utf8'))).toMatchObject({ state: 'succeeded', target: { webVersion: version } })
+    await expect(dialog.getByRole('region', { name: '更新与回滚', exact: true })).toBeVisible()
     expect(launched).toEqual([version])
     expect(launched).toEqual([version])
   } finally {
   } finally {
     await page.goto('about:blank')
     await page.goto('about:blank')

+ 86 - 15
tests/e2e/team-tools.spec.ts

@@ -1,5 +1,77 @@
 import { test, expect } from '@playwright/test'
 import { test, expect } from '@playwright/test'
 
 
+test('simple group creation keeps chat lightweight and explicit delivery has editable collapsed details',async({page},testInfo)=>{
+  await page.goto('/conversations')
+  await page.getByRole('textbox',{name:'账号',exact:true}).fill('fixture')
+  await page.getByRole('textbox',{name:'密码',exact:true}).fill('fixture-pass')
+  await page.getByRole('button',{name:'登录',exact:true}).click()
+  await expect(page.locator('.desktop-sidebar .sidebar-create-trigger')).toBeVisible()
+  for (const [name,canManageTeam] of [['交付负责人',true],['协作成员',false]] as const) {
+    await page.locator('.desktop-sidebar .sidebar-create-trigger').click()
+    await page.getByRole('menuitem',{name:'新建 Bot',exact:true}).click()
+    const editor=page.getByRole('dialog',{name:'创建机器人'})
+    await editor.getByRole('textbox',{name:'名称',exact:true}).fill(name)
+    if(canManageTeam)await editor.getByRole('checkbox',{name:'允许组建团队',exact:true}).check()
+    await editor.getByRole('button',{name:'保存',exact:true}).click()
+    await expect(page.getByRole('heading',{name,exact:true})).toBeVisible()
+  }
+  await page.reload()
+  await page.locator('.desktop-sidebar .sidebar-create-trigger').click()
+  await page.getByRole('menuitem',{name:'新建群聊',exact:true}).click()
+  const dialog=page.getByRole('dialog',{name:'创建群聊'})
+  await expect(dialog.getByRole('combobox',{name:'协作方式',exact:true})).toBeHidden()
+  await expect(dialog.getByText('软件开发团队',{exact:true})).toBeHidden()
+  await dialog.getByRole('textbox',{name:'名称',exact:true}).fill('轻量协作群')
+  await dialog.getByRole('checkbox',{name:'交付负责人',exact:true}).check()
+  await dialog.getByRole('checkbox',{name:'协作成员',exact:true}).check()
+  await dialog.getByRole('combobox',{name:'负责人',exact:true}).selectOption({label:'交付负责人'})
+  await dialog.getByRole('textbox',{name:'群规则(可选)',exact:true}).fill('回答简洁,结论注明来源。')
+  await page.screenshot({path:testInfo.outputPath('simple-group-desktop.png')})
+  await page.setViewportSize({width:390,height:844})
+  await page.emulateMedia({colorScheme:'dark',reducedMotion:'reduce'})
+  await expect(dialog.getByRole('button',{name:'保存',exact:true})).toBeInViewport()
+  await page.screenshot({path:testInfo.outputPath('simple-group-mobile.png')})
+  await dialog.getByRole('button',{name:'保存',exact:true}).click()
+  await expect(page.getByRole('heading',{name:'轻量协作群',exact:true})).toBeVisible()
+  const id=new URL(page.url()).pathname.split('/').at(-1)!
+  const snapshot=await (await page.request.get(`/api/app/conversations/${id}`)).json()
+  expect(snapshot.tasks).toHaveLength(1)
+  expect(snapshot.task.goal).toBeUndefined()
+  expect(snapshot.assignments).toEqual([])
+  await expect(page.locator('.task-plan')).toHaveCount(0)
+  const composer=page.getByRole('textbox',{name:'输入消息,Enter 发送,Shift + Enter 换行'})
+  await composer.fill('简单讨论一下这个方案')
+  await page.getByRole('button',{name:'发送消息',exact:true}).click()
+  await expect(page.locator('.message--assistant')).not.toHaveCount(0)
+  await expect(page.getByRole('button',{name:'交付目标',exact:true})).toBeEnabled()
+  const before=await (await page.request.get(`/api/app/conversations/${id}`)).json()
+  expect(before.task.goal).toBeUndefined()
+  await page.getByRole('button',{name:'交付目标',exact:true}).click()
+  await composer.fill('把方案做完并交付一份报告')
+  const sent=page.waitForResponse(r=>r.request().method()==='POST'&&r.url().endsWith(`/api/app/conversations/${id}/messages`))
+  await page.getByRole('button',{name:'发送消息',exact:true}).click()
+  const response=await sent
+  expect(response.request().postDataJSON().mode).toBe('goal')
+  expect(response.ok(),await response.text()).toBe(true)
+  await expect(page.getByRole('region',{name:'目标进度'})).toBeVisible()
+  const details=page.locator('.task-plan details')
+  await expect(details).not.toHaveAttribute('open')
+  expect((await (await page.request.get(`/api/app/conversations/${id}`)).json()).tasks).toHaveLength(1)
+  await details.locator('summary').click()
+  await page.getByRole('button',{name:'调整验收要求',exact:true}).click()
+  await page.getByRole('textbox',{name:'验收要求',exact:true}).fill('比较三种方案\n说明结论和依据')
+  await page.getByRole('button',{name:'保存验收要求',exact:true}).click()
+  await expect(details).toContainText('比较三种方案')
+  await expect(page.getByRole('button',{name:'调整验收要求',exact:true})).toBeVisible()
+  await page.screenshot({path:testInfo.outputPath('delivery-criteria-mobile.png')})
+  await page.setViewportSize({width:1280,height:900})
+  await page.emulateMedia({colorScheme:'light'})
+  await details.locator('summary').click()
+  await page.screenshot({path:testInfo.outputPath('delivery-progress-desktop.png')})
+  await page.getByRole('button',{name:'停止任务',exact:true}).click()
+  await expect(page.locator('.task-plan header')).toContainText('已停止')
+})
+
 test('team permission defaults off, saves, reloads and revokes in the Agent editor', async ({page},testInfo) => {
 test('team permission defaults off, saves, reloads and revokes in the Agent editor', async ({page},testInfo) => {
   await page.goto('/conversations')
   await page.goto('/conversations')
   await page.getByRole('textbox',{name:'账号',exact:true}).fill('fixture')
   await page.getByRole('textbox',{name:'账号',exact:true}).fill('fixture')
@@ -48,7 +120,7 @@ test('task plans show owners and keep independent text and attachment drafts whe
   await page.goto(`/conversations/${ids.sourceConversationId}`)
   await page.goto(`/conversations/${ids.sourceConversationId}`)
   await page.getByRole('link',{name:'打开任务',exact:true}).click()
   await page.getByRole('link',{name:'打开任务',exact:true}).click()
   await expect(page).toHaveURL(new RegExp(`/conversations/${ids.conversationId}\\?taskId=${ids.firstTaskId}`))
   await expect(page).toHaveURL(new RegExp(`/conversations/${ids.conversationId}\\?taskId=${ids.firstTaskId}`))
-  await page.locator('details.task-plan summary').click()
+  await page.locator('.task-plan details summary').click()
   await expect(page.locator('.task-plan')).toContainText('研究资料')
   await expect(page.locator('.task-plan')).toContainText('研究资料')
   await expect(page.locator('.task-plan')).toContainText('验收研究员')
   await expect(page.locator('.task-plan')).toContainText('验收研究员')
   await expect(page.locator('.task-plan')).toContainText('临时助手')
   await expect(page.locator('.task-plan')).toContainText('临时助手')
@@ -56,18 +128,17 @@ test('task plans show owners and keep independent text and attachment drafts whe
   const composer=page.getByRole('textbox',{name:'输入消息,Enter 发送,Shift + Enter 换行'})
   const composer=page.getByRole('textbox',{name:'输入消息,Enter 发送,Shift + Enter 换行'})
   await composer.fill('调研任务的草稿')
   await composer.fill('调研任务的草稿')
   await page.locator('.composer-area input[type=file]').first().setInputFiles({name:'draft.txt',mimeType:'text/plain',buffer:Buffer.from('待发送附件')})
   await page.locator('.composer-area input[type=file]').first().setInputFiles({name:'draft.txt',mimeType:'text/plain',buffer:Buffer.from('待发送附件')})
-  await page.getByRole('combobox',{name:'当前任务'}).selectOption(ids.secondTaskId)
+  await page.getByRole('combobox',{name:'当前话题'}).selectOption(ids.secondTaskId)
   await expect(composer).toHaveValue('')
   await expect(composer).toHaveValue('')
   await composer.fill('独立任务的草稿')
   await composer.fill('独立任务的草稿')
-  await page.getByRole('combobox',{name:'当前任务'}).selectOption(ids.firstTaskId)
+  await page.getByRole('combobox',{name:'当前话题'}).selectOption(ids.firstTaskId)
   await expect(composer).toHaveValue('调研任务的草稿')
   await expect(composer).toHaveValue('调研任务的草稿')
   await expect(page.locator('.composer-attachments')).toContainText('draft.txt')
   await expect(page.locator('.composer-attachments')).toContainText('draft.txt')
   await page.screenshot({path:testInfo.outputPath('task-plan-drafts.png')})
   await page.screenshot({path:testInfo.outputPath('task-plan-drafts.png')})
-  if(!await page.getByRole('button',{name:'停止任务',exact:true}).isVisible())await page.locator('details.task-plan summary').click()
   await page.getByRole('button',{name:'停止任务',exact:true}).click()
   await page.getByRole('button',{name:'停止任务',exact:true}).click()
   await expect(page.locator('.task-plan')).toContainText('已停止')
   await expect(page.locator('.task-plan')).toContainText('已停止')
   await expect(page.locator('.task-plan')).toContainText('已退役')
   await expect(page.locator('.task-plan')).toContainText('已退役')
-  if(!await page.getByText('验收研究员(临时) · 临时助手', {exact:false}).first().isVisible())await page.locator('details.task-plan summary').click()
+  if(!await page.getByText('验收研究员(临时) · 临时助手', {exact:false}).first().isVisible())await page.locator('.task-plan details summary').click()
   await page.screenshot({path:testInfo.outputPath('task-helper-retired.png')})
   await page.screenshot({path:testInfo.outputPath('task-helper-retired.png')})
 })
 })
 
 
@@ -77,7 +148,7 @@ test('registers an execution node, downloads its private config and disables it'
   await page.getByRole('textbox',{name:'密码',exact:true}).fill('fixture-pass')
   await page.getByRole('textbox',{name:'密码',exact:true}).fill('fixture-pass')
   await page.getByRole('button',{name:'登录',exact:true}).click()
   await page.getByRole('button',{name:'登录',exact:true}).click()
   await page.getByRole('button',{name:/^(打开设置中心|设置与模式)$/}).first().click()
   await page.getByRole('button',{name:/^(打开设置中心|设置与模式)$/}).first().click()
-  if(await page.getByRole('menuitem',{name:'进入设置',exact:true}).isVisible())await page.getByRole('menuitem',{name:'进入设置',exact:true}).click()
+  await page.getByRole('menuitem',{name:'设置',exact:true}).click()
   const dialog=page.getByRole('dialog',{name:'设置中心'})
   const dialog=page.getByRole('dialog',{name:'设置中心'})
   await dialog.getByRole('button',{name:'Hermes 连接',exact:true}).click()
   await dialog.getByRole('button',{name:'Hermes 连接',exact:true}).click()
   await dialog.locator('details.runner-settings summary').click()
   await dialog.locator('details.runner-settings summary').click()
@@ -120,8 +191,8 @@ test('configures the Agent computer in its chat panel and keeps preparation in a
  const editor=page.getByRole('dialog');await editor.getByRole('textbox',{name:'名称',exact:true}).fill('尚未配置的本地电脑')
  const editor=page.getByRole('dialog');await editor.getByRole('textbox',{name:'名称',exact:true}).fill('尚未配置的本地电脑')
  await expect(editor.getByRole('combobox',{name:'执行环境'})).toHaveCount(0)
  await expect(editor.getByRole('combobox',{name:'执行环境'})).toHaveCount(0)
  await editor.getByRole('button',{name:'保存',exact:true}).click()
  await editor.getByRole('button',{name:'保存',exact:true}).click()
- await page.getByRole('button',{name:'电脑',exact:true}).click()
- const dock=page.getByRole('complementary',{name:'Agent 电脑面板'})
+ await page.getByRole('button',{name:'电脑与定时任务',exact:true}).click()
+ const dock=page.getByRole('complementary',{name:'机器人电脑面板'})
  const vmTab=dock.getByRole('tab',{name:'本地虚拟机',exact:true})
  const vmTab=dock.getByRole('tab',{name:'本地虚拟机',exact:true})
  await vmTab.click()
  await vmTab.click()
  await expect(vmTab).toHaveAttribute('aria-selected','true')
  await expect(vmTab).toHaveAttribute('aria-selected','true')
@@ -139,13 +210,13 @@ test('Local VM settings replace the image catalog and prepare the managed deskto
  await login(page)
  await login(page)
  await expect(page.getByRole('button',{name:'电脑与环境',exact:true})).toHaveCount(0)
  await expect(page.getByRole('button',{name:'电脑与环境',exact:true})).toHaveCount(0)
  await page.getByRole('button',{name:'设置与模式',exact:true}).first().click()
  await page.getByRole('button',{name:'设置与模式',exact:true}).first().click()
- await page.getByRole('menuitem',{name:'进入设置',exact:true}).click()
+ await page.getByRole('menuitem',{name:'设置',exact:true}).click()
  const settings=page.getByRole('dialog',{name:'设置中心'})
  const settings=page.getByRole('dialog',{name:'设置中心'})
  await settings.getByRole('button',{name:'本地虚拟机',exact:true}).click()
  await settings.getByRole('button',{name:'本地虚拟机',exact:true}).click()
  const panel=settings.getByRole('region',{name:'本地虚拟机设置'})
  const panel=settings.getByRole('region',{name:'本地虚拟机设置'})
  await expect(panel).toContainText('隔离方式')
  await expect(panel).toContainText('隔离方式')
  await expect(panel.getByRole('button',{name:'上传并导入'})).toHaveCount(0)
  await expect(panel.getByRole('button',{name:'上传并导入'})).toHaveCount(0)
- await panel.getByRole('button',{name:'准备本地虚拟机',exact:true}).click()
+ await panel.getByRole('button',{name:'准备所选镜像',exact:true}).click()
  await expect(panel).toContainText('虚拟机环境已就绪')
  await expect(panel).toContainText('虚拟机环境已就绪')
  await panel.getByRole('combobox',{name:'虚拟机数量上限'}).selectOption('3')
  await panel.getByRole('combobox',{name:'虚拟机数量上限'}).selectOption('3')
  await expect(panel.getByRole('combobox',{name:'虚拟机数量上限'})).toHaveValue('3')
  await expect(panel.getByRole('combobox',{name:'虚拟机数量上限'})).toHaveValue('3')
@@ -158,12 +229,12 @@ test('Agent computer appears as a right panel and opens an interactive desktop',
  await login(page)
  await login(page)
  const seed=await(await page.request.post('/__test/computer?off=1',{data:{}})).json()
  const seed=await(await page.request.post('/__test/computer?off=1',{data:{}})).json()
  await page.goto(`/conversations/${seed.conversationId}`)
  await page.goto(`/conversations/${seed.conversationId}`)
- await page.getByRole('button',{name:'电脑',exact:true}).click()
- const dock=page.getByRole('complementary',{name:'Agent 电脑面板'})
+ await page.getByRole('button',{name:'电脑与定时任务',exact:true}).click()
+ const dock=page.getByRole('complementary',{name:'机器人电脑面板'})
  await expect(dock).toBeVisible();await expect(dock).toContainText('本地虚拟机')
  await expect(dock).toBeVisible();await expect(dock).toContainText('本地虚拟机')
  await dock.getByRole('button',{name:'设置本地虚拟机',exact:true}).click()
  await dock.getByRole('button',{name:'设置本地虚拟机',exact:true}).click()
  const settings=page.getByRole('dialog',{name:'设置中心'})
  const settings=page.getByRole('dialog',{name:'设置中心'})
- await settings.getByRole('button',{name:'准备本地虚拟机',exact:true}).click()
+ await settings.getByRole('button',{name:'准备所选镜像',exact:true}).click()
  await settings.getByRole('button',{name:'关闭设置中心',exact:true}).click()
  await settings.getByRole('button',{name:'关闭设置中心',exact:true}).click()
  await expect(dock.getByRole('button',{name:/创建.*的虚拟机/})).toBeVisible({timeout:12000})
  await expect(dock.getByRole('button',{name:/创建.*的虚拟机/})).toBeVisible({timeout:12000})
  await dock.getByRole('button',{name:/创建.*的虚拟机/}).click()
  await dock.getByRole('button',{name:/创建.*的虚拟机/}).click()
@@ -190,8 +261,8 @@ test('two desktops are watch-only on opening and release before changing the con
  const first=await(await page.request.post('/__test/computer',{data:{}})).json()
  const first=await(await page.request.post('/__test/computer',{data:{}})).json()
  const second=await(await page.request.post('/__test/computer',{data:{}})).json()
  const second=await(await page.request.post('/__test/computer',{data:{}})).json()
  await page.goto(`/conversations/${first.conversationId}`)
  await page.goto(`/conversations/${first.conversationId}`)
- await page.getByRole('button',{name:'电脑',exact:true}).click()
- const dock=page.getByRole('complementary',{name:'Agent 电脑面板'})
+ await page.getByRole('button',{name:'电脑与定时任务',exact:true}).click()
+ const dock=page.getByRole('complementary',{name:'机器人电脑面板'})
  await expect(dock.getByRole('button',{name:'打开双桌面'})).toBeVisible()
  await expect(dock.getByRole('button',{name:'打开双桌面'})).toBeVisible()
  await dock.getByRole('button',{name:'打开双桌面'}).click()
  await dock.getByRole('button',{name:'打开双桌面'}).click()
  const workspace=page.getByRole('main',{name:'双桌面工作区'})
  const workspace=page.getByRole('main',{name:'双桌面工作区'})

+ 4 - 2
tests/e2e/workspace-chat.spec.ts

@@ -305,7 +305,7 @@ test('created roles and editable teams share a durable chat list without plugin
   await dialog.getByRole('checkbox', { name: '产品经理', exact: true }).check()
   await dialog.getByRole('checkbox', { name: '产品经理', exact: true }).check()
   await dialog.getByRole('checkbox', { name: '开发工程师', exact: true }).check()
   await dialog.getByRole('checkbox', { name: '开发工程师', exact: true }).check()
   await dialog
   await dialog
-    .getByRole('combobox', { name: '管理员', exact: true })
+    .getByRole('combobox', { name: '负责人', exact: true })
     .selectOption({ label: '产品经理' })
     .selectOption({ label: '产品经理' })
   await dialog.getByRole('button', { name: '保存', exact: true }).click()
   await dialog.getByRole('button', { name: '保存', exact: true }).click()
   await expect(page.getByRole('heading', { name: '产品开发团队', exact: true })).toBeVisible()
   await expect(page.getByRole('heading', { name: '产品开发团队', exact: true })).toBeVisible()
@@ -392,11 +392,13 @@ test('created roles and editable teams share a durable chat list without plugin
   await second.close()
   await second.close()
   await page.goto('/conversations')
   await page.goto('/conversations')
   await openCreate(page, '新建群聊')
   await openCreate(page, '新建群聊')
+  await dialog.locator('summary').filter({hasText:'从团队模板选择'}).click()
   await expect(dialog.getByRole('button', { name: '信息收集团队', exact: true })).toBeDisabled()
   await expect(dialog.getByRole('button', { name: '信息收集团队', exact: true })).toBeDisabled()
   await dialog.getByRole('button', { name: '取消', exact: true }).click()
   await dialog.getByRole('button', { name: '取消', exact: true }).click()
   await createAgent(page, '模板成员四')
   await createAgent(page, '模板成员四')
   await createAgent(page, '模板成员五')
   await createAgent(page, '模板成员五')
   await openCreate(page, '新建群聊')
   await openCreate(page, '新建群聊')
+  await dialog.locator('summary').filter({hasText:'从团队模板选择'}).click()
   for (const name of ['信息收集团队', '产品设计团队', '软件开发团队', '文案书写团队', '项目管理团队', '数据分析团队', '会议协作团队', '运维保障团队']) {
   for (const name of ['信息收集团队', '产品设计团队', '软件开发团队', '文案书写团队', '项目管理团队', '数据分析团队', '会议协作团队', '运维保障团队']) {
     await expect(dialog.getByRole('button', { name, exact: true })).toBeEnabled()
     await expect(dialog.getByRole('button', { name, exact: true })).toBeEnabled()
   }
   }
@@ -522,7 +524,7 @@ for (const mode of ['普通聊天', 'Bot 单聊', '群聊', '普通长回复'] a
         await dialog.getByRole('textbox', { name: '名称', exact: true }).fill('流式验证群')
         await dialog.getByRole('textbox', { name: '名称', exact: true }).fill('流式验证群')
         await dialog.getByRole('checkbox', { name: `${mode}流式验证助手`, exact: true }).check()
         await dialog.getByRole('checkbox', { name: `${mode}流式验证助手`, exact: true }).check()
         await dialog.getByRole('checkbox', { name: '群聊流式协作成员', exact: true }).check()
         await dialog.getByRole('checkbox', { name: '群聊流式协作成员', exact: true }).check()
-        await dialog.getByRole('combobox', { name: '管理员', exact: true }).selectOption({ label: `${mode}流式验证助手` })
+        await dialog.getByRole('combobox', { name: '负责人', exact: true }).selectOption({ label: `${mode}流式验证助手` })
         await dialog.getByRole('button', { name: '保存', exact: true }).click()
         await dialog.getByRole('button', { name: '保存', exact: true }).click()
         await expect(page.getByRole('heading', { name: '流式验证群', exact: true })).toBeVisible()
         await expect(page.getByRole('heading', { name: '流式验证群', exact: true })).toBeVisible()
       }
       }

+ 24 - 12
tests/e2e/workspace.spec.ts

@@ -1,4 +1,12 @@
-import { expect, test } from '@playwright/test'
+import { expect, test, type Page } from '@playwright/test'
+
+async function openSecondSession(page: Page) {
+  const sidebar = page.locator('.desktop-sidebar')
+  const second = sidebar.getByRole('option').filter({ hasText: '第二个会话' })
+  await expect(sidebar.getByRole('option').first()).toBeVisible()
+  if (!await second.isVisible()) await sidebar.getByRole('button', { name: '继续加载会话' }).click()
+  await second.click()
+}
 
 
 const WIDE_DOCX_BASE64 = 'UEsDBAoAAAAIAKwmFF15bjPX6AAAAK0BAAATAAAAW0NvbnRlbnRfVHlwZXNdLnhtbH1QyU7DMBD9FWuuKHHggBCK0wPLETiUDxjZk8SqN3nc0v49Tlt6QIXjzFv1+tXeO7GjzDYGBbdtB4KCjsaGScHn+rV5AMEFg0EXAyk4EMNq6NeHRCyqNrCCuZT0KCXrmTxyGxOFiowxeyz1zJNMqDc4kbzrunupYygUSlMWDxj6Zxpx64p42df3qUcmxyCeTsQlSwGm5KzGUnG5C+ZXSnNOaKvyyOHZJr6pBJBXExbk74Cz7r0Ok60h8YG5vKGvLPkVs5Em6q2vyvZ/mys94zhaTRf94pZy1MRcF/euvSAebfjpL49zD99QSwMECgAAAAAArCYUXQAAAAAAAAAAAAAAAAYAAABfcmVscy9QSwMECgAAAAgArCYUXZv9N+qtAAAAKQEAAAsAAABfcmVscy8ucmVsc43POw7CMAwG4KtE3mlaBoRQ0y4IqSsqB7ASN61oHkrCo7cnAwNFDIy2f3+W6/ZpZnanECdnBVRFCYysdGqyWsClP232wGJCq3B2lgQsFKFt6jPNmPJKHCcfWTZsFDCm5A+cRzmSwVg4TzZPBhcMplwGzT3KK2ri27Lc8fBpwNpknRIQOlUB6xdP/9huGCZJRydvhmz6ceIrkWUMmpKAhwuKq3e7yCzwpuarF5sXUEsDBAoAAAAAAKwmFF0AAAAAAAAAAAAAAAAFAAAAd29yZC9QSwMECgAAAAgArCYUXalT+9hjAQAABwMAABEAAAB3b3JkL2RvY3VtZW50LnhtbKVSW0/CMBT+K03fpXMBJYRBFAaaYDSKwdeydluTrW3awsBfb7uVDYwmJr6cc75z+c6lHU8PZQH2VGkmeASvewEElCeCMJ5F8H29uBpCoA3mBBeC0wgeqYbTybgaEZHsSsoNsARcj6oI5sbIEUI6yWmJdU9Iym0sFarExkKVoUooIpVIqNaWvyxQGAQ3qMSMQ0e5FeTotHRCOWEmG0YomD/PPoBUdM9oNUbO7aSqZZ1stoVXL8obG1C5oa6DYWB3sq6jtOOTA4bIZ6zwUexMG0rZgRIXRJdES8WIMzOrZ6JoaAd9y4p+daOLStNQJY30xMnmrOT7fKhLPD/GKl6swfrufhWDeL6MfzgF6vr8u9vr4/Lhb+1QsyNqH0LTxHjC7O3Tv0QY9uveubUHw76/n8yesHITCRnB27DOUCzLTYu2whhRtrCgaRfLKSZURbAGqRCmBdnOeNBseBoJnf4Z6v7w5AtQSwECFAAKAAAACACsJhRdeW4z1+gAAACtAQAAEwAAAAAAAAAAAAAAAAAAAAAAW0NvbnRlbnRfVHlwZXNdLnhtbFBLAQIUAAoAAAAAAKwmFF0AAAAAAAAAAAAAAAAGAAAAAAAAAAAAEAAAABkBAABfcmVscy9QSwECFAAKAAAACACsJhRdm/036q0AAAApAQAACwAAAAAAAAAAAAAAAAA9AQAAX3JlbHMvLnJlbHNQSwECFAAKAAAAAACsJhRdAAAAAAAAAAAAAAAABQAAAAAAAAAAABAAAAATAgAAd29yZC9QSwECFAAKAAAACACsJhRdqVP72GMBAAAHAwAAEQAAAAAAAAAAAAAAAAA2AgAAd29yZC9kb2N1bWVudC54bWxQSwUGAAAAAAUABQAgAQAAyAMAAAAA'
 const WIDE_DOCX_BASE64 = 'UEsDBAoAAAAIAKwmFF15bjPX6AAAAK0BAAATAAAAW0NvbnRlbnRfVHlwZXNdLnhtbH1QyU7DMBD9FWuuKHHggBCK0wPLETiUDxjZk8SqN3nc0v49Tlt6QIXjzFv1+tXeO7GjzDYGBbdtB4KCjsaGScHn+rV5AMEFg0EXAyk4EMNq6NeHRCyqNrCCuZT0KCXrmTxyGxOFiowxeyz1zJNMqDc4kbzrunupYygUSlMWDxj6Zxpx64p42df3qUcmxyCeTsQlSwGm5KzGUnG5C+ZXSnNOaKvyyOHZJr6pBJBXExbk74Cz7r0Ok60h8YG5vKGvLPkVs5Em6q2vyvZ/mys94zhaTRf94pZy1MRcF/euvSAebfjpL49zD99QSwMECgAAAAAArCYUXQAAAAAAAAAAAAAAAAYAAABfcmVscy9QSwMECgAAAAgArCYUXZv9N+qtAAAAKQEAAAsAAABfcmVscy8ucmVsc43POw7CMAwG4KtE3mlaBoRQ0y4IqSsqB7ASN61oHkrCo7cnAwNFDIy2f3+W6/ZpZnanECdnBVRFCYysdGqyWsClP232wGJCq3B2lgQsFKFt6jPNmPJKHCcfWTZsFDCm5A+cRzmSwVg4TzZPBhcMplwGzT3KK2ri27Lc8fBpwNpknRIQOlUB6xdP/9huGCZJRydvhmz6ceIrkWUMmpKAhwuKq3e7yCzwpuarF5sXUEsDBAoAAAAAAKwmFF0AAAAAAAAAAAAAAAAFAAAAd29yZC9QSwMECgAAAAgArCYUXalT+9hjAQAABwMAABEAAAB3b3JkL2RvY3VtZW50LnhtbKVSW0/CMBT+K03fpXMBJYRBFAaaYDSKwdeydluTrW3awsBfb7uVDYwmJr6cc75z+c6lHU8PZQH2VGkmeASvewEElCeCMJ5F8H29uBpCoA3mBBeC0wgeqYbTybgaEZHsSsoNsARcj6oI5sbIEUI6yWmJdU9Iym0sFarExkKVoUooIpVIqNaWvyxQGAQ3qMSMQ0e5FeTotHRCOWEmG0YomD/PPoBUdM9oNUbO7aSqZZ1stoVXL8obG1C5oa6DYWB3sq6jtOOTA4bIZ6zwUexMG0rZgRIXRJdES8WIMzOrZ6JoaAd9y4p+daOLStNQJY30xMnmrOT7fKhLPD/GKl6swfrufhWDeL6MfzgF6vr8u9vr4/Lhb+1QsyNqH0LTxHjC7O3Tv0QY9uveubUHw76/n8yesHITCRnB27DOUCzLTYu2whhRtrCgaRfLKSZURbAGqRCmBdnOeNBseBoJnf4Z6v7w5AtQSwECFAAKAAAACACsJhRdeW4z1+gAAACtAQAAEwAAAAAAAAAAAAAAAAAAAAAAW0NvbnRlbnRfVHlwZXNdLnhtbFBLAQIUAAoAAAAAAKwmFF0AAAAAAAAAAAAAAAAGAAAAAAAAAAAAEAAAABkBAABfcmVscy9QSwECFAAKAAAACACsJhRdm/036q0AAAApAQAACwAAAAAAAAAAAAAAAAA9AQAAX3JlbHMvLnJlbHNQSwECFAAKAAAAAACsJhRdAAAAAAAAAAAAAAAABQAAAAAAAAAAABAAAAATAgAAd29yZC9QSwECFAAKAAAACACsJhRdqVP72GMBAAAHAwAAEQAAAAAAAAAAAAAAAAA2AgAAd29yZC9kb2N1bWVudC54bWxQSwUGAAAAAAUABQAgAQAAyAMAAAAA'
 
 
@@ -43,7 +51,7 @@ test('separates writable Web chats from read-only Hermes history', async ({ page
 
 
 test('explains optional upstream credentials without blocking a ready connection', async ({ page }, testInfo) => {
 test('explains optional upstream credentials without blocking a ready connection', async ({ page }, testInfo) => {
   await page.getByRole('button', { name: /^(打开设置中心|设置与模式)$/ }).first().click()
   await page.getByRole('button', { name: /^(打开设置中心|设置与模式)$/ }).first().click()
-  if (await page.getByRole('menuitem', { name: '进入设置', exact: true }).isVisible()) await page.getByRole('menuitem', { name: '进入设置', exact: true }).click()
+  await page.getByRole('menuitem', { name: '设置', exact: true }).click()
   const dialog = page.getByRole('dialog', { name: '设置中心' })
   const dialog = page.getByRole('dialog', { name: '设置中心' })
   await dialog.getByRole('button', { name: 'Hermes 连接', exact: true }).click()
   await dialog.getByRole('button', { name: 'Hermes 连接', exact: true }).click()
   await expect(dialog.locator('[aria-label="Hermes 连接状态"]')).toBeVisible()
   await expect(dialog.locator('[aria-label="Hermes 连接状态"]')).toBeVisible()
@@ -499,14 +507,14 @@ test('keeps pins first and loads the next session page at the list bottom', asyn
     element.scrollTop = element.scrollHeight
     element.scrollTop = element.scrollHeight
     element.dispatchEvent(new Event('scroll'))
     element.dispatchEvent(new Event('scroll'))
   })
   })
-  await expect(items).toHaveCount(103)
+  await expect.poll(() => items.count()).toBeGreaterThan(100)
   await expect(sidebar.getByRole('button', { name: '继续加载会话' })).toHaveCount(0)
   await expect(sidebar.getByRole('button', { name: '继续加载会话' })).toHaveCount(0)
 })
 })
 
 
 test('switches the composer model to the selected historical session model', async ({ page }) => {
 test('switches the composer model to the selected historical session model', async ({ page }) => {
   await page.goto('/chat/session-demo?profile=yaoyao')
   await page.goto('/chat/session-demo?profile=yaoyao')
   await expect(page.locator('.composer-tool--model')).toContainText('gpt-5.6')
   await expect(page.locator('.composer-tool--model')).toContainText('gpt-5.6')
-  await page.getByRole('option', { name: /第二个会话/ }).click()
+  await openSecondSession(page)
   await expect(page.locator('.composer-tool--model')).toContainText('gpt-5.5')
   await expect(page.locator('.composer-tool--model')).toContainText('gpt-5.5')
 })
 })
 
 
@@ -528,7 +536,7 @@ test('opens a conversation even when marking it read is unsupported', async ({ p
     await route.fulfill({ status: 405, contentType: 'application/json', body: JSON.stringify({ error: 'Method Not Allowed' }) })
     await route.fulfill({ status: 405, contentType: 'application/json', body: JSON.stringify({ error: 'Method Not Allowed' }) })
   })
   })
 
 
-  await page.getByRole('option').filter({ hasText: '第二个会话' }).click()
+  await openSecondSession(page)
   await expect(page).toHaveURL(/\/chat\/session-second\?profile=yaoyao/)
   await expect(page).toHaveURL(/\/chat\/session-second\?profile=yaoyao/)
   await expect(page.getByText('已整理完成。下面是', { exact: false })).toBeVisible()
   await expect(page.getByText('已整理完成。下面是', { exact: false })).toBeVisible()
   expect(pageErrors).toEqual([])
   expect(pageErrors).toEqual([])
@@ -584,7 +592,7 @@ test('keeps the show-thinking preference across sessions of the same Agent', asy
   await expect(setting).toHaveAttribute('aria-checked', 'true')
   await expect(setting).toHaveAttribute('aria-checked', 'true')
   await setting.click()
   await setting.click()
   await expect(page.locator('.turn-trace')).toHaveCount(0)
   await expect(page.locator('.turn-trace')).toHaveCount(0)
-  await page.getByRole('option').filter({ hasText: '第二个会话' }).click()
+  await openSecondSession(page)
   await expect(page.locator('.turn-trace')).toHaveCount(0)
   await expect(page.locator('.turn-trace')).toHaveCount(0)
   await page.locator('.composer-tool[aria-label="设置"]').click()
   await page.locator('.composer-tool[aria-label="设置"]').click()
   await page.getByRole('switch', { name: /显示思考/ }).click()
   await page.getByRole('switch', { name: /显示思考/ }).click()
@@ -805,7 +813,7 @@ test('renders model changes as a collapsed system event', async ({ page }) => {
 })
 })
 
 
 test('opens a local message file link as a floating preview card', async ({ page }) => {
 test('opens a local message file link as a floating preview card', async ({ page }) => {
-  await page.route('**/Users/samien/Agents/%E6%96%B9%E6%A1%88%E8%8D%89%E7%A8%BF.md', route => route.fulfill({
+  await page.route(url => url.pathname === '/api/files/download' && url.searchParams.get('path') === '/Users/samien/Agents/方案草稿.md', route => route.fulfill({
     status: 200,
     status: 200,
     contentType: 'text/markdown',
     contentType: 'text/markdown',
     body: '# 会话文件\n\n这是会话中的文本文件。',
     body: '# 会话文件\n\n这是会话中的文本文件。',
@@ -829,10 +837,14 @@ test('opens a local message file link as a floating preview card', async ({ page
 
 
 test('shows a thinking animation after submit until output starts', async ({ page }) => {
 test('shows a thinking animation after submit until output starts', async ({ page }) => {
   await page.goto('/chat/session-demo?profile=yaoyao')
   await page.goto('/chat/session-demo?profile=yaoyao')
+  await expect(page.getByText('已整理完成。下面是', { exact: false })).toBeVisible()
+  const replies = page.getByText('这是来自假 Gateway 的流式回复。', { exact: true })
+  const count = await replies.count()
   await page.locator('.composer-textarea').fill('请开始思考')
   await page.locator('.composer-textarea').fill('请开始思考')
   await page.getByRole('button', { name: '发送消息' }).click()
   await page.getByRole('button', { name: '发送消息' }).click()
   await expect(page.locator('.thinking-indicator')).toBeVisible()
   await expect(page.locator('.thinking-indicator')).toBeVisible()
-  await expect(page.getByText('这是来自假 Gateway 的流式回复。', { exact: true })).toBeVisible()
+  await expect(replies).toHaveCount(count + 1)
+  await expect(replies.last()).toBeVisible()
   await expect(page.locator('.thinking-indicator')).toHaveCount(0)
   await expect(page.locator('.thinking-indicator')).toHaveCount(0)
 })
 })
 
 
@@ -902,7 +914,7 @@ test('keeps the canonical logo and yaoyao-webui composer geometry', async ({ pag
   await expect(assistantMessage.locator('.message__actions')).toHaveCSS('opacity', '1')
   await expect(assistantMessage.locator('.message__actions')).toHaveCSS('opacity', '1')
   await expect(page.locator('.message--tool-only .message__actions')).toHaveCount(0)
   await expect(page.locator('.message--tool-only .message__actions')).toHaveCount(0)
   await expect(page.locator('[data-message-id="message-thinking-tool"]')).toHaveCount(0)
   await expect(page.locator('[data-message-id="message-thinking-tool"]')).toHaveCount(0)
-  await expect(page.locator('.turn-trace')).toHaveCount(1)
+  await expect(page.locator('.turn-trace').first()).toBeVisible()
   const userMessageMeta = page.locator('.message--user .message__meta')
   const userMessageMeta = page.locator('.message--user .message__meta')
   await expect(userMessageMeta).not.toHaveCount(0)
   await expect(userMessageMeta).not.toHaveCount(0)
   expect(await userMessageMeta.evaluateAll(elements => elements.every(element => getComputedStyle(element).display === 'none'))).toBe(true)
   expect(await userMessageMeta.evaluateAll(elements => elements.every(element => getComputedStyle(element).display === 'none'))).toBe(true)
@@ -1032,7 +1044,7 @@ test('uses the mobile composer and keeps the closed drawer inert', async ({ page
 test('renders the Kanban snapshot and mobile status control without page overflow', async ({ page }) => {
 test('renders the Kanban snapshot and mobile status control without page overflow', async ({ page }) => {
   await page.getByRole('button', { name: '看板', exact: true }).click()
   await page.getByRole('button', { name: '看板', exact: true }).click()
   await expect(page).toHaveURL(/\/kanban\/default$/)
   await expect(page).toHaveURL(/\/kanban\/default$/)
-  await expect(page).toHaveTitle('产品研发 · 夭夭')
+  await expect(page).toHaveTitle('产品研发 · 夭夭 AI')
   await expect(page.getByRole('heading', { name: '产品研发', exact: true })).toBeVisible()
   await expect(page.getByRole('heading', { name: '产品研发', exact: true })).toBeVisible()
   await expect(page.getByRole('article', { name: /完成 Web 看板验收/ })).toBeVisible()
   await expect(page.getByRole('article', { name: /完成 Web 看板验收/ })).toBeVisible()
   await expect(page.locator('.kanban-column')).toHaveCount(8)
   await expect(page.locator('.kanban-column')).toHaveCount(8)
@@ -1071,10 +1083,10 @@ test('serves cached chat history locally and refreshes upstream only on explicit
   await expect(page.getByRole('menuitem', { name: '强制刷新历史' })).toBeVisible()
   await expect(page.getByRole('menuitem', { name: '强制刷新历史' })).toBeVisible()
   await expect(page.getByRole('menu', { name: '会话操作' })).toHaveCSS('opacity', '1')
   await expect(page.getByRole('menu', { name: '会话操作' })).toHaveCSS('opacity', '1')
   await page.screenshot({ path: testInfo.outputPath('force-history-refresh.png') })
   await page.screenshot({ path: testInfo.outputPath('force-history-refresh.png') })
-  const forced = page.waitForResponse(response => messagesURL(response.url()) && response.request().headers()['x-yaoyao-cache'] === 'bypass')
+  const forced = page.waitForResponse(response => response.url().includes('/api/app/sessions/session-demo/sync') && response.request().method() === 'POST')
   await page.getByRole('menuitem', { name: '强制刷新历史' }).click()
   await page.getByRole('menuitem', { name: '强制刷新历史' }).click()
   const refreshed = await forced
   const refreshed = await forced
   expect(refreshed.ok()).toBe(true)
   expect(refreshed.ok()).toBe(true)
-  expect(refreshed.headers()['x-yaoyao-data-source']).toBe('upstream')
+  expect(refreshed.status()).toBe(202)
   await expect(page.locator('.message--assistant').filter({ hasText: '验收摘要' })).toBeVisible()
   await expect(page.locator('.message--assistant').filter({ hasText: '验收摘要' })).toBeVisible()
 })
 })

+ 1 - 1
tests/fixtures/fake-hermes.mjs

@@ -521,7 +521,7 @@ server.on('upgrade', (request, socket, head) => {
           client.send(JSON.stringify({ jsonrpc: '2.0', method: 'event', params: { type: 'message.start', session_id: requestFrame.params.session_id, profile: 'yaoyao' } }))
           client.send(JSON.stringify({ jsonrpc: '2.0', method: 'event', params: { type: 'message.start', session_id: requestFrame.params.session_id, profile: 'yaoyao' } }))
           client.send(JSON.stringify({ jsonrpc: '2.0', method: 'event', params: { type: 'message.delta', session_id: requestFrame.params.session_id, profile: 'yaoyao', payload: { text: '这是来自假 Gateway 的流式回复。' } } }))
           client.send(JSON.stringify({ jsonrpc: '2.0', method: 'event', params: { type: 'message.delta', session_id: requestFrame.params.session_id, profile: 'yaoyao', payload: { text: '这是来自假 Gateway 的流式回复。' } } }))
           client.send(JSON.stringify({ jsonrpc: '2.0', method: 'event', params: { type: 'message.complete', session_id: requestFrame.params.session_id, profile: 'yaoyao', payload: { text: '这是来自假 Gateway 的流式回复。', status: 'complete' } } }))
           client.send(JSON.stringify({ jsonrpc: '2.0', method: 'event', params: { type: 'message.complete', session_id: requestFrame.params.session_id, profile: 'yaoyao', payload: { text: '这是来自假 Gateway 的流式回复。', status: 'complete' } } }))
-        }, 1200)
+        }, requestFrame.params.text === '请开始思考' ? 3500 : 1200)
         return
         return
       }
       }
       respond({ ok: true })
       respond({ ok: true })

+ 6 - 1
tests/fixtures/workspace-server.ts

@@ -1,7 +1,7 @@
 import {nativeEnvironmentFixture} from './native-environment.js'
 import {nativeEnvironmentFixture} from './native-environment.js'
 import {FixtureGrokAuthProvider} from './grok-auth-provider.js'
 import {FixtureGrokAuthProvider} from './grok-auth-provider.js'
 import { FixtureBotPlugins } from './bot-plugins.js'
 import { FixtureBotPlugins } from './bot-plugins.js'
-/** Isolated, deterministic Hermes fixture. Optional team-tool readiness is only for editor UI tests. */
+/** Isolated, deterministic Hermes fixture. Team-tool transport is simulated, with no live model. */
 import { createServer } from 'node:http'
 import { createServer } from 'node:http'
 import { mkdtempSync, readFileSync, existsSync, writeFileSync } from 'node:fs'
 import { mkdtempSync, readFileSync, existsSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { tmpdir } from 'node:os'
@@ -72,6 +72,11 @@ const upstream = createServer((req, res) => {
     return
     return
   }
   }
   if (url.pathname.includes('/plugins/')) {
   if (url.pathname.includes('/plugins/')) {
+    if (process.env.WORKSPACE_FIXTURE_TEAM_TOOLS === '1' && ['/api/plugins/yaoyao-bot-bridge/bind', '/api/plugins/yaoyao-bot-bridge/unbind'].includes(url.pathname)) {
+      req.resume()
+      send({ok:true,native_tools:true})
+      return
+    }
     if (process.env.WORKSPACE_FIXTURE_TEAM_TOOLS === '1' && url.pathname === '/api/plugins/yaoyao-bot-bridge/capabilities') {
     if (process.env.WORKSPACE_FIXTURE_TEAM_TOOLS === '1' && url.pathname === '/api/plugins/yaoyao-bot-bridge/capabilities') {
       send({ version: 1, ready: true, native_tools: true, in_process: true })
       send({ version: 1, ready: true, native_tools: true, in_process: true })
       return
       return

+ 97 - 0
tests/live/desktopImages.live.test.ts

@@ -0,0 +1,97 @@
+// @vitest-environment node
+import {it,expect,vi} from 'vitest'
+import {DatabaseSync} from 'node:sqlite'
+import {mkdtemp,mkdir,readFile,writeFile,rm} from 'node:fs/promises'
+import {tmpdir} from 'node:os'
+import {join,resolve} from 'node:path'
+import {randomUUID} from 'node:crypto'
+import {execFile} from 'node:child_process'
+import {promisify} from 'node:util'
+import {ComputerRuntime} from '../../src/runner/worker/gateway'
+import {LocalVmImages} from '../../src/runner/computers/localVm'
+import {CUA_DRIVER,CUA_SOCKET} from '../../src/runner/computers/container'
+// @ts-expect-error Standalone deployment script.
+import {generateDesktopCompose} from '../../scripts/generate-desktop-compose.mjs'
+const exec=promisify(execFile)
+const enabled=!!process.env.YAOYAO_TEST_STANDARD_IMAGE&&!!process.env.YAOYAO_TEST_CURSOR_IMAGE
+const docker=(args:string[])=>exec('docker',args,{timeout:90000,maxBuffer:8*1024*1024})
+const evidence=resolve('test-results/desktop-image-options')
+
+it.skipIf(!enabled)('runs both images independently, preserves a selection and workspace across recreation, and shares one choice',async()=>{
+ const root=await mkdtemp(join(tmpdir(),'yaoyao-images-live-')),db=new DatabaseSync(':memory:')
+ const standard=(await docker(['image','inspect',process.env.YAOYAO_TEST_STANDARD_IMAGE!,'--format','{{.Id}}'])).stdout.trim()
+ const cursor=(await docker(['image','inspect',process.env.YAOYAO_TEST_CURSOR_IMAGE!,'--format','{{.Id}}'])).stdout.trim()
+ const runtime=new ComputerRuntime(db,{protocol:1,runnerId:randomUUID(),serverURL:'http://127.0.0.1',hermesURL:'http://127.0.0.1',token:'fixture',allowedProfiles:['default'],artifactRoots:[],computers:{runtime:'docker',imageId:standard,python:'/unused',hermesSource:'/unused',hermesHome:'/unused',network:'public-proxy'}},root)
+ const manager=new LocalVmImages(runtime,db)
+ const ids=[randomUUID(),randomUUID()],targets=ids.map(id=>({environmentId:id,agentId:id,ownerKey:'fixture'}))
+ const ready=async(meta:typeof targets[number])=>{const spec=runtime.pool.definition('fixture',meta.environmentId)!;await vi.waitFor(async()=>{await runtime.provider.health(spec,()=>{});await runtime.provider.capture(spec,()=>{})},{timeout:65000,interval:1000});return spec}
+ try{
+  await manager.ready
+  // Bind the exact two local images under test; normal preparation verification still runs.
+  const command=manager.images.run.bind(manager.images)
+  vi.spyOn(manager.images,'run').mockImplementation((engine,args)=>args[0]==='image'&&args[1]==='ls'?Promise.resolve(cursor):command(engine,args))
+  await manager.prepare(randomUUID(),async()=>{},'cursor')
+  await vi.waitFor(async()=>expect((await manager.status()).job?.state).toBe('complete'),{timeout:80000,interval:1000})
+  vi.spyOn(runtime,'resolveWorkspace').mockResolvedValue({type:'resolved',cwd:'/home/cua/workspace',configuredCwd:'.'})
+  for(const [index,key] of (['standard','cursor'] as const).entries()){
+   await manager.select(targets[index]!,key,()=>{})
+   await runtime.desktop(targets[index]!,'default','create',()=>{})
+  }
+  await mkdir(evidence,{recursive:true})
+  for(const [index,meta] of targets.entries()){
+   const spec=await ready(meta)
+   if(index===1){
+    await runtime.provider.execute(spec,['/usr/local/bin/yaoyao-browser','--new-window','data:text/html,<title>Yaoyao Cursor verification</title><h1>Cursor Universal</h1><p>Desktop, browser and private workspace are ready.</p>'],{authorize:()=>{}})
+    await vi.waitFor(()=>runtime.provider.execute(spec,['xdotool','search','--name','Yaoyao Cursor verification'],{authorize:()=>{}}),{timeout:30000,interval:1000})
+    expect((await runtime.provider.execute(spec,['ps','-eo','args='],{authorize:()=>{}})).stdout).toContain('--proxy-server=http://127.0.0.1:3128')
+   }
+   const result=await runtime.provider.execute(spec,['sh','-c',`printf image-${index} > proof-${index}.txt; mkdir -p .browser-profiles; printf profile-${index} > .browser-profiles/proof-${index}.txt; test ! -e proof-${1-index}.txt`],{authorize:()=>{}})
+   expect(result.stderr).toBe('')
+   const frame=await runtime.provider.capture(spec,()=>{})
+   await writeFile(join(evidence,index?'cursor.png':'standard.png'),Buffer.from(frame.data,'base64'))
+  }
+  expect(runtime.pool.status('fixture').filter(s=>s.status==='idle')).toHaveLength(2)
+  expect(runtime.imageFor({...targets[1]!,agentId:randomUUID()})).toBe(cursor)
+  await expect(manager.select(targets[1]!,'standard',()=>{})).rejects.toMatchObject({code:'computer_image_in_use'})
+  await runtime.desktop(targets[1]!,'default','remove',()=>{})
+  await runtime.desktop(targets[1]!,'default','create',()=>{})
+  const restored=await ready(targets[1]!)
+  expect(restored.imageId).toBe(cursor)
+  expect((await runtime.provider.execute(restored,['cat','proof-1.txt','.browser-profiles/proof-1.txt'],{authorize:()=>{}})).stdout).toBe('image-1profile-1')
+  await runtime.provider.execute(restored,[CUA_DRIVER,'call','press_key',JSON.stringify({key:'escape'}),'--socket',CUA_SOCKET],{authorize:()=>{}})
+  expect(await readFile(join(root,'computer-workspaces',ids[0]!,'proof-0.txt'),'utf8')).toBe('image-0')
+ }finally{
+  await manager.close()
+  for(const meta of targets)await runtime.desktop(meta,'default','remove',()=>{})
+  await runtime.controls.close();await runtime.pool.close();db.close();await rm(root,{recursive:true,force:true})
+ }
+},240000)
+
+it.skipIf(!enabled)('runs mixed Compose desktops with isolated volumes and the same private bridge protocol',async()=>{
+ const root=await mkdtemp(join(tmpdir(),'yaoyao-compose-images-')),project='yaoyao-image-test-'+randomUUID().slice(0,8)
+ const entries=[{id:randomUUID(),service:'desktop-1',name:'Standard'},{id:randomUUID(),service:'desktop-2',name:'Cursor',imageKey:'cursor'}]
+ let yaml=generateDesktopCompose(await readFile('compose.yaml','utf8'),entries)
+ yaml=yaml.replace('${YAOYAO_DESKTOP_IMAGE:-hermes-yaoyao-desktop:0.4.0}',process.env.YAOYAO_TEST_STANDARD_IMAGE!).replace('${YAOYAO_CURSOR_DESKTOP_IMAGE:-yaoyao-desktop:cursor}',process.env.YAOYAO_TEST_CURSOR_IMAGE!)
+ const config=join(root,'compose.yaml');await writeFile(config,yaml)
+ const compose=['compose','--project-name',project,'--project-directory',process.cwd(),'-f',config]
+ try{
+  await docker([...compose,'up','-d','--no-build','desktop-1','desktop-2'])
+  for(const [index,entry] of entries.entries()){
+   const id=(await docker([...compose,'ps','-q',entry.service])).stdout.trim()
+   const call=async(op:string,body={})=>{
+    const script="import http.client,socket,sys; c=http.client.HTTPConnection('localhost'); c.sock=socket.socket(socket.AF_UNIX); c.sock.connect('/run/desktop/desktop.sock'); c.request('POST',sys.argv[1],sys.argv[2]); r=c.getresponse(); print(r.read().decode())"
+    // Match Web's uid and read-only IPC mount, outside the desktop's private parent.
+    return JSON.parse((await docker(['run','--rm','--network','none','--cap-drop','ALL','--user','1000:1000','--mount',`type=volume,src=${project}_${entry.service}-ipc,dst=/run/desktop,readonly`,'--entrypoint','python3',process.env.YAOYAO_TEST_CURSOR_IMAGE!,'-c',script,'/'+op,JSON.stringify({...body,desktopId:entry.id})])).stdout)
+   }
+   await vi.waitFor(async()=>expect((await call('health')).ready).toBe(true),{timeout:65000,interval:1000})
+   const lease=await call('acquire',{requestId:randomUUID(),owner:'fixture'})
+   const state=JSON.parse((await docker(['inspect',id])).stdout)[0]
+   expect(state.HostConfig.NetworkMode).toBe('none')
+   expect(Object.keys(state.HostConfig.PortBindings??{})).toHaveLength(0)
+   const output=await docker(['exec','--user','1000:1000',id,'sh','-c',`printf compose-${index} > /home/cua/workspace/proof-${index}; test ! -e /home/cua/workspace/proof-${1-index}`])
+   expect(output.stderr).toBe('')
+   expect((await call('frame',lease)).data).toBeTruthy()
+   await call('release',{...lease,cancel:false})
+  }
+ }finally{await docker([...compose,'down','--volumes']);await rm(root,{recursive:true,force:true})}
+},180000)

+ 1 - 1
tests/live/localVm.live.test.ts

@@ -55,7 +55,7 @@ it.skipIf(!process.env.YAOYAO_HERMES_PYTHON||!process.env.YAOYAO_COMPUTER_IMAGE)
   await page.getByRole('menuitem',{name:'进入设置',exact:true}).click()
   await page.getByRole('menuitem',{name:'进入设置',exact:true}).click()
   const settings=page.getByRole('dialog',{name:'设置中心'})
   const settings=page.getByRole('dialog',{name:'设置中心'})
   await settings.getByRole('button',{name:'本地虚拟机',exact:true}).click()
   await settings.getByRole('button',{name:'本地虚拟机',exact:true}).click()
-  await settings.getByRole('button',{name:'准备本地虚拟机',exact:true}).click()
+  await settings.getByRole('button',{name:'准备所选镜像',exact:true}).click()
   await expect.poll(async()=>await settings.innerText(),{timeout:120000}).toContain('虚拟机环境已就绪')
   await expect.poll(async()=>await settings.innerText(),{timeout:120000}).toContain('虚拟机环境已就绪')
   expect(app.runners.records()).toHaveLength(1)
   expect(app.runners.records()).toHaveLength(1)
   expect(app.runners.records()[0]?.name).toBe('本机虚拟机')
   expect(app.runners.records()[0]?.name).toBe('本机虚拟机')

+ 1 - 0
tests/server/composeDesktops.test.ts

@@ -43,6 +43,7 @@ it('locks Compose capacity and binds existing desktops without allowing cross-ac
   const bind=(id:string,desktopId:string,owner='alice')=>request(app.callback()).put(`/api/app/agents/${id}/local-vm`).set('x-owner',owner).send({enabled:true,desktopId})
   const bind=(id:string,desktopId:string,owner='alice')=>request(app.callback()).put(`/api/app/agents/${id}/local-vm`).set('x-owner',owner).send({enabled:true,desktopId})
   await bind(first.id,randomUUID()).expect(400)
   await bind(first.id,randomUUID()).expect(400)
   await bind(first.id,desktops[0]!.id).expect(200);await bind(second.id,desktops[0]!.id).expect(200)
   await bind(first.id,desktops[0]!.id).expect(200);await bind(second.id,desktops[0]!.id).expect(200)
+  await request(app.callback()).put(`/api/app/agents/${first.id}/local-vm/image`).send({imageKey:'cursor'}).expect(409,{code:'compose_desktop_managed'})
   for(const id of [first.id,second.id])expect(()=>nodes.requireSource('alice',store.require('alice','agent',id))).not.toThrow()
   for(const id of [first.id,second.id])expect(()=>nodes.requireSource('alice',store.require('alice','agent',id))).not.toThrow()
   await bind(other.id,desktops[0]!.id,'bob').expect(403)
   await bind(other.id,desktops[0]!.id,'bob').expect(403)
   expect((await service.status('bob')).desktops?.[0]?.available).toBe(false)
   expect((await service.status('bob')).desktops?.[0]?.available).toBe(false)

+ 23 - 0
tests/server/desktopComposeImages.test.ts

@@ -0,0 +1,23 @@
+// @vitest-environment node
+import {it,expect} from 'vitest'
+import {readFileSync} from 'node:fs'
+// @ts-expect-error Deployment generator is a standalone Node script.
+import {generateDesktopCompose} from '../../scripts/generate-desktop-compose.mjs'
+import {parseComposeDesktops} from '../../src/server/composeDesktops'
+const base=readFileSync(new URL('../../compose.yaml',import.meta.url),'utf8')
+const entries=JSON.parse(readFileSync(new URL('../../deploy/compose-desktops.json',import.meta.url),'utf8'))
+it('generates different recipes and isolated persistent volumes for two fixed desktops',()=>{
+ const yaml=generateDesktopCompose(base,[entries[0],{...entries[1],imageKey:'cursor'}])
+ expect(yaml).toContain('dockerfile: Dockerfile\n')
+ expect(yaml).toContain('dockerfile: Dockerfile.cursor\n')
+ expect(yaml).toContain('platform: linux/amd64')
+ expect(yaml).toContain('YAOYAO_CURSOR_DESKTOP_IMAGE:-yaoyao-desktop:cursor')
+ expect(yaml).toContain('desktop-1-workspace:/home/cua/workspace')
+ expect(yaml).toContain('desktop-2-workspace:/home/cua/workspace')
+ expect(yaml).not.toContain('/var/run/docker.sock')
+ const line=yaml.split('\n').find((s:string)=>s.includes('HERMES_YAOYAO_COMPOSE_DESKTOPS:'))!
+ const targets=parseComposeDesktops(JSON.parse(line.slice(line.indexOf(':')+1).trim()))
+ expect(targets.map(d=>d.imageKey)).toEqual(['standard','cursor'])
+ expect(targets[0]?.socketPath).not.toBe(targets[1]?.socketPath)
+ for(const key of ['arbitrary','__proto__','constructor','cursor\n    privileged: true'])expect(()=>generateDesktopCompose(base,[{...entries[0],imageKey:key}])).toThrow()
+})

+ 70 - 0
tests/server/localVm.test.ts

@@ -128,3 +128,73 @@ it('keeps uncertain preparation cleanup fenced and retries cleanup when runtime
   const release=f.runtime.pool.beginMaintenance();release()
   const release=f.runtime.pool.beginMaintenance();release()
  }finally{canStop=true;await manager.close();await f.close()}
  }finally{canStop=true;await manager.close();await f.close()}
 })
 })
+
+it('keeps two prepared images and binds one immutable image per independent or shared desktop',async()=>{
+ const f=await fixture(),standard='sha256:'+'a'.repeat(64),cursor='sha256:'+'b'.repeat(64)
+ f.runtime.config.imageId=standard
+ const manager=new LocalVmImages(f.runtime,f.db)
+ const manifest=(id:string)=>({protocol:1 as const,imageId:id,architecture:'amd64' as const,driver:'0.20.0' as const,layer:'5' as const,imageKey:id===cursor?'cursor' as const:'standard' as const,createdAt:1})
+ try{
+  vi.spyOn(manager.images,'inspect').mockImplementation(async id=>manifest(id))
+  vi.spyOn(manager.images,'run').mockResolvedValue(standard+'\n'+cursor)
+  await manager.prepare(randomUUID(),async()=>{},'cursor')
+  await vi.waitFor(async()=>expect((await manager.status()).job?.state).toBe('complete'))
+  expect((await manager.status()).images?.filter(i=>i.ready).map(i=>i.key)).toEqual(['standard','cursor'])
+  expect(f.runtime.config.imageId).toBe(standard)
+  const a={environmentId:randomUUID(),agentId:randomUUID(),ownerKey:'alice'},b={environmentId:randomUUID(),agentId:randomUUID(),ownerKey:'alice'}
+  await manager.select(a,'standard',()=>{})
+  await manager.select(b,'cursor',()=>{})
+  expect(f.runtime.imageFor(a)).toBe(standard);expect(f.runtime.imageFor(b)).toBe(cursor)
+  expect(f.runtime.imageFor({...b,agentId:randomUUID()})).toBe(cursor)
+  await expect(manager.select({...b,ownerKey:'bob'},'standard',()=>{})).rejects.toMatchObject({code:'computer_owner_mismatch'})
+  vi.spyOn(f.runtime,'resolveWorkspace').mockResolvedValue({type:'resolved',cwd:'/home/cua/workspace',configuredCwd:'.'})
+  await f.runtime.desktop(a,'default','create',()=>{})
+  await f.runtime.desktop(b,'default','create',()=>{})
+  expect(f.running.size).toBe(2)
+  expect(f.runtime.pool.definition('alice',a.environmentId)?.imageId).toBe(standard)
+  expect(f.runtime.pool.definition('alice',b.environmentId)?.imageId).toBe(cursor)
+  await expect(manager.select(b,'standard',()=>{})).rejects.toMatchObject({code:'computer_image_in_use'})
+  await f.runtime.desktop(b,'default','stop',()=>{})
+  await expect(manager.select(b,'standard',()=>{})).rejects.toMatchObject({code:'computer_image_in_use'})
+  await f.runtime.desktop(b,'default','remove',()=>{})
+  expect(f.runtime.imageFor(b)).toBe(cursor)
+  await manager.select(b,'standard',()=>{})
+  expect(f.runtime.imageFor({...b,agentId:randomUUID()})).toBe(standard)
+  expect(f.runtime.provider.deleteWorkspace).toHaveBeenCalledTimes(2) // Only preparation scratch space.
+  await manager.close()
+  const resumed=new LocalVmImages(f.runtime,f.db);await resumed.ready
+  expect(f.runtime.imageFor(b)).toBe(standard)
+  vi.spyOn(resumed.images,'inspect').mockImplementation(async id=>manifest(id))
+  expect((await resumed.options()).filter(i=>i.ready)).toHaveLength(2)
+  await resumed.close()
+ }finally{await manager.close();await f.close()}
+})
+
+it('does not select an unprepared image or mutate a choice after authorization expires',async()=>{
+ const f=await fixture(),manager=new LocalVmImages(f.runtime,f.db),meta={environmentId:randomUUID(),agentId:randomUUID(),ownerKey:'alice'}
+ try{
+  await expect(manager.select(meta,'cursor',()=>{})).rejects.toMatchObject({code:'computer_image_required'})
+  expect(f.runtime.imageFor(meta)).toBe(UNCONFIGURED_COMPUTER_IMAGE)
+  const denied=()=>{throw new Error('expired')}
+  await expect(manager.select(meta,'standard',denied)).rejects.toThrow('expired')
+  expect(f.db.prepare('SELECT * FROM computer_image_bindings').all()).toEqual([])
+ }finally{await manager.close();await f.close()}
+})
+
+it('does not fall back to the standard recipe when Cursor preparation fails',async()=>{
+ const f=await fixture(),standard='sha256:'+'a'.repeat(64)
+ f.runtime.config.imageId=standard
+ const manager=new LocalVmImages(f.runtime,f.db)
+ try{
+  vi.spyOn(manager.images,'run').mockResolvedValue(standard)
+  vi.spyOn(manager.images,'inspect').mockResolvedValue({protocol:1,imageId:standard,architecture:'arm64',driver:'0.20.0',layer:'5',createdAt:1})
+  const prepare=vi.spyOn(manager.images,'prepare').mockRejectedValue(new Error('cursor build failed'))
+  const id=randomUUID()
+  await manager.prepare(id,async()=>{},'cursor')
+  await vi.waitFor(async()=>expect((await manager.status()).job?.state).toBe('failed'))
+  expect(prepare).toHaveBeenCalledWith(expect.any(String),'cursor')
+  expect(f.runtime.config.imageId).toBe(standard)
+  expect((await manager.options()).find(i=>i.key==='cursor')?.ready).toBe(false)
+  await expect(manager.prepare(id,async()=>{},'standard')).rejects.toMatchObject({code:'idempotency_conflict'})
+ }finally{await manager.close();await f.close()}
+})

+ 8 - 0
tests/server/localVmRoutes.test.ts

@@ -31,6 +31,12 @@ it('protects preparation, removes the old catalog API and scopes sharing to the
   await request(app.callback()).post(base+'/prepare').send({requestId:id}).expect(403)
   await request(app.callback()).post(base+'/prepare').send({requestId:id}).expect(403)
   await request(app.callback()).post(base+'/prepare').set('x-admin','yes').send({requestId:id,imageId:'arbitrary'}).expect(400)
   await request(app.callback()).post(base+'/prepare').set('x-admin','yes').send({requestId:id,imageId:'arbitrary'}).expect(400)
   await request(app.callback()).post(base+'/prepare').set('x-admin','yes').send({requestId:id}).expect(200)
   await request(app.callback()).post(base+'/prepare').set('x-admin','yes').send({requestId:id}).expect(200)
+  await request(app.callback()).post(base+'/prepare').set('x-admin','yes').send({requestId:randomUUID(),imageKey:'cursor'}).expect(200)
+  expect(hub.localVm).toHaveBeenLastCalledWith('alice',runner.id,expect.objectContaining({op:'prepare',imageKey:'cursor'}))
+  await request(app.callback()).put(`/api/app/agents/${first.id}/local-vm/image`).send({imageKey:'cursor'}).expect(200)
+  expect(hub.computer).toHaveBeenLastCalledWith('alice',expect.objectContaining({id:first.id}),'image',{imageKey:'cursor'},expect.any(Function))
+  await request(app.callback()).put(`/api/app/agents/${first.id}/local-vm/image`).send({imageKey:'arbitrary'}).expect(400)
+  await request(app.callback()).put(`/api/app/agents/${first.id}/local-vm/image`).set('x-owner','bob').send({imageKey:'cursor'}).expect(404)
   expect(service.allowed(id,runner.id)).toBe(true);expect(service.allowed(id,randomUUID())).toBe(false)
   expect(service.allowed(id,runner.id)).toBe(true);expect(service.allowed(id,randomUUID())).toBe(false)
   version++;expect(service.allowed(id,runner.id)).toBe(false);version--
   version++;expect(service.allowed(id,runner.id)).toBe(false);version--
   await request(app.callback()).get(`/api/app/admin/runners/${runner.id}/images`).set('x-admin','yes').expect(404)
   await request(app.callback()).get(`/api/app/admin/runners/${runner.id}/images`).set('x-admin','yes').expect(404)
@@ -38,6 +44,8 @@ it('protects preparation, removes the old catalog API and scopes sharing to the
   await request(app.callback()).put(base+'/policy').set('x-admin','yes').send({requestId:randomUUID(),mode:'shared',maxInstances:2}).expect(200)
   await request(app.callback()).put(base+'/policy').set('x-admin','yes').send({requestId:randomUUID(),mode:'shared',maxInstances:2}).expect(200)
   const a=store.require<any>('alice','agent',first.id),b=store.require<any>('alice','agent',second.id)
   const a=store.require<any>('alice','agent',first.id),b=store.require<any>('alice','agent',second.id)
   expect(a.computerEnvironmentId).toBeTruthy();expect(b.computerEnvironmentId).toBe(a.computerEnvironmentId)
   expect(a.computerEnvironmentId).toBeTruthy();expect(b.computerEnvironmentId).toBe(a.computerEnvironmentId)
+  await request(app.callback()).put(`/api/app/agents/${second.id}/local-vm/image`).send({imageKey:'standard'}).expect(200)
+  expect(hub.computer).toHaveBeenLastCalledWith('alice',expect.objectContaining({computerEnvironmentId:a.computerEnvironmentId}),'image',{imageKey:'standard'},expect.any(Function))
   expect(store.require('alice','agent',chatting.id)).toEqual(chatting)
   expect(store.require('alice','agent',chatting.id)).toEqual(chatting)
   const later=store.createAgent('alice',{name:'后加入成员',profile:'default',execution:'computer'})
   const later=store.createAgent('alice',{name:'后加入成员',profile:'default',execution:'computer'})
   expect(later.computerEnvironmentId).toBe(a.computerEnvironmentId)
   expect(later.computerEnvironmentId).toBe(a.computerEnvironmentId)

+ 57 - 0
tests/server/taskCoordinator.test.ts

@@ -42,6 +42,63 @@ function settle(runId:string,status:WorkspaceRun['status']='complete',text='有
 const assignment=(id:string)=>store.require<AgentAssignment>(owner,'assignment',id)
 const assignment=(id:string)=>store.require<AgentAssignment>(owner,'assignment',id)
 
 
 describe('durable team task coordination',()=>{
 describe('durable team task coordination',()=>{
+  it('keeps chat lightweight and starts one explicit goal in the existing topic', () => {
+    const conversation = store.createGroup(owner, {name:'日常群聊',memberIds:[lead.id,worker.id],administratorId:lead.id,mode:'free',autoReplyIds:[worker.id]})
+    const task = store.tasks(owner, conversation.id)[0]!
+    const chat = runtime.send(owner, conversation.id, {requestId:randomUUID(),taskId:task.id,content:'讨论一下方案'})
+    expect(store.get(owner,'goal',task.id)).toBeUndefined()
+    expect(runtime.tasks.assignments(owner,task.id)).toEqual([])
+    settle(chat.id)
+    const input = {requestId:randomUUID(),taskId:task.id,content:'完成方案并交付报告',mode:'goal'}
+    const run = runtime.send(owner,conversation.id,input)
+    expect(runtime.send(owner,conversation.id,input).id).toBe(run.id)
+    expect(store.tasks(owner,conversation.id)).toHaveLength(1)
+    expect(store.require<AgentGoal>(owner,'goal',task.id)).toMatchObject({objective:input.content,coordinatorId:lead.id})
+    expect(run).toMatchObject({goalId:task.id,targetAgentId:lead.id})
+    expect(store.list<{runId:string;agentId:string}>(owner,'turn').filter(w=>w.runId===run.id).map(w=>w.agentId)).toEqual([lead.id])
+    expect(runtime.tasks.assignments(owner,task.id)).toEqual([])
+    const review = runtime.dispatch(owner,conversation.id,{requestId:randomUUID(),taskId:task.id,content:'复核进展'}, {agentId:lead.id,kind:'task_review'})
+    expect(store.list<{runId:string;agentId:string}>(owner,'turn').filter(w=>w.runId===review.id).map(w=>w.agentId)).toEqual([lead.id])
+    settle(review.id)
+    expect(runtime.tasks.finish(owner,lead.id,{requestId:randomUUID(),goalId:task.id,status:'complete',result:'交付完整报告',checks:[{criterion:0,passed:true,evidence:'报告已对照请求核验'}]},run.id).status).toBe('complete')
+  })
+  it('rejects delivery without a valid coordinator or during existing chat work without leaving a goal', () => {
+    const conversation = store.createGroup(owner,{name:'讨论群',memberIds:[lead.id,worker.id],administratorId:worker.id})
+    const task = store.tasks(owner,conversation.id)[0]!
+    const input = {requestId:randomUUID(),taskId:task.id,mode:'goal',content:'完成报告'}
+    expect(()=>runtime.send(owner,conversation.id,input)).toThrow('允许组建团队')
+    expect(store.get(owner,'goal',task.id)).toBeUndefined()
+    expect(store.messages(owner,conversation.id)).toEqual([])
+    store.updateConversation(owner,conversation.id,{administratorId:lead.id})
+    runtime.send(owner,conversation.id,{requestId:randomUUID(),taskId:task.id,content:'先讨论'})
+    expect(()=>runtime.send(owner,conversation.id,input)).toThrow('等待当前回复')
+    expect(store.get(owner,'goal',task.id)).toBeUndefined()
+  })
+  it('edits criteria with concurrency protection and refuses completion against superseded criteria', () => {
+    const input = {requestId:randomUUID(),expectedRevision:1,acceptanceCriteria:['报告应比较三种方案']}
+    const edited = runtime.tasks.updateCriteria(owner,goal.id,input)
+    expect(edited.acceptanceRevision).toBe(2)
+    expect(runtime.tasks.updateCriteria(owner,goal.id,input)).toEqual(edited)
+    expect(()=>runtime.tasks.updateCriteria(owner,goal.id,{...input,requestId:randomUUID(),acceptanceCriteria:['覆盖用户的新要求']})).toThrow('已更新')
+    const finish = {requestId:randomUUID(),goalId:goal.id,status:'complete',result:'完成',checks:[{criterion:0,passed:true,evidence:'原有验收依据'}]}
+    expect(()=>runtime.tasks.finish(owner,lead.id,finish)).toThrow('最新要求')
+    expect(()=>runtime.tasks.updateCriteria('other',goal.id,{...input,requestId:randomUUID()})).toThrow()
+    expect(runtime.tasks.finish(owner,lead.id,{...finish,acceptanceRevision:2,checks:[{criterion:0,passed:true,evidence:'报告包含三种方案及逐项比较'}]}).status).toBe('complete')
+    expect(()=>runtime.tasks.updateCriteria(owner,goal.id,{...input,requestId:randomUUID(),expectedRevision:2})).toThrow('进行中的目标')
+  })
+  it('wakes an idle coordinator once for newly edited criteria without creating assignments', async () => {
+    const run = runtime.dispatch(owner,team.id,{requestId:randomUUID(),taskId:goal.id,content:'直接交付报告'}, {agentId:lead.id,kind:'task_review'})
+    settle(run.id)
+    await vi.waitFor(()=>expect(store.list<TaskDelivery>(owner,'task-delivery')).toHaveLength(1))
+    const firstDelivery = store.list<TaskDelivery>(owner,'task-delivery')[0]!
+    settle(firstDelivery.runId!)
+    runtime.tasks.updateCriteria(owner,goal.id,{requestId:randomUUID(),expectedRevision:1,acceptanceCriteria:['增加三种方案的比较']})
+    await vi.waitFor(()=>expect(store.list<TaskDelivery>(owner,'task-delivery')).toHaveLength(2))
+    runtime.tasks.wake()
+    await new Promise(resolve=>setTimeout(resolve,5))
+    expect(store.list<TaskDelivery>(owner,'task-delivery')).toHaveLength(2)
+    expect(runtime.tasks.assignments(owner,goal.id)).toEqual([])
+  })
   it('runs dependencies only after review, returns a result to the original conversation once',async()=>{
   it('runs dependencies only after review, returns a result to the original conversation once',async()=>{
     const a=assign('调研'),b=assign('撰写',second,[a.id])
     const a=assign('调研'),b=assign('撰写',second,[a.id])
     await vi.waitFor(()=>expect(assignment(a.id).status).toBe('running'))
     await vi.waitFor(()=>expect(assignment(a.id).status).toBe('running'))

+ 17 - 0
tests/server/workspace.test.ts

@@ -130,6 +130,23 @@ it('executes a structured assignment on its actual worker and leaves acceptance
   expect(submitted.params.text).toContain('执行子任务')
   expect(submitted.params.text).toContain('执行子任务')
   expect(store.get<any>(owner,'goal',goal.id)?.status).not.toBe('complete')
   expect(store.get<any>(owner,'goal',goal.id)?.status).not.toBe('complete')
 })
 })
+it('keeps structured goal coordination on the lead and does not relay mention text as duplicate work', async () => {
+  const lead=store.updateAgent(owner,agent('交付负责人').id,{canManageTeam:true}),worker=agent('研究成员')
+  const target=nodes.target(owner,'local'), request=target.session.request.bind(target.session)
+  vi.spyOn(target.session,'request').mockImplementation(async(path,options)=>path.startsWith('/api/plugins/yaoyao-bot-bridge/')
+    ? {status:200,body:Buffer.from(JSON.stringify({ok:true,version:1,ready:true,in_process:true,native_tools:true})),headers:new Headers()}
+    : request(path,options))
+  const team=store.createGroup(owner,{name:'自由协作交付',memberIds:[lead.id,worker.id],administratorId:lead.id,mode:'free',autoReplyIds:[worker.id]})
+  reply=(socket,p)=>socket.send(JSON.stringify({method:'event',params:{type:'message.complete',session_id:p.session_id,payload:{text:'@研究成员 请核对资料',status:'complete'}}}))
+  const run=runtime.send(owner,team.id,{requestId:randomUUID(),content:'交付研究报告',mode:'goal'})
+  await vi.waitFor(()=>expect(['complete','failed']).toContain(store.require<WorkspaceRun>(owner,'run',run.id).status))
+  const settled=store.require<WorkspaceRun>(owner,'run',run.id)
+  expect(settled.status,settled.error).toBe('complete')
+  const work=store.list<Work>(owner,'turn').filter(w=>w.runId===run.id)
+  expect(work.map(w=>w.agentId)).toEqual([lead.id])
+  expect(runtime.tasks.assignments(owner,run.goalId!)).toEqual([])
+  expect(requests.filter(r=>r.method==='prompt.submit').every(r=>!String(r.params.text).startsWith('你是 研究成员'))).toBe(true)
+})
 function direct(id: string, user = owner) {
 function direct(id: string, user = owner) {
   return store
   return store
     .list<WorkspaceConversation>(user, 'conversation')
     .list<WorkspaceConversation>(user, 'conversation')

+ 22 - 1
tests/server/workspaceRoutes.test.ts

@@ -265,12 +265,33 @@ describe('application workspace HTTP contract', () => {
     expect(repeated.body.run.id).toBe(resumed.body.run.id)
     expect(repeated.body.run.id).toBe(resumed.body.run.id)
     await req('post',`/api/app/conversations/${team.id}/tasks/${task.id}/resume`,'second').send({requestId:randomUUID()}).expect(404)
     await req('post',`/api/app/conversations/${team.id}/tasks/${task.id}/resume`,'second').send({requestId:randomUUID()}).expect(404)
   })
   })
+  it('starts an explicit delivery and lets only its owner edit versioned acceptance criteria',async()=>{
+    vi.spyOn(runtime.workspaceRuntime,'wake').mockImplementation(()=>{})
+    vi.spyOn(runtime.workspaceRuntime.teamTools,'requireAvailable').mockResolvedValue()
+    const lead=runtime.workspace.createAgent('first',{name:'负责人',profile:'default',canManageTeam:true})
+    const member=runtime.workspace.createAgent('first',{name:'成员',profile:'default'})
+    const team=runtime.workspace.createGroup('first',{name:'交付群',memberIds:[lead.id,member.id],administratorId:lead.id})
+    const task=runtime.workspace.tasks('first',team.id)[0]!
+    const path=`/api/app/conversations/${team.id}`
+    const input={requestId:randomUUID(),taskId:task.id,content:'完成并交付报告',mode:'goal'}
+    const sent=await req('post',`${path}/messages`).send(input).expect(202)
+    expect(sent.body.run.goalId).toBe(task.id)
+    expect((await req('post',`${path}/messages`).send(input).expect(202)).body.run.id).toBe(sent.body.run.id)
+    expect((await req('get',`${path}/tasks/${task.id}/plan`).expect(200)).body.assignments).toEqual([])
+    const update={requestId:randomUUID(),expectedRevision:1,acceptanceCriteria:['包含三种方案的比较']}
+    const edited=await req('patch',`${path}/tasks/${task.id}/plan`).send(update).expect(200)
+    expect(edited.body.goal).toMatchObject({acceptanceRevision:2,acceptanceCriteria:update.acceptanceCriteria})
+    await req('patch',`${path}/tasks/${task.id}/plan`,'second').send({...update,requestId:randomUUID()}).expect(404)
+    expect((await req('patch',`${path}/tasks/${task.id}/plan`).send({...update,requestId:randomUUID()}).expect(409)).body.code).toBe('goal_criteria_changed')
+  })
   it('grants team management only with a ready bridge and persists explicit revocation', async () => {
   it('grants team management only with a ready bridge and persists explicit revocation', async () => {
     const denied = await req('post','/api/app/agents').send({name:'老板',profile:'default',canManageTeam:true}).expect(409)
     const denied = await req('post','/api/app/agents').send({name:'老板',profile:'default',canManageTeam:true}).expect(409)
     expect(denied.body.code).toBe('team_tools_unavailable')
     expect(denied.body.code).toBe('team_tools_unavailable')
     expect((await req('get','/api/app/agents')).body.agents).toEqual([])
     expect((await req('get','/api/app/agents')).body.agents).toEqual([])
     bridgeReady = true
     bridgeReady = true
-    const agent = (await req('post','/api/app/agents').send({name:'老板',profile:'default',canManageTeam:true}).expect(201)).body.agent
+    const created = await req('post','/api/app/agents').send({name:'老板',profile:'default',canManageTeam:true})
+    expect(created.status, JSON.stringify(created.body)).toBe(201)
+    const agent = created.body.agent
     expect(agent.canManageTeam).toBe(true)
     expect(agent.canManageTeam).toBe(true)
     await req('patch',`/api/app/agents/${agent.id}`,'second').send({canManageTeam:false}).expect(404)
     await req('patch',`/api/app/agents/${agent.id}`,'second').send({canManageTeam:false}).expect(404)
     bridgeReady = false
     bridgeReady = false

+ 25 - 0
tests/server/workspaceTeamTools.test.ts

@@ -62,6 +62,31 @@ async function buildTeam() {
 }
 }
 
 
 describe('Agent-owned team tools', () => {
 describe('Agent-owned team tools', () => {
+  it('only assembles members when creating a team, without goals or assignments', async () => {
+    const before = store.list(owner,'run').length
+    const {team,task} = await buildTeam()
+    expect(store.tasks(owner,team.id)).toHaveLength(1)
+    expect(task.goal).toBeUndefined()
+    expect(store.list(owner,'goal')).toEqual([])
+    expect(store.list(owner,'assignment')).toEqual([])
+    expect(store.list(owner,'run')).toHaveLength(before)
+  })
+  it('promotes the current user conversation into a goal without creating another task or turn', async () => {
+    const {team,task} = await buildTeam()
+    const run = runtime.send(owner,team.id,{requestId:randomUUID(),taskId:task.id,content:'把这件事做完并交付报告'})
+    work = store.list<Work>(owner,'turn').find(w=>w.runId===run.id)!
+    work.status='running';work.teamManagementRevision=manager.revision;store.put(owner,'turn',work.id,work)
+    const before = store.list(owner,'run').length
+    const input = {requestId:randomUUID(),teamId:team.id,title:'报告',content:'交付报告',acceptanceCriteria:['包含结论和依据']}
+    const started = await call('start_team_task',input)
+    expect((await call('start_team_task',input)).task.id).toBe(task.id)
+    expect(store.tasks(owner,team.id)).toHaveLength(1)
+    expect(store.list(owner,'run')).toHaveLength(before)
+    expect(started.run.goalId).toBe(task.id)
+    const edited = await call('update_team_goal',{requestId:randomUUID(),goalId:task.id,expectedRevision:1,acceptanceCriteria:['包含三条结论及对应来源']})
+    expect(edited.goal.acceptanceRevision).toBe(2)
+    await expect(call('start_team_task',{...input,requestId:randomUUID()})).rejects.toMatchObject({code:'goal_exists'})
+  })
   it('records creator authority and archives only an unused member it created',async()=>{
   it('records creator authority and archives only an unused member it created',async()=>{
     const child=(await call('create_agent',{requestId:randomUUID(),name:'临时项目成员',profile:'default'})).agent
     const child=(await call('create_agent',{requestId:randomUUID(),name:'临时项目成员',profile:'default'})).agent
     expect(child.createdByAgentId).toBe(manager.id)
     expect(child.createdByAgentId).toBe(manager.id)