Kaynağa Gözat

发布 v0.4.11:完善会话任务、忙碌状态与模型代理

Samien 2 ay önce
ebeveyn
işleme
dea12f20ad
33 değiştirilmiş dosya ile 569 ekleme ve 93 silme
  1. 6 6
      README.md
  2. 1 1
      docker.env.example
  3. 4 0
      docs/computer-worker.md
  4. 6 6
      docs/docker-install.md
  5. 2 2
      docs/macos-app.md
  6. 49 0
      docs/releases/v0.4.11.md
  7. 4 4
      docs/verification/2026-09-10-bot-panels/README.md
  8. BIN
      docs/verification/2026-09-10-bot-panels/desktop-agent-list-scroll.png
  9. BIN
      docs/verification/2026-09-10-bot-panels/desktop-computer.png
  10. BIN
      docs/verification/2026-09-10-bot-panels/desktop-group-task-picker.png
  11. BIN
      docs/verification/2026-09-10-bot-panels/desktop-inspector.png
  12. BIN
      docs/verification/2026-09-10-bot-panels/desktop-routine-logs.png
  13. BIN
      docs/verification/2026-09-10-bot-panels/desktop-routines.png
  14. BIN
      docs/verification/2026-09-10-bot-panels/phone-group-inspector.png
  15. 2 2
      package-lock.json
  16. 1 1
      package.json
  17. 3 3
      release.json
  18. 2 0
      src/client/components/composer/ComposerShell.vue
  19. 12 6
      src/client/components/workspace/ConversationList.vue
  20. 1 1
      src/client/components/workspace/TaskPlan.vue
  21. 8 8
      src/client/components/workspace/WorkspaceBotPanel.vue
  22. 3 2
      src/client/components/workspace/WorkspaceInspectorPanel.vue
  23. 21 3
      src/client/components/workspace/viewModels.ts
  24. 67 32
      src/client/views/ConversationsView.vue
  25. 4 4
      src/runner/worker/gateway.ts
  26. 13 5
      src/runner/worker/hermes_worker.py
  27. 12 2
      src/runner/worker/process.ts
  28. 57 0
      tests/client/conversationSettings.test.ts
  29. 58 0
      tests/client/workspacePresentation.test.ts
  30. 26 2
      tests/e2e/bot-panels.spec.ts
  31. 85 0
      tests/live/workerProxy.live.test.ts
  32. 74 0
      tests/server/workerProxy.test.ts
  33. 48 3
      tests/server/workerResolution.test.ts

+ 6 - 6
README.md

@@ -1,6 +1,6 @@
 # 夭夭 AI
 
-当前 Web 与 macOS 桌面发布版本:**v0.4.9**。桌面版提供 Apple Silicon(arm64)DMG,详见 [发布说明](docs/releases/v0.4.9.md)。
+当前 Web 与 macOS 桌面发布版本:**v0.4.11**。桌面版提供 Apple Silicon(arm64)DMG,详见 [发布说明](docs/releases/v0.4.11.md)。
 
 夭夭 AI 为网页、iOS 和安卓提供统一的 Agent、群聊、文件库及语音配置服务。Hermes 通过标准 9119 HTTP/WebSocket 接口执行任务。
 
