oh-my-opencode 5.0.0-beta.7 → 5.0.0-beta.9

package/packages/omo-codex/plugin/test/sync-skills.test.mjs

@@ -5,8 +5,6 @@ import test from "node:test";
 import { fileURLToPath } from "node:url";
 import { sharedSkillsRootPath } from "@oh-my-opencode/shared-skills";
 import {
-	CONTEXT_PRESSURE_SKILL_BUDGET_BYTES,
-	assertPackagedContentMatches,
 	componentSkillSources,
 	expectedSkills,
 	listSkillFiles,
@@ -16,7 +14,6 @@ import {
 
 const root = dirname(dirname(fileURLToPath(import.meta.url)));
 const repoRoot = join(root, "..", "..", "..");
-const opencodeOnlyToolPattern = /\b(?:call_omo_agent|background_output|team_[a-z_]+|task)\s*\(/;
 const generatedSkillMetadataFiles = new Set(["agents/openai.yaml"]);
 
 async function readPackagedSkillFile(...segments) {
@@ -131,7 +128,6 @@ test("#given a shared skill name collides with a Codex component skill #when agg
 	// when / then
 	assert.notEqual(removeCodexCompatibilityGuidance(aggregateSkill), removeCodexCompatibilityGuidance(sharedSkill));
 	assert.equal(removeCodexCompatibilityGuidance(aggregateSkill), removeCodexCompatibilityGuidance(componentSkill));
-	assert.match(aggregateSkill, /multi_agent_v1/);
 });
 
 test("#given shared skill source tests #when aggregate Codex skills are synced #then source tests are not packaged", async () => {
@@ -191,9 +187,7 @@ test("#given synced ulw-loop skill #when Codex hint metadata is inspected #then
 	// then
 	assert.match(skill, /^---\r?\nname: ulw-loop\r?\n/m);
 	assert.match(interfaceMetadata, /display_name: "\(OmO\) ulw-loop"/);
-	assert.doesNotMatch(interfaceMetadata, /ulw-loop \/ ulw-loop/);
-	assert.match(interfaceMetadata, /short_description: "Goal-like ultrawork loop for systematic decomposition"/);
-	assert.match(interfaceMetadata, /default_prompt: "Use \$ulw-loop/);
+	assert.match(interfaceMetadata, /^\s*default_prompt:\s*".+"$/m);
 });
 
 test("#given synced ulw-loop skill #when Codex hint metadata is inspected #then ulw-loop remains discoverable as an alias", async () => {
@@ -229,92 +223,11 @@ test("#given synced git-master skill #when inspected #then commits and git histo
 
 	// then
 	assert.match(skill, /^---\r?\nname: git-master\r?\n/m);
-	assert.match(skill, /MUST USE whenever a task needs a commit or git-history investigation/);
-	assert.match(skill, /Commit only the user's requested changes/);
-	assert.match(skill, /Choose the Git tool by the question/);
-	assert.match(skill, /git log -S "text"/);
-	assert.match(skill, /git blame -L start,end -- file/);
 	assert.match(interfaceMetadata, /display_name: "\(OmO\) git-master"/);
 	assert.match(interfaceMetadata, /- "git commit"/);
 	assert.match(interfaceMetadata, /- "history search"/);
 });
 
-test("#given synced ulw-loop skill #when worker guidance is inspected #then context-hygiene guidance matches the source", async () => {
-	// given
-	const sourceSkill = await readFile(
-		join(root, "components", "ulw-loop", "skills", "ulw-loop", "references", "full-workflow.md"),
-		"utf8",
-	);
-	const syncedSkill = await readFile(join(root, "skills", "ulw-loop", "SKILL.md"), "utf8");
-	const syncedWorkflow = await readFile(join(root, "skills", "ulw-loop", "references", "full-workflow.md"), "utf8");
-	// ulw-loop is V2-primary (gpt-5.6 sol/terra use the flat `wait_agent`); the `multi_agent_v1.*`
-	// namespace is documented only as the v1 fallback, so the wait_agent refs accept the bare token.
-	const requiredPatterns = [
-		["wait_agent ref", /\bwait_agent\b/],
-		["local spawned-name tracking", /Track spawned agent names locally/],
-		["wait_agent mailbox path", /wait_agent.*mailbox signals/],
-		["progress status contract", /WORKING:/],
-		["long-running plan/reviewer background guidance", /Plan and reviewer agents may run for a long time/],
-		["bounded plan/reviewer polling", /wait_agent.*cycles/],
-		["exponential backoff wait guard", /double the timeout up to ~5 minutes/],
-		["git-master checkpointing", /git-master/],
-		["touched-path commit-style probe", /touched-path commit history/],
-		["verified work-unit commit", /verified work unit/],
-		["observed commit style", /commit in the observed style/],
-	];
-
-	// when / then
-	for (const [label, pattern] of requiredPatterns) {
-		assert.match(sourceSkill, pattern, `source skill missing ${label}`);
-		assert.match(syncedWorkflow, pattern, `synced workflow missing ${label}`);
-	}
-	assert.match(syncedSkill, /references\/full-workflow\.md/);
-	assert.match(syncedSkill, /wait_agent/);
-	assert.match(syncedSkill, /close_agent/);
-});
-
-test("#given packaged start-work skill #when inspected #then no-plan bootstrap and adversarial verification contracts are shipped", async () => {
-	// given
-	const skillFile = await readPackagedSkillFile("start-work", "SKILL.md");
-
-	// when / then
-	assertPackagedContentMatches(skillFile, [
-		["executes Prometheus plan with Boulder state", /Prometheus work plan[\s\S]*Boulder state/],
-		["bootstraps ulw-plan when no selectable plan exists", /no selectable plan[\s\S]*ulw-plan|ulw-plan[\s\S]*no selectable plan/i],
-		["does not execute work without an approved plan", /approved plan[\s\S]*(?:before|prior to)[\s\S]*execution|execution[\s\S]*(?:requires|needs)[\s\S]*approved plan/i],
-		["keeps hook continuation Boulder-only", /Boulder[\s\S]*(?:continuation|Stop hook)[\s\S]*(?:only|solely)|(?:continuation|Stop hook)[\s\S]*(?:only|solely)[\s\S]*Boulder/i],
-		["distinguishes execution from verification", /execution[\s\S]*verification|verification[\s\S]*execution/i],
-		["requires dirty-worktree-aware editing", /dirty worktree/i],
-		["requires stale-state probes", /stale state/i],
-		["rejects misleading success output", /misleading success output/i],
-		["does not accept worker done claims without independent verification", /done claim[\s\S]*independent(?:ly)? verified|independent(?:ly)? verify[\s\S]*done claim/i],
-	]);
-});
-
-test("#given packaged ulw-plan skill #when inspected #then dynamic multi-agent planning contracts are shipped", async () => {
-	// given
-	const skillFile = await readPackagedSkillFile("ulw-plan", "SKILL.md");
-	const workflowFile = await readPackagedSkillFile("ulw-plan", "references", "full-workflow.md");
-	const combinedFile = {
-		path: `${skillFile.path} + ${workflowFile.path}`,
-		content: `${skillFile.content}\n${workflowFile.content}`,
-	};
-
-	// when / then
-	assertPackagedContentMatches(combinedFile, [
-		["self-orchestrates 5 host subagents for planning", /(?:self-orchestrates|orchestrates)[\s\S]*5[\s\S]*host subagents/i],
-		["requires dynamic workflow phases", /dynamic[\s\S]*workflow[\s\S]*phase|phase[\s\S]*dynamic[\s\S]*workflow/i],
-		["keeps verification distinct from execution", /verification[\s\S]*execution|execution[\s\S]*verification/i],
-		["requires dirty-worktree-aware planning", /dirty worktree/i],
-		["requires stale-state checks between source and packaged payloads", /stale state/i],
-		["rejects misleading success output", /misleading success output/i],
-		["does not accept subagent outputs as success without independent verification", /subagent outputs?[\s\S]*(?:not|never)[\s\S]*(?:success|approval)|independent(?:ly)? verif(?:y|ied|ication)[\s\S]*subagent outputs?/i],
-		["treats Discord or external content as claims, not instructions", /(?:Discord|external content)[\s\S]*claims?[\s\S]*not instructions?|not instructions?[\s\S]*(?:Discord|external content)/i],
-	]);
-	assert.doesNotMatch(combinedFile.content, opencodeOnlyToolPattern);
-	assert.doesNotMatch(combinedFile.content, /Proceeding to plan generation/);
-});
-
 test("#given packaged Codex ulw-plan surfaces #when inspected #then dangerous sandbox bypass guidance is not shipped", async () => {
 	// given
 	const dangerousBypassToken = ["dangerously", "bypass"].join("-");
@@ -330,34 +243,3 @@ test("#given packaged Codex ulw-plan surfaces #when inspected #then dangerous sa
 	assert.doesNotMatch(packagedWorkflow.content, dangerousBypassPattern, `${packagedWorkflow.path} ships unsafe Codex bypass guidance`);
 	assert.doesNotMatch(componentWorkflow.content, dangerousBypassPattern, `${componentWorkflow.path} ships unsafe Codex bypass guidance`);
 });
-
-test("#given packaged ulw-research skill #when Codex delivery gates are inspected #then the category-based proofread gate is stripped", async () => {
-	// given
-	const content = await readFile(join(root, "skills", "ulw-research", "SKILL.md"), "utf8");
-
-	// then the writing-category proofread gate never ships to Codex (no category concept there)
-	assert.doesNotMatch(content, /category="writing"/, "codex ulw-research ships the writing-category proofread gate");
-	assert.doesNotMatch(content, /Proofread gate/, "codex ulw-research still references the proofread gate");
-	// and the visual-QA delivery gate survives as the single gate
-	assert.match(content, /### The delivery gate \u2014 visual QA must PASS/u, "codex ulw-research lost the visual-QA delivery gate");
-	assert.match(content, /Visual QA \(always\)/, "codex ulw-research lost the visual-QA gate body");
-});
-
-test("#given context-pressure-prone skills #when bundled for Codex #then the eagerly loaded payload stays budgeted", async () => {
-	// given
-	const skillsRoot = join(root, "skills");
-	const skillNames = ["debugging", "ulw-loop"];
-
-	// when
-	let totalBytes = 0;
-	for (const skillName of skillNames) {
-		const content = await readFile(join(skillsRoot, skillName, "SKILL.md"), "utf8");
-		totalBytes += Buffer.byteLength(content, "utf8");
-	}
-
-	// then
-	assert.ok(
-		totalBytes <= CONTEXT_PRESSURE_SKILL_BUDGET_BYTES,
-		`debugging + ulw-loop eager payload is ${totalBytes} bytes, above ${CONTEXT_PRESSURE_SKILL_BUDGET_BYTES}`,
-	);
-});

package/packages/omo-codex/plugin/test/teammode-archive-ambiguity.test.mjs

@@ -1,48 +1,8 @@
 import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
-import { join } from "node:path";
 import test from "node:test";
 
-import { root } from "./aggregate-plugin-fixture.mjs";
 import { cleanupTeamRoot, createTeamRoot, readTeamJson, runTeam } from "./teammode-safety-fixture.mjs";
 
-const teammodeSkillPath = join("components", "teammode", "skills", "teammode", "SKILL.md");
-
-test("#given Codex App thread ids can be ambiguous across hosts #when archive guidance is read #then it separates app-thread archival from team-state archival", () => {
-	const body = readFileSync(join(root, teammodeSkillPath), "utf8");
-
-	assert.match(
-		body,
-		/Ambiguous Codex thread id|ambiguous across hosts/i,
-		"archive guidance must name the Codex App multi-host ambiguity failure instead of only saying the archive tool is unavailable",
-	);
-	assert.match(
-		body,
-		/app-thread archival blocker/i,
-		"archive guidance must classify ambiguous app-thread ids as app-thread archival blockers",
-	);
-	assert.match(
-		body,
-		/record .*team log/i,
-		"archive guidance must require a durable team-log record when app-thread archival cannot be proven",
-	);
-	assert.match(
-		body,
-		/continue .*team-state archive/i,
-		"archive guidance must let the team-state archive proceed after recording the app-thread archival blocker",
-	);
-	assert.match(
-		body,
-		/archive --note/i,
-		"archive guidance must route ambiguous app-thread archive blockers into archive --note evidence",
-	);
-	assert.match(
-		body,
-		/Do not delete/i,
-		"archive guidance must keep evidence available until ambiguous app-thread archival is resolved",
-	);
-});
-
 test("#given app-thread archival is blocked by an ambiguous id #when archive runs with a note #then team state is archived and keeps the blocker in the log", () => {
 	const tempRoot = createTeamRoot("omo-codex-teammode-archive-ambiguity-");
 	try {

package/packages/omo-codex/plugin/test/teammode-communication.test.mjs

@@ -3,14 +3,12 @@ import { readFileSync } from "node:fs";
 import { join } from "node:path";
 import test from "node:test";
 
-import { root } from "./aggregate-plugin-fixture.mjs";
 import { cleanupTeamRoot, createTeamRoot, runTeam, teamDir } from "./teammode-safety-fixture.mjs";
 
-// The teammode guide.md is what every member actually reads. The real run of leader session
-// 019eed1e- proved members default to silence: 10 members, ~6 min, 4 end-of-work reports, zero
-// peer messages, zero mid-task reports, zero send_message_to_thread calls - because the prose said
-// "over-communicate relentlessly" (aspirational, no trigger) and never named the tool or targets.
-// These tests pin the fix: a concrete push-communication protocol is the default the manual renders.
+// The teammode guide.md is what every member actually reads. A real leader-session run proved members
+// default to silence when the guide never names the tool or the address book, so the tests below pin
+// only the machine tokens the generator must surface: the cross-thread tool name and the team.json
+// field paths members address messages by. Guide/prompt wording itself is prose and stays unpinned.
 
 function buildTwoMemberTeam(tempRoot, sessionId) {
 	runTeam(tempRoot, "init", "--name", "Comms", "--session-name", "frequent", "--session", sessionId);
@@ -39,69 +37,15 @@ test("#given a bound team #when the member field manual renders #then it names t
 		cleanupTeamRoot(tempRoot);
 	}
 });
-
-test("#given a bound team #when the member field manual renders #then it gives concrete per-moment cadence triggers, not aspirational 'constantly'", () => {
-	const tempRoot = createTeamRoot("omo-codex-teammode-comms-");
-	try {
-		buildTwoMemberTeam(tempRoot, "comms-cadence");
-		const guide = readGuide(tempRoot, "comms-cadence");
-
-		// then - a concrete heartbeat cadence the model can bind to
-		assert.match(guide, /every few tool calls/, "guide must give a concrete heartbeat trigger");
-		assert.match(guide, /WORKING:/, "guide must keep the WORKING heartbeat marker");
-		assert.match(guide, /BLOCKED:/, "guide must keep the BLOCKED marker");
-		// then - an explicit peer-notify rule so cross-cutting findings are pushed, not siloed
-		assert.match(guide, /to a \*\*peer\*\*/, "guide must have an explicit peer-notify rule");
-		assert.match(guide, /touches their slice/, "guide must trigger peer messages on slice-touching findings");
-		// then - the reassurance WHY that ties the two halves together: frequent reporting is what earns
-		// uninterrupted focus, so the leader has no reason to interrupt a member who keeps it informed
-		assert.match(guide, /uninterrupted focus/i, "guide must tell members frequent updates buy uninterrupted focus from the leader");
-		// then - the end-only directive that previously won is gone (it licensed batch-at-the-end reporting)
-		assert.doesNotMatch(guide, /the moment your work is complete/, "the standalone end-only report directive must be removed");
-	} finally {
-		cleanupTeamRoot(tempRoot);
-	}
-});
-
-test("#given a member bootstrap trigger #when it is generated #then it points at the push tool and a continuous cadence, not an end-of-work report", () => {
+test("#given a member bootstrap trigger #when it is generated #then it names the cross-thread push tool", () => {
 	const tempRoot = createTeamRoot("omo-codex-teammode-comms-");
 	try {
 		buildTwoMemberTeam(tempRoot, "comms-bootstrap");
 		const prompt = runTeam(tempRoot, "member-prompt", "--team", "comms-bootstrap", "--id", "A").stdout;
 
-		// then - the first thing a member reads tells it to push via the tool as it works
+		// then - the first thing a member reads names the tool it can push through
 		assert.match(prompt, /codex_app\.send_message_to_thread/, "bootstrap must name the push tool");
-		assert.match(prompt, /never just one report at the end/, "bootstrap must reject end-only reporting");
-		// then - it no longer frames reporting as a one-shot completion event
-		assert.doesNotMatch(prompt, /report to the leader the moment you are done/, "the end-only bootstrap line must be removed");
 	} finally {
 		cleanupTeamRoot(tempRoot);
 	}
 });
-
-test("#given the leader-facing SKILL.md #when it describes communication #then it requires --session so members can reach the leader and frames members as pushing", () => {
-	const skill = readFileSync(join(root, "components", "teammode", "skills", "teammode", "SKILL.md"), "utf8");
-
-	// then - the leader is told members PUSH to it (not only that the leader sends)
-	assert.match(skill, /Members push to you/i, "SKILL.md must frame members as pushing to the leader");
-	// then - the --session requirement is stated WITH its reason (member->leader push needs a real leader thread)
-	assert.match(skill, /--session <your own thread id>/, "SKILL.md must require init --session <your own thread id>");
-	assert.match(skill, /stuck polling|cannot report to you/i, "SKILL.md must explain why --session matters");
-});
-
-// The leader (a GPT-5.5 main session) over-polls when nothing reframes silence as work: real jobdori
-// run 019f07a6- fired 6 leader->child pings, 4 pure "WORKING CHECK"/"NUDGE" nags that interrupted the
-// child mid-slice. The member guide already mandates frequent reporting; the missing half is telling the
-// leader to WAIT. These tests pin that the leader-facing skill reframes quiet-as-working and gates any
-// outbound ping behind concrete decision rules instead of letting anxiety drive a barrage.
-test("#given the leader-facing SKILL.md #when it covers waiting on members #then it reframes a quiet member as working and gates leader pings behind decision rules", () => {
-	const skill = readFileSync(join(root, "components", "teammode", "skills", "teammode", "SKILL.md"), "utf8");
-
-	// then - a quiet member between heartbeats is reframed as working, not a stall to chase
-	// (\s+ tolerates markdown line-wrapping between the two words)
-	assert.match(skill, /working,\s+not stalled/i, "SKILL.md must reframe a quiet member as working, not stalled");
-	// then - outbound leader messages are gated behind explicit decision rules, not anxiety
-	assert.match(skill, /Message a member only when/i, "SKILL.md must gate leader pings behind a concrete decision rule");
-	// then - the anti-pattern nag pings the real run produced are named as what NOT to send
-	assert.match(skill, /are you\s+done\?/i, "SKILL.md must name the 'are you done?' style nag as forbidden");
-});

package/packages/omo-codex/plugin/test/teammode-thread-links.test.mjs

@@ -71,46 +71,13 @@ test("#given a worktree-backed team has bound member threads #when guide and sta
 		const status = runTeam(tempRoot, "status", "--team", sessionId).stdout;
 		const prompt = runTeam(tempRoot, "member-prompt", "--team", sessionId, "--id", "A").stdout;
 
+		// then - guide, status, and bootstrap prompt all surface the member's bound thread link and cwd
 		assert.match(guide, /codex:\/\/threads\/019ef350-ee78-72a3-bd5e-e40cebc3d814/);
 		assert.match(guide, /codex:\/\/threads\/019ef2dd-5b99-7ae2-8461-ffa6ca309d23/);
 		assert.match(guide, /worktree `\/tmp\/review-worktree`/);
 		assert.match(status, /link=codex:\/\/threads\/019ef350-ee78-72a3-bd5e-e40cebc3d814/);
-		assert.match(prompt, /Your Codex thread link is codex:\/\/threads\/019ef350-ee78-72a3-bd5e-e40cebc3d814/);
-		assert.match(prompt, /Work inside `\/tmp\/review-worktree`/);
-		assert.match(prompt, /Before editing, verify that your assigned worktree exists and contains repo files/);
-		assert.match(prompt, /BLOCKED: worktree not ready/);
-	} finally {
-		cleanupTeamRoot(tempRoot);
-	}
-});
-
-test("#given a worktree member has no cwd bound yet #when guide and prompt render #then they tell Codex to wait for readiness", () => {
-	const tempRoot = createTeamRoot("omo-codex-teammode-worktree-wait-");
-	try {
-		const sessionId = "worktree-wait";
-		runTeam(tempRoot, "init", "--name", "Wait", "--session-name", "worktrees", "--session", sessionId, "--worktree", "--base-branch", "main");
-		addMember(tempRoot, sessionId, {
-			id: "A",
-			name: "worktree-driver",
-			focus: "drive a pending Codex worktree thread",
-			lens: "ownership",
-			deliverable: "ready worktree report",
-		});
-		addMember(tempRoot, sessionId, {
-			id: "B",
-			name: "integration-watch",
-			focus: "watch integration boundaries",
-			lens: "perspective",
-			deliverable: "integration notes",
-		});
-		runTeam(tempRoot, "bind-thread", "--team", sessionId, "--id", "A", "--thread", "019ef350-ee78-72a3-bd5e-e40cebc3d814");
-
-		const guide = readFileSync(`${teamDir(tempRoot, sessionId)}/guide.md`, "utf8");
-		const prompt = runTeam(tempRoot, "member-prompt", "--team", sessionId, "--id", "A").stdout;
-
-		assert.match(guide, /If Codex returns only `pendingWorktreeId`/);
-		assert.match(guide, /wait until Codex surfaces a real thread id/);
-		assert.match(prompt, /If this prompt arrived before your Codex worktree checkout is ready/);
+		assert.match(prompt, /codex:\/\/threads\/019ef350-ee78-72a3-bd5e-e40cebc3d814/);
+		assert.match(prompt, /\/tmp\/review-worktree/);
 	} finally {
 		cleanupTeamRoot(tempRoot);
 	}

package/packages/omo-codex/plugin/test/teammode-transport.test.mjs

@@ -3,7 +3,6 @@ import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import test from "node:test";
 
-import { root } from "./aggregate-plugin-fixture.mjs";
 import {
 	cleanupTeamRoot,
 	createTeamRoot,
@@ -53,45 +52,6 @@ function addV2Members(tempRoot, sessionId) {
 	);
 }
 
-test("#given flat V2 tools are available #when the leader reads teammode #then transport selection and user announcement precede init", () => {
-	const skill = readFileSync(join(root, "components", "teammode", "skills", "teammode", "SKILL.md"), "utf8");
-	const inspectIndex = skill.indexOf("Inspect your active tool list");
-	const initIndex = skill.indexOf('team.mjs" init');
-
-	assert.notEqual(inspectIndex, -1, "skill must inspect the active tool list");
-	assert.notEqual(initIndex, -1, "skill must still document init");
-	assert.ok(inspectIndex < initIndex, "transport inspection must happen before init");
-	assert.match(skill, /spawn_agent.*task_name[\s\S]*send_message[\s\S]*followup_task[\s\S]*wait_agent[\s\S]*list_agents[\s\S]*interrupt_agent/);
-	assert.match(skill, /tell the user|announce.*transport/i);
-	assert.match(skill, /MultiAgentV2/i);
-	assert.match(skill, /Codex App.*fallback/i);
-});
-
-test("#given neither transport's tools are visible #when the leader reads teammode #then search hits are revalidated and fallback is capability-aware without team state", () => {
-	const skill = readFileSync(join(root, "components", "teammode", "skills", "teammode", "SKILL.md"), "utf8");
-
-	const searchIndex = skill.indexOf("tool_search");
-	const unavailableIndex = skill.indexOf("Teammode unavailable");
-	assert.notEqual(searchIndex, -1, "skill must route hidden tools through the tool_search check");
-	assert.notEqual(unavailableIndex, -1, "skill must give the leader unavailable announcement templates");
-	assert.ok(searchIndex < unavailableIndex, "tool_search must precede the unavailable conclusion");
-	assert.match(skill, /revalidate.*COMPLETE.*compatible transport set/is, "a deferred-tool hit must be revalidated as a complete transport");
-	assert.match(skill, /another visible plain-subagent mechanism.*spawn.*communicate.*observe/is, "plain-subagent fallback requires a complete visible lifecycle");
-	assert.match(skill, /Otherwise continue serially.*capability limitation/is, "missing all transports must continue serially rather than promise workers");
-	assert.match(skill, /Do NOT run `init`/, "the fallback must not create team state");
-	assert.doesNotMatch(skill, /splitting the work across plain fire-and-forget subagents/i, "the skill must not promise unavailable plain subagents");
-});
-
-test("#given a MultiAgentV2 team #when the leader spawns members #then guidance limits calls to exposed V2 fields", () => {
-	const skill = readFileSync(join(root, "components", "teammode", "skills", "teammode", "SKILL.md"), "utf8");
-
-	assert.match(skill, /using only the V2 schema fields/i);
-	assert.match(skill, /`task_name`[\s\S]*`message`[\s\S]*`fork_turns`/);
-	assert.match(skill, /role, priority, or task-specific routing instruction in `message`/i);
-	assert.match(skill, /V2 does not accept[\s\S]*`agent_type`, `model`, `reasoning_effort`, or `service_tier`/);
-	assert.match(skill, /inherit the[\s\S]*session model/i);
-});
-
 test("#given MultiAgentV2 transport #when members are added and bound #then task names and canonical agent paths form the address book", () => {
 	const tempRoot = createTeamRoot("omo-codex-teammode-v2-transport-");
 	try {
@@ -123,7 +83,6 @@ test("#given MultiAgentV2 transport #when members are added and bound #then task
 				{ id: "B", taskName: "mailbox_delivery", agentPath: "/root/mailbox_delivery", threadId: null, threadTitle: null, status: "active" },
 			],
 		);
-		assert.match(guide, /Transport:.*MultiAgentV2/i);
 		assert.match(guide, /members\[\]\.agentPath/);
 		assert.match(guide, /send_message/);
 		assert.match(guide, /followup_task/);
@@ -223,9 +182,7 @@ test("#given a V2 team #when the whole team is archived without a note #then no
 		const archiveEntry = team.log.find((entry) => entry.event === "archive");
 
 		assert.equal(team.status, "archived");
-		assert.doesNotMatch(result.stdout, /closed all members/i, "V2 has no runtime close/archive operation to claim");
 		assert.match(result.stdout, /no runtime archive operation/i);
-		assert.doesNotMatch(archiveEntry.detail, /all members closed/i);
 		assert.match(archiveEntry.detail, /no runtime archive operation/i);
 	} finally {
 		cleanupTeamRoot(tempRoot);
@@ -261,7 +218,6 @@ test("#given a codex_app team #when one member is archived #then the existing wo
 		const result = runTeam(tempRoot, "archive", "--team", "app-archive-member", "--id", "A");
 
 		assert.match(result.stdout, /archived member A/);
-		assert.doesNotMatch(result.stdout, /no runtime archive operation/i);
 	} finally {
 		cleanupTeamRoot(tempRoot);
 	}

package/packages/omo-codex/plugin/test/teammode-worktree.test.mjs

@@ -83,24 +83,21 @@ test("#given a worktree team #when worktree-add A #then a real git worktree on a
 		assert.match(result.stdout, /A/);
 		assert.match(result.stdout, /wait for the real Codex thread id/);
 		assert.match(result.stdout, /bind-thread before sending bootstrap/);
-		assert.doesNotMatch(result.stdout, /Tell that member to:/);
 	} finally {
 		cleanupTeamRoot(tempRoot);
 	}
 });
 
-test("#given worktree-add ran #when the field manual is regenerated #then it flips the member's guide to ISOLATION IS ON with the derived branch", () => {
+test("#given worktree-add ran #when the field manual is regenerated #then it shows the member's derived worktree branch", () => {
 	const tempRoot = createTeamRoot("omo-codex-teammode-wt-guide-");
 	try {
 		initGitRepo(tempRoot);
 		bootstrapTeam(tempRoot, "wt-guide", { worktree: false });
-		// before: no isolation, so the manual tells members to signal collisions instead
-		assert.match(readFileSync(join(teamDir(tempRoot, "wt-guide"), "guide.md"), "utf8"), /does not use isolated git worktrees/);
 
 		runTeam(tempRoot, "worktree-add", "--team", "wt-guide", "--id", "A");
 
+		// then - the regenerated guide carries the derived branch recorded in team state
 		const guide = readFileSync(join(teamDir(tempRoot, "wt-guide"), "guide.md"), "utf8");
-		assert.match(guide, /ISOLATION IS ON/);
 		assert.match(guide, /team\/wt-guide\/A/, "the member's row must show its derived worktree branch");
 	} finally {
 		cleanupTeamRoot(tempRoot);
@@ -225,7 +222,6 @@ test("#given a member branch that cannot be merged #when integrate runs #then it
 		const out = `${result.stdout}${result.stderr}`;
 		assert.notEqual(result.status, 0);
 		assert.match(out, /could not integrate|not something we can merge|ghost-branch-404/i, "must surface git's actual reason");
-		assert.doesNotMatch(out, /Conflicting files/, "a non-conflict failure must NOT be mislabeled as a merge conflict");
 	} finally {
 		cleanupTeamRoot(tempRoot);
 	}

package/packages/omo-codex/plugin/test/ultrawork-skill-pointer.test.mjs

@@ -33,7 +33,6 @@ test("#given synced skills #when the ultrawork skill is inspected #then it carri
 	const directive = readFileSync(join(root, "components", "ultrawork", "directive.md"), "utf8");
 	assert.match(skill, /^---\nname: ultrawork\n/);
 	assert.equal(skill.endsWith(directive), true);
-	assert.match(skill, /## 1\. Create the goal with binding success criteria/);
 });
 
 test("#given the built ultrawork CLI #when a ulw prompt is submitted #then a compact skill pointer is emitted", () => {
@@ -42,10 +41,8 @@ test("#given the built ultrawork CLI #when a ulw prompt is submitted #then a com
 	const output = JSON.parse(result.stdout);
 	const context = output.hookSpecificOutput.additionalContext;
 	assert.match(context, /^<ultrawork-mode>/);
-	assert.match(context, /First user-visible line this turn MUST be exactly:/);
 	assert.match(context, /create_goal/);
 	assert.equal(context.includes(skillPath), true);
-	assert.equal(context.includes("Tier triage"), false);
 	assert.equal(Buffer.byteLength(context, "utf8") < POINTER_MAX_BYTES, true);
 });
 

package/packages/omo-codex/plugin/test/ulw-plan-review-state-contract.test.mjs

@@ -54,15 +54,12 @@ function matchesCas(state, expected, clauses) {
 
 for (const surface of surfaces) {
 	test(`#given ${surface.name} #when deeper review becomes required before plan completion #then durable request state covers explicit and automatic review without inventing a digest`, async () => {
-		const skill = await readFile(surface.skillPath, "utf8");
 		const workflow = await readFile(surface.workflowPath, "utf8");
 		const contract = readJsonContract(workflow, "ulw-plan-review-request-state-contract");
 
 		assert.equal(contract.transition, "replace");
 		assert.equal(contract.phase, "review_requested");
 		assert.deepEqual(contract.applies_when, ["explicit_review_modifier_before_complete_plan", "intent=unclear_and_nontrivial"]);
-		assert.match(skill, /Include `--review-required`[\s\S]{0,180}non-Trivial UNCLEAR/);
-		assert.match(workflow, /--draft-only/);
 		assert.equal(contract.atomic, true);
 		assert.equal(contract.review_required, true);
 		assert.equal(contract.plan_path, ".omo/plans/<slug>.md");

package/packages/omo-codex/scripts/install-dist/install-local.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// omo-codex-install:7bc4b0f020f0a1b4448cc75385a7e3c60042e3b270e304d4c1a43a859e81a4c2:b7c9fa9c8d92e9e8082bed55796691f3ce7feb478dc3826605dde249c3937b4e
+// omo-codex-install:1d8359e77ebe41655f091cd2e455f320cde2f9c681f0651797c47d8fdfa2dd76:c76513d859dcf200fa0178cedc7bbd268cbb9a16c2f2b30d3edd344daec24755
 var __defProp = Object.defineProperty;
 var __returnValue = (v) => v;
 function __exportSetter(name, newValue) {
@@ -5927,7 +5927,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@oh-my-opencode/omo-codex",
-    version: "5.0.0-beta.7",
+    version: "5.0.0-beta.9",
     type: "module",
     private: true,
     description: "Codex harness adapter for oh-my-openagent. Vendored Codex plugin namespace (omo) + TypeScript installer + telemetry.",

package/packages/omo-codex/scripts/install-lazycodex-version-stamp.test.mjs

@@ -77,8 +77,13 @@ test("#given sisyphuslabs lazycodex install #when installing locally #then stamp
 	assert.equal(manifest.version, "4.7.6");
 	assert.equal(packageJson.version, "4.7.6");
 	assert.equal(componentPackageJson.version, "4.7.6");
-	assert.equal(hooks.hooks.PostToolUse[0].hooks[0].statusMessage, "(OmO 4.7.6) Checking Comments");
-	assert.equal(componentHooks.hooks.UserPromptSubmit[0].hooks[0].statusMessage, "(OmO 4.7.6) Checking Ulw-Loop Steering");
+	for (const statusMessage of [
+		hooks.hooks.PostToolUse[0].hooks[0].statusMessage,
+		componentHooks.hooks.UserPromptSubmit[0].hooks[0].statusMessage,
+	]) {
+		assert.match(statusMessage, /^\(OmO 4\.7\.6\) \S/);
+		assert.doesNotMatch(statusMessage, /0\.1\.0/);
+	}
 	assert.deepEqual(snapshot, {
 		packageName: "lazycodex-ai",
 		version: "4.7.6",

package/packages/shared-skills/skills/frontend/SKILL.md

@@ -5,7 +5,7 @@ description: "MUST USE for frontend/web UI/UX/visual work: building, styling, re
 
 # Frontend
 
-This file is a router, not a rulebook. The rules live in four rulesets under `references/`; your first job is to load the smallest set of files that covers the request, state which you loaded in one sentence, then execute under their guidance. Loading nothing and freestyling produces the generic AI-slop output this skill exists to prevent; loading everything wastes context and creates contradictory instructions.
+This file is a router, not a rulebook. The rules live in four rulesets under `references/`, and reading them is the work, not the preamble to it. Before touching any file, name the references the request routes to and the one reason each is needed, then read exactly those. Declaring the set first is what makes the choice reviewable: a reference you never named is one you decided to skip, and a reference you named but never opened is a gap you still owe. Freestyling past the routed set produces the generic AI-slop output this skill exists to prevent.
 
 **The bar is not clean-and-correct — it is work a senior designer at Linear, Stripe, or Supabase would ship.** Correct-but-flat is a failure, not a finish. Protect the surface as hard as you protect the build: design is a first-class deliverable, not a one-shot decision you lock and walk away from.
 
@@ -14,12 +14,13 @@ This file is a router, not a rulebook. The rules live in four rulesets under `re
 | Request involves… | Read |
 |---|---|
 | ANY UI implementation, styling, redesign, mockup, or visual decision | `references/design/README.md` FIRST. It enforces two mandatory gates — the Design System Gate (a `DESIGN.md` must exist before any component is written) and the React Dev Tooling Gate (react-grab / react-scan / react-doctor installed by default) — then routes to the taste and brand references below. |
+| Spatial structure — app shells, scroll ownership, "what goes where", "this layout breaks at X" | ALSO `references/design/layout-skill.md` for the mechanics, then `references/design/stylegallery.md` to fetch a named pattern contract for that exact spatial problem. Both stack on the style skill and add no visual direction. |
 | Interaction or motion work — micro-interactions, animated components, transitions, gestures, hover/press/state feedback, "make it feel alive" | ALSO `references/design/interaction-skill.md`. The beui.dev catalog is the mandatory interaction reference: find the nearest pattern, read its real source through the file's curl recipe, and adapt the mechanism to `DESIGN.md` motion tokens. It stacks on the routed style skill — never replaces it. |
 | Writing or modifying frontend code, OR auditing performance / SEO / accessibility / quality | ALSO `references/perfection/README.md`. Lighthouse 100 in every category, measured on real Playwright Chromium (never the `lighthouse` CLI), achieved through architecture — never by dropping animations or hiding content. |
-| Looking up a concrete style, color palette, font pairing, chart type, landing-page structure, or UX guideline — or generating a project design system from keywords | `references/ui-ux-db/README.md`. A searchable CSV database with a CLI; a lookup tool, not a posture. Load on demand; `design` stays the source of truth for taste and the `DESIGN.md` contract. |
-| ANY implementation or redesign that creates or updates `DESIGN.md` — plus explicit operating-layer asks (personas, critique, debt, handoff, synthetic user testing) | `references/designpowers/README.md` + `references/designpowers/lane-c-review.md`. An internal frontend ruleset, not a separate skill: lane-c is the Phase Final flatness/critique reviewer, and its accessibility-constraints and accepted-debt language fills the required `DESIGN.md` sections. Load other lanes only when their phase applies. |
+| Looking up a concrete style, palette, font pairing, chart type, landing structure, or UX guideline — or generating a design system from keywords | `references/ui-ux-db/README.md`. A searchable CSV database with a CLI: a lookup tool, not a posture. `design` stays the source of truth for taste and the `DESIGN.md` contract. |
+| ANY implementation or redesign that creates or updates `DESIGN.md` — plus explicit operating-layer asks (personas, critique, debt, handoff, synthetic user testing) | `references/designpowers/README.md` + `lane-c-review.md`. lane-c is the Phase Final flatness/critique reviewer and fills the accessibility-constraint and accepted-debt sections `DESIGN.md` requires. Load other lanes only when their phase applies. |
 
-**For implementation work, design + perfection load together.** A page that hits Lighthouse 100 but looks like AI slop has failed; a page that looks beautiful but ships a 2 MB bundle has failed. Both win or neither does.
+**For implementation work, design + perfection load together.** Beauty with a 2 MB bundle fails; Lighthouse 100 that looks like AI slop fails. Both win or neither does.
 
 ## Design System and Component Workflow
 
@@ -32,12 +33,13 @@ Every implementation must choose one of these branches before UI code changes:
 2. **Greenfield or fresh setup:** if the user gave no concrete visual reference, design research is a build step with named deliverables — not exploration to be budgeted. Exploration-stop instincts ("enough exploration", two-wave caps) do not apply here. Fire every research lane IN PARALLEL before `DESIGN.md` is written, and open `DESIGN.md` with a `## 0. Research Log` section recording each lane's deliverable — a lane with no Research Log line did not run. Skip a lane only when its tool or network is genuinely unavailable, and name the skip in `DESIGN.md`:
    - **Embedded references:** use `references/design/_INDEX.md` to shortlist 2-3 plausible Layer B references, then read exactly one Layer A style skill and one Layer B reference in full — every line, no partial reads (they are 200-500 lines; a sliced read produces the flattened token set this gate exists to prevent). Log the shortlist, the pick, and why. Use `open-design` only when the curated set has no fit; add `ui-ux-db` lookups for palette/type/domain questions.
    - **Lazyweb real-product screens:** READ `references/design/lazyweb.md` FIRST and run its recipe verbatim — do not improvise curl calls against lazyweb.com; the recipe mints its own anonymous token. Log the queries run, how many screens you actually VIEWED, and the layout grammar harvested — never pixel copies.
+   - **StyleGallery spatial patterns:** read `references/design/stylegallery.md` and fetch the pattern whose primary spatial problem matches the screen. Log the pattern adopted and the element that owns the scroll.
    - **Imagen concept drafts:** generate 2-3 imagen concept drafts, each seeded with the loaded Layer A + Layer B tokens (palette, type, material); pick the strongest and treat the chosen draft as the reference-fidelity contract. Log the draft paths and the pick.
    Synthesize every lane into `DESIGN.md`. Treat sources as source material, not mood labels: extract tokens, layout grammar, component anatomy, interaction states, motion, and taste decisions, then recombine them into project-specific primitives. Before laying out sections, inventory the content blocks and assign each a job — hook, explain, prove, compare, convert, navigate, retain — then order sections by the visitor's decision path, not by visual symmetry. Never freestyle past the selected references, never copy logos or brand-specific copy. Then run the Primitive Showcase Gate (`references/design/README.md` Phase 0) before any product screen.
 3. **Existing project with `DESIGN.md` or a component system:** read it, follow it, and update it before implementation only when the requested work needs a new token, primitive, state, motion rule, accessibility constraint, accepted debt, or reference-fidelity requirement.
 4. **Existing project with UI but no `DESIGN.md` and no reusable component layer:** STOP and ask the user one focused question: should you preserve the current look with copy-nearby styling, or extract a real `DESIGN.md` plus reusable components before continuing? Do not silently choose.
 
-For implementation, redesign, or design-system work that creates or updates `DESIGN.md`, `references/designpowers/README.md` + `lane-c-review.md` are part of the default load — feed their personas, accessibility, critique, debt, handoff, and role-reference guidance into the branch above. The resulting `DESIGN.md` is the implementation contract: tokens, typography, spacing, primitives, motion, responsive behavior, accessibility constraints, and accepted debt must be named there before code uses them. Verify component primitives, states, and final screens with real visual QA evidence; pass design-system decisions, implementation evidence, and unresolved debt into `/review-work` for significant implementation work.
+The resulting `DESIGN.md` is the implementation contract: tokens, typography, spacing, primitives, motion, responsive behavior, accessibility constraints, and accepted debt must be named there before code uses them. Verify component primitives, states, and final screens with real visual QA evidence; pass design-system decisions, implementation evidence, and unresolved debt into `/review-work` for significant implementation work.
 
 ## Ruleset 1 — design (`references/design/`)
 
@@ -104,7 +106,7 @@ Domains: `product` `style` `typography` `color` `landing` `chart` `ux` `react` `
 
 ## Ruleset 4 — designpowers (`references/designpowers/`)
 
-`README.md` routes design operating-layer guidance from the pinned `Owl-Listener/designpowers` reference corpus into the existing frontend workflow. Load it — together with `lane-c-review.md` — for every implementation or redesign that creates or updates `DESIGN.md`, and additionally when a task needs explicit personas, accessibility and cognitive constraints, design critique, design debt, handoff, synthetic user testing, motion guidance, or role-reference prompts. It does not replace this frontend skill, `/visual-qa`, `/ulw-plan`, `/start-work`, or `/review-work`; it supplies richer design context that must first be distilled into the project `DESIGN.md`, then used as the design-system contract for implementation and verification.
+`README.md` routes the pinned `Owl-Listener/designpowers` corpus into this workflow. It supplies design context — personas, accessibility and cognitive constraints, critique, debt, handoff, synthetic user testing, motion, role prompts — that must be distilled into `DESIGN.md` first, then used as the implementation contract. It replaces nothing: not this skill, not `/visual-qa`, `/ulw-plan`, `/start-work`, or `/review-work`.
 
 ## Quick routes — most common requests
 
@@ -120,6 +122,7 @@ Domains: `product` `style` `typography` `color` `landing` `chart` `ux` `react` `
 | "Audit my site" / "make this page faster" | `perfection/README.md` (+ `perfection/react-perf-tooling.md` if React) |
 | "Mockup image of a fintech app" — no code | `design/imagegen-frontend-mobile.md` (+ a Layer B brand if named) |
 | "What palette/fonts fit a wellness brand?" | `ui-ux-db/README.md` → search CLI |
+| "Where should this go?" / "the layout breaks" / scroll + containment | `design/layout-skill.md` + `design/stylegallery.md` on the current style skill |
 | "What do shipped apps in this space look like?" / design-direction research | `design/lazyweb.md` (curl-only) + `design/_INDEX.md` shortlist |
 | "Set up this React project" | `design/README.md` + `design/react-dev-tooling-skill.md` |
 | "Use designpowers", "make the design workflow stronger", "add personas/accessibility/debt/handoff" | `design/README.md` + `designpowers/README.md` (+ `perfection/README.md` if implementation or audit follows) |
@@ -127,7 +130,7 @@ Domains: `product` `style` `typography` `color` `landing` `chart` `ux` `react` `
 ## Shared axioms (all four rulesets agree — apply always)
 
 - **No design system = no UI work.** `DESIGN.md` exists before components do; every color, font size, and spacing value traces back to a token in it.
-- **Concrete reference = contract.** When a screenshot, generated mockup, overview, or annotated reference exists, the implementation must match its pixels, copy, component structure, and responsive intent unless the user explicitly accepts a deviation.
+- **Concrete reference = contract.** When a screenshot, mockup, or annotated reference exists, match its pixels, copy, component structure, and responsive intent unless the user accepts a deviation.
 - **Never weaken UX OR flatten the surface to buy points.** No dropping animations, hiding content, simplifying interactions, or replacing rendered/lit material with flat fills and flat geometric primitives for a Lighthouse score or a deadline. Hit 100 AND keep the surface dimensional — both, or neither.
 - **No emojis as icons.** SVG icon sets only (Lucide, Heroicons, Radix, Phosphor).
 - **GPU-composited animation only** — `transform`, `opacity`, `filter`; never animate layout properties.