@hunter-harness/workflow-harness 0.4.9 → 0.4.11

package/harness/bundles/general/codex/scripts/harness_events.py

@@ -884,22 +884,32 @@ def build_event(args: argparse.Namespace, existing: list[dict[str, Any]]) -> dic
 def validate_append_event(args: argparse.Namespace) -> tuple[str, str] | None:
     """Validate type-specific append fields before any file is mutated."""
     event_type = str(args.type)
-    for field in _EVENT_REQUIRED_FIELDS.get(event_type, ()):
-        value = getattr(args, field, None)
-        if value is None or (isinstance(value, str) and not value.strip()):
-            return (
-                "EVENT_REQUIRED_FIELD",
-                f"EVENT_REQUIRED_FIELD: {event_type} requires --{field.replace('_', '-')}",
-            )
+    missing = [
+        f"--{field.replace('_', '-')}"
+        for field in _EVENT_REQUIRED_FIELDS.get(event_type, ())
+        if getattr(args, field, None) is None
+        or (isinstance(getattr(args, field, None), str)
+            and not getattr(args, field).strip())
+    ]
+    if missing:
+        # 一次性列出全部缺失字段——逐个报错会让调用方每个字段往返一轮（E-3）
+        return (
+            "EVENT_REQUIRED_FIELD",
+            f"EVENT_REQUIRED_FIELD: {event_type} requires " + ", ".join(missing),
+        )
     allowed = _EVENT_ALLOWED_FIELDS[event_type]
-    for field in OPTIONAL_FIELDS:
-        value = getattr(args, field, None)
-        if value is not None and field not in allowed:
-            return (
-                "EVENT_FIELD_NOT_ALLOWED",
-                "EVENT_FIELD_NOT_ALLOWED: "
-                f"{event_type} does not accept --{field.replace('_', '-')}",
-            )
+    disallowed = [
+        f"--{field.replace('_', '-')}"
+        for field in OPTIONAL_FIELDS
+        if getattr(args, field, None) is not None and field not in allowed
+    ]
+    if disallowed:
+        # 一次列出全部不被接受的字段——逐个报错会让调用方每字段往返一轮（R-4）
+        return (
+            "EVENT_FIELD_NOT_ALLOWED",
+            f"EVENT_FIELD_NOT_ALLOWED: {event_type} does not accept "
+            + ", ".join(disallowed),
+        )
     for field, length in (("trace_id", 32), ("span_id", 16), ("parent_span_id", 16)):
         value = getattr(args, field, None)
         if value is not None and not re.fullmatch(rf"[0-9a-f]{{{length}}}", str(value)):
@@ -2146,7 +2156,7 @@ def build_parser() -> argparse.ArgumentParser:
         parents=[common],
         help="append one event and auto-render execution-log",
     )
-    p_append.add_argument("--change-dir", required=True)
+    p_append.add_argument("--change-dir", "--change", dest="change_dir", required=True)
     p_append.add_argument("--phase", required=True)
     p_append.add_argument("--type", required=True)
     p_append.add_argument("--command", default=None)
@@ -2200,7 +2210,7 @@ def build_parser() -> argparse.ArgumentParser:
         parents=[common],
         help="validate and append many events under one lock (H-15)",
     )
-    p_batch.add_argument("--change-dir", required=True)
+    p_batch.add_argument("--change-dir", "--change", dest="change_dir", required=True)
     p_batch.add_argument(
         "--file",
         required=True,
@@ -2213,7 +2223,7 @@ def build_parser() -> argparse.ArgumentParser:
         parents=[common],
         help="re-render execution-log.md from events.ndjson",
     )
-    p_render.add_argument("--change-dir", required=True)
+    p_render.add_argument("--change-dir", "--change", dest="change_dir", required=True)
     p_render.set_defaults(func=cmd_render)
 
     p_summary = sub.add_parser(
@@ -2221,7 +2231,7 @@ def build_parser() -> argparse.ArgumentParser:
         parents=[common],
         help="summarize phases/issues from events.ndjson",
     )
-    p_summary.add_argument("--change-dir", required=True)
+    p_summary.add_argument("--change-dir", "--change", dest="change_dir", required=True)
     p_summary.set_defaults(func=cmd_summary)
 
     return parser

package/harness/bundles/general/codex/scripts/harness_fixback.py

@@ -75,6 +75,14 @@ def _write_json(path: Path, value: dict[str, Any]) -> None:
         temporary.unlink(missing_ok=True)
 
 
