@fitlab-ai/agent-infra 0.7.1 → 0.7.2

package/templates/.agents/skills/create-task/SKILL.zh-CN.md

@@ -24,7 +24,7 @@ description: "根据自然语言描述创建任务"
 
 ## 任务入参短号别名
 
-> 如果 `{task-id}` 入参以 `#` 开头，先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
+> 如果 `{task-id}` 入参匹配 `^[#]?[0-9]+$`（裸数字或带 `#` 前缀），先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
 
 ## 执行步骤
 ### 1. 解析用户描述
@@ -108,12 +108,12 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 - `## 上下文` 中的 `- **分支**：`：更新为生成的分支名
 - **追加**到 `## Activity Log`（不要覆盖之前的记录）：
   ```
-  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Task Created** by {agent} — Task created from description
+  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Create Task** by {agent} — Task created from description
   ```
 
 ### 4. 按 `.agents/rules/create-issue.md` 级联创建 Issue
 
-在 task.md 落盘并记录 `Task Created` 后，先读取 `.agents/rules/create-issue.md` 并按其中描述的步骤执行 Issue 创建。
+在 task.md 落盘并记录 `Create Task` 后，先读取 `.agents/rules/create-issue.md` 并按其中描述的步骤执行 Issue 创建。
 
 规则文件由当前配置的代码平台决定其内容：
 - 支持 Issue 创建的平台：包含完整的认证检测、模板检测、label/Issue Type/milestone 推断、Issue 创建调用、`task.md` 回写流程
@@ -129,7 +129,7 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 
 ### 5. 完成校验
 
-**先调用短号分配**（保证 `short_id` 写回 task.md + 注册表 entry 已在；完成校验阶段会读取）：
+**先调用短号分配**（保证注册表 entry 已分配；完成校验阶段会读取）：
 
 ```bash
 node .agents/scripts/task-short-id.js alloc "$task_id"
@@ -154,14 +154,14 @@ node .agents/scripts/validate-artifact.js gate create-task .agents/workspace/act
 
 > 仅在校验通过后执行本步骤。
 
-> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。
+> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。 渲染「下一步」命令前，先读取 `.agents/rules/next-step-output.md`，按其取短号片段把命令中的 `{task-ref}` 渲染为短号 `#NN`（未分配/已释放时回退完整 TASK-id）。
 
 场景 A：已创建 Issue 时输出：
 ```
 任务已创建，并已级联创建 Issue。
 
 任务信息：
-- 任务 ID：{task-id}
+- 任务 ID：{task-id}（短号 {task-ref}）
 - 标题：{title}
 - 类型：{type}
 - 工作流：{workflow}
@@ -171,9 +171,9 @@ node .agents/scripts/validate-artifact.js gate create-task .agents/workspace/act
 - 任务文件：.agents/workspace/active/{task-id}/task.md
 
 下一步 - 执行需求分析：
-  - Claude Code / OpenCode：/analyze-task {task-id}
-  - Gemini CLI：/{{project}}:analyze-task {task-id}
-  - Codex CLI：$analyze-task {task-id}
+  - Claude Code / OpenCode：/analyze-task {task-ref}
+  - Gemini CLI：/{{project}}:analyze-task {task-ref}
+  - Codex CLI：$analyze-task {task-ref}
 ```
 
 场景 B：未创建 Issue 时输出：
@@ -181,7 +181,7 @@ node .agents/scripts/validate-artifact.js gate create-task .agents/workspace/act
 任务已创建。
 
 任务信息：
-- 任务 ID：{task-id}
+- 任务 ID：{task-id}（短号 {task-ref}）
 - 标题：{title}
 - 类型：{type}
 - 工作流：{workflow}
@@ -190,9 +190,9 @@ node .agents/scripts/validate-artifact.js gate create-task .agents/workspace/act
 - 任务文件：.agents/workspace/active/{task-id}/task.md
 
 下一步 - 执行需求分析：
-  - Claude Code / OpenCode：/analyze-task {task-id}
-  - Gemini CLI：/{{project}}:analyze-task {task-id}
-  - Codex CLI：$analyze-task {task-id}
+  - Claude Code / OpenCode：/analyze-task {task-ref}
+  - Gemini CLI：/{{project}}:analyze-task {task-ref}
+  - Codex CLI：$analyze-task {task-ref}
 ```
 
 场景 C：Issue 创建失败时输出：
@@ -200,7 +200,7 @@ node .agents/scripts/validate-artifact.js gate create-task .agents/workspace/act
 任务已创建，但 Issue 级联创建失败。
 
 任务信息：
-- 任务 ID：{task-id}
+- 任务 ID：{task-id}（短号 {task-ref}）
 - 标题：{title}
 - 类型：{type}
 - 工作流：{workflow}
@@ -214,9 +214,9 @@ Issue 创建失败：
 - 任务文件：.agents/workspace/active/{task-id}/task.md
 
 下一步 - 执行需求分析：
-  - Claude Code / OpenCode：/analyze-task {task-id}
-  - Gemini CLI：/{{project}}:analyze-task {task-id}
-  - Codex CLI：$analyze-task {task-id}
+  - Claude Code / OpenCode：/analyze-task {task-ref}
+  - Gemini CLI：/{{project}}:analyze-task {task-ref}
+  - Codex CLI：$analyze-task {task-ref}
 
 后续如需平台同步：修复认证/网络/模板问题后，可按 `.agents/rules/create-issue.md` 对当前任务手动执行一次 Issue 创建；或手动创建/查找 Issue，并把 `issue_number` 写入 task.md，后续技能会接管级联同步。
 ```

package/templates/.agents/skills/create-task/config/verify.json

@@ -18,7 +18,7 @@
       "expected_status": "active"
     },
     "activity-log": {
-      "expected_action_pattern": "Task Created",
+      "expected_action_pattern": "(Create Task|Task Created)",
       "freshness_minutes": 30
     },
     "platform-sync": {

package/templates/.agents/skills/import-codescan/SKILL.en.md

@@ -15,7 +15,7 @@ Import the specified Code Scanning (CodeQL) alert and create a remediation task.
 
 ## Task id short ref
 
-> If `{task-id}` begins with `#`, follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
+> If `{task-id}` matches `^[#]?[0-9]+$` (bare numeric or `#`-prefixed), follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
 
 ## Execution Flow
 
@@ -57,12 +57,12 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 Update task.md: `current_step` -> `requirement-analysis`.
 - **Append** to `## Activity Log` (do NOT overwrite previous entries):
   ```
-  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Import Code Scanning Alert** by {agent} — Code Scanning alert #{alert-number} imported
+  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Import Codescan** by {agent} — Code Scanning alert #{alert-number} imported
   ```
 
 ### 4. Verification Gate
 
-**Allocate short id first** (writes `short_id` back to task.md and the registry entry; the validation gate will read it):
+**Allocate short id first** (ensures the registry entry is allocated; the validation gate will read it):
 
 ```bash
 node .agents/scripts/task-short-id.js alloc "$task_id"
@@ -87,7 +87,7 @@ Keep the gate output in your reply as fresh evidence. Do not claim completion wi
 
 > Execute this step only after the verification gate passes.
 
-> **IMPORTANT**: All TUI command formats listed below must be output in full. Do not show only the format for the current AI agent. If `.agents/.airc.json` configures custom TUIs (via `customTUIs`), read each tool's `name` and `invoke`, then add the matching command line in the same format (`${skillName}` becomes the skill name and `${projectName}` becomes the project name).
+> **IMPORTANT**: All TUI command formats listed below must be output in full. Do not show only the format for the current AI agent. If `.agents/.airc.json` configures custom TUIs (via `customTUIs`), read each tool's `name` and `invoke`, then add the matching command line in the same format (`${skillName}` becomes the skill name and `${projectName}` becomes the project name). Before rendering the "Next steps" commands, read `.agents/rules/next-step-output.md` and use its short-id snippet to render `{task-ref}` in the commands as the short id `#NN` (falling back to the full TASK-id when unallocated or released).
 
 ```
 Code Scanning alert #{alert-number} imported.
@@ -98,12 +98,12 @@ Alert information:
 - Location: {file-path}:{line-number}
 
 Task information:
-- Task ID: {task-id}
+- Task ID: {task-id} (short id {task-ref})
 
 Next step:
-  - Claude Code / OpenCode: /analyze-task {task-id}
-  - Gemini CLI: /{{project}}:analyze-task {task-id}
-  - Codex CLI: $analyze-task {task-id}
+  - Claude Code / OpenCode: /analyze-task {task-ref}
+  - Gemini CLI: /{{project}}:analyze-task {task-ref}
+  - Codex CLI: $analyze-task {task-ref}
 ```
 
 

package/templates/.agents/skills/import-codescan/SKILL.zh-CN.md

@@ -15,7 +15,7 @@ description: "导入 Code Scanning 告警并创建修复任务"
 
 ## 任务入参短号别名
 
-> 如果 `{task-id}` 入参以 `#` 开头，先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
+> 如果 `{task-id}` 入参匹配 `^[#]?[0-9]+$`（裸数字或带 `#` 前缀），先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
 
 ## 执行流程
 
@@ -57,12 +57,12 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 更新 task.md：`current_step` -> `requirement-analysis`。
 - **追加**到 `## Activity Log`（不要覆盖之前的记录）：
   ```
-  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Import Code Scanning Alert** by {agent} — Code Scanning alert #{alert-number} imported
+  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Import Codescan** by {agent} — Code Scanning alert #{alert-number} imported
   ```
 
 ### 4. 完成校验
 
-**先调用短号分配**（保证 `short_id` 写回 task.md + 注册表 entry 已在；完成校验阶段会读取）：
+**先调用短号分配**（保证注册表 entry 已分配；完成校验阶段会读取）：
 
 ```bash
 node .agents/scripts/task-short-id.js alloc "$task_id"
@@ -87,7 +87,7 @@ node .agents/scripts/validate-artifact.js gate import-codescan .agents/workspace
 
 > 仅在校验通过后执行本步骤。
 
-> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。
+> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。 渲染「下一步」命令前，先读取 `.agents/rules/next-step-output.md`，按其取短号片段把命令中的 `{task-ref}` 渲染为短号 `#NN`（未分配/已释放时回退完整 TASK-id）。
 
 ```
 Code Scanning 告警 #{alert-number} 已导入。
@@ -98,12 +98,12 @@ Code Scanning 告警 #{alert-number} 已导入。
 - 位置：{file-path}:{line-number}
 
 任务信息：
-- 任务 ID：{task-id}
+- 任务 ID：{task-id}（短号 {task-ref}）
 
 下一步：
-  - Claude Code / OpenCode：/analyze-task {task-id}
-  - Gemini CLI：/agent-infra:analyze-task {task-id}
-  - Codex CLI：$analyze-task {task-id}
+  - Claude Code / OpenCode：/analyze-task {task-ref}
+  - Gemini CLI：/agent-infra:analyze-task {task-ref}
+  - Codex CLI：$analyze-task {task-ref}
 ```
 
 

package/templates/.agents/skills/import-codescan/config/verify.json

@@ -17,7 +17,7 @@
       "expected_status": "active"
     },
     "activity-log": {
-      "expected_action_pattern": "Import Code Scanning Alert",
+      "expected_action_pattern": "(Import Codescan|Import Code Scanning Alert)",
       "freshness_minutes": 30
     },
     "platform-sync": null

package/templates/.agents/skills/import-dependabot/SKILL.en.md

@@ -15,7 +15,7 @@ Import the specified Dependabot security alert and create a remediation task.
 
 ## Task id short ref
 
-> If `{task-id}` begins with `#`, follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
+> If `{task-id}` matches `^[#]?[0-9]+$` (bare numeric or `#`-prefixed), follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
 
 ## Execution Flow
 
@@ -58,12 +58,12 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 Update task.md: `current_step` -> `requirement-analysis`.
 - **Append** to `## Activity Log` (do NOT overwrite previous entries):
   ```
-  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Import Dependabot Alert** by {agent} — Dependabot alert #{alert-number} imported
+  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Import Dependabot** by {agent} — Dependabot alert #{alert-number} imported
   ```
 
 ### 4. Verification Gate
 
-**Allocate short id first** (writes `short_id` back to task.md and the registry entry; the validation gate will read it):
+**Allocate short id first** (ensures the registry entry is allocated; the validation gate will read it):
 
 ```bash
 node .agents/scripts/task-short-id.js alloc "$task_id"
@@ -88,7 +88,7 @@ Keep the gate output in your reply as fresh evidence. Do not claim completion wi
 
 > Execute this step only after the verification gate passes.
 
-> **IMPORTANT**: All TUI command formats listed below must be output in full. Do not show only the format for the current AI agent. If `.agents/.airc.json` configures custom TUIs (via `customTUIs`), read each tool's `name` and `invoke`, then add the matching command line in the same format (`${skillName}` becomes the skill name and `${projectName}` becomes the project name).
+> **IMPORTANT**: All TUI command formats listed below must be output in full. Do not show only the format for the current AI agent. If `.agents/.airc.json` configures custom TUIs (via `customTUIs`), read each tool's `name` and `invoke`, then add the matching command line in the same format (`${skillName}` becomes the skill name and `${projectName}` becomes the project name). Before rendering the "Next steps" commands, read `.agents/rules/next-step-output.md` and use its short-id snippet to render `{task-ref}` in the commands as the short id `#NN` (falling back to the full TASK-id when unallocated or released).
 
 ```
 Security alert #{alert-number} imported.
@@ -99,15 +99,15 @@ Vulnerability information:
 - Affected package: {package-name}
 
 Task information:
-- Task ID: {task-id}
+- Task ID: {task-id} (short id {task-ref})
 
 Output file:
 - Task file: .agents/workspace/active/{task-id}/task.md
 
 Next step:
-  - Claude Code / OpenCode: /analyze-task {task-id}
-  - Gemini CLI: /{{project}}:analyze-task {task-id}
-  - Codex CLI: $analyze-task {task-id}
+  - Claude Code / OpenCode: /analyze-task {task-ref}
+  - Gemini CLI: /{{project}}:analyze-task {task-ref}
+  - Codex CLI: $analyze-task {task-ref}
 ```
 
 

package/templates/.agents/skills/import-dependabot/SKILL.zh-CN.md

@@ -15,7 +15,7 @@ description: "导入 Dependabot 安全告警并创建修复任务"
 
 ## 任务入参短号别名
 
-> 如果 `{task-id}` 入参以 `#` 开头，先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
+> 如果 `{task-id}` 入参匹配 `^[#]?[0-9]+$`（裸数字或带 `#` 前缀），先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
 
 ## 执行流程
 
@@ -58,12 +58,12 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 更新 task.md：`current_step` -> `requirement-analysis`。
 - **追加**到 `## Activity Log`（不要覆盖之前的记录）：
   ```
-  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Import Dependabot Alert** by {agent} — Dependabot alert #{alert-number} imported
+  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Import Dependabot** by {agent} — Dependabot alert #{alert-number} imported
   ```
 
 ### 4. 完成校验
 
-**先调用短号分配**（保证 `short_id` 写回 task.md + 注册表 entry 已在；完成校验阶段会读取）：
+**先调用短号分配**（保证注册表 entry 已分配；完成校验阶段会读取）：
 
 ```bash
 node .agents/scripts/task-short-id.js alloc "$task_id"
@@ -88,7 +88,7 @@ node .agents/scripts/validate-artifact.js gate import-dependabot .agents/workspa
 
 > 仅在校验通过后执行本步骤。
 
-> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。
+> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。 渲染「下一步」命令前，先读取 `.agents/rules/next-step-output.md`，按其取短号片段把命令中的 `{task-ref}` 渲染为短号 `#NN`（未分配/已释放时回退完整 TASK-id）。
 
 ```
 安全告警 #{alert-number} 已导入。
@@ -99,15 +99,15 @@ node .agents/scripts/validate-artifact.js gate import-dependabot .agents/workspa
 - 受影响包：{package-name}
 
 任务信息：
-- 任务 ID：{task-id}
+- 任务 ID：{task-id}（短号 {task-ref}）
 
 产出文件：
 - 任务文件：.agents/workspace/active/{task-id}/task.md
 
 下一步：
-  - Claude Code / OpenCode：/analyze-task {task-id}
-  - Gemini CLI：/agent-infra:analyze-task {task-id}
-  - Codex CLI：$analyze-task {task-id}
+  - Claude Code / OpenCode：/analyze-task {task-ref}
+  - Gemini CLI：/agent-infra:analyze-task {task-ref}
+  - Codex CLI：$analyze-task {task-ref}
 ```
 
 

package/templates/.agents/skills/import-dependabot/config/verify.json

@@ -17,7 +17,7 @@
       "expected_status": "active"
     },
     "activity-log": {
-      "expected_action_pattern": "Import Dependabot Alert",
+      "expected_action_pattern": "(Import Dependabot|Import Dependabot Alert)",
       "freshness_minutes": 30
     },
     "platform-sync": null

package/templates/.agents/skills/import-issue/SKILL.en.md

@@ -15,7 +15,7 @@ Import the specified Issue and create a task. Argument: issue number.
 
 ## Task id short ref
 
-> If `{task-id}` begins with `#`, follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
+> If `{task-id}` matches `^[#]?[0-9]+$` (bare numeric or `#`-prefixed), follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
 
 ## Execution Flow
 
@@ -123,7 +123,7 @@ If task.md contains a valid `issue_number`, perform these sync actions (skip and
 
 ### 7. Verification Gate
 
-**Allocate short id first** (writes `short_id` back to task.md and the registry entry; the validation gate will read it):
+**Allocate short id first** (ensures the registry entry is allocated; the validation gate will read it):
 
 ```bash
 node .agents/scripts/task-short-id.js alloc "$task_id"
@@ -148,13 +148,13 @@ Keep the gate output in your reply as fresh evidence. Do not claim completion wi
 
 > Execute this step only after the verification gate passes.
 
-> **IMPORTANT**: All TUI command formats listed below must be output in full. Do not show only the format for the current AI agent. If `.agents/.airc.json` configures custom TUIs (via `customTUIs`), read each tool's `name` and `invoke`, then add the matching command line in the same format (`${skillName}` becomes the skill name and `${projectName}` becomes the project name).
+> **IMPORTANT**: All TUI command formats listed below must be output in full. Do not show only the format for the current AI agent. If `.agents/.airc.json` configures custom TUIs (via `customTUIs`), read each tool's `name` and `invoke`, then add the matching command line in the same format (`${skillName}` becomes the skill name and `${projectName}` becomes the project name). Before rendering the "Next steps" commands, read `.agents/rules/next-step-output.md` and use its short-id snippet to render `{task-ref}` in the commands as the short id `#NN` (falling back to the full TASK-id when unallocated or released).
 
 ```
 Issue #{number} imported.
 
 Task information:
-- Task ID: {task-id}
+- Task ID: {task-id} (short id {task-ref})
 - Title: {title}
 - Workflow: {workflow}
 
@@ -162,9 +162,9 @@ Output file:
 - Task file: .agents/workspace/active/{task-id}/task.md
 
 Next step - run requirements analysis:
-  - Claude Code / OpenCode: /analyze-task {task-id}
-  - Gemini CLI: /{{project}}:analyze-task {task-id}
-  - Codex CLI: $analyze-task {task-id}
+  - Claude Code / OpenCode: /analyze-task {task-ref}
+  - Gemini CLI: /{{project}}:analyze-task {task-ref}
+  - Codex CLI: $analyze-task {task-ref}
 ```
 
 

package/templates/.agents/skills/import-issue/SKILL.zh-CN.md

@@ -15,7 +15,7 @@ description: "从 Issue 导入并创建任务"
 
 ## 任务入参短号别名
 
-> 如果 `{task-id}` 入参以 `#` 开头，先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
+> 如果 `{task-id}` 入参匹配 `^[#]?[0-9]+$`（裸数字或带 `#` 前缀），先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
 
 ## 执行流程
 
@@ -123,7 +123,7 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 
 ### 7. 完成校验
 
-**先调用短号分配**（保证 `short_id` 写回 task.md + 注册表 entry 已在；完成校验阶段会读取）：
+**先调用短号分配**（保证注册表 entry 已分配；完成校验阶段会读取）：
 
 ```bash
 node .agents/scripts/task-short-id.js alloc "$task_id"
@@ -148,13 +148,13 @@ node .agents/scripts/validate-artifact.js gate import-issue .agents/workspace/ac
 
 > 仅在校验通过后执行本步骤。
 
-> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。
+> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。 渲染「下一步」命令前，先读取 `.agents/rules/next-step-output.md`，按其取短号片段把命令中的 `{task-ref}` 渲染为短号 `#NN`（未分配/已释放时回退完整 TASK-id）。
 
 ```
 Issue #{number} 已导入。
 
 任务信息：
-- 任务 ID：{task-id}
+- 任务 ID：{task-id}（短号 {task-ref}）
 - 标题：{title}
 - 工作流：{workflow}
 
@@ -162,9 +162,9 @@ Issue #{number} 已导入。
 - 任务文件：.agents/workspace/active/{task-id}/task.md
 
 下一步 - 执行需求分析：
-  - Claude Code / OpenCode：/analyze-task {task-id}
-  - Gemini CLI：/agent-infra:analyze-task {task-id}
-  - Codex CLI：$analyze-task {task-id}
+  - Claude Code / OpenCode：/analyze-task {task-ref}
+  - Gemini CLI：/agent-infra:analyze-task {task-ref}
+  - Codex CLI：$analyze-task {task-ref}
 ```
 
 

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

@@ -29,7 +29,7 @@ Before the state check is complete, do not make external-state assertions such a
 
 ## Task id short ref
 
-> If `{task-id}` begins with `#`, follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
+> If `{task-id}` matches `^[#]?[0-9]+$` (bare numeric or `#`-prefixed), follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
 
 ## Steps
 
@@ -66,6 +66,8 @@ Use it to understand:
 - identified technical risks
 - effort and complexity assessment
 
+**Round ≥ 2: respond to the prior review (only when a review artifact exists)**: if the task directory contains `review-plan.md` / `review-plan-r{N}.md`, read the highest-round review report; add a `## Response to Prior Review` section to this round's plan artifact, and for each finding verify it via Read/Grep before acting (holds → accept and fix; judged hallucinated/unfounded → rebut with counter-evidence rather than defaulting to compliance); record any open disagreement under `## Open Questions`. Round 1 has no review, so skip this section.
+
 ### 4. Understand the Problem
 
 - Read the relevant source files identified in the analysis
@@ -115,15 +117,11 @@ Update `.agents/workspace/active/{task-id}/task.md`:
 - Mark technical-design as complete in workflow progress and include the actual round when the task template supports it
 - Before appending the workflow Activity Log entry, re-estimate `effort` based on the technical plan (number of implementation steps, files touched, test matrix scope, integration surface). If the re-estimated value differs from the current value in `task.md`:
   - Overwrite the `effort` field in frontmatter with the new value
-  - Prepend an Activity Log entry recording the transition (placed before the `Technical Design (Round N)` entry):
-    ```
-    - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Plan Re-estimate** by {agent} — effort {old} → {new} (rationale: {short basis grounded in this plan})
-    ```
-  Both entries may share the same timestamp; ordering is conveyed by list position only.
-  If the re-estimated value matches the current value, skip the Re-estimate entry. The Flow A sync that follows reads the possibly updated frontmatter and propagates the new value to the Issue automatically.
+  - Append a `## Effort Re-estimate` section to this round's plan artifact `{plan-artifact}`, recording: `effort {old} → {new} (rationale: {short basis grounded in this plan})`
+  If the re-estimated value matches the current value, skip it: do not write the `## Effort Re-estimate` section. The Flow A sync that follows reads the possibly updated frontmatter and propagates the new value to the Issue automatically.
 - **Append** to `## Activity Log` (do NOT overwrite previous entries):
   ```
-  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Technical Design (Round {N})** by {agent} — Plan completed, awaiting human review → {artifact-filename}
+  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Plan Task (Round {N})** by {agent} — Plan completed, awaiting human review → {artifact-filename}
   ```
 
 If task.md contains a valid `issue_number`, perform these sync actions (skip and continue on any failure):
@@ -152,7 +150,7 @@ Keep the gate output in your reply as fresh evidence. Do not claim completion wi
 
 > Execute this step only after the verification gate passes.
 
-> **IMPORTANT**: All TUI command formats listed below must be output in full. Do not show only the format for the current AI agent. If `.agents/.airc.json` configures custom TUIs (via `customTUIs`), read each tool's `name` and `invoke`, then add the matching command line in the same format (`${skillName}` becomes the skill name and `${projectName}` becomes the project name).
+> **IMPORTANT**: All TUI command formats listed below must be output in full. Do not show only the format for the current AI agent. If `.agents/.airc.json` configures custom TUIs (via `customTUIs`), read each tool's `name` and `invoke`, then add the matching command line in the same format (`${skillName}` becomes the skill name and `${projectName}` becomes the project name). Before rendering the "Next steps" commands, read `.agents/rules/next-step-output.md` and use its short-id snippet to render `{task-ref}` in the commands as the short id `#NN` (falling back to the full TASK-id when unallocated or released).
 
 Output format:
 ```
@@ -172,9 +170,9 @@ Important: human review checkpoint.
 Please review the technical plan before continuing to implementation.
 
 Next step - review the technical plan:
-  - Claude Code / OpenCode: /review-plan {task-id}
-  - Gemini CLI: /{{project}}:review-plan {task-id}
-  - Codex CLI: $review-plan {task-id}
+  - Claude Code / OpenCode: /review-plan {task-ref}
+  - Gemini CLI: /{{project}}:review-plan {task-ref}
+  - Codex CLI: $review-plan {task-ref}
 ```
 
 ## Completion Checklist

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

@@ -29,7 +29,7 @@ tail .agents/workspace/active/{task-id}/task.md
 
 ## 任务入参短号别名
 
-> 如果 `{task-id}` 入参以 `#` 开头，先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
+> 如果 `{task-id}` 入参匹配 `^[#]?[0-9]+$`（裸数字或带 `#` 前缀），先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
 
 ## 执行步骤
 ### 1. 验证前置条件
@@ -65,6 +65,8 @@ tail .agents/workspace/active/{task-id}/task.md
 - 已识别的技术风险
 - 工作量和复杂度评估
 
+**Round ≥ 2：响应上一轮审查（仅当存在审查产物时）**：若任务目录存在 `review-plan.md` / `review-plan-r{N}.md`，读取最高轮次的审查报告；在本轮方案产物中新增 `## 对上一轮审查的响应` 段，对每条发现先 Read/Grep 核实再处置（成立 → 接受并修正；判定为幻觉/不成立 → 附反证反驳，不默认顺从），未决分歧写入 `## 未决问题`。Round 1 无审查，跳过本段。
+
 ### 4. 理解问题
 
 - 阅读分析中识别的相关源码文件
@@ -114,15 +116,11 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 - 在工作流进度中标记 technical-design 为已完成，并注明实际轮次（如果任务模板支持）
 - 在追加工作流 Activity Log 条目之前，基于技术方案（实施步骤数、涉及文件、测试矩阵范围、集成面）重估 `effort`。若重估值与 `task.md` 当前值不一致：
   - 用新值覆盖 frontmatter 的 `effort` 字段
-  - 在 `Technical Design (Round N)` 条目之前追加一条转移记录：
-    ```
-    - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Plan Re-estimate** by {agent} — effort {old} → {new} (rationale: {基于本轮方案的简短依据})
-    ```
-  两条条目可共用同一时间戳，顺序仅通过列表位置表达。
-  若重估值与当前值一致，跳过 Re-estimate 条目。后续 Flow A 同步会读取可能更新过的 frontmatter，并自动把新值同步到 Issue。
+  - 在本轮方案产物 `{plan-artifact}` 中追加 `## 工作量重估` 段，记录一条：`effort {old} → {new} (rationale: {基于本轮方案的简短依据})`
+  若重估值与当前值一致，跳过：不写入 `## 工作量重估` 段。后续 Flow A 同步会读取可能更新过的 frontmatter，并自动把新值同步到 Issue。
 - **追加**到 `## Activity Log`（不要覆盖之前的记录）：
   ```
-  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Technical Design (Round {N})** by {agent} — Plan completed, awaiting human review → {artifact-filename}
+  - {YYYY-MM-DD HH:mm:ss±HH:MM} — **Plan Task (Round {N})** by {agent} — Plan completed, awaiting human review → {artifact-filename}
   ```
 
 如果 task.md 中存在有效的 `issue_number`，执行以下同步操作（任一失败则跳过并继续）：
@@ -151,7 +149,7 @@ node .agents/scripts/validate-artifact.js gate plan-task .agents/workspace/activ
 
 > 仅在校验通过后执行本步骤。
 
-> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。
+> **重要**：以下「下一步」中列出的所有 TUI 命令格式必须完整输出，不要只展示当前 AI 代理对应的格式。如果 `.agents/.airc.json` 中配置了自定义 TUI（`customTUIs`），读取每个工具的 `name` 和 `invoke`，按同样格式补充对应命令行（`${skillName}` 替换为技能名，`${projectName}` 替换为项目名）。 渲染「下一步」命令前，先读取 `.agents/rules/next-step-output.md`，按其取短号片段把命令中的 `{task-ref}` 渲染为短号 `#NN`（未分配/已释放时回退完整 TASK-id）。
 
 输出格式：
 ```
@@ -171,9 +169,9 @@ node .agents/scripts/validate-artifact.js gate plan-task .agents/workspace/activ
 请在继续实现之前审查技术方案。
 
 下一步 - 审查技术方案：
-  - Claude Code / OpenCode：/review-plan {task-id}
-  - Gemini CLI：/{{project}}:review-plan {task-id}
-  - Codex CLI：$review-plan {task-id}
+  - Claude Code / OpenCode：/review-plan {task-ref}
+  - Gemini CLI：/agent-infra:review-plan {task-ref}
+  - Codex CLI：$review-plan {task-ref}
 ```
 
 ## 完成检查清单

package/templates/.agents/skills/plan-task/config/verify.en.json

@@ -33,7 +33,7 @@
       ]
     },
     "activity-log": {
-      "expected_action_pattern": "Technical Design \\(Round \\d+\\)",
+      "expected_action_pattern": "(Plan Task|Technical Design) \\(Round \\d+\\)",
       "freshness_minutes": 30
     },
     "platform-sync": {

package/templates/.agents/skills/plan-task/config/verify.zh-CN.json

@@ -33,7 +33,7 @@
       ]
     },
     "activity-log": {
-      "expected_action_pattern": "Technical Design \\(Round \\d+\\)",
+      "expected_action_pattern": "(Plan Task|Technical Design) \\(Round \\d+\\)",
       "freshness_minutes": 30
     },
     "platform-sync": {

package/templates/.agents/skills/restore-task/SKILL.en.md

@@ -18,7 +18,7 @@ Version stamp rule: when creating or updating `task.md` frontmatter, read `.agen
 
 ## Task id short ref
 
-> If `{task-id}` begins with `#`, follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
+> If `{task-id}` matches `^[#]?[0-9]+$` (bare numeric or `#`-prefixed), follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
 
 ## Steps
 

package/templates/.agents/skills/restore-task/SKILL.zh-CN.md

@@ -18,7 +18,7 @@ description: "从平台 Issue 评论还原本地任务文件"
 
 ## 任务入参短号别名
 
-> 如果 `{task-id}` 入参以 `#` 开头，先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
+> 如果 `{task-id}` 入参匹配 `^[#]?[0-9]+$`（裸数字或带 `#` 前缀），先读取 `.agents/rules/task-short-id.md` 的「SKILL 入参解析」段执行解析；后续命令视 `{task-id}` 为解析后的全长 `TASK-YYYYMMDD-HHMMSS` 形式。
 
 ## 执行步骤
 ### 1. 验证输入与环境

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

@@ -28,7 +28,7 @@ tail .agents/workspace/active/{task-id}/task.md
 
 ## Task id short ref
 
-> If `{task-id}` begins with `#`, follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
+> If `{task-id}` matches `^[#]?[0-9]+$` (bare numeric or `#`-prefixed), follow the "SKILL parameter resolver" section of `.agents/rules/task-short-id.md`; treat `{task-id}` as the resolved full `TASK-YYYYMMDD-HHMMSS` form for every downstream command.
 
 ## Steps
 
@@ -65,7 +65,7 @@ date "+%Y-%m-%d %H:%M:%S%:z"
 ```
 
 Set `current_step` to `requirement-analysis-review`, refresh task metadata, and append:
-`- {YYYY-MM-DD HH:mm:ss±HH:MM} — **Analysis Review (Round {N})** by {agent} — Verdict: {Approved/Changes Requested/Rejected}, blockers: {n}, major: {n}, minor: {n}[ (+ {n} env-blocked)] → {review-artifact}`
+`- {YYYY-MM-DD HH:mm:ss±HH:MM} — **Review Analysis (Round {N})** by {agent} — Verdict: {Approved/Changes Requested/Rejected}, blockers: {n}, major: {n}, minor: {n}[ (+ {n} env-blocked)] → {review-artifact}`
 
 If task.md has a valid `issue_number`, read `.agents/rules/issue-sync.md`, sync the task comment, and publish the `{review-artifact}` comment.
 
@@ -78,3 +78,5 @@ node .agents/scripts/validate-artifact.js gate review-analysis .agents/workspace
 ### 8. Tell the User
 
 Use the conclusion branch in `reference/output-templates.md` and show all TUI command formats.
+
+> When rendering "Next steps" commands, `{task-ref}` is the current task's short id `#NN` (see `.agents/rules/next-step-output.md` for lookup and fallback; read it before rendering). Other `{task-id}` placeholders (report titles, paths) keep the full TASK-id form.