@godv61/dsh-task-engine 0.23.9 → 0.25.0

package/hooks/commit-msg

@@ -33,8 +33,9 @@ var import_node_path = __toESM(require("node:path"), 1);
 function artifactsForStage(stage, config2) {
   return config2.artifacts.filter((artifact) => artifact.stage === stage);
 }
-function todosBlockers(state2) {
+function todosBlockers(state2, config2) {
   if (state2.items.length === 0) return ["no implementation items"];
+  const depth = config2?.review_depth ?? "two-stage";
   const blockers = [];
   for (const item of state2.items) {
     if (item.status !== "done") {
@@ -42,11 +43,13 @@ function todosBlockers(state2) {
       continue;
     }
     if (item.review === void 0) {
-      blockers.push(`item "${item.id}" is done but has no two-stage review`);
+      blockers.push(`item "${item.id}" is done but has no review`);
       continue;
     }
-    if (item.review.spec.outcome !== "pass") blockers.push(`item "${item.id}" spec review is not pass`);
-    if (item.review.quality.outcome !== "pass") blockers.push(`item "${item.id}" quality review is not pass`);
+    if (item.review.spec?.outcome !== "pass") blockers.push(`item "${item.id}" spec review is not pass`);
+    if (depth === "two-stage" && item.review.quality?.outcome !== "pass") {
+      blockers.push(`item "${item.id}" quality review is not pass`);
+    }
   }
   return blockers;
 }
@@ -57,7 +60,7 @@ function guardSatisfied(guard, state2, config2) {
     case "solution_confirmation":
       return state2.solution_confirmed;
     case "todos_done":
-      return todosBlockers(state2).length === 0;
+      return todosBlockers(state2, config2).length === 0;
     case "verified": {
       if (!state2.verification.passed) return false;
       if (config2.high_risk_requires_verification && state2.risk_level === "high_risk") {
@@ -87,11 +90,45 @@ function validateCommitMessage(message2, config2) {
     errors: [`commit summary "${message2}" does not match ${config2.commit.message_hint}`]
   };
 }
+function verificationHeldStages(config2) {
+  const held = /* @__PURE__ */ new Set();
+  const queue = config2.transitions.filter((transition) => (transition.requires ?? []).includes("verified")).map((transition) => transition.to);
+  while (queue.length > 0) {
+    const stage = queue.shift();
+    if (held.has(stage)) continue;
+    held.add(stage);
+    for (const transition of config2.transitions) {
+      if (transition.from === stage && !held.has(transition.to)) queue.push(transition.to);
+    }
+  }
+  return held;
+}
+function verificationBlockers(state2, config2) {
+  if (state2.execution_version !== 1) return [];
+  if (!verificationHeldStages(config2).has(state2.stage)) return [];
+  const blockers = [];
+  if (!state2.verification.passed) {
+    blockers.push("this flow requires a passing verification at this stage, and the current verification is not passing");
+  }
+  if (config2.high_risk_requires_verification && state2.risk_level === "high_risk") {
+    const receipt = state2.verification.receipt;
+    if (receipt === void 0) {
+      blockers.push("a high-risk task needs a real command receipt, and none is recorded");
+    } else if (receipt.exit_code !== 0 || receipt.timed_out || receipt.aborted) {
+      blockers.push("a high-risk task needs a command that exited 0 without timing out or aborting");
+    }
+  }
+  return blockers;
+}
 function commitCheckpoint(state2, config2) {
   const { policy, checkpoints } = config2.commit;
   if (policy === "manual") {
     return { allowed: false, reason: "commit policy is manual \u2014 await an explicit user instruction" };
   }
+  const verification = verificationBlockers(state2, config2);
+  if (verification.length > 0) {
+    return { allowed: false, reason: verification.join("; ") };
+  }
   if (checkpoints.includes(state2.stage)) {
     const ready = config2.transitions.filter((transition) => transition.from === state2.stage).every((transition) => (transition.requires ?? []).every((g) => guardSatisfied(g, state2, config2)));
     if (!ready) {
@@ -118,6 +155,10 @@ function checkFileScope(state2, committing, config2) {
 }
 
 // src/workflows.ts
+function bundled(skill, ...rules) {
+  const ref = (name) => ({ source: "bundled", name });
+  return { skill: ref(skill), rules: rules.map(ref) };
+}
 var STANDARD = {
   stages: ["\u9700\u6C42\u8BC4\u5BA1", "\u8BBE\u8BA1", "\u5F00\u53D1", "\u4EA4\u4ED8", "\u4EE3\u7801\u5BA1\u6838", "\u5B8C\u6210"],
   start_stage: "\u9700\u6C42\u8BC4\u5BA1",
@@ -128,25 +169,34 @@ var STANDARD = {
     { from: "\u4EA4\u4ED8", to: "\u4EE3\u7801\u5BA1\u6838", requires: ["verified"] },
     { from: "\u4EE3\u7801\u5BA1\u6838", to: "\u5B8C\u6210", requires: ["review_passed", "artifacts_present"] }
   ],
+  // No artifacts, no commit policy, no skills: the skeleton carries none of them.
+  artifacts: [],
+  commit: { policy: "task", message_pattern: "", message_hint: "\u65E0\u683C\u5F0F\u8981\u6C42", checkpoints: ["\u4EE3\u7801\u5BA1\u6838"], file_scope: true },
+  high_risk_requires_verification: true
+};
+var STANDARD_RECOMMENDATION = {
+  commit: {
+    // Only the TEXT conventions. Policy, checkpoints and scope stay on the
+    // skeleton: they decide when a gate fires, not how a message reads.
+    message_pattern: "^\u3010(\\S+)\u3011\u3010(?:TASK|T\\d+)\u3011.+",
+    message_hint: "\u3010<task_id>\u3011\u3010TASK/T1\u3011\u8BF4\u660E \u2014\u2014 \u7B2C\u4E00\u6BB5\u586B\u672C\u4EFB\u52A1 id\uFF08\u5982 GREET-001\uFF09\uFF0C\u5199\u7ED3\u679C\u4E0D\u5199\u7A7A\u6CDB\u52A8\u4F5C"
+  },
   artifacts: [
     { stage: "\u9700\u6C42\u8BC4\u5BA1", id: "requirement", name: "\u9700\u6C42\u8BF4\u660E", fields: ["scope", "acceptance_criteria"] },
     { stage: "\u8BBE\u8BA1", id: "design", name: "\u8BBE\u8BA1\u6587\u6863", fields: ["approach", "risks", "impact"] },
     { stage: "\u4EE3\u7801\u5BA1\u6838", id: "review", name: "\u8BC4\u5BA1\u8BB0\u5F55", fields: ["conclusion", "issues"] }
   ],
-  commit: {
-    policy: "task",
-    message_pattern: "^\u3010(\\S+)\u3011\u3010(?:TASK|T\\d+)\u3011.+",
-    message_hint: "\u3010<task_id>\u3011\u3010TASK/T1\u3011\u8BF4\u660E \u2014\u2014 \u7B2C\u4E00\u6BB5\u586B\u672C\u4EFB\u52A1 id\uFF08\u5982 GREET-001\uFF09\uFF0C\u5199\u7ED3\u679C\u4E0D\u5199\u7A7A\u6CDB\u52A8\u4F5C",
-    checkpoints: ["\u4EE3\u7801\u5BA1\u6838"],
-    file_scope: true
-  },
-  high_risk_requires_verification: true,
   stage_bindings: {
-    "\u9700\u6C42\u8BC4\u5BA1": { skills: ["requirement-analysis"], rules: ["security-redlines"] },
-    "\u8BBE\u8BA1": { skills: ["solution-design"] },
-    "\u5F00\u53D1": { skills: ["code-implement"], rules: ["coding-conventions"] },
-    "\u4EA4\u4ED8": { skills: ["code-verify"], rules: ["coding-conventions"] },
-    "\u4EE3\u7801\u5BA1\u6838": { skills: ["code-review", "code-commit"], rules: ["security-redlines", "commit-conventions"] }
+    "\u9700\u6C42\u8BC4\u5BA1": { skills: [bundled("requirement-analysis", "security-redlines")] },
+    "\u8BBE\u8BA1": { skills: [bundled("solution-design")] },
+    "\u5F00\u53D1": { skills: [bundled("code-implement", "coding-conventions", "security-redlines")] },
+    "\u4EA4\u4ED8": { skills: [bundled("code-verify")] },
+    "\u4EE3\u7801\u5BA1\u6838": {
+      skills: [
+        bundled("code-review", "coding-conventions", "security-redlines"),
+        bundled("code-commit", "commit-conventions")
+      ]
+    }
   }
 };
 var AGILE = {
@@ -155,24 +205,43 @@ var AGILE = {
   transitions: [
     { from: "\u9700\u6C42", to: "\u5F00\u53D1", requires: ["requirement_confirmation"] },
     { from: "\u5F00\u53D1", to: "\u4EA4\u4ED8", requires: ["todos_done"] },
+    // Entering 审查 is unconditional. A review guard on this edge would be
+    // circular — it would demand the verdict BEFORE the stage that produces it —
+    // and it would also block the commit at 交付, since a commit requires its
+    // stage's outgoing guards. What 审查 requires is declared as completion_guards
+    // instead, because a terminal stage has no outgoing edge to carry it.
     { from: "\u4EA4\u4ED8", to: "\u5BA1\u67E5", requires: [] }
   ],
-  artifacts: [
-    { stage: "\u9700\u6C42", id: "requirement", name: "\u9700\u6C42\u8BF4\u660E", fields: ["scope"] }
-  ],
+  artifacts: [],
+  commit: { policy: "item", message_pattern: "", message_hint: "\u65E0\u683C\u5F0F\u8981\u6C42", checkpoints: ["\u4EA4\u4ED8"], file_scope: true },
+  high_risk_requires_verification: false,
+  // 审查 is terminal and IS the review, so there is no outgoing edge to carry
+  // the guard. Declaring it here is what makes a blocked review prevent
+  // completion; without it the stage could be reached and finished with the
+  // review failing, which is what the assessment found.
+  completion_guards: ["review_passed"]
+};
+var AGILE_RECOMMENDATION = {
   commit: {
-    policy: "item",
-    message_pattern: "^\u3010(\\S+)\u3011\u3010T\\d+\u3011.+",
-    message_hint: "\u3010<task_id>\u3011\u3010T1\u3011\u8BF4\u660E \u2014\u2014 \u7B2C\u4E00\u6BB5\u586B\u672C\u4EFB\u52A1 id",
-    checkpoints: ["\u4EA4\u4ED8"],
-    file_scope: true
+    // `item` policy emits two label shapes: `T<n>` mid-flow and `TASK` at the
+    // closing checkpoint. The pattern accepts BOTH, so the label the engine hands
+    // the model always satisfies the rule that validates it.
+    message_pattern: "^\u3010(\\S+)\u3011\u3010(?:TASK|T\\d+)\u3011.+",
+    message_hint: "\u3010<task_id>\u3011\u3010TASK/T1\u3011\u8BF4\u660E \u2014\u2014 \u7B2C\u4E00\u6BB5\u586B\u672C\u4EFB\u52A1 id\uFF1B\u5B9E\u65BD\u9879\u63D0\u4EA4\u7528 T1\u3001T2\uFF0C\u6536\u5C3E\u63D0\u4EA4\u7528 TASK"
   },
-  high_risk_requires_verification: false,
+  artifacts: [
+    { stage: "\u9700\u6C42", id: "requirement", name: "\u9700\u6C42\u8BF4\u660E", fields: ["scope"] },
+    // The 审查 stage binds code-review, whose instructions write this artifact with
+    // `record artifact=review`. Declaring it keeps that binding executable: the
+    // engine refuses an undeclared artifact, so a bound skill pointing at one would
+    // be a contract the recommendation made impossible to satisfy.
+    { stage: "\u5BA1\u67E5", id: "review", name: "\u8BC4\u5BA1\u8BB0\u5F55", fields: ["conclusion", "issues"] }
+  ],
   stage_bindings: {
-    "\u9700\u6C42": { skills: ["requirement-analysis"] },
-    "\u5F00\u53D1": { skills: ["code-implement"], rules: ["coding-conventions"] },
-    "\u4EA4\u4ED8": { skills: ["code-verify", "code-commit"], rules: ["commit-conventions"] },
-    "\u5BA1\u67E5": { skills: ["code-review"] }
+    "\u9700\u6C42": { skills: [bundled("requirement-analysis", "security-redlines")] },
+    "\u5F00\u53D1": { skills: [bundled("code-implement", "coding-conventions", "security-redlines")] },
+    "\u4EA4\u4ED8": { skills: [bundled("code-verify"), bundled("code-commit", "commit-conventions")] },
+    "\u5BA1\u67E5": { skills: [bundled("code-review", "coding-conventions", "security-redlines")] }
   }
 };
 var MINIMAL = {
@@ -182,17 +251,17 @@ var MINIMAL = {
     { from: "\u5F00\u53D1", to: "\u4EA4\u4ED8", requires: ["todos_done"] }
   ],
   artifacts: [],
-  commit: {
-    policy: "task",
-    message_pattern: "",
-    message_hint: "\u65E0\u683C\u5F0F\u8981\u6C42",
-    checkpoints: ["\u4EA4\u4ED8"],
-    file_scope: false
-  },
-  high_risk_requires_verification: false,
+  commit: { policy: "task", message_pattern: "", message_hint: "\u65E0\u683C\u5F0F\u8981\u6C42", checkpoints: ["\u4EA4\u4ED8"], file_scope: false },
+  high_risk_requires_verification: false
+};
+var MINIMAL_RECOMMENDATION = {
+  // A fast-change flow checks each change once, not twice under two headings a
+  // short change rarely distinguishes. The item still has to be reviewed — what
+  // drops is the duplicated verdict, which is where the weight actually was.
+  review_depth: "single",
   stage_bindings: {
-    "\u5F00\u53D1": { skills: ["code-implement"] },
-    "\u4EA4\u4ED8": { skills: ["code-commit"], rules: ["commit-conventions"] }
+    "\u5F00\u53D1": { skills: [bundled("code-implement", "coding-conventions", "security-redlines")] },
+    "\u4EA4\u4ED8": { skills: [bundled("code-commit", "commit-conventions")] }
   }
 };
 function deriveCapabilities(config2) {
@@ -204,40 +273,61 @@ function deriveCapabilities(config2) {
   if (config2.commit.file_scope) caps.push("file_scope");
   return caps;
 }
-function preset(id, version, label, description, config2) {
-  return { id, version, label, description, capabilities: deriveCapabilities(config2), config: config2 };
+function preset(id, version, label, description, config2, recommendation) {
+  return {
+    id,
+    version,
+    label,
+    description,
+    capabilities: deriveCapabilities(config2),
+    config: config2,
+    // exactOptionalPropertyTypes: omit rather than assign undefined.
+    ...recommendation !== void 0 ? { recommendation } : {}
+  };
 }
 var FLOW_PRESETS = {
-  standard: preset("standard", 2, "\u6807\u51C6\u7814\u53D1", "\u9700\u6C42\u8BC4\u5BA1 \u2192 \u8BBE\u8BA1 \u2192 \u5F00\u53D1 \u2192 \u4EA4\u4ED8 \u2192 \u4EE3\u7801\u5BA1\u6838\uFF0C\u5BA1\u6838\u540E\u63D0\u4EA4", STANDARD),
-  agile: preset("agile", 1, "\u654F\u6377\u8F7B\u91CF", "\u9700\u6C42 \u2192 \u5F00\u53D1 \u2192 \u4EA4\u4ED8 \u2192 \u5BA1\u67E5\uFF0C\u56DB\u9636\u6BB5\u3001\u5C11\u4EA7\u7269", AGILE),
-  minimal: preset("minimal", 1, "\u7EAF\u4EE3\u7801", "\u5F00\u53D1 \u2192 \u4EA4\u4ED8\uFF0C\u4E24\u9636\u6BB5\uFF0C\u53EA\u7559\u63D0\u4EA4\u95E8\u7981", MINIMAL)
+  standard: preset("standard", 3, "\u5B8C\u6574\u7814\u53D1", "\u65B0\u529F\u80FD\u3001\u67B6\u6784\u6216\u8DE8\u6A21\u5757\u6539\u52A8\u3001\u9AD8\u98CE\u9669\u4EFB\u52A1\uFF1A\u9700\u6C42\u786E\u8BA4 \u2192 \u65B9\u6848\u786E\u8BA4 \u2192 \u5B9E\u73B0 \u2192 \u9A8C\u8BC1 \u2192 \u5BA1\u6838 \u2192 \u63D0\u4EA4", STANDARD, STANDARD_RECOMMENDATION),
+  // Version 4 for agile: 交付 → 审查 now requires review_passed, where it previously
+  // required nothing. That is a gate-semantics change, so a task created before it
+  // keeps its frozen version 3 config and behaves exactly as it did.
+  //
+  // Version 3 across all three: the preset is now a bare skeleton and its former
+  // built-in bindings, commit rule and artifacts are a separate recommendation a
+  // user adopts explicitly. Tasks created before this keep their frozen config and
+  // are unaffected; a project's existing config is likewise left exactly as it is.
+  agile: preset("agile", 4, "\u65E5\u5E38\u8FED\u4EE3", "\u76EE\u6807\u660E\u786E\u7684\u5E38\u89C4\u529F\u80FD\u4E0E\u7F3A\u9677\u4FEE\u590D\uFF1A\u76EE\u6807\u4E0E\u9A8C\u6536 \u2192 \u5B9E\u73B0 \u2192 \u9A8C\u6536\u4E0E\u5BA1\u67E5 \u2192 \u63D0\u4EA4", AGILE, AGILE_RECOMMENDATION),
+  minimal: preset("minimal", 3, "\u5FEB\u901F\u4FEE\u6539", "\u5C40\u90E8\u3001\u4F4E\u98CE\u9669\u3001\u65B9\u6848\u660E\u786E\u7684\u6539\u52A8\uFF1A\u4FEE\u6539 \u2192 \u68C0\u67E5\u4E0E\u63D0\u4EA4\uFF0C\u6BCF\u9879\u4E00\u6B21\u68C0\u67E5", MINIMAL, MINIMAL_RECOMMENDATION)
 };
 function dedupe(names) {
   return [...new Set(names)];
 }
-function mergeBindings(base, override) {
-  if (override === void 0) return base;
-  let changed = false;
-  const merged = { ...base.stage_bindings };
-  for (const [stage, addition] of Object.entries(override)) {
-    const existing = merged[stage];
-    const skills = dedupe([...existing?.skills ?? [], ...addition.skills ?? []]);
-    const rules = dedupe([...existing?.rules ?? [], ...addition.rules ?? []]);
-    const binding = {};
-    if (skills.length > 0) binding.skills = skills;
-    if (rules.length > 0) binding.rules = rules;
-    merged[stage] = binding;
-    changed = true;
+function applyProjectConfig(base, project) {
+  if (project === void 0) return base;
+  const next = { ...base };
+  if (project.stage_bindings !== void 0) {
+    const bindings = {};
+    for (const [stage, binding] of Object.entries(project.stage_bindings)) {
+      const entry = {};
+      if ((binding.skills ?? []).length > 0) entry.skills = [...binding.skills];
+      const legacy = dedupe(binding.legacy_rules ?? []);
+      if (legacy.length > 0) entry.legacy_rules = legacy;
+      bindings[stage] = entry;
+    }
+    next.stage_bindings = bindings;
   }
-  if (!changed) return base;
-  return { ...base, stage_bindings: merged };
+  if (project.commit !== void 0) next.commit = project.commit;
+  if (project.artifacts !== void 0) next.artifacts = project.artifacts;
+  if (project.review_depth !== void 0) next.review_depth = project.review_depth;
+  if (project.commit_required !== void 0) next.commit_required = project.commit_required;
+  return next;
 }
-function resolveFlow(flow, override) {
+function resolveFlow(flow, project) {
   const preset2 = FLOW_PRESETS[flow];
   if (preset2 === void 0) {
     return { ok: false, code: "UNKNOWN_FLOW", flow, knownFlows: Object.keys(FLOW_PRESETS) };
   }
-  return { ok: true, config: mergeBindings(preset2.config, override?.stage_bindings), preset: preset2 };
+  const { flow: _ignored, ...rest } = project ?? { flow };
+  return { ok: true, config: applyProjectConfig(preset2.config, { flow, ...rest }), preset: preset2 };
 }
 
 // src/snapshot.ts
@@ -392,8 +482,15 @@ function loadWorkflow(parsed) {
   if (typeof flow !== "string" || flow.trim() === "") {
     refuse('\u9879\u76EE .dsh/eng.json \u7F3A "flow" \u5B57\u6BB5\u2014\u2014\u8BBE\u4E3A standard|agile|minimal\uFF0C\u6216\u5220\u9664\u8BE5\u6587\u4EF6');
   }
-  const override = typeof parsed.stage_bindings === "object" && parsed.stage_bindings !== null && !Array.isArray(parsed.stage_bindings) ? { stage_bindings: parsed.stage_bindings } : void 0;
-  const resolved = resolveFlow(flow, override);
+  const project = {
+    flow,
+    ...typeof parsed.stage_bindings === "object" && parsed.stage_bindings !== null && !Array.isArray(parsed.stage_bindings) ? { stage_bindings: parsed.stage_bindings } : {},
+    ...typeof parsed.commit === "object" && parsed.commit !== null && !Array.isArray(parsed.commit) ? { commit: parsed.commit } : {},
+    ...Array.isArray(parsed.artifacts) ? { artifacts: parsed.artifacts } : {},
+    ...typeof parsed.review_depth === "string" ? { review_depth: parsed.review_depth } : {},
+    ...typeof parsed.commit_required === "boolean" ? { commit_required: parsed.commit_required } : {}
+  };
+  const resolved = resolveFlow(flow, project);
   if (!resolved.ok) {
     refuse(`\u672A\u77E5\u6D41\u7A0B "${resolved.flow}"\uFF08\u5DF2\u77E5\u6D41\u7A0B\uFF1A${resolved.knownFlows.join("\u3001")}\uFF09`);
   }