+def _read_json(path: Path) -> Any:
+    try:
+        value = json.loads(path.read_text(encoding="utf-8-sig"))
+    except (OSError, json.JSONDecodeError):
+        return None
+    return value
+
+
 def _load(change_dir: Path, batch_id: str) -> dict[str, Any]:
     path = _batch_path(change_dir, batch_id)
     try:
@@ -1186,7 +1194,21 @@ def evidence_template(
         "provenance": provenance,
     }
     target = Path(out) if out else Path("runtime") / f"fixback-{resolved_id}.json"
-    path = target if target.is_absolute() else (change_dir / target)
+    if target.is_absolute():
+        path = target
+    else:
+        # F-3：与 ledger --out 同一类坑——相对路径已含 change-dir 前缀时直接拼
+        # change_dir 会产生嵌套幽灵目录（2026-08-31 实测）。前缀命中按 cwd 解析。
+        cwd = Path.cwd().resolve()
+        change_resolved = change_dir.resolve()
+        if _is_within(change_resolved, [cwd]):
+            change_rel = change_resolved.relative_to(cwd)
+            if target.parts[: len(change_rel.parts)] == change_rel.parts:
+                path = cwd / target
+            else:
+                path = change_dir / target
+        else:
+            path = change_dir / target
     path = path.resolve()
     if not _is_within(path, [change_dir.resolve(), state_root, _project_root(change_dir)]):
         return {
@@ -1708,6 +1730,20 @@ def close_batch(
         }
     )
     _write_json(_batch_path(change_dir, batch_id), batch)
+    # F-5：批次关闭会同步把托管会话置为 CLOSED——否则 session 永远 ACTIVE，
+    # 后续 launch-review 被 CONTEXT_PREPARATION_ACTIVE 幂等保护误拦（2026-08-31
+    # demo-datasource 实测）。
+    session_file = _session_path(change_dir)
+    session = _read_json(session_file)
+    if (
+        isinstance(session, dict)
+        and session.get("batchId") == batch_id
+        and session.get("status") == "ACTIVE"
+    ):
+        session["status"] = "CLOSED"
+        session["nextStep"] = "done"
+        session["updatedAt"] = closed_at
+        _write_json(session_file, session)
     return batch
 
 

package/harness/bundles/general/codex/scripts/harness_gate.py

@@ -2594,6 +2594,64 @@ def _normalize_gate_phase(args: argparse.Namespace, as_json: bool) -> int | None
     )
 
 
+def _verification_target_coverage_warning(
+    change_dir: Path, phase: str
+) -> dict[str, Any] | None:
+    """E-5：场景表引用未声明的 verification target 时提前 WARN。
+
+    场景带 execution_level（unit/integration/…），但 build-profile 的
+    verificationGraph.targets 未声明对应 target 时，问题要等到 ledger record
+    才以 unsupported verification 报错——太迟。gate begin 提前列出待补清单。
+    映射约定：unit → unitTest；其他 level → 任一以其名开头的 target。
+    """
+    if phase != "execute":
+        return None
+    manifest_path = change_dir / "meta" / "scenario-manifest.json"
+    profile_path = change_dir / "meta" / "build-profile.json"
+    if not profile_path.is_file():
+        # build-profile 常规位置在项目 .harness/config/；change meta 下优先
+        profile_path = change_dir.parents[2] / ".harness" / "config" / "build-profile.json"
+    if not manifest_path.is_file() or not profile_path.is_file():
+        return None
+    try:
+        manifest = json.loads(manifest_path.read_text(encoding="utf-8-sig"))
+        profile = json.loads(profile_path.read_text(encoding="utf-8-sig"))
+    except (OSError, json.JSONDecodeError):
+        return None
+    content = manifest.get("content") if isinstance(manifest, dict) else None
+    scenarios = content.get("scenarios") if isinstance(content, dict) else None
+    if not isinstance(scenarios, list):
+        return None
+    levels = sorted({
+        str(s.get("execution_level")).strip()
+        for s in scenarios
+        if isinstance(s, dict) and str(s.get("execution_level") or "").strip()
+    })
+    graph = profile.get("verificationGraph")
+    targets = graph.get("targets") if isinstance(graph, dict) else None
+    target_names = set(targets.keys()) if isinstance(targets, dict) else set()
+    uncovered = [
+        level for level in levels
+        if level != "unit"
+        and not any(name.lower().startswith(level.lower()) for name in target_names)
+    ]
+    # unit 场景由 unitTest 覆盖；只在完全没有 unitTest 时才算缺口
+    if "unit" in levels and "unitTest" not in target_names:
+        uncovered.append("unit(→unitTest)")
+    if not uncovered:
+        return None
+    return {
+        "code": "VERIFICATION_TARGETS_UNDECLARED",
+        "message": (
+            "场景表涉及未声明的验证级别: " + ", ".join(uncovered) +
+            "；ledger record 将报 unsupported verification。请在 "
+            ".harness/config/build-profile.json 的 verificationGraph.targets "
+            "声明对应 target（如 integrationTest）"
+        ),
+        "uncoveredLevels": uncovered,
+    }
+
+
 def cmd_begin(args: argparse.Namespace) -> int:
     as_json = bool(args.json)
     normalized = _normalize_gate_phase(args, as_json)
