fix(harness): enforce publish guard against unsafe commit history and tier bypass

tests/test_harness.py

@@ -192,7 +192,8 @@ def test_skip_without_issue_fails_and_with_issue_passes(self):
         self.assertEqual(self.check()[0], 1)
         self.write("ros2/src/pkg/test/test_skip.py", f"import pytest\n{marker}(reason='needs sim, #88')\ndef test_s():\n    pass\n")
         self.commit("skip with issue")
-        self.assertEqual(self.check()[0], 0)
+        # The original untracked marker remains in the bundled commit history.
+        self.assertEqual(self.check()[0], 1)
 
     def test_removed_test_fails(self):
         self.write("ros2/src/pkg/test/test_node.py", "# emptied\n")
@@ -230,6 +231,73 @@ def test_secret_and_output_files_fail(self):
     def test_no_change_fails(self):
         self.assertEqual(self.check()[0], 1)
 
+    def test_guard_rejects_git_quoted_protected_path(self):
+        # Git quotes a literal tab unless --name-status -z is used.
+        self.write("harness/probe\t.md", "forbidden protected file\n")
+        self.commit("add protected path with tab")
+        code, report = self.check()
+        self.assertEqual(code, 1, report)
+        self.assertIn("harness/probe\t.md", report["files"])
+        self.assertIn("tier D", " ".join(report["failures"]))
+
+    def test_tier_ceiling_is_enforced_and_permitted_tiers_pass(self):
+        self.write("ros2/src/pkg/pkg/node.py", "def f():\n    return 2\n")
+        self.commit("change source")
+        code, report = self.check("--max-tier", "A")
+        self.assertEqual(code, 1)
+        self.assertIn("maximum tier A", " ".join(report["failures"]))
+        self.assertEqual(self.check("--max-tier", "B")[0], 0)
+
+    def test_clean_tier_a_change_below_ceiling(self):
+        self.write("ros2/src/pkg/test/test_more.py", "def test_g():\n    assert True\n")
+        self.commit("new test")
+        self.assertEqual(self.check("--max-tier", "A")[0], 0)
+
+    def test_removing_assertion_from_existing_test_demotes_tier_a(self):
+        # Existing test function is still present and test counts can be flat.
+        self.write("ros2/src/pkg/test/test_node.py", "def test_f():\n    x = 1\n")
+        self.commit("weaken a test")
+        code, report = self.check("--tests-before", "1", "--tests-after", "1",
+                                  "--max-tier", "A")
+        self.assertEqual(code, 1, report)
+        self.assertEqual(report["tier"], "B")
+        self.assertIn("maximum tier A", " ".join(report["failures"]))
+
+    def test_intermediate_committed_secret_rejected_even_when_removed(self):
+        # Synthetic secret only: this object remains reachable in the bundle.
+        path = "ros2/src/pkg/pkg/temp_key.py"
+        self.write(path, "TOKEN = 'ghp_" + "A" * 36 + "'\n")
+        self.commit("temporary token")
+        (self.repo / path).unlink()
+        self.write("ros2/src/pkg/test/test_more.py", "def test_g():\n    assert True\n")
+        self.commit("remove token and add test")
+        code, report = self.check("--max-tier", "A")
+        self.assertEqual(code, 1, report)
+        self.assertIn("secret-like string", " ".join(report["failures"]))
+
+    def test_intermediate_protected_edit_rejected_when_reverted(self):
+        path = "harness/temporary-policy.md"
+        self.write(path, "protected\n")
+        self.commit("touch protected path")
+        (self.repo / path).unlink()
+        self.write("ros2/src/pkg/test/test_more.py", "def test_g():\n    assert True\n")
+        self.commit("remove protected path and add test")
+        code, report = self.check()
+        self.assertEqual(code, 1, report)
+        self.assertIn("tier D path touched", " ".join(report["failures"]))
+
+    def test_untracked_skip_in_original_commit_is_not_sanitized_by_fixup(self):
+        path = "ros2/src/pkg/test/test_skipped.py"
+        marker = "@pytest.mark." + "skip"
+        self.write(path, f"import pytest\n{marker}(reason='later')\ndef test_x():\n    pass\n")
+        self.commit("untracked skip")
+        self.write(path, f"import pytest\n{marker}(reason='tracking #102')\ndef test_x():\n    pass\n")
+        self.commit("document skip")
+        code, report = self.check()
+        self.assertEqual(code, 1)
+        self.assertIn("untracked test skip", " ".join(report["failures"]))
+
+
 
 class Select(unittest.TestCase):
     def issue(self, number, repo="openamrobot-manifest", names=("ai-ready",), body="", created="2026-10-01T00:00:00Z"):

