@hunter-harness/workflow-harness 0.2.84 → 0.2.86

package/harness/bundles/java/codex/harness-test/SKILL.md

@@ -3,7 +3,7 @@ name: harness-test
 description: 测试执行：读取场景表，执行单元测试+API接口测试+数据兼容验证，输出测试报告。仅当用户显式调用 /harness-test
   时使用；不得在 run 结束后自动接续执行。
 ---
-<!-- generated by harness_deploy.py; core=1d28a8320140680d; overlay=java; agent=codex; do not edit -->
+<!-- generated by harness_deploy.py; core=874039c57f9d1bc4; overlay=java; agent=codex; do not edit -->
 # harness-test — 测试执行
 
 ## Purpose

package/harness/bundles/java/codex/scripts/harness_archive.py

@@ -2599,23 +2599,12 @@ def check_status(
             }
         )
 
-    # 发布内容预检：与服务端同源的规则，扫的是真正会进 ZIP 的那批文件。
-    # 服务端策略不归本地裁决，所以只预警不阻断——但必须在归档开始时就说出来，
-    # 而不是等跑完全流程由 upload 返回 422。
-    content_scan = precheck_publication_content(change_dir)
-    checks["publication_content_scan"] = content_scan
-    if content_scan.get("blocked"):
-        warnings.append({
-            "code": "PUBLICATION_CONTENT_SCAN_FLAGGED",
-            "message": str(content_scan.get("nextAction") or ""),
-        })
-    elif not content_scan.get("ok"):
-        warnings.append({
-            "code": str(
-                content_scan.get("reasonCode") or "PUBLICATION_CONTENT_SCAN_UNAVAILABLE"
-            ),
-            "message": str(content_scan.get("message") or ""),
-        })
+    checks["publication_content_scan"] = {
+        "ok": True,
+        "scan_performed": False,
+        "findings": [],
+        "message": "上传归档链路已停用内容敏感扫描；保留路径、凭据与 ZIP 安全校验。",
+    }
 
     sensitive_gate = validate_sensitive_evidence_publication_gate(
         change_dir,
@@ -9408,6 +9397,9 @@ def resolve_hunter_cli_command(project_root: Path) -> list[str]:
     """Command prefix that runs the hunter-harness CLI, cheapest route first."""
     node = shutil.which("node")
     if node:
+        current_entry = os.environ.get("HUNTER_HARNESS_CLI_ENTRY", "").strip()
+        if current_entry and Path(current_entry).is_file():
+            return [node, str(Path(current_entry).resolve())]
         entry = _installed_cli_entry(project_root)
         if entry is not None:
             return [node, str(entry)]
@@ -9774,6 +9766,7 @@ def auto_push_archive_core(
     change_key: str | None = None,
     extra_entries: dict[str, tuple[str, str, bytes]] | None = None,
     reuse_retained_package: bool = False,
+    prepared_package: dict[str, Any] | None = None,
 ) -> dict[str, Any]:
     """Build and upload one deterministic core ZIP after finalize.
 
@@ -9786,11 +9779,13 @@ def auto_push_archive_core(
     """
     project_root = project_root.resolve()
     effective_change_key = change_key or archive_dir.name
-    package = (
-        load_retained_package(project_root, effective_change_key)
-        if reuse_retained_package
-        else None
-    )
+    package = prepared_package
+    if package is None:
+        package = (
+            load_retained_package(project_root, effective_change_key)
+            if reuse_retained_package
+            else None
+        )
     if package is None:
         try:
             package = build_archive_package(
@@ -10637,6 +10632,28 @@ def resolve_archive_dir_for_change(
     return archive_root / matches[-1], matches
 
 
+def resolve_latest_unpublished_archive(project_root: Path) -> tuple[str | None, list[str]]:
+    """Choose the newest sealed archive without a durable local receipt."""
+    archive_root = project_root / ".harness" / "archive"
+    if not archive_root.is_dir():
+        return None, []
+    candidates: list[tuple[str, str]] = []
+    for entry in archive_root.iterdir():
+        if not entry.is_dir():
+            continue
+        change = entry.name
+        try:
+            summary = read_json(entry / "reports" / "final" / "summary-data.json")
+            if isinstance(summary, dict) and isinstance(summary.get("changeName"), str):
+                change = str(summary["changeName"]).strip() or change
+        except (OSError, ValueError, json.JSONDecodeError):
+            pass
+        if read_durable_archive_receipt(project_root, change) is None:
+            candidates.append((entry.name, change))
+    candidates.sort(reverse=True)
+    return (candidates[0][1] if candidates else None), [item[1] for item in candidates]
+
+
 def _republish_knowledge_entry(archive_dir: Path) -> dict[str, tuple[str, str, bytes]]:
     """Knowledge candidates for archives sealed before the candidates step.
 
@@ -10707,12 +10724,26 @@ def cmd_republish(
         "changeKey": change_key,
         "dryRun": dry_run,
     }
+    root = resolve_republish_project_root(project_root, archive_dir)
+    if change_key == "latest":
+        selected, available = resolve_latest_unpublished_archive(root)
+        if selected is None:
+            payload.update({
+                "ok": True,
+                "reasonCode": "ARCHIVE_NO_UNPUBLISHED_ARCHIVE",
+                "noChanges": True,
+                "availableChanges": available,
+                "projectRoot": str(root)
+            })
+            return 0, payload
+        change_key = selected
+        payload["changeKey"] = change_key
+        payload["selectedChange"] = selected
     if re.fullmatch(r"[A-Za-z0-9][A-Za-z0-9._-]{0,159}", change_key) is None:
         payload["error"] = "change key must be a portable path segment"
         payload["reasonCode"] = "ARCHIVE_CHANGE_KEY_INVALID"
         return 2, payload
 
-    root = resolve_republish_project_root(project_root, archive_dir)
     payload["projectRoot"] = str(root)
     matches: list[str] = []
     if archive_dir is None:
@@ -10821,7 +10852,7 @@ def cmd_republish(
     # distinct name; it must never be mistaken for a pending upload.
     preview_path = (
         root / ".harness" / "state" / "local" / "archive-packages"
-        / f"{change_key}.preview.zip"
+        / f"{change_key}{'.preview.zip' if dry_run else '.zip'}"
     )
     try:
         package = build_archive_package(
@@ -10837,7 +10868,8 @@ def cmd_republish(
         return 1, payload
     finally:
         try:
-            preview_path.unlink(missing_ok=True)
+            if dry_run:
+                preview_path.unlink(missing_ok=True)
         except OSError:
             pass
 
@@ -10907,6 +10939,7 @@ def cmd_republish(
         archive_dir,
         change_key=change_key,
         extra_entries=extra_entries,
+        prepared_package=package,
     )
     payload["push"] = result
     payload["ok"] = bool(result.get("ok"))

package/harness/bundles/java/codex/scripts/harness_change.py

@@ -564,18 +564,36 @@ def _lease_expired(lease: dict[str, Any]) -> bool:
     return dt.datetime.now().astimezone() >= exp_dt
 
 
-def inspect_lease(project_root: Path, change_id: str) -> dict[str, Any] | None:
-    """Return the current non-expired lease without mutating it."""
+def inspect_lease_state(project_root: Path, change_id: str) -> dict[str, Any]:
+    """Read the lease without mutating it, keeping the three failure modes apart.
+
+    ``inspect_lease`` collapses absent / expired / corrupt into ``None``, so a
+    caller cannot tell "nobody ever held this" from "the phase outlived its
+    TTL". Those need different answers: an expired lease still carries the
+    runId that proves who owns the phase, a corrupt one proves nothing, and an
+    absent one may just mean the phase already closed.
+
+    state is one of ``active`` | ``expired`` | ``absent`` | ``corrupt``. The
+    lease dict is returned for ``active`` and ``expired``; ``None`` otherwise.
+    """
     path = _lease_path(project_root, change_id)
     if not path.is_file():
-        return None
+        return {"state": "absent", "lease": None}
     try:
         lease = _read_json(path)
     except (OSError, json.JSONDecodeError):
-        return None
-    if not isinstance(lease, dict) or _lease_expired(lease):
-        return None
-    return lease
+        return {"state": "corrupt", "lease": None}
+    if not isinstance(lease, dict):
+        return {"state": "corrupt", "lease": None}
+    if _lease_expired(lease):
+        return {"state": "expired", "lease": lease}
+    return {"state": "active", "lease": lease}
+
+
+def inspect_lease(project_root: Path, change_id: str) -> dict[str, Any] | None:
+    """Return the current non-expired lease without mutating it."""
+    state = inspect_lease_state(project_root, change_id)
+    return state["lease"] if state["state"] == "active" else None
 
 
 def _claim_lease_locked(

package/harness/bundles/java/codex/scripts/harness_context.py

@@ -21,6 +21,7 @@ if str(SCRIPTS_DIR) not in sys.path:
     sys.path.insert(0, str(SCRIPTS_DIR))
 
 import harness_ledger as hl  # noqa: E402
+import harness_paths as hpaths  # noqa: E402
 
 
 PHASE_GRAPH = {
@@ -31,17 +32,8 @@ PHASE_GRAPH = {
     "submit": (),
 }
 
-WORKFLOW_PHASES = (
-    "plan",
-    "run",
-    "test",
-    "review",
-    "package",
-    "apidoc",
-    "submit",
-    "merge",
-    "archive",
-)
+# 唯一权威清单在 harness_paths（叶子模块，harness_phase 引的是同一个对象）。
+WORKFLOW_PHASES = hpaths.WORKFLOW_PHASES
 
 DISPLAY_TITLE_MAX_LENGTH = 80
 
@@ -270,13 +262,24 @@ def _contract(project: Path, change: str) -> tuple[Path, dict[str, Any], Path]:
 
 
 def _phase_plan(contract_root: Path) -> tuple[list[str] | None, str]:
+    """读出阶段计划；无法采信时说明原因，而不是悄悄退成 legacy。
+
+    以前这里遇到未知阶段名一律返回 (None, "legacy")：阶段计划整个失效，
+    `_allowed_next_phases` 退回硬编码的 PHASE_GRAPH，而调用方看不出发生过这件事。
+    未知阶段名不是假想问题——阶段清单少一个 merge 时，worktree 变更的
+    plannedPhases 就会带着 merge 走到这里。
+
+    未知名先过 LEGACY_PHASE_ALIASES 读时映射（阶段改名后历史 change 靠它继续可读），
+    仍然解析不了才降级，并把原因与具体阶段名带在 source 里。
+    """
     policy_path = contract_root / "meta" / "gate-policy.json"
     if not policy_path.is_file():
         return None, "legacy"
     try:
         policy = _read_json(policy_path)
     except (OSError, ValueError, json.JSONDecodeError):
-        return None, "legacy"
+        return None, "legacy:policy-unreadable"
+    unknown: list[str] = []
     for field, source in (
         ("plannedPhases", "change"),
         ("defaultPhases", "policy-default"),
@@ -285,12 +288,17 @@ def _phase_plan(contract_root: Path) -> tuple[list[str] | None, str]:
         if not isinstance(raw, list):
             continue
         phases = [str(item).strip() for item in raw if str(item).strip()]
-        if (
-            phases
-            and len(phases) == len(set(phases))
-            and all(item in WORKFLOW_PHASES for item in phases)
-        ):
-            return phases, source
+        if not phases or len(phases) != len(set(phases)):
+            continue
+        resolved = [hpaths.resolve_phase_name(item) for item in phases]
+        missing = [item for item, hit in zip(phases, resolved) if hit is None]
+        if missing:
+            unknown.extend(missing)
+            continue
+        # 映射后可能出现重复（两个旧名合并成同一个新阶段），保序去重。
+        return list(dict.fromkeys(str(item) for item in resolved)), source
+    if unknown:
+        return None, "legacy:unknown-phases=" + ",".join(dict.fromkeys(unknown))
     return None, "legacy"
 
 
@@ -405,6 +413,7 @@ def _paths(state_root: Path) -> dict[str, Path]:
         "begins": runtime / "transition-begins.ndjson",
         "current": runtime / "current-context.json",
         "lease": runtime / "context-lease.json",
+        "adoptions": runtime / "context-adoptions.ndjson",
     }
 
 
@@ -604,8 +613,14 @@ def _claim_prepared_context(
             )
         except (OSError, ValueError, json.JSONDecodeError):
             return {"ok": False, "code": "CONTEXT_CURRENT_INVALID"}
+        # 跨阶段推进必须有 receipt 证明它合法；同一个阶段换执行者不需要。
+        # 以前两者都要 receipt，于是上一阶段崩溃没能正常 close 时，接手的工具
+        # 连"继续把这个阶段干完"都做不到。并发保护不受影响：租约未过期而
+        # owner 不同，上面 CONTEXT_LEASE_HELD 已经拦下了，能走到这里只剩
+        # 「租约已过期」和「租约已被上一阶段 close 删除」两种情况。
+        adoption: dict[str, Any] | None = None
         if recovery is None and isinstance(current, dict) and (
-            current.get("executor") != executor or current.get("phase") != phase
+            current.get("phase") != phase
         ):
             valid_receipt = (
                 isinstance(latest, dict)
@@ -621,6 +636,19 @@ def _claim_prepared_context(
                     "toExecutor": executor,
                     "toPhase": phase,
                 }
+        executor_changed = (
+            isinstance(current, dict) and current.get("executor") != executor
+        )
+        if recovery is not None or executor_changed:
+            adoption = {
+                "previousExecutor": (
+                    current.get("executor") if isinstance(current, dict) else None
+                ),
+                "newExecutor": executor,
+                "reason": (
+                    "lease_expired" if recovery is not None else "same_phase_handoff"
+                ),
+            }
 
         try:
             execution_root = _execution_root(project, contract_root, state_root)
@@ -657,6 +685,20 @@ def _claim_prepared_context(
             current_context["preparationId"] = preparation_id
         _write_json_atomic(paths["lease"], lease)
         _write_json_atomic(paths["current"], current_context)
+        if adoption is not None:
+            # 接管必须留痕。过期租约本来就允许任何执行者顶替，但以前只在返回体
+            # 里挂一个 recovery，退出进程就没了——事后查"这个阶段是谁接手的"
+            # 无据可依。收据形状照 harness_archive.adopt_existing_range。
+            adoption = {
+                "schemaVersion": 1,
+                "changeName": change,
+                "phase": phase,
+                **adoption,
+                "previousOwner": recovery.get("previousOwner") if recovery else None,
+                "expiredAt": recovery.get("expiredAt") if recovery else None,
+                "adoptedAt": now.isoformat(),
+            }
+            _append_ndjson(paths["adoptions"], adoption)
         return {
             "ok": True,
             "lease": lease,
@@ -664,6 +706,7 @@ def _claim_prepared_context(
             "transitions": transitions,
             "latestTransition": latest,
             "recovery": recovery,
+            "adoption": adoption,
             "executionRoot": str(execution_root),
         }
 

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

@@ -405,6 +405,10 @@ def _default_gate_begin(**kwargs: Any) -> dict[str, Any]:
         str(kwargs["run_id"]),
         "--note",
         "开始处理评审中确认需要修改的代码问题。",
+        # 显式标记这一轮是 review fixback。以前靠 gate 嗅探 note 里有没有
+        # "fixback" 字样——而上面这条 note 一个都没有，于是 fixback 的 run 事件
+        # 从来没被打上 trigger/from_phase。
+        "--fixback",
     ]
     for option, key in (
         ("--executor-tool", "executor_tool"),