From 31e3a76f713f87b6f437a45bbcf977e97cddc09e Mon Sep 17 00:00:00 2001 From: weichen Date: Wed, 7 Oct 2026 17:31:08 +0000 Subject: [PATCH] Take the WP6 pins and record the usage/retry increment on the task card Why: Backend#96 merged the usage split and default retry; the core Usage fields, Frontend#48, and the native/squad cascades landed; Dev pins and the increment record follow. Evidence: check-pins pins ok; WP6 chain CI green on every merge head; audit N20 closes (split flows into run records on every path). Impact: usage accounting is uniform end to end; stream retry is a library default. Refs: Agent-Native#35-#39, Agent-Squad#41, Agent-System-Backend#96, Agent-System-Frontend#48 --- .task/feature-agent-stack-n3.md | 1 + deps/agent-native | 2 +- deps/agent-squad | 2 +- modules/backend | 2 +- modules/core | 2 +- modules/frontend | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.task/feature-agent-stack-n3.md b/.task/feature-agent-stack-n3.md index 3dbd05c3..b22c25a5 100644 --- a/.task/feature-agent-stack-n3.md +++ b/.task/feature-agent-stack-n3.md @@ -67,6 +67,7 @@ OTel SDK/gRPC/采样（保留手写导出）；completion/prompt 预算口径改 | WP4 OTel GenAI 对齐 | 保留键可把 run 级关联经既有 Trace 签名传入（不破宿主）；结束期过滤可让 usage 在存续期补进 | agent-native telemetry/loop + backend app/settings/runtime | 名称后缀+gen_ai.* 键枚举+intValue+service.name 钉住；一次 Run 共享 trace 且 parent 链正确；正文拒绝名单原样过 | 用户「下一步实施 N3」 | PASS（Native#32、Squad#36、Backend#93 合入，CI GATE；验收③ GATE） | span 形态切到 GenAI 约定（invoke_agent /chat /execute_tool 、gen_ai.* 属性、一次 Run 一条 trace）；默认不导出（端点空） | 否（WP6 总验复跑） | | WP3 检查点收口 | 资格可静态声明并被测试钉住；恢复故障注入对 root 不可重现（用显式测试缝替代权限法） | agent-native checkpoint/tools + backend rewind/server/fs | 资格集合钉住；符号链接按外部改动处理；部分恢复进 Result 不中止；日志有界；HTTP happy+409 过 | 用户「下一步实施 N3」 | PASS（Native#33、Squad#37、Backend#94 合入，CI GATE；验收② GATE） | Result 增 Failed；Rewind 不再单文件中止；checkpoints.jsonl 裁到 200 anchors；CI 以 root 跑暴露的权限法注入问题由 restoreForTesting 缝解决 | 否（WP6 总验复跑） | | WP5 Memory 端口 | 端口形态对齐 squad/runstore 先例（库定义+宿主实现）；注入做 request-scoped 可免累计与落盘重复 | agent-native runtime/memory + loop + backend runmgr/llm | 注入到达请求且与迁移前同文；空召回零变化；校验 fail-closed；适配器 scope/limit/回读全过 | 用户「下一步实施 N3」 | PASS（Native#34、Squad#38、Backend#95 合入，CI GATE） | 组装侧注入退役（循环按请求注入，同文不双份）；memory_write 内核面可用；MemoryScope 默认空保持旧语义 | 否（WP6 总验复跑） | +| WP6 计费拆分与回退/重试收口 | cache 只入累计位可免字段膨胀；重试下沉库默认一处可消灭「谁接谁没接」漂移面；事件桥三层（loop/exec/squad）逐层加字段比改签名安全 | agent-native loop/exec + core Usage + backend 三路径 + frontend | 映射测试/记账测试全绿；设置 0=关语义保持；verifier 显式接重试+回退；前端 82/82 | 用户「下一步实施 N3」 | PASS（Native#35/#37/#38/#39、Squad#41、Backend#96、Frontend#48、Core 合入，CI GATE；N20 关闭） | run.Usage 带 Last*/cache；子代理入账；重试成库默认（负值关）；usage 事件终态路径也发；徽章显示上一请求/累计 | 否（闭卡总验复跑） | | WP1 RunState 收口 | 尾部兜底可与意图路径正交不重复；替换文只作 user 消息可保内存/转录一致；done.json 按状态分流可让优雅停机续跑且幂等 | agent-native loop + backend runmgr | 杀窗口两态配对成立且零重复；健康转录零改写；guardrails 消费方回归通过 | 用户「下一步实施 N3」（方案 Documents#43 合入后） | PASS（Native#30、Squad#34、Backend#91 合入，CI GATE；验收① 库层 GATE） | Stop.Replacement 展示形态变化（assistant 不再显示替换文）；优雅停机子代理续跑（一次且仅一次）；每次 Run 前配对恒成立 | 否（WP6 总验复跑） | ## 同步记录 diff --git a/deps/agent-native b/deps/agent-native index 0e03cc21..1ac21c68 160000 --- a/deps/agent-native +++ b/deps/agent-native @@ -1 +1 @@ -Subproject commit 0e03cc2144471661a4c6423fb1dd8779f6454c2a +Subproject commit 1ac21c68d4e2c2728d92d6db67a30ff06e0066d3 diff --git a/deps/agent-squad b/deps/agent-squad index bf7fe842..c462bc4a 160000 --- a/deps/agent-squad +++ b/deps/agent-squad @@ -1 +1 @@ -Subproject commit bf7fe8429bdfa7ae1cbf021de11111b9e581fa2f +Subproject commit c462bc4ae5bbd96e6caeb09c2ad24bf87ed153ab diff --git a/modules/backend b/modules/backend index e5034e17..e59b25c8 160000 --- a/modules/backend +++ b/modules/backend @@ -1 +1 @@ -Subproject commit e5034e177d78d175bd4d12b66cfffaf19a129696 +Subproject commit e59b25c816ed508b418c862fbe396eae9e2c656a diff --git a/modules/core b/modules/core index 0b5c7747..1b7e2c0f 160000 --- a/modules/core +++ b/modules/core @@ -1 +1 @@ -Subproject commit 0b5c7747a3165bf0d0f2219204b7b70ec3ed7645 +Subproject commit 1b7e2c0f4793766032810d11cee2a68615ce9df6 diff --git a/modules/frontend b/modules/frontend index 50c72446..84b73ab3 160000 --- a/modules/frontend +++ b/modules/frontend @@ -1 +1 @@ -Subproject commit 50c724460159171254242ae48e956a80f4eb9c7e +Subproject commit 84b73ab32848e623d0a0ab7ade552784dca8cf3c