From dfa4d384e940ee9f7e2eec4af8a0059acac28a06 Mon Sep 17 00:00:00 2001 From: weichen Date: Thu, 1 Oct 2026 05:18:55 +0000 Subject: [PATCH 1/4] Record the task card for feature-full-agent-r1 --- .task/feature-full-agent-r1.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .task/feature-full-agent-r1.md diff --git a/.task/feature-full-agent-r1.md b/.task/feature-full-agent-r1.md new file mode 100644 index 00000000..f90fafa3 --- /dev/null +++ b/.task/feature-full-agent-r1.md @@ -0,0 +1,25 @@ +# feature/full-agent-r1 任务卡 + +任务主记录：；状态：进行中；owner：weichen + +## 基线与授权 + +- 权威仓：ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Agent-System-Dev.git；目标分支：main；R0（initial_base_sha）= 76b2fb35a99e0847fff832b4e14e5766ea474c4e +- 工作区：/home/weichen/projects/Agent-System-Dev-wt-feature-full-agent-r1（worktree）；分支：feature/full-agent-r1 +- 授权与交付终点：<本次允许的动作与终点；未授权事项写明> + +## 目标与非目标 + +<预期结果、受影响入口/模块/契约；明确不做什么。> + +## 同步记录 + +| 节点 | sync_base_sha | tested_head_sha | checked_at | +|---|---|---|---| +| 启动 | 76b2fb35a99e0847fff832b4e14e5766ea474c4e | 76b2fb35a99e0847fff832b4e14e5766ea474c4e | 2026-10-01T05:18:55Z | + +## 结果与验证（完成后填写） + +- 结果： +- 验证： +- 影响与剩余项： From c9221faedcf27ba917ac66e1882f979eb6de92bb Mon Sep 17 00:00:00 2001 From: weichen Date: Thu, 1 Oct 2026 06:08:51 +0000 Subject: [PATCH 2/4] Land the full-agent capability batch across agent-native, agent-squad, and backend Why: the settled direction requires a complete agent kernel (web search, code tooling, system tools, external tool calls, skills, prompts) fused with squad orchestration; the three sub-repos landed their batches and this bumps the gitlinks and records the task card. Evidence: Agent-Native PR #3 (go vet + go test 15 pkgs ok), Agent-Squad PR #3 (6 pkgs ok), Backend PR #35 (19 pkgs ok after rebasing onto the concurrently merged #34); Dev make test all green (core + backend 19 + frontend vitest 40 + ui vitest 68 + agent-command). Impact: deps/agent-native -> f9ab2ef, deps/agent-squad -> 9a402e4, modules/backend -> 87a3d0d; task card filled with per-PR evidence and remaining-item notes (sandbox honesty, injection surfaces, progressive enablement, deployment validation pending). Refs: .task/feature-full-agent-r1.md batches B1-B10. --- .task/feature-full-agent-r1.md | 32 ++++++++++++++++++++++++++++---- deps/agent-native | 2 +- deps/agent-squad | 2 +- modules/backend | 2 +- 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/.task/feature-full-agent-r1.md b/.task/feature-full-agent-r1.md index f90fafa3..bc7b213a 100644 --- a/.task/feature-full-agent-r1.md +++ b/.task/feature-full-agent-r1.md @@ -18,8 +18,32 @@ |---|---|---|---| | 启动 | 76b2fb35a99e0847fff832b4e14e5766ea474c4e | 76b2fb35a99e0847fff832b4e14e5766ea474c4e | 2026-10-01T05:18:55Z | -## 结果与验证（完成后填写） +## 结果与验证 -- 结果： -- 验证： -- 影响与剩余项： +- 结果（四个仓、四个 PR 全部合入）： + - **Agent-Native PR #3**（main=f9ab2ef，8 提交）：exec.Request v0.2（Model/ToolAllowlist/ + Skills/Budget/SessionScope/ExecutionID/Env）+ Registry.Restrict 策略层（含 mcp__x__* 命名空间 + 通配）；代码工具面（glob **/grep 正则+include+ignore_case/read 行范围/multi_edit 原子）； + run_command/run_python（解释器白名单、env 白名单、进程组 SIGKILL、64KB 截断、黑名单、 + 脚本落盘）；搜索接线（Options.Search）+ fetch_url（SSRF 逐跳硬边界、域名策略、HTML 剥离）； + MCP 客户端（stdio+Streamable HTTP、mcp__server__tool 桥接、不可信元数据上限、真实子进程 + 测试）；skills（SKILL.md 加载 + load_skill 渐进披露 + promptx 装配器）；会话 compaction/ + 元数据/崩溃半行容错；subagent 委派端口 + delegate_task；parity-matrix R15 重定基线。 + - **Agent-Squad PR #3**（main=9a402e4）：RoleSpec 贯通（Tools/Skills/标识进请求、BashPermission + 三态在工厂层执行、步骤重试共享截止预算）、RegisterAgentNativeFull(AgentNativeConfig)、 + leader 轮修平（OnEvent 桥 + 完整装配）、LLM 规划器派生 schema 扩展、角色级 HitlPolicy + 合并、HTTP API 支持 mode/leader_role/max_leader_turns。 + - **Backend PR #35**（main=87a3d0d，rebase 于并行合入的 #34 之上）：deps 提升至 f9ab2ef/ + 9a402e4；squadadapter AgentNativeOptions 钩子 + buildBackends（默认后端不变，渐进启用）； + app.go 从 settings.models.chat/tools.tavily.*/runtime.exec//skills 组装内核配置； + tools.InterpreterExecConfig 内核/产品共用解释器白名单。 + - **Dev 本 PR**：gitlink 三提升（agent-native/agent-squad/modules/backend）。 +- 验证：Agent-Native go vet+go test 15 包 ok；Agent-Squad 6 包 ok；Backend 19 包 ok + （rebase 后复跑）；Dev `make test` 组合全绿（core 1 + backend 19 + frontend vitest 40 + + ui vitest 68 + agent-command 2）。安全负例：SSRF 私网/元数据端点/重定向逐跳、执行工具 + 黑名单/超时杀组/取消杀组/env 隔离、MCP 不可达 fail-closed、技能未安装 fail-closed、 + allowlist 未知名 fail-closed、预算超限永久失败。 +- 影响与剩余项：run_command 不是 OS 沙箱（宿主隔离责任，文档声明）；技能正文与 MCP server + 描述属提示注入面（受信根+上限）；产品 squad 默认后端仍为 agent-system，角色显式声明 + Backend:"agent-native" 才走内核（parity 渐进启用条款，AB 扩面验收另行推进）；部署与 + 真人模型实测待所有者安排。 diff --git a/deps/agent-native b/deps/agent-native index 228daa3f..f9ab2ef6 160000 --- a/deps/agent-native +++ b/deps/agent-native @@ -1 +1 @@ -Subproject commit 228daa3ff5ec174752052c2a826d76571fb63a09 +Subproject commit f9ab2ef698ff253b8914a081e8651da65de3b38d diff --git a/deps/agent-squad b/deps/agent-squad index 1aa548ff..9a402e46 160000 --- a/deps/agent-squad +++ b/deps/agent-squad @@ -1 +1 @@ -Subproject commit 1aa548ff147876eb0e80413ee361213853a940b3 +Subproject commit 9a402e468ec758b0f7d5af952e57ebde9248925d diff --git a/modules/backend b/modules/backend index 2880b58b..87a3d0db 160000 --- a/modules/backend +++ b/modules/backend @@ -1 +1 @@ -Subproject commit 2880b58b7bd673e66aa7fcd7c08e2d24a964d608 +Subproject commit 87a3d0dbfb991c4ccf14b71d2ca9597720647af4 From 3d3b683989fd20283c44a675e4addbee7bfdae1f Mon Sep 17 00:00:00 2001 From: weichen Date: Thu, 1 Oct 2026 06:09:46 +0000 Subject: [PATCH 3/4] Record the sync checkpoint --- .task/feature-duplication-lesson-records.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.task/feature-duplication-lesson-records.md b/.task/feature-duplication-lesson-records.md index 475c388a..0164b263 100644 --- a/.task/feature-duplication-lesson-records.md +++ b/.task/feature-duplication-lesson-records.md @@ -64,3 +64,4 @@ | 同步前验收 | 76b2fb35a99e0847fff832b4e14e5766ea474c4e | 62d39037afafc98a6bbad3689cf479a299bc4ad8 | 2026-10-01T05:20:28Z | | 同步前验收 | 3072611209c445a0d87d54545cfd23d2b971e177 | 957de90142bc98bde3f479092e3892754000ef15 | 2026-10-01T05:23:44Z | | 同步前验收 | 4c4071e5d8e256dd8f82ba9c74efa1effd1e9df3 | 0ed945956af3f10231f7d80706c798fc83617e6c | 2026-10-01T04:50:27Z | +| 同步前验收 | 4adc4cc458f15546e5605dc55843acc26b310c41 | 916437ca2d93310ed5b4e517f99b1a787d9af843 | 2026-10-01T06:09:46Z | From f7e0f8e17c96a89dc5f561cc307e992a7f0b0cea Mon Sep 17 00:00:00 2001 From: weichen Date: Thu, 1 Oct 2026 06:11:30 +0000 Subject: [PATCH 4/4] Close 1 merged task card(s) and archive them MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Why: branches merged into main had left their task cards open; backfill status and archive to prevent bookkeeping debt. Evidence: feature-full-agent-r1.md(PR#120) — merges verified via git log --merges against origin/main. Impact: .task/*.md moved to .task/archive/ with status backfilled; no code or submodule change. Refs: task.sh close (card-autoclose-r1) --- .task/{ => archive}/feature-full-agent-r1.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) rename .task/{ => archive}/feature-full-agent-r1.md (84%) diff --git a/.task/feature-full-agent-r1.md b/.task/archive/feature-full-agent-r1.md similarity index 84% rename from .task/feature-full-agent-r1.md rename to .task/archive/feature-full-agent-r1.md index bc7b213a..11cd5e15 100644 --- a/.task/feature-full-agent-r1.md +++ b/.task/archive/feature-full-agent-r1.md @@ -1,6 +1,6 @@ # feature/full-agent-r1 任务卡 -任务主记录：；状态：进行中；owner：weichen +任务主记录：PR #120 https://git-home.u1680832.nyat.app:30319/weichen/Agent-System-Dev/pulls/120（merge e3941e90ca）；状态：已完成（回填）；owner：weichen ## 基线与授权 @@ -47,3 +47,9 @@ 描述属提示注入面（受信根+上限）；产品 squad 默认后端仍为 agent-system，角色显式声明 Backend:"agent-native" 才走内核（parity 渐进启用条款，AB 扩面验收另行推进）；部署与 真人模型实测待所有者安排。 + +## 闭合记录（card-autoclose 回填） + +- 依据：merge e3941e90caaad3e586870819f30884497a8b2ce7（PR #120）已包含于 origin/main，分支成果已落盘；本段为合入后回填。 +- 合并主题：Merge pull request 'Land the full-agent capability batch (B1-B10) across agent-native, agent-squad, and backend' (#120) from feature/full-agent-r1 into main +- 归档：随闭合移入 .task/archive/；任务执行期的过程证据见原任务记录与 PR。