oh-my-opencode 5.0.0-beta.3 → 5.0.0-beta.30

package/packages/omo-codex/plugin/components/rules/test/bundled-rules-priority.test.ts

@@ -1,19 +1,22 @@
 import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
+import type { RuleCandidate } from "@oh-my-opencode/rules-engine/engine";
+import {
+	createEngine,
+	defaultConfig,
+	type EngineDeps,
+	resolvePluginRulesRoot,
+	SOURCE_PRIORITY,
+} from "@oh-my-opencode/rules-engine/engine";
 import { afterEach, describe, expect, it } from "vitest";
-
 import { configFromEnvironment } from "../src/config.js";
-import { SOURCE_PRIORITY } from "@oh-my-opencode/rules-engine/engine";
-import { createEngine, defaultConfig, type EngineDeps } from "@oh-my-opencode/rules-engine/engine";
-import { resolvePluginRulesRoot } from "@oh-my-opencode/rules-engine/engine";
-import type { RuleCandidate } from "@oh-my-opencode/rules-engine/engine";
 
 const projectRoot = "/tmp/codex-rules-bundled-priority";
 const bundledPath = join(projectRoot, "bundled-rules", "hephaestus.md");
 const homePath = join(projectRoot, "home", ".opencode", "rules", "hephaestus.md");
