@guanlin4924/devflow-pi 0.1.36 → 0.1.37

package/README.md

@@ -11,7 +11,7 @@ Devflow Pi 是一个面向项目研发交付的独立 OMP 产品入口，内置
 安装与启动：
 
 ```bash
-npm install -g @guanlin4924/devflow-pi@0.1.36
+npm install -g @guanlin4924/devflow-pi@0.1.37
 cd /path/to/your-project
 devflow-pi init
 devflow-pi doctor

package/package.json

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

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

@@ -1468,6 +1468,30 @@ export default function devflowCore(pi: ExtensionAPI) {
         return { handled: true };
       }
     }
+    // A step transition can succeed before the runtime manages to prepare the
+    // fresh-session handoff. Keep approval useful in this recovery state, but
+    // retry only the handoff; never repeat the already-persisted transition.
+    if (controlState.phase === "blocked" && controlState.label === "会话轮换准备失败" && controlAction === "approve") {
+      const inspected = await inspectWorkflow(ctx.cwd);
+      if (!inspected.result.ok || !inspected.snapshot) {
+        ctx.ui.notify(`会话交接重试失败：${inspected.result.stderr || inspected.result.stdout || "invalid inspector JSON"}`, "error");
+        return { handled: true };
+      }
+      if (inspected.snapshot.action === "workflow_complete") {
+        setControlState(ctx, initialControlState());
+        ctx.ui.notify("工作流已完成。", "info");
+        return { handled: true };
+      }
+      setControlState(ctx, waitingUserState("正在重试干净会话交接"));
+      try {
+        await requestControlledRollover(ctx, inspected.snapshot);
+        ctx.ui.notify("已重新登记会话交接；当前回合结束后将自动切换到下一节点。", "info");
+      } catch (error) {
+        setControlState(ctx, { intent: "workflow-execute", phase: "blocked", label: "会话轮换准备失败" });
+        ctx.ui.notify(`会话交接仍未完成：${String(error)}`, "error");
+      }
+      return { handled: true };
+    }
     if (controlState.phase === "awaiting-approval" || controlState.phase === "waiting-user") {
       if (controlAction === "reject") {
         ctx.ui.notify("已保留当前步骤和产物。请直接说明需要修改的内容；未执行任何推进。", "info");

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

@@ -98,8 +98,22 @@ result = catch(:transition_done) do
         result = fail_result("handoff_integrity_failure", "rollover" => rollover)
         throw :transition_done, result
       end
-      result = fail_result("rollover_in_progress", "rollover" => rollover)
-      throw :transition_done, result
+      if expected_state_revision.is_a?(Integer) && expected_state_revision < revision - 1
+        # The state has moved beyond the revision captured by this prepared
+        # handoff. It is an orphan from an interrupted/retried runtime turn,
+        # not an active lock. Verify its immutable evidence, preserve the
+        # handoff file on disk, and replace the STATE pointer with a handoff
+        # for the current revision.
+        existing_path, = DevflowControlIO.resolve_control_path(root, rollover["handoff_path"], :handoff)
+        unless File.exist?(existing_path) && Digest::SHA256.hexdigest(File.binread(existing_path)) == rollover["handoff_sha256"]
+          result = fail_result("handoff_integrity_failure", "rollover" => rollover)
+          throw :transition_done, result
+        end
+        rollover = nil
+      else
+        result = fail_result("rollover_in_progress", "rollover" => rollover)
+        throw :transition_done, result
+      end
     elsif rollover && rollover["status"] == "claimed"
       result = fail_result("rollover_in_progress", "rollover" => rollover)
       throw :transition_done, result

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

@@ -132,7 +132,7 @@ module WorkflowStateValidator
       return
     end
     status = rollover["status"]
-    unless %w[prepared claimed consumed failed].include?(status)
+unless %w[prepared claimed consumed superseded failed].include?(status)
       issues << issue("error", "invalid_rollover_status", "STATE.rollover.status is invalid", status: status)
       return
     end

package/src/constants.ts

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