@@ -2911,6 +2969,14 @@ def cmd_begin(args: argparse.Namespace) -> int:
         )
         raise
 
+    coverage_warning = _verification_target_coverage_warning(change_dir, args.phase)
+    if coverage_warning is not None:
+        gate_warnings.append(coverage_warning)
+        print(
+            f"[harness-gate] WARNING {coverage_warning['code']}: "
+            f"{coverage_warning['message']}",
+            file=sys.stderr,
+        )
     payload = {
         "ok": True,
         "code": "PHASE_BEGUN",
@@ -3039,6 +3105,20 @@ def _resume_closed_phase(
             for candidate in hctx.allowed_next_phases(project, change_id, args.phase)
             if hp.resolve_phase_name(candidate) != args.phase
         ]
+        # F-4：续跑路径同样——fixback 回环的 execute 关门应回 review 的后继
+        if args.phase == "execute" and isinstance(transitions, list) and transitions:
+            latest_t = transitions[-1]
+            if (
+                isinstance(latest_t, dict)
+                and hp.resolve_phase_name(latest_t.get("fromPhase")) == "review"
+                and hp.resolve_phase_name(latest_t.get("toPhase")) == "execute"
+                and latest_t.get("trigger") == "review-fixback"
+            ):
+                candidates = [
+                    candidate
+                    for candidate in hctx.allowed_next_phases(project, change_id, "review")
+                    if hp.resolve_phase_name(candidate) != args.phase
+                ]
         if to_phase is None and len(candidates) == 1:
             # 计划后继唯一（排除 fixback 自环）：close 的意图没有歧义，直接补跑 handoff
             to_phase = candidates[0]
@@ -3625,10 +3705,25 @@ def cmd_close(args: argparse.Namespace) -> int:
             and context_view.get("ok")
             and isinstance(context_view.get("current"), dict)
         ):
+            # F-4：fixback 回环（最新交接是 review→execute 且 trigger=
+            # review-fixback）关门时，后继不是再来一轮 review，而是 review
+            # 当时的计划后继（submit）。不按此处理会把 transitions 链写成
+            # …→review→execute→review 的语义错乱（2026-08-31 实测）。
+            source_phase = args.phase
+            transitions = context_view.get("transitions") or []
+            if args.phase == "execute" and transitions:
+                latest = transitions[-1]
+                if (
+                    isinstance(latest, dict)
+                    and hp.resolve_phase_name(latest.get("fromPhase")) == "review"
+                    and hp.resolve_phase_name(latest.get("toPhase")) == "execute"
+                    and latest.get("trigger") == "review-fixback"
+                ):
+                    source_phase = "review"
             forward = [
                 candidate
                 for candidate in hctx.allowed_next_phases(
-                    project, str(resolved["changeId"]), args.phase
+                    project, str(resolved["changeId"]), source_phase
                 )
                 if hp.resolve_phase_name(candidate) != args.phase
             ]
@@ -3800,11 +3895,25 @@ def cmd_classify(args: argparse.Namespace) -> int:
     payload["classifiedAt"] = classified_at
 
     if change_dir is not None and change_dir.is_dir():