-const bundledBody = "Bundled baseline discipline.";
-const homeBody = "Home baseline discipline override.";
+const bundledBody = "BUNDLED_BASELINE_SENTINEL";
+const homeBody = "HOME_OVERRIDE_SENTINEL";
 const tempDirectories: string[] = [];
 
 afterEach(() => {
@@ -35,14 +38,7 @@ function globalCandidate(source: "plugin-bundled" | "~/.opencode/rules", path: s
 }
 
 function ruleMarkdown(body: string): string {
-	return [
-		"---",
-		"description: OMO Hephaestus baseline discipline for Codex",
-		"alwaysApply: true",
-		"---",
-		"",
-		body,
-	].join("\n");
+	return ["---", "description: Fixture", "alwaysApply: true", "---", "", body].join("\n");
 }
 
 describe("plugin bundled rule priority", () => {
@@ -85,7 +81,6 @@ describe("plugin bundled rule priority", () => {
 		// then
 		expect(formatted).toContain(homePath);
 		expect(formatted).toContain(homeBody);
-		expect(formatted).not.toContain(`- [hephaestus.md]{${homePath}}`);
 		expect(formatted).not.toContain(bundledPath);
 		expect(formatted).not.toContain(bundledBody);
 	});

package/packages/omo-codex/plugin/components/rules/test/bundled-rules.test.ts

@@ -1,8 +1,8 @@
 import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
+import { createRuleDiscoveryCache, findRuleCandidates } from "@oh-my-opencode/rules-engine/engine";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
-
 import {
 	type CodexPostCompactInput,
 	type CodexSessionStartInput,
@@ -10,7 +10,6 @@ import {
 	runSessionStartHook,
 	runUserPromptSubmitHook,
 } from "../src/codex-hook.js";
-import { createRuleDiscoveryCache, findRuleCandidates } from "@oh-my-opencode/rules-engine/engine";
 
 interface FixtureOptions {
 	readonly writeProjectDuplicate?: boolean;
@@ -40,8 +39,12 @@ const DISABLED_BUNDLED_ENV = {
 	CODEX_RULES_DISABLE_BUNDLED: "1",
 };
 
-const BUNDLED_BODY = "Bundled craftsman baseline.";
-const SHARED_BODY = "Always choose the smallest correct change.";
+// Runtime sentinel: the rules hook emits and re-greps this marker when
+// deduplicating injected rules against the transcript (transcript-rule-filter.ts).
+const INSTRUCTIONS_FROM = "Instructions from: ";
+
+const BUNDLED_BODY = "BUNDLED_PERSONA_SENTINEL";
+const SHARED_BODY = "SHARED_RULE_SENTINEL";
 
 const tempDirectories: string[] = [];
 let originalPluginRoot: string | undefined;
@@ -130,10 +133,6 @@ function userPromptSubmitInput(root: string): Parameters<typeof runUserPromptSub
 	};
 }
 
-function occurrenceCount(value: string, search: string): number {
-	return value.split(search).length - 1;
-}
-
 describe("plugin bundled rules", () => {
 	it("#given PLUGIN_ROOT with bundled markdown #when finding candidates #then plugin-bundled source is cached", () => {
 		// given
@@ -162,11 +161,8 @@ describe("plugin bundled rules", () => {
 
 		// then
 		expect(output).toContain('"hookEventName":"SessionStart"');
-		expect(output).toContain(`Instructions from: ${bundledRulePath}`);
+		expect(output).toContain(`${INSTRUCTIONS_FROM}${bundledRulePath}`);
 		expect(output).toContain(BUNDLED_BODY);
-		expect(output).toContain("## Project Instructions");
-		expect(output).not.toContain("must read project rules:");
-		expect(output).not.toContain(`- [hephaestus.md]{${bundledRulePath}}`);
 	});
 
 	it("#given same project and bundled body #when SessionStart runs #then project rule file wins", async () => {
@@ -180,8 +176,7 @@ describe("plugin bundled rules", () => {
 		});
 
 		// then
-		expect(occurrenceCount(output, "- [hephaestus.md]{")).toBe(0);
-		expect(output).toContain(`Instructions from: ${projectRulePath}`);
+		expect(output).toContain(`${INSTRUCTIONS_FROM}${projectRulePath}`);
 		expect(output).toContain(SHARED_BODY);
 		expect(output).not.toContain(bundledRulePath);
 	});
@@ -207,7 +202,7 @@ describe("plugin bundled rules", () => {
 			pluginDataRoot: pluginData,
 			env: BUNDLED_ONLY_ENV,
 		});
-		expect(firstOutput).toContain(`Instructions from: ${bundledRulePath}`);
+		expect(firstOutput).toContain(`${INSTRUCTIONS_FROM}${bundledRulePath}`);
 		expect(firstOutput).toContain(BUNDLED_BODY);
 
 		// when
@@ -219,9 +214,8 @@ describe("plugin bundled rules", () => {
 
 		// then
 		expect(compactOutput).toBe("");
-		expect(output).toContain(`Instructions from: ${bundledRulePath}`);
+		expect(output).toContain(`${INSTRUCTIONS_FROM}${bundledRulePath}`);
 		expect(output).toContain(BUNDLED_BODY);
-		expect(output).not.toContain("[Truncated. Full:");
 	});
 
 	it("#given bundled Hephaestus rule body exceeds per-rule cap #when SessionStart runs #then static context expands the body within result budget", async () => {
@@ -232,7 +226,7 @@ describe("plugin bundled rules", () => {
 		tempDirectories.push(root, pluginRoot, pluginData);
 		writeFileSync(join(root, "package.json"), JSON.stringify({ name: "fixture" }));
 		mkdirSync(join(pluginRoot, "bundled-rules"), { recursive: true });
-		const oversizedBody = "The bundled craftsman discipline is non-negotiable. ".repeat(400);
+		const oversizedBody = "BUNDLED_OVERSIZE_SENTINEL_".repeat(500);
 		expect(oversizedBody.length).toBeGreaterThan(12000);
 		const tailMarker = "BUNDLED_TAIL_SENTINEL_LANDS_IN_FULL";
 		const bundledRulePath = join(pluginRoot, "bundled-rules", "hephaestus.md");
@@ -247,10 +241,9 @@ describe("plugin bundled rules", () => {
 		});
 
 		// then
-		expect(output).toContain(`Instructions from: ${bundledRulePath}`);
-		expect(output).toContain("The bundled craftsman discipline is non-negotiable.");
+		expect(output).toContain(`${INSTRUCTIONS_FROM}${bundledRulePath}`);
+		expect(output).toContain("BUNDLED_OVERSIZE_SENTINEL_");
 		expect(output).toContain(tailMarker);
-		expect(output).not.toContain("[Truncated. Full:");
 	});
 
 	it("#given project rule body exceeds per-rule cap #when SessionStart runs #then static context injects a truncated body", async () => {
@@ -262,7 +255,7 @@ describe("plugin bundled rules", () => {
 		writeFileSync(join(root, "package.json"), JSON.stringify({ name: "fixture" }));
 		mkdirSync(join(root, ".omo", "rules"), { recursive: true });
 		mkdirSync(join(pluginRoot, "bundled-rules"), { recursive: true });
-		const oversizedBody = "The project rule body is intentionally oversized for the cap test. ".repeat(300);
+		const oversizedBody = "PROJECT_OVERSIZE_SENTINEL_".repeat(500);
 		expect(oversizedBody.length).toBeGreaterThan(12000);
 		const tailMarker = "PROJECT_TAIL_SENTINEL_SHOULD_NOT_LAND";
 		const projectRulePath = join(root, ".omo", "rules", "oversized.md");
@@ -277,9 +270,8 @@ describe("plugin bundled rules", () => {
 		});
 
 		// then
-		expect(output).toContain(`Instructions from: ${projectRulePath}`);
-		expect(output).toContain("The project rule body is intentionally oversized for the cap test.");
-		expect(output).toContain("[Truncated. Full:");
+		expect(output).toContain(`${INSTRUCTIONS_FROM}${projectRulePath}`);
+		expect(output).toContain("PROJECT_OVERSIZE_SENTINEL_");
 		expect(output).not.toContain(tailMarker);
 	});
 });

package/packages/omo-codex/plugin/components/rules/test/codex-hook-post-compact-budget.test.ts

@@ -18,6 +18,10 @@ const PROJECT_RULES_ENV = {
 	CODEX_RULES_MAX_RULE_CHARS: "30000",
 };
 
+// Runtime sentinel: the rules hook emits and re-greps this marker when
+// deduplicating injected rules against the transcript (transcript-rule-filter.ts).
+const INSTRUCTIONS_FROM = "Instructions from: ";
+
 afterEach(() => {
 	for (const directory of tempDirectories.splice(0)) {
 		rmSync(directory, { recursive: true, force: true });
@@ -46,15 +50,13 @@ describe("codex rules post-compaction context budget", () => {
 		});
 
 		// then
-		expect(firstContext).toContain(`Instructions from: ${path.join(root, "CONTEXT.md")}`);
-		expect(firstContext).toContain("Project rule");
-		expect(firstContext).toContain("[Truncated. Full:");
+		expect(firstContext).toContain(`${INSTRUCTIONS_FROM}${path.join(root, "CONTEXT.md")}`);
+		expect(firstContext).toContain("CTX_OVERSIZE_SENTINEL");
+		expect(firstContext).not.toContain("CTX_TAIL_SENTINEL");
 		expect(firstContext.length).toBeLessThan(31_000);
 		const recoveryContext = readAdditionalContext(output);
-		expect(recoveryContext).toContain("MUST READ");
-		expect(recoveryContext).toContain("NO EXCUSES");
 		expect(recoveryContext).toContain(path.join(root, "CONTEXT.md"));
-		expect(recoveryContext).not.toContain("Project rule");
+		expect(recoveryContext).not.toContain("CTX_OVERSIZE_SENTINEL");
 		expect(recoveryContext.length).toBeLessThan(2_000);
 	});
 });
@@ -66,7 +68,7 @@ function makeOversizedProject(): { root: string; pluginData: string } {
 	writeFileSync(path.join(root, "package.json"), JSON.stringify({ name: "fixture" }));
 	writeFileSync(path.join(root, "AGENTS.md"), "Project AGENTS.md should stay Codex-native.");
 	writeFileSync(path.join(root, "CLAUDE.md"), "Project CLAUDE.md should stay outside rules hook context.");
-	writeFileSync(path.join(root, "CONTEXT.md"), `Project rule\n${"A".repeat(30_000)}`);
+	writeFileSync(path.join(root, "CONTEXT.md"), `CTX_OVERSIZE_SENTINEL\n${"A".repeat(30_000)}\nCTX_TAIL_SENTINEL`);
 	mkdirSync(path.join(root, ".omo", "rules"), { recursive: true });
 	writeFileSync(
 		path.join(root, ".omo", "rules", "typescript.md"),

package/packages/omo-codex/plugin/components/rules/test/codex-hook-post-compact-context.test.ts

@@ -38,7 +38,6 @@ describe("codex rules compacted context recovery", () => {
 		// then
 		const postCompactContext = readAdditionalContext(output);
 		expect(postCompactContext.length).toBeLessThan(2_000);
-		expect(postCompactContext).toContain("MUST READ");
 		expect(postCompactContext).toContain("CONTEXT.md");
 		expect(postCompactContext).not.toContain("Project rule");
 	});
@@ -65,7 +64,6 @@ describe("codex rules compacted context recovery", () => {
 		// then
 		const firstContext = readOptionalAdditionalContext(firstOutput);
 		expect(firstContext.length).toBeLessThan(1_000);
-		expect(firstContext).toContain("MUST READ");
 		expect(firstContext).toContain("CONTEXT.md");
 		expect(secondOutput).toBe("");
 	});
@@ -88,7 +86,6 @@ describe("codex rules compacted context recovery", () => {
 		// then
 		const context = readOptionalAdditionalContext(output);
 		expect(context.length).toBeLessThan(1_000);
-		expect(context).toContain("MUST READ");
 		expect(context).toContain("CONTEXT.md");
 	});
 
@@ -106,7 +103,6 @@ describe("codex rules compacted context recovery", () => {
 		// then
 		const context = readOptionalAdditionalContext(output);
 		expect(context.length).toBeLessThan(1_000);
-		expect(context).toContain("MUST READ");
 		expect(context).toContain("CONTEXT.md");
 	});
 
@@ -128,7 +124,6 @@ describe("codex rules compacted context recovery", () => {
 		// then
 		const context = readOptionalAdditionalContext(output);
 		expect(context.length).toBeLessThan(1_000);
-		expect(context).toContain("MUST READ");
 		expect(context).toContain("CONTEXT.md");
 	});
 
@@ -157,7 +152,6 @@ describe("codex rules compacted context recovery", () => {
 		const contexts = outputs.map(readOptionalAdditionalContext);
 		expect(contexts.filter((context) => context.length > 0)).toHaveLength(1);
 		expect(contexts.join("").length).toBeLessThan(1_000);
-		expect(contexts.join("")).toContain("MUST READ");
 		expect(contexts.join("")).toContain("CONTEXT.md");
 	});
 });

package/packages/omo-codex/plugin/components/rules/test/codex-hook-post-compact-dedup.test.ts

@@ -18,6 +18,10 @@ const PROJECT_ONLY_ENV = {
 	CODEX_RULES_ENABLED_SOURCES: "CONTEXT.md,.omo/rules",
 };
 
+// Runtime sentinel: the rules hook emits and re-greps this marker when
+// deduplicating injected rules against the transcript (transcript-rule-filter.ts).
+const INSTRUCTIONS_FROM = "Instructions from: ";
+
 afterEach(() => {
 	for (const directory of tempDirectories.splice(0)) {
 		rmSync(directory, { recursive: true, force: true });
@@ -114,9 +118,8 @@ describe("codex rules PostCompact deduplication", () => {
 
 		// then
 		const context = readAdditionalContext(output);
-		expect(context).toContain("MUST READ");
 		expect(context).toContain("CONTEXT.md");
-		expect(context).not.toContain("Instructions from:");
+		expect(context).not.toContain(INSTRUCTIONS_FROM);
 	});
 
 	it("#given startup static context dropped by compaction #when compact SessionStart runs after PostCompact #then it emits a mandatory read directive without rule bodies", async () => {
@@ -140,9 +143,8 @@ describe("codex rules PostCompact deduplication", () => {
 
 		// then
 		const context = readAdditionalContext(output);
-		expect(context).toContain("MUST READ");
 		expect(context).toContain("CONTEXT.md");
-		expect(context).not.toContain("Instructions from:");
+		expect(context).not.toContain(INSTRUCTIONS_FROM);
 	});
 });
 

package/packages/omo-codex/plugin/components/rules/test/codex-hook-post-compact-directive.test.ts

@@ -1,8 +1,9 @@
-import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { parseRule } from "@oh-my-opencode/rules-engine/engine";
 import { afterEach, describe, expect, it } from "vitest";
-
 import {
 	type CodexPostCompactInput,
 	type CodexPostToolUseInput,
@@ -20,6 +21,10 @@ const PROJECT_ONLY_ENV = {
 };
 const SESSION_ID = "session-post-compact-directive";
 
+// Runtime sentinel: the rules hook emits and re-greps this marker when
+// deduplicating injected rules against the transcript (transcript-rule-filter.ts).
+const INSTRUCTIONS_FROM = "Instructions from: ";
+
 afterEach(() => {
 	for (const directory of tempDirectories.splice(0)) {
 		rmSync(directory, { recursive: true, force: true });
@@ -48,10 +53,8 @@ describe("codex rules post-compaction read directive", () => {
 		});
 
 		// then
-		expect(dynamicOutput).toContain("TypeScript rule");
+		expect(dynamicOutput).toContain("TS_RULE_SENTINEL");
 		const context = readAdditionalContext(output);
-		expect(context).toContain("MUST READ");
-		expect(context).toContain("NO EXCUSES");
 		expect(context).toContain("CONTEXT.md");
 		expect(context).toContain(".omo/rules/typescript.md");
 		expect(context).not.toContain("A".repeat(50));
@@ -125,9 +128,9 @@ describe("codex rules post-compaction read directive", () => {
 
 		// then
 		const context = readAdditionalContext(output);
-		expect(context).toContain("You are Hephaestus");
-		expect(context).not.toContain("[Truncated. Full:");
-		expect(context).toContain("MUST READ");
+		const bundledRulePath = fileURLToPath(new URL("../bundled-rules/hephaestus/gpt-5.5.md", import.meta.url));
+		expect(context).toContain(`${INSTRUCTIONS_FROM}${bundledRulePath}`);
+		expect(context).toContain(parseRule(readFileSync(bundledRulePath, "utf8")).body.trim());
 		expect(context).toContain("CONTEXT.md");
 	});
 });
@@ -141,7 +144,7 @@ function makeProject(): { root: string; pluginData: string } {
 	mkdirSync(path.join(root, ".omo", "rules"), { recursive: true });
 	writeFileSync(
 		path.join(root, ".omo", "rules", "typescript.md"),
-		["---", 'globs: "**/*.ts"', "---", "", `TypeScript rule\n${"B".repeat(2_000)}`].join("\n"),
+		["---", 'globs: "**/*.ts"', "---", "", `TS_RULE_SENTINEL\n${"B".repeat(2_000)}`].join("\n"),
 	);
 	mkdirSync(path.join(root, "src"), { recursive: true });
 	writeFileSync(path.join(root, "src", "app.ts"), "export const app = 1;\n");

package/packages/omo-codex/plugin/components/rules/test/codex-hook.test.ts

@@ -77,6 +77,10 @@ const DYNAMIC_BUNDLED_ONLY_ENV = {
 	PLUGIN_ROOT: COMPONENT_ROOT,
 };
 
+// Runtime sentinel: the rules hook emits and re-greps this marker when
+// deduplicating injected rules against the transcript (transcript-rule-filter.ts).
+const INSTRUCTIONS_FROM = "Instructions from: ";
+
 afterEach(() => {
 	for (const directory of tempDirectories.splice(0)) {
 		rmSync(directory, { recursive: true, force: true });
@@ -88,20 +92,13 @@ function makeTempProject(): { root: string; pluginData: string } {
 	const pluginData = mkdtempSync(path.join(tmpdir(), "codex-rules-data-"));
 	tempDirectories.push(root, pluginData);
 	writeFileSync(path.join(root, "package.json"), JSON.stringify({ name: "fixture" }));
-	writeFileSync(path.join(root, "AGENTS.md"), "Project AGENTS.md should stay Codex-native.");
-	writeFileSync(path.join(root, "CLAUDE.md"), "Project CLAUDE.md should stay outside rules hook context.");
-	writeFileSync(path.join(root, "CONTEXT.md"), "Always wear safety goggles when refactoring.");
+	writeFileSync(path.join(root, "AGENTS.md"), "AGENTS_MD_SENTINEL");
+	writeFileSync(path.join(root, "CLAUDE.md"), "CLAUDE_MD_SENTINEL");
+	writeFileSync(path.join(root, "CONTEXT.md"), "CTX_RULE_SENTINEL");
 	mkdirSync(path.join(root, ".omo", "rules"), { recursive: true });
 	writeFileSync(
 		path.join(root, ".omo", "rules", "typescript.md"),
-		[
-			"---",
-			"description: TypeScript",
-			'globs: ["**/*.ts", "**/*.tsx"]',
-			"---",
-			"",
-			"Prefer strict TypeScript for all source files.",
-		].join("\n"),
+		["---", "description: TypeScript", 'globs: ["**/*.ts", "**/*.tsx"]', "---", "", "TS_RULE_SENTINEL"].join("\n"),
 	);
 	mkdirSync(path.join(root, "src"), { recursive: true });
 	writeFileSync(path.join(root, "src", "app.ts"), "export const app = true;\n");
@@ -224,11 +221,10 @@ describe("codex rules hooks", () => {
 		// then
 		const parsed = parseHookOutput(output);
 		expect(parsed.hookSpecificOutput?.hookEventName).toBe("SessionStart");
-		expect(parsed.hookSpecificOutput?.additionalContext).toContain("## Project Instructions");
 		expect(parsed.hookSpecificOutput?.additionalContext).toContain(
-			`Instructions from: ${path.join(root, "CONTEXT.md")}`,
+			`${INSTRUCTIONS_FROM}${path.join(root, "CONTEXT.md")}`,
 		);
-		expect(parsed.hookSpecificOutput?.additionalContext).toContain("Always wear safety goggles");
+		expect(parsed.hookSpecificOutput?.additionalContext).toContain("CTX_RULE_SENTINEL");
 	});
 
 	it("#given default auto sources #when SessionStart runs #then native Codex AGENTS.md is not duplicated", async () => {
@@ -242,11 +238,11 @@ describe("codex rules hooks", () => {
 
 		// then
 		const parsed = parseHookOutput(output);
-		expect(parsed.hookSpecificOutput?.additionalContext).toContain("## Project Instructions");
-		expect(parsed.hookSpecificOutput?.additionalContext).not.toContain("Project AGENTS.md should stay Codex-native.");
-		expect(parsed.hookSpecificOutput?.additionalContext).not.toContain(
-			"Project CLAUDE.md should stay outside rules hook context.",
+		expect(parsed.hookSpecificOutput?.additionalContext).toContain(
+			`${INSTRUCTIONS_FROM}${path.join(root, "CONTEXT.md")}`,
 		);
+		expect(parsed.hookSpecificOutput?.additionalContext).not.toContain("AGENTS_MD_SENTINEL");
+		expect(parsed.hookSpecificOutput?.additionalContext).not.toContain("CLAUDE_MD_SENTINEL");
 	});
 
 	it("#given project AGENTS.md #when SessionStart runs #then rules hook leaves AGENTS.md to Codex native handling", async () => {
@@ -320,9 +316,8 @@ describe("codex rules hooks", () => {
 		// then
 		expect(resumeOutput).toBe("");
 		const clearContext = parseHookOutput(clearOutput).hookSpecificOutput?.additionalContext ?? "";
-		expect(clearContext).toContain("## Project Instructions");
-		expect(clearContext).toContain(`Instructions from: ${path.join(root, "CONTEXT.md")}`);
-		expect(clearContext).toContain("Always wear safety goggles");
+		expect(clearContext).toContain(`${INSTRUCTIONS_FROM}${path.join(root, "CONTEXT.md")}`);
+		expect(clearContext).toContain("CTX_RULE_SENTINEL");
 	});
 
 	it("#given static context remains in transcript but cache is missing #when SessionStart runs #then it emits no duplicate context", async () => {
@@ -363,10 +358,8 @@ describe("codex rules hooks", () => {
 		// regression line: prior versions emitted "src\\app.ts" on Windows.
 		const parsed = parseHookOutput(output);
 		expect(parsed.hookSpecificOutput?.hookEventName).toBe("PostToolUse");
-		expect(parsed.hookSpecificOutput?.additionalContext).toContain(
-			"Additional project instructions matched for src/app.ts",
-		);
-		expect(parsed.hookSpecificOutput?.additionalContext).toContain("Prefer strict TypeScript");
+		expect(parsed.hookSpecificOutput?.additionalContext).toContain("src/app.ts");
+		expect(parsed.hookSpecificOutput?.additionalContext).toContain("TS_RULE_SENTINEL");
 		expect(parsed.hookSpecificOutput?.additionalContext ?? "").not.toContain("src\\app.ts");
 		expect(output).not.toContain("updatedMCPToolOutput");
 		expect(output).not.toContain("suppressOutput");
@@ -396,9 +389,9 @@ describe("codex rules hooks", () => {
 		const parsed = parseHookOutput(output);
 		const additionalContext = parsed.hookSpecificOutput?.additionalContext ?? "";
 		expect(parsed.hookSpecificOutput?.hookEventName).toBe("PostToolUse");
-		expect(additionalContext).toContain("Additional project instructions matched for src/app.ts");
+		expect(additionalContext).toContain("src/app.ts");
 		expect(additionalContext).not.toContain("src\\app.ts");
-		expect(occurrenceCount(additionalContext, "Prefer strict TypeScript")).toBe(1);
+		expect(occurrenceCount(additionalContext, "TS_RULE_SENTINEL")).toBe(1);
 	});
 
 	it("#given dynamic context already injected #when PostToolUse repeats #then emits no duplicate context", async () => {
@@ -437,10 +430,10 @@ describe("codex rules hooks", () => {
 		// then
 		const firstContext = parseHookOutput(firstOutput).hookSpecificOutput?.additionalContext ?? "";
 		const secondContext = parseHookOutput(secondOutput).hookSpecificOutput?.additionalContext ?? "";
-		expect(firstContext).toContain("based on GPT-5.5");
-		expect(firstContext).not.toContain("based on GPT-5.6");
-		expect(secondContext).toContain("based on GPT-5.6");
-		expect(secondContext).not.toContain("based on GPT-5.5");
+		expect(firstContext).toContain("bundled-rules/hephaestus/gpt-5.5.md");
+		expect(firstContext).not.toContain("bundled-rules/hephaestus/gpt-5.6.md");
+		expect(secondContext).toContain("bundled-rules/hephaestus/gpt-5.6.md");
+		expect(secondContext).not.toContain("bundled-rules/hephaestus/gpt-5.5.md");
 	});
 
 	it("#given default auto sources #when excluded AGENTS.md changes #then PostToolUse fingerprint stays stable", async () => {
@@ -496,7 +489,7 @@ describe("codex rules hooks", () => {
 		);
 
 		// then
-		expect(parseHookOutput(output).hookSpecificOutput?.additionalContext).toContain("Prefer strict TypeScript");
+		expect(parseHookOutput(output).hookSpecificOutput?.additionalContext).toContain("TS_RULE_SENTINEL");
 	});
 
 	it("#given cached dynamic target #when rule frontmatter changes #then PostToolUse rechecks the target", async () => {
@@ -505,15 +498,13 @@ describe("codex rules hooks", () => {
 		const filePath = path.join(root, "src", "app.ts");
 		const input = postToolUseInput(root, filePath);
 		await runPostToolUseHook(input, { pluginDataRoot: pluginData, env: RULES_ONLY_ENV });
-		writeTypeScriptRule(root, '"**/*.ts"', "Prefer readonly TypeScript after rule edits.");
+		writeTypeScriptRule(root, '"**/*.ts"', "TS_RULE_V2_SENTINEL");
 
 		// when
 		const output = await runPostToolUseHook(input, { pluginDataRoot: pluginData, env: RULES_ONLY_ENV });
 
 		// then
-		expect(parseHookOutput(output).hookSpecificOutput?.additionalContext).toContain(
-			"Prefer readonly TypeScript after rule edits.",
-		);
+		expect(parseHookOutput(output).hookSpecificOutput?.additionalContext).toContain("TS_RULE_V2_SENTINEL");
 	});
 
 	it("#given cached dynamic context #when PostCompact runs #then PostToolUse emits no duplicate dynamic context", async () => {
@@ -633,7 +624,7 @@ describe("codex rules hooks", () => {
 		});
 
 		// then
-		expect(parseHookOutput(output).hookSpecificOutput?.additionalContext).toContain("Prefer strict TypeScript");
+		expect(parseHookOutput(output).hookSpecificOutput?.additionalContext).toContain("TS_RULE_SENTINEL");
 	});
 
 	it("#given static-only mode #when PostToolUse runs #then emits no dynamic context", async () => {

package/packages/omo-codex/plugin/components/rules/test/dynamic-target-fingerprints.test.ts

@@ -1,10 +1,9 @@
 import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
+import { defaultConfig } from "@oh-my-opencode/rules-engine/engine";
 import { afterEach, describe, expect, it } from "vitest";
-
 import { fingerprintDynamicTargets } from "../src/dynamic-target-fingerprints.js";
-import { defaultConfig } from "@oh-my-opencode/rules-engine/engine";
 
 const tempDirectories: string[] = [];
 

package/packages/omo-codex/plugin/components/rules/test/engine.test.ts

@@ -1,10 +1,13 @@
 import { join } from "node:path";
+import type { RuleCandidate } from "@oh-my-opencode/rules-engine/engine";
+import {
+	createEngine,
+	defaultConfig,
+	matchRule as defaultMatchRule,
+	type EngineDeps,
+} from "@oh-my-opencode/rules-engine/engine";
 import { describe, expect, it } from "vitest";
-
 import { configFromEnvironment } from "../src/config.js";
-import { createEngine, defaultConfig, type EngineDeps } from "@oh-my-opencode/rules-engine/engine";
-import { matchRule as defaultMatchRule } from "@oh-my-opencode/rules-engine/engine";
-import type { RuleCandidate } from "@oh-my-opencode/rules-engine/engine";
 
 const projectRoot = "/tmp/codex-rules-engine";
 

package/packages/omo-codex/plugin/components/rules/test/finder.test.ts

@@ -1,10 +1,9 @@
 import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { afterEach, describe, expect, it } from "vitest";
-
-import { findRuleCandidates } from "@oh-my-opencode/rules-engine/engine";
 import type { RuleCandidate } from "@oh-my-opencode/rules-engine/engine";
+import { findRuleCandidates } from "@oh-my-opencode/rules-engine/engine";
+import { afterEach, describe, expect, it } from "vitest";
 
 const tempDirectories: string[] = [];