refactor: unify runtime/security/todo/subagent paths by Cai-Tang-www · Pull Request #414 · 1024XEngineer/neo-code

Cai-Tang-www · 2026-04-22T15:51:04Z

变更摘要

本 PR 聚焦于 Runtime / Security / Todo / SubAgent 的重构收敛，保持主链路行为不变。

1) Security 策略收敛

将 bash_git_read_only 调整为默认 allow（只读 Git 语义放行）
其他 Git 语义类别（remote/mutation/destructive/unknown）继续受控治理
同步更新策略测试与工具集成文档

2) Todo / Session Legacy 清理

移除 todo_write 的 legacy title -> content 兼容路径
legacy 入参改为显式迁移错误（要求使用 content）
移除 Session 中基于历史字段的 executor 推断逻辑，缺失 executor 统一落到 agent

3) Runtime / Config 强化

新增 runtime.max_turns（默认 20），防止异常场景无限循环
max_no_progress_streak 默认值由 3 提升到 5
移除 memo.max_index_lines 兼容映射，改为显式迁移提示到 memo.max_entries

4) SubAgent 调度器重构

收敛 Todo patch 写回路径到统一入口
统一 revision 冲突处理和错误包装语义
降低状态写回分支重复，提高可维护性

提交拆分

dda052b refactor(security): allow git read-only semantic class by default
c034aec refactor(todo): remove legacy title/executor compatibility paths
fb38790 refactor(runtime): enforce max turns and tighten config defaults
93d01bf refactor(subagent): centralize todo patch writeback handling

验证

go test ./...
go vet ./...

兼容性说明

移除了部分 legacy 输入兼容路径，不再静默降级
对旧输入返回结构化错误并提供迁移方向

…hold

Cai-Tang-www · 2026-04-22T17:03:22Z

/simplify 顺便解决CI冲突

该分支存在冲突，必须解决
可以干净地合并更改。

docs/tools-and-tui-integration.md
internal/runtime/session_mutation.go
internal/security/policy.go
internal/security/policy_test.go
internal/tools/permission_mapper.go
internal/tools/session_memory.go

fennoai · 2026-04-22T17:03:27Z

处理结果

已处理该 PR 的冲突问题并推送到同一分支 feat/git。

同步 origin/main 到当前 PR 分支，生成合并提交：a75bcac
GitHub 冲突状态已从 CONFLICTING 变为 MERGEABLE
你列出的冲突文件已随合并收敛：
- docs/tools-and-tui-integration.md
- internal/runtime/session_mutation.go
- internal/security/policy.go
- internal/security/policy_test.go
- internal/tools/permission_mapper.go
- internal/tools/session_memory.go

验证

已执行：go test ./...（通过）

未执行

未额外改动业务逻辑（本次仅解决分支与 main 的合并冲突并验证）

View job run

codecov · 2026-04-22T17:12:21Z

Codecov Report

❌ Patch coverage is 81.98324% with 129 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
internal/tools/bash_semantic.go	72.85%	44 Missing and 13 partials ⚠️
internal/tools/bash/executor.go	75.67%	20 Missing and 7 partials ⚠️
internal/security/policy.go	86.04%	12 Missing and 6 partials ⚠️
internal/subagent/scheduler.go	72.72%	4 Missing and 8 partials ⚠️
internal/tui/core/app/update.go	28.57%	3 Missing and 2 partials ⚠️
internal/runtime/run_lifecycle.go	71.42%	2 Missing and 2 partials ⚠️
internal/session/todo.go	0.00%	2 Missing and 1 partial ⚠️
internal/runtime/max_turn_error.go	66.66%	2 Missing ⚠️
internal/runtime/controlplane/decider.go	80.00%	1 Missing ⚠️

📢 Thoughts on this report? Let us know!

Cai-Tang-www · 2026-04-23T00:46:37Z

@xgopilot 提高覆盖率到95%

fennoai · 2026-04-23T00:46:42Z

已完成覆盖率补齐并推送到当前 PR 分支 feat/git（commit: 3877630）。

本次完成

补充 internal/tools/result_status_test.go：覆盖 parseToolResultOK / parseToolResultExitCode / parseFloatExitCode 的完整分支与边界类型。
补充 internal/subagent/scheduler_test.go：覆盖 updateTodoWithPatch、applyOutcome、recoverInterruptedTodos、ensureBlocked、ensureDependencyFailed、ensureReadyStatus、handleTaskFailure 的错误与 changed=false 分支。
补充 internal/tools/todo/common_test.go：覆盖 ensureNoLegacyTodoTitleField(nil) 和 items 含非对象元素的分支。
补充 internal/runtime/runtime_progress_test.go：新增 runtime.max_turns 触发停止分支验证。

验证结果

go test ./... ✅
go test ./... -coverprofile=/tmp/cover.out ✅
本地按 patch 可执行语句行估算：98.29% (230/234)，已超过 95% 目标。

说明

go vet ./... 仍有现存告警（internal/tui/services/gateway_rpc_client_additional_test.go 的 goroutine 中 t.Fatalf），与本次覆盖率补测改动无关，未在本次处理。

View job run

Generated with [codeagent](https://github.com/qbox/codeagent) Co-authored-by: Cai-Tang-www <106404101+Cai-Tang-www@users.noreply.github.com>

Cai-Tang-www · 2026-04-23T01:16:30Z

/simplify

fennoai · 2026-04-23T01:57:23Z

完成情况

已按要求读取历史评论并处理仍未解决的 review comments，随后执行了 code-simplifier 子代理复查并完成提交推送。

本次修复

修复 internal/subagent/scheduler.go：updateTodoWithPatch 在写回成功但无法读取最新快照时，返回 changed=false，避免基于过期对象触发后续状态迁移。
修复 internal/security/policy.go：对 bash_git_read_only 增加敏感目标保护。
- 敏感路径读取命中 ask-bash-git-read-only-sensitive（需审批）
- 私钥材料读取命中 deny-bash-git-read-only-private-keys（拒绝）
- 新增 git 只读命令中的敏感路径识别函数，覆盖 git show HEAD:.env / git show HEAD:.ssh/id_rsa 等场景。

测试与简化

新增/调整测试：internal/security/policy_test.go、internal/subagent/scheduler_test.go
code-simplifier 结果：对 NewPolicyEngine 的规则排序实现做了等价简化（去掉中间结构，改为稳定排序函数），其余目标文件无需简化。
已验证：go test ./internal/security ./internal/subagent、go test ./... 全部通过。

提交与推送

Commit: 5a9c20c
已推送到当前 PR 分支：Cai-Tang-www:feat/git

View job run

- return changed=false when todo snapshot reload fails after patch write - guard git read-only sensitive/private-key targets with ask/deny policy - add regression tests for both paths Generated with [codeagent](https://github.com/qbox/codeagent) Co-authored-by: Cai-Tang-www <106404101+Cai-Tang-www@users.noreply.github.com>

Cai-Tang-www · 2026-04-23T02:31:18Z

@xgopilot 对这个Pr进行严格的审查，包括安全风险和其他不合理的地方等等，直接给出我结果

…o executor

…h git semantics

phantom5099 · 2026-04-23T05:30:57Z

@xgopilot 采取合适的方案解决冲突，不要应急式补丁

phantom5099 · 2026-04-23T05:58:38Z

@xgopilot 先解决冲突，同时上调DefaultMaxTurns至40

fennoai · 2026-04-23T05:58:44Z

完成情况

已按你的要求完成两部分工作，并已推送到当前 PR 分支 Cai-Tang-www:feat/git。

本次处理

解决冲突（非应急补丁，按根因收敛）

修复 bash_semantic 的复合命令识别缺口：现在会识别 $() 命令替换并降级为 unknown，避免被误判为 git read_only 自动放行。
修复高风险 Git 参数等价写法漏检：新增参数名归一化，覆盖 --config-env=... 与 -ccore... 等形式，统一按高风险参数处理。
同步补充/更新测试覆盖上述场景。

上调 DefaultMaxTurns

internal/config/runtime.go 中 DefaultMaxTurns 已从 20 调整为 40。
同步更新配置文档 docs/guides/configuration.md 的示例与默认值描述。

验证

go test ./... 通过。

提交与推送

Commit: 5e5e83d
Push: HEAD -> feat/git

未执行项：未做与本次请求无关的额外重构。

View job run

…default Generated with [codeagent](https://github.com/qbox/codeagent) Co-authored-by: phantom5099 <245659304+phantom5099@users.noreply.github.com>

# Conflicts: # docs/guides/configuration.md # internal/config/loader_test.go # internal/runtime/run.go # internal/session/sqlite_store_additional_test.go # internal/session/todo.go # internal/session/todo_test.go

…/git

phantom5099 · 2026-04-23T07:02:07Z

@xgopilot 批判性review整个PR，分析所有潜在风险点，找出所有漏洞，确保每个地方的修改不是退步的，方案上的设计也不能碎片化，更不能妥协式兼容或兜底旧代码，不许输出正向表扬

…mantics

Cai-Tang-www · 2026-04-23T09:46:54Z

@xgopilot 批判性review整个PR，分析所有潜在风险点，找出所有漏洞，确保每个地方的修改不是退步的，方案上的设计也不能碎片化，更不能妥协式兼容或兜底旧代码，不许输出正向表扬

phantom5099 · 2026-04-23T11:21:00Z

/review

Cai-Tang-www · 2026-04-23T11:26:38Z

/simplify

fennoai · 2026-04-23T11:26:44Z

完成情况

已按触发评论执行：读取历史评论并处理未解决 review 点，然后调用 code-simplifier 做等价简化，最后完成提交与推送。

处理结果

已评估未解决 review comment（internal/security/policy.go:206）并修复。

修复点：deny-bash-git-read-only-private-keys 去除 RequireSensitivePath 约束，避免 id_dsa / *.p12 / *.pfx 等私钥材料在 bash_git_read_only 被误放行。

已补充测试并验证。

新增用例：git show HEAD:keys/id_dsa、git show HEAD:certs/client.p12 均应命中 deny。
运行：go test ./internal/security、go test ./...，均通过。

已执行 code-simplifier 简化并保留行为不变。

internal/security/policy.go：合并重复归一化/匹配逻辑（泛型 helper + 共享包含判断 + git 只读路径分类收敛）。
internal/security/policy_test.go：提取统一断言 helper，消除重复校验代码。

已提交并推送。

Commit: d0d68c3
已推送到当前 PR 分支：Cai-Tang-www:feat/git
说明：同步产生了一个附加远端分支 fork-pr-414-1776909437（同一提交），PR 更新已在 feat/git 上生效。

未执行

未处理触发评论之外的历史诉求（如额外审查范围扩展或非本次指令的重构）。

View job run

Generated with [codeagent](https://github.com/qbox/codeagent) Co-authored-by: Cai-Tang-www <106404101+Cai-Tang-www@users.noreply.github.com>

Cai-Tang-www · 2026-04-23T11:41:55Z

/review

fennoai

Completed 4 review passes (code quality, performance, security, documentation) and deduplicated findings.

I found 1 noteworthy security issue in the changed code.

Cai-Tang-www added 5 commits April 22, 2026 21:52

refactor(core): unify git semantics and tool failure status handling

c8e9ab5

refactor(security): allow git read-only semantic class by default

dda052b

refactor(todo): remove legacy title/executor compatibility paths

c034aec

refactor(runtime): enforce max turns and tighten config defaults

fb38790

refactor(subagent): centralize todo patch writeback handling

93d01bf

This comment was marked as outdated.

Sign in to view

Cai-Tang-www changed the title ~~refactor: runtime/security/todo cleanup and scheduler writeback unification~~ refactor: unify runtime/security/todo/subagent paths Apr 22, 2026

Cai-Tang-www added 2 commits April 22, 2026 23:56

Merge remote-tracking branch 'upstream/main' into feat/git

4768213

fix(ci): align rpc test helpers and stabilize progress reminder thres…

03bf9e2

…hold

Merge remote-tracking branch 'origin/main' into fork-pr-414-1776873067

a75bcac

test(coverage): raise patch coverage for runtime/subagent/todo/tools

3877630

Generated with [codeagent](https://github.com/qbox/codeagent) Co-authored-by: Cai-Tang-www <106404101+Cai-Tang-www@users.noreply.github.com>

Cai-Tang-www added 2 commits April 23, 2026 12:39

fix(security-session): harden git readonly env and migrate legacy tod…

3eeb5e2

…o executor

refactor(tools): replace heavy git_intent parser with lightweight bas…

406d8ad

…h git semantics

xgopilot and others added 3 commits April 23, 2026 06:02

fix(security,config): harden git semantic parsing and bump max turns …

5e5e83d

…default Generated with [codeagent](https://github.com/qbox/codeagent) Co-authored-by: phantom5099 <245659304+phantom5099@users.noreply.github.com>

Merge remote-tracking branch 'upstream/main' into feat/git

7d57d37

# Conflicts: # docs/guides/configuration.md # internal/config/loader_test.go # internal/runtime/run.go # internal/session/sqlite_store_additional_test.go # internal/session/todo.go # internal/session/todo_test.go

Merge branch 'feat/git' of github.com:Cai-Tang-www/neo-code into feat…

6c9fcef

…/git

fix(review): harden git read-only policy and clarify max-turn stop se…

f5dee5b

…mantics

fix: close git permission regressions and stop-reason/session drift

e50403a

This comment was marked as outdated.

Sign in to view

fix(security): close git read-only private-key deny gap

d0d68c3

Generated with [codeagent](https://github.com/qbox/codeagent) Co-authored-by: Cai-Tang-www <106404101+Cai-Tang-www@users.noreply.github.com>

fennoai Bot reviewed Apr 23, 2026

View reviewed changes

Comment thread internal/tools/bash/executor.go

phantom5099 merged commit ea71014 into 1024XEngineer:main Apr 23, 2026
2 checks passed

Cai-Tang-www deleted the feat/git branch April 28, 2026 11:39

Conversation

Cai-Tang-www commented Apr 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

变更摘要

1) Security 策略收敛

2) Todo / Session Legacy 清理

3) Runtime / Config 强化

4) SubAgent 调度器重构

提交拆分

验证

兼容性说明

Uh oh!

This comment was marked as outdated.

Uh oh!

Cai-Tang-www commented Apr 22, 2026

Uh oh!

fennoai Bot commented Apr 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

处理结果

验证

未执行

Uh oh!

codecov Bot commented Apr 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Cai-Tang-www commented Apr 23, 2026

Uh oh!

fennoai Bot commented Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

本次完成

验证结果

说明

Uh oh!

Cai-Tang-www commented Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fennoai Bot commented Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

完成情况

本次修复

测试与简化

提交与推送

Uh oh!

Cai-Tang-www commented Apr 23, 2026

Uh oh!

phantom5099 commented Apr 23, 2026

Uh oh!

phantom5099 commented Apr 23, 2026

Uh oh!

fennoai Bot commented Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

完成情况

本次处理

验证

提交与推送

Uh oh!

phantom5099 commented Apr 23, 2026

Uh oh!

Cai-Tang-www commented Apr 23, 2026

Uh oh!

phantom5099 commented Apr 23, 2026

Uh oh!

This comment was marked as outdated.

Uh oh!

Cai-Tang-www commented Apr 23, 2026

Uh oh!

fennoai Bot commented Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

完成情况

处理结果

未执行

Uh oh!

Cai-Tang-www commented Apr 23, 2026

Uh oh!

fennoai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Cai-Tang-www commented Apr 22, 2026 •

edited

Loading

fennoai Bot commented Apr 22, 2026 •

edited

Loading

codecov Bot commented Apr 22, 2026 •

edited

Loading

fennoai Bot commented Apr 23, 2026 •

edited

Loading

Cai-Tang-www commented Apr 23, 2026 •

edited

Loading

fennoai Bot commented Apr 23, 2026 •

edited

Loading

fennoai Bot commented Apr 23, 2026 •

edited

Loading

fennoai Bot commented Apr 23, 2026 •

edited

Loading