Merge branch 'unify/skills-20261114' into master
🧪 Test / 🧪 Lock + lint (push) Canceled after 0s

The e2e repair 550f696 on top of the e2e split: the mic exclusion of the Record lookups and the mic-field id filter move into hub_e2e_radio.py, radio_layout_probes.py and radio_layout_focus_probes.py, and tasks/match joins SCREENS in hub_e2e_kit.py, where the split put that code.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Kevin Veen-BirkenbachandClaude Opus 5.5 committed 2026-11-15 10:56:51 +00:00
commit 586e92c990
9 files changed
+18 -16

No files matched your search

+1 -1
View File
@@ -25,7 +25,7 @@ OUT = Path(os.environ.get("E2E_OUT", "/tmp/orchestrator-phase4-shots"))
WIDTHS = ((1920, 1080), (1366, 768), (390, 844))
VIEWS = ("orbit", "chord", "swimlane", "tree", "3d")
TASK_VIEWS = ("list", "board", "rasci", "gantt", "burn", "3d")
SCREENS = ["home", "stream", "tasks/operator", "stream/rules", *(f"{tab}/{view}" for tab in ("agents", "artifacts") for view in VIEWS), "agents/hierarchy", *(f"tasks/{view}" for view in TASK_VIEWS), "resources"]
SCREENS = ["home", "stream", "tasks/operator", "tasks/match", "stream/rules", *(f"{tab}/{view}" for tab in ("agents", "artifacts") for view in VIEWS), "agents/hierarchy", *(f"tasks/{view}" for view in TASK_VIEWS), "resources"]
SUBS = ["Firewall"]
TABS = ["Home", "Stream", "Agents", "Artifacts", "Tasks", "Resources"]
HELPERS = """
+2 -2
View File
@@ -178,7 +178,7 @@ COMPOSE = """(async () => {@HELPERS@@SPOT_OPEN@
channel.value = "call";
channel.dispatchEvent(new Event("change", {bubbles: true}));
recipient.value = "@TO@";
const record = all("button", form).find((button) => button.hasAttribute("aria-pressed"));
const record = all("button", form).find((button) => button.hasAttribute("aria-pressed") && !button.classList.contains("mic"));
record.click();
await sleep(1500);
const recording = record.getAttribute("aria-pressed");
@@ -265,7 +265,7 @@ SPOT_SEND = """(async () => {@HELPERS@
inline: [getComputedStyle(spot).position, spot.getBoundingClientRect().bottom <= main.getBoundingClientRect().top, spot.parentElement.nextElementSibling === main],
toolbar: all('#main [role="toolbar"] > *').map((node) => name(node.tagName === "DETAILS" ? node.querySelector("summary") : node)),
channels: all("option", channel).map((option) => option.value),
record: all("button", form).filter((button) => button.hasAttribute("aria-pressed")).map(text),
record: all("button", form).filter((button) => button.hasAttribute("aria-pressed") && !button.classList.contains("mic")).map(text),
heads: all(".spot-head button", spot).map((button) => [name(button), button.title]),
@FITS@,
};
+1 -1
View File
@@ -228,7 +228,7 @@ COMPOSE_HOME = """(async () => {@HELPERS@@PROBES@
const homeSpeak = tile("radio-speak");
const form = (root) => root.querySelector("form.composer");
const area = (root) => form(root).querySelector("textarea");
const record = (root) => all("button", form(root)).find((button) => button.hasAttribute("aria-pressed"));
const record = (root) => all("button", form(root)).find((button) => button.hasAttribute("aria-pressed") && !button.classList.contains("mic"));
const note = (root) => {
const audio = form(root).querySelector(".voice-note audio");
return audio ? audio.getAttribute("src").replace("/api/voice/", "").replace(".wav", "") : null;
+2 -2
View File
@@ -170,7 +170,7 @@ HOME = """(async () => {@HELPERS@@PROBES@
log: [tile("radio-log").querySelectorAll(".radio-row").length, tile("radio").querySelectorAll(".radio-row").length, document.querySelectorAll("#radio-spot .radio-row").length],
gone: all("#main .home-tile.gone").length,
stars: all("#main .home-tile .home-body .star").length,
ids: all("#main .home-tile .home-body [id]").map((node) => node.id),
ids: all("#main .home-tile .home-body [id]").map((node) => node.id).filter((id) => !id.startsWith("mic-field-")),
};
const count = (id) => tile(id).querySelectorAll(".radio-row").length;
const before = [count("radio-log"), count("radio")];
@@ -307,7 +307,7 @@ SPOT = """(async () => {@HELPERS@@PROBES@@SPEAKING@
states.stations.closed = [fold.open, document.activeElement === summary];
}
if (wanted.includes("voice")) {
const record = all("button", form).find((button) => button.hasAttribute("aria-pressed"));
const record = all("button", form).find((button) => button.hasAttribute("aria-pressed") && !button.classList.contains("mic"));
record.click();
await sleep(1300);
record.click();
+3 -3
View File
@@ -220,7 +220,7 @@ class TestFirewallE2E(HubCase):
self.writer = writer_host.Writer(trust, home, tree)
self.spool = self.state / "firewall"
verifier.write_private(self.spool / "view.json", self.writer.view())
self.local = f"http://localhost:{self.port}/"
self.page_url = f"http://localhost:{self.port}/"
def host_unit(self) -> None:
if any((self.spool / "jobs").iterdir()):
@@ -235,7 +235,7 @@ class TestFirewallE2E(HubCase):
steps = []
for index, (width, height) in enumerate(base.WIDTHS):
values = {"SECRET": SECRET, "FILE": str(self.settings), "ENTRY": f"Bash(make lint-{width}:*)", "REMOVE": "true" if index == 0 else "false"}
steps.append({"width": width, "height": height, "url": f"{self.local}?{width}#stream/rules", "wait": 1500, "probe": probe(SHOW, values), "shot": str(OUT / f"chromium-{width}-firewall.png")})
steps.append({"width": width, "height": height, "url": f"{self.page_url}?{width}#stream/rules", "wait": 1500, "probe": probe(SHOW, values), "shot": str(OUT / f"chromium-{width}-firewall.png")})
steps.append({"width": width, "height": height, "url": None, "wait": 0, "probe": probe(SIGN, values), "shot": str(OUT / f"chromium-{width}-firewall-signed.png")})
data = self.drive(steps, authenticator)
(OUT / "chromium-firewall.json").write_text(json.dumps(data, indent=1), encoding="utf-8")
@@ -282,7 +282,7 @@ class TestFirewallE2E(HubCase):
def test_chromium_names_a_group_and_signs_a_rule_for_it(self):
authenticator = self.authenticator()
steps = [{"width": 1366, "height": 768, "url": f"{self.local}#stream/rules", "wait": 1500, "probe": probe(GROUP_RULE, {}), "shot": str(OUT / "chromium-1366-firewall-group-rule.png")}]
steps = [{"width": 1366, "height": 768, "url": f"{self.page_url}#stream/rules", "wait": 1500, "probe": probe(GROUP_RULE, {}), "shot": str(OUT / "chromium-1366-firewall-group-rule.png")}]
data = self.drive(steps, authenticator)
(OUT / "chromium-firewall-group.json").write_text(json.dumps(data, indent=1), encoding="utf-8")
self.assertEqual(data["errors"], [])
+2
View File
@@ -24,6 +24,7 @@ from hub_support import (
LONG_TASK,
LONG_VOLUME,
LONG_WORKTREE,
MERGED_BRANCH,
iso,
long_repos,
long_task,
@@ -322,6 +323,7 @@ class TestHomeBookmarks(HubCase):
scan = json.loads(self.tree_file.read_text(encoding="utf-8"))
scan["repos"] += long_repos()
self.tree_file.write_text(json.dumps(scan), encoding="utf-8")
self.write_local_plan(scan, {MERGED_BRANCH: {"skip": None, "actions": ["local-branch"]}})
def vanish(self) -> None:
register = self.council / "rasci.json"
+1 -1
View File
@@ -176,7 +176,7 @@ class TestLiveBubbles(HubCase):
stamp = time.time()
rows = [
{
"ts": stamp + index / 1000,
"ts": stamp - (len(cues[word]) - 1 - index) / 1000,
"from": sender,
"to": to,
"text": text,
+5 -5
View File
@@ -78,16 +78,16 @@ class TestInboxGoneRows(HubCase):
super().setUp()
OUT.mkdir(parents=True, exist_ok=True)
self.write_tree()
hub = self.httpd.hub
real = hub.render
frozen = type(self.httpd.hub)
real = frozen.render
def render(nonce: str) -> tuple[str, str]:
def render(hub: object, nonce: str) -> tuple[str, str]:
self.write_council({"rasci.json": SHOWN})
page = real(nonce)
page = real(hub, nonce)
self.write_council({"rasci.json": LEFT})
return page
patch = mock.patch.object(hub, "render", render)
patch = mock.patch.object(frozen, "render", render)
patch.start()
self.addCleanup(patch.stop)