@fitlab-ai/agent-infra 0.8.3 → 0.8.5

package/templates/.agents/scripts/review-diff-fingerprint.js

@@ -13,7 +13,8 @@ const repoRoot = execFileSync("git", ["rev-parse", "--show-toplevel"], {
 }).trim();
 
 function usage() {
-  console.error("Usage: node .agents/scripts/review-diff-fingerprint.js <worktree|staged> <baseline>");
+  console.error("Usage: node .agents/scripts/review-diff-fingerprint.js <worktree|staged> <baseline> [--format json]");
+  console.error("   or: node .agents/scripts/review-diff-fingerprint.js compare <expected-tree> <actual-tree> [--format json]");
   process.exit(2);
 }
 
@@ -42,6 +43,15 @@ function splitNull(output) {
   return output.split("\0").filter((value) => value !== "");
 }
 
+function pathExists(filePath) {
+  try {
+    fs.lstatSync(filePath);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 function hashDiff(args, env = process.env) {
   const diff = execFileSync("git", args, {
     cwd: repoRoot,
@@ -51,49 +61,110 @@ function hashDiff(args, env = process.env) {
   return `sha256:${crypto.createHash("sha256").update(diff).digest("hex")}`;
 }
 
-function worktreeFingerprint(baseline, globs) {
+function withTemporaryIndex(baseline, callback) {
   const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "agent-infra-review-index-"));
   const tempIndex = path.join(tempDir, "index");
   const env = { ...process.env, GIT_INDEX_FILE: tempIndex };
 
   try {
     execFileSync("git", ["read-tree", baseline], { cwd: repoRoot, env });
+    return callback(env);
+  } finally {
+    fs.rmSync(tempDir, { recursive: true, force: true });
+  }
+}
 
-    const tracked = splitNull(git(["diff", "--name-only", "-z", baseline, "--", ...globs]));
-    const untracked = splitNull(git(["ls-files", "-o", "--exclude-standard", "-z", "--", ...globs]));
-    const paths = [...new Set([...tracked, ...untracked])];
-
-    for (const filePath of paths) {
-      const absolutePath = path.join(repoRoot, filePath);
-      if (fs.existsSync(absolutePath)) {
-        execFileSync("git", ["update-index", "--add", "--", filePath], { cwd: repoRoot, env });
-      } else {
-        execFileSync("git", ["update-index", "--remove", "--", filePath], { cwd: repoRoot, env });
-      }
+function projectWorktree(baseline, globs, env) {
+  const tracked = splitNull(git(["diff", "--name-only", "-z", baseline, "--", ...globs]));
+  const untracked = splitNull(git(["ls-files", "-o", "--exclude-standard", "-z", "--", ...globs]));
+  const paths = [...new Set([...tracked, ...untracked])];
+
+  for (const filePath of paths) {
+    const absolutePath = path.join(repoRoot, filePath);
+    if (pathExists(absolutePath)) {
+      execFileSync("git", ["update-index", "--add", "--", filePath], { cwd: repoRoot, env });
+    } else {
+      execFileSync("git", ["update-index", "--remove", "--", filePath], { cwd: repoRoot, env });
     }
+  }
+}
 
-    return hashDiff(["diff", "--cached", "--binary", baseline, "--", ...globs], env);
-  } finally {
-    fs.rmSync(tempDir, { recursive: true, force: true });
+function projectStaged(baseline, globs, env) {
+  const paths = splitNull(git(["diff", "--cached", "--name-only", "-z", baseline, "--", ...globs]));
+  for (const filePath of paths) {
+    const entry = execFileSync(
+      "git",
+      ["--literal-pathspecs", "ls-files", "--stage", "-z", "--", filePath],
+      { cwd: repoRoot, encoding: "buffer" }
+    );
+    const indexInfo = entry.length > 0
+      ? entry
+      : Buffer.from(`0 ${"0".repeat(40)}\t${filePath}\0`);
+    execFileSync("git", ["update-index", "-z", "--index-info"], {
+      cwd: repoRoot,
+      env,
+      input: indexInfo
+    });
   }
 }
 
-function stagedFingerprint(baseline, globs) {
-  return hashDiff(["diff", "--cached", "--binary", baseline, "--", ...globs]);
+function snapshot(mode, baseline, globs) {
+  return withTemporaryIndex(baseline, (env) => {
+    if (mode === "worktree") {
+      projectWorktree(baseline, globs, env);
+    } else {
+      projectStaged(baseline, globs, env);
+    }
+    return {
+      baseline,
+      fingerprint: hashDiff(["diff", "--cached", "--binary", baseline, "--", ...globs], env),
+      tree: git(["write-tree"], { env }).trim()
+    };
+  });
+}
+
+function compareTrees(expected, actual) {
+  git(["rev-parse", "--verify", `${expected}^{tree}`]);
+  git(["rev-parse", "--verify", `${actual}^{tree}`]);
+  const fields = splitNull(git(["diff", "--name-status", "-z", "--no-renames", expected, actual]));
+  const result = { equal: fields.length === 0, added: [], missing: [], different: [] };
+  for (let index = 0; index < fields.length; index += 2) {
+    const status = fields[index];
+    const filePath = fields[index + 1];
+    if (status === "A") {
+      result.added.push(filePath);
+    } else if (status === "D") {
+      result.missing.push(filePath);
+    } else {
+      result.different.push(filePath);
+    }
+  }
+  return result;
 }
 
 function main(argv) {
-  const [mode, baseline] = argv;
+  const [mode, first, second] = argv;
+  const json = argv.includes("--format") && argv[argv.indexOf("--format") + 1] === "json";
+
+  if (mode === "compare") {
+    if (!first || !second) {
+      usage();
+    }
+    const result = compareTrees(first, second);
+    process.stdout.write(json ? `${JSON.stringify(result)}\n` : `${result.equal ? "equal" : "different"}\n`);
+    process.exitCode = result.equal ? 0 : 1;
+    return;
+  }
+
+  const baseline = first;
   if (!["worktree", "staged"].includes(mode) || !baseline) {
     usage();
   }
 
-  git(["rev-parse", "--verify", `${baseline}^{commit}`]);
+  const resolvedBaseline = git(["rev-parse", "--verify", `${baseline}^{commit}`]).trim();
   const globs = resolvePostReviewGlobs({}, loadReviewConfig());
-  const fingerprint = mode === "worktree"
-    ? worktreeFingerprint(baseline, globs)
-    : stagedFingerprint(baseline, globs);
-  process.stdout.write(`${fingerprint}\n`);
+  const result = snapshot(mode, resolvedBaseline, globs);
+  process.stdout.write(json ? `${JSON.stringify(result)}\n` : `${result.fingerprint}\n`);
 }
 
 main(process.argv.slice(2));

package/templates/.agents/scripts/validate-artifact.js

@@ -6,7 +6,10 @@ import { fileURLToPath } from "node:url";
 
 import {
   extractReviewBaseline,
+  extractReviewDiffFingerprint,
+  extractReviewedSnapshotTree,
   findAuthoritativeReviewCodeArtifact,
+  parseReviewVerdict,
   resolvePostReviewGlobs
 } from "./lib/post-review-commit.js";
 
@@ -223,6 +226,8 @@ function runCheck(type, context) {
       return checkCompletionChecklist(context);
     case "review-ledger":
       return checkReviewLedger(context);
+    case "review-fact":
+      return checkReviewFact(context);
     case "post-review-commit":
       return checkPostReviewCommit(context);
     default: {
@@ -775,12 +780,10 @@ function checkPostReviewCommit({ taskDir, config }) {
 
   const task = loadTask(taskDir);
   const content = fs.readFileSync(reviewArtifact.path, "utf8");
-  const reviewBaseline = extractReviewBaseline(content);
   const lastReviewedCommit = task.ok ? (task.metadata.last_reviewed_commit || "").trim() : "";
   const baselineSource = resolvePostReviewBaseline({
     gitRoot,
     lastReviewedCommit,
-    reviewBaseline,
     reviewArtifact: reviewArtifact.fileName
   });
   if (!baselineSource.ok) {
@@ -814,39 +817,123 @@ function checkPostReviewCommit({ taskDir, config }) {
 
   return failResult(
     "post-review-commit",
-    `${commits.length} commit(s) to code/rule paths after review baseline ${sha.slice(0, 8)}; re-run review-code or record a human-decided exemption`
+    `${commits.length} commit(s) to code/rule paths after reviewed commit ${sha.slice(0, 8)}; re-run review-code or record a human-decided exemption`
   );
 }
 
-function resolvePostReviewBaseline({ gitRoot, lastReviewedCommit, reviewBaseline, reviewArtifact }) {
-  if (lastReviewedCommit) {
-    if (SHA_PATTERN.test(lastReviewedCommit) && gitCommitExists(gitRoot, lastReviewedCommit)) {
-      return { ok: true, sha: lastReviewedCommit };
-    }
+function checkReviewFact({ taskDir, artifactFile }) {
+  const resolvedArtifact = resolveArtifactPath(
+    taskDir,
+    "review-code.md|review-code-r{N}.md",
+    artifactFile
+  );
+  if (!resolvedArtifact.ok) {
+    return failResult("review-fact", resolvedArtifact.message);
+  }
+
+  const task = loadTask(taskDir);
+  if (!task.ok) {
+    return failResult("review-fact", task.message);
+  }
+
+  const content = fs.readFileSync(resolvedArtifact.path, "utf8");
+  const verdict = parseReviewVerdict(content);
+  const reviewBaseline = extractReviewBaseline(content);
+  const reviewedFingerprint = extractReviewDiffFingerprint(content);
+  const reviewedTree = extractReviewedSnapshotTree(content);
+
+  if (!["通过", "需要修改", "拒绝", "Approved", "Changes Requested", "Rejected"].includes(verdict)) {
+    return failResult("review-fact", `Unsupported review verdict '${verdict}'`);
+  }
+
+  let gitRoot;
+  let head;
+  let baseline;
+  try {
+    gitRoot = execFileSync("git", ["-C", taskDir, "rev-parse", "--show-toplevel"], { encoding: "utf8" }).trim();
+    head = execFileSync("git", ["-C", gitRoot, "rev-parse", "HEAD"], { encoding: "utf8" }).trim();
+    baseline = execFileSync("git", ["-C", gitRoot, "rev-parse", `${reviewBaseline}^{commit}`], { encoding: "utf8" }).trim();
+  } catch {
+    return blockedResult(
+      "review-fact",
+      `Unable to resolve review baseline '${reviewBaseline}' in the task repository; re-run review-code`
+    );
+  }
+
+  if (baseline !== head) {
+    return failResult(
+      "review-fact",
+      `Review baseline ${baseline.slice(0, 8)} does not match current HEAD ${head.slice(0, 8)}; re-run review-code`
+    );
+  }
+
+  let actualSnapshot;
+  try {
+    actualSnapshot = JSON.parse(execFileSync(
+      process.execPath,
+      [path.join(repoRoot, ".agents", "scripts", "review-diff-fingerprint.js"), "worktree", baseline, "--format", "json"],
+      { cwd: gitRoot, encoding: "utf8" }
+    ));
+  } catch {
+    return blockedResult(
+      "review-fact",
+      `Unable to recompute reviewed diff fingerprint from baseline ${baseline.slice(0, 8)}; re-run review-code`
+    );
+  }
+
+  if (actualSnapshot.fingerprint !== reviewedFingerprint) {
+    return failResult(
+      "review-fact",
+      `Reviewed diff fingerprint does not match the current worktree for baseline ${baseline.slice(0, 8)}; re-run review-code`
+    );
   }
 
-  if (!reviewBaseline) {
-    return {
-      ok: false,
-      result: passResult(
-        "post-review-commit",
-        `${reviewArtifact} predates baseline-commit anchoring; skipped (legacy artifact)`,
-        [`${reviewArtifact} has no 审查基线提交 / Review Baseline Commit field`]
-      )
-    };
+  if (!reviewedTree || actualSnapshot.tree !== reviewedTree) {
+    return failResult(
+      "review-fact",
+      `Reviewed snapshot tree does not match the current worktree for baseline ${baseline.slice(0, 8)}; re-run review-code`
+    );
   }
 
-  if (!SHA_PATTERN.test(reviewBaseline)) {
-    return {
-      ok: false,
-      result: blockedResult(
-        "post-review-commit",
-        `${reviewArtifact} has an empty or malformed 审查基线提交 SHA ('${reviewBaseline}'); manual remediation required`
-      )
-    };
+  if (["通过", "Approved"].includes(verdict)) {
+    const lastReviewedCommit = String(task.metadata.last_reviewed_commit || "").trim();
+    const cleanSnapshot = actualSnapshot.tree === execFileSync(
+      "git",
+      ["-C", gitRoot, "rev-parse", `${baseline}^{tree}`],
+      { encoding: "utf8" }
+    ).trim();
+    if (cleanSnapshot && lastReviewedCommit !== baseline) {
+      return failResult(
+        "review-fact",
+        `Approved clean review must set task last_reviewed_commit to baseline ${baseline.slice(0, 8)}`
+      );
+    }
+    if (!cleanSnapshot && lastReviewedCommit) {
+      return failResult(
+        "review-fact",
+        "Approved review with uncommitted changes must remain unanchored until commit"
+      );
+    }
   }
 
-  return { ok: true, sha: reviewBaseline };
+  return passResult(
+    "review-fact",
+    `Review fact valid for ${path.basename(resolvedArtifact.path)} at ${baseline.slice(0, 8)}`
+  );
+}
+
+function resolvePostReviewBaseline({ gitRoot, lastReviewedCommit, reviewArtifact }) {
+  if (SHA_PATTERN.test(lastReviewedCommit) && gitCommitExists(gitRoot, lastReviewedCommit)) {
+    return { ok: true, sha: lastReviewedCommit };
+  }
+
+  return {
+    ok: false,
+    result: blockedResult(
+      "post-review-commit",
+      `${reviewArtifact}: reviewed snapshot was not anchored to a valid commit; re-run commit or review-code`
+    )
+  };
 }
 
 function gitCommitExists(gitRoot, sha) {
@@ -942,22 +1029,41 @@ function parseFrontmatter(content) {
 function getSectionContent(content, names) {
   const lines = content.split(/\r?\n/);
 
+  function visibleHeadings() {
+    const headings = [];
+    let fence = null;
+    for (let index = 0; index < lines.length; index += 1) {
+      const line = lines[index];
+      if (fence) {
+        const closer = line.match(/^ {0,3}(`+|~+)\s*$/);
+        if (closer && closer[1][0] === fence.character && closer[1].length >= fence.length) {
+          fence = null;
+        }
+        continue;
+      }
+      const opener = line.match(/^ {0,3}(`{3,}|~{3,})(?:[^`~].*)?$/);
+      if (opener) {
+        fence = { character: opener[1][0], length: opener[1].length };
+        continue;
+      }
+      if (line.startsWith("## ")) {
+        headings.push({ index, text: line.trim() });
+      }
+    }
+    return headings;
+  }
+
+  const headings = visibleHeadings();
+
   for (const name of names) {
     const heading = `## ${name}`;
-    const startIndex = lines.findIndex((line) => line.trim() === heading);
-    if (startIndex === -1) {
+    const position = headings.findIndex((item) => item.text === heading);
+    if (position === -1) {
       continue;
     }
-
-    const sectionLines = [];
-    for (let index = startIndex + 1; index < lines.length; index += 1) {
-      if (lines[index].startsWith("## ")) {
-        break;
-      }
-      sectionLines.push(lines[index]);
-    }
-
-    return sectionLines.join("\n").trim();
+    const startIndex = headings[position].index;
+    const endIndex = headings[position + 1]?.index ?? lines.length;
+    return lines.slice(startIndex + 1, endIndex).join("\n").trim();
   }
 
   return "";

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

@@ -210,7 +210,7 @@ Create `.agents/workspace/active/{task-id}/{analysis-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/'
 ```
 
 Update `.agents/workspace/active/{task-id}/task.md`:

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

@@ -209,7 +209,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/'
 ```
 
 更新 `.agents/workspace/active/{task-id}/task.md`：
@@ -275,7 +275,7 @@ node .agents/scripts/validate-artifact.js gate analyze-task .agents/workspace/ac
 
 下一步 - 审查需求分析：
   - Claude Code / OpenCode：/review-analysis {task-ref}
-  - Gemini CLI：/agent-infra:review-analysis {task-ref}
+  - Gemini CLI：/{{project}}:review-analysis {task-ref}
   - Codex CLI：$review-analysis {task-ref}
 ```
 

package/templates/.agents/skills/archive-tasks/scripts/archive-tasks.sh

@@ -210,7 +210,7 @@ rebuild_manifest() {
   entries_file="$tmpdir/manifest.tsv"
   month_keys_file="$tmpdir/manifest-months.tsv"
   year_keys_file="$tmpdir/manifest-years.tsv"
-  generated_at=$(date "+%Y-%m-%d %H:%M:%S%:z")
+  generated_at=$(date "+%Y-%m-%d %H:%M:%S%z" | sed 's/\([+-][0-9][0-9]\)\([0-9][0-9]\)$/\1:\2/')
 
   mkdir -p "$ARCHIVE_DIR"
   : > "$entries_file"

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

@@ -58,7 +58,7 @@ Before blocking, thoroughly analyze:
 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/'
 ```
 
 Update `.agents/workspace/active/{task-id}/task.md`:

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

@@ -57,7 +57,7 @@ description: >
 获取当前时间：
 
 ```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/'
 ```
 
 更新 `.agents/workspace/active/{task-id}/task.md`：
@@ -140,7 +140,7 @@ ai sandbox rm {branch}
 
 下一步 - 检查任务状态（解除阻塞后）：
   - Claude Code / OpenCode：/check-task {task-ref}
-  - Gemini CLI：/agent-infra:check-task {task-ref}
+  - Gemini CLI：/{{project}}:check-task {task-ref}
   - Codex CLI：$check-task {task-ref}
 ```
 

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

@@ -58,7 +58,7 @@ When syncing to the Issue, replace any existing `status:` labels with the inferr
 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/'
 ```
 
 Update `task.md` in the task directory:

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

@@ -57,7 +57,7 @@ description: >
 获取当前时间：
 
 ```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`：
@@ -149,7 +149,7 @@ ai sandbox rm {branch}
 
 下一步 - 查看已转移任务：
   - Claude Code / OpenCode：/check-task {task-ref}
-  - Gemini CLI：/agent-infra:check-task {task-ref}
+  - Gemini CLI：/{{project}}:check-task {task-ref}
   - Codex CLI：$check-task {task-ref}
 ```
 

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

@@ -78,15 +78,15 @@ ai task status {task-id}
 
 | 当前状态           | Claude Code / OpenCode       | Gemini CLI                               | Codex CLI                    |
 |--------------------|------------------------------|------------------------------------------|------------------------------|
-| 分析完成           | `/review-analysis {task-ref}` | `/agent-infra:review-analysis {task-ref}` | `$review-analysis {task-ref}` |
-| 需求分析审查通过   | `/plan-task {task-ref}`       | `/agent-infra:plan-task {task-ref}`       | `$plan-task {task-ref}`       |
-| 需求分析审查有问题 | `/analyze-task {task-ref}`    | `/agent-infra:analyze-task {task-ref}`    | `$analyze-task {task-ref}`    |
-| 计划完成           | `/review-plan {task-ref}`     | `/agent-infra:review-plan {task-ref}`     | `$review-plan {task-ref}`     |
-| 技术方案审查通过   | `/code-task {task-ref}`       | `/agent-infra:code-task {task-ref}`       | `$code-task {task-ref}`       |
-| 技术方案审查有问题 | `/plan-task {task-ref}`       | `/agent-infra:plan-task {task-ref}`       | `$plan-task {task-ref}`       |
-| 实现完成           | `/review-code {task-ref}`     | `/agent-infra:review-code {task-ref}`     | `$review-code {task-ref}`     |
-| 代码审查通过       | `/commit`                    | `/agent-infra:commit`                    | `$commit`                    |
-| 代码审查有问题     | `/code-task {task-ref}`       | `/agent-infra:code-task {task-ref}`       | `$code-task {task-ref}`       |
+| 分析完成           | `/review-analysis {task-ref}` | `/{{project}}:review-analysis {task-ref}` | `$review-analysis {task-ref}` |
+| 需求分析审查通过   | `/plan-task {task-ref}`       | `/{{project}}:plan-task {task-ref}`       | `$plan-task {task-ref}`       |
+| 需求分析审查有问题 | `/analyze-task {task-ref}`    | `/{{project}}:analyze-task {task-ref}`    | `$analyze-task {task-ref}`    |
+| 计划完成           | `/review-plan {task-ref}`     | `/{{project}}:review-plan {task-ref}`     | `$review-plan {task-ref}`     |
+| 技术方案审查通过   | `/code-task {task-ref}`       | `/{{project}}:code-task {task-ref}`       | `$code-task {task-ref}`       |
+| 技术方案审查有问题 | `/plan-task {task-ref}`       | `/{{project}}:plan-task {task-ref}`       | `$plan-task {task-ref}`       |
+| 实现完成           | `/review-code {task-ref}`     | `/{{project}}:review-code {task-ref}`     | `$review-code {task-ref}`     |
+| 代码审查通过       | `/commit`                    | `/{{project}}:commit`                    | `$commit`                    |
+| 代码审查有问题     | `/code-task {task-ref}`       | `/{{project}}:code-task {task-ref}`       | `$code-task {task-ref}`       |
 | 任务被阻塞         | 解除阻塞或提供所需信息       | —                                        | 解除阻塞或提供所需信息       |
 | 任务已完成         | 无需操作                     | —                                        | 无需操作                     |
 

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

@@ -88,7 +88,7 @@ If a related task exists (search for `codescan_alert_number: <alert-number>`):
 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/'
 ```
 
 - Add the dismissal record to task.md

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

@@ -88,7 +88,7 @@ Code Scanning 告警 #{alert-number}
 获取当前时间：
 
 ```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
@@ -128,7 +128,7 @@ ai sandbox rm {branch}
 
 下一步 - 完成并归档任务（如有关联任务）：
   - Claude Code / OpenCode：/complete-task {task-ref}
-  - Gemini CLI：/agent-infra:complete-task {task-ref}
+  - Gemini CLI：/{{project}}:complete-task {task-ref}
   - Codex CLI：$complete-task {task-ref}
 ```
 

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

@@ -96,7 +96,7 @@ If a related task exists (search for `security_alert_number: <alert-number>`):
 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/'
 ```
 
 - Add the dismissal record to task.md

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

@@ -96,7 +96,7 @@ CVE：{cve-id}
 获取当前时间：
 
 ```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
@@ -136,7 +136,7 @@ ai sandbox rm {branch}
 
 下一步 - 完成并归档任务（如有关联任务）：
   - Claude Code / OpenCode：/complete-task {task-ref}
-  - Gemini CLI：/agent-infra:complete-task {task-ref}
+  - Gemini CLI：/{{project}}:complete-task {task-ref}
   - Codex CLI：$complete-task {task-ref}
 ```
 

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

@@ -114,7 +114,7 @@ Create `.agents/workspace/active/{task-id}/{code-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 `code`, refresh task metadata, and append one Activity Log entry:

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

@@ -156,7 +156,7 @@ echo "$result"
 获取当前时间：
 
 ```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/'
 ```
 
 更新 `.agents/workspace/active/{task-id}/task.md`：

package/templates/.agents/skills/code-task/reference/branch-management.zh-CN.md

@@ -4,7 +4,7 @@
 
 ## 分支名规则
 
-- 格式：`agent-infra-{type}-{slug}`
+- 格式：`{{project}}-{type}-{slug}`
 - 项目前缀：读取 `.agents/.airc.json` 中的 `project`
 - `{type}`：读取 `task.md` frontmatter 中的 `type`
 - `{slug}`：根据任务标题提取 3-6 个英文关键词，转为 kebab-case
@@ -23,7 +23,7 @@
 - 当前分支不一致：按下方”创建与切换命令”章节切换到已记录分支
 
 场景 B：`task.md` 未记录任务分支
-- 判断当前分支是否符合项目分支命名规范（`agent-infra-{type}-{slug}`）且语义上属于当前任务
+- 判断当前分支是否符合项目分支命名规范（`{{project}}-{type}-{slug}`）且语义上属于当前任务
 - 符合：将当前分支名回写到 `task.md`，继续
 - 不符合：生成新的任务分支名，按下方”创建与切换命令”章节创建并切换，回写到 `task.md`
 

package/templates/.agents/skills/code-task/reference/fix-mode.en.md

@@ -74,11 +74,11 @@ Fix status:
 Next step - re-review or commit:
 - Re-review (always recommended):
   - Claude Code / OpenCode: /review-code {task-ref}
-  - Gemini CLI: /agent-infra:review-code {task-ref}
+  - Gemini CLI: /{{project}}:review-code {task-ref}
   - Codex CLI: $review-code {task-ref}
 - Commit directly (optional; only when all issues are resolved and changes are low risk):
   - Claude Code / OpenCode: /commit
-  - Gemini CLI: /agent-infra:commit
+  - Gemini CLI: /{{project}}:commit
   - Codex CLI: $commit
 ```
 

package/templates/.agents/skills/code-task/reference/fix-mode.zh-CN.md

@@ -74,11 +74,11 @@ manual-validation 项不在修复范围。处理规则：
 下一步 - 重新审查或提交：
 - 重新审查（始终推荐）：
   - Claude Code / OpenCode：/review-code {task-ref}
-  - Gemini CLI：/agent-infra:review-code {task-ref}
+  - Gemini CLI：/{{project}}:review-code {task-ref}
   - Codex CLI：$review-code {task-ref}
 - 直接提交（可选；仅在所有问题已解决且风险可控时）：
   - Claude Code / OpenCode：/commit
-  - Gemini CLI：/agent-infra:commit
+  - Gemini CLI：/{{project}}:commit
   - Codex CLI：$commit
 ```
 

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

@@ -15,6 +15,6 @@
 
 下一步 - 代码审查：
   - Claude Code / OpenCode：/review-code {task-ref}
-  - Gemini CLI：/agent-infra:review-code {task-ref}
+  - Gemini CLI：/{{project}}:review-code {task-ref}
   - Codex CLI：$review-code {task-ref}
 ```