@guanlin4924/devflow-pi 0.1.51 → 0.1.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@guanlin4924/devflow-pi",
-  "version": "0.1.51",
+  "version": "0.1.53",
   "type": "module",
   "description": "Devflow 专项研发 Pi，基于固定版本 OMP Runtime 组装研发状态机、代码智能、设计、实现与质量门禁。",
   "license": "UNLICENSED",

package/plugins/devflow-core/extensions/devflow-core.ts

@@ -369,7 +369,7 @@ export function isRequirementDraftToolAllowed(toolName: string, input: unknown,
   return normalized === "task" && taskAgents.length > 0 && taskAgents.every(agent => PLANNING_AGENTS.has(agent));
 }
 
-type InternalDevflowControlResource = "contract" | "state" | "mainflow";
+type InternalDevflowControlResource = "contract" | "state" | "mainflow" | "requirement_graph" | "requirement_coverage";
 
 /** Resolve an xdev target only when all supplied target aliases agree.
  * A direct/eval caller can otherwise provide `path` for a real file plus an
@@ -394,6 +394,8 @@ export function internalDevflowControlResource(toolName: string, input: unknown)
   if (target === "xd://devflow_contract") return "contract";
   if (target === "xd://devflow_state") return "state";
   if (target === "xd://devflow_mainflow") return "mainflow";
+  if (target === "xd://devflow_requirement_graph") return "requirement_graph";
+  if (target === "xd://devflow_requirement_coverage") return "requirement_coverage";
   return undefined;
 }
 
@@ -1117,6 +1119,7 @@ function stepScopedMutationOwner(toolName: string, input: unknown): string | nul
   if (["write", "edit", "apply_patch", "notebook_edit", "task", "bash", "shell", "exec_command"].includes(normalized)) return null;
   if (!normalized.startsWith("devflow_") || CONTRACT_CONTROL_TOOLS.has(normalized) || CONTRACT_READ_TOOLS.has(normalized)) return undefined;
   const action = inputAction(input);
+  if (normalized === "devflow_requirement_coverage") return action === "validate" ? undefined : "requirement-wayfinder";
   if (normalized === "devflow_code_index") return action === "scan" ? "code-index-refresh" : undefined;
   if (normalized === "devflow_requirement_graph") {
     const writeContext = input && typeof input === "object" && (input as Record<string, unknown>).write === true;
@@ -1781,8 +1784,9 @@ export default function devflowCore(pi: ExtensionAPI) {
     if (!controlPlaneSucceeded(synced)) {
       throw new Error(synced.stderr || synced.stdout || "artifact registry sync after rollover prepare failed");
     }
-    await enqueueControlledRolloverRequest(ctx.cwd, rolloverId, ctx.sessionManager.getSessionId());
+    // The runtime can observe the request immediately; arm the switch handler first.
     pendingRollover = { snapshot, preparedRevision: payload.revision, rolloverId };
+    await enqueueControlledRolloverRequest(ctx.cwd, rolloverId, ctx.sessionManager.getSessionId());
   }
 
   function parallelBranches(snapshot: Record<string, unknown>): Array<{ workflow_step: string; track: string }> {
@@ -2396,7 +2400,7 @@ export default function devflowCore(pi: ExtensionAPI) {
         recoveredApprovalState = true;
       }
     }
-    if (recoveredApprovalState || controlState.phase === "awaiting-approval" || controlState.phase === "waiting-user") {
+    if (recoveredApprovalState || controlState.phase === "awaiting-approval" || controlState.phase === "waiting-user" || (controlState.phase === "blocked" && controlState.label === "推进校验失败")) {
       if (controlAction === "reject") {
         ctx.ui.notify("已保留当前步骤和产物。请直接说明需要修改的内容；未执行任何推进。", "info");
         return { handled: true };
@@ -2435,7 +2439,7 @@ export default function devflowCore(pi: ExtensionAPI) {
         ]);
         if (!result.ok) {
           setControlState(ctx, { intent: "workflow-execute", phase: "blocked", label: "推进校验失败" });
-          ctx.ui.notify(`未推进：${result.stderr || result.stdout}`, "error");
+          ctx.ui.notify(`未推进：${result.stderr || result.stdout}\n请补齐上述校验缺项后重新审批；重复批准不会绕过门禁。可请求重新执行当前步骤以修复产物。`, "error");
           return { handled: true };
         }
         const after = await inspectWorkflowWithRegistryRecovery(ctx.cwd);
@@ -2457,6 +2461,10 @@ export default function devflowCore(pi: ExtensionAPI) {
         return { handled: true };
       }
     }
+    if (controlAction) {
+      ctx.ui.notify("当前没有可推进的审批节点。请先完成或修复当前步骤产物，再请求审批；状态未推进。", "info");
+      return { handled: true };
+    }
     const intent = classifyNaturalLanguageIntent(event.text);
     if (intent === "explain-state") {
       const inspected = await inspectWorkflow(ctx.cwd);
@@ -2824,6 +2832,20 @@ export default function devflowCore(pi: ExtensionAPI) {
     },
   });
 
+  pi.registerTool({
+    name: "devflow_requirement_coverage",
+    label: "Devflow Requirement Coverage",
+    description: "Generate Core source units from a requirement source file, or validate wayfinder coverage before requesting approval. Generation never creates coverage claims.",
+    parameters: z.object({ action: z.enum(["generate", "validate"]), feature: z.string().min(1), source: z.string().optional() }),
+    approval: args => args.action === "generate" ? "write" : "read",
+    async execute(_id, params, _signal, _onUpdate, ctx) {
+      return renderResult(await runRuby(ctx.cwd, "workflow-orchestrator/scripts/requirement_coverage.rb", [
+        "--root", ctx.cwd, "--feature", params.feature,
+        ...(params.action === "generate" ? ["--source", params.source ?? "", "--write"] : []),
+      ]));
+    },
+  });
+
   pi.registerTool({
 
     name: "devflow_requirement_graph",
@@ -2850,7 +2872,7 @@ export default function devflowCore(pi: ExtensionAPI) {
         propagation: z.enum(["one_hop", "full"]).optional(),
       }).optional(),
     }),
-    approval: (args) => args.action === "propose" || args.action === "confirm" ? "write" : "read",
+    approval: (args) => args.action === "propose" || args.action === "confirm" || (args.action === "context" && args.write === true) ? "write" : "read",
     async execute(_id, params, _signal, _onUpdate, ctx) {
       const graphWrite = params.action === "propose" || params.action === "confirm" || (params.action === "context" && params.write === true);
       if (graphWrite) {

package/plugins/devflow-core/skills/workflow-orchestrator/scripts/requirement_coverage.rb

@@ -4,6 +4,7 @@
 # Canonical wayfinder quality checker.  It validates references and structured
 # coverage only; AI-provided equivalence labels are never trusted.
 require "digest"
+require "date"
 require "json"
 require "optparse"
 require "yaml"
@@ -12,6 +13,33 @@ require_relative "requirement_graph"
 module RequirementCoverage
   module_function
 
+  def generate(root:, feature:, source:)
+    state = YAML.safe_load(File.read(File.join(root, ".planning/STATE.md")).split(/^---\s*$/, 3)[1], permitted_classes: [Date], aliases: false)
+    raise ArgumentError, "source generation requires the active wayfinder step" unless state["current_feature"] == feature && state["current_step"] == "requirement-wayfinder"
+    source_path = File.realpath(File.expand_path(source, root))
+    raise ArgumentError, "source must be a project file" unless source_path.start_with?(File.realpath(root) + File::SEPARATOR)
+    text = File.read(source_path)
+    fingerprint = sha(text)
+    units = text.lines.each_with_index.map do |line, index|
+      excerpt = line.strip
+      next if excerpt.empty?
+      id = "SU-#{sha("#{source_path.delete_prefix(File.realpath(root))}:#{index + 1}:#{excerpt}")[0, 16]}"
+      { "stable_unit_id" => id, "source_document_fingerprint" => fingerprint,
+        "excerpt" => excerpt, "excerpt_fingerprint" => sha(excerpt), "line" => index + 1,
+        "required_assertions" => [{ "assertion_id" => "#{id}-A1", "source_unit_id" => id,
+          "type" => "source_statement", "predicate" => excerpt }] }
+    end.compact
+    raise ArgumentError, "source must not be empty" if units.empty?
+    directory = RequirementGraph.feature_dir(root, feature)
+    path = File.join(directory, "source_units.yaml")
+    payload = { "schema_version" => 1, "produced_by" => "core.source_unitizer/v1",
+      "source_document" => source_path.delete_prefix(File.realpath(root) + File::SEPARATOR),
+      "source_document_fingerprint" => fingerprint, "units" => units }
+    File.write(path + ".tmp", YAML.dump(payload))
+    File.rename(path + ".tmp", path)
+    { "ok" => true, "path" => path, "unit_count" => units.length }
+  end
+
   def validate(root:, feature:)
     directory = RequirementGraph.feature_dir(root, feature)
     errors = []
@@ -165,9 +193,16 @@ if $PROGRAM_NAME == __FILE__
   OptionParser.new do |opts|
     opts.on("--root PATH") { |value| options[:root] = value }
     opts.on("--feature NAME") { |value| options[:feature] = value }
+    opts.on("--source PATH") { |value| options[:source] = value }
+    opts.on("--write") { options[:write] = true }
   end.parse!
   abort("--root and --feature are required") unless options[:root] && options[:feature]
-  payload = RequirementCoverage.validate(root: options[:root], feature: options[:feature])
+  payload = if options[:write]
+    abort("--source is required") if options[:source].to_s.empty?
+    RequirementCoverage.generate(root: options[:root], feature: options[:feature], source: options[:source])
+  else
+    RequirementCoverage.validate(root: options[:root], feature: options[:feature])
+  end
   puts JSON.pretty_generate(payload)
-  exit(payload["verdict"] == "allow" ? 0 : 1)
+  exit(payload["ok"] ? 0 : 1)
 end

package/plugins/devflow-core/skills/workflow-orchestrator/templates/feature-development.yaml

@@ -409,6 +409,12 @@ steps:
       - path: ".planning/requirements/{feature}/决策地图.md"
         type: requirement-wayfinder
         required: true
+      - path: ".planning/requirements/{feature}/source_units.yaml"
+        type: requirement-source-units
+        required: true
+      - path: ".planning/requirements/{feature}/coverage.yaml"
+        type: requirement-coverage
+        required: true
     meta_output:
       path: ".planning/requirements/{feature}/决策地图.meta.json"
       fields:

package/plugins/devflow-requirements/skills/workflow-wayfinder/SKILL.md

@@ -13,6 +13,8 @@ Always create or update:
 
 - `.planning/requirements/{功能名}/决策地图.md`
 - `.planning/requirements/{功能名}/决策地图.meta.json`
+- `.planning/requirements/{功能名}/source_units.yaml` (Core-generated)
+- `.planning/requirements/{功能名}/coverage.yaml`
 - `.planning/requirements/{功能名}/wayfinder/WF-xxx.md` for each ticket
 
 `决策地图.meta.json` minimum fields:
@@ -166,8 +168,29 @@ After resolution, update the map immediately. Do not solve hidden Fog tickets be
 
 ## Phase 4 — Exit Criteria
 
+### Required Coverage Gate
+
+Before setting ready_for_baseline, call `devflow_requirement_coverage(action="generate", feature=..., source=...)`
+with the project-relative authoritative requirement source file. If the source is spread over several documents,
+first consolidate the complete source with provenance; do not substitute the decision map or silently omit source text.
+Core conservatively preserves every nonempty source line as an assertion; these are source statements, not automatically business rules.
+Never hand-author source_units.yaml or its produced_by marker.
+
+Read the generated units and write coverage.yaml with schema_version: 1, units and claims arrays.
+Each units entry has unit_id and disposition: {kind: active}. Each claim has claim_id, source_unit_id,
+assertion_ids, inherited_constraints and an evidence_ref pointing to the actual map/ticket coverage.
+inherited_constraints must preserve the assertion's type and predicate (and any other constraint fields).
+Review each source statement against its evidence before claiming coverage; copying constraints alone is not evidence.
+Deferred/out_of_scope dispositions require real, source-fingerprint-bound approval records; never invent approval IDs.
+
+Call `devflow_requirement_coverage(action="validate", feature=...)`. Only verdict=allow satisfies this gate.
+Missing files, uncertain coverage and approval-required results must be repaired or reported as blocked,
+not described as completed. Reuse existing tickets and decisions during repair.
+
 Exit this step to `workflow-domain-modeling` only when:
 
+- The Core coverage checker returns verdict=allow.
+
 - Destination is still valid.
 - All L1/L2 blocking decisions are resolved.
 - Remaining L3/L4 questions are either resolved or explicitly non-blocking.

package/src/constants.ts

@@ -1,5 +1,5 @@
 export const PRODUCT_NAME = "Devflow Pi";
-export const PRODUCT_VERSION = "0.1.51";
+export const PRODUCT_VERSION = "0.1.53";
 export const PROJECT_SCHEMA_VERSION = 1;
 export const OMP_RUNTIME_VERSION = "17.2.7";
 

package/src/runtime.ts

@@ -209,7 +209,7 @@ export async function runInteractiveRuntime(project: ProjectContext, options: Ru
   // authority remains STATE.rollover, which the extension verifies and claims
   // during session_switch before it starts the next workflow turn.
   const consumeControlledRollover = async (): Promise<void> => {
-    if (rolloverConsumptionInFlight) return;
+    if (rolloverConsumptionInFlight || interactiveSubmissionInFlight || runtime.session.isStreaming) return;
     rolloverConsumptionInFlight = true;
     try {
     const requestPath = path.join(project.root, ".planning", "rollover-request.json");
@@ -238,6 +238,8 @@ export async function runInteractiveRuntime(project: ProjectContext, options: Ru
     // already durable and STATE remains frozen until the target consumes it.
     let switched = false;
     for (let attempt = 0; attempt < 3 && !switched; attempt += 1) {
+      // newSession aborts a running turn; leave the durable request for the poller.
+      if (interactiveSubmissionInFlight || runtime.session.isStreaming) return;
       switched = await runtime.session.newSession();
       if (!switched && attempt < 2) await new Promise(resolve => setTimeout(resolve, 100));
     }
@@ -259,8 +261,11 @@ export async function runInteractiveRuntime(project: ProjectContext, options: Ru
       rolloverConsumptionInFlight = false;
       mode.showWarning(`Devflow 会话轮换运行时异常，将自动重试：${String(error)}`);
       scheduleControlledRolloverRetry();
+    } finally {
+      rolloverConsumptionInFlight = false;
     }
   };
+  let interactiveSubmissionInFlight = false;
   let rolloverConsumptionInFlight = false;
   let rolloverRetryTimer: ReturnType<typeof setTimeout> | undefined;
   let rolloverRetryAttempt = 0;
@@ -287,7 +292,12 @@ export async function runInteractiveRuntime(project: ProjectContext, options: Ru
   await consumeControlledRollover();
   while (true) {
     const input = await mode.getUserInput();
-    await omp.submitInteractiveInput(mode, runtime.session, input);
+    interactiveSubmissionInFlight = true;
+    try {
+      await omp.submitInteractiveInput(mode, runtime.session, input);
+    } finally {
+      interactiveSubmissionInFlight = false;
+    }
     await consumeControlledRollover();
     // The submitted turn may create a durable rollover request after the
     // immediate check above returns. Poll once while the UI is waiting for the