diff --git a/README.md b/README.md index c1301fd..47e495d 100644 --- a/README.md +++ b/README.md @@ -84,6 +84,7 @@ - 当前 `local-agent` 已新增 `Codex App Server` runner：boss-agent 默认打开 `codexAppServerEnabled`，通过 `codex app-server` stdio 接入 `conversation_reply / dispatch_execution`，也可灰度切到 `ws://127.0.0.1:` 或 `unix://PATH` 本机长驻 App Server；WebSocket/Unix WebSocket handshake 支持 `Authorization: Bearer `，优先用 `codexAppServerAuthTokenFile` 保存本地 token。失败时只在 turn 未启动前回退 `codex exec resume`，避免重复执行同一轮对话。设备 heartbeat 会单独上报 `codexAppServer` capability，并按 `codexAppServerDiscoveryTtlMs` 缓存 `model/list / skills/list / plugin/list / app/list / modelProvider/capabilities/read` 的能力摘要，供 APP/后台模型选择和治理页读取。2026-05-31 起，runner 会吸收 App Server 的 plan / diff / item / subagent 事件并归一到 Boss `execution_progress` 进度卡，执行中通过 `POST /api/v1/master-agent/tasks/[taskId]/progress` 实时刷新；后续已补 `approvals / warnings / fileChanges / threadStatus / realtime / modelRoute / tokenUsage / mcpServers / remoteControl / threadGoal / threadSettings / compaction / accountStatus / modelVerification / threadCollaboration / toolActivities / reasoningSummary / windowsSandbox` 等结构化摘要。Android 原生进度卡可显示线程状态、实时状态、线程配置、线程协作、工具活动、思考摘要、账号状态、运行状态、Windows 沙箱状态、安全提醒、审批状态和文件变更摘要，且不展示完整命令、diff、系统提示词、密钥、SDP、音频原始数据、raw realtime item、remote installationId、本地绝对路径或 Windows sandbox sourcePath。本机 `codex-cli 0.135.0-alpha.1` 协议快照已生成在 `docs/protocol-snapshots/codex-app-server/0.135.0-alpha.1/`。同日新增第一版 Inter-Thread Broker：任务携带源/目标 Codex 线程时可通过 `thread/read -> thread/inject_items -> turn/start` 完成受控线程协作；服务端新增 `POST /api/v1/projects/[projectId]/thread-collaboration` 作为 APP/后台可调用入口；任务携带 `targetCodexTurnId` 时 runner 会改用 `turn/steer` 干预活跃 turn。 - 当前 App Server heartbeat discovery 已扩展到 `experimentalFeature/list / collaborationMode/list / permissionProfile/list / mcpServerStatus/list`，设备详情页会展示“治理：实验特性 / 协作模式 / MCP / 权限”摘要；MCP 只保留服务名、工具数量、资源数量和认证状态，permission profile 只保留 id/description，不保存本地路径、resource URI、文件规则、token 或工具参数。 - 当前 App Server heartbeat discovery 已继续扩展到 `account/read / account/rateLimits/read / config/read / configRequirements/read / externalAgentConfig/detect`，设备详情页会展示账号、套餐、额度、App 配置、托管要求和外部 Agent 迁移候选摘要；该链路只保存计数、开关和状态，不保存邮箱、API key、完整 config、本地路径、迁移描述或外部 Agent 原始内容。 +- 当前 App Server heartbeat discovery 已新增 `thread/list / thread/loaded/list` 线程可见性摘要，设备详情页会展示线程总数、已加载线程、活跃线程和最新更新时间；metadata 只保留非归档线程的 `id / name / sourceKind / status / updatedAt / loaded` 轻量目录，不保存 cwd、本地路径、turn 内容、用户正文或内部 prompt。 - `GET http://127.0.0.1:4317/api/v1/skills` 正常，已返回本机扫描到的 Codex Skill - `POST http://127.0.0.1:4317/api/v1/heartbeat` 正常，且会顺带触发 `thread-context` 上报 - `local-agent` 当前每 5 秒轮询一次本机 Skill lifecycle 请求；默认打开 `skillLifecycleEnabled=true`。远程 `install` 或带 `sourceUrl` 的更新必须命中 `skillLifecycleAllowedSources` 或 `skillLifecycleTrustedSources`，为空时只允许既有本地 Skill 的 `update / rollback / uninstall / version_lock`；请求携带 `checksum / expectedChecksum` 时会校验 `manifest.json` 或 `SKILL.md` 的 sha256，失败会清理半安装目录或尽量恢复备份。卸载 / 更新 / 回滚前会在 `skillsDir/.boss-skill-backups` 保留备份，卸载仍限制在 `skillsDir` 目录内，版本锁写入 `.boss-skill-locks.json` diff --git a/docs/architecture/ai_handoff_index_cn.md b/docs/architecture/ai_handoff_index_cn.md index 7e13567..c9e22b5 100644 --- a/docs/architecture/ai_handoff_index_cn.md +++ b/docs/architecture/ai_handoff_index_cn.md @@ -153,7 +153,7 @@ - Web 和原生 Android 当前都已经接上“新设备导入草稿 -> 勾选 -> 决议预览 -> 应用导入”的前台页面；已绑定生产设备继续保留 heartbeat 自动导入链路 - 原生首页的刷新失败策略当前已改成按当前 tab 独立判错，不会再因为 `设备 / 设置 / OTA` 的旁路请求失败把会话页刷新一并判成失败 - 当前量产方向已经明确为“Boss 企业控制面 + 可插拔执行协议”：多租户、权限、审批、审计、备份、回退和 Skill 治理由 Boss 承担，Codex App Server / Codex MCP / Codex CLI / Computer Use / 业务系统 API 都作为 provider 接入；详见 `docs/architecture/enterprise_ai_ops_architecture_cn.md` -- 当前 Codex App Server 已完成十四批接入：boss-agent 默认开启 `local-agent/codex-app-server-runner.mjs` 作为 Codex 绑定入口，优先走 `codex app-server` stdio，也可灰度连接 `ws://127.0.0.1:` 或 `unix://PATH` 同机长驻 App Server；长驻连接支持 `Authorization: Bearer `，配置上优先使用 `codexAppServerAuthTokenFile`。turn 启动前失败才回退 CLI，turn 启动后不重复执行；桌面远程控制默认先走 `codex-computer-use`，失败后回退 `cua-driver-computer-use`。2026-05-31 已按本机 `codex-cli 0.135.0-alpha.1` 生成协议快照 `docs/protocol-snapshots/codex-app-server/0.135.0-alpha.1/`，并把 `turn/plan/updated`、`turn/diff/updated`、`item/started|completed`、`thread/started`、`item/*/requestApproval`、`item/autoApprovalReview/*`、`guardianWarning`、`serverRequest/resolved`、`item/fileChange/patchUpdated`、`thread/status/changed`、`thread/realtime/*`、`model/rerouted`、`thread/tokenUsage/updated`、`mcpServer/startupStatus/updated`、`remoteControl/status/changed`、`windowsSandbox/setupCompleted`、`thread/goal/*`、`thread/settings/updated`、`thread/compacted`、`account/updated`、`account/rateLimits/updated`、`model/verification`、`warning`、`configWarning`、`deprecationNotice`、`ThreadItem.collabToolCall`、`ThreadItem.contextCompaction`、`mcpToolCall`、`dynamicToolCall`、`webSearch`、`imageView`、`imageGeneration`、`hook/started|completed`、`enteredReviewMode`、`exitedReviewMode`、`commandExecution`、`ThreadItem.plan`、`ThreadItem.reasoning.summary` 归一到 Boss `execution_progress` 卡片；realtime 只保留状态、文本摘要和计数，运行状态只保留模型切换、上下文用量、MCP 状态、远控连接摘要和 Windows 沙箱准备状态，线程配置只保留目标、模型、审批、沙箱、协作模式和压缩状态，线程协作只保留工具名、状态、目标类型和智能体状态，工具活动只保留类型、名称、状态和安全摘要，图像生成只保留状态与安全文件名，钩子生命周期只保留事件名、处理器类型、状态、来源、执行模式和耗时，思考摘要只保留官方 summary 文本和状态，账号状态只保留认证方式、套餐、额度窗口、积分余额和模型校验摘要，不保存 SDP、音频原始数据、raw item、remote installationId、cwd、turnId、配置文件路径、collab 源/目标线程 ID、collab prompt、tool arguments/result/contentItems、web URL token、命令正文/输出、raw reasoning content、reasoning item id、imageGeneration revisedPrompt/result、hook sourcePath/statusMessage/entries、Windows sandbox sourcePath/samplePaths/本地绝对路径或未清洗密钥。heartbeat 已能缓存 `model/list / skills/list / plugin/list / app/list / modelProvider/capabilities/read / experimentalFeature/list / collaborationMode/list / permissionProfile/list / mcpServerStatus/list / account/read / account/rateLimits/read / config/read / configRequirements/read / externalAgentConfig/detect` 的能力摘要；同批已补 `turn/steer` 活跃 turn 干预和 `POST /api/v1/projects/[projectId]/thread-collaboration` 服务端线程协作排队入口。MCP、权限、账号、配置和外部 Agent discovery 只保留安全摘要，不保存 resource URI、权限文件规则、工具参数、邮箱、完整 config、本地路径、迁移描述或 token。 +- 当前 Codex App Server 已完成十五批接入：boss-agent 默认开启 `local-agent/codex-app-server-runner.mjs` 作为 Codex 绑定入口，优先走 `codex app-server` stdio，也可灰度连接 `ws://127.0.0.1:` 或 `unix://PATH` 同机长驻 App Server；长驻连接支持 `Authorization: Bearer `，配置上优先使用 `codexAppServerAuthTokenFile`。turn 启动前失败才回退 CLI，turn 启动后不重复执行；桌面远程控制默认先走 `codex-computer-use`，失败后回退 `cua-driver-computer-use`。2026-05-31 已按本机 `codex-cli 0.135.0-alpha.1` 生成协议快照 `docs/protocol-snapshots/codex-app-server/0.135.0-alpha.1/`，并把 `turn/plan/updated`、`turn/diff/updated`、`item/started|completed`、`thread/started`、`item/*/requestApproval`、`item/autoApprovalReview/*`、`guardianWarning`、`serverRequest/resolved`、`item/fileChange/patchUpdated`、`thread/status/changed`、`thread/realtime/*`、`model/rerouted`、`thread/tokenUsage/updated`、`mcpServer/startupStatus/updated`、`remoteControl/status/changed`、`windowsSandbox/setupCompleted`、`thread/goal/*`、`thread/settings/updated`、`thread/compacted`、`account/updated`、`account/rateLimits/updated`、`model/verification`、`warning`、`configWarning`、`deprecationNotice`、`ThreadItem.collabToolCall`、`ThreadItem.contextCompaction`、`mcpToolCall`、`dynamicToolCall`、`webSearch`、`imageView`、`imageGeneration`、`hook/started|completed`、`enteredReviewMode`、`exitedReviewMode`、`commandExecution`、`ThreadItem.plan`、`ThreadItem.reasoning.summary` 归一到 Boss `execution_progress` 卡片；realtime 只保留状态、文本摘要和计数，运行状态只保留模型切换、上下文用量、MCP 状态、远控连接摘要和 Windows 沙箱准备状态，线程配置只保留目标、模型、审批、沙箱、协作模式和压缩状态，线程协作只保留工具名、状态、目标类型和智能体状态，工具活动只保留类型、名称、状态和安全摘要，图像生成只保留状态与安全文件名，钩子生命周期只保留事件名、处理器类型、状态、来源、执行模式和耗时，思考摘要只保留官方 summary 文本和状态，账号状态只保留认证方式、套餐、额度窗口、积分余额和模型校验摘要，不保存 SDP、音频原始数据、raw item、remote installationId、cwd、turnId、配置文件路径、collab 源/目标线程 ID、collab prompt、tool arguments/result/contentItems、web URL token、命令正文/输出、raw reasoning content、reasoning item id、imageGeneration revisedPrompt/result、hook sourcePath/statusMessage/entries、Windows sandbox sourcePath/samplePaths/本地绝对路径或未清洗密钥。heartbeat 已能缓存 `model/list / skills/list / plugin/list / app/list / modelProvider/capabilities/read / experimentalFeature/list / collaborationMode/list / permissionProfile/list / mcpServerStatus/list / account/read / account/rateLimits/read / config/read / configRequirements/read / externalAgentConfig/detect / thread/list / thread/loaded/list` 的能力摘要；同批已补 `turn/steer` 活跃 turn 干预和 `POST /api/v1/projects/[projectId]/thread-collaboration` 服务端线程协作排队入口。MCP、权限、账号、配置、外部 Agent 和线程 discovery 只保留安全摘要，不保存 resource URI、权限文件规则、工具参数、邮箱、完整 config、本地路径、迁移描述、turn 内容、用户正文或 token。 - 当前 boss-agent 已支持 Mac OTA：`local-agent/boss-agent-ota-runner.mjs` 默认开启，每 5 分钟检查服务端最新包；状态页可手动检查或下载并安装，安装时保留原绑定配置，只更新版本号和本机 runtime 路径。最新验证版本为 `20260516221619`，已在 MacBook Air `macbook-air` 上确认 OTA 下载校验、暂存、覆盖安装后不会误切到默认 `config.cloud.json`。正式分发脚本已预留 Developer ID 公证路径：`BOSS_AGENT_NOTARIZE=1` 配合 notary profile 或 Apple ID 凭据。 - 当前量产治理已补设备撤权和任务可靠性底座：`revoke_device` 会清空设备 token、标记离线并阻断 heartbeat / 任务认领 / Skill 同步 / 日志上报 / boss-agent OTA；`MasterAgentTask` claim 会记录 attempt 和 lease，运行中任务可按租约重试，超过上限转 `timed_out`，用户或管理员可通过 cancel 接口转 `canceled` 且迟到 complete 不覆盖终态。 - 当前群聊 `dispatch_execution` 完成回写已补幂等，重复完成不会再向群聊重复追加结果 diff --git a/docs/architecture/api_and_service_inventory_cn.md b/docs/architecture/api_and_service_inventory_cn.md index 8a71ebd..25cfadb 100644 --- a/docs/architecture/api_and_service_inventory_cn.md +++ b/docs/architecture/api_and_service_inventory_cn.md @@ -120,6 +120,7 @@ - 当前新增 Codex App Server runner：`local-agent/codex-app-server-runner.mjs`。boss-agent 默认配置 `codexAppServerEnabled=true`，会接管 `conversation_reply / dispatch_execution`；它默认通过 stdio 启动 `codex app-server`，也支持 `codexAppServerTransport=ws + codexAppServerUrl=ws://127.0.0.1:` 或 `codexAppServerTransport=unix + codexAppServerUrl=unix:///absolute/path.sock` 连接同机长驻 App Server，bearer token 可通过 `codexAppServerAuthTokenFile` 读取并在握手时发送 `Authorization: Bearer `。runner 执行 `initialize -> thread/resume|thread/start -> turn/start|turn/steer`，并把 `item/agentMessage/delta` 或 `item/completed` 归一成 Boss 任务回复；当 App Server 对单个 JSON-RPC 请求返回 `-32001 / retry later` 时，runner 会做最多 3 次指数退避重试。turn 启动前失败可回退 CLI，turn 启动后失败不回退，避免重复执行。2026-05-31 起，runner 会把 `turn/plan/updated`、`turn/diff/updated`、`item/started|completed`、`thread/started` 归一成 `executionProgress.steps / branch / artifacts / agents`，把 `item/*/requestApproval`、`item/autoApprovalReview/*`、`guardianWarning`、`serverRequest/resolved`、`item/fileChange/patchUpdated` 归一成 `executionProgress.approvals / warnings / fileChanges`，把 `thread/status/changed`、`thread/realtime/started|transcript|outputAudio|itemAdded|error|closed` 归一成 `executionProgress.threadStatus / realtime`，把 `model/rerouted`、`thread/tokenUsage/updated`、`mcpServer/startupStatus/updated`、`remoteControl/status/changed` 归一成 `executionProgress.modelRoute / tokenUsage / mcpServers / remoteControl`，并把 `thread/goal/*`、`thread/settings/updated`、`thread/compacted`、`account/updated`、`account/rateLimits/updated`、`model/verification`、`warning`、`configWarning`、`deprecationNotice`、`ThreadItem.collabToolCall`、`ThreadItem.contextCompaction`、`mcpToolCall`、`dynamicToolCall`、`webSearch`、`imageView`、`imageGeneration`、`hook/started|completed`、`windowsSandbox/setupCompleted`、`enteredReviewMode`、`exitedReviewMode`、`commandExecution`、`ThreadItem.plan`、`ThreadItem.reasoning.summary` 归一成线程配置、账号状态、模型校验、安全提醒、线程协作、上下文压缩、工具活动、图片产物、钩子生命周期、Windows 沙箱准备状态、计划步骤和思考摘要；服务端 complete 回写会与本地 Git/GitHub 进度合并，且不保存 SDP、音频 base64、raw realtime item、remote installationId、cwd、turnId、配置路径、collab 源/目标线程 ID、collab prompt、tool arguments/result/contentItems、web URL token、命令正文/输出、raw reasoning content、reasoning item id、imageGeneration revisedPrompt/result、hook sourcePath/statusMessage/entries、Windows sandbox sourcePath/samplePaths/本地绝对路径或未清洗的 MCP 错误。heartbeat 同时支持按 TTL 拉取 `model/list / skills/list / plugin/list / app/list / modelProvider/capabilities/read`，并把摘要保存在 `capabilities.codexAppServer.metadata`。 - App Server heartbeat discovery 现在还会按 TTL 拉取 `experimentalFeature/list / collaborationMode/list / permissionProfile/list / mcpServerStatus/list`，写入 `capabilities.codexAppServer.metadata.experimentalFeatures / collaborationModes / permissionProfiles / mcpServers`。这些字段用于 APP/后台治理页展示 Codex 当前可用的实验特性、多 Agent/协作模式、权限 profile 和 MCP 服务健康；MCP 请求固定使用 `detail=toolsAndAuthOnly`，服务端状态里不保存 resource URI、工具参数、permission profile 文件规则、本地路径或密钥。 - App Server heartbeat discovery 现在还会按 TTL 拉取 `account/read / account/rateLimits/read / config/read / configRequirements/read / externalAgentConfig/detect`，写入 `capabilities.codexAppServer.metadata.accountSummary / rateLimitSummary / appConfigSummary / configRequirements / externalAgentMigration`。这些字段用于 APP/后台展示账号、额度、App 配置、企业托管要求和外部 Agent 迁移候选摘要；当前只做观测，不通过 Boss 远程写 `config.toml` 或执行外部 Agent 导入，且不保存邮箱、完整 config、API key、本地路径或迁移描述。 +- App Server heartbeat discovery 现在还会按 TTL 拉取 `thread/list / thread/loaded/list`，写入 `capabilities.codexAppServer.metadata.threadSummary`。该字段用于 APP/后台展示 Codex 当前可见线程数量、加载态、活跃态和非归档线程轻量目录；目录只保留 `id / name / sourceKind / status / updatedAt / loaded`，不保存 cwd、本地路径、turn 内容、用户正文或内部 prompt。 - 当前 Codex App Server runner 已新增第一版 Boss Inter-Thread Broker：任务携带 `intentCategory=thread_collaboration`、`sourceCodexThreadRef` 和 `targetCodexThreadRef` 时，会先 `thread/read` 源线程，再通过 `thread/inject_items` 向目标线程注入受控摘要，最后 `turn/start` 目标线程；服务端入口是 `POST /api/v1/projects/[projectId]/thread-collaboration`，负责权限、源/目标线程校验和任务排队。这不是假设官方线程 P2P，而是 Boss 自己做线程协作编排。 - 当前 boss-agent Mac OTA 已接入：`local-agent/boss-agent-ota-runner.mjs` 会用设备 token 调 Boss 服务端 `/api/v1/boss-agent/ota` 检查最新 Mac 运行包，`/api/v1/boss-agent/ota/apply` 会下载 `boss-agent-mac-latest.zip`、校验 sha256、暂存安装 wrapper，并拉起本机安装器；安装脚本会保留绑定配置并只更新版本号与本机 runtime 路径。安装器会优先沿用当前 LaunchAgent active config，并保留所有 `config*.json`，避免多电脑场景中误绑定到默认设备配置。当前最新验证包为 `20260516221619`；构建脚本支持 `BOSS_AGENT_NOTARIZE=1` 的 Developer ID 公证路径。 - 当前 `local-agent` 还新增了两条统一电脑控制 runtime： diff --git a/docs/architecture/codex_server_progress_card_cn.md b/docs/architecture/codex_server_progress_card_cn.md index 1357b71..1776a51 100644 --- a/docs/architecture/codex_server_progress_card_cn.md +++ b/docs/architecture/codex_server_progress_card_cn.md @@ -20,9 +20,9 @@ Boss 不能直接把 App Server 原始 Thread / Turn / Item 字段写进业务 2026-05-31 已继续把 `turn/plan/updated`、`turn/diff/updated`、`item/started|completed`、`thread/started` 这类协议事件归一化为 Boss `execution_progress` 的步骤、分支变更、产物和后台智能体。同日第二批补齐 `item/*/requestApproval`、`item/autoApprovalReview/*`、`guardianWarning`、`serverRequest/resolved` 和 `item/fileChange/patchUpdated` 的安全摘要映射，APP 只展示审批状态、风险提醒和文件路径，不展示完整命令、diff、系统提示词或密钥。第三批已把 `thread/status/changed` 与 `thread/realtime/*` 归一成 `executionProgress.threadStatus / realtime`，APP 只展示活跃/等待审批/等待用户输入、realtime 文本摘要、音频片段计数和关闭/错误原因；第四批已把 `model/rerouted`、`thread/tokenUsage/updated`、`mcpServer/startupStatus/updated` 和 `remoteControl/status/changed` 归一成 `executionProgress.modelRoute / tokenUsage / mcpServers / remoteControl`，用于 APP “运行状态”区块。 -2026-06-01 第五批已把 `thread/goal/updated|cleared`、`thread/settings/updated` 和 `thread/compacted` 归一成 `executionProgress.threadGoal / threadSettings / compaction`，用于 APP “线程配置”区块；第六批已把 `account/updated`、`account/rateLimits/updated`、`model/verification`、`warning`、`configWarning`、`deprecationNotice` 归一成 `executionProgress.accountStatus / modelVerification / warnings`；第七批已把官方 `ThreadItem.collabToolCall` 归一成 `executionProgress.threadCollaboration`，并按官方建议把新版 `ThreadItem.contextCompaction` 映射回 `executionProgress.compaction`；第八批已把 `mcpToolCall`、`dynamicToolCall`、`webSearch`、`imageView`、`enteredReviewMode`、`exitedReviewMode` 和 `commandExecution` 归一成 `executionProgress.toolActivities`；第九批已把官方 `ThreadItem.plan` 的最终 `item/completed` 文本映射为 `executionProgress.steps`，并把 `ThreadItem.reasoning.summary` 映射为 `executionProgress.reasoningSummary`；第十批已把 `ThreadItem.imageGeneration` 安全映射为 `executionProgress.toolActivities` 的图像生成活动和 `executionProgress.artifacts` 的图片产物；第十一批已把 `hook/started|completed` 安全映射为 `executionProgress.toolActivities` 的钩子活动，供 APP 以“钩子”轻卡展示企业治理和插件生命周期状态；第十二批已把 `windowsSandbox/setupCompleted` 安全映射为 `executionProgress.windowsSandbox`，供 APP 在“运行状态”里展示 Windows 沙箱准备状态、setup mode 和脱敏错误摘要；第十三批已把 heartbeat discovery 扩展到 `experimentalFeature/list`、`collaborationMode/list`、`permissionProfile/list` 和 `mcpServerStatus/list`，供设备详情、APP 和 PC 后台看到实验特性、协作模式、权限 Profile 与 MCP 服务摘要；第十四批已把 `account/read`、`account/rateLimits/read`、`config/read`、`configRequirements/read` 和 `externalAgentConfig/detect` 纳入 heartbeat discovery，用于展示账号、套餐、额度、App 配置、托管要求和外部 Agent 迁移候选摘要。 +2026-06-01 第五批已把 `thread/goal/updated|cleared`、`thread/settings/updated` 和 `thread/compacted` 归一成 `executionProgress.threadGoal / threadSettings / compaction`，用于 APP “线程配置”区块；第六批已把 `account/updated`、`account/rateLimits/updated`、`model/verification`、`warning`、`configWarning`、`deprecationNotice` 归一成 `executionProgress.accountStatus / modelVerification / warnings`；第七批已把官方 `ThreadItem.collabToolCall` 归一成 `executionProgress.threadCollaboration`，并按官方建议把新版 `ThreadItem.contextCompaction` 映射回 `executionProgress.compaction`；第八批已把 `mcpToolCall`、`dynamicToolCall`、`webSearch`、`imageView`、`enteredReviewMode`、`exitedReviewMode` 和 `commandExecution` 归一成 `executionProgress.toolActivities`；第九批已把官方 `ThreadItem.plan` 的最终 `item/completed` 文本映射为 `executionProgress.steps`，并把 `ThreadItem.reasoning.summary` 映射为 `executionProgress.reasoningSummary`；第十批已把 `ThreadItem.imageGeneration` 安全映射为 `executionProgress.toolActivities` 的图像生成活动和 `executionProgress.artifacts` 的图片产物；第十一批已把 `hook/started|completed` 安全映射为 `executionProgress.toolActivities` 的钩子活动，供 APP 以“钩子”轻卡展示企业治理和插件生命周期状态；第十二批已把 `windowsSandbox/setupCompleted` 安全映射为 `executionProgress.windowsSandbox`，供 APP 在“运行状态”里展示 Windows 沙箱准备状态、setup mode 和脱敏错误摘要；第十三批已把 heartbeat discovery 扩展到 `experimentalFeature/list`、`collaborationMode/list`、`permissionProfile/list` 和 `mcpServerStatus/list`，供设备详情、APP 和 PC 后台看到实验特性、协作模式、权限 Profile 与 MCP 服务摘要；第十四批已把 `account/read`、`account/rateLimits/read`、`config/read`、`configRequirements/read` 和 `externalAgentConfig/detect` 纳入 heartbeat discovery，用于展示账号、套餐、额度、App 配置、托管要求和外部 Agent 迁移候选摘要；第十五批已把 `thread/list` 和 `thread/loaded/list` 纳入 heartbeat discovery，用于展示线程总数、已加载线程、活跃线程、归档线程和非归档可见线程轻量目录。 -`thread/realtime/sdp`、音频 base64、原始 realtime item、remote installationId、thread settings 的 `cwd`、compaction `turnId`、collaboration settings 内部 prompt、collabToolCall 源/目标线程 ID、tool arguments/result/contentItems、web URL token、命令正文/输出、raw reasoning `content`、reasoning item id、imageGeneration 原始 result/revisedPrompt、hook id/sourcePath/statusMessage/entries、Windows sandbox sourcePath/samplePaths、本地绝对路径、permission profile 文件规则、MCP resource URI、账号邮箱、API key、完整 config、外部 Agent 迁移描述和未清洗的 MCP 错误不入账。 +`thread/realtime/sdp`、音频 base64、原始 realtime item、remote installationId、thread settings 的 `cwd`、compaction `turnId`、collaboration settings 内部 prompt、collabToolCall 源/目标线程 ID、tool arguments/result/contentItems、web URL token、命令正文/输出、raw reasoning `content`、reasoning item id、imageGeneration 原始 result/revisedPrompt、hook id/sourcePath/statusMessage/entries、Windows sandbox sourcePath/samplePaths、本地绝对路径、permission profile 文件规则、MCP resource URI、账号邮箱、API key、完整 config、外部 Agent 迁移描述、turn 内容、用户正文和未清洗的 MCP 错误不入账。 官方文档入口：`https://developers.openai.com/codex/app-server` @@ -44,7 +44,7 @@ Boss 不能直接把 App Server 原始 Thread / Turn / Item 字段写进业务 - 本机协议快照已生成到 `docs/protocol-snapshots/codex-app-server/0.135.0-alpha.1/`，共识别 137 个协议方法；确认支持 `thread/inject_items`、`thread/rollback`、`thread/goal/*`、`turn/steer`、`command/exec`、`thread/realtime/*`、`account/*`、`model/verification`、`configWarning`、`deprecationNotice`、`model/list` - Boss 当前默认仍以 `stdio` 作为本机 agent 接入方式；`ws://127.0.0.1:` 和 `unix://PATH` 本地长驻 transport 已可灰度接入，WebSocket/Unix WebSocket handshake 支持 `Authorization: Bearer `；非 loopback signed bearer/JWT、自动重连和健康探测仍保留为后续增强，不直接替换当前稳定链路 - 官方文档提示 WebSocket ingress 满载时会返回 JSON-RPC `-32001 / Server overloaded; retry later.`；Boss runner 已对该错误做最多 3 次指数退避重试，避免长驻连接瞬时拥塞直接把用户任务打失败 -- Boss heartbeat 已新增 App Server 能力发现缓存：按 `codexAppServerDiscoveryTtlMs` 拉取 `model/list`、`modelProvider/capabilities/read`、`skills/list`、`plugin/list`、`app/list`、`experimentalFeature/list`、`collaborationMode/list`、`permissionProfile/list`、`mcpServerStatus/list`、`account/read`、`account/rateLimits/read`、`config/read`、`configRequirements/read` 和 `externalAgentConfig/detect`，归一成设备 `capabilities.codexAppServer.metadata`；发现失败只记录 warn，不阻塞心跳。MCP discovery 使用 `detail=toolsAndAuthOnly`，账号和配置 discovery 只保留安全摘要，不保存邮箱、resource URI、工具参数、完整 config、本地路径或迁移描述。 +- Boss heartbeat 已新增 App Server 能力发现缓存：按 `codexAppServerDiscoveryTtlMs` 拉取 `model/list`、`modelProvider/capabilities/read`、`skills/list`、`plugin/list`、`app/list`、`experimentalFeature/list`、`collaborationMode/list`、`permissionProfile/list`、`mcpServerStatus/list`、`account/read`、`account/rateLimits/read`、`config/read`、`configRequirements/read`、`externalAgentConfig/detect`、`thread/list` 和 `thread/loaded/list`，归一成设备 `capabilities.codexAppServer.metadata`；发现失败只记录 warn，不阻塞心跳。MCP discovery 使用 `detail=toolsAndAuthOnly`，账号、配置和线程 discovery 只保留安全摘要，不保存邮箱、resource URI、工具参数、完整 config、本地路径、迁移描述、turn 内容或用户正文。 - Boss 第一批只用 App Server 做任务级 provider，不直接复用 ChatGPT Mobile 到 Codex App 的官方 relay；官方移动控制链路仍属于 ChatGPT App 与 Codex App 同账号/工作区之间的产品能力，不是第三方 Boss 可以稳定依赖的私有通道 下一轮再核对版本时，不要只看 npm 包版本号；必须同时读取 App Server schema / TypeScript 定义，并把 protocol snapshot 保存到 `docs/protocol-snapshots/codex-app-server//`。 diff --git a/docs/architecture/current_runtime_and_deploy_status_cn.md b/docs/architecture/current_runtime_and_deploy_status_cn.md index b3ca5de..cc1acd1 100644 --- a/docs/architecture/current_runtime_and_deploy_status_cn.md +++ b/docs/architecture/current_runtime_and_deploy_status_cn.md @@ -38,6 +38,7 @@ - 当前 Codex server 调研结论已记录在 `docs/architecture/codex_server_progress_card_cn.md`：长期优先方向更新为 `Codex App Server / Remote Control -> Inter-Thread Broker -> CodexMcpBackendAdapter -> codex exec resume` 的分层 provider 策略；当前 boss-agent 默认打开 `Codex App Server` runner 作为 Codex 绑定入口，Boss 仍保留 `codex exec resume` 兜底，并继续用 `execution_progress` 结构化进度卡作为 APP 可见执行态。本机 `codex-cli 0.135.0-alpha.1` 协议快照已生成到 `docs/protocol-snapshots/codex-app-server/0.135.0-alpha.1/`，确认支持 WebSocket auth、`thread/inject_items`、`turn/steer`、`thread/realtime/*`、`thread/goal/*`、`thread/settings/updated`、`thread/compacted`、`ThreadItem.contextCompaction`、`ThreadItem.collabToolCall`、`account/*`、`model/verification`、`configWarning`、`deprecationNotice`、`command/exec` 和 `model/list` - 当前 App Server 能力发现已新增治理摘要：local-agent 会在 heartbeat discovery 中拉取 `experimentalFeature/list / collaborationMode/list / permissionProfile/list / mcpServerStatus/list`，并把实验特性、协作模式、权限 Profile 与 MCP 服务状态写入设备 `codexAppServer.metadata`；设备详情页会显示“治理”摘要。该链路只保留安全摘要，不保存 MCP resource URI、permission profile 文件规则、本地路径、token 或工具参数。 - 当前 App Server 能力发现已新增账号与配置摘要：local-agent 会在 heartbeat discovery 中拉取 `account/read / account/rateLimits/read / config/read / configRequirements/read / externalAgentConfig/detect`，并把账号登录方式、套餐、额度使用率、App 配置计数、托管要求数量和外部 Agent 迁移候选数量写入设备 `codexAppServer.metadata`；设备详情页会显示“账号 / 配置”摘要。该链路只读不写，不保存账号邮箱、完整 config、API key、本地路径或迁移描述。 +- 当前 App Server 能力发现已新增线程可见性摘要：local-agent 会在 heartbeat discovery 中拉取 `thread/list / thread/loaded/list`，并把线程总数、已加载线程数、活跃线程数、归档线程数、最新更新时间和非归档线程轻量目录写入设备 `codexAppServer.metadata.threadSummary`；设备详情页会显示“线程”摘要。该链路不保存 cwd、本地路径、turn 内容、用户正文或内部 prompt。 - 当前量产 B+ 架构开发文档已新增：`docs/architecture/enterprise_ai_ops_architecture_cn.md`。该文档把 PPT 中的主 Agent / 业务 Agent / 老板端 / 经理端 / 员工端 / 治理层 / 系统层 / 设备层 / 执行层 / 接入层整理成后续产品架构约束，并明确数据库备份、业务回退、Codex 协议扩展和 Skill 治理方向；它是规划文档，不代表当前全部已落地 - 当前 `claw-code` 已以最小 `ClawBackendAdapter` 形式接入执行底座，但默认关闭；只有显式配置 `BOSS_CLAW_*` 且可用性探测通过时，`master-agent` 当前对话中才会出现并允许选择 `claw-runtime` - 当前已新增最小 `Telegram Gateway`：Boss 当前可直接暴露 Telegram webhook，把 Telegram 私聊或受控群聊文本桥接进 `master-agent` 或按群 / Topic 路由到指定 Boss 项目，并在主 Agent 异步任务完成后自动回推 Telegram；配置入口已接到 Web `/me/telegram` 和原生 Android `我的 > Telegram 接入` diff --git a/local-agent/codex-app-server-runner.mjs b/local-agent/codex-app-server-runner.mjs index ca55dd4..2808618 100644 --- a/local-agent/codex-app-server-runner.mjs +++ b/local-agent/codex-app-server-runner.mjs @@ -1349,6 +1349,67 @@ function normalizeDiscoveryExternalAgentMigration(result) { }; } +function extractDiscoveryThreadStatus(thread) { + const status = thread?.status && typeof thread.status === "object" ? thread.status : thread?.status; + return safeProgressText( + typeof status === "string" + ? status + : status?.type ?? status?.state ?? thread?.state ?? (thread?.archived ? "archived" : "unknown"), + 40, + ); +} + +function extractLoadedThreadIds(result) { + const candidates = [ + ...asArray(result?.threadIds), + ...asArray(result?.loadedThreadIds), + ...asArray(result?.data).map((item) => item?.id ?? item?.threadId ?? item), + ...asArray(result?.threads).map((item) => item?.id ?? item?.threadId ?? item), + ]; + return new Set(candidates.map((item) => trimToDefined(item)).filter(Boolean)); +} + +function normalizeDiscoveryThreadSummary(threadListResult, loadedListResult, limit) { + const loadedThreadIds = extractLoadedThreadIds(loadedListResult); + const rawThreads = asArray(threadListResult?.data).length > 0 + ? asArray(threadListResult?.data) + : asArray(threadListResult?.threads); + const threads = rawThreads + .map((thread) => { + const id = trimToDefined(thread?.id ?? thread?.threadId); + if (!id) return null; + const archived = Boolean(thread?.archived); + return { + id, + name: safeRuntimeDiagnosticText(thread?.name ?? thread?.title, 120) || id, + sourceKind: safeProgressText(thread?.sourceKind ?? thread?.source?.kind, 48) || "unknown", + status: extractDiscoveryThreadStatus(thread), + archived, + loaded: loadedThreadIds.has(id) || Boolean(thread?.loaded), + updatedAt: trimToDefined(thread?.updatedAt ?? thread?.lastUpdatedAt ?? thread?.createdAt) || "", + }; + }) + .filter(Boolean); + const sourceKinds = Array.from(new Set(threads.map((thread) => thread.sourceKind).filter(Boolean))).sort(); + const latestUpdatedAt = threads + .map((thread) => thread.updatedAt) + .filter(Boolean) + .sort() + .at(-1) || ""; + return { + threadCount: threads.length, + loadedThreadCount: threads.filter((thread) => thread.loaded).length, + activeThreadCount: threads.filter((thread) => /active|running|streaming/i.test(thread.status)).length, + archivedThreadCount: threads.filter((thread) => thread.archived).length, + latestUpdatedAt, + sourceKinds, + visibleThreads: threads + .filter((thread) => !thread.archived) + .sort((left, right) => String(right.updatedAt).localeCompare(String(left.updatedAt))) + .slice(0, limit), + }; +} + async function withCodexAppServerRpcSession(runnerConfig, callback) { const cwd = runnerConfig.cwd || process.cwd(); let closed = false; @@ -1470,6 +1531,8 @@ export async function discoverCodexAppServerCapabilities(runnerConfig) { configResult, configRequirementsResult, externalAgentConfigResult, + threadListResult, + loadedThreadsResult, ] = await Promise.all([ safeRequest(request, "model/list", { includeHidden: false, limit }), safeRequest(request, "modelProvider/capabilities/read", {}), @@ -1485,6 +1548,8 @@ export async function discoverCodexAppServerCapabilities(runnerConfig) { safeRequest(request, "config/read", { includeLayers: false }), safeRequest(request, "configRequirements/read"), safeRequest(request, "externalAgentConfig/detect", { includeHome: true, cwds: [cwd] }), + safeRequest(request, "thread/list", { cwd, limit }), + safeRequest(request, "thread/loaded/list", { limit }), ]); const models = asArray(modelResult?.data) @@ -1518,6 +1583,7 @@ export async function discoverCodexAppServerCapabilities(runnerConfig) { appConfigSummary: normalizeDiscoveryAppConfigSummary(configResult), configRequirements: normalizeDiscoveryConfigRequirements(configRequirementsResult), externalAgentMigration: normalizeDiscoveryExternalAgentMigration(externalAgentConfigResult), + threadSummary: normalizeDiscoveryThreadSummary(threadListResult, loadedThreadsResult, limit), errors: [ modelResult?.__bossError ? `model/list:${safeRuntimeDiagnosticText(modelResult.__bossError)}` : undefined, providerCapabilities?.__bossError @@ -1549,6 +1615,12 @@ export async function discoverCodexAppServerCapabilities(runnerConfig) { externalAgentConfigResult?.__bossError ? `externalAgentConfig/detect:${safeRuntimeDiagnosticText(externalAgentConfigResult.__bossError)}` : undefined, + threadListResult?.__bossError + ? `thread/list:${safeRuntimeDiagnosticText(threadListResult.__bossError)}` + : undefined, + loadedThreadsResult?.__bossError + ? `thread/loaded/list:${safeRuntimeDiagnosticText(loadedThreadsResult.__bossError)}` + : undefined, ].filter(Boolean), }; }); diff --git a/src/components/app-ui.tsx b/src/components/app-ui.tsx index 9fcb43a..a9a4928 100644 --- a/src/components/app-ui.tsx +++ b/src/components/app-ui.tsx @@ -84,6 +84,24 @@ function numberFromMetadata(value: unknown) { return Number.isFinite(numeric) ? Math.max(0, Math.round(numeric)) : 0; } +function minuteTimestampFromMetadata(value: unknown) { + const text = typeof value === "string" ? value.trim() : ""; + if (!text) return "未发现"; + const date = new Date(text); + if (Number.isNaN(date.getTime())) return text; + const parts = new Intl.DateTimeFormat("zh-CN", { + timeZone: "Asia/Shanghai", + year: "numeric", + month: "2-digit", + day: "2-digit", + hour: "2-digit", + minute: "2-digit", + hour12: false, + }).formatToParts(date); + const valueOf = (type: string) => parts.find((part) => part.type === type)?.value ?? ""; + return `${valueOf("year")}-${valueOf("month")}-${valueOf("day")} ${valueOf("hour")}:${valueOf("minute")}`; +} + export function buildDeviceWorkspaceDetailCards(workspace: DeviceWorkspaceView) { const selectedDevice = workspace.selectedDevice; const primaryPolicy = workspace.projectExecutionPolicies?.[0]; @@ -101,6 +119,7 @@ export function buildDeviceWorkspaceDetailCards(workspace: DeviceWorkspaceView) const codexAppConfigSummary = objectFromMetadata(codexAppServerMetadata.appConfigSummary); const codexConfigRequirements = objectFromMetadata(codexAppServerMetadata.configRequirements); const codexExternalAgentMigration = objectFromMetadata(codexAppServerMetadata.externalAgentMigration); + const codexThreadSummary = objectFromMetadata(codexAppServerMetadata.threadSummary); return { capabilities: { @@ -135,6 +154,11 @@ export function buildDeviceWorkspaceDetailCards(workspace: DeviceWorkspaceView) )} 个 · 托管要求 ${numberFromMetadata(codexConfigRequirements.requirementCount)} 个 · 外部迁移 ${numberFromMetadata( codexExternalAgentMigration.itemCount, )} 项`, + codexThreads: `线程：${numberFromMetadata(codexThreadSummary.threadCount)} 个 · 已加载 ${numberFromMetadata( + codexThreadSummary.loadedThreadCount, + )} 个 · 活跃 ${numberFromMetadata(codexThreadSummary.activeThreadCount)} 个 · 最新 ${minuteTimestampFromMetadata( + codexThreadSummary.latestUpdatedAt, + )}`, preferredExecutionMode: `默认执行模式：${ selectedDevice?.preferredExecutionMode === "gui" ? "GUI" @@ -775,6 +799,9 @@ export function DeviceEditorCard({
{detailCards.capabilities.items.codexConfig}
+
+ {detailCards.capabilities.items.codexThreads} +
{detailCards.capabilities.items.preferredExecutionMode}
diff --git a/tests/device-detail-capabilities-route.test.ts b/tests/device-detail-capabilities-route.test.ts index 243cfed..7bb4751 100644 --- a/tests/device-detail-capabilities-route.test.ts +++ b/tests/device-detail-capabilities-route.test.ts @@ -99,6 +99,25 @@ test("device detail exposes Codex App Server discovered model and extension summ projectItemCount: 2, itemTypes: ["AGENTS_MD", "MCP_SERVER_CONFIG", "SKILLS"], }, + threadSummary: { + threadCount: 3, + loadedThreadCount: 2, + activeThreadCount: 1, + archivedThreadCount: 1, + latestUpdatedAt: "2026-06-03T08:20:00.000Z", + sourceKinds: ["app", "cli"], + visibleThreads: [ + { + id: "thr-active", + name: "Boss App Server rollout", + sourceKind: "app", + status: "active", + archived: false, + loaded: true, + updatedAt: "2026-06-03T08:20:00.000Z", + }, + ], + }, }, }, }; @@ -113,6 +132,7 @@ test("device detail exposes Codex App Server discovered model and extension summ assert.equal(cards.capabilities.items.codexGovernance, "治理：实验特性 2 个 · 协作模式 2 个 · MCP 2 个 · 权限 1 个"); assert.equal(cards.capabilities.items.codexAccount, "账号：chatgpt · 套餐 pro · 额度 42%"); assert.equal(cards.capabilities.items.codexConfig, "配置：App 2 个 · 已启用 1 个 · 托管要求 2 个 · 外部迁移 3 项"); + assert.equal(cards.capabilities.items.codexThreads, "线程：3 个 · 已加载 2 个 · 活跃 1 个 · 最新 2026-06-03 16:20"); }); test("device detail exposes folder and project conflict skeleton from workspace policy", async () => { diff --git a/tests/device-heartbeat-capability-metadata.test.ts b/tests/device-heartbeat-capability-metadata.test.ts index 919c6b3..a513e02 100644 --- a/tests/device-heartbeat-capability-metadata.test.ts +++ b/tests/device-heartbeat-capability-metadata.test.ts @@ -68,6 +68,13 @@ test("device heartbeat preserves Codex App Server capability metadata", async () appConfigSummary: { appCount: 2, enabledAppCount: 1 }, configRequirements: { managed: true, requirementCount: 2, warningCount: 1 }, externalAgentMigration: { itemCount: 3, homeItemCount: 1, projectItemCount: 2 }, + threadSummary: { + threadCount: 3, + loadedThreadCount: 2, + activeThreadCount: 1, + latestUpdatedAt: "2026-06-03T08:20:00.000Z", + visibleThreads: [{ id: "thr-active", name: "Boss App Server rollout", loaded: true }], + }, }, }, }, @@ -106,4 +113,20 @@ test("device heartbeat preserves Codex App Server capability metadata", async () )?.itemCount, 3, ); + assert.equal( + ( + updatedDevice?.capabilities?.codexAppServer.metadata?.threadSummary as + | { threadCount?: number; visibleThreads?: Array<{ id?: string }> } + | undefined + )?.threadCount, + 3, + ); + assert.equal( + ( + updatedDevice?.capabilities?.codexAppServer.metadata?.threadSummary as + | { visibleThreads?: Array<{ id?: string }> } + | undefined + )?.visibleThreads?.[0]?.id, + "thr-active", + ); }); diff --git a/tests/fixtures/codex-app-server-runtime.mjs b/tests/fixtures/codex-app-server-runtime.mjs index e13d371..ba3ecfd 100644 --- a/tests/fixtures/codex-app-server-runtime.mjs +++ b/tests/fixtures/codex-app-server-runtime.mjs @@ -381,6 +381,56 @@ rl.on("line", (line) => { return; } + if (message.method === "thread/list") { + send({ + id: message.id, + result: { + data: [ + { + id: "thr-active", + name: "Boss App Server rollout", + sourceKind: "app", + archived: false, + updatedAt: "2026-06-03T08:20:00.000Z", + cwd: "/Users/kris/code/boss", + status: { type: "active", activeFlags: ["running"] }, + turns: [{ userInput: "secret user text should not leak" }], + }, + { + id: "thr-idle", + name: "AItoukui planning", + sourceKind: "cli", + archived: false, + updatedAt: "2026-06-03T07:00:00.000Z", + cwd: "/Users/kris/code/AItoukui", + status: { type: "idle" }, + }, + { + id: "thr-archived", + name: "Old private thread", + sourceKind: "app", + archived: true, + updatedAt: "2026-06-01T01:00:00.000Z", + cwd: "/Users/kris/private", + status: { type: "notLoaded" }, + }, + ], + nextCursor: null, + }, + }); + return; + } + + if (message.method === "thread/loaded/list") { + send({ + id: message.id, + result: { + threadIds: ["thr-active", "thr-idle"], + }, + }); + return; + } + if (message.method === "thread/resume") { send({ id: message.id, diff --git a/tests/local-agent-codex-app-server-runner.test.mjs b/tests/local-agent-codex-app-server-runner.test.mjs index 313dc0c..49f5e1f 100644 --- a/tests/local-agent-codex-app-server-runner.test.mjs +++ b/tests/local-agent-codex-app-server-runner.test.mjs @@ -63,6 +63,21 @@ test("codex app-server discovery includes governance and MCP summaries without l projectItemCount: 2, itemTypes: ["AGENTS_MD", "MCP_SERVER_CONFIG", "SKILLS"], }); + assert.equal(metadata.threadSummary.threadCount, 3); + assert.equal(metadata.threadSummary.loadedThreadCount, 2); + assert.equal(metadata.threadSummary.activeThreadCount, 1); + assert.equal(metadata.threadSummary.archivedThreadCount, 1); + assert.equal(metadata.threadSummary.latestUpdatedAt, "2026-06-03T08:20:00.000Z"); + assert.deepEqual(metadata.threadSummary.sourceKinds, ["app", "cli"]); + assert.deepEqual(metadata.threadSummary.visibleThreads[0], { + id: "thr-active", + name: "Boss App Server rollout", + sourceKind: "app", + status: "active", + archived: false, + loaded: true, + updatedAt: "2026-06-03T08:20:00.000Z", + }); const serialized = JSON.stringify(metadata); assert.equal(serialized.includes("sk-secret-should-not-leak"), false); @@ -73,6 +88,8 @@ test("codex app-server discovery includes governance and MCP summaries without l assert.equal(serialized.includes("private-user@example.com"), false); assert.equal(serialized.includes("CLAUDE.md"), false); assert.equal(serialized.includes("AGENTS.md"), false); + assert.equal(serialized.includes("secret user text should not leak"), false); + assert.equal(serialized.includes("Old private thread"), false); }); function encodeWsTextFrame(value) {