feat(match): merge and commit-tree previews, Match motion and Home tile
The host runner computes a merge preview for each operator row that merges or commits and posts it to the runner-only /api/runner/previews, and an ask of git commit ships the staged commit tree; Match cards show what the merge brings in onto HEAD, or why no preview exists. Cards fly off with their verdict stamp unless reduced motion is set, Match gets its own button in Tasks and a Home tile that keeps the live stack, and the 3D graph and the faces fix land with it. 🎯 Fix: 85 % 💥 Break: 10 % 💸 Tokens: – ⏱️ Velocity: – 🛡️ Security: 100 % 🏆 Score: 77 🚦 Gate: ⛔ fix 85 % < 90, break 10 % > 5 Created-with: https://s.veen.world/skills Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
96d4d2933c
commit
78f2fec339
19 files changed
+692
-90
No files matched your search
@@ -273,7 +273,7 @@ class TestOrchestratorGaps(HubCase):
|
||||
self.assertNotIn("error", sweep[0], sweep[0])
|
||||
self.assertEqual(sorted(sweep[0]["expected"]), sorted(f"#{screen}" for screen in base.SCREENS))
|
||||
self.assertEqual([target for target in sweep[0]["nav"] if not any(f"#{screen}" == target or f"#{screen}".startswith(f"{target}/") for screen in base.SCREENS)], [])
|
||||
self.assertEqual(sorted({view for found in sweep for view in found["views"]}), sorted(sweep[0]["viewNames"]))
|
||||
self.assertEqual(sorted({view for found in sweep for view in found["views"]}), sorted([*sweep[0]["viewNames"], "Match"]))
|
||||
for found, screen, width in zip(sweep, screens, widths, strict=True):
|
||||
with self.subTest(screen=screen, width=width):
|
||||
self.assertNotIn("error", found, found)
|
||||
|
||||
@@ -765,7 +765,7 @@ class TestHomePage(unittest.TestCase):
|
||||
marked = set(re.findall(r"\['[^']+', \"([^\"]+)\"\]", home))
|
||||
captured = set(re.findall(r'Panels\.capture\("([^"]+)"', home))
|
||||
made = set(re.findall(r'\{kind: "(\w+)", id, view[,}]', sources))
|
||||
self.assertEqual((len(literal), marked), (11, {"radio-log"}))
|
||||
self.assertEqual((len(literal), marked), (12, {"radio-log"}))
|
||||
literal |= marked
|
||||
self.assertEqual(len(dynamic), 13)
|
||||
self.assertEqual(sorted(literal | dynamic), sorted(registered))
|
||||
|
||||
@@ -39,6 +39,28 @@ def staged_repo(root: Path) -> Path:
|
||||
return repo
|
||||
|
||||
|
||||
def merge_repo(root: Path) -> tuple[Path, str]:
|
||||
repo = root / "merge"
|
||||
repo.mkdir()
|
||||
git(repo, "init", "-q", "-b", "main")
|
||||
(repo / "app.py").write_text("keep = 1\n", encoding="utf-8")
|
||||
git(repo, "add", "-A")
|
||||
git(repo, "commit", "-q", "-m", "base")
|
||||
git(repo, "checkout", "-q", "-b", "feature")
|
||||
(repo / "app.py").write_text("keep = 1\nadded = 2\n", encoding="utf-8")
|
||||
git(repo, "commit", "-q", "-am", "feature")
|
||||
target = git(repo, "rev-parse", "HEAD").strip()
|
||||
git(repo, "checkout", "-q", "main")
|
||||
return repo, target
|
||||
|
||||
|
||||
def move_head(repo: Path) -> str:
|
||||
(repo / "other.txt").write_text("moved\n", encoding="utf-8")
|
||||
git(repo, "add", "other.txt")
|
||||
git(repo, "commit", "-q", "-m", "moved")
|
||||
return git(repo, "rev-parse", "HEAD").strip()
|
||||
|
||||
|
||||
class MatchCase(HubCase):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
@@ -336,6 +358,69 @@ class TestCommandCards(MatchCase):
|
||||
self.assertIn(words, shown.stdout)
|
||||
|
||||
|
||||
class TestMergeCards(MatchCase):
|
||||
def merge_row(self) -> tuple[Path, str, str]:
|
||||
repo, target = merge_repo(self.work)
|
||||
command = f"git merge --ff-only {target}"
|
||||
self.operator_row("operator/merge", command, str(repo))
|
||||
return repo, target, command
|
||||
|
||||
def released(self) -> tuple[Path, str, dict]:
|
||||
repo, target, _ = self.merge_row()
|
||||
self.card("operator:operator/merge")
|
||||
self.run_runner(register=False)
|
||||
card = self.card("operator:operator/merge")
|
||||
entry = {"kind": "operator", "id": "operator/merge", "verb": "approve", "label": "", "sha256": card["sha256"], "payload": card["hash"]}
|
||||
with mock.patch.object(batches, "UNDO", 0.05):
|
||||
self.assertEqual(self.approve([entry], self.signed([entry], self.pin()))[0], 202)
|
||||
self.settle(lambda: self.httpd.hub.jobs.listed() != [])
|
||||
self.assertEqual([job["head"] for job in self.runner_jobs()], [card["merge"]["head"]])
|
||||
return repo, target, card
|
||||
|
||||
def test_the_runner_previews_a_merge_row_and_its_card_turns_stale_once_head_moves(self):
|
||||
repo, target, command = self.merge_row()
|
||||
self.assertIsNone(self.card("operator:operator/merge")["merge"])
|
||||
self.run_runner(register=False)
|
||||
card = self.card("operator:operator/merge")
|
||||
head = git(repo, "rev-parse", "HEAD").strip()
|
||||
self.assertEqual((card["merge"], card["stale"]), ({"head": head, "base": head, "target": target, "error": ""}, False))
|
||||
shown = {"": "@@ -1 +1,2 @@\n keep = 1\n+added = 2", "content withheld": ""}
|
||||
self.assertEqual([(entry["path"], entry["status"], entry["additions"], entry["patch"] == shown[entry["note"]]) for entry in card["files"]], [("app.py", "M", 1, True)])
|
||||
status, _, body = self.call("GET", "/api/runner/previews", None, self.client())
|
||||
self.assertEqual((status, json.loads(body)["rows"]), (200, [{"task": "operator/merge", "command": command, "directory": str(repo), "head": head}]))
|
||||
taken = self.httpd.hub.merge_previews.get("operator:operator/merge")["taken"]
|
||||
self.run_runner(register=False)
|
||||
self.assertEqual(self.httpd.hub.merge_previews.get("operator:operator/merge")["taken"], taken)
|
||||
moved = move_head(repo)
|
||||
self.run_runner(register=False)
|
||||
after = self.card("operator:operator/merge")
|
||||
self.assertEqual((after["stale"], after["stale_reason"], after["merge"]["head"]), (True, "HEAD or the merge base moved since it was added", moved))
|
||||
|
||||
def test_only_the_runner_posts_a_preview_and_only_for_an_open_row_and_its_command(self):
|
||||
_, target, command = self.merge_row()
|
||||
shown = {"task": "operator/merge", "command": command, "head": "a" * 40, "base": "a" * 40, "target": target, "diff": []}
|
||||
self.assertEqual(self.post_json("/api/runner/previews", shown, self.guard(self.host))[0], 403)
|
||||
self.assertEqual(self.call("GET", "/api/runner/previews", None, self.guard(self.host))[0], 403)
|
||||
for bad, code in (({**shown, "command": "git merge main"}, 409), ({**shown, "task": "operator/gone"}, 404), ({**shown, "head": "HEAD"}, 400), ({**shown, "diff": "x"}, 400)):
|
||||
with self.subTest(bad=bad):
|
||||
self.assertEqual(self.post_json("/api/runner/previews", bad, self.client())[0], code)
|
||||
self.assertEqual(self.post_json("/api/runner/previews", shown, self.client())[0], 200)
|
||||
|
||||
def test_a_released_merge_runs_while_head_stays_the_previewed_one(self):
|
||||
repo, target, _ = self.released()
|
||||
self.run_runner(register=False)
|
||||
self.settle(lambda: self.httpd.hub.jobs.listed()[0]["status"] == "done")
|
||||
self.assertEqual(git(repo, "rev-parse", "HEAD").strip(), target)
|
||||
|
||||
def test_a_released_merge_is_refused_once_head_moved_after_the_preview(self):
|
||||
repo, _, card = self.released()
|
||||
moved = move_head(repo)
|
||||
self.run_runner(register=False)
|
||||
job = self.httpd.hub.jobs.listed()[0]
|
||||
self.assertEqual((job["status"], git(repo, "rev-parse", "HEAD").strip()), ("refused", moved))
|
||||
self.assertIn(f"HEAD moved from {card['merge']['head'][:12]} to {moved[:12]}", job["output"])
|
||||
|
||||
|
||||
class TestPayloadHash(unittest.TestCase):
|
||||
def test_the_hash_binds_command_directory_and_every_file_state(self):
|
||||
files = [{"path": "/tmp/a", "state": "read", "reason": "", "sha256": "1" * 64, "size": 3, "content": "abc"}]
|
||||
|
||||
@@ -720,6 +720,78 @@ class TestStagedDiff(unittest.TestCase):
|
||||
found = staged_diff.commit_of(command, "/w")
|
||||
self.assertEqual(None if found is None else str(found), expected)
|
||||
|
||||
def test_only_a_single_git_commit_tree_of_full_object_ids_names_its_tree_and_parents(self):
|
||||
tree, parent, other = "a" * 40, "b" * 40, "c" * 64
|
||||
cases = {
|
||||
f"git commit-tree {tree} -p {parent} -m 'feat: x' -m body": ("/w", tree, [parent]),
|
||||
f"git -C sub commit-tree -p{parent} -p {other} -S -mx {tree}": ("/w/sub", tree, [parent, other]),
|
||||
f"env --chdir=sub git commit-tree {tree} --gpg-sign=KEY -F msg.txt": ("/w/sub", tree, []),
|
||||
f"git commit-tree {tree} --no-gpg-sign -m 'fix commit'": ("/w", tree, []),
|
||||
f"git commit-tree HEAD^{{tree}} -p {parent} -m x": None,
|
||||
f"git commit-tree {tree} -p HEAD -m x": None,
|
||||
f"git commit-tree {tree[:12]} -m x": None,
|
||||
f"git commit-tree {tree} {other} -m x": None,
|
||||
f"git commit-tree {tree} -p": None,
|
||||
f"git commit-tree {tree} --frobnicate -m x": None,
|
||||
f"git commit-tree {tree} -- -m x": None,
|
||||
"git commit-tree -m x": None,
|
||||
f"GIT_DIR=/tmp/other git commit-tree {tree} -m x": None,
|
||||
f"git commit-tree {tree} -m x && git push": None,
|
||||
f"git commit {tree} -m x": None,
|
||||
}
|
||||
for command, expected in cases.items():
|
||||
with self.subTest(command=command):
|
||||
found = staged_diff.tree_of(command, "/w")
|
||||
self.assertEqual(None if found is None else (str(found[0]), found[1], found[2]), expected)
|
||||
self.assertIsNone(staged_diff.commit_of(f"git commit-tree {tree} -m x", "/w"))
|
||||
|
||||
def test_only_a_single_git_merge_of_a_full_object_id_names_its_directory_and_target(self):
|
||||
target = "d" * 40
|
||||
cases = {
|
||||
f"git merge --ff-only {target}": ("/w", target),
|
||||
f"git -C sub merge --no-ff --no-edit -m 'merge it' -S {target}": ("/w/sub", target),
|
||||
f"git merge --message=x --no-verify -mx {target}": ("/w", target),
|
||||
"git merge --ff-only origin/main": None,
|
||||
f"git merge {target} {'e' * 40}": None,
|
||||
f"git merge -s ours {target}": None,
|
||||
f"git merge -X theirs {target}": None,
|
||||
f"git merge --allow-unrelated-histories {target}": None,
|
||||
"git merge -m": None,
|
||||
f"git merge {target} && git push": None,
|
||||
f"GIT_DIR=/tmp/x git merge {target}": None,
|
||||
f"git merge-base HEAD {target}": None,
|
||||
}
|
||||
for command, expected in cases.items():
|
||||
with self.subTest(command=command):
|
||||
found = staged_diff.merge_of(command, "/w")
|
||||
self.assertEqual(None if found is None else (str(found[0]), found[1]), expected)
|
||||
|
||||
def test_a_merge_preview_shows_the_target_tree_against_its_merge_base_with_head(self):
|
||||
base = git(self.repo, "rev-parse", "HEAD").strip()
|
||||
git(self.repo, "commit", "-q", "-m", "next")
|
||||
target = git(self.repo, "rev-parse", "HEAD").strip()
|
||||
git(self.repo, "reset", "-q", "--hard", base)
|
||||
found = staged_diff.merge_preview(self.repo, target, self.rules)
|
||||
tree = git(self.repo, "rev-parse", f"{target}^{{tree}}").strip()
|
||||
self.assertEqual(found, {"head": base, "base": base, "target": target, "diff": staged_diff.tree_diff(self.repo, tree, self.rules)[0]})
|
||||
self.assertEqual(staged_diff.head_of(self.repo), base)
|
||||
with self.assertRaises(staged_diff.DiffError):
|
||||
staged_diff.merge_preview(self.repo, "0" * 40, self.rules)
|
||||
|
||||
def test_a_commit_tree_ask_ships_its_tree_against_the_first_parent_and_its_allow_needs_no_binding(self):
|
||||
tree = git(self.repo, "write-tree").strip()
|
||||
head = git(self.repo, "rev-parse", "HEAD").strip()
|
||||
ask = {**ASK, "tool": "Bash", "command": f"git commit-tree {tree} -p {head} -m 'fix commit'", "cwd": str(self.repo)}
|
||||
diff, sealed = staged_diff.tree_diff(self.repo, tree, self.rules)
|
||||
self.assertEqual(permission_hook.commit_diff(ask, self.rules), (None, {"diff": diff, "sealed": sealed}))
|
||||
self.assertFalse(permission_hook.unapprovable(ask))
|
||||
self.assertEqual(permission_hook.bound(ALLOW, ask, None), ALLOW)
|
||||
root = permission_hook.commit_diff({**ask, "command": f"git commit-tree {tree} -m root"}, self.rules)[1]["diff"]
|
||||
self.assertEqual([(entry["path"], entry["status"]) for entry in root], [("added.txt", "A"), ("app.py", "A"), ("logo.png", "B")])
|
||||
for command in (f"git commit-tree {head} -p {tree} -m x", f"git commit-tree {'0' * 40} -m x"):
|
||||
with self.subTest(command=command):
|
||||
self.assertEqual(permission_hook.commit_diff({**ask, "command": command}, self.rules), (None, {}))
|
||||
|
||||
|
||||
class TestHubOperatorTasks(HubCase):
|
||||
def scratch(self) -> tuple[Path, Path, dict]:
|
||||
|
||||
Reference in new issue
Block a user