@fitlab-ai/agent-infra 0.11.3 → 0.11.4

package/lib/task/rework-intent.ts

@@ -1,9 +1,14 @@
 const REWORK_INTENT_HEADINGS = ['返工意图', 'Rework Intent'] as const;
 const REWORK_INTENT_COLUMNS = [
+  'intent_id', 'finding_id', 'source_artifact', 'source_sha256', 'target',
+  'classification', 'evidence_digest', 'task_fact_digest', 'status', 'declared_at', 'consumed_at'
+] as const;
+const LEGACY_REWORK_INTENT_COLUMNS = [
   'intent_id', 'finding_id', 'source_artifact', 'source_sha256', 'target',
   'status', 'declared_at', 'consumed_at'
 ] as const;
-type ReworkTarget = 'analysis' | 'plan' | 'code';
+type ReworkTarget = 'analysis' | 'plan' | 'code' | 'pause';
+type ReworkClassification = 'scope-or-requirement' | 'design' | 'implementation' | 'human-decision' | 'insufficient-evidence';
 type ReworkIntentStatus = 'pending' | 'consumed' | 'superseded';
 type ReworkIntent = {
   intentId: string;
@@ -11,6 +16,9 @@ type ReworkIntent = {
   sourceArtifact: string;
   sourceSha256: string;
   target: ReworkTarget;
+  classification?: ReworkClassification;
+  evidenceDigest?: string;
+  taskFactDigest?: string;
   status: ReworkIntentStatus;
   declaredAt: string;
   consumedAt: string;
@@ -66,15 +74,19 @@ function parseReworkIntentDocument(content: string): ReworkIntentParseResult {
       const row = Object.fromEntries(REWORK_INTENT_COLUMNS.map((column, index) => [column, values[index]!])) as Record<string, string>;
       if (!/^RI-[1-9]\d*$/.test(row.intent_id!)) throw new Error(`invalid intent id '${row.intent_id}'`);
       if (!/^(AN|PL|CD)-[1-9]\d*$/.test(row.finding_id!)) throw new Error(`invalid finding id '${row.finding_id}'`);
-      if (!['analysis', 'plan', 'code'].includes(row.target!)) throw new Error(`invalid rework target '${row.target}'`);
+      if (!['analysis', 'plan', 'code', 'pause'].includes(row.target!)) throw new Error(`invalid rework target '${row.target}'`);
+      if (!['scope-or-requirement', 'design', 'implementation', 'human-decision', 'insufficient-evidence'].includes(row.classification!)) throw new Error(`invalid rework classification '${row.classification}'`);
       if (!['pending', 'consumed', 'superseded'].includes(row.status!)) throw new Error(`invalid rework status '${row.status}'`);
       if (!/^[a-f0-9]{64}$/.test(row.source_sha256!)) throw new Error(`invalid source hash for '${row.intent_id}'`);
+      if (!/^[a-f0-9]{64}$/.test(row.evidence_digest!) || !/^[a-f0-9]{64}$/.test(row.task_fact_digest!)) throw new Error(`invalid semantic digest for '${row.intent_id}'`);
       if (!row.source_artifact || !row.declared_at) throw new Error(`rework intent '${row.intent_id}' has invalid required fields`);
       const terminal = row.status === 'consumed' || row.status === 'superseded';
       if (terminal !== Boolean(row.consumed_at)) throw new Error(`rework intent '${row.intent_id}' has invalid consumed_at`);
       return {
         intentId: row.intent_id!, findingId: row.finding_id!, sourceArtifact: row.source_artifact!,
         sourceSha256: row.source_sha256!, target: row.target as ReworkTarget,
+        classification: row.classification as ReworkClassification,
+        evidenceDigest: row.evidence_digest!, taskFactDigest: row.task_fact_digest!,
         status: row.status as ReworkIntentStatus, declaredAt: row.declared_at!, consumedAt: row.consumed_at!
       } satisfies ReworkIntent;
     });
@@ -96,7 +108,10 @@ function renderReworkIntents(intents: readonly ReworkIntent[]): string {
     `| ${REWORK_INTENT_COLUMNS.map(() => '---').join(' | ')} |`,
     ...intents.map((intent) => `| ${[
       intent.intentId, intent.findingId, intent.sourceArtifact, intent.sourceSha256,
-      intent.target, intent.status, intent.declaredAt, intent.consumedAt
+      intent.target, intent.classification ?? (intent.target === 'analysis' ? 'scope-or-requirement' : intent.target === 'plan' ? 'design' : intent.target === 'code' ? 'implementation' : 'insufficient-evidence'),
+      intent.evidenceDigest ?? requireDigest(`${intent.findingId}|${intent.sourceArtifact}|${intent.sourceSha256}`),
+      intent.taskFactDigest ?? requireDigest(`current|${intent.findingId}|${intent.target}`),
+      intent.status, intent.declaredAt, intent.consumedAt
     ].map(escape).join(' | ')} |`)
   ].join('\n');
 }
@@ -104,11 +119,63 @@ function renderReworkIntents(intents: readonly ReworkIntent[]): string {
 function upsertReworkIntent(intents: readonly ReworkIntent[], intent: ReworkIntent): { changed: boolean; intents: readonly ReworkIntent[] } {
   const existing = intents.find((candidate) => candidate.intentId === intent.intentId);
   if (!existing) return { changed: true, intents: [...intents, intent] };
-  const identity = (value: ReworkIntent) => [value.intentId, value.findingId, value.sourceArtifact, value.sourceSha256, value.target];
+  const identity = (value: ReworkIntent) => [value.intentId, value.findingId, value.sourceArtifact, value.sourceSha256, value.target, value.classification, value.evidenceDigest, value.taskFactDigest];
   if (JSON.stringify(identity(existing)) !== JSON.stringify(identity(intent))) throw new Error(`intent '${intent.intentId}' identity conflicts with existing state`);
   return { changed: false, intents };
 }
 
+function consumeHumanDecisionReworkIntents(
+  intents: readonly ReworkIntent[],
+  findingId: string,
+  consumedAt: string
+): { changed: boolean; intents: readonly ReworkIntent[] } {
+  let changed = false;
+  const next = intents.map((intent) => {
+    if (intent.status !== 'pending' || intent.target !== 'pause' || intent.classification !== 'human-decision' || intent.findingId !== findingId) return intent;
+    changed = true;
+    return { ...intent, status: 'consumed' as const, consumedAt };
+  });
+  return { changed, intents: next };
+}
+
+function parseLegacyReworkIntentDocument(content: string): ReworkIntentParseResult {
+  // TODO(compat): Remove this explicit decoder once no task contains the eight-column rework-intent header.
+  const body = sectionBody(content);
+  if (body === null) return { ok: false, code: 'TASK_REWORK_INTENT_INVALID', message: 'legacy rework intent section is missing' };
+  const lines = body.split(/\r?\n/).filter((line) => line.trim());
+  const header = lines[0] ? cells(lines[0]) : null;
+  const separator = lines[1] ? cells(lines[1]) : null;
+  if (!header || !separator || header.length !== LEGACY_REWORK_INTENT_COLUMNS.length || !header.every((value, index) => value === LEGACY_REWORK_INTENT_COLUMNS[index])) {
+    return { ok: false, code: 'TASK_REWORK_INTENT_INVALID', message: 'rework intent section is not the known legacy table' };
+  }
+  try {
+    const intents = lines.slice(2).map((line) => {
+      const values = cells(line);
+      if (!values || values.length !== LEGACY_REWORK_INTENT_COLUMNS.length) throw new Error('legacy rework intent row has the wrong column count');
+      const row = Object.fromEntries(LEGACY_REWORK_INTENT_COLUMNS.map((column, index) => [column, values[index]!])) as Record<string, string>;
+      if (!/^RI-[1-9]\d*$/.test(row.intent_id!) || !/^(AN|PL|CD)-[1-9]\d*$/.test(row.finding_id!)) throw new Error('legacy rework intent identity is invalid');
+      if (!['analysis', 'plan', 'code'].includes(row.target!) || !['pending', 'consumed', 'superseded'].includes(row.status!)) throw new Error('legacy rework intent state is invalid');
+      if (!/^[a-f0-9]{64}$/.test(row.source_sha256!)) throw new Error('legacy rework intent source hash is invalid');
+      const legacyDigest = (value: string) => requireDigest(value);
+      const classification: ReworkClassification = row.target === 'analysis' ? 'scope-or-requirement' : row.target === 'plan' ? 'design' : 'implementation';
+      return {
+        intentId: row.intent_id!, findingId: row.finding_id!, sourceArtifact: row.source_artifact!, sourceSha256: row.source_sha256!,
+        target: row.target as ReworkTarget, classification,
+        evidenceDigest: legacyDigest(`${row.finding_id}|${row.source_artifact}|${row.source_sha256}`),
+        taskFactDigest: legacyDigest(`legacy|${row.finding_id}|${row.target}`),
+        status: row.status as ReworkIntentStatus, declaredAt: row.declared_at!, consumedAt: row.consumed_at!
+      } satisfies ReworkIntent;
+    });
+    return { ok: true, present: true, intents };
+  } catch (error) {
+    return { ok: false, code: 'TASK_REWORK_INTENT_INVALID', message: error instanceof Error ? error.message : String(error) };
+  }
+}
+
+function requireDigest(value: string): string {
+  return createHash('sha256').update(value).digest('hex');
+}
+
 function consumeReworkIntents(
   intents: readonly ReworkIntent[],
   target: ReworkTarget,
@@ -161,5 +228,8 @@ export {
   consumeReworkIntents,
   supersedeReworkIntents,
   upsertReworkIntent
+  , consumeHumanDecisionReworkIntents
+  , parseLegacyReworkIntentDocument
 };
-export type { ReworkIntent, ReworkIntentParseResult, ReworkIntentStatus, ReworkTarget };
+export type { ReworkClassification, ReworkIntent, ReworkIntentParseResult, ReworkIntentStatus, ReworkTarget };
+import { createHash } from 'node:crypto';

package/lib/task/verification-engine.ts

@@ -40,7 +40,6 @@ import type { OrchestrationRun } from "./orchestration.ts";
 import { resolveDeliveryTarget } from "./delivery-target.ts";
 import { readPrDeliveryFact } from "./pr-delivery-fact.ts";
 import { validateLocalArtifact } from "./local-artifact-finalization.ts";
-import { validateQualificationAudit } from "./qualification-audit.ts";
 import { getArtifactSchema } from "./artifact-schema.ts";
 import { inspectArtifactContract } from "./artifact-operations.ts";
 import type { VerificationShared } from "./verification-types.ts";
@@ -78,7 +77,6 @@ const BRANCH_SLUG_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 
 // Review disagreement ledger (see .agents/rules/review-handshake.md).
 const LEDGER_SECTION_NAMES = ["审查分歧账本", "Review Disagreement Ledger"];
-const DEFAULT_MAX_HANDSHAKE_ROUNDS = 3;
 const POST_REVIEW_COMMIT_STAGE = "post-review-commit";
 const SHA_PATTERN = /^[0-9a-f]{7,40}$/i;
 
@@ -511,19 +509,6 @@ function checkArtifact({ taskDir, config, artifactFile, skillName }: any): any {
   }
 
   const content = fs.readFileSync(artifactPath, "utf8");
-  let taskContent = "";
-  const taskPath = path.join(taskDir, "task.md");
-  if (fs.existsSync(taskPath)) {
-    try {
-      taskContent = fs.readFileSync(taskPath, "utf8");
-    } catch (error) {
-      return failResult("artifact", `Cannot read task qualification contract: ${error instanceof Error ? error.message : String(error)}`);
-    }
-  }
-  if (taskContent && /^review-(?:analysis|plan|code)$/.test(skillName)) {
-    const qualification = validateQualificationAudit(taskContent, content, { artifact: path.basename(artifactPath) });
-    if (!qualification.ok) return failResult("artifact", `${path.basename(artifactPath)} has qualification audit errors: ${qualification.code}: ${qualification.message}`);
-  }
   const schemaFamily = skillName === "analyze-task"
     ? "analysis"
     : skillName === "review-analysis"
@@ -547,9 +532,7 @@ function checkArtifact({ taskDir, config, artifactFile, skillName }: any): any {
   }
   if (localFamily) {
     const local = validateLocalArtifact(content, {
-      family: localFamily,
-      ...(taskContent ? { taskContent } : {}),
-      artifact: path.basename(artifactPath)
+      family: localFamily
     });
     if (!local.ok) {
       return failResult(
@@ -818,12 +801,11 @@ function checkReviewLedger({ taskDir, config, repositoryRoot }: any): any {
   }
 
   const stageScope = Array.isArray(config.stage_scope) ? config.stage_scope : null;
-  const maxRounds = Number(resolveReviewSetting(config, "maxHandshakeRounds", DEFAULT_MAX_HANDSHAKE_ROUNDS, repositoryRoot));
   const problems = [];
   let inScopeCount = 0;
 
   for (const row of rows) {
-    const { id, stage, round: roundRaw, status, evidence } = row;
+    const { id, stage, status, evidence } = row;
     const stageScoped = stageScope ? stageScope.includes(stage) : true;
     // post-review-commit exemption rows are consumed by the post-review-commit
     // check, not enforced here.
@@ -843,15 +825,6 @@ function checkReviewLedger({ taskDir, config, repositoryRoot }: any): any {
     if (status !== "open" && evidence === "") {
       problems.push(`${id}: status '${status}' requires evidence`);
     }
-    const round = Number.parseInt(roundRaw!, 10);
-    if (
-      Number.isFinite(round) &&
-      round >= maxRounds &&
-      !LEDGER_TERMINAL.has(status!) &&
-      status !== "needs-human-decision"
-    ) {
-      problems.push(`${id}: round ${round} reached limit ${maxRounds} without convergence; escalate to needs-human-decision`);
-    }
     if (!LEDGER_TERMINAL.has(status!)) {
       problems.push(`${id}: unresolved (status '${status}')`);
     }
@@ -1194,7 +1167,8 @@ function checkReviewFact({ taskDir, artifactFile, repositoryRoot }: any): any {
   let targetHead;
   let diffBase;
   try {
-    gitRoot = execFileSync("git", ["-C", taskDir, "rev-parse", "--show-toplevel"], { encoding: "utf8" }).trim();
+    const taskRepositoryRoot = execFileSync("git", ["-C", taskDir, "rev-parse", "--show-toplevel"], { encoding: "utf8" }).trim();
+    gitRoot = reviewWorktreeForTask(taskRepositoryRoot, String(task.metadata.branch || "").trim()) ?? taskRepositoryRoot;
     head = execFileSync("git", ["-C", gitRoot, "rev-parse", "HEAD"], { encoding: "utf8" }).trim();
     const target = resolveDeliveryTarget(gitRoot, { remote: deliveryRemote, baseRef: deliveryBaseRef });
     if (!target.ok) throw new Error(target.message);
@@ -1275,6 +1249,21 @@ function checkReviewFact({ taskDir, artifactFile, repositoryRoot }: any): any {
   );
 }
 
+function reviewWorktreeForTask(repositoryRoot: string, branch: string): string | null {
+  if (!branch) return null;
+  const expectedRef = `refs/heads/${branch}`;
+  const records = execFileSync("git", ["-C", repositoryRoot, "worktree", "list", "--porcelain"], {
+    encoding: "utf8",
+    stdio: ["pipe", "pipe", "pipe"]
+  }).trim().split(/\r?\n\r?\n/);
+  for (const record of records) {
+    const worktree = /^worktree (.+)$/m.exec(record)?.[1];
+    const branchRef = /^branch (.+)$/m.exec(record)?.[1];
+    if (worktree && branchRef === expectedRef) return worktree;
+  }
+  throw new Error(`Task branch '${branch}' is not checked out in a registered worktree`);
+}
+
 function resolvePostReviewBaseline({ gitRoot, lastReviewedCommit, reviewArtifact }: any): any {
   if (SHA_PATTERN.test(lastReviewedCommit) && gitCommitExists(gitRoot, lastReviewedCommit)) {
     return { ok: true, sha: lastReviewedCommit };

package/lib/task/verification.ts

@@ -15,7 +15,7 @@ type VerificationEvent =
   | 'review-analysis.completed' | 'plan.completed' | 'review-plan.completed'
   | 'code.completed' | 'review-code.completed' | 'manual-validation.completed' | 'validation-run.completed'
   | 'block-task.completed' | 'cancel-task.completed' | 'commit.completed'
-  | 'complete-task.preflight' | 'complete-task.hard-preflight' | 'complete-task.completed'
+  | 'complete-task.preflight' | 'complete-task.hard-preflight' | 'complete-task.prepared' | 'complete-task.completed'
   | 'create-pr.completed' | 'create-task.completed'
   | 'import-codescan.completed' | 'import-dependabot.completed'
   | 'import-issue.completed' | 'watch-pr.completed'
@@ -71,6 +71,7 @@ const VERIFICATION_CATALOG: Readonly<Record<VerificationEvent, VerificationSpec>
   'commit.completed': gate('commit', 'active'),
   'complete-task.preflight': { skill: 'complete-task', expectedState: 'active', mode: 'checks', checks: ['required-pr-delivery'] },
   'complete-task.hard-preflight': { skill: 'complete-task', expectedState: 'active', mode: 'checks', checks: ['required-pr-delivery'] },
+  'complete-task.prepared': gate('complete-task', 'active'),
   'complete-task.completed': gate('complete-task', 'completed'),
   'create-pr.completed': gate('create-pr', 'active'),
   'create-task.completed': gate('create-task', 'active'),

package/lib/task/workflow-warning-intents.ts

@@ -1,6 +1,7 @@
 import fs from 'node:fs';
 
 import { resolveTaskRef } from './resolve-ref.ts';
+import { parseTaskFrontmatter } from './frontmatter.ts';
 import {
   WORKFLOW_WARNING_COLUMNS,
   WORKFLOW_WARNING_HEADINGS,
@@ -137,11 +138,18 @@ function applyWorkflowWarningIntent(intent: WorkflowWarningIntent, options: Task
 function projectFinalizationWarning(
   taskRef: string,
   warning: OperationWarning & { status: 'open' | 'resolved'; resolvedAt: string | null },
-  options: TaskWriteOptions = {}
+  options: TaskWriteOptions & { resolution?: 'passed' | 'superseded' } = {}
 ): FinalizationWarningProjectionResult {
   const resolved = resolveTaskRef(taskRef, { repoRoot: options.repoRoot });
   if (!resolved.ok) return { status: 'failed', changed: false, error: { code: resolved.code, message: resolved.message } };
-  if (resolved.state !== 'completed') return { status: 'failed', changed: false, error: { code: 'TASK_STATE_MISMATCH', message: `task ${resolved.taskId} is ${resolved.state}, expected completed` } };
+  let prepared = resolved.state === 'completed';
+  if (!prepared && resolved.state === 'active') {
+    try { prepared = parseTaskFrontmatter(fs.readFileSync(resolved.taskMdPath, 'utf8')).status === 'completed'; }
+    catch { prepared = false; }
+  }
+  if (!prepared) {
+    return { status: 'failed', changed: false, error: { code: 'TASK_STATE_MISMATCH', message: `task ${resolved.taskId} is ${resolved.state}, expected a prepared or completed task` } };
+  }
   let content: string;
   let rows: WorkflowWarning[];
   try {
@@ -160,22 +168,26 @@ function projectFinalizationWarning(
       message: warning.message,
       action: retryHintForWarning(warning),
       resolvedAt: warning.resolvedAt || (warning.status === 'resolved' ? metadata.timestamp : ''),
-      resolution: warning.status === 'resolved' ? 'Resolved by a successful finalization retry' : ''
+      resolution: warning.status === 'resolved'
+        ? options.resolution === 'superseded' ? 'Superseded by a later verification observation' : 'Resolved by a successful finalization retry'
+        : ''
     }
     : {
       id: nextWarningId(rows), time: metadata.timestamp, step: warning.step,
       severity: warning.severity, code: warning.code, status: warning.status,
       target: warning.target, message: warning.message, action: retryHintForWarning(warning),
-      resolvedAt: warning.resolvedAt || '', resolution: warning.status === 'resolved' ? 'Resolved by a successful finalization retry' : ''
+      resolvedAt: warning.resolvedAt || '', resolution: warning.status === 'resolved'
+        ? options.resolution === 'superseded' ? 'Superseded by a later verification observation' : 'Resolved by a successful finalization retry'
+        : ''
     };
   if (existing && JSON.stringify(existing) === JSON.stringify(after)) return { status: 'no-op', changed: false, error: null };
   const written = writeTask({
     taskRef: resolved.taskId,
-    expectedState: 'completed',
+    expectedState: resolved.state,
     mutations: [...sectionMutation(content), rowMutation(after)]
   }, {
     ...options,
-    taskLocation: { repoRoot: resolved.repoRoot, taskId: resolved.taskId, taskMdPath: resolved.taskMdPath, state: 'completed' },
+    taskLocation: { repoRoot: resolved.repoRoot, taskId: resolved.taskId, taskMdPath: resolved.taskMdPath, state: resolved.state },
     metadataProvider: () => metadata
   });
   if (written.status === 'failed') return { status: 'failed', changed: false, error: { code: written.error.code, message: written.error.message } };

package/lib/task/workspace-snapshot.ts

@@ -42,7 +42,8 @@ function captureWorktreeTree(repoRoot: string, forcedPath: string | null): strin
   const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-infra-orchestration-index-'));
   const indexFile = path.join(tempDir, 'index');
   try {
-    git(repoRoot, indexFile, ['read-tree', 'HEAD']);
+    try { git(repoRoot, indexFile, ['read-tree', 'HEAD']); }
+    catch { git(repoRoot, indexFile, ['read-tree', '--empty']); }
     git(repoRoot, indexFile, ['add', '-A', '--', ':/']);
     if (forcedPath && fs.existsSync(path.join(repoRoot, forcedPath))) {
       git(repoRoot, indexFile, ['add', '-f', '--', forcedPath]);
@@ -138,5 +139,5 @@ function diffWorkspaceSnapshots(repoRoot: string, before: string, after: string)
   return [...changed].sort();
 }
 
-export { captureRepositorySnapshot, captureWorkspaceSnapshot, diffWorkspaceSnapshots };
+export { captureRepositorySnapshot, captureWorkspaceSnapshot, captureWorktreeTree, diffWorkspaceSnapshots };
 export type { OrchestrationWorkspaceFingerprint, RepositorySnapshot, WorkspaceSnapshotContext };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fitlab-ai/agent-infra",
-  "version": "0.11.3",
+  "version": "0.11.4",
   "description": "Bootstrap tool for AI multi-tool collaboration infrastructure — works with Claude Code, Codex, Antigravity CLI, and OpenCode",
   "license": "MIT",
   "type": "module",

package/templates/.agents/rules/review-handshake.en.md

@@ -29,11 +29,11 @@ After the executor gives `adjusted` / `refuted` / `cannot-judge`, the reviewer m
 - **Hold with new evidence** → set back to `open` (with new evidence, returned to the executor).
 - **Escalate to human** → set to `needs-human-decision`.
 
-## Convergence termination (loop guard)
+## Evidence-driven rework convergence
 
-- The per-finding handshake round limit is `MAX_HANDSHAKE_ROUNDS`, default **3**, overridable via `review.maxHandshakeRounds` in `.agents/.airc.json`.
-- When a finding's `round` reaches the limit without entering a terminal state, it must be forced to `needs-human-decision`; the gate rejects rows that hit the limit without escalating.
-- `needs-human-decision` keeps blocking completion until a human records a ruling in the task.md `## 人工裁决` section and flips the row to `human-decided`.
+- The first Changes Requested verdict permits an ordinary revision. After one revision-review cycle, another Changes Requested verdict must classify the problem as scope or requirements, design, implementation, human decision, or insufficient evidence before another executor artifact is created.
+- Classification binds the finding, source review SHA, and stable task-fact digest. Artifact names, rounds, and retry counts are not evidence by themselves.
+- Human choice and insufficient evidence pause stably; implementation can continue when new decisive evidence exists. Retry count alone never forces a human escalation.
 
 ## Same-model convergence-bias mitigation (documentation-level discipline)
 

package/templates/.agents/rules/review-handshake.zh-CN.md

@@ -29,11 +29,11 @@
 - **补充新证据后坚持** → 账本置回 `open`（带新证据，回到执行方）。
 - **升级人工裁决** → 账本置 `needs-human-decision`。
 
-## 收敛终止语义（防死循环）
+## 证据驱动的返工收敛
 
-- 单条 finding 的握手轮次上限 `MAX_HANDSHAKE_ROUNDS`，默认 **3**，可在 `.agents/.airc.json` 的 `review.maxHandshakeRounds` 覆盖。
-- 某条 finding 的 `round` 达到上限仍未进入终态，必须强制置 `needs-human-decision`；gate 会拦截"达限却未升级"的行。
-- `needs-human-decision` 持续阻塞完成，直到人工在 task.md `## 人工裁决` 段记录裁定并把该行翻为 `human-decided`。
+- 首次 Changes Requested 允许正常修订。完成一次修订—复审后再次收到 Changes Requested 时，必须在下一执行产物前把问题分类为范围或需求、方案、实现、人工裁决或证据不足。
+- 分类必须绑定 finding、来源审查 SHA 和稳定任务事实摘要。文件名、artifact round 或返工次数本身不构成新证据。
+- 人工选择或证据不足进入稳定暂停；具有新决定性证据的实现缺陷可以继续修订。不得仅因次数达到阈值强制升级人工裁决。
 
 ## 同源模型收敛偏差缓解（文档级纪律）
 

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

@@ -13,6 +13,10 @@ If the entry operands contain `--orchestrated`, bind `{execution-flag}` to `--or
 
 ## Boundary / Critical Rules
 
+### Flow decision
+
+The analysis artifact must record the selected path, factual basis, unmet higher-path conditions, and factual upgrade triggers in `## Flow Decision`. The path is streamlined, standard, or full; file count, module count, and speculative risk cannot upgrade it by themselves.
+
 ### Persisted Report Evidence
 
 Before generating the analysis report, read `.agents/rules/evidence-reporting.md`. Record the command, target scope, status or structured result, actual result, and uncovered parts for state checks and successful checks; include decisive raw excerpts only for failures, blocking conditions, or disputes.
@@ -61,7 +65,7 @@ If `task.md` is missing, tell the user to create or import the task first.
 
 ### 2. Resolve the Analysis Context
 
-Run `agent-infra-internal task-artifact {task-id} inspect --family analysis`. Continue only for `ready`; take `{analysis-round}` / `{analysis-artifact}` from `next.round` / `next.name` and revision inputs from `inputs`. Do not scan rounds or construct names in the skill.
+Run `agent-infra-internal task-artifact {task-id} inspect --family analysis`. Continue only for `ready`. When `selection.disposition` is `reuse`, reuse `selection.artifact`, do not run started/init or write a new artifact, and continue directly to completion verification and next-step guidance. Otherwise take `{analysis-round}` / `{analysis-artifact}` from `next.round` / `next.name` and revision inputs from `inputs`. Do not scan rounds or construct names in the skill.
 
 ### 3. Read Task Context
 
@@ -261,7 +265,10 @@ Keep the gate output in your reply as fresh evidence. Do not claim completion wi
 > Before rendering next steps, read `.agents/rules/next-step-output.md`, invoke the shared helper only for the selected scenario, and insert its stdout at `{next-step-commands}`.
 
 Output format:
-Populate `{next-step-commands}` for this scenario by running `agent-infra-internal agent-client next-steps --skill review-analysis --task-ref {task-ref}`.
+Select one command from the canonical path to populate `{next-step-commands}`:
+- Streamlined: `agent-infra-internal agent-client next-steps --skill code-task --task-ref {task-ref}`
+- Standard: `agent-infra-internal agent-client next-steps --skill plan-task --task-ref {task-ref}`
+- Full: `agent-infra-internal agent-client next-steps --skill review-analysis --task-ref {task-ref}`
 
 ```
 Analysis complete for task {task-id}.
@@ -274,7 +281,7 @@ Summary:
 Output file:
 - Analysis report: .agents/workspace/active/{task-id}/{analysis-artifact}
 
-Next step - review the analysis:
+Next step - continue on the selected path:
 {next-step-commands}
 ```
 
@@ -292,7 +299,7 @@ Next step - review the analysis:
 
 ## STOP
 
-After completing the checklist, **stop immediately**. Wait for the user to review the analysis result and manually invoke the `plan-task` skill.
+After completing the checklist, **stop immediately**. Wait for the user to invoke the next stage selected above.
 
 ## Notes
 

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

@@ -13,6 +13,10 @@ description: >
 
 ## 行为边界 / 关键规则
 
+### 流程裁定
+
+分析产物必须在 `## 流程裁定` 中记录本任务路径、判定依据、未满足的更高路径条件和事实型升级触发条件。路径仅可为精简、标准或完整；文件数、模块数和推测性风险不能单独升级路径。
+
 ### 持久化报告证据
 
 生成分析报告时，先读取 `.agents/rules/evidence-reporting.md`。状态核对和成功检查记录命令、目标范围、状态/结构化结果、实际结果和未覆盖部分；失败、阻塞或争议才附决定性原文摘录。
@@ -64,7 +68,7 @@ agent-infra-internal task-event {task-id} analyze.started --agent {standard-agen
 
 ### 2. 解析分析上下文
 
-运行 `agent-infra-internal task-artifact {task-id} inspect --family analysis`。仅当结果为 `ready` 时继续；从 `next.round` / `next.name` 记录 `{analysis-round}` / `{analysis-artifact}`，从 `inputs` 读取修订上下文。不得自行扫描轮次或拼装文件名。随后执行 started 事件，并以事件返回的 `artifactContext` 复核同一身份。
+运行 `agent-infra-internal task-artifact {task-id} inspect --family analysis`。仅当结果为 `ready` 时继续。若 `selection.disposition` 为 `reuse`，复用 `selection.artifact`，不得执行 started、init 或写入新产物，并直接进入完成校验与下一步提示。其他状态从 `next.round` / `next.name` 记录 `{analysis-round}` / `{analysis-artifact}`，从 `inputs` 读取修订上下文；不得自行扫描轮次或拼装文件名。随后执行 started 事件，并以事件返回的 `artifactContext` 复核同一身份。
 
 ### 3. 阅读任务上下文
 
@@ -261,7 +265,10 @@ agent-infra-internal task-verify {task-id} analyze.completed --artifact {analysi
 > 渲染下一步前先读取 `.agents/rules/next-step-output.md`，仅为已选场景调用统一 helper，并将 stdout 填入 `{next-step-commands}`。
 
 输出格式：
-使用 `agent-infra-internal agent-client next-steps --skill review-analysis --task-ref {task-ref}` 生成本场景的 `{next-step-commands}`。
+按分析中的规范路径选择一条命令生成 `{next-step-commands}`：
+- 精简路径：`agent-infra-internal agent-client next-steps --skill code-task --task-ref {task-ref}`
+- 标准路径：`agent-infra-internal agent-client next-steps --skill plan-task --task-ref {task-ref}`
+- 完整路径：`agent-infra-internal agent-client next-steps --skill review-analysis --task-ref {task-ref}`
 
 ```
 任务 {task-id} 分析完成。
@@ -274,7 +281,7 @@ agent-infra-internal task-verify {task-id} analyze.completed --artifact {analysi
 产出文件：
 - 分析报告：.agents/workspace/active/{task-id}/{analysis-artifact}
 
-下一步 - 审查需求分析：
+下一步 - 按所选路径继续：
 {next-step-commands}
 ```
 
@@ -292,7 +299,7 @@ agent-infra-internal task-verify {task-id} analyze.completed --artifact {analysi
 
 ## 停止
 
-完成检查清单后，**立即停止**。等待用户审查分析结果并手动调用 `plan-task` 技能。
+完成检查清单后，**立即停止**。等待用户调用上述所选路径的下一阶段。
 
 ## 注意事项
 

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

@@ -1,8 +1,8 @@
 ---
 name: code-task
 description: >
-  Implement code from the technical plan and output a report.
-  Use when an approved technical plan needs implementing, or code review found issues to fix.
+  Implement code from the selected lifecycle input and output a report.
+  Use when analysis or a technical plan is ready for the selected path, or code review found issues to fix.
   Only invoke this skill automatically when the conversation includes a resolvable task reference.
 ---
 
@@ -11,16 +11,20 @@ description: >
 
 If the entry operands contain `--orchestrated`, bind `{execution-flag}` to `--orchestrated` and forward it unchanged to the completed event; otherwise bind it to an empty value. Never infer it from `orchestration.json`, environment variables, or prior artifacts. Lifecycle events also require explicit trigger data: use `{trigger-initiator}=orchestrator` for orchestration and `model` otherwise; `{request-id}` is a stable single-line identifier for this task and artifact round, and `{reason-code}` is `user-request` for initial work and `review-finding` for fixes or decisions. Reuse the same values for started and completed.
 
-Implement the approved plan and produce `code.md` or `code-r{N}.md`. This skill supports initial implementation, fix mode based on `review-code` feedback, and human-decision-driven implementation.
+Implement from the input selected by the lifecycle path and produce `code.md` or `code-r{N}.md`. This skill supports initial implementation, fix mode based on `review-code` feedback, and human-decision-driven implementation.
 
 ## Boundary / Critical Rules
 
+### Path and rework
+
+This stage consumes only the canonical path fact parsed by core from the latest valid analysis artifact; a stage omitted by that path must not create an artifact. When another Changes Requested verdict follows one completed revision-review cycle in the same stage, classify the rework before the next executor artifact and bind it to the finding, source SHA, and stable task-fact digest. A round or filename change is not new evidence.
+
 ### Persisted Report Evidence
 
 Before generating the implementation report, read `.agents/rules/evidence-reporting.md`. Successful tests record the command, target scope, status or structured result, actual result, and uncovered parts; failures, blocking conditions, or disputes retain a reproducible entry point, exact location, and decisive excerpt instead of complete successful stdout.
 
 - When evaluating candidate qualification or `HD-N`, read `.agents/rules/decision-qualification.md`, audit normalized task constraints/candidates, and record the five qualification-audit tables in the implementation report; unknown or unconfirmed constraints must not automatically exclude a candidate
-- Follow the latest plan artifact: `plan.md` or `plan-r{N}.md`
+- Follow the lifecycle input selected by core: `analysis.md` / `analysis-r{N}.md` for the streamlined path, and `plan.md` / `plan-r{N}.md` for the standard or full path
 - Before generating task or lifecycle Markdown that will be synchronized to an Issue, read `.agents/rules/sync-content-generation.md` and apply its producer-side constraints; the sync path does not parse or rewrite the body
 - Read `.agents/rules/compatibility-policy.md` before implementation. Implement only the compatibility budget explicitly approved by the plan; never retain old branches, result contracts, or migration shims merely to be “safe”
 - Fix mode verifies each finding of the latest `review-code` one by one: fix it if it holds, or rebut it and record it under unresolved if it is unfounded/hallucinated; do not expand to issues the review did not list; manual-validation items are out of scope
@@ -56,7 +60,7 @@ After prerequisites and mode are confirmed and before this round's first artifac
 
 ### 1. Verify Prerequisites
 
-Require `task.md` and at least one plan artifact: `plan.md` or `plan-r{N}.md`.
+Require `task.md`. Step 4 validates the lifecycle input selected by the chosen path; the skill must not require a plan artifact unconditionally.
 
 ### 2. Ensure the Task Branch
 
@@ -78,6 +82,8 @@ status=$?
 echo "$result"
 ```
 
+When `selection.disposition` is `reuse`, reuse `selection.artifact`, do not run started/init, modify code, or write a new artifact, and continue directly to completion verification and next-step guidance. Otherwise continue with the table below.
+
 Dispatch by `$status` and `result.mode`:
 
 - `0` + `"init"`: initial implementation; record `{code-artifact}` and `{code-round}`
@@ -90,11 +96,11 @@ Dispatch by `$status` and `result.mode`:
 
 ### 5. Read Structured Inputs
 
-Use only the structured result from step 4: read the selected plan artifact and, in fix mode, the selected review artifact. Use `next.name` as `{code-artifact}` and `next.round` as `{code-round}`. In decision mode, take the unified identity from `implementation_input`, `decision_id`, and `decision_evidence`; do not rescan or construct identities in the skill.
+Use only the structured result from step 4: read `{lifecycle-input-artifact}` from `inputs` (analysis for the streamlined path, plan otherwise) and, in fix mode, the selected review artifact. Use `next.name` as `{code-artifact}` and `next.round` as `{code-round}`. In decision mode, take the unified identity from `implementation_input`, `decision_id`, and `decision_evidence`; do not rescan or construct identities in the skill.
 
-### 6. Read the Technical Plan
+### 6. Read the Lifecycle Input
 
-Extract implementation steps, files, test strategy, constraints, risks, and approved tradeoffs. In decision mode, also read the `{input-id}` row and its `{decision-evidence}` record in task.md, and implement only that ruling's requested behavior change.
+Extract implementation steps, files, test strategy, constraints, risks, and approved tradeoffs from `{lifecycle-input-artifact}`. In decision mode, also read the `{input-id}` row and its `{decision-evidence}` record in task.md, and implement only that ruling's requested behavior change.
 
 ### 7. Implement the Code