super-engineer-workflow 0.1.5 → 0.1.6

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.6
+
+- 修复计划生成失败或中断后重复 `/se:apply` 会创建多个空 session/output 目录的问题。
+
 ## 0.1.5
 
 - 修复重复执行 `/se:plan` 会创建多个 session 的问题：计划阶段复用当前 session，交付中重复 plan 会被拒绝。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-engineer-workflow",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Super Engineer workflow skill and CLI for demand-driven AI delivery with OpenSpec bridge support.",
   "license": "MIT",
   "author": "Gary-Coding",

package/scripts/se-e2e-test.py

@@ -24,6 +24,7 @@ def main() -> None:
         os.environ["USERPROFILE"] = str(home)
         test_templates_cli(root)
         test_openspec_state_and_bridge(root)
+        test_incomplete_plan_session_is_reused(root)
         test_todo_auto_session_and_verify_compaction(root)
     print("e2e_test=ok")
 
@@ -323,6 +324,84 @@ def test_todo_auto_session_and_verify_compaction(root: Path) -> None:
         raise AssertionError("notification should be marked skipped when no provider is configured")
 
 
+def test_incomplete_plan_session_is_reused(root: Path) -> None:
+    workspace = root / "incomplete-plan-workspace"
+    code = root / "broken-code" / "not-a-project"
+    demand_dir = workspace / "superengineer" / "10-broken"
+    demand_dir.mkdir(parents=True)
+    code.mkdir(parents=True)
+    (workspace / "docs").mkdir(parents=True)
+    (workspace / "workspace.yml").write_text(
+        "\n".join(
+            [
+                "version: 1",
+                "mode: auto",
+                "workflow_source: todo",
+                "vars:",
+                "  demand_name: 10-broken",
+                "todo_file: superengineer/${demand_name}/todo.md",
+                "reference_files: []",
+                "code_path: ../broken-code/not-a-project",
+                "output_dir: superengineer/${demand_name}/output",
+                "",
+            ]
+        ),
+        encoding="utf-8",
+    )
+    (demand_dir / "todo.md").write_text(
+        "# 限制条件\n"
+        "- 修改的服务是 broken-service\n\n"
+        "# 待办事项\n\n"
+        "- [ ] 增加一个测试接口\n",
+        encoding="utf-8",
+    )
+
+    first_apply = run(
+        [
+            sys.executable,
+            str(RUN_WORKFLOW),
+            "route-se",
+            "--workspace",
+            str(workspace),
+            "--command-text",
+            "/se:apply",
+        ],
+        check=False,
+    )
+    if first_apply.returncode == 0 or "未找到可识别的项目目录" not in first_apply.output:
+        raise AssertionError("first /se:apply should fail before plan is generated")
+    current = read_json(workspace / ".super-engineer" / "current-session.json")
+    first_session_id = current["session_id"]
+    sessions_dir = workspace / ".super-engineer" / "sessions"
+    output_dir = workspace / "superengineer" / "10-broken" / "output"
+    if len(list(sessions_dir.iterdir())) != 1:
+        raise AssertionError("first failed /se:apply should create exactly one reusable data session")
+    if output_dir.exists() and list(output_dir.iterdir()):
+        raise AssertionError("failed plan should not create an empty output report session")
+
+    second_apply = run(
+        [
+            sys.executable,
+            str(RUN_WORKFLOW),
+            "route-se",
+            "--workspace",
+            str(workspace),
+            "--command-text",
+            "/se:apply",
+        ],
+        check=False,
+    )
+    if second_apply.returncode == 0 or "session_action=reused_incomplete" not in second_apply.output:
+        raise AssertionError("second /se:apply should reuse the incomplete planning session")
+    current = read_json(workspace / ".super-engineer" / "current-session.json")
+    if current["session_id"] != first_session_id:
+        raise AssertionError("incomplete planning session should remain current")
+    if len(list(sessions_dir.iterdir())) != 1:
+        raise AssertionError("repeated failed /se:apply should not create another data session")
+    if output_dir.exists() and list(output_dir.iterdir()):
+        raise AssertionError("repeated failed /se:apply should not create output report sessions")
+
+
 def run(command: list[str], check: bool = True, env: dict[str, str] | None = None):
     result = subprocess.run(
         command,

package/super-engineer-workflow/scripts/common.py

@@ -652,17 +652,13 @@ def create_session(config: dict[str, Any]) -> dict[str, Any]:
         },
     )
     Path(session_meta["data_dir"]).mkdir(parents=True, exist_ok=True)