-        policy_doc = gate_policy_document(payload)
-        policy_path = change_dir / "meta" / "gate-policy.json"
-        _write_json(policy_path, policy_doc)
-        payload["policyPersisted"] = True
-        payload["policyPath"] = str(policy_path)
+        finalized = (change_dir / "meta" / "plan-profile.json").is_file()
+        if finalized and not getattr(args, "force", False):
+            # P1-1：classify 形态像只读查询，实际是写操作。已发布的 change
+            # 被误跑 classify 会覆盖 configure-plan 写入的工作副本（2026-08-30
+            # demo-datasource 实测 plannedPhases 被清）。默认拒写并显式提示。
+            payload["policyPersisted"] = False
+            payload["warning"] = (
+                "change 已发布（meta/plan-profile.json 存在），classify 不再重写 "
+                "meta/gate-policy.json 工作副本；确需重算请显式传 --force"
+            )
+            payload["writeGuarded"] = True
+        else:
+            policy_doc = gate_policy_document(payload)
+            policy_path = change_dir / "meta" / "gate-policy.json"
+            _write_json(policy_path, policy_doc)
+            payload["policyPersisted"] = True
+            payload["policyPath"] = str(policy_path)
+            if finalized:
+                payload["warning"] = "--force：已发布 change 的工作副本已被重写"
     else:
         payload["policyPersisted"] = False
         payload["warning"] = (
@@ -3930,7 +4039,7 @@ def build_parser() -> argparse.ArgumentParser:
 
     p_begin = sub.add_parser("begin", parents=[shared])
     p_begin.add_argument("--phase", required=True)
-    p_begin.add_argument("--change", default=None)
+    p_begin.add_argument("--change", "--change-dir", dest="change", default=None)
     p_begin.add_argument(
         "--project",
         default=None,
@@ -3960,7 +4069,7 @@ def build_parser() -> argparse.ArgumentParser:
         help="关闭阶段门禁（关门只调本命令；上下文交接由 --to-phase 内联完成，不要再单独调 harness_context.py close）",
     )
     p_close.add_argument("--phase", required=True)
-    p_close.add_argument("--change", default=None)
+    p_close.add_argument("--change", "--change-dir", dest="change", default=None)
     p_close.add_argument(
         "--project",
         default=None,
@@ -3985,7 +4094,7 @@ def build_parser() -> argparse.ArgumentParser:
 
     p_classify = sub.add_parser("classify", parents=[shared])
     p_classify.add_argument("--project", default=None, type=Path, help=_PROJECT_ROOT_HELP)
-    p_classify.add_argument("--change", default=None)
+    p_classify.add_argument("--change", "--change-dir", dest="change", default=None)
     p_classify.add_argument("--stage", required=True, choices=["plan", "post-run"])
     p_classify.add_argument(
         "--tier-override",
@@ -3993,13 +4102,18 @@ def build_parser() -> argparse.ArgumentParser:
         choices=["fast", "standard", "full"],
     )
     p_classify.add_argument("--override-by", default="user")
+    p_classify.add_argument(
+        "--force",
+        action="store_true",
+        help="已发布 change 也强制重写 gate-policy.json 工作副本",
+    )
     p_classify.set_defaults(func=cmd_classify)
 
     p_checkpoint = sub.add_parser("checkpoint", parents=[shared])
     p_checkpoint.add_argument("--project", default=None, type=Path, help=_PROJECT_ROOT_HELP)
     p_checkpoint.add_argument("checkpoint_action", choices=["status", "approve"])
     p_checkpoint.add_argument("--id", required=True)
-    p_checkpoint.add_argument("--change", default=None)
+    p_checkpoint.add_argument("--change", "--change-dir", dest="change", default=None)
     p_checkpoint.add_argument("--reviewer", default=None)
     p_checkpoint.set_defaults(func=cmd_checkpoint)
 

package/harness/bundles/general/codex/scripts/harness_ledger.py

@@ -1624,6 +1624,15 @@ def evidence_summary(entry: dict[str, Any]) -> dict[str, Any]:
     }
 
 
+def _is_relative_to(path: Path, base: Path) -> bool:
+    """Python 3.9 兼容的 is_relative_to。"""
+    try:
+        path.relative_to(base)
+        return True
+    except ValueError:
+        return False
+
+
 def _nonempty_str(value: Any) -> bool:
     return isinstance(value, str) and bool(value.strip())
 
@@ -3056,6 +3065,12 @@ def cmd_record(args: argparse.Namespace) -> int:
         "scenarioCoverage": entry.get("scenarioCoverage"),
         "migrationReceipt": migration_receipt,
     }
+    zero_warn = _zero_tests_with_selector_warning(
+        str(args.command), args.evidence, project_root
+    )
+    if zero_warn is not None:
+        payload["warnings"] = [zero_warn]
+        print(f"[harness-ledger] WARNING {zero_warn}", file=sys.stderr)
     emit_compact_or_verbose(
         payload, as_json=as_json, verbose=verbose,
         compact_fn=_compact_record_payload,
@@ -3063,6 +3078,47 @@ def cmd_record(args: argparse.Namespace) -> int:
     return 0
 
 
+def _zero_tests_with_selector_warning(
+    command: str, evidence: str | None, project_root: Path | None
+) -> str | None:
+    """选择器存在却 0 命中 → WARN（E-2）。
+
+    surefire 插件级 ``<excludedGroups>`` 会压过命令行空值覆盖，
+    `-Dgroups=X` 选择器 0 命中仍 exit 0——只看退出码就是假阳性
+    （2026-08-30 demo-datasource 集成测试静默 0 执行实测）。
+    证据文本出现 Tests run: 0 且命令含选择器时，record 给出醒目警告。
+    """
+    if not evidence:
+        return None
+    selectors = ("-Dgroups=", "-Dtest=", "--groups", "--filter", "-DfailIfNoSpecifiedTests")
+    if not any(selector in str(command) for selector in selectors):
+        return None
+    candidates = [Path(evidence)]
+    if project_root is not None and not Path(evidence).is_absolute():
+        candidates.insert(0, project_root / evidence)
+    text: str | None = None
+    for candidate in candidates:
+        try:
+            if candidate.is_file() and candidate.stat().st_size <= 4 * 1024 * 1024:
+                text = candidate.read_text(encoding="utf-8", errors="replace")
+                break
+        except OSError:
+            continue
+    if text is None:
+        return None
+    zero = re.search(
+        r"Tests run:\s*0,\s*Failures:\s*0,\s*Errors:\s*0", text
+    )
+    ran_something = re.search(r"Tests run:\s*[1-9]", text)
+    if zero is not None and ran_something is None:
+        return (
+            "ZERO_TESTS_WITH_SELECTOR: 命令含测试选择器但 Tests run=0（exit 0 不代表通过）；"
+            "常见于 surefire 插件级 excludedGroups 压过命令行覆盖——检查 pom 是否写死 "
+            "<excludedGroups>（应改为 ${excludedGroups} 属性占位）"
+        )
+    return None
+
+
 def cmd_scenario_receipt_template(args: argparse.Namespace) -> int:
     """Emit a schema-v2 receipt skeleton built from the scenario manifest.
 
@@ -3202,8 +3258,32 @@ def cmd_scenario_receipt_template(args: argparse.Namespace) -> int:
         return 0
     out_path = Path(str(out_raw)).expanduser()
     if not out_path.is_absolute():
-        out_path = change_dir / out_path
+        # 防双重拼接（E-1）：调用方按 CLI 惯例传 cwd 相对路径时（如
+        # .harness/changes/<cn>/evidence/x.json），直接拼 change_dir 会产生嵌套
+        # 幽灵目录。相对路径若以 change-dir 自身前缀开头，按 cwd 解析；否则按
+        # 文档规则相对 change-dir 解析。
+        cwd = Path.cwd().resolve()
+        change_resolved = change_dir.resolve()
+        if _is_relative_to(change_resolved, cwd):
+            change_rel = change_resolved.relative_to(cwd)
+            if out_path.parts[: len(change_rel.parts)] == change_rel.parts:
+                out_path = cwd / out_path
+            else:
+                out_path = change_dir / out_path
+        else:
+            out_path = change_dir / out_path
     out_path = out_path.resolve()
+    change_resolved = change_dir.resolve()
+    cwd = Path.cwd().resolve()
+    if not (
+        _is_relative_to(out_path, change_resolved)
+        or _is_relative_to(out_path, cwd)
+    ):
+        return emit_error(
+            "--out 解析后越出项目目录: " + str(out_path),
+            as_json=as_json,
+            error_code="SCENARIO_RECEIPT_OUT_OF_PROJECT",
+        )
     try:
         out_path.parent.mkdir(parents=True, exist_ok=True)
         out_path.write_text(body, encoding="utf-8", newline="\n")
@@ -3321,7 +3401,7 @@ def build_parser() -> argparse.ArgumentParser:
     p_hash.set_defaults(func=cmd_hash)
 
     p_reuse = sub.add_parser("can-reuse", parents=[shared_json], help="decide whether a verification can be reused")
-    p_reuse.add_argument("--change-dir", required=True)
+    p_reuse.add_argument("--change-dir", "--change", dest="change_dir", required=True)
     p_reuse.add_argument(
         "--verification",
         required=True,
@@ -3389,7 +3469,7 @@ def build_parser() -> argparse.ArgumentParser:
     p_reuse.set_defaults(func=cmd_can_reuse)
 
     p_record = sub.add_parser("record", parents=[shared_json], help="write validation result into ledger")
-    p_record.add_argument("--change-dir", required=True)
+    p_record.add_argument("--change-dir", "--change", dest="change_dir", required=True)
     p_record.add_argument("--verification", required=True)
     p_record.add_argument("--status", required=True)
     p_record.add_argument("--command", required=True)
@@ -3515,7 +3595,7 @@ def build_parser() -> argparse.ArgumentParser:
             "pre-filled from meta/scenario-manifest.json"
         ),
     )
-    p_receipt.add_argument("--change-dir", required=True)
+    p_receipt.add_argument("--change-dir", "--change", dest="change_dir", required=True)
     p_receipt.add_argument(
         "--scenario-ids",
         required=True,

package/harness/bundles/general/codex/scripts/harness_process.py

@@ -15,6 +15,7 @@ import json
 import os
 from pathlib import Path
 import signal
+import shutil
 import subprocess
 import sys
 import time
@@ -946,6 +947,23 @@ def capture_owned_members(spawned: SpawnedProcess) -> dict[str, Any] | None:
     return proof
 
 
+def resolve_windows_executable(argv: Sequence[str]) -> list[str]:
+    """Windows 无扩展名命令解析为实际可执行文件（F-1）。
+
+    CreateProcess 不走 shell，`mvn`/`npm` 这类 .cmd 包装会报 WinError 2；
+    shutil.which 遵循 PATHEXT 能找到 mvn.cmd。POSIX 或未命中时原样返回。
+    """
+    if os.name != "nt" or not argv:
+        return list(argv)
+    head = argv[0]
+    if not isinstance(head, str) or not head or os.path.splitext(head)[1]:
+        return list(argv)
+    resolved = shutil.which(head)
+    if resolved is None:
+        return list(argv)
+    return [resolved, *argv[1:]]
+
+
 def spawn_structured_argv(
     argv: Sequence[str],
     *,

package/harness/bundles/general/codex/scripts/harness_runtime.py

@@ -1099,6 +1099,9 @@ def _spawn_detached_worker(
     env: dict[str, str],
     output: Any = subprocess.DEVNULL,
 ) -> subprocess.Popen[bytes]:
+    from harness_process import resolve_windows_executable
+
+    argv = resolve_windows_executable(argv)
     kwargs: dict[str, Any] = {
         "cwd": str(cwd),
         "env": env,
@@ -1171,6 +1174,40 @@ def start_run_session(
     working_directory = working_directory.expanduser().resolve()
     if not working_directory.is_dir():
         raise ValueError(f"RUN_SESSION_WORKDIR_MISSING: {working_directory}")
+    # F-2：fixback 会话缺 product-identity 时白跑一轮、register 才拒。批次开着
+    # 就从 baseProductIdentity 自动注入；没有 OPEN 批次则当场拒绝（2026-08-31
+    # demo-datasource 实测）。
+    if verification.startswith("fixback") and not (
+        product_identity and product_identity.strip()
+    ):
+        batches_dir = state_root / "fixback" / "batches"
+        open_identity: str | None = None
+        open_batch_id: str | None = None
+        if batches_dir.is_dir():
+            for batch_file in sorted(batches_dir.glob("*.json")):
+                try:
+                    batch = json.loads(batch_file.read_text(encoding="utf-8-sig"))
+                except (OSError, json.JSONDecodeError):
+                    continue
+                if (
+                    isinstance(batch, dict)
+                    and batch.get("status") == "OPEN"
+                    and isinstance(batch.get("baseProductIdentity"), str)
+                    and batch["baseProductIdentity"].strip()
+                ):
+                    open_identity = str(batch["baseProductIdentity"]).strip()
+                    open_batch_id = str(batch.get("batchId") or "")
+                    break
+        if open_identity is None:
+            raise ValueError(
+                "FIXBACK_PRODUCT_IDENTITY_REQUIRED: fixback 会话必须有产品身份——"
+                "传 --product-identity，或先启动 fixback 批次（其 baseProductIdentity "
+                "会被自动注入）"
+            )
+        product_identity = open_identity
+        product_identity_source = f"fixback-batch:{open_batch_id}"
+    else:
+        product_identity_source = None
     session_id = session_id or f"run-{uuid.uuid4().hex}"
     run_id = run_id or session_id
     session_root = _run_session_root(state_root, session_id)
@@ -1215,6 +1252,11 @@ def start_run_session(
         "heartbeatSeconds": heartbeat_seconds,
         "expectedDurationSeconds": expected_duration_seconds,
         "productIdentity": product_identity,
+        **(
+            {"productIdentitySource": product_identity_source}
+            if product_identity_source is not None
+            else {}
+        ),
         "resourceLocks": normalized_resource_locks,
         "resourceLockTokens": {},
         "resourceWaitMs": 0,
@@ -1427,8 +1469,12 @@ def _run_session_worker(state_root: Path, session_id: str) -> int:
             "wb", buffering=0
         ) as stderr:
             try:
-                from harness_process import spawn_structured_argv
+                from harness_process import (
+                    resolve_windows_executable,
+                    spawn_structured_argv,
+                )
 
+                argv = resolve_windows_executable(argv)
                 spawned = spawn_structured_argv(
                     argv,
                     cwd=Path(str(receipt["workingDirectory"])),

package/harness/bundles/general/cursor/.harness-build.json

@@ -2,5 +2,5 @@
   "schemaVersion": 1,
   "overlay": "none",
   "agent": "cursor",
-  "coreHash": "b2f31f3090f759b0"
+  "coreHash": "55a60d625b7500ac"
 }

package/harness/bundles/general/cursor/harness-archive/SKILL.md

@@ -3,7 +3,7 @@ name: harness-archive
 description: 归档所有变更产出（计划/测试报告/审查/SQL/API文档）到 .harness/archive/，含归档元数据。仅当用户显式调用
   /harness-archive 时使用；不得被其他阶段 skill 自动接续触发。
 ---
-<!-- generated by harness_deploy.py; core=b2f31f3090f759b0; overlay=none; agent=cursor; do not edit -->
+<!-- generated by harness_deploy.py; core=55a60d625b7500ac; overlay=none; agent=cursor; do not edit -->
 # harness-archive — 变更归档
 
 ## Purpose

package/harness/bundles/general/cursor/harness-codebase-map/SKILL.md

@@ -3,7 +3,7 @@ name: harness-codebase-map
 description: 分析现有代码库并生成 .harness/codebase/map/
   下的结构化代码库地图。用于陌生项目理解、重大改造前梳理、harness-sync 提示 map 过期后的人工刷新。
 ---
-<!-- generated by harness_deploy.py; core=b2f31f3090f759b0; overlay=none; agent=cursor; do not edit -->
+<!-- generated by harness_deploy.py; core=55a60d625b7500ac; overlay=none; agent=cursor; do not edit -->
 # harness-codebase-map — 代码库地图
 
 ## Purpose

package/harness/bundles/general/cursor/harness-execute/SKILL.md

@@ -4,7 +4,7 @@ description: 执行阶段：按变更簇执行 TDD
   编码循环（RED→GREEN→REFACTOR→编译验证），随后完成单元/接口/数据兼容验证并输出测试报告。仅当用户显式调用
   /harness-execute 时使用；不得因用户提到编码/实现/测试就自动触发，也不得被其他阶段 skill 自动接续。
 ---
-<!-- generated by harness_deploy.py; core=b2f31f3090f759b0; overlay=none; agent=cursor; do not edit -->
+<!-- generated by harness_deploy.py; core=55a60d625b7500ac; overlay=none; agent=cursor; do not edit -->
 # harness-execute — 执行（编码 + 验证）
 
 > 2026-08 阶段合并：原 `run`（编码）与 `test`（验证）合并为单一 `execute` 阶段；
@@ -61,13 +61,15 @@ description: 执行阶段：按变更簇执行 TDD
 
 ## Workflow 概要
 
-0. 加载上下文：先 `harness_context.py prepare --project . --change <id> --phase execute --executor <tool> --json`（`--project` 必填），再 `harness_context.py begin --project . --change <id> --phase execute --executor <tool> --json` 校验交接，最后运行 **`harness_gate.py begin --phase execute --change <id>`**。旧名 `--phase run` / `--phase test` 仍被接受并归一为 execute。<br>**交接凭证不必手工补**：v2 计划的 `plan finalize` 不写 context 事务，`prepare` 会在检测到 committed 的 `meta/publication-journals/*.json` 时自动补录 `plan → execute` 凭证（凭证带 `bootstrapSource=plan_publication_journal` 留痕）。仍报 `HANDOFF_REQUIRED`/`LEGACY_BOOTSTRAP_REQUIRED` 说明**没有**这份发布证据——回到 plan 阶段确认发布是否真的完成，**不得**自己拼 `classify + configure-plan + close` 造凭证。<br>**Fixback** 不得拼装底层步骤，必须只调用一次 `harness_fixback.py launch-review --project . --change <id> --change-dir <change-dir> --executor <tool> --skills-root <skills-root> --product-identity <当前产品身份> --json`；返回 `FIXBACK_NOTHING_TO_APPLY` 时直接报告并停止。禁止手写 `events.ndjson` / `phase.end`。
+0. 加载上下文：先 `harness_context.py prepare --project . --change <id> --phase execute --executor <tool> --json`（`--project` 必填），再 `harness_context.py begin --project . --change <id> --phase execute --executor <tool> --json` 校验交接，最后运行 **`harness_gate.py begin --phase execute --change <id>`**。旧名 `--phase run` / `--phase test` 仍被接受并归一为 execute。<br>Git Bash 注意：`--note` 等字符串参数**不要以 `/` 开头**（MSYS 会把它当路径改写成 `C:/Program Files/Git/...`）；以 `/` 开头时先 `MSYS_NO_PATHCONV=1`。<br>**交接凭证不必手工补**：v2 计划的 `plan finalize` 不写 context 事务，`prepare` 会在检测到 committed 的 `meta/publication-journals/*.json` 时自动补录 `plan → execute` 凭证（凭证带 `bootstrapSource=plan_publication_journal` 留痕）。仍报 `HANDOFF_REQUIRED`/`LEGACY_BOOTSTRAP_REQUIRED` 说明**没有**这份发布证据——回到 plan 阶段确认发布是否真的完成，**不得**自己拼 `classify + configure-plan + close` 造凭证。<br>**Fixback** 不得拼装底层步骤，必须只调用一次 `harness_fixback.py launch-review --project . --change <id> --change-dir <change-dir> --executor <tool> --skills-root <skills-root> --product-identity <当前产品身份> --json`；返回 `FIXBACK_NOTHING_TO_APPLY` 时直接报告并停止。禁止手写 `events.ndjson` / `phase.end`。
+
+**Fixback 步骤序列**（0.4.11 起文档化；每步失败都有 recoveryAction）：launch-review 启动批次 → 托管 RED 会话（`harness_runtime.py run-start --verification fixback-red --product-identity <批次 baseProductIdentity，缺省自动注入> -- ...`）→ `harness_fixback.py evidence-template` 生成证据 + `register-evidence` 注册 → 修复 → GREEN 会话同法 → 逐 issue `resolve-issue` → `harness_review.py write-dispositions` 处置 → affected 验证会话 + review 收据 → `harness_fixback.py close --change-dir <change-dir> --batch-id <批次> --final-product-identity <身份>`（批次关闭会同步把 fixback-session 置 CLOSED）→ `harness_gate.py close --phase execute`（fixback 回环自动派生回 submit）。Windows 上命令名写 `mvn` 会 WinError 2——0.4.11 起 launcher 自动解析 .cmd/.exe，更早版本请写全路径。
 0.5. **测试基础设施探测**与**命令执行模式 preflight** → `testing-reference.md`「命令执行模式 preflight」；测试基线已由 gate begin 内部建立，不得再次执行 guard begin
 1. **变更簇 TDD** — `protocols.md` `run-tdd-protocol`；批量 RED/GREEN；按需 `change-cluster-review-protocol`
 2. 构建验证 + **仅**通过 `harness_ledger.py record` 写 ledger（禁止 Write/Edit `verification-ledger.json`）；profile 缺失或陈旧时先 `harness_preflight.py detect --project . --json`；`record --project . --profile-input <key>` 从同一 target 推导 scope、coverage、规范命令与输入闭包
 3. **验证执行**：单元测试可复用则跳过（`harness_ledger.py can-reuse`）；接口测试**强制批量执行器**一次跑完全部场景；数据兼容验证按场景表执行 → `testing-reference.md`
 4. **场景覆盖检查**（场景表映射，禁止用用例数冒充场景数）
-5. **关门检查**（10 项）→ 只执行一次 `harness_gate.py close`；`--to-phase` 可省略——计划后继唯一（排除 fixback 自环）时自动派生并交接（输出含 `derivedToPhase`）。仅 fixback 回环时显式传 `--to-phase execute`。该命令内部关闭 test guard、写 `phase.end`、释放租约、写 handoff 并补传事件；不得再单独调用 test-guard/context close。失败时按结构化 `recoveryAction` 原样重试，已完成步骤幂等复用。
+5. **关门检查**（10 项）→ 只执行一次 `harness_gate.py close`；`--to-phase` 可省略——计划后继唯一（排除 fixback 自环）时自动派生并交接（输出含 `derivedToPhase`）。仅 fixback 回环时显式传 `--to-phase execute`；fixback 批次的 execute 关门自动派生 review 的后继（submit），不会错误地再回一轮 review（0.4.11 起）。该命令内部关闭 test guard、写 `phase.end`、释放租约、写 handoff 并补传事件；不得再单独调用 test-guard/context close。失败时按结构化 `recoveryAction` 原样重试，已完成步骤幂等复用。
 
 **阶段归属规则**：只用 `ownerPhase=execute` 的任务和场景判定本阶段结果。`ownerPhase=review`/`submit` 的场景按计划留给后续阶段属于正常移交，出现在关门返回值的 `deferred` 里，不阻断 execute。合并前 `ownerPhase=run`/`test` 的旧清单经别名表归一为 execute，在 execute 关门时一并到期。