tools/harness_guard.py

@@ -53,22 +53,47 @@ def test_names(lines):
     return names
 
 
-def diff_lines(root, base):
-    """Per file: (added lines, removed lines)."""
-    out, current, previous = {}, None, None
-    for line in git(root, "diff", "--unified=0", "--no-color", "--no-renames", f"{base}..HEAD").splitlines():
-        if line.startswith("--- "):
-            previous = None if line.endswith("/dev/null") else line[6:]
-        elif line.startswith("+++ "):
-            current = previous if line.endswith("/dev/null") else line[6:]
-            out.setdefault(current, ([], []))
-        elif current and line.startswith("+") and not line.startswith("+++"):
-            out[current][0].append(line[1:])
-        elif current and line.startswith("-") and not line.startswith("---"):
-            out[current][1].append(line[1:])
+def git_bytes(root, *args):
+    return subprocess.run(["git", "-C", str(root), *args], check=True,
+                          capture_output=True).stdout
+
+
+def changed_paths(root, base, head="HEAD"):
+    """Parse actual Git paths; textual name-status output quotes unsafe names."""
+    raw = git_bytes(root, "diff", "--name-status", "-z", "--no-renames",
+                    f"{base}..{head}")
+    fields = raw.split(b"\0")
+    if fields[-1] != b"" or len(fields[:-1]) % 2:
+        raise ValueError("malformed NUL-delimited git name-status output")
+    return [(fields[i].decode("utf-8", errors="strict"),
+             fields[i + 1].decode("utf-8", errors="strict"))
+            for i in range(0, len(fields) - 1, 2)]
+
+
+def diff_lines(root, base, paths, head="HEAD"):
+    """Per-file text diffs using real path arguments, not quoted patch headers."""
+    out = {}
+    for path in paths:
+        added, removed = [], []
+        patch = git(root, "diff", "--unified=0", "--no-color", "--no-renames",
+                    f"{base}..{head}", "--", path)
+        in_hunk = False
+        for line in patch.splitlines():
+            if line.startswith("@@ "):
+                in_hunk = True
+            elif in_hunk and line.startswith("+"):
+                added.append(line[1:])
+            elif in_hunk and line.startswith("-"):
+                removed.append(line[1:])
+        out[path] = (added, removed)
     return out
 
 
+def existed_at(root, commit, path):
+    return subprocess.run(["git", "-C", str(root), "cat-file", "-e",
+                           f"{commit}:{path}"], capture_output=True).returncode == 0
+
+
 def run(args):
     root = Path(args.repo_root).resolve()
     policy = hl.load_policy(Path(args.harness_root))
@@ -79,8 +104,7 @@ def run(args):
     if dirty:
         failures.append(f"uncommitted changes left in the worktree: {dirty[:5]}")
 
-    changes = [l.split("\t") for l in git(root, "diff", "--name-status", "--no-renames",
-                                          f"{args.base}..HEAD").splitlines() if l]
+    changes = changed_paths(root, args.base)
     if not changes:
         failures.append("no change was committed")
     tiers, files_changed = [], []
@@ -104,17 +128,22 @@ def run(args):
                 failures.append(f"{path}: tier C, a person writes this change ({status_code})")
         tiers.append(tier)
     tier = hl.highest(tiers)