-    Path(session_meta["report_dir"]).mkdir(parents=True, exist_ok=True)
     write_managed_json(config, current_session_file(config), session_meta)
     return session_meta
 
 
 def current_session_meta(config: dict[str, Any]) -> dict[str, Any]:
     session_meta = read_json(current_session_file(config), {})
-    normalized = _normalize_session_meta(config, session_meta)
-    Path(normalized["data_dir"]).mkdir(parents=True, exist_ok=True)
-    Path(normalized["report_dir"]).mkdir(parents=True, exist_ok=True)
-    return normalized
+    return _normalize_session_meta(config, session_meta)
 
 
 def current_session_status(config: dict[str, Any], session_meta: dict[str, Any] | None = None) -> dict[str, Any]:
@@ -678,16 +674,26 @@ def active_session_for_plan(config: dict[str, Any]) -> dict[str, Any] | None:
         session_meta = current_session_meta(config)
     except FileNotFoundError:
         return None
-    if not data_artifact_path(config, "plan.json", session_meta).exists():
-        return None
+    data_dir = Path(str(session_meta["data_dir"]))
+    has_plan = data_artifact_path(config, "plan.json", session_meta).exists()
     status = current_session_status(config, session_meta)
     status_phase = str(status.get("phase", "") or "").strip()
     if status_phase in ("done", "archived", "blocked"):
         return None
+    if not has_plan and data_dir.exists():
+        return {
+            "session": session_meta,
+            "status": status,
+            "phase": status_phase or "draft",
+            "incomplete": True,
+        }
+    if not has_plan:
+        return None
     return {
         "session": session_meta,
         "status": status,
         "phase": status_phase or "plan",
+        "incomplete": False,
     }
 
 
@@ -697,6 +703,8 @@ def ensure_plan_can_run(config: dict[str, Any]) -> dict[str, Any] | None:
         return None
     phase = str(active.get("phase", "")).strip()
     session = active.get("session", {})
+    if active.get("incomplete"):
+        return active
     if phase in ("plan", "wait_confirm_plan"):
         return active
     raise RuntimeError(

package/super-engineer-workflow/scripts/run-workflow.py

@@ -294,16 +294,24 @@ def command_plan(workspace: Path | None) -> None:
         raise SystemExit(str(error))
     if active:
         session = active.get("session", {})
-        print("session_action=reused")
-        print(f"session_id={session.get('session_id', '')}")
-        print(f"phase={active.get('phase', '')}")
-        print("next_action=当前计划已存在，继续执行 /se:apply。")
-        return
-    command_init(workspace)
-    config = load_workspace_config(workspace)
-    session_meta = create_session(config)
-    print("session_action=created")
-    print(f"session_id={session_meta.get('session_id', '')}")
+        session_meta = session
+        if active.get("incomplete"):
+            print("session_action=reused_incomplete")
+            print(f"session_id={session_meta.get('session_id', '')}")
+            print(f"phase={active.get('phase', '')}")
+            print("next_action=复用未完成计划会话，继续生成 discovery/plan。")
+        else:
+            print("session_action=reused")
+            print(f"session_id={session_meta.get('session_id', '')}")
+            print(f"phase={active.get('phase', '')}")
+            print("next_action=当前计划已存在，继续执行 /se:apply。")
+            return
+    else:
+        command_init(workspace)
+        config = load_workspace_config(workspace)
+        session_meta = create_session(config)
+        print("session_action=created")
+        print(f"session_id={session_meta.get('session_id', '')}")
     command_discover(workspace)
     args = ["--workspace", str(workspace)] if workspace else []
     run_python("generate-smart-plan.py", args)