@hunter-harness/workflow-harness 0.2.64 → 0.2.65

package/harness/bundles/java/cursor/scripts/harness_gate.py

@@ -981,28 +981,24 @@ def read_identity(skills_root: Path) -> dict[str, Any]:
     return identity
 
 
+def resolve_skills_root(raw: str | None) -> Path | None:
+    """Resolve an explicit root or the installed bundle beside this script."""
+    if isinstance(raw, str) and raw.strip():
+        return Path(raw).expanduser().resolve()
+    adjacent = SCRIPTS_DIR.parent.resolve()
+    return adjacent if (adjacent / ".harness-build.json").is_file() else None
+
+
 def change_code_root(change_dir: Path) -> Path:
     project = change_dir.parents[2]
-    metadata = (
-        (change_dir / "meta" / "change-context.json", ("worktreeRoot",)),
-        (change_dir / "meta" / "worktree.json", ("worktreePath", "path")),
-    )
-    for context_path, fields in metadata:
-        if not context_path.is_file():
-            continue
-        try:
-            context = json.loads(context_path.read_text(encoding="utf-8"))
-            raw_root = next(
-                (str(context.get(field) or "").strip() for field in fields if context.get(field)),
-                "",
-            )
-            if raw_root:
-                raw_path = Path(raw_root).expanduser()
-                candidate = (raw_path if raw_path.is_absolute() else project / raw_path).resolve()
-                if candidate.is_dir():
-                    return candidate
-        except (OSError, ValueError, json.JSONDecodeError):
-            pass
+    inferred = hl.infer_execution_project_root(change_dir)
+    if inferred is not None:
+        return inferred
+    if hl.declares_execution_worktree(change_dir):
+        raise ValueError(
+            "EXECUTION_WORKTREE_INVALID: declared worktree is missing, not a Git root, "
+            "or belongs to another repository"
+        )
     return project
 
 
@@ -2388,16 +2384,15 @@ def cmd_begin(args: argparse.Namespace) -> int:
         return emit_error("POLICY_LOAD_FAILED", str(exc), as_json=as_json)
 
     executor_tool = args.executor_tool or os.environ.get("HUNTER_HARNESS_TOOL")
-    if not args.skills_root:
+    skills_root = resolve_skills_root(args.skills_root)
+    if skills_root is None:
         return emit_error(
             "BUNDLE_IDENTITY_REQUIRED",
             "--skills-root is required; refresh the selected Harness adapter if identity is missing",
             as_json=as_json,
         )
     try:
-        identity = validate_identity(
-            project, Path(args.skills_root).expanduser().resolve(), executor_tool
-        )
+        identity = validate_identity(project, skills_root, executor_tool)
     except (OSError, json.JSONDecodeError, ValueError) as exc:
         return emit_error("BUNDLE_IDENTITY_INVALID", str(exc), as_json=as_json)
     executor_tool = executor_tool or str(identity.get("adapter") or "") or None
@@ -2446,7 +2441,7 @@ def cmd_begin(args: argparse.Namespace) -> int:
                 run_id=run_id,
                 project=project,
                 execution_root=execution_root,
-                skills_root=Path(args.skills_root).expanduser(),
+                skills_root=skills_root,
             )
         except ValueError as exc:
             if gate_soft_allowed(severity_mode, args.phase, "capsule"):
@@ -2532,7 +2527,7 @@ def cmd_begin(args: argparse.Namespace) -> int:
                 "projectRoot": str(project.resolve()),
                 "stateRoot": str(state_root),
                 "executionRoot": str(execution_root),
-                "skillsRoot": str(Path(args.skills_root).expanduser().resolve()),
+                "skillsRoot": str(skills_root.resolve()),
                 "repositoryId": hp.repository_identity(execution_root),
                 "baseCommit": base_commit or current_head,
                 "currentHead": current_head,
@@ -2574,7 +2569,7 @@ def cmd_begin(args: argparse.Namespace) -> int:
         "projectRoot": str(project),
         "stateRoot": capsule.get("stateRoot") if capsule else None,
         "executionRoot": capsule.get("executionRoot") if capsule else str(execution_root),
-        "skillsRoot": capsule.get("skillsRoot") if capsule else str(Path(args.skills_root).resolve()),
+        "skillsRoot": capsule.get("skillsRoot") if capsule else str(skills_root.resolve()),
         "lease": claim.get("lease"),
         "identity": identity,
         "event": event_result,

package/harness/bundles/java/cursor/scripts/harness_ledger.py

@@ -412,6 +412,131 @@ def input_files_from_args(args: argparse.Namespace) -> tuple[list[str], Path | N
     return resolve_input_files(selected, project_root), project_root
 
 
+def infer_execution_project_root(change_dir: Path) -> Path | None:
+    """Resolve the tree under test from trusted change metadata.
+
+    Worktree changes keep their durable contract under the main checkout while
+    product files live in the execution worktree.  Requiring every caller to
+    reconstruct that split caused ledger commands to hash the main checkout or
+    fail repeatedly.  Prefer the persisted execution root and otherwise leave
+    legacy callers unchanged.
+    """
+    change_dir = change_dir.expanduser().resolve()
+    project_root = next(
+        (ancestor.parent for ancestor in change_dir.parents if ancestor.name == ".harness"),
+        None,
+    )
+    if project_root is None:
+        return None
+
+    def git_common_dir(root: Path) -> Path | None:
+        process = subprocess.run(
+            ["git", "-C", str(root), "rev-parse", "--path-format=absolute", "--git-common-dir"],
+            text=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            check=False,
+        )
+        if process.returncode != 0 or not process.stdout.strip():
+            return None
+        raw = Path(process.stdout.strip()).expanduser()
+        return raw.resolve() if raw.is_absolute() else (root / raw).resolve()
+
+    project_common_dir = git_common_dir(project_root)
+
+    def trusted_worktree(candidate: Path) -> Path | None:
+        if not candidate.is_dir():
+            return None
+        process = subprocess.run(
+            ["git", "-C", str(candidate), "rev-parse", "--show-toplevel"],
+            text=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            check=False,
+        )
+        if process.returncode != 0 or not process.stdout.strip():
+            return None
+        top_level = Path(process.stdout.strip()).expanduser().resolve()
+        if top_level != candidate:
+            return None
+        # Origin URL + root commit identifies a repository lineage, not a
+        # linked checkout. Independent clones can share both. A real linked
+        # worktree must share the exact Git common directory with the main tree.
+        if project_common_dir is None or git_common_dir(top_level) != project_common_dir:
+            return None
+        return top_level
+
+    candidates = (
+        (
+            change_dir / "meta" / "change-context.json",
+            ("worktreePath", "path", "worktreeRoot"),
+        ),
+        (
+            change_dir / "meta" / "worktree.json",
+            ("worktreePath", "path", "worktreeRoot"),
+        ),
+    )
+    for metadata_path, keys in candidates:
+        if not metadata_path.is_file():
+            continue
+        try:
+            payload = json.loads(metadata_path.read_text(encoding="utf-8-sig"))
+        except (OSError, json.JSONDecodeError):
+            continue
+        if not isinstance(payload, dict):
+            continue
+        for key in keys:
+            raw = payload.get(key)
+            if not isinstance(raw, str) or not raw.strip():
+                continue
+            raw_path = Path(raw).expanduser()
+            candidate = (
+                raw_path.resolve()
+                if raw_path.is_absolute()
+                else (project_root / raw_path).resolve()
+            )
+            if key == "worktreeRoot" and candidate.name != change_dir.name:
+                nested = (candidate / change_dir.name).resolve()
+                trusted_nested = trusted_worktree(nested)
+                if trusted_nested is not None:
+                    return trusted_nested
+                if trusted_worktree(candidate) is None:
+                    continue
+            trusted_candidate = trusted_worktree(candidate)
+            if trusted_candidate is not None:
+                return trusted_candidate
+    return None
+
+
+def declares_execution_worktree(change_dir: Path) -> bool:
+    """Return whether persisted metadata explicitly selects another checkout."""
+    for metadata_path in (
+        change_dir / "meta" / "change-context.json",
+        change_dir / "meta" / "worktree.json",
+    ):
+        if not metadata_path.is_file():
+            continue
+        try:
+            payload = json.loads(metadata_path.read_text(encoding="utf-8-sig"))
+        except (OSError, json.JSONDecodeError):
+            continue
+        if isinstance(payload, dict) and any(
+            isinstance(payload.get(key), str) and str(payload[key]).strip()
+            for key in ("worktreePath", "path", "worktreeRoot")
+        ):
+            return True
+    return False
+
+
+def apply_inferred_project_root(args: argparse.Namespace, change_dir: Path) -> None:
+    """Fill an omitted --project without overriding an explicit caller choice."""
+    if getattr(args, "project", None):
+        return
+    inferred = infer_execution_project_root(change_dir)
+    if inferred is not None:
+        args.project = str(inferred)
+
+
 def sha256_file(path: Path) -> str:
     digest = hashlib.sha256()
     with path.open("rb") as handle:
@@ -1774,20 +1899,10 @@ def worktree_ready(ledger: dict[str, Any], change_dir: Path) -> bool:
     root = ledger.get("worktreeRoot")
     if root is not None and _nonempty_str(root):
         return True
-    meta = change_dir / "meta" / "worktree.json"
-    if not meta.is_file():
-        return False
-    try:
-        data = json.loads(meta.read_text(encoding="utf-8-sig"))
-    except (OSError, json.JSONDecodeError):
-        return False
-    if not isinstance(data, dict):
-        return False
-    if data.get("requested") is True and data.get("created") is True:
-        return True
-    if _nonempty_str(data.get("path")) or _nonempty_str(data.get("worktreeRoot")):
-        return True
-    return False
+    # Metadata aliases are accepted only when they resolve to a real linked
+    # worktree of this repository. This keeps install reuse aligned with the
+    # execution root used by context and gate, including `worktreePath`.
+    return infer_execution_project_root(change_dir) is not None
 
 
 def decide_can_reuse(
@@ -2242,6 +2357,7 @@ def cmd_can_reuse(args: argparse.Namespace) -> int:
     verbose = bool(getattr(args, "verbose", False))
     verification = args.verification
     change_dir = resolve_path(args.change_dir)
+    apply_inferred_project_root(args, change_dir)
     ownership_check = frozen_ownership_check(change_dir)
     if not ownership_check.get("ok"):
         return emit_error(
@@ -2359,6 +2475,9 @@ def cmd_can_reuse(args: argparse.Namespace) -> int:
         return emit_error(f"can-reuse failed: {exc}", as_json=as_json)
 
     payload = _attach_invalidation_code(payload)
+    payload["resolvedProjectRoot"] = (
+        str(project_root) if project_root is not None else None
+    )
     emit_compact_or_verbose(
         payload, as_json=as_json, verbose=verbose,
         compact_fn=_compact_can_reuse_payload,
@@ -2370,6 +2489,7 @@ def cmd_record(args: argparse.Namespace) -> int:
     as_json = bool(args.json)
     verbose = bool(getattr(args, "verbose", False))
     change_dir = resolve_path(args.change_dir)
+    apply_inferred_project_root(args, change_dir)
     ownership_check = frozen_ownership_check(change_dir)
     if not ownership_check.get("ok"):
         return emit_error(
@@ -2836,11 +2956,26 @@ def cmd_record(args: argparse.Namespace) -> int:
 def cmd_diff_hash(args: argparse.Namespace) -> int:
     as_json = bool(args.json)
     repo_raw = getattr(args, "repo", None)
-    repo = Path(repo_raw).expanduser().resolve() if repo_raw else Path.cwd().resolve()
     base = getattr(args, "base", None)
     change_dir_raw = getattr(args, "change_dir", None)
     try:
         change_dir = resolve_path(change_dir_raw) if change_dir_raw else None
+        repo = Path(repo_raw).expanduser().resolve() if repo_raw else Path.cwd().resolve()
+        # Historical skill text passed ``--repo .`` even when the active change
+        # ran in a linked worktree.  Treat that shorthand like the default and
+        # recover the authoritative execution root captured during Plan.
+        repo_hint = str(repo_raw or "").strip().replace("\\", "/")
+        if change_dir is not None and repo_hint in {"", ".", "./"}:
+            inferred_repo = infer_execution_project_root(change_dir)
+            if inferred_repo is not None:
+                repo = inferred_repo
+            elif declares_execution_worktree(change_dir):
+                return emit_error(
+                    "change metadata declares an execution worktree that is missing or belongs "
+                    "to another repository",
+                    as_json=as_json,
+                    error_code="EXECUTION_WORKTREE_INVALID",
+                )
         if change_dir is not None and _contract_is_v2(change_dir):
             resolved_base = str(base or "").strip()
             if not resolved_base:
@@ -3086,7 +3221,11 @@ def build_parser() -> argparse.ArgumentParser:
         parents=[shared_json],
         help="compute commit-invariant byte-level diff hash for a repo",
     )
-    p_diff.add_argument("--repo", default=None, help="repo root (default: cwd)")
+    p_diff.add_argument(
+        "--repo",
+        default=None,
+        help="repo root (default: change worktree when recorded, otherwise cwd)",
+    )
     p_diff.add_argument("--base", default=None, help="base commit (default: root commit)")
     p_diff.add_argument(
         "--change-dir",

package/harness/bundles/java/cursor/scripts/harness_runtime.py

@@ -33,11 +33,15 @@ SCHEMA_VERSION = 1
 RUN_SESSION_SCHEMA_VERSION = 1
 RUN_TERMINAL_STATUSES = {"OK", "FAIL", "INCOMPLETE", "CANCELLED"}
 _CHANGE_ID = re.compile(r"^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$")
-SECRET_SCAN_RULES_VERSION = "secret-scan-v1"
+SECRET_SCAN_RULES_VERSION = "secret-scan-v2"
 SECRET_SCAN_RECEIPT_REL = Path("meta") / "secret-scan-receipt.json"
 _SENSITIVE_ASSIGNMENT = re.compile(
-    rb"(?i)[\"']?(?:password|passwd|token|secret|cookie|authorization|database[_-]?url)"
-    rb"[\"']?\s*[:=]\s*[\"']?[^\s\"']{4,}"
+    rb"(?i)[\"']?(?:password|passwd|token|secret|cookie|database[_-]?url)"
+    rb"[\"']?\s*[:=]\s*[\"']?(?P<value>[^\s\"']{4,})"
+)
+_AUTHORIZATION_ASSIGNMENT = re.compile(
+    rb"(?i)[\"']?authorization[\"']?\s*[:=]\s*[\"']?"
+    rb"(?:(?:bearer|basic)\s+)?(?P<value>[^\s\"']{4,})"
 )
 _ADAPTERS = {
     "claude-code": (".worktrees", "harness/"),
@@ -193,8 +197,16 @@ def _sensitive_candidates(root: Path) -> list[dict[str, Any]]:
             raw = path.read_bytes()
         except OSError:
             continue
-        match = _SENSITIVE_ASSIGNMENT.search(raw)
-        if match is None:
+        finding = next(
+            (
+                match
+                for pattern in (_SENSITIVE_ASSIGNMENT, _AUTHORIZATION_ASSIGNMENT)
+                for match in pattern.finditer(raw)
+                if not _is_sensitive_placeholder(match.group("value"))
+            ),
+            None,
+        )
+        if finding is None:
             continue
         candidates.append({
             "path": path.relative_to(root).as_posix(),
@@ -204,6 +216,20 @@ def _sensitive_candidates(root: Path) -> list[dict[str, Any]]:
     return candidates
 
 
+def _is_sensitive_placeholder(value: bytes) -> bool:
+    text = value.decode("utf-8", errors="ignore").strip().strip("`'").strip()
+    return bool(
+        re.fullmatch(r"<[^<>]+>", text)
+        or re.fullmatch(r"\$\{[A-Za-z_][A-Za-z0-9_]*\}", text)
+        or re.fullmatch(r"\{\{[^{}]+\}\}", text)
+        or re.fullmatch(
+            r"(?i)(?:example|placeholder|redacted|masked|bearer|basic|"
+            r"your[-_][A-Za-z0-9_-]+|x{4,})",
+            text,
+        )
+    )
+
+
 def publishable_tree_digest(root: Path) -> str:
     """Public digest helper shared by the archive publication gate."""
     return _publishable_tree_digest(root)

package/harness/manifests/general/claude-code.json

@@ -2,9 +2,9 @@
   "schema_version": 2,
   "profile": "general",
   "adapter": "claude-code",
-  "bundle_version": "0.2.53",
+  "bundle_version": "0.2.54",
   "requires": {
-    "minimumCliVersion": "0.2.73",
+    "minimumCliVersion": "0.2.74",
     "capabilities": [
       "sync@2",
       "rules-sync@1",
@@ -23,7 +23,7 @@
   "files": [
     {
       "path": ".harness-build.json",
-      "sha256": "1b39101b4c9cf6dab32fb0e226f49497c91c9f1ca3508a06b41f105502b560fb"
+      "sha256": "a7cbdb7be11d56b509b88d5406209901dc1ae27ed0bab9f7baeb9910043efa33"
     },
     {
       "path": "agents/harness-evaluator.md",
@@ -79,7 +79,7 @@
     },
     {
       "path": "contracts/workflow-policy.json",
-      "sha256": "3da83c2d769d536cb8bf356f1a03f0ad08eb19ff385ac36960bf53b5083b4f32"
+      "sha256": "3b671d438a687d800879863590ff04bd953c7d3eac6865bda3d85cdfc26fbc52"
     },
     {
       "path": "harness-archive/checklist.md",
@@ -95,7 +95,7 @@
     },
     {
       "path": "harness-archive/SKILL.md",
-      "sha256": "946170c7b150b688dc83bddf4dc0f3488ced503c1d533b219a7bc2b6583794b1"
+      "sha256": "8436d5af255e01e178a4920a176bdc1192e429b637c2c1d1959e7f168bd98f25"
     },
     {
       "path": "harness-archive/templates/summary-data-template.json",
@@ -111,7 +111,7 @@
     },
     {
       "path": "harness-codebase-map/SKILL.md",
-      "sha256": "9e2da46174dfa40f2b347e5e928feda8807021496cc0cd8ea99a5e43fac92ea0"
+      "sha256": "b19f8a3d4da1e471d3b857c7e914e4ecdef838812ae7b6e3c8a970eec7c7061b"
     },
     {
       "path": "harness-codebase-map/templates/ARCHITECTURE.md",
@@ -151,11 +151,11 @@
     },
     {
       "path": "harness-knowledge-ingest/SKILL.md",
-      "sha256": "001b637a9c18a3e453b5af673b7da8bf86c564cbc5809270547b60a63b5d06e7"
+      "sha256": "7ece336a562d942fe033a09e0bcfc6454ca1762d6c3e0410a5550a93d4cf9e12"
     },
     {
       "path": "harness-knowledge-query/SKILL.md",
-      "sha256": "ef858857be39df8c82279f774f5a6e3ce0531c3d555442de7d5d29cbca3e4e1e"
+      "sha256": "75f01294c4d81abab5d75dd10001607cd6779410c4b2d08202d00b03d13a8132"
     },
     {
       "path": "harness-plan/checklist.md",
@@ -171,7 +171,7 @@
     },
     {
       "path": "harness-plan/SKILL.md",
-      "sha256": "b2f7b3427a1741bd4a757c06c3ce91ffb95092dcb87fc33c699fbcbffe7a40e6"
+      "sha256": "9922ba328a97497b9eef1937e00f4d79d5a754c0af4bc3f00ed2d60ba097ae1c"
     },
     {
       "path": "harness-review/checklist.md",
@@ -187,7 +187,7 @@
     },
     {
       "path": "harness-review/SKILL.md",
-      "sha256": "b7dc70ed34e362858e4fe473cb6a03e7bcaf6b78df399459d7f28a304e121116"
+      "sha256": "35cd30eb98e61e751e3d92eed371e32ebf550d9919a759c34387c332ce1144a9"
     },
     {
       "path": "harness-run/checklist.md",
@@ -203,7 +203,7 @@
     },
     {
       "path": "harness-run/SKILL.md",
-      "sha256": "e97ae481de895bf0b86a1171de9ed904ee0c50093c4ea655c31b40e2d514d27f"
+      "sha256": "ccadcd4170ca8e9c76611bfee9bda6cb016d627d5848de91da40d74fef28758b"
     },
     {
       "path": "harness-submit/checklist.md",
@@ -215,7 +215,7 @@
     },
     {
       "path": "harness-submit/SKILL.md",
-      "sha256": "b0853f34ff2461a268158e015f71e2c0159ea20522437dba1709dd76848e099a"
+      "sha256": "a5ce09ea83ef86837a2a641f7c680f18c418c191e31674c1afd12102a25ac55a"
     },
     {
       "path": "harness-sync/reference.md",
@@ -223,7 +223,7 @@
     },
     {
       "path": "harness-sync/SKILL.md",
-      "sha256": "c7d463eb390d99b5e566cb3fc970700d2d1bff07e56173d33b10644672db9102"
+      "sha256": "00d5d6ebe2b1a416b4c814e5a14fcb7c3ceb5c2e5219f9d929f702c92f123174"
     },
     {
       "path": "harness-test/checklist.md",
@@ -247,7 +247,7 @@
     },
     {
       "path": "harness-test/SKILL.md",
-      "sha256": "51dc5197408d9c4961ad81e69ce3e1695e11e394ee3582da71fda4b11de80b3c"
+      "sha256": "9e66478326b1f042e705af7d6c7253bf86ced062770debe952337b92297b1f08"
     },
     {
       "path": "protocols/archive-report-protocol.md",
@@ -319,7 +319,7 @@
     },
     {
       "path": "scripts/harness_archive.py",
-      "sha256": "3c6fc709e5a2876fd4bad4ec60402b7b3933af1ea6d15bb6d16f269c7d65bf2f"
+      "sha256": "f029938af890198a737d6fea746a9f5ed885f8c32a462a63cac79dbb0f0b8be0"
     },
     {
       "path": "scripts/harness_change.py",
@@ -331,7 +331,7 @@
     },
     {
       "path": "scripts/harness_context.py",
-      "sha256": "5ef587edd57b0c819df1c37a448eda33f00a5b97b930c804290d1a83d9a4ad60"
+      "sha256": "464b59fea967bf123a7e203524b22ce68ead7db0250e686407ea29520853065f"
     },
     {
       "path": "scripts/harness_deploy.py",
@@ -363,7 +363,7 @@
     },
     {
       "path": "scripts/harness_gate.py",
-      "sha256": "f6be8724c0a8a0691d235a4af30fa97dc2988235ae47b88bfbe7235994c63230"
+      "sha256": "662f3490217546c9a20ce910f14493133dcf1a5cd1127f6cc6c50747ac22618c"
     },
     {
       "path": "scripts/harness_headless.py",
@@ -375,7 +375,7 @@
     },
     {
       "path": "scripts/harness_ledger.py",
-      "sha256": "5c33a09f3b073294afa21804697488dd5fa5601e79707be8b7db9f89be8e95f9"
+      "sha256": "58f45d0a30c124b2493fc4a4c66f40c85c9a3dda952fccafbdc05a9a7a135d02"
     },
     {
       "path": "scripts/harness_migration_head.py",
@@ -427,7 +427,7 @@
     },
     {
       "path": "scripts/harness_runtime.py",
-      "sha256": "75341de64c53f6393d99cfd944d83578e55317c494a76273865baa87459abdfa"
+      "sha256": "3866980763961f178f44fc04330854b4a3e05867900418316f876bf7f4fca1b7"
     },
     {
       "path": "scripts/harness_service.py",