@@ -38,7 +38,7 @@ Web 数据默认保存在 `~/.yaoyao`,可用 `YAOYAO_HOME` 指定(兼容 `HE
 
 ## macOS 桌面版
 
-在 [v0.4.9 发布页](https://github.com/Lsamien/yaoyao/releases/tag/v0.4.9) 下载 `Yaoyao-0.4.9-arm64.dmg`,将“夭夭”拖到应用程序后打开。首次启动会核对并同步配套本机 Web 服务;普通退出保留后台运行,“停止后台服务并退出”可完整停止本应用管理的后台。详细说明见 [macOS App](docs/macos-app.md)。
+在 [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)。
 
 此 DMG 使用 Apple Development 开发签名,未做 Apple 公证。
 
@@ -48,11 +48,11 @@ Web 数据默认保存在 `~/.yaoyao`,可用 `YAOYAO_HOME` 指定(兼容 `HE
 
 | 镜像 | 架构 |
 | --- | --- |
-| `samienluo/yaoyao:v0.4.9-amd` | AMD64 |
-| `samienluo/yaoyao:v0.4.9` | 自动匹配 AMD64 / ARM64 |
-| `samienluo/yaoyao:latest` | 最新稳定版通用镜像,当前与 `v0.4.9` 相同 |
+| `samienluo/yaoyao:v0.4.11-amd` | AMD64 |
+| `samienluo/yaoyao:v0.4.11` | 自动匹配 AMD64 / ARM64 |
+| `samienluo/yaoyao:latest` | 最新稳定版通用镜像,当前与 `v0.4.11` 相同 |
 
-准备好 Docker Engine/Compose 和容器可访问的 Hermes 9119 服务,在仓库目录将 `docker.env.example` 复制为 `docker.env`。配置上游地址,并设置 `HERMES_YAOYAO_IMAGE=samienluo/yaoyao:v0.4.9`(或 `samienluo/yaoyao:latest`),即可使用远程镜像:
+准备好 Docker Engine/Compose 和容器可访问的 Hermes 9119 服务,在仓库目录将 `docker.env.example` 复制为 `docker.env`。配置上游地址,并设置 `HERMES_YAOYAO_IMAGE=samienluo/yaoyao:v0.4.11`(或 `samienluo/yaoyao:latest`),即可使用远程镜像:
 
 ```sh
 docker compose --env-file docker.env pull web

+ 1 - 1
docker.env.example

@@ -3,7 +3,7 @@ HERMES_YAOYAO_BIND_ADDRESS=127.0.0.1
 HERMES_YAOYAO_PUBLISHED_PORT=15300
 # 远程通用镜像支持 AMD64 / ARM64;每次发布更新 latest 并保留旧版本标签。
 # HERMES_YAOYAO_IMAGE=samienluo/yaoyao:latest
-# 固定版本:samienluo/yaoyao:v0.4.9;仅 AMD64:samienluo/yaoyao:v0.4.9-amd。
+# 固定版本:samienluo/yaoyao:v0.4.11;仅 AMD64:samienluo/yaoyao:v0.4.11-amd。
 # 留空时使用本地构建名称 yaoyao:local。
 # YAOYAO_DESKTOP_IMAGE=hermes-yaoyao-desktop:0.4.0
 

+ 4 - 0
docs/computer-worker.md

@@ -28,6 +28,10 @@ Worker 复用已安装 Hermes 的模型循环。它截获整个工具执行入
 
 当前 Worker 模型连接支持 Hermes 的 `chat_completions`、`anthropic_messages`、`codex_responses` API 模式;不启动宿主 CLI 模型后端。模型设置和凭据来自允许列表内的 Profile。
 
+模型 Worker 自动继承所选基础 Profile `.env` 中的 `HTTP_PROXY`、`HTTPS_PROXY`、`ALL_PROXY`、`NO_PROXY` 及其小写形式,无需单独配置 Worker。变量大小写和显式空值原样保留,由 Hermes SDK 决定代理选择与绕过规则;Profile 未配置时保持直连,不回退到 Runner 的全局代理。新建或恢复会话时重新读取,人工接管后交还控制时沿用本轮快照。代理仅在 Runner 内存和模型子进程环境中使用,不写入会话数据库或发送到客户端。
+
+模型连接代理与隔离电脑的 `none` / `public-proxy` 联网策略相互独立。模型进程运行在 Runner 侧,因此代理地址中的 `127.0.0.1` 指向 Runner 所在运行环境,不会自动改写成虚拟电脑或 Docker 宿主地址。网络探测收到 HTTP 403 只能证明可达;验收模型连接需要收到完整模型回复。
+
 ## 权限和生命周期
 
 - 控制面在执行节点、账号、基础 Profile、Agent、聊天成员关系和任务状态上共同检查授权。检查发生在命令准入、电脑操作、续期和产物传输时。

+ 6 - 6
docs/docker-install.md

@@ -12,14 +12,14 @@
 
 | 标签 | 架构 |
 | --- | --- |
-| `v0.4.9-amd` | `linux/amd64` |
-| `v0.4.9` | `linux/amd64`、`linux/arm64`,拉取时自动匹配 |
-| `latest` | 最新稳定通用镜像,当前指向与 `v0.4.9` 相同的镜像 |
+| `v0.4.11-amd` | `linux/amd64` |
+| `v0.4.11` | `linux/amd64`、`linux/arm64`,拉取时自动匹配 |
+| `latest` | 最新稳定通用镜像,当前指向与 `v0.4.11` 相同的镜像 |
 
 ```sh
-docker pull samienluo/yaoyao:v0.4.9
+docker pull samienluo/yaoyao:v0.4.11
 # 需要固定 AMD64 时:
-docker pull samienluo/yaoyao:v0.4.9-amd
+docker pull samienluo/yaoyao:v0.4.11-amd
 ```
 
 每次新版本发布都会更新 `latest`,旧版本标签继续保留。需要固定部署版本时使用具体版本标签。
@@ -34,7 +34,7 @@ cp docker.env.example docker.env
 
 | 配置 | 用途 |
 | --- | --- |
-| `HERMES_YAOYAO_IMAGE` | 远程镜像可设为 `samienluo/yaoyao:v0.4.9` 或 `samienluo/yaoyao:latest`;未设置时使用本地构建名称 |
+| `HERMES_YAOYAO_IMAGE` | 远程镜像可设为 `samienluo/yaoyao:v0.4.11` 或 `samienluo/yaoyao:latest`;未设置时使用本地构建名称 |
 | `HERMES_YAOYAO_UPSTREAM` | Hermes 上游地址,默认 `http://host.docker.internal:9119` |
 | `HERMES_YAOYAO_BIND_ADDRESS` | Web 的宿主机发布地址,默认 `127.0.0.1`;局域网访问可设为 `0.0.0.0` |
 | `HERMES_YAOYAO_PUBLISHED_PORT` | 宿主机 Web 端口,默认 `15300` |

+ 2 - 2
docs/macos-app.md

@@ -40,7 +40,7 @@ npm run desktop:build
 npm run desktop:test
 npm run desktop:pack
 codesign --verify --deep --strict desktop-release/mac-arm64/夭夭.app
-hdiutil verify desktop-release/Yaoyao-0.4.9-arm64.dmg
+hdiutil verify desktop-release/Yaoyao-0.4.11-arm64.dmg
 ```
 
 开发 App 的 6 项测试通过:真实内置服务启动、账号与 Runner 连接、关闭窗口保持运行、服务崩溃恢复、外部客户端不误停服务、退出清理、加密配置再次启动、偏好保存及手动重新打开、版本不符拒绝、钥匙串失败保护。另有更新器 14 项定向测试通过,包含 App 禁用源码更新及回退。
@@ -58,4 +58,4 @@ Electron 初始化时设置其钥匙串项目名称([v43.4.0 源码](https://g
 
 最终实际签名 App 的完整 Runner 导入、加密保存、服务崩溃恢复、窗口关闭保持连接、退出清理和再次打开自动连接均已通过;另有独立的核心服务生命周期测试通过。新加密助手在实际签名 App 中验证所属路径和签名团队。安装包经挂载检查,开发专用助手没有进入分发包。
 
-v0.4.9 同时发布 Web 与 macOS Apple Silicon DMG,见 [发布说明](releases/v0.4.9.md)。正式 App 首次启动按上文同步规则升级较旧的本机 Web;已有更新版本保留。独立预览应指定独立 `HERMES_YAOYAO_HOME` 和 `HERMES_YAOYAO_DESKTOP_PORT`。
+v0.4.11 同时发布 Web 与 macOS Apple Silicon DMG,见 [发布说明](releases/v0.4.11.md)。正式 App 首次启动按上文同步规则升级较旧的本机 Web;已有更新版本保留。独立预览应指定独立 `HERMES_YAOYAO_HOME` 和 `HERMES_YAOYAO_DESKTOP_PORT`。

+ 49 - 0
docs/releases/v0.4.11.md

@@ -0,0 +1,49 @@
+# 夭夭 AI v0.4.11
+
+本次发布 Web、macOS Apple Silicon 桌面版、Android 1.3(165)及 Docker Hub 双架构镜像,包含此前尚未正式发布的 v0.4.10 改动。
+
+## 更新内容
+
+- 优化会话侧栏、任务选择与新建任务入口,修复桌面 Bot 列表滚动。
+- 修复从会话菜单打开聊天设置时可能编辑错误会话的问题,按实际菜单目标打开并保存。
+- 机器人在不同单聊、群聊中的忙碌、等待和排队状态统一展示;安卓同步更新这些状态。
+- 模型 Worker 自动继承基础 Hermes Profile 的代理配置,显式设置的执行环境代理保持优先。
+- 任务进度与输入框等宽对齐,并缩小两者间距。
+
+## 下载
+
+- `Yaoyao-0.4.11-arm64.dmg`:macOS Apple Silicon,Apple Development 开发签名,未做 Apple 公证。
+- `Yaoyao-1.3-165-android.apk`:Android 12 及以上,沿用原正式发布密钥。
+- `Yaoyao-0.4.11-source.tar.gz`:Web 与桌面端源码。
+- `SHA256SUMS.txt`:发布附件的 SHA-256 校验文件。
+
+## Docker Hub 远程镜像
+
+镜像仓库:[samienluo/yaoyao](https://hub.docker.com/r/samienluo/yaoyao)。
+
+| 镜像标签 | 架构 |
+| --- | --- |
+| `samienluo/yaoyao:v0.4.11-amd` | `linux/amd64` |
+| `samienluo/yaoyao:v0.4.11` | 自动匹配 `linux/amd64` / `linux/arm64` |
+| `samienluo/yaoyao:latest` | 本次发布后指向已验证的 `v0.4.11` 通用镜像 |
+
+```sh
+docker pull samienluo/yaoyao:v0.4.11
+# 固定使用 AMD64:
+docker pull samienluo/yaoyao:v0.4.11-amd
+```
+
+在 `docker.env` 中设置 `HERMES_YAOYAO_IMAGE=samienluo/yaoyao:v0.4.11` 或 `samienluo/yaoyao:latest` 后更新:
+
+```sh
+docker compose --env-file docker.env pull web
+docker compose --env-file docker.env up -d --no-build web
+```
+
+镜像的实际 digest、架构与运行核验结果记录在本版本 GitHub 发布页。固定版本验证通过后更新 `latest`,所有旧版本标签保留。
+
+## 升级
+
+官方发布地址为 https://github.com/Lsamien/yaoyao/releases/tag/v0.4.11 。App 首次启动继续只同步较旧的本机 Web,保留已有更新的独立 Web;默认数据目录为 `~/.yaoyao`。
+
+升级前备份完整数据目录及加密密钥。源码部署重新构建,Docker 部署拉取已发布镜像并重建容器,保留原数据目录和命名卷。

+ 4 - 4
docs/verification/2026-09-10-bot-panels/README.md

@@ -3,11 +3,11 @@
 ## 完成内容
 
 - 共享本地虚拟机按同一账号、同一执行节点绑定多个机器人,不再按基础 Profile 分成多台。虚拟机运行数量上限单独管理;独立模式仍保留。共享电脑保留已确定的工作目录,机器人保留独立会话。
-- 机器人侧栏包含电脑、定时任务和 Inspector。电脑选择参照 OpenMausBot:自动、Grok Bot 云端、本地虚拟机、本机、仅浏览器、不使用电脑。当前执行节点没有本机控制与独立浏览器连接,因此对应两项不可选。
+- 机器人侧栏将电脑与定时任务作为居中的同组入口;Inspector 独立放在会话标题栏的聊天设置之后,标题栏与面板标题统一使用原侧栏的小虫图标。电脑选择参照 OpenMausBot:自动、Grok Bot 云端、本地虚拟机、本机、仅浏览器、不使用电脑。当前执行节点没有本机控制与独立浏览器连接,因此对应两项不可选。
 - 自动选择保留可用本地虚拟机;新机器人可使用已就绪的本地执行节点,否则使用当前账号已连接的 Grok Bot 云端。查看侧栏只查询状态;显式打开云端电脑或实际工具执行才建立/唤醒连接。
 - Grok Bot 使用服务端保存的加密凭据,按账号复用同一台虚拟机。机器人通过当前基础 Hermes 的工具桥获得云端 shell、文件读写、截图与桌面输入工具;云端地址和认证令牌不下发到浏览器或手机。
 - 接管等待当前云端电脑操作完成,后续机器人电脑工具等待交还。两个页面不能同时取得控制;控制到期不自行恢复,重新接管并交还后才继续,交还说明进入后续工具结果。
-- 群聊侧栏只有 Inspector,没有电脑查看或控制入口。
+- 群聊没有电脑查看或控制入口;任务选择器使用胶囊外观,并可从下拉末项直接新建、切换任务。聊天列表操作菜单可按类型“查看机器人”或“查看群聊”。
 - 编辑机器人允许切换基础机器人,服务端校验来源授权、可用性和空闲状态。新执行使用新会话,近期聊天记录仍用于上下文。
 - 定时任务支持单次、间隔、每日、每周和明确时区。任务、下次执行时间与执行记录持久化,重启后补执行一次到期任务,不集中重放漏掉的所有周期;相同任务未结束时跳过重叠执行。结果进入机器人原聊天。
 - 定时任务排版对齐 OpenMausBot 的 RoutinesSection / RoutineList / RoutineLogs:顶部操作卡、独立任务卡、状态标记、下一次执行、最近结果、日志筛选与模态编辑器。仅编辑标题或提示词不会推迟原定执行时间。
@@ -18,9 +18,9 @@
 ## 验证
 
 - 使用独立测试目录验证 Grok Bot 0.47.0 连接:状态读取成功,真实 shell 返回 Linux x86_64、box、/workspace,退出码 0;读取到 1280×800 PNG 桌面截图。未向真实云端发送桌面输入或改动工作文件。
-- Web Playwright 使用一次性 Hermes fixture,覆盖编辑基础机器人、真实网关请求记录、定时任务创建/立即执行/完成、群聊移除电脑入口,以及 375px 深色/减少动态效果显示。这里验证应用链路,fixture 回复不作为真实模型推理证据。
+- Web Playwright 使用一次性 Hermes fixture,覆盖编辑基础机器人、真实网关请求记录、独立 Inspector、居中的电脑/定时任务入口、定时任务创建/立即执行/完成、群聊任务新建与切换、多机器人列表滚动、群聊移除电脑入口,以及 375px 深色/减少动态效果显示。这里验证应用链路,fixture 回复不作为真实模型推理证据。
 - 全量 Vitest:871 项通过、7 项按原配置跳过;生产构建通过。Web 完整侧栏流程 Playwright:1 项通过。iOS 本地签名模拟器:WorkspaceChatTests 33 项、界面测试 3 项通过。
-- `desktop-computer.png`、`desktop-inspector.png`、`desktop-routines.png`、`phone-group-inspector.png` 均为本次 fixture 的实际浏览器截图。
+- `desktop-computer.png`、`desktop-inspector.png`、`desktop-group-task-picker.png`、`desktop-agent-list-scroll.png`、`desktop-routines.png`、`phone-group-inspector.png` 均为本次 fixture 的实际浏览器截图。
 
 ## 启用
 

BIN
docs/verification/2026-09-10-bot-panels/desktop-agent-list-scroll.png


BIN
docs/verification/2026-09-10-bot-panels/desktop-computer.png


BIN
docs/verification/2026-09-10-bot-panels/desktop-group-task-picker.png


BIN
docs/verification/2026-09-10-bot-panels/desktop-inspector.png


BIN
docs/verification/2026-09-10-bot-panels/desktop-routine-logs.png


BIN
docs/verification/2026-09-10-bot-panels/desktop-routines.png


BIN
docs/verification/2026-09-10-bot-panels/phone-group-inspector.png


+ 2 - 2
package-lock.json

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

+ 1 - 1
package.json

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

+ 3 - 3
release.json

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

+ 2 - 0
src/client/components/composer/ComposerShell.vue

@@ -424,6 +424,8 @@ defineExpose({
       </Transition>
     </div>
 
+    <slot name="before-input" />
+
     <div
       class="composer-shell"
       :class="{ 'composer-shell--drag': dragOver, 'composer-shell--disabled': disabled }"

+ 12 - 6
src/client/components/workspace/ConversationList.vue

@@ -1,20 +1,21 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue'
 import ResourceSidebar from '@/components/app/ResourceSidebar.vue'
-import { workspaceConversationItem } from './viewModels'
+import { workspaceAgentActivity, workspaceConversationItem } from './viewModels'
 import type { WorkspaceAgent, WorkspaceConversation } from '@shared/workspace'
 const props = withDefaults(defineProps<{ conversations: WorkspaceConversation[]; agents?: WorkspaceAgent[]; selected?: string }>(), { agents: () => [] })
-const emit = defineEmits<{ select: [id: string]; pin: [id: string]; archive: [id: string]; delete: [id: string] }>()
+const emit = defineEmits<{ select: [id: string]; settings: [id: string]; pin: [id: string]; archive: [id: string]; delete: [id: string] }>()
 const menuId = ref('')
 const menuPosition = ref({ left: '8px', top: '8px' })
 const menuConversation = computed(() => props.conversations.find(c => c.id === menuId.value))
+const agentActivity = computed(() => workspaceAgentActivity(props.conversations))
 const rows = computed(() => props.conversations.filter(c => !c.archived).map(c => ({
-  ...workspaceConversationItem(c, props.agents),
+  ...workspaceConversationItem(c, props.agents, agentActivity.value),
   section: '',
 })))
 function openMenu(id: string, event: MouseEvent) {
   menuId.value = id
-  menuPosition.value = { left: `${Math.max(8, Math.min(event.clientX, window.innerWidth - 170))}px`, top: `${Math.max(8, Math.min(event.clientY, window.innerHeight - 140))}px` }
+  menuPosition.value = { left: `${Math.max(8, Math.min(event.clientX, window.innerWidth - 170))}px`, top: `${Math.max(8, Math.min(event.clientY, window.innerHeight - 180))}px` }
 }
 function action(kind: 'pin' | 'archive' | 'delete') {
   if (kind === 'pin') emit('pin', menuId.value)
@@ -22,6 +23,7 @@ function action(kind: 'pin' | 'archive' | 'delete') {
   else emit('delete', menuId.value)
   menuId.value = ''
 }
+function openSettings(){const id=menuId.value;menuId.value='';emit('settings',id)}
 </script>
 <template>
   <div class="conversation-list">
@@ -31,6 +33,7 @@ function action(kind: 'pin' | 'archive' | 'delete') {
     <Teleport to="body">
       <div v-if="menuConversation" class="conversation-menu-dismiss" @pointerdown.self="menuId = ''" @keydown.esc="menuId = ''">
         <section class="conversation-actions" :style="menuPosition" role="menu" aria-label="聊天操作">
+          <button role="menuitem" @click="openSettings">{{ menuConversation.kind === 'direct' ? '机器人设置' : '群聊设置' }}</button>
           <button role="menuitem" @click="action('pin')">{{ menuConversation.pinned ? '取消置顶' : '置顶聊天' }}</button>
           <button role="menuitem" @click="action('archive')">{{ menuConversation.archived ? '恢复聊天' : '归档聊天' }}</button>
           <button class="danger" role="menuitem" @click="action('delete')">删除聊天</button>
@@ -40,8 +43,11 @@ function action(kind: 'pin' | 'archive' | 'delete') {
   </div>
 </template>
 <style scoped>
-.conversation-list{display:flex;flex:1;flex-direction:column;min-height:0}
-.conversation-list :deep(.sidebar-list){padding:0 12px 18px;scrollbar-gutter:auto}
+.conversation-list{display:flex;height:100%;min-height:0;flex:1;flex-direction:column;overflow:hidden}
+.conversation-list :deep(.sidebar-list){padding:0 12px 18px;scrollbar-gutter:stable;scrollbar-width:thin;scrollbar-color:color-mix(in srgb,var(--text-muted) 60%,transparent) transparent}
+.conversation-list :deep(.sidebar-list::-webkit-scrollbar){width:8px}
+.conversation-list :deep(.sidebar-list::-webkit-scrollbar-thumb){border:2px solid transparent;border-radius:999px;background:color-mix(in srgb,var(--text-muted) 60%,transparent);background-clip:padding-box}
+.conversation-list :deep(.sidebar-list:hover::-webkit-scrollbar-thumb){background:color-mix(in srgb,var(--text-muted) 82%,transparent);background-clip:padding-box}
 .conversation-list :deep(.sidebar-item){min-height:76px;padding:14px 8px;gap:16px;border-radius:12px}
 .conversation-list :deep(.sidebar-item__icon){width:44px;height:44px;flex-basis:44px}
 .conversation-list :deep(.sidebar-item__row strong){font-size:15px;font-weight:600;line-height:22px}

+ 1 - 1
src/client/components/workspace/TaskPlan.vue

@@ -26,7 +26,7 @@ const labels: Record<string,string> = {pending:'待执行',running:'进行中',r
   </details>
 </template>
 <style scoped>
-.task-plan{margin:0 18px 10px;border:1px solid var(--line);border-radius:12px;padding:0 14px;font-size:13px;max-height:34vh;overflow:auto}
+.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}

+ 8 - 8
src/client/components/workspace/WorkspaceBotPanel.vue

@@ -5,20 +5,20 @@ import LocalVmChatPanel from './LocalVmChatPanel.vue'
 import WorkspaceInspectorPanel from './WorkspaceInspectorPanel.vue'
 import WorkspaceRoutinesPanel from './WorkspaceRoutinesPanel.vue'
 import type {WorkspaceAgent} from '@shared/workspace'
-const props=defineProps<{agents:WorkspaceAgent[];conversationId:string;taskId?:string;group:boolean;isAdmin:boolean;active?:boolean;initialView?:'computer'|'routines'|'inspector'}>()
+const props=defineProps<{agents:WorkspaceAgent[];conversationId:string;taskId?:string;mode:'computer'|'inspector';isAdmin:boolean;active?:boolean}>()
 const emit=defineEmits<{close:[];changed:[];settings:[];desktop:[agent:WorkspaceAgent];workspace:[agent:WorkspaceAgent]}>()
-const view=ref<'computer'|'routines'|'inspector'>('computer')
-watch(()=>[props.conversationId,props.initialView],()=>{let saved;try{saved=localStorage.getItem('yaoyao-bot-panel:'+props.conversationId)}catch{}view.value=props.group?'inspector':props.initialView??(['computer','routines','inspector'].includes(saved??'')?saved as typeof view.value:'computer')},{immediate:true})
+const view=ref<'computer'|'routines'>('computer')
+watch(()=>props.conversationId,()=>{let saved;try{saved=localStorage.getItem('yaoyao-bot-panel:'+props.conversationId)}catch{}view.value=saved==='routines'?'routines':'computer'},{immediate:true})
 watch(view,value=>{try{localStorage.setItem('yaoyao-bot-panel:'+props.conversationId,value)}catch{}})
 </script>
 <template>
  <aside class="bot-panel" aria-label="机器人右侧栏">
-  <header><div class="tabs" role="group" aria-label="机器人侧栏项目"><button v-if="!group" :aria-pressed="view==='computer'" @click="view='computer'"><AppIcon name="monitor" :size="15"/>电脑</button><button v-if="!group" :aria-pressed="view==='routines'" @click="view='routines'"><AppIcon name="calendar" :size="15"/>定时任务</button><button :aria-pressed="view==='inspector'" @click="view='inspector'"><AppIcon name="bug" :size="15"/>Inspector</button></div><button aria-label="关闭机器人侧栏" @click="emit('close')"><AppIcon name="close"/></button></header>
-  <LocalVmChatPanel v-if="view==='computer'&&!group" embedded :agents="agents" :is-admin="isAdmin" :active="active" @changed="emit('changed')" @settings="emit('settings')" @desktop="emit('desktop',$event)" @workspace="emit('workspace',$event)"/>
-  <WorkspaceRoutinesPanel v-else-if="view==='routines'&&agents[0]&&!group" :agent-id="agents[0].id"/>
-  <WorkspaceInspectorPanel v-else :conversation-id="conversationId" :task-id="taskId"/>
+  <header v-if="mode==='computer'"><div class="tabs" role="group" aria-label="电脑与定时任务"><button :aria-pressed="view==='computer'" @click="view='computer'"><AppIcon name="monitor" :size="15"/>电脑</button><button :aria-pressed="view==='routines'" @click="view='routines'"><AppIcon name="calendar" :size="15"/>定时任务</button></div><button class="close" aria-label="关闭机器人侧栏" @click="emit('close')"><AppIcon name="close"/></button></header>
+  <WorkspaceInspectorPanel v-if="mode==='inspector'" show-close :conversation-id="conversationId" :task-id="taskId" @close="emit('close')"/>
+  <LocalVmChatPanel v-else-if="view==='computer'" embedded :agents="agents" :is-admin="isAdmin" :active="active" @changed="emit('changed')" @settings="emit('settings')" @desktop="emit('desktop',$event)" @workspace="emit('workspace',$event)"/>
+  <WorkspaceRoutinesPanel v-else-if="agents[0]" :agent-id="agents[0].id"/>
  </aside>
 </template>
 <style scoped>
-.bot-panel{width:420px;min-width:320px;max-width:46%;height:100%;border-left:1px solid var(--line);background:var(--surface);display:flex;flex-direction:column;color:var(--text-primary)}header{display:flex;align-items:center;justify-content:space-between;gap:8px;padding:10px 12px;border-bottom:1px solid var(--line)}.tabs{display:flex;flex-wrap:wrap;gap:2px}.tabs button{font-size:12px;padding:8px}.tabs button[aria-pressed=true]{background:var(--surface-soft);color:var(--text-primary);font-weight:600}button{font:inherit;display:inline-flex;align-items:center;justify-content:center;gap:5px;border:0;background:transparent;color:var(--text-secondary);border-radius:8px;min-width:44px;min-height:44px;cursor:pointer}button:focus-visible{outline:2px solid var(--accent);outline-offset:2px}@media(max-width:900px){.bot-panel{position:fixed;inset:0 0 0 auto;width:min(440px,100vw);max-width:100%;z-index:35;box-shadow:-20px 0 60px #0002}}:deep(.local-vm-chat-panel.embedded){width:100%;max-width:none;min-width:0;border:0;position:static;box-shadow:none;flex:1;min-height:0}:deep(.local-vm-chat-panel.embedded>header){display:none}
+.bot-panel{width:420px;min-width:320px;max-width:46%;height:100%;border-left:1px solid var(--line);background:var(--surface);display:flex;flex-direction:column;color:var(--text-primary)}header{position:relative;display:flex;align-items:center;justify-content:center;min-height:64px;padding:10px 58px;border-bottom:1px solid var(--line);box-sizing:border-box}.tabs{display:flex;flex-wrap:wrap;justify-content:center;gap:2px}.tabs button{font-size:12px;padding:8px}.tabs button[aria-pressed=true]{background:var(--surface-soft);color:var(--text-primary);font-weight:600}.close{position:absolute;right:12px}button{font:inherit;display:inline-flex;align-items:center;justify-content:center;gap:5px;border:0;background:transparent;color:var(--text-secondary);border-radius:8px;min-width:44px;min-height:44px;cursor:pointer}button:hover{background:var(--surface-hover);color:var(--text-primary)}button:focus-visible{outline:2px solid var(--accent);outline-offset:2px}@media(max-width:900px){.bot-panel{position:fixed;inset:0 0 0 auto;width:min(440px,100vw);max-width:100%;z-index:35;box-shadow:-20px 0 60px #0002}}:deep(.local-vm-chat-panel.embedded){width:100%;max-width:none;min-width:0;border:0;position:static;box-shadow:none;flex:1;min-height:0}:deep(.local-vm-chat-panel.embedded>header){display:none}
 </style>

Dosya farkı çok büyük olduğundan ihmal edildi
+ 3 - 2
src/client/components/workspace/WorkspaceInspectorPanel.vue


+ 21 - 3
src/client/components/workspace/viewModels.ts

@@ -425,14 +425,32 @@ export function workspaceAvatarState(conversation: import('@shared/workspace').W
   return conversation.activeRunStatus === 'waiting' || conversation.activeRunStatus === 'uncertain' ? 'waiting' : 'working'
 }
 
-export function workspaceConversationItem(c: import('@shared/workspace').WorkspaceConversation, agents: import('@shared/workspace').WorkspaceAgent[]): SidebarItem {
+type WorkspaceAgentActivity = 'working' | 'waiting' | 'loading'
+
+/** A Bot can be busy in several chats; one finished run must not hide another. */
+export function workspaceAgentActivity(conversations: import('@shared/workspace').WorkspaceConversation[]): Map<string, WorkspaceAgentActivity> {
+  const activity = new Map<string, WorkspaceAgentActivity>()
+  const priority = { working: 3, waiting: 2, loading: 1 }
+  for (const conversation of conversations) {
+    for (const id of conversation.memberIds) {
+      const state = workspaceAvatarState(conversation, id)
+      if (state !== 'working' && state !== 'waiting' && state !== 'loading') continue
+      const previous = activity.get(id)
+      if (!previous || priority[state] > priority[previous]) activity.set(id, state)
+    }
+  }
+  return activity
+}
+
+export function workspaceConversationItem(c: import('@shared/workspace').WorkspaceConversation, agents: import('@shared/workspace').WorkspaceAgent[], agentActivity?: ReadonlyMap<string, WorkspaceAgentActivity>): SidebarItem {
+  const activity = c.kind === 'direct' ? agentActivity?.get(c.memberIds[0] || '') : undefined
   return {
     id: c.id, title: c.name, subtitle: c.preview || '开始聊天', pinned: c.pinned,
     section: c.pinned ? '已置顶' : '聊天', avatar: c.kind === 'group' ? '' : c.avatar,
     avatarMembers: c.kind === 'group' ? workspaceAvatarMembers(c.memberIds, agents, c) : [],
     meta: formatConversationTime(c.lastMessageAt ?? c.createdAt),
     avatarKind: c.kind === 'direct' ? 'agent' : 'team',
-    avatarState: workspaceAvatarState(c, c.memberIds[0] || ''), avatarActivityKey: c.lastSeq,
-    unread: c.unreadCount ?? Math.max(0, c.lastSeq - c.readSeq), status: c.activeRunId ? 'working' : undefined,
+    avatarState: activity ?? workspaceAvatarState(c, c.memberIds[0] || ''), avatarActivityKey: c.lastSeq,
+    unread: c.unreadCount ?? Math.max(0, c.lastSeq - c.readSeq), status: activity || c.activeRunId ? 'working' : undefined,
   }
 }

+ 67 - 32
src/client/views/ConversationsView.vue

@@ -31,7 +31,7 @@ import TeamPresetPicker from '@/components/workspace/TeamPresetPicker.vue'
 import { TEAM_PRESETS, type TeamPreset } from '@/components/groups/teamPresets'
 import type { WorkspaceMemberRole } from '@shared/workspace'
 import AppIcon from '@/components/common/AppIcon.vue'
-import { workspaceAvatarMembers, workspaceAvatarState, workspaceConversationItem, workspaceMessagesToUi } from '@/components/workspace/viewModels'
+import { workspaceAgentActivity, workspaceAvatarMembers, workspaceAvatarState, workspaceConversationItem, workspaceMessagesToUi } from '@/components/workspace/viewModels'
 import { useAuthStore } from '@/stores/auth'
 import { useThemeStore } from '@/stores/theme'
 import { apiRequest, ApiError } from '@/api/client'
@@ -74,8 +74,9 @@ const text = ref(''),
 const identityBusy = ref(false),
   identityError = ref(''),
   identityResetVersion = ref(0)
+const agentActivity = computed(() => workspaceAgentActivity(conversations.value))
 const searchItems = computed<SidebarItem[]>(() => [false, true].map(archived => {
-  const items = conversations.value.filter(c => c.archived === archived).map(c => workspaceConversationItem(c, agents.value))
+  const items = conversations.value.filter(c => c.archived === archived).map(c => workspaceConversationItem(c, agents.value, agentActivity.value))
   return { id: archived ? 'archived' : 'unarchived', title: archived ? '已归档' : '未归档', children: items, emptyText: archived ? '没有已归档聊天' : '没有未归档聊天' }
 }))
 const archivedIds = computed(() => new Set(conversations.value.filter(c => c.archived).map(c => c.id)))
@@ -129,9 +130,11 @@ async function sendFromComposer(payload: ComposerSubmit) {
 }
 const dialog = ref<'agent' | 'group' | 'editAgent' | 'editGroup' | null>(null),
   editingId = ref(''),
+  editingConversationId = ref(''),
   scroller = ref<HTMLElement>(),
   fileInput = ref<HTMLInputElement>(),
   dialogElement = ref<HTMLDialogElement>()
+const editingConversation = computed(() => conversations.value.find(c => c.id === editingConversationId.value) ?? (active.value?.id === editingConversationId.value ? active.value : undefined))
 const remotePickerOpen=ref(false)
 const isRemoteAgent=computed(()=>dialog.value==='editAgent' && !!agents.value.find(a=>a.id===editingId.value)?.remoteAgentId)
 async function remoteAdded(agent:Agent){
@@ -191,7 +194,10 @@ let cursor = 0,
 const selected = computed(() => (typeof route.params.id === 'string' ? route.params.id : undefined))
 const selectedTask = computed(() => typeof route.query.taskId === 'string' ? route.query.taskId : '')
 const shell=ref<InstanceType<typeof WorkspaceShell>>(),vmWorkspace=ref<InstanceType<typeof LocalVmWorkspace>>(),desktopViewer=ref<InstanceType<typeof ComputerPanel>>()
-const computerOpen=ref(false),computerDockOpen=ref(false),twoDesktops=ref(false),desktopAgent=ref<Agent>()
+const computerOpen=ref(false),dockView=ref<'computer'|'inspector'>(),twoDesktops=ref(false),desktopAgent=ref<Agent>()
+const creatingTask=ref(false)
+const CREATE_TASK_VALUE='__create_task__'
+function toggleDock(view:'computer'|'inspector'){dockView.value=dockView.value===view?undefined:view}
 async function openComputer(agent:Agent){
   if(window.yaoyaoDesktop?.openComputer){try{await window.yaoyaoDesktop.openComputer(agent.id)}catch(cause){error.value=cause instanceof Error?cause.message:'无法打开电脑窗口'}return}
   desktopAgent.value=agent;computerOpen.value=true
@@ -320,6 +326,20 @@ async function markRead() {
   })
   read.readSeq = read.lastSeq
 }
+async function selectTask(event:Event){
+  const select=event.currentTarget as HTMLSelectElement,value=select.value
+  if(value!==CREATE_TASK_VALUE){await router.push({query:{...route.query,taskId:value}});return}
+  select.value=activeTask.value?.id??''
+  if(!active.value||active.value.kind!=='group'||creatingTask.value)return
+  const conversationId=active.value.id
+  creatingTask.value=true;error.value=''
+  try{
+    const result=await apiRequest<{task:WorkspaceTask}>(`/api/app/conversations/${conversationId}/tasks`,{method:'POST',body:{}})
+    if(active.value?.id!==conversationId)return
+    tasks.value=[result.task,...tasks.value.filter(task=>task.id!==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}
+}
 async function stopTask() {
   if (!active.value || !activeTask.value) return
   try {
@@ -374,10 +394,15 @@ async function select(id: string) {
   pendingRequestId = undefined
   await router.push(`/conversations/${id}`)
 }
-async function openDialog(kind: NonNullable<typeof dialog.value>) {
+function openConversationSettings(id: string) {
+  const conversation = conversations.value.find(c => c.id === id)
+  if (conversation) void openDialog(conversation.kind === 'direct' ? 'editAgent' : 'editGroup', conversation)
+}
+async function openDialog(kind: NonNullable<typeof dialog.value>, conversation = active.value) {
   error.value = ''
   dialog.value = kind
   editingId.value = ''
+  editingConversationId.value = kind === 'editAgent' || kind === 'editGroup' ? conversation?.id ?? '' : ''
   selectedPresetId.value = 'custom'
   Object.assign(form, {
     name: '',
@@ -400,8 +425,8 @@ async function openDialog(kind: NonNullable<typeof dialog.value>) {
       form.source = s.sources[0] ? JSON.stringify([s.sources[0].nodeId, s.sources[0].profile]) : ''
     }
     if (kind === 'editAgent') {
-      const a = members.value[0]
-      if (!a) return
+      const a = agents.value.find(a => a.id === conversation?.memberIds[0])
+      if (!a) throw new Error('机器人不存在,请刷新后重试')
       editingId.value = a.id
       Object.assign(form, a)
       form.source=JSON.stringify([a.nodeId,a.profile])
@@ -410,12 +435,12 @@ async function openDialog(kind: NonNullable<typeof dialog.value>) {
         if(remote)Object.assign(form,remote)
       }
     }
-    if (kind === 'editGroup' && active.value) {
-      editingId.value = active.value.id
-      Object.assign(form, active.value, {
-        memberIds: [...active.value.memberIds],
-        autoReplyIds: [...active.value.autoReplyIds],
-        memberRoles: Object.fromEntries(Object.entries(active.value.memberRoles ?? {}).map(([id, role]) => [id, { ...role }])),
+    if (kind === 'editGroup' && conversation) {
+      editingId.value = conversation.id
+      Object.assign(form, conversation, {
+        memberIds: [...conversation.memberIds],
+        autoReplyIds: [...conversation.autoReplyIds],
+        memberRoles: Object.fromEntries(Object.entries(conversation.memberRoles ?? {}).map(([id, role]) => [id, { ...role }])),
       })
     }
     await nextTick()
@@ -428,6 +453,7 @@ async function openDialog(kind: NonNullable<typeof dialog.value>) {
 function closeDialog() {
   dialogElement.value?.close()
   dialog.value = null
+  editingConversationId.value = ''
 }
 watch(
   () => form.memberIds.slice(),
@@ -594,9 +620,9 @@ async function changeLifecycle(operation: WorkspaceLifecycleAction, id: string,
   }
 }
 async function stopMember(id: string) {
-  if (!active.value) return
+  if (!editingConversation.value) return
   try {
-    await apiRequest(`/api/app/conversations/${active.value.id}/agents/${id}/stop`, { method: 'POST', body: {} })
+    await apiRequest(`/api/app/conversations/${editingConversation.value.id}/agents/${id}/stop`, { method: 'POST', body: {} })
     await load(); await refresh()
   } catch (cause) { error.value = cause instanceof Error ? cause.message : '停止失败' }
 }
@@ -653,6 +679,7 @@ watch([selected,selectedTask], () => {
   pendingRequestId = undefined;uploadedSources = [];uploadedReferences = []
   void load()
 })
+watch(selected,()=>{dockView.value=undefined})
 onMounted(async () => {
   void auth.refreshProfileAvatars().catch(() => undefined)
   try {
@@ -696,10 +723,10 @@ onBeforeUnmount(() => {
     @create-remote-agent="remotePickerOpen = true"
   >
     <template #sidebar
-      ><ConversationList :conversations="conversations" :agents="agents" :selected="selected" @select="select" @pin="action('pin', $event)" @archive="action('archive', $event)" @delete="changeLifecycle('delete', $event)"
+      ><ConversationList :conversations="conversations" :agents="agents" :selected="selected" @select="select" @settings="openConversationSettings" @pin="action('pin', $event)" @archive="action('archive', $event)" @delete="changeLifecycle('delete', $event)"
     /></template>
     <template #mobile-sidebar
-      ><ConversationList :conversations="conversations" :agents="agents" :selected="selected" @select="select" @pin="action('pin', $event)" @archive="action('archive', $event)" @delete="changeLifecycle('delete', $event)"
+      ><ConversationList :conversations="conversations" :agents="agents" :selected="selected" @select="select" @settings="openConversationSettings" @pin="action('pin', $event)" @archive="action('archive', $event)" @delete="changeLifecycle('delete', $event)"
     /></template>
     <div v-show="!twoDesktops" class="conversation-with-computer">
     <section class="workspace-chat" aria-label="聊天" @click.capture="openTaskLink">
@@ -719,24 +746,32 @@ onBeforeUnmount(() => {
         <template #header-leading><button v-if="active" class="workspace-list-back icon-button" aria-label="返回 Bot 列表" @click="router.push('/conversations')"><AppIcon name="chevron-left" /></button></template>
         <template #header-actions>
           <div v-if="active" class="header-actions">
-            <button type="button" class="icon-button" :aria-label="active.kind==='group'?'Inspector':'电脑与定时任务'" :title="active.kind==='group'?'Inspector':'电脑与定时任务'" @click="computerDockOpen=!computerDockOpen"><AppIcon :name="active.kind==='group'?'tools':'monitor'"/></button>
-            <select v-if="active.kind === 'group' && tasks.length" class="task-picker" aria-label="当前任务" :value="activeTask?.id" @change="router.push({query:{...route.query,taskId:($event.target as HTMLSelectElement).value}})">
-              <option v-for="task in tasks" :key="task.id" :value="task.id">{{ task.title }}</option>
-            </select>
+            <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">
+              <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>
+              <AppIcon name="chevron-down" :size="14"/>
+            </span>
             <button class="icon-button" aria-label="聊天设置" title="聊天设置" @click="openDialog(active.kind === 'direct' ? 'editAgent' : 'editGroup')"><AppIcon name="settings" /></button>
+            <button type="button" class="icon-button" aria-label="Inspector" title="Inspector" :aria-pressed="dockView==='inspector'" @click="toggleDock('inspector')"><AppIcon name="bug"/></button>
           </div>
         </template>
       </MessageTimeline>
       <p v-if="run?.status === 'queued'" class="task-queue-status" role="status">正在等待可用机器人</p>
-      <TaskPlan :goal="activeTask?.goal" :assignments="assignments" :agents="agents" @stop="stopTask" @resume="resumeTask" />
       <p v-if="error" class="error" role="alert">{{ error }}<button class="icon-button" @click="error = ''" aria-label="关闭错误"><AppIcon name="close" /></button></p>
       <ComposerShell v-if="active" :key="composerKey" ref="composer" mode="group" :draft-key="composerKey"
         :disabled="active.archived || loading || active.id !== selected" :sending="busy" stop-while-running :streaming="!!active.activeRunId"
         :tool-trace-visible="showThinking" :reference="reference" :context-used="Number(context?.usedTokens || 0)" :context-limit="Number(context?.limitTokens || 0)"
         :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>
+          <TaskPlan :goal="activeTask?.goal" :assignments="assignments" :agents="agents" @stop="stopTask" @resume="resumeTask" />
+        </template>
+      </ComposerShell>
     </section>
-    <WorkspaceBotPanel v-if="computerDockOpen&&active" :conversation-id="active.id" :task-id="activeTask?.id" :group="active.kind==='group'" :active="!twoDesktops" :agents="computerCandidates" :is-admin="auth.user?.role === 'admin'" @close="computerDockOpen=false" @changed="refresh()" @settings="shell?.openLocalVm()" @desktop="openComputer" @workspace="desktopAgent=$event;twoDesktops=true" />
+    <WorkspaceBotPanel v-if="dockView&&active" :conversation-id="active.id" :task-id="activeTask?.id" :mode="dockView" :active="!twoDesktops" :agents="computerCandidates" :is-admin="auth.user?.role === 'admin'" @close="dockView=undefined" @changed="refresh()" @settings="shell?.openLocalVm()" @desktop="openComputer" @workspace="desktopAgent=$event;twoDesktops=true" />
     </div>
     <ComputerPanel ref="desktopViewer" v-if="computerOpen&&desktopAgent" :agents="[desktopAgent]" auto-take @changed="load()" @close="computerOpen=false" />
     <LocalVmWorkspace ref="vmWorkspace" v-if="twoDesktops&&desktopAgent" :agents="agents.filter(a=>a.execution==='computer'&&!a.archived&&!a.computerEnvironmentId)" :primary="desktopAgent.id" @close="twoDesktops=false" />
@@ -755,11 +790,11 @@ onBeforeUnmount(() => {
     <PreviewModal v-if="preview" :item="preview" :items="media" @close="preview = null" />
     <ImagePreviewLightbox v-model="mediaIndex" :images="lightboxMedia" />
     <RemoteAgentPicker v-if="remotePickerOpen && !auth.isBotOnly" @close="remotePickerOpen = false" @added="remoteAdded" />
-    <Teleport to="body"><dialog v-if="dialog" ref="dialogElement" class="editor" @cancel.prevent="closeDialog">
+    <Teleport to="body"><dialog v-if="dialog" ref="dialogElement" class="editor" aria-labelledby="conversation-editor-title" @cancel.prevent="closeDialog">
       <form @submit.prevent="save">
         <header>
-          <h2>
-            {{ dialog === 'agent' ? '创建机器人' : dialog === 'group' ? '创建群聊' : '编辑资料' }}
+          <h2 id="conversation-editor-title">
+            {{ dialog === 'agent' ? '创建机器人' : dialog === 'group' ? '创建群聊' : dialog === 'editAgent' ? '机器人设置' : '群聊设置' }}
           </h2>
           <button type="button" aria-label="关闭" @click="closeDialog">×</button>
         </header>
@@ -769,7 +804,7 @@ onBeforeUnmount(() => {
         <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" />
         <div v-else-if="!isAgentDialog" class="team-avatar-settings">
-          <TeamAvatar :name="form.name" :members="workspaceAvatarMembers(form.memberIds, agents, dialog === 'editGroup' ? active : undefined)" :size="64" />
+          <TeamAvatar :name="form.name" :members="workspaceAvatarMembers(form.memberIds, agents, dialog === 'editGroup' ? editingConversation : undefined)" :size="64" />
           <small>群聊头像由成员头像自动组合,随成员头像更新。</small>
         </div>
         <label
@@ -819,20 +854,20 @@ onBeforeUnmount(() => {
           <legend>选择成员</legend>
           <label
             v-for="a in agents.filter((a) =>
-              !a.temporaryGoalId && (!a.archived || (dialog === 'editGroup' && active?.memberIds.includes(a.id))),
+              !a.temporaryGoalId && (!a.archived || (dialog === 'editGroup' && editingConversation?.memberIds.includes(a.id))),
             )"
             :key="a.id"
             ><input
               v-model="form.memberIds"
               type="checkbox"
               :value="a.id"
-              :disabled="busy || (dialog === 'editGroup' && (a.id === active?.administratorId || a.id === form.administratorId)) || (!form.memberIds.includes(a.id) && form.memberIds.length >= 8)"
+              :disabled="busy || (dialog === 'editGroup' && (a.id === editingConversation?.administratorId || a.id === form.administratorId)) || (!form.memberIds.includes(a.id) && form.memberIds.length >= 8)"
             />{{ a.name }}</label
           ><small v-if="dialog === 'group' && agents.filter((a) => !a.archived && !a.temporaryGoalId).length < 2"
             >至少需要两个机器人才能创建群聊。</small
           >
           <small v-if="dialog === 'editGroup'">可增减成员,最多 8 位。当前管理员不能移除;如需移除,请先更换管理员并保存。</small>
-          <button v-for="a in agents.filter(a => active?.activeAgentStates?.[a.id])" :key="`stop:${a.id}`" type="button" @click="stopMember(a.id)">停止 {{ a.name }}</button>
+          <button v-for="a in agents.filter(a => editingConversation?.activeAgentStates?.[a.id])" :key="`stop:${a.id}`" type="button" @click="stopMember(a.id)">停止 {{ a.name }}</button>
         </fieldset>
         <fieldset v-if="dialog === 'editGroup' && Object.keys(form.memberRoles).length">
           <legend>角色分工</legend>
@@ -915,9 +950,9 @@ onBeforeUnmount(() => {
   margin: 15px 0;
   font-size: 13px;
 }
-.task-picker { max-width:180px;min-height:36px;border:1px solid var(--line);border-radius:8px;background:var(--surface);color:var(--text-primary);padding:4px 8px;font:inherit }
+.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)}
-@media(max-width:720px){.task-picker{max-width:100px}}
+@media(max-width:720px){.task-picker-shell,.task-picker{max-width:118px}.task-picker{min-height:44px;padding-left:12px}}
 .team-management-permission > span {
   display: flex;
   align-items: center;

+ 4 - 4
src/runner/worker/gateway.ts

@@ -15,11 +15,11 @@ import {ComposeComputerProvider} from '../computers/compose.js'
 import {COMPOSE_DESKTOP_IMAGE,type DesktopRelay} from '../../shared/composeDesktops.js'
 import {ComputerControls} from './control.js'
 import {ComputerPublicProxy} from '../network/computerProxy.js'
-import {HermesWorkerProcess,type WorkerModel,type WorkerTool,type WorkerFrame} from './process.js'
+import {HermesWorkerProcess,type WorkerModel,type WorkerProxyEnvironment,type WorkerTool,type WorkerFrame} from './process.js'
 
 export interface ComputerTarget {environmentId:string;ownerKey:string;agentId:string}
 export interface WorkerSession {agentId?:string;id:string;profile:string;ownerKey:string;environmentId:string;cwd:string;configuredCwd:string;history:any[];outcome?:'complete'|'failed'|'uncertain'}
-interface Live {workMarker?:string;paused?:boolean;pauseJob?:Promise<ComputerLease>;segment?:number;toolCalls:Set<Promise<unknown>>;journal:Map<string,{name:string;result:unknown}>;proxy?:ComputerPublicProxy;session:WorkerSession;model:WorkerModel;lease:ComputerLease;controller:AbortController;worker?:HermesWorkerProcess;finishing?:Promise<void>;stopping?:Promise<void>;releasing?:Promise<void>;images:any[];running:boolean;received:boolean}
+interface Live {workMarker?:string;paused?:boolean;pauseJob?:Promise<ComputerLease>;segment?:number;toolCalls:Set<Promise<unknown>>;journal:Map<string,{name:string;result:unknown}>;proxy?:ComputerPublicProxy;session:WorkerSession;model:WorkerModel;proxyEnv?:WorkerProxyEnvironment;lease:ComputerLease;controller:AbortController;worker?:HermesWorkerProcess;finishing?:Promise<void>;stopping?:Promise<void>;releasing?:Promise<void>;images:any[];running:boolean;received:boolean}
 const object=(properties:Record<string,unknown>,required:string[])=>({type:'object',properties,required,additionalProperties:false})
 const text={type:'string'}
 const TOOLS:WorkerTool[]=[
@@ -141,7 +141,7 @@ export class ComputerGateway {
       await this.authorized()
       const controller=new AbortController(),lease=await this.runtime.pool.acquire(this.spec(session),this.workId,()=>{this.guard();if(controller.signal.aborted)throw new Error('cancelled')},controller.signal)
       if(this.closed){controller.abort();await this.runtime.pool.release(lease);throw new Error('电脑通道已关闭')}
-      this.live={session,lease,controller,model:resolved.model as WorkerModel,images:[],running:false,received:false,toolCalls:new Set(),journal:new Map()}
+      this.live={session,lease,controller,model:resolved.model as WorkerModel,proxyEnv:resolved.proxyEnv,images:[],running:false,received:false,toolCalls:new Set(),journal:new Map()}
       this.runtime.save(session);this.runtime.gateways.set(this.meta.environmentId,this)
       if(this.runtime.config.network==='public-proxy'){
         const live=this.live
@@ -188,7 +188,7 @@ export class ComputerGateway {
       live.received=false;live.running=true;live.session.outcome='uncertain';live.session.history.push({role:'user',content:prompt});this.runtime.save(live.session)
       const directory=join(this.runtime.home,'workers',live.session.id,this.workId,String(live.segment=(live.segment??0)+1))
       await mkdir(directory,{recursive:true,mode:0o700})
-      const worker=new HermesWorkerProcess(this.runtime.config.python,this.runtime.script,{mode:'run',home:directory,hermesSource:this.runtime.config.hermesSource,model:live.model,sessionId:live.session.id,taskId:this.workId,cwd:live.session.cwd,network:this.runtime.config.network??'none',tools:[...TOOLS,...(this.team?.catalog??[])],prompt:live.images.length?[{type:'text',text:prompt},...live.images]:prompt,history})
+      const worker=new HermesWorkerProcess(this.runtime.config.python,this.runtime.script,{mode:'run',home:directory,hermesSource:this.runtime.config.hermesSource,model:live.model,proxyEnv:live.proxyEnv,sessionId:live.session.id,taskId:this.workId,cwd:live.session.cwd,network:this.runtime.config.network??'none',tools:[...TOOLS,...(this.team?.catalog??[])],prompt:live.images.length?[{type:'text',text:prompt},...live.images]:prompt,history})
       live.worker=worker
       this.runtime.workers.set(this.workId,{environmentId:this.meta.environmentId,ownerKey:this.meta.ownerKey,process:worker});void worker.exited.then(()=>{if(this.runtime.workers.get(this.workId)?.process===worker)this.runtime.workers.delete(this.workId)})
       worker.onTool=(name,args,id,callId)=>{

+ 13 - 5
src/runner/worker/hermes_worker.py

@@ -18,6 +18,8 @@ WIRE = sys.stdout
 WRITE_LOCK = threading.Lock()
 BOOT = json.loads(sys.stdin.readline())
 NONCE = BOOT["nonce"]
+PROXY_ENV_KEYS = ("HTTP_PROXY", "HTTPS_PROXY", "ALL_PROXY", "NO_PROXY",
+                  "http_proxy", "https_proxy", "all_proxy", "no_proxy")
 
 def emit(kind, **values):
     with WRITE_LOCK:
@@ -42,14 +44,19 @@ def load_profile():
     os.environ["HERMES_HOME"] = str(home)
     sys.path.insert(0, str(source))
     from dotenv import dotenv_values
-    for key, value in dotenv_values(home / ".env").items():
+    profile_env = dotenv_values(home / ".env")
+    for key, value in profile_env.items():
         if value is not None:
             os.environ[key] = value
+    # Capture only this Profile's values, before Hermes imports can load any
+    # fallback environment. Preserve case and explicit empty values for its SDK.
+    proxy_env = {key: profile_env[key] for key in PROXY_ENV_KEYS
+                 if isinstance(profile_env.get(key), str)}
     from hermes_constants import set_hermes_home_override
     set_hermes_home_override(str(home))
     from hermes_cli.config import load_config_readonly
     try:
-        return load_config_readonly()
+        return load_config_readonly(), proxy_env
     except Exception:
         raise ConfigurationError("computer_profile_config_invalid") from None
 
@@ -75,7 +82,7 @@ def resolve_workspace(config):
 
 
 def resolve_model():
-    config = load_profile()
+    config, proxy_env = load_profile()
     workspace = resolve_workspace(config)
     model = config.get("model", {})
     if not isinstance(model, dict) or not model.get("default"):
@@ -87,7 +94,8 @@ def resolve_model():
         raise ConfigurationError("computer_model_unavailable") from None
     if runtime.get("api_mode") not in ("chat_completions", "anthropic_messages", "codex_responses"):
         raise ConfigurationError("computer_model_unsupported")
-    emit("resolved", model={key: runtime[key] for key in ("provider", "api_mode", "base_url", "api_key") if key in runtime} | {"model": model["default"]}, **workspace)
+    emit("resolved", model={key: runtime[key] for key in ("provider", "api_mode", "base_url", "api_key") if key in runtime} | {"model": model["default"]}, **workspace,
+         **({"proxyEnv": proxy_env} if proxy_env else {}))
 
 
 def run_model():
@@ -193,7 +201,7 @@ def run_model():
 try:
     with contextlib.redirect_stdout(sys.stderr):
         if BOOT.get("mode") == "resolve-workspace":
-            emit("resolved", **resolve_workspace(load_profile()))
+            emit("resolved", **resolve_workspace(load_profile()[0]))
         elif BOOT.get("mode") == "resolve":
             resolve_model()
         else:

+ 12 - 2
src/runner/worker/process.ts

@@ -5,6 +5,8 @@ import {HttpError} from '../../server/errors.js'
 
 export interface WorkerTool {id?:string;name:string;description:string;inputSchema:Record<string,unknown>}
 export interface WorkerModel {provider:string;api_mode:string;base_url?:string;api_key?:string;model:string}
+const proxyEnvKeys=['HTTP_PROXY','HTTPS_PROXY','ALL_PROXY','NO_PROXY','http_proxy','https_proxy','all_proxy','no_proxy'] as const
+export type WorkerProxyEnvironment=Partial<Record<typeof proxyEnvKeys[number],string>>
 export interface WorkerFrame {type:string;[key:string]:any}
 const configurationErrors:Record<string,string>={
   computer_profile_invalid:'基础 Profile 名称无效',
@@ -26,7 +28,15 @@ export class HermesWorkerProcess {
   onEvent:(frame:WorkerFrame)=>void=()=>{}
   onTool:(name:string,args:unknown,id:string,callId?:string)=>Promise<unknown>=async()=>{throw new Error('工具未授权')}
   constructor(python:string,script:string,input:Record<string,unknown>,onDiagnostic?:(text:string)=>void){
-    this.child=spawn(python,['-u',script],{stdio:'pipe',env:{PATH:process.env.PATH??'/usr/bin:/bin',HOME:homedir(),PYTHONNOUSERSITE:'1',PYTHONDONTWRITEBYTECODE:'1'}})
+    const {proxyEnv,...boot}=input
+    const env:NodeJS.ProcessEnv={PATH:process.env.PATH??'/usr/bin:/bin',HOME:homedir(),PYTHONNOUSERSITE:'1',PYTHONDONTWRITEBYTECODE:'1'}
+    // Only the selected Profile's proxy snapshot crosses this boundary. Never
+    // inherit the Runner's proxy settings, credentials or Python overrides.
+    if(proxyEnv&&typeof proxyEnv==='object'&&!Array.isArray(proxyEnv))for(const key of proxyEnvKeys){
+      const value=(proxyEnv as Record<string,unknown>)[key]
+      if(typeof value==='string')env[key]=value
+    }
+    this.child=spawn(python,['-u',script],{stdio:'pipe',env})
     if(onDiagnostic)this.child.stderr.on('data',chunk=>onDiagnostic(String(chunk)));else this.child.stderr.resume()
     this.exited=new Promise(resolve=>{
       const done=()=>{if(this.finished)return;this.finished=true;this.fail(new Error('Hermes Worker 已退出'));resolve()}
@@ -38,7 +48,7 @@ export class HermesWorkerProcess {
       for(;;){const end=this.output.indexOf('\n');if(end<0)break;const line=this.output.slice(0,end);this.output=this.output.slice(end+1);try{const frame=JSON.parse(line);if(frame.nonce===this.nonce)this.receive(frame)}catch{/* non-protocol output has no authority */}}
     })
     this.child.stdin.on('error',()=>{})
-    this.child.stdin.write(JSON.stringify({...input,nonce:this.nonce})+'\n')
+    this.child.stdin.write(JSON.stringify({...boot,nonce:this.nonce})+'\n')
   }
   private receive(frame:WorkerFrame){
     const waiting=this.waiters.get(frame.type)

+ 57 - 0
tests/client/conversationSettings.test.ts

@@ -0,0 +1,57 @@
+import { afterEach, expect, it, vi } from 'vitest'
+import { flushPromises, shallowMount, type VueWrapper } from '@vue/test-utils'
+import { shallowRef } from 'vue'
+import { createMemoryHistory, createRouter, matchedRouteKey } from 'vue-router'
+import ConversationsView from '@/views/ConversationsView.vue'
+import { apiRequest } from '@/api/client'
+import type { WorkspaceConversation } from '@shared/workspace'
+
+vi.mock('@/api/client', () => ({ apiRequest: vi.fn(), ApiError: class extends Error {} }))
+vi.mock('@/stores/auth', () => ({ useAuthStore: () => ({ user: { id: 'owner' }, profiles: [], refreshProfileAvatars: async () => {} }) }))
+vi.mock('@/stores/theme', () => ({ useThemeStore: () => ({}) }))
+
+const originalShowModal = HTMLDialogElement.prototype.showModal
+const originalClose = HTMLDialogElement.prototype.close
+let wrapper: VueWrapper | undefined
+afterEach(() => { wrapper?.unmount(); wrapper = undefined; vi.restoreAllMocks(); vi.mocked(apiRequest).mockReset(); HTMLDialogElement.prototype.showModal = originalShowModal; HTMLDialogElement.prototype.close = originalClose })
+
+it.each(['direct', 'group'] as const)('opens and saves the menu target %s while another chat is selected', async kind => {
+  const base: WorkspaceConversation = { id: 'current', kind: 'direct', name: '当前聊天', avatar: '', memberIds: ['current-bot'], instructions: '', administratorId: 'current-bot', mode: 'host', autoReplyIds: [], maxReplyRounds: 3, archived: false, pinned: false, readSeq: 0, lastSeq: 0, preview: '', createdAt: 1, updatedAt: 1 }
+  const target: WorkspaceConversation = { ...base, id: 'target', kind, name: '目标聊天', memberIds: ['target-bot', ...(kind === 'group' ? ['current-bot'] : [])], administratorId: 'target-bot', instructions: '目标规则', activeAgentStates: kind === 'group' ? { 'target-bot': 'running' } : {} }
+  const conversations = [base, target]
+  const agents = ['current-bot', 'target-bot'].map(id => ({ id, name: id === 'target-bot' ? '目标机器人' : '当前机器人', avatar: '', instructions: `${id}规则`, nodeId: 'local', profile: 'default', archived: false }))
+  vi.mocked(apiRequest).mockImplementation(async path => {
+    if (path === '/api/app/agents') return { agents } as never
+    if (path === '/api/app/agents/sources') return { sources: [{ nodeId: 'local', profile: 'default', name: '基础机器人' }] } as never
+    if (path === '/api/app/conversations') return { conversations, cursor: 1 } as never
+    if (path.startsWith('/api/app/events')) return { events: [], cursor: 1 } as never
+    const conversation = conversations.find(c => path === `/api/app/conversations/${c.id}`)
+    if (conversation) return { conversation, messages: [], runs: [], run: null, interactions: [], tasks: [] } as never
+    return {} as never
+  })
+  HTMLDialogElement.prototype.showModal = function () { this.open = true }
+  HTMLDialogElement.prototype.close = function () { this.open = false }
+  const router = createRouter({ history: createMemoryHistory(), routes: [{ path: '/conversations/:id?', component: { template: '<div />' } }] })
+  await router.push('/conversations/current'); await router.isReady()
+  wrapper = shallowMount(ConversationsView, { attachTo: document.body, global: {
+    provide: { [matchedRouteKey as symbol]: shallowRef(router.currentRoute.value.matched[0]) }, plugins: [router],
+    stubs: { WorkspaceShell: { template: '<div><slot name="sidebar" /><slot /></div>' }, Teleport: false },
+  } })
+  await flushPromises()
+  wrapper.findComponent({ name: 'ConversationList' }).vm.$emit('settings', 'target')
+  await flushPromises()
+  const dialog = document.querySelector<HTMLDialogElement>('dialog.editor')!
+  expect(dialog.open).toBe(true)
+  expect(dialog.querySelector('h2')?.textContent?.trim()).toBe(kind === 'direct' ? '机器人设置' : '群聊设置')
+  expect(dialog.querySelector<HTMLInputElement>('input[maxlength="100"]')?.value).toBe(kind === 'direct' ? '目标机器人' : '目标聊天')
+  expect(router.currentRoute.value.path).toBe('/conversations/current')
+  if (kind === 'group') {
+    expect(dialog.querySelector<HTMLInputElement>('input[value="target-bot"]')?.disabled).toBe(true)
+    const stop = [...dialog.querySelectorAll('button')].find(button => button.textContent === '停止 目标机器人')!
+    stop.click(); await flushPromises()
+    expect(apiRequest).toHaveBeenCalledWith('/api/app/conversations/target/agents/target-bot/stop', expect.objectContaining({ method: 'POST' }))
+  }
+  dialog.querySelector('form')!.dispatchEvent(new Event('submit', { bubbles: true, cancelable: true }))
+  await flushPromises()
+  expect(apiRequest).toHaveBeenCalledWith(kind === 'direct' ? '/api/app/agents/target-bot' : '/api/app/conversations/target', expect.objectContaining({ method: 'PATCH', body: expect.objectContaining({ name: kind === 'direct' ? '目标机器人' : '目标聊天' }) }))
+})

+ 58 - 0
tests/client/workspacePresentation.test.ts

@@ -17,7 +17,9 @@ describe('workspace chat uses the established presentation', () => {
 })
 
 import { mount } from '@vue/test-utils'
+import { nextTick } from 'vue'
 import ConversationList from '@/components/workspace/ConversationList.vue'
+import ResourceSidebar from '@/components/app/ResourceSidebar.vue'
 import TeamAvatar from '@/components/common/TeamAvatar.vue'
 import type { WorkspaceAgent, WorkspaceConversation } from '../../src/shared/workspace'
 
@@ -47,6 +49,42 @@ it('composes real member avatars and refreshes them without changing group membe
   wrapper.unmount()
 })
 
+it.each([
+  ['direct', '机器人设置'],
+  ['group', '群聊设置'],
+] as const)('opens settings for a %s conversation from its actions menu', async (kind, label) => {
+  const conversation: WorkspaceConversation = {
+    id: kind,
+    kind,
+    name: kind === 'direct' ? '机器人' : '群聊',
+    avatar: '',
+    memberIds: [],
+    instructions: '',
+    administratorId: '',
+    mode: 'host',
+    autoReplyIds: [],
+    maxReplyRounds: 1,
+    archived: false,
+    pinned: false,
+    readSeq: 0,
+    lastSeq: 0,
+    preview: '',
+    createdAt: 1,
+    updatedAt: 1,
+  }
+  const wrapper = mount(ConversationList, { attachTo: document.body, props: { conversations: [conversation] } })
+  wrapper.getComponent(ResourceSidebar).vm.$emit('more', conversation.id, new MouseEvent('click', { clientX: 100, clientY: 100 }))
+  await nextTick()
+  const menu = document.body.querySelector<HTMLElement>('[aria-label="聊天操作"]')!
+  const view = [...menu.querySelectorAll<HTMLButtonElement>('button')].find(button => button.textContent === label)!
+  view.click()
+  await nextTick()
+  expect(wrapper.emitted('settings')).toEqual([[conversation.id]])
+  expect(wrapper.emitted('select')).toBeUndefined()
+  expect(document.body.querySelector('[aria-label="聊天操作"]')).toBeNull()
+  wrapper.unmount()
+})
+
 
 it('keeps inline thinking in the process trace and its media out of the message body', () => {
   const messages = workspaceMessagesToUi([{
@@ -57,3 +95,23 @@ it('keeps inline thinking in the process trace and its media out of the message
   expect(messages[0].content).toBe('[报告](/tmp/report.pdf)')
   expect(messages[0].reasoning).toBe('![过程图](/tmp/process.png)')
 })
+
+
+it('keeps a Bot busy across group replies until its final active conversation finishes', async () => {
+  const base: WorkspaceConversation = { id: 'direct', kind: 'direct', name: 'Bot', avatar: '', memberIds: ['a'], instructions: '', administratorId: 'a', mode: 'host', autoReplyIds: [], maxReplyRounds: 1, archived: false, pinned: false, readSeq: 0, lastSeq: 0, preview: '', createdAt: 1, updatedAt: 1 }
+  const group: WorkspaceConversation = { ...base, id: 'group', kind: 'group', memberIds: ['a', 'b'], activeRunId: 'g-run', activeAgentStates: { a: 'running', b: 'waiting' } }
+  const other: WorkspaceConversation = { ...group, id: 'other', activeRunId: 'other-run', activeAgentStates: { a: 'waiting' } }
+  const wrapper = mount(ConversationList, { props: { conversations: [base, group, other, { ...base, id: 'unrelated', memberIds: ['unrelated'] }] } })
+  const bot = () => wrapper.get('[data-sidebar-id="direct"]')
+  expect(bot().find('.agent-avatar--working').exists()).toBe(true)
+  expect(bot().find('.presence--working').exists()).toBe(true)
+  expect(wrapper.get('[data-sidebar-id="unrelated"]').find('.agent-avatar--working').exists()).toBe(false)
+  await wrapper.setProps({ conversations: [base, { ...group, activeRunId: undefined, activeAgentStates: {}, avatarSignals: { a: { id: 'done', state: 'success', at: Date.now() } } }, other] })
+  expect(bot().find('.agent-avatar--waiting').exists()).toBe(true)
+  await wrapper.setProps({ conversations: [base, { ...other, activeAgentStates: { a: 'queued' } }] })
+  expect(bot().find('.agent-avatar--loading').exists()).toBe(true)
+  await wrapper.setProps({ conversations: [base] })
+  expect(bot().find('.agent-avatar--idle').exists()).toBe(true)
+  expect(bot().find('.presence--working').exists()).toBe(false)
+  wrapper.unmount()
+})

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

@@ -31,11 +31,15 @@ test('robot sidebar, source changes, requests, routines and group boundaries wor
  const panel=page.getByRole('complementary',{name:'机器人右侧栏'})
  await expect(panel.getByRole('tab',{name:'自动',exact:true})).toBeVisible()
  await expect(panel.getByRole('tab',{name:'云端 · Grok Bot',exact:true})).toBeVisible()
+ await expect(panel.getByRole('button',{name:'电脑',exact:true})).toHaveAttribute('aria-pressed','true')
+ await expect(panel.locator(':scope > header .tabs')).toHaveCSS('justify-content','center')
  await page.screenshot({path:evidence+'/desktop-computer.png'})
- await panel.getByRole('button',{name:'Inspector',exact:true}).click()
+ await page.getByRole('button',{name:'Inspector',exact:true}).click()
+ await expect(panel.locator(':scope > header')).toHaveCount(0)
  await panel.getByRole('button',{name:'Raw',exact:true}).click()
  await expect(panel.locator('summary').filter({hasText:'prompt.submit'}).first()).toBeVisible()
  await page.screenshot({path:evidence+'/desktop-inspector.png'})
+ await page.getByRole('button',{name:'电脑与定时任务',exact:true}).click()
  await panel.getByRole('button',{name:'定时任务',exact:true}).click()
  await panel.getByRole('button',{name:'新建定时任务',exact:true}).click()
  const routineEditor=page.getByRole('dialog',{name:'新建定时任务',exact:true})
@@ -60,11 +64,31 @@ test('robot sidebar, source changes, requests, routines and group boundaries wor
  const group=(await response.json()).conversation
  await page.goto('/conversations/'+group.id)
  await expect(page.getByRole('button',{name:'电脑与定时任务',exact:true})).toHaveCount(0)
+ const taskPicker=page.getByRole('combobox',{name:'当前任务',exact:true})
+ const optionCount=await taskPicker.locator('option').count()
+ await taskPicker.selectOption('__create_task__')
+ await expect(page).toHaveURL(/taskId=/)
+ await expect(page.getByRole('combobox',{name:'当前任务',exact:true}).locator('option')).toHaveCount(optionCount+1)
+ await page.screenshot({path:evidence+'/desktop-group-task-picker.png'})
+ 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'}})
+  expect(created.ok(),await created.text()).toBe(true)
+ }
+ await page.reload()
+ const agentList=page.locator('.desktop-sidebar .sidebar-list')
+ await expect.poll(()=>agentList.evaluate(element=>element.scrollHeight-element.clientHeight)).toBeGreaterThan(0)
+ await agentList.evaluate(element=>{element.scrollTop=element.scrollHeight})
+ await expect.poll(()=>agentList.evaluate(element=>element.scrollTop)).toBeGreaterThan(0)
+ await expect(agentList).toHaveCSS('overflow-y','auto')
+ expect(await agentList.evaluate(element=>getComputedStyle(element,'::-webkit-scrollbar-thumb').backgroundColor)).not.toBe('rgba(0, 0, 0, 0)')
+ await agentList.hover()
+ await page.screenshot({path:evidence+'/desktop-agent-list-scroll.png'})
  await page.getByRole('button',{name:'Inspector',exact:true}).click()
+ await expect(panel.locator(':scope > header')).toHaveCount(0)
  await expect(panel.getByRole('button',{name:'电脑',exact:true})).toHaveCount(0)
  await expect(panel.getByRole('button',{name:'定时任务',exact:true})).toHaveCount(0)
  await page.setViewportSize({width:375,height:812});await page.emulateMedia({colorScheme:'dark',reducedMotion:'reduce'})
  await page.screenshot({path:evidence+'/phone-group-inspector.png'})
  const box=await panel.boundingBox();expect(box!.width).toBeLessThanOrEqual(375)
- await expect(panel.getByRole('button',{name:'关闭机器人侧栏',exact:true})).toBeVisible()
+ await expect(panel.getByRole('button',{name:'关闭 Inspector',exact:true})).toBeVisible()
 })

+ 85 - 0
tests/live/workerProxy.live.test.ts

@@ -0,0 +1,85 @@
+// @vitest-environment node
+import {afterEach,expect,it,vi} from 'vitest'
+import {createServer,type IncomingMessage,type ServerResponse,type Server} from 'node:http'
+import {mkdtemp,mkdir,writeFile,rm} from 'node:fs/promises'
+import {tmpdir} from 'node:os'
+import {join,resolve} from 'node:path'
+import {randomUUID} from 'node:crypto'
+import {HermesWorkerProcess} from '../../src/runner/worker/process'
+
+afterEach(()=>vi.unstubAllEnvs())
+const enabled=!!process.env.YAOYAO_HERMES_PYTHON&&!!process.env.YAOYAO_HERMES_SOURCE
+const listen=(server:Server)=>new Promise<number>(resolve=>server.listen(0,'127.0.0.1',()=>resolve((server.address() as {port:number}).port)))
+const close=(server:Server)=>new Promise<void>(resolve=>{server.close(()=>resolve());server.closeAllConnections()})
+
+it.skipIf(!enabled).each(['uppercase','lowercase','no-proxy','unconfigured'] as const)('uses the actual Hermes loop with Profile proxy policy: %s',async mode=>{
+ const root=await mkdtemp(join(tmpdir(),'yaoyao-worker-proxy-live-')),hermesHome=join(root,'hermes'),workerHome=join(root,'worker')
+ const profile=mode==='uppercase'?'default':'writer',profileHome=profile==='default'?hermesHome:join(hermesHome,'profiles',profile)
+ await mkdir(profileHome,{recursive:true})
+ const proxyRequests:Array<{url:string;auth?:string}>=[],directRequests:string[]=[],modelRequests:any[]=[]
+ const reply=async(req:IncomingMessage,res:ServerResponse)=>{
+  const url=new URL(req.url!,'http://fixture')
+  if(req.method==='GET'&&url.pathname==='/v1/models'){
+   res.setHeader('Content-Type','application/json');res.end(JSON.stringify({data:[{id:'fixture-model',object:'model',context_length:65536}]}));return
+  }
+  if(req.method!=='POST'||url.pathname!=='/v1/chat/completions'){res.statusCode=404;res.end('{}');return}
+  let body='';for await(const chunk of req)body+=chunk
+  const input=JSON.parse(body);modelRequests.push(input)
+  if(req.headers.authorization!=='Bearer fixture-model-key'){res.statusCode=401;res.end('{}');return}
+  const message={role:'assistant',content:'代理链路已完成完整回复。'}
+  if(input.stream){
+   res.setHeader('Content-Type','text/event-stream')
+   res.end('data: '+JSON.stringify({id:'fixture-response',object:'chat.completion.chunk',model:'fixture-model',choices:[{index:0,delta:message,finish_reason:'stop'}]})+'\n\ndata: [DONE]\n\n')
+  }else{
+   res.setHeader('Content-Type','application/json')
+   res.end(JSON.stringify({id:'fixture-response',object:'chat.completion',model:'fixture-model',choices:[{index:0,message,finish_reason:'stop'}],usage:{prompt_tokens:10,completion_tokens:10,total_tokens:20}}))
+  }
+ }
+ // The HTTP proxy terminates a fixture-only origin. The .invalid name cannot
+ // resolve directly, so a successful model response proves proxy traversal.
+ const proxy=createServer((req,res)=>{
+  proxyRequests.push({url:req.url!,auth:req.headers['proxy-authorization']})
+  if(!req.url?.startsWith('http://worker-proxy.invalid/')){res.statusCode=502;res.end('{}');return}
+  void reply(req,res).catch(()=>{res.statusCode=500;res.end('{}')})
+ })
+ const direct=createServer((req,res)=>{directRequests.push(req.url!);void reply(req,res).catch(()=>{res.statusCode=500;res.end('{}')})})
+ const workers:HermesWorkerProcess[]=[]
+ let diagnostics=''
+ try{
+  const [proxyPort,directPort]=await Promise.all([listen(proxy),listen(direct)])
+  const proxyURL=`http://fixture-user:fixture-proxy-password@127.0.0.1:${proxyPort}`
+  const proxied=mode==='uppercase'||mode==='lowercase'
+  const baseURL=proxied?'http://worker-proxy.invalid/v1':`http://127.0.0.1:${directPort}/v1`
+  // A Runner-level proxy must neither override a Profile nor become a fallback.
+  for(const key of ['HTTP_PROXY','HTTPS_PROXY','ALL_PROXY','http_proxy','https_proxy','all_proxy'])vi.stubEnv(key,proxyURL)
+  for(const key of ['NO_PROXY','no_proxy'])vi.stubEnv(key,'')
+  await writeFile(join(profileHome,'config.yaml'),`model:\n  provider: custom\n  default: fixture-model\n  base_url: ${baseURL}\n  api_key: \${WORKER_FIXTURE_KEY}\n  api_mode: chat_completions\nterminal:\n  cwd: /home/cua/workspace\n`,{mode:0o600})
+  const proxyVars=mode==='uppercase'?`HTTP_PROXY=\${FIXTURE_PROXY_URL}\nHTTPS_PROXY=\${FIXTURE_PROXY_URL}\nNO_PROXY=\n`:mode==='lowercase'?`http_proxy=\${FIXTURE_PROXY_URL}\nhttps_proxy=\${FIXTURE_PROXY_URL}\nno_proxy=\n`:mode==='no-proxy'?`HTTP_PROXY=\${FIXTURE_PROXY_URL}\nHTTPS_PROXY=\${FIXTURE_PROXY_URL}\nNO_PROXY=127.0.0.1,localhost\n`:''
+  await writeFile(join(profileHome,'.env'),`WORKER_FIXTURE_KEY=fixture-model-key\nFIXTURE_PROXY_URL=${proxyURL}\nUNRELATED_SECRET=fixture-unrelated-secret\n${proxyVars}`,{mode:0o600})
+  const resolver=new HermesWorkerProcess(process.env.YAOYAO_HERMES_PYTHON!,resolve('src/runner/worker/hermes_worker.py'),{mode:'resolve',profile,hermesHome,hermesSource:process.env.YAOYAO_HERMES_SOURCE})
+  workers.push(resolver)
+  const resolved=await resolver.wait('resolved');await resolver.close()
+  expect(resolved.proxyEnv??{}).not.toHaveProperty('UNRELATED_SECRET')
+  expect(resolved.proxyEnv??{}).not.toHaveProperty('FIXTURE_PROXY_URL')
+  if(mode==='unconfigured')expect(resolved).not.toHaveProperty('proxyEnv')
+  const worker=new HermesWorkerProcess(process.env.YAOYAO_HERMES_PYTHON!,resolve('src/runner/worker/hermes_worker.py'),{diagnostic:true,mode:'run',home:workerHome,hermesSource:process.env.YAOYAO_HERMES_SOURCE,model:resolved.model,proxyEnv:resolved.proxyEnv,sessionId:randomUUID(),taskId:randomUUID(),cwd:resolved.cwd,tools:[],prompt:'返回测试回复。',history:[]},text=>{diagnostics+=text})
+  workers.push(worker)
+  const frames:unknown[]=[];worker.onEvent=frame=>frames.push(frame)
+  const complete=await worker.wait('complete',45000).catch(error=>{throw new Error(`${String(error)}\n${diagnostics}`)})
+  expect(complete).toMatchObject({text:'代理链路已完成完整回复。',completed:true})
+  expect(modelRequests.length).toBeGreaterThan(0)
+  if(proxied){
+   expect(proxyRequests.some(request=>request.url==='http://worker-proxy.invalid/v1/chat/completions')).toBe(true)
+   expect(proxyRequests.find(request=>request.url.endsWith('/chat/completions'))?.auth).toBe('Basic '+Buffer.from('fixture-user:fixture-proxy-password').toString('base64'))
+   expect(directRequests).toEqual([])
+  }else{
+   expect(directRequests).toContain('/v1/chat/completions')
+   expect(proxyRequests).toEqual([])
+  }
+  expect(JSON.stringify(frames)+diagnostics).not.toMatch(/fixture-proxy-password|fixture-unrelated-secret|proxyEnv/)
+ }finally{
+  await Promise.all(workers.map(worker=>worker.close()))
+  await Promise.all([close(proxy),close(direct)])
+  await rm(root,{recursive:true,force:true})
+ }
+},60000)

+ 74 - 0
tests/server/workerProxy.test.ts

@@ -0,0 +1,74 @@
+// @vitest-environment node
+import {expect,it,vi} from 'vitest'
+import {DatabaseSync} from 'node:sqlite'
+import {mkdtemp,writeFile,rm} from 'node:fs/promises'
+import {tmpdir} from 'node:os'
+import {join} from 'node:path'
+import {randomUUID} from 'node:crypto'
+import {ComputerGateway,ComputerRuntime} from '../../src/runner/worker/gateway'
+import type {WorkerProxyEnvironment} from '../../src/runner/worker/process'
+
+it('keeps proxy settings private, reuses them after takeover, and refreshes them when resuming a session',async()=>{
+ const home=await mkdtemp(join(tmpdir(),'yaoyao-worker-proxy-')),db=new DatabaseSync(':memory:'),script=join(home,'probe.py')
+ // Exercise the real Gateway, process launcher and lease lifecycle; replace
+ // only the model loop and the VM provider. The probe stays on the private pipe.
+ await writeFile(script,`import json,os,sys
+boot=json.loads(sys.stdin.readline())
+print(json.dumps({"nonce":boot["nonce"],"type":"probe","env":{k:v for k,v in os.environ.items() if k.lower().endswith("_proxy")},"boot":boot}),flush=True)
+for line in sys.stdin:
+    if json.loads(line).get("type")=="interrupt": break
+`)
+ 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:'sha256:'+'a'.repeat(64),python:'python3',hermesSource:home,hermesHome:home,network:'none'}},home,script)
+ const id=randomUUID(),meta={environmentId:id,agentId:id,ownerKey:'owner'},gateways:ComputerGateway[]=[],events:unknown[]=[]
+ const first={HTTPS_PROXY:'http://user:first-private-proxy@127.0.0.1:7890',NO_PROXY:'localhost'}
+ const second={https_proxy:'http://user:second-private-proxy@127.0.0.1:8890',no_proxy:'internal.test'}
+ let current:WorkerProxyEnvironment|undefined=first
+ const createGateway=()=>{
+  const gateway=new ComputerGateway(runtime,meta,randomUUID(),async()=>{},async()=>({}))
+  gateway.onEvent=frame=>events.push(frame);gateways.push(gateway);return gateway
+ }
+ const probe=(gateway:ComputerGateway)=>runtime.workers.get(gateway.workId)!.process.wait('probe',5000)
+ try{
+  await runtime.ready
+  const resolver=vi.spyOn(runtime,'resolve').mockImplementation(async()=>({type:'resolved',cwd:'/home/cua/workspace',configuredCwd:'.',model:{provider:'custom',api_mode:'chat_completions',model:'fixture'},...(current?{proxyEnv:{...current}}:{})}))
+  const state={id,containerId:'fixture',running:true,workspace:home,isolation:'container' as const}
+  const ensure=vi.spyOn(runtime.provider,'ensure').mockResolvedValue(state)
+  vi.spyOn(runtime.provider,'inspect').mockResolvedValue(state)
+  vi.spyOn(runtime.provider,'stop').mockResolvedValue();vi.spyOn(runtime.provider,'remove').mockResolvedValue()
+  const gateway=createGateway();await gateway.connect()
+  const created=await gateway.rpc('session.create',{profile:'default'})
+  await gateway.rpc('prompt.submit',{session_id:created.session_id,text:'first turn'})
+  expect((await probe(gateway)).env).toEqual(first)
+  current=second
+  await gateway.takeControl(randomUUID(),()=>{})
+  await gateway.giveBack('continue')
+  const continued=await probe(gateway)
+  expect(continued.env).toEqual(first)
+  expect(continued.boot.history).toContainEqual({role:'user',content:'first turn'})
+  expect(resolver).toHaveBeenCalledTimes(1)
+  await gateway.close()
+
+  const resumed=createGateway();await resumed.connect()
+  expect((await resumed.rpc('session.resume',{profile:'default',session_id:created.session_id})).session_id).toBe(created.session_id)
+  await resumed.rpc('prompt.submit',{session_id:created.session_id,text:'next turn'})
+  expect((await probe(resumed)).env).toEqual(second)
+  expect(resolver).toHaveBeenCalledTimes(2)
+  await resumed.close()
+
+  current=undefined
+  const direct=createGateway();await direct.connect()
+  await direct.rpc('session.resume',{profile:'default',session_id:created.session_id})
+  await direct.rpc('prompt.submit',{session_id:created.session_id,text:'direct turn'})
+  const frame=await probe(direct)
+  expect(frame.env).toEqual({})
+  expect(frame.boot.model).not.toHaveProperty('proxyEnv')
+  expect(frame.boot).not.toHaveProperty('proxyEnv')
+  expect(resolver).toHaveBeenCalledTimes(3)
+  const persisted=db.prepare('SELECT value FROM computer_sessions').all()
+  for(const value of [created,persisted,events,ensure.mock.calls])expect(JSON.stringify(value)).not.toMatch(/private-proxy|proxyEnv|HTTPS_PROXY|https_proxy/)
+ }finally{
+  await Promise.all(gateways.map(gateway=>gateway.close()))
+  await runtime.controls.close();await runtime.pool.close();db.close()
+  vi.restoreAllMocks();await rm(home,{recursive:true,force:true})
+ }
+})

+ 48 - 3
tests/server/workerResolution.test.ts

@@ -1,5 +1,5 @@
 // @vitest-environment node
-import {afterEach,beforeEach,expect,it} from 'vitest'
+import {afterEach,beforeEach,expect,it,vi} from 'vitest'
 import {mkdtemp,mkdir,writeFile,rm} from 'node:fs/promises'
 import {tmpdir,homedir} from 'node:os'
 import {join,resolve} from 'node:path'
@@ -12,12 +12,12 @@ beforeEach(async()=>{
  await mkdir(join(source,'hermes_cli'),{recursive:true});await mkdir(home)
  // Only replace the installed Hermes config/SDK boundary. Exercise the real
  // Python reader and Node protocol, including failures and secret filtering.
- await writeFile(join(source,'dotenv.py'),'def dotenv_values(path): return {}\n')
+ await writeFile(join(source,'dotenv.py'),'import json\ndef dotenv_values(path): return json.loads(path.read_text()) if path.exists() else {}\n')
  await writeFile(join(source,'hermes_constants.py'),'def set_hermes_home_override(path): pass\n')
  await writeFile(join(source,'hermes_cli','config.py'),'import os,json\nfrom pathlib import Path\ndef load_config_readonly(): return json.loads((Path(os.environ["HERMES_HOME"])/"config.yaml").read_text())\n')
  await writeFile(join(source,'hermes_cli','runtime_provider.py'),'raise RuntimeError("provider secret must never escape")\n')
 })
-afterEach(async()=>{await Promise.all(workers.splice(0).map(w=>w.close()));await rm(root,{recursive:true,force:true})})
+afterEach(async()=>{await Promise.all(workers.splice(0).map(w=>w.close()));vi.unstubAllEnvs();await rm(root,{recursive:true,force:true})})
 function read(mode='resolve-workspace',profile='default'){
  const worker=new HermesWorkerProcess('python3',resolve('src/runner/worker/hermes_worker.py'),{mode,profile,hermesSource:source,hermesHome:home})
  workers.push(worker);return worker.wait('resolved')
@@ -53,3 +53,48 @@ it('still requires a usable model for an Agent run and does not expose SDK detai
  await expect(read('resolve')).rejects.toMatchObject({code:'computer_model_unavailable'})
  try{await read('resolve')}catch(error){expect(String(error)).not.toContain('provider secret')}
 })
+
+it('resolves only each selected Profile proxy snapshot, preserving case and explicit empty values',async()=>{
+ const profiles={
+  default:{HTTP_PROXY:'http://user:proxy-secret@127.0.0.1:7890',HTTPS_PROXY:'http://127.0.0.1:7891',ALL_PROXY:'socks5://127.0.0.1:7892',NO_PROXY:'localhost,127.0.0.1,::1'},
+  writer:{http_proxy:'http://127.0.0.1:8890',https_proxy:'http://127.0.0.1:8891',all_proxy:'',no_proxy:'internal.test'},
+  direct:{},
+ }
+ vi.stubEnv('HTTPS_PROXY','http://runner-secret@127.0.0.1:9999')
+ // A provider import must not change the already captured Profile snapshot.
+ await writeFile(join(source,'hermes_cli','runtime_provider.py'),'import os\nos.environ["HTTPS_PROXY"]="http://fallback-secret@127.0.0.1:9998"\ndef resolve_runtime_provider(**kwargs): return {"provider":"custom","api_mode":"chat_completions","api_key":"model-private-key"}\n')
+ for(const [profile,proxyEnv] of Object.entries(profiles)){
+  const directory=profile==='default'?home:join(home,'profiles',profile)
+  await mkdir(directory,{recursive:true})
+  await writeFile(join(directory,'config.yaml'),JSON.stringify({model:{default:'fixture',provider:'custom'}}))
+  await writeFile(join(directory,'.env'),JSON.stringify({...proxyEnv,UNRELATED_SECRET:'profile-private-key',BARE_KEY:null}))
+ }
+ const frames=await Promise.all(Object.keys(profiles).map(profile=>read('resolve',profile)))
+ frames.forEach((frame,index)=>{
+  expect(frame.proxyEnv??{}).toEqual(Object.values(profiles)[index])
+  expect(frame.model).toEqual({provider:'custom',api_mode:'chat_completions',api_key:'model-private-key',model:'fixture'})
+  expect(JSON.stringify(frame)).not.toMatch(/profile-private-key|runner-secret|fallback-secret/)
+ })
+ expect(frames[2]).not.toHaveProperty('proxyEnv')
+ expect(await read('resolve-workspace')).not.toHaveProperty('proxyEnv')
+ await rm(join(home,'.env'))
+ expect(await read('resolve')).not.toHaveProperty('proxyEnv')
+})
+
+it('starts Python with only explicit proxy keys and never inherits Runner secrets or proxy variables',async()=>{
+ const proxyEnv={HTTP_PROXY:'http://user:proxy-secret@127.0.0.1:7890',HTTPS_PROXY:'',ALL_PROXY:'socks5://127.0.0.1:7891',NO_PROXY:'localhost,127.0.0.1',http_proxy:'',https_proxy:'http://127.0.0.1:7892',all_proxy:'',no_proxy:'internal.test'}
+ for(const key of Object.keys(proxyEnv))vi.stubEnv(key,'runner-private-proxy')
+ vi.stubEnv('WORKER_SECRET','runner-private-key')
+ const script=join(root,'environment.py')
+ await writeFile(script,'import os,sys,json\nboot=json.loads(sys.stdin.readline())\nprint(json.dumps({"nonce":boot["nonce"],"type":"resolved","env":dict(os.environ),"boot":boot}),flush=True)\n')
+ for(const configured of [proxyEnv,undefined]){
+  const worker=new HermesWorkerProcess('python3',script,{proxyEnv:configured?{...configured,WORKER_SECRET:'injected-private-key',PYTHONPATH:'/forbidden',HOME:'/forbidden',PATH:'/forbidden'}:undefined})
+  workers.push(worker)
+  const frame=await worker.wait('resolved')
+  for(const key of Object.keys(proxyEnv))expect(frame.env[key]).toBe(configured?.[key as keyof typeof proxyEnv])
+  expect(frame.env).toMatchObject({HOME:homedir(),PATH:process.env.PATH,PYTHONNOUSERSITE:'1',PYTHONDONTWRITEBYTECODE:'1'})
+  expect(frame.env).not.toHaveProperty('WORKER_SECRET')
+  expect(frame.env).not.toHaveProperty('PYTHONPATH')
+  expect(frame.boot).not.toHaveProperty('proxyEnv')
+ }
+})

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor