@fitlab-ai/agent-infra 0.8.3 → 0.8.5

package/templates/.agents/skills/review-code/SKILL.zh-CN.md

@@ -73,9 +73,10 @@ tail .agents/workspace/active/{task-id}/task.md
 ### 4. 执行审查
 
 遵循 `.agents/workflows/feature-development.yaml`，并同时检查完整变更上下文：
-- `git diff --binary HEAD -- <post-review-globs>` 覆盖已跟踪变更
+- 一次性记录 `R=$(git rev-parse HEAD)`；本轮报告、指纹和任务审查事实都复用该 R，禁止稍后重新读取 HEAD 代替
+- `git diff --binary "$R" -- <post-review-globs>` 覆盖已跟踪变更
 - `git ls-files -o --exclude-standard -z -- <post-review-globs>` 覆盖未跟踪新文件
-- `node .agents/scripts/review-diff-fingerprint.js worktree HEAD` 生成审查差异指纹，并写入报告
+- `node .agents/scripts/review-diff-fingerprint.js worktree "$R" --format json` 一次生成审查差异指纹 `F` 与审查快照树 `T`，并写入报告
 
 > 详细审查标准、严重程度划分和 reviewer 关注点见 `reference/review-criteria.md`。执行此步骤前先读取 `reference/review-criteria.md`。
 > 测试审查硬门禁：当 `git diff` 触及测试文件时，必须先读取 `.agents/rules/testing-discipline.md` 并逐条核对（尤其"正向已覆盖时不应再加反向断言"）。
@@ -91,13 +92,15 @@ tail .agents/workspace/active/{task-id}/task.md
 获取当前时间：
 
 ```bash
-date "+%Y-%m-%d %H:%M:%S%:z"
+date "+%Y-%m-%d %H:%M:%S%z" | sed 's/\([+-][0-9][0-9]\)\([0-9][0-9]\)$/\1:\2/'
 ```
 
 - `current_step`：code-review
 - `assigned_to`：{当前代理}
 - `updated_at`：{当前时间}
 - `agent_infra_version`：按 `.agents/rules/version-stamp.md` 取值
+- 若本轮 `总体结论` / `Overall Verdict` 为 `通过` / `Approved` 且 `T == R^{tree}`，写入 `last_reviewed_commit: {R}`；若 Approved 快照包含未提交差异，则清除既有 `last_reviewed_commit`，等待 `commit` 锚定
+- 若本轮结论不是 Approved，保留既有 `last_reviewed_commit`，不得推进或清空
 - 追加：
 `- {YYYY-MM-DD HH:mm:ss±HH:MM} — **Review Code (Round {N})** by {agent} — Verdict: {Approved/Changes Requested/Rejected}, blockers: {n}, major: {n}, minor: {n}, Manual-validation: {n} → {artifact-filename}`
 

package/templates/.agents/skills/review-code/config/verify.en.json

@@ -32,10 +32,12 @@
         "^\\$ ",
         "^- \\*\\*Overall Verdict\\*\\*[:：]\\s*(?:通过|需要修改|拒绝|Approved|Changes Requested|Rejected)\\s*$",
         "^- \\*\\*Review Baseline Commit\\*\\*[:：]\\s*\\S",
-        "^- \\*\\*Reviewed Diff Fingerprint\\*\\*[:：]\\s*sha256:[0-9a-f]{64}\\s*$"
+        "^- \\*\\*Reviewed Diff Fingerprint\\*\\*[:：]\\s*sha256:[0-9a-f]{64}\\s*$",
+        "^- \\*\\*Reviewed Snapshot Tree\\*\\*[:：]\\s*[0-9a-f]{40,64}\\s*$"
       ],
       "freshness_minutes": 30
     },
+    "review-fact": {},
     "activity-log": {
       "expected_action_pattern": "(Review Code|Code Review) \\(Round \\d+\\)",
       "freshness_minutes": 30

package/templates/.agents/skills/review-code/config/verify.zh-CN.json

@@ -32,10 +32,12 @@
         "^\\$ ",
         "^- \\*\\*总体结论\\*\\*[:：]\\s*(?:通过|需要修改|拒绝|Approved|Changes Requested|Rejected)\\s*$",
         "^- \\*\\*审查基线提交\\*\\*[:：]\\s*\\S",
-        "^- \\*\\*审查差异指纹\\*\\*[:：]\\s*sha256:[0-9a-f]{64}\\s*$"
+        "^- \\*\\*审查差异指纹\\*\\*[:：]\\s*sha256:[0-9a-f]{64}\\s*$",
+        "^- \\*\\*审查快照树\\*\\*[:：]\\s*[0-9a-f]{40,64}\\s*$"
       ],
       "freshness_minutes": 30
     },
+    "review-fact": {},
     "activity-log": {
       "expected_action_pattern": "(Review Code|Code Review) \\(Round \\d+\\)",
       "freshness_minutes": 30

package/templates/.agents/skills/review-code/reference/output-templates.en.md

@@ -29,7 +29,7 @@ Task {task-id} review completed. Verdict: approved.
 
 Next step - commit the code:
   - Claude Code / OpenCode: /commit
-  - Gemini CLI: /agent-infra:commit
+  - Gemini CLI: /{{project}}:commit
   - Codex CLI: $commit
 
 [When manual-validation > 0, append this final line:]
@@ -45,12 +45,12 @@ Task {task-id} review completed. Verdict: approved.
 
 Next step - fix before commit (recommended):
   - Claude Code / OpenCode: /code-task {task-ref}
-  - Gemini CLI: /agent-infra:code-task {task-ref}
+  - Gemini CLI: /{{project}}:code-task {task-ref}
   - Codex CLI: $code-task {task-ref}
 
 Or commit directly (skip fix):
   - Claude Code / OpenCode: /commit
-  - Gemini CLI: /agent-infra:commit
+  - Gemini CLI: /{{project}}:commit
   - Codex CLI: $commit
 
 [When manual-validation > 0, append this final line:]
@@ -66,7 +66,7 @@ Task {task-id} review completed. Verdict: changes requested.
 
 Next step - fix the findings:
   - Claude Code / OpenCode: /code-task {task-ref}
-  - Gemini CLI: /agent-infra:code-task {task-ref}
+  - Gemini CLI: /{{project}}:code-task {task-ref}
   - Codex CLI: $code-task {task-ref}
 
 [When manual-validation > 0, append this final line:]
@@ -82,7 +82,7 @@ Task {task-id} review completed. Verdict: rejected, re-design the technical plan
 
 Next step - re-design the technical plan:
   - Claude Code / OpenCode: /plan-task {task-ref}
-  - Gemini CLI: /agent-infra:plan-task {task-ref}
+  - Gemini CLI: /{{project}}:plan-task {task-ref}
   - Codex CLI: $plan-task {task-ref}
 
 > Note: Rejected means the implementation direction needs to be reworked end-to-end, not patched locally. `code-task/scripts/detect-mode.js` branch #7 refuses a direct `/code-task` and requires a fresh plan first.

package/templates/.agents/skills/review-code/reference/output-templates.zh-CN.md

@@ -29,7 +29,7 @@
 
 下一步 - 提交代码：
   - Claude Code / OpenCode：/commit
-  - Gemini CLI：/agent-infra:commit
+  - Gemini CLI：/{{project}}:commit
   - Codex CLI：$commit
 
 [当 manual-validation > 0 时，在最后附加一行：]
@@ -45,12 +45,12 @@
 
 下一步 - 修复问题后提交（推荐）：
   - Claude Code / OpenCode：/code-task {task-ref}
-  - Gemini CLI：/agent-infra:code-task {task-ref}
+  - Gemini CLI：/{{project}}:code-task {task-ref}
   - Codex CLI：$code-task {task-ref}
 
 或直接提交（跳过修复）：
   - Claude Code / OpenCode：/commit
-  - Gemini CLI：/agent-infra:commit
+  - Gemini CLI：/{{project}}:commit
   - Codex CLI：$commit
 
 [当 manual-validation > 0 时，在最后附加一行：]
@@ -66,7 +66,7 @@
 
 下一步 - 修复问题：
   - Claude Code / OpenCode：/code-task {task-ref}
-  - Gemini CLI：/agent-infra:code-task {task-ref}
+  - Gemini CLI：/{{project}}:code-task {task-ref}
   - Codex CLI：$code-task {task-ref}
 
 [当 manual-validation > 0 时，在最后附加一行：]
@@ -82,7 +82,7 @@
 
 下一步 - 重新设计技术方案：
   - Claude Code / OpenCode：/plan-task {task-ref}
-  - Gemini CLI：/agent-infra:plan-task {task-ref}
+  - Gemini CLI：/{{project}}:plan-task {task-ref}
   - Codex CLI：$plan-task {task-ref}
 
 > 注意：Rejected 表示实现方向需要整体重做，不是局部修复。`code-task/scripts/detect-mode.js` 分支 #7 会拒绝直接 `/code-task`，要求先重新方案设计。

package/templates/.agents/skills/review-code/reference/report-template.en.md

@@ -21,8 +21,9 @@ Use this template when writing `review-code.md` or `review-code-r{N}.md`.
 - **Reviewer**: {reviewer-name}
 - **Review Time**: {timestamp}
 - **Scope**: {file-count and major modules}
-- **Review Baseline Commit**: {raw git rev-parse HEAD} (baseline for the complete-task post-review commit gate; see `.agents/rules/review-handshake.md`)
-- **Reviewed Diff Fingerprint**: {raw node .agents/scripts/review-diff-fingerprint.js worktree HEAD}
+- **Review Baseline Commit**: {raw R captured once for this round} (diff base only; see `.agents/rules/review-handshake.md`)
+- **Reviewed Diff Fingerprint**: {raw node .agents/scripts/review-diff-fingerprint.js worktree "$R"}
+- **Reviewed Snapshot Tree**: {tree field from node .agents/scripts/review-diff-fingerprint.js worktree "$R" --format json}
 - **Overall Verdict**: {Approved / Changes Requested / Rejected} (pick exactly one; combined phrases will fail the verify gate)
 - **Findings (AI-actionable)**: 0 blockers, 0 majors, 0 minors / **Manual validation**: 0
 

package/templates/.agents/skills/review-code/reference/report-template.zh-CN.md

@@ -21,8 +21,9 @@
 - **审查者**：{reviewer-name}
 - **审查时间**：{timestamp}
 - **审查范围**：{file-count and major modules}
-- **审查基线提交**：{git rev-parse HEAD 原文}（complete-task 的 post-review commit 门禁基线；详见 `.agents/rules/review-handshake.md`）
-- **审查差异指纹**：{node .agents/scripts/review-diff-fingerprint.js worktree HEAD 原文}
+- **审查基线提交**：{本轮一次性捕获的 R 原文}（仅表示 diff base；详见 `.agents/rules/review-handshake.md`）
+- **审查差异指纹**：{node .agents/scripts/review-diff-fingerprint.js worktree "$R" 原文}
+- **审查快照树**：{node .agents/scripts/review-diff-fingerprint.js worktree "$R" --format json 的 tree 字段}
 - **总体结论**：{通过 / 需要修改 / 拒绝}（恰取一个；禁止写组合短语，否则 verify gate 失败）
 - **发现（AI 可处理）**：0 阻塞项，0 主要，0 次要 / **人工校验**：0
 

package/templates/.agents/skills/review-plan/SKILL.en.md

@@ -73,7 +73,7 @@ Create `.agents/workspace/active/{task-id}/{review-artifact}`.
 Get the current time:
 
 ```bash
-date "+%Y-%m-%d %H:%M:%S%:z"
+date "+%Y-%m-%d %H:%M:%S%z" | sed 's/\([+-][0-9][0-9]\)\([0-9][0-9]\)$/\1:\2/'
 ```
 
 Set `current_step` to `technical-design-review`, refresh task metadata, and append:

package/templates/.agents/skills/review-plan/SKILL.zh-CN.md

@@ -79,7 +79,7 @@ tail .agents/workspace/active/{task-id}/task.md
 获取当前时间：
 
 ```bash
-date "+%Y-%m-%d %H:%M:%S%:z"
+date "+%Y-%m-%d %H:%M:%S%z" | sed 's/\([+-][0-9][0-9]\)\([0-9][0-9]\)$/\1:\2/'
 ```
 
 更新 task.md：

package/templates/.agents/skills/review-plan/reference/output-templates.en.md

@@ -27,7 +27,7 @@ Task {task-id} technical plan review completed. Verdict: approved.
 
 Next step - write code:
   - Claude Code / OpenCode: /code-task {task-ref}
-  - Gemini CLI: /agent-infra:code-task {task-ref}
+  - Gemini CLI: /{{project}}:code-task {task-ref}
   - Codex CLI: $code-task {task-ref}
 
 [When manual-validation > 0, append:]
@@ -43,12 +43,12 @@ Task {task-id} technical plan review completed. Verdict: approved.
 
 Next step - revise plan before coding (recommended):
   - Claude Code / OpenCode: /plan-task {task-ref}
-  - Gemini CLI: /agent-infra:plan-task {task-ref}
+  - Gemini CLI: /{{project}}:plan-task {task-ref}
   - Codex CLI: $plan-task {task-ref}
 
 Or proceed directly to coding:
   - Claude Code / OpenCode: /code-task {task-ref}
-  - Gemini CLI: /agent-infra:code-task {task-ref}
+  - Gemini CLI: /{{project}}:code-task {task-ref}
   - Codex CLI: $code-task {task-ref}
 
 [When manual-validation > 0, append:]
@@ -64,7 +64,7 @@ Task {task-id} technical plan review completed. Verdict: changes requested.
 
 Next step - revise technical plan:
   - Claude Code / OpenCode: /plan-task {task-ref}
-  - Gemini CLI: /agent-infra:plan-task {task-ref}
+  - Gemini CLI: /{{project}}:plan-task {task-ref}
   - Codex CLI: $plan-task {task-ref}
 
 [When manual-validation > 0, append:]
@@ -80,7 +80,7 @@ Task {task-id} technical plan review completed. Verdict: rejected, redesign requ
 
 Next step - redesign:
   - Claude Code / OpenCode: /plan-task {task-ref}
-  - Gemini CLI: /agent-infra:plan-task {task-ref}
+  - Gemini CLI: /{{project}}:plan-task {task-ref}
   - Codex CLI: $plan-task {task-ref}
 
 [When manual-validation > 0, append:]

package/templates/.agents/skills/review-plan/reference/output-templates.zh-CN.md

@@ -27,7 +27,7 @@
 
 下一步 - 编写代码：
   - Claude Code / OpenCode：/code-task {task-ref}
-  - Gemini CLI：/agent-infra:code-task {task-ref}
+  - Gemini CLI：/{{project}}:code-task {task-ref}
   - Codex CLI：$code-task {task-ref}
 
 [当 manual-validation > 0 时，在最后附加一行：]
@@ -43,12 +43,12 @@
 
 下一步 - 修订方案后编码（推荐）：
   - Claude Code / OpenCode：/plan-task {task-ref}
-  - Gemini CLI：/agent-infra:plan-task {task-ref}
+  - Gemini CLI：/{{project}}:plan-task {task-ref}
   - Codex CLI：$plan-task {task-ref}
 
 或直接进入编码：
   - Claude Code / OpenCode：/code-task {task-ref}
-  - Gemini CLI：/agent-infra:code-task {task-ref}
+  - Gemini CLI：/{{project}}:code-task {task-ref}
   - Codex CLI：$code-task {task-ref}
 
 [当 manual-validation > 0 时，在最后附加一行：]
@@ -64,7 +64,7 @@
 
 下一步 - 修订技术方案：
   - Claude Code / OpenCode：/plan-task {task-ref}
-  - Gemini CLI：/agent-infra:plan-task {task-ref}
+  - Gemini CLI：/{{project}}:plan-task {task-ref}
   - Codex CLI：$plan-task {task-ref}
 
 [当 manual-validation > 0 时，在最后附加一行：]
@@ -80,7 +80,7 @@
 
 下一步 - 重新设计：
   - Claude Code / OpenCode：/plan-task {task-ref}
-  - Gemini CLI：/agent-infra:plan-task {task-ref}
+  - Gemini CLI：/{{project}}:plan-task {task-ref}
   - Codex CLI：$plan-task {task-ref}
 
 [当 manual-validation > 0 时，在最后附加一行：]

package/templates/.agents/skills/test/SKILL.zh-CN.md

@@ -11,16 +11,27 @@ description: >
 
 ## 1. 编译 / 类型检查
 
-本项目由 Node.js CLI 和模板文件组成，无需编译。跳过此步骤。
+```bash
+# TODO：替换为项目实际的编译命令
+# npx tsc --noEmit       (TypeScript)
+# mvn compile             (Maven)
+# go build ./...          (Go)
+# make build              (通用)
+```
+
+确认没有编译错误。
 
 ## 2. 运行单元测试（按层级选择）
 
-本项目把测试分为三层，按场景选择运行命令；新增测试文件默认归入 **full**，确认足够快且足够核心后，再上调到 core 或 smoke。
+三层测试是可选的反馈速度优化；如果测试套件较小，所有层级都可以映射到同一个完整测试命令。
 
 ### smoke（目标 <5s）
 
 ```bash
-npm run test:smoke
+# TODO：替换为项目的 smoke 子集命令
+# npm run test:smoke       (Node.js)
+# pytest -m "not slow"     (Python)
+# go test -short ./...     (Go)
 ```
 
 适用场景：
@@ -31,7 +42,10 @@ npm run test:smoke
 ### core（目标 <15s）
 
 ```bash
-npm run test:core
+# TODO：替换为项目的 core 子集命令
+# npm run test:core        (Node.js)
+# pytest -m "not contract" (Python)
+# go test ./...            (Go)
 ```
 
 适用场景：
@@ -39,18 +53,22 @@ npm run test:core
 - 写 code.md / code-r{N}.md 报告前的最终验证
 - 推送 PR 前的本地把关
 
-### full（目标 <60s）
+### full（完整测试套件）
 
 ```bash
-npm test
+# TODO：替换为项目的完整测试命令
+# npm test                 (Node.js)
+# mvn test                 (Maven)
+# pytest                   (Python)
+# go test ./...            (Go)
 ```
 
 适用场景：
 - release / tag 前
-- CI（unit-tests.yml）
+- CI
 - main 合并前的最终把关
 
-full 层运行全部项目测试。`npm test` 使用通配匹配项目测试文件，**新增的测试文件会自动归入 full**，这是安全网。
+如果项目尚未分层，smoke / core / full 可以全部使用完整测试命令；分层不是使用协作工作流的前置条件。
 
 ## 3. 输出结果
 

package/templates/.agents/skills/update-agent-infra/SKILL.en.md

@@ -33,7 +33,7 @@ same-path external files, and later external sources win over earlier external
 sources. Conflicts are recorded in the report. The script then performs:
 - detect the template source version
 - File registry sync (`defaults.json` → `.agents/.airc.json`)
-- All managed files (language selection → exclude merged/ejected → placeholder rendering → overwrite)
+- All managed files (language selection → exclude merged/ejected → placeholder rendering → write; built-in guarded managed files use a source-baseline three-way comparison)
 - Ejected files (create only on first install)
 - `.agents/.airc.json` update (`templateVersion`, file lists)
 
@@ -47,6 +47,8 @@ The script outputs JSON to stdout. Parse and record the report.
   list these in the report so users know which files were ignored because a
   built-in template or later external source won
 - `managed.written` / `managed.created`: updated / newly created managed files
+- `managed.protected`: guarded managed files whose local user-only modification or deletion was preserved
+- `managed.conflicts`: guarded managed files with unknown origin, two-sided changes, or ownership that cannot be proven during a platform switch; list each target, reason, and three-way hash
 - `managed.removed`: deleted managed files (including old paths removed during template migrations)
 - `managed.skippedPlatform`: managed / merged entries skipped because they belong to a different platform
 - `managed.skippedTUI`: managed / merged entries skipped because they are owned by a built-in TUI that is disabled in `tuis` (customTUI command files under the same path prefix are preserved)
@@ -56,6 +58,8 @@ The script outputs JSON to stdout. Parse and record the report.
 - `selfUpdate`: whether this is a self-update scenario
 - `configUpdated`: whether `.agents/.airc.json` was updated
 
+If `managed.conflicts` is non-empty, output every conflict and stop immediately before Phase B. Do not overwrite a conflicting file or advance its `files.managedBaselines` entry.
+
 ## Phase B: Process merged files (AI intelligent merge)
 
 Process each item in the report's `merged.pending` list:

package/templates/.agents/skills/update-agent-infra/SKILL.zh-CN.md

@@ -27,7 +27,7 @@ node .agents/skills/update-agent-infra/scripts/sync-templates.js
 脚本读取 `.agents/.airc.json`，并通过 npm 自动定位已安装的 `@fitlab-ai/agent-infra/templates/` 目录。同步前会合并 `templates.sources` 中配置的外部模板源；相同文件以内置模板为准，多个外部源之间后者覆盖前者，冲突会写入报告。然后自动完成：
 - 检测模板源版本
 - 同步文件注册表（`defaults.json` → `.agents/.airc.json`）
-- 处理所有 managed 文件（语言选择 → 排除 merged/ejected → 占位符渲染 → 覆盖写入）
+- 处理所有 managed 文件（语言选择 → 排除 merged/ejected → 占位符渲染 → 写入；内建 guarded managed 文件使用来源基线三方比较）
 - 处理 ejected 文件（仅首次安装时创建）
 - 更新 `.agents/.airc.json`（`templateVersion`、文件列表）
 
@@ -39,6 +39,8 @@ node .agents/skills/update-agent-infra/scripts/sync-templates.js
 - `templateRoot`：模板文件根目录绝对路径
 - `templateSources.conflicts`：外部模板源冲突列表；报告中必须显式展示，说明哪些文件因内置模板或后续外部源获胜而被忽略
 - `managed.written` / `managed.created`：已更新/新建的 managed 文件
+- `managed.protected`：检测到用户单边修改或删除、因此保留本地状态的 guarded managed 文件
+- `managed.conflicts`：来源未知、双边修改或平台切换时无法证明官方所有权的 guarded managed 冲突；必须逐项展示 target、reason 与三方哈希
 - `managed.removed`：被删除的 managed 文件（包括模板迁移时移除的旧路径）
 - `managed.skippedPlatform`：因归属其他平台而被跳过的 managed / merged 条目
 - `managed.skippedTUI`：因 `tuis` 中未启用对应内建 TUI 而被跳过的 managed / merged 条目（落在同一路径前缀下的 customTUI 命令文件会被保留）
@@ -48,6 +50,8 @@ node .agents/skills/update-agent-infra/scripts/sync-templates.js
 - `selfUpdate`：是否为自更新模式
 - `configUpdated`：`.agents/.airc.json` 是否已更新
 
+如果 `managed.conflicts` 非空，输出全部冲突并立即停止，不进入阶段 B；禁止覆盖冲突文件或推进其 `files.managedBaselines`。
+
 ## 阶段 B：处理 merged 文件（AI 智能合并）
 
 根据报告中 `merged.pending` 列表，逐个文件处理。对于每个条目：
@@ -133,7 +137,7 @@ node .agents/skills/update-agent-infra/scripts/sync-templates.js
 ```
 下一步 - 提交代码：
   - Claude Code / OpenCode：/commit
-  - Gemini CLI：/agent-infra:commit
+  - Gemini CLI：/{{project}}:commit
   - Codex CLI：$commit
 ```