-    if args.max_tier and hl.TIER_ORDER[tier] > hl.TIER_ORDER[args.max_tier]:
-        notes.append(f"change is tier {tier}, above the issue's tier {args.max_tier}; labelled tier {tier}")
-
     body = Path(args.pr_body).read_text(encoding="utf-8") if args.pr_body and Path(args.pr_body).exists() else ""
     manifests = [p for p in files_changed if hl.matches(p, policy.get("dependency_manifests", []))]
     if manifests:
         tier = hl.highest([tier, "B"])
         if not re.search(r"^#+\s*Dependencies", body, re.M | re.I):
             failures.append(f"dependency manifest changed ({', '.join(manifests)}) without a Dependencies section")
 
-    per_file = diff_lines(root, args.base)
+    per_file = diff_lines(root, args.base, files_changed)
+    # Removing lines from an existing test is not an A-tier change, even
+    # when its function name and overall executed test count remain unchanged.
+    edited_tests = [path for path, (_, removed) in per_file.items()
+                    if removed and hl.is_test_path(path) and existed_at(root, args.base, path)]
+    if edited_tests:
+        tier = hl.highest([tier, "B"])
+        notes.append("existing test lines removed; needs tier B owner review: " +
+                     ", ".join(edited_tests[:5]))
     added_total = removed_total = 0
     removed_tests, added_tests = set(), set()
     for path, (added, removed) in per_file.items():
@@ -140,10 +169,40 @@ def run(args):
         if line.startswith("-\t-\t"):
             failures.append(f"{line.split(chr(9))[-1]}: binary file")
 
-    for sha in git(root, "rev-list", f"{args.base}..HEAD").split():
+    # Publish transfers the original bundle, including intermediate commits.
+    # The final net diff is insufficient: unsafe blobs and forbidden path edits
+    # can still be present in reachable commit history after later reverts.
+    for sha in git(root, "rev-list", "--reverse", f"{args.base}..HEAD").split():
         message = git(root, "log", "-1", "--format=%B", sha)
         if not re.search(r"^Signed-off-by: .+ <.+>$", message, re.M):
             failures.append(f"commit {sha[:9]} has no Signed-off-by line")
+        ancestry = git(root, "rev-list", "--parents", "-n", "1", sha).split()
+        if len(ancestry) != 2:
+            failures.append(f"commit {sha[:9]} is a merge/root commit; agent bundles require linear history")
+            continue
+        parent = ancestry[1]
+        intermediate = changed_paths(root, parent, sha)
+        for status_code, path in intermediate:
+            path_tier = hl.tier_of(path, args.repository, policy)
+            if path.startswith((".harness-out", ".harness/")):
+                failures.append(f"commit {sha[:9]}: forbidden harness scratch file {path}")
+            elif path_tier == "D" and not hl.mission_allows(path, args.repository, policy, args.mission):
+                failures.append(f"commit {sha[:9]}: tier D path touched: {path}")
+            elif path_tier == "C" and not (status_code == "A" and hl.is_test_path(path)):
+                failures.append(f"commit {sha[:9]}: tier C path touched: {path}")
+        for path, (added, _) in diff_lines(root, parent, [p for _, p in intermediate], sha).items():
+            for line in added:
+                if SECRET.search(line):
+                    failures.append(f"commit {sha[:9]}: secret-like string in {path}")
+                if SKIP.search(line) and not ISSUE_REF.search(line):
+                    failures.append(f"commit {sha[:9]}: untracked test skip in {path}")
+            binary = git(root, "diff", "--numstat", f"{parent}..{sha}", "--", path)
+            if binary.startswith("-\t-\t"):
+                failures.append(f"commit {sha[:9]}: binary file in history: {path}")
+
+    # Include tier promotions from both dependencies and test-line removals.
+    if args.max_tier and hl.TIER_ORDER[tier] > hl.TIER_ORDER[args.max_tier]:
+        failures.append(f"change is tier {tier}, above selected issue's maximum tier {args.max_tier}; escalate to owner")
 
     if args.tests_before is not None and args.tests_after is not None:
         if args.tests_after < args.tests_before: