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

package/packages/omo-codex/plugin/components/lsp/dist/daemon-cli-path.js

@@ -2,7 +2,7 @@ import { existsSync, readFileSync } from "node:fs";
 import { createRequire } from "node:module";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
-import { OMO_LSP_DAEMON_CLI, OMO_LSP_DAEMON_VERSION, resolveDaemonRuntime, } from "@code-yeongyu/lsp-daemon/client";
+import { OMO_LSP_DAEMON_CLI, OMO_LSP_DAEMON_VERSION, resolveDaemonRuntime } from "@code-yeongyu/lsp-daemon/client";
 const requireFromHere = createRequire(import.meta.url);
 const PACKAGE_LSP_DAEMON_CLI = "@code-yeongyu/lsp-daemon/cli";
 export function ensureLspDaemonCliEnv(env = process.env) {

package/packages/omo-codex/plugin/components/lsp/hooks/hooks.json

@@ -8,7 +8,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/dist/cli.js\" hook post-tool-use",
 						"timeout": 60,
-						"statusMessage": "(OmO 5.0.0-beta.3) Checking LSP Diagnostics"
+						"statusMessage": "(OmO 5.0.0-beta.31) Checking LSP Diagnostics"
 					}
 				]
 			}
@@ -21,7 +21,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/dist/cli.js\" hook post-compact",
 						"timeout": 5,
-						"statusMessage": "(OmO 5.0.0-beta.3) Resetting LSP Diagnostics Cache"
+						"statusMessage": "(OmO 5.0.0-beta.31) Resetting LSP Diagnostics Cache"
 					}
 				]
 			}

package/packages/omo-codex/plugin/components/lsp/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@code-yeongyu/codex-lsp",
-	"version": "5.0.0-beta.3",
+	"version": "5.0.0-beta.31",
 	"description": "Codex plugin that exposes Language Server Protocol tools and post-edit diagnostics.",
 	"type": "module",
 	"packageManager": "npm@11.12.1",
@@ -54,10 +54,10 @@
 		"@code-yeongyu/lsp-daemon": "file:../../../../lsp-daemon"
 	},
 	"devDependencies": {
-		"@biomejs/biome": "2.4.16",
-		"@types/node": "^25.9.3",
-		"typescript": "^6.0.3",
-		"vitest": "^4.1.8"
+		"@biomejs/biome": "2.5.9",
+		"@types/node": "^26.2.0",
+		"typescript": "^7.0.2",
+		"vitest": "^4.1.11"
 	},
 	"engines": {
 		"node": ">=20.0.0"

package/packages/omo-codex/plugin/components/lsp/src/cli.ts

@@ -33,7 +33,7 @@ main().catch((error: unknown) => {
 
 async function runPackageLspMcpCli(): Promise<void> {
 	const cliPath = resolveLspDaemonCliPath();
-	const child = spawn(execPath, [cliPath, "mcp"], { stdio: "inherit" });
+	const child = spawn(execPath, [cliPath, "mcp"], { stdio: "inherit", windowsHide: true });
 	await new Promise<void>((resolve, reject) => {
 		child.once("error", reject);
 		child.once("exit", (code, signal) => {

package/packages/omo-codex/plugin/components/lsp/src/codex-hook.ts

@@ -4,7 +4,7 @@ import { join, resolve } from "node:path";
 
 import { callDiagnosticsViaDaemon } from "@code-yeongyu/lsp-daemon/client";
 import { collectPostEditDiagnostics, type PostEditDiagnosticsOutcome } from "@oh-my-opencode/lsp-core/post-edit";
-import { parseLspRequestContext, type LspRequestContext } from "@oh-my-opencode/lsp-core/request-context";
+import { type LspRequestContext, parseLspRequestContext } from "@oh-my-opencode/lsp-core/request-context";
 
 import { ensureLspDaemonCliEnv } from "./daemon-cli-path.js";
 import {

package/packages/omo-codex/plugin/components/lsp/src/daemon-cli-path.ts

@@ -3,11 +3,7 @@ import { createRequire } from "node:module";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 
-import {
-	OMO_LSP_DAEMON_CLI,
-	OMO_LSP_DAEMON_VERSION,
-	resolveDaemonRuntime,
-} from "@code-yeongyu/lsp-daemon/client";
+import { OMO_LSP_DAEMON_CLI, OMO_LSP_DAEMON_VERSION, resolveDaemonRuntime } from "@code-yeongyu/lsp-daemon/client";
 
 const requireFromHere = createRequire(import.meta.url);
 

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

@@ -1,9 +1,8 @@
 import { mkdtempSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
-
-import { afterEach, describe, expect, it } from "vitest";
 import type { PostEditDiagnosticsOutcome } from "@oh-my-opencode/lsp-core/post-edit";
+import { afterEach, describe, expect, it } from "vitest";
 
 import { runLspPostCompactHook, runLspPostToolUseHook } from "../src/codex-hook.js";
 
@@ -149,11 +148,11 @@ describe("codex PostToolUse unavailable LSP suppression", () => {
 		const input = postToolUseInput("session-daemon-down-probe", ".omo/ulw-loop/evidence/note.md");
 		let calls = 0;
 
-			await withPluginData(pluginData, async () => {
-				await runLspPostToolUseHook(input, async () => {
-					calls += 1;
-					return markdownNotConfigured();
-				});
+		await withPluginData(pluginData, async () => {
+			await runLspPostToolUseHook(input, async () => {
+				calls += 1;
+				return markdownNotConfigured();
+			});
 			await runLspPostToolUseHook(input, async () => {
 				calls += 1;
 				return "error[markdown] (1000) at 1:1: cached call should have been skipped.";

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

@@ -1,9 +1,8 @@
 import { mkdtempSync, realpathSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
-
-import { afterEach, describe, expect, it } from "vitest";
 import type { PostEditDiagnosticsOutcome } from "@oh-my-opencode/lsp-core/post-edit";
+import { afterEach, describe, expect, it } from "vitest";
 
 import { codexLspRequestContext, extractMutatedFilePaths, runLspPostToolUseHook } from "../src/codex-hook.js";
 

package/packages/omo-codex/plugin/components/lsp/test/package-smoke.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest";
 import {
 	listDirectoryEntries,
 	readHooksJson,
+	readJsonFile,
 	readMcpJson,
 	readPackageJson,
 	readTextFile,
@@ -44,7 +45,16 @@ describe("plugin package metadata", () => {
 		expect(postCompactCommand).toBe(`node "${pluginRoot}/dist/cli.js" hook post-compact`);
 		expect(lspServer?.command).toBe("node");
 		expect(lspServer?.args).toEqual(["../../../../lsp-daemon/dist/cli.js", "mcp"]);
-		expect(lspServer?.startup_timeout_sec).toBe(10);
+		expect(readJsonFile(".mcp.json")).toEqual({
+			mcpServers: {
+				lsp: {
+					command: "node",
+					args: ["../../../../lsp-daemon/dist/cli.js", "mcp"],
+					cwd: ".",
+					startup_timeout_sec: 10,
+				},
+			},
+		});
 		expect(cliSource).not.toContain("./lazy-lsp-mcp.js");
 		expect(cliSource).toContain("resolveLspDaemonCliPath");
 		expect(daemonCliPathSource).toContain("@code-yeongyu/lsp-daemon/cli");

package/packages/omo-codex/plugin/components/rules/AGENTS.md

@@ -10,6 +10,17 @@ Conventions for human contributors and AI agents working on this repository.
 - Tabs for indentation. Double quotes for strings.
 - Tests use vitest with `#given .. #when .. #then` descriptions or plain `// given / // when / // then` body comments.
 
+## Layout
+
+- `src/cli.ts`: bin `omo-rules`; routes `hook session-start` / `hook user-prompt-submit` / `hook post-tool-use` / `hook post-compact`.
+- `src/codex-hook.ts`: the four lifecycle hook functions (`runSessionStartHook`, `runUserPromptSubmitHook`, `runPostToolUseHook`, `runPostCompactHook`) — config, engine load, budgets, dedup, output formatting. Main behavioral hotspot.
+- `src/persistent-cache.ts` + `src/session-state-lock.ts`: persisted static/dynamic dedup, target fingerprints, post-compact claims (`withPostCompactBudget`, `claimPostCompactPending`), `withSessionStateLock` (`SESSION_STATE_LOCK_CONTENDED`).
+- `src/tool-paths.ts`: Codex file path extraction for reads, edits, `apply_patch`, shell-style tools (`extractCodexToolPaths`).
+- `src/transcript-search.ts` / `src/transcript-rule-filter.ts`: transcript scanning and filtering.
+- `src/rules-engine-factory.ts`: bridges `@oh-my-opencode/rules-engine` (discovery, parsing, matching, config).
+- `bundled-rules/`: shipped Markdown rules (`hephaestus/`, `windows-git-bash.md`); ordering and platform candidates pinned by tests.
+- `hooks/hooks.json`: registration. `scripts/bench-codex-rules.mjs`: benchmark.
+
 ## Commands
 
 - `npm install` - install dependencies.
@@ -17,6 +28,7 @@ Conventions for human contributors and AI agents working on this repository.
 - `npm run typecheck` - strict TypeScript check.
 - `npm run check` - type check, biome, and build.
 - `npm pack --dry-run` - release package smoke test.
+- `npm run bench` - builds then runs the rules benchmark (`node scripts/bench-codex-rules.mjs`).
 - `node dist/cli.js hook session-start < fixture.json` - smoke-test static rule injection.
 - `node dist/cli.js hook post-tool-use < fixture.json` - smoke-test dynamic rule injection.
 

package/packages/omo-codex/plugin/components/rules/biome.json

@@ -1,9 +1,9 @@
 {
-	"$schema": "https://biomejs.dev/schemas/2.4.15/schema.json",
+	"$schema": "https://biomejs.dev/schemas/2.5.9/schema.json",
 	"linter": {
 		"enabled": true,
 		"rules": {
-			"recommended": true,
+			"preset": "recommended",
 			"style": {
 				"noDefaultExport": "error",
 				"noEnum": "error",

package/packages/omo-codex/plugin/components/rules/dist/cli.js

@@ -19,20 +19,22 @@ var __toESM = (mod, isNodeMode, target) => {
   }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
-  for (let key of __getOwnPropNames(mod))
-    if (!__hasOwnProp.call(to, key))
-      __defProp(to, key, {
-        get: __accessProp.bind(mod, key),
-        enumerable: true
-      });
+  if (mod && typeof mod === "object" || typeof mod === "function") {
+    for (let key of __getOwnPropNames(mod))
+      if (!__hasOwnProp.call(to, key))
+        __defProp(to, key, {
+          get: __accessProp.bind(mod, key),
+          enumerable: true
+        });
+  }
   if (canCache)
     cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
 
-// ../../../node_modules/.bun/picomatch@4.0.5/node_modules/picomatch/lib/constants.js
-var require_constants = __commonJS((exports, module) => {
+// ../../../node_modules/.bun/picomatch@4.0.7/node_modules/picomatch/lib/constants.js
+var require_constants = __commonJS(function(exports, module) {
   var WIN_SLASH = "\\\\/";
   var WIN_NO_SLASH = `[^${WIN_SLASH}]`;
   var DEFAULT_MAX_EXTGLOB_RECURSION = 0;
@@ -176,8 +178,8 @@ var require_constants = __commonJS((exports, module) => {
   };
 });
 
-// ../../../node_modules/.bun/picomatch@4.0.5/node_modules/picomatch/lib/utils.js
-var require_utils = __commonJS((exports) => {
+// ../../../node_modules/.bun/picomatch@4.0.7/node_modules/picomatch/lib/utils.js
+var require_utils = __commonJS(function(exports) {
   var {
     REGEX_BACKSLASH,
     REGEX_REMOVE_BACKSLASH,
@@ -239,8 +241,8 @@ var require_utils = __commonJS((exports) => {
   };
 });
 
-// ../../../node_modules/.bun/picomatch@4.0.5/node_modules/picomatch/lib/scan.js
-var require_scan = __commonJS((exports, module) => {
+// ../../../node_modules/.bun/picomatch@4.0.7/node_modules/picomatch/lib/scan.js
+var require_scan = __commonJS(function(exports, module) {
   var utils = require_utils();
   var {
     CHAR_ASTERISK,
@@ -270,7 +272,7 @@ var require_scan = __commonJS((exports, module) => {
   var scan = (input, options) => {
     const opts = options || {};
     const length = input.length - 1;
-    const scanToEnd = opts.parts === true || opts.scanToEnd === true;
+    const scanToEnd = opts.parts === true || opts.tokens === true || opts.scanToEnd === true;
     const slashes = [];
     const tokens = [];
     const parts = [];
@@ -377,14 +379,18 @@ var require_scan = __commonJS((exports, module) => {
             negatedExtglob = true;
           }
           if (scanToEnd === true) {
+            let parens = 0;
             while (eos() !== true && (code = advance())) {
               if (code === CHAR_BACKWARD_SLASH) {
                 backslashes = token.backslashes = true;
-                code = advance();
+                advance();
                 continue;
               }
-              if (code === CHAR_RIGHT_PARENTHESES) {
-                isGlob = token.isGlob = true;
+              if (code === CHAR_LEFT_PARENTHESES) {
+                parens++;
+                continue;
+              }
+              if (code === CHAR_RIGHT_PARENTHESES && --parens === 0) {
                 finished = true;
                 break;
               }
@@ -439,13 +445,18 @@ var require_scan = __commonJS((exports, module) => {
       if (opts.noparen !== true && code === CHAR_LEFT_PARENTHESES) {
         isGlob = token.isGlob = true;
         if (scanToEnd === true) {
+          let parens = 1;
           while (eos() !== true && (code = advance())) {
-            if (code === CHAR_LEFT_PARENTHESES) {
+            if (code === CHAR_BACKWARD_SLASH) {
               backslashes = token.backslashes = true;
-              code = advance();
+              advance();
+              continue;
+            }
+            if (code === CHAR_LEFT_PARENTHESES) {
+              parens++;
               continue;
             }
-            if (code === CHAR_RIGHT_PARENTHESES) {
+            if (code === CHAR_RIGHT_PARENTHESES && --parens === 0) {
               finished = true;
               break;
             }
@@ -519,32 +530,31 @@ var require_scan = __commonJS((exports, module) => {
     if (opts.parts === true || opts.tokens === true) {
       let prevIndex;
       for (let idx = 0;idx < slashes.length; idx++) {
-        const n = prevIndex ? prevIndex + 1 : start;
+        const n2 = prevIndex !== undefined ? prevIndex + 1 : start;
         const i = slashes[idx];
-        const value = input.slice(n, i);
+        const value2 = input.slice(n2, i);
         if (opts.tokens) {
           if (idx === 0 && start !== 0) {
             tokens[idx].isPrefix = true;
             tokens[idx].value = prefix;
           } else {
-            tokens[idx].value = value;
+            tokens[idx].value = value2;
           }
           depth(tokens[idx]);
           state.maxDepth += tokens[idx].depth;
         }
-        if (idx !== 0 || value !== "") {
-          parts.push(value);
+        if (i >= start) {
+          parts.push(value2);
+          prevIndex = i;
         }
-        prevIndex = i;
       }
-      if (prevIndex && prevIndex + 1 < input.length) {
-        const value = input.slice(prevIndex + 1);
-        parts.push(value);
-        if (opts.tokens) {
-          tokens[tokens.length - 1].value = value;
-          depth(tokens[tokens.length - 1]);
-          state.maxDepth += tokens[tokens.length - 1].depth;
-        }
+      const n = prevIndex !== undefined ? prevIndex + 1 : start;
+      const value = input.slice(n);
+      parts.push(value);
+      if (opts.tokens && prevIndex && prevIndex + 1 < input.length) {
+        tokens[tokens.length - 1].value = value;
+        depth(tokens[tokens.length - 1]);
+        state.maxDepth += tokens[tokens.length - 1].depth;
       }
       state.slashes = slashes;
       state.parts = parts;
@@ -554,8 +564,8 @@ var require_scan = __commonJS((exports, module) => {
   module.exports = scan;
 });
 
-// ../../../node_modules/.bun/picomatch@4.0.5/node_modules/picomatch/lib/parse.js
-var require_parse = __commonJS((exports, module) => {
+// ../../../node_modules/.bun/picomatch@4.0.7/node_modules/picomatch/lib/parse.js
+var require_parse = __commonJS(function(exports, module) {
   var constants = require_constants();
   var utils = require_utils();
   var {
@@ -1386,6 +1396,7 @@ var require_parse = __commonJS((exports, module) => {
           rest = rest.slice(3);
           consume("/**", 3);
         }
+        const isEnd = eos() || state.parens > 0 && rest === ")".repeat(state.parens) && !extglobs.some((extglob) => extglob.type === "negate");
         if (prior.type === "bos" && eos()) {
           prev.type = "globstar";
           prev.value += value;
@@ -1395,7 +1406,7 @@ var require_parse = __commonJS((exports, module) => {
           consume(value);
           continue;
         }
-        if (prior.type === "slash" && prior.prev.type !== "bos" && !afterStar && eos()) {
+        if (prior.type === "slash" && prior.prev.type !== "bos" && !afterStar && isEnd) {
           state.output = state.output.slice(0, -(prior.output + prev.output).length);
           prior.output = `(?:${prior.output}`;
           prev.type = "globstar";
@@ -1573,8 +1584,8 @@ var require_parse = __commonJS((exports, module) => {
   module.exports = parse;
 });
 
-// ../../../node_modules/.bun/picomatch@4.0.5/node_modules/picomatch/lib/picomatch.js
-var require_picomatch = __commonJS((exports, module) => {
+// ../../../node_modules/.bun/picomatch@4.0.7/node_modules/picomatch/lib/picomatch.js
+var require_picomatch = __commonJS(function(exports, module) {
   var scan = require_scan();
   var parse = require_parse();
   var utils = require_utils();
@@ -1713,8 +1724,8 @@ var require_picomatch = __commonJS((exports, module) => {
   module.exports = picomatch;
 });
 
-// ../../../node_modules/.bun/picomatch@4.0.5/node_modules/picomatch/index.js
-var require_picomatch2 = __commonJS((exports, module) => {
+// ../../../node_modules/.bun/picomatch@4.0.7/node_modules/picomatch/index.js
+var require_picomatch2 = __commonJS(function(exports, module) {
   var pico = require_picomatch();
   var utils = require_utils();
   function picomatch(glob, options, returnState = false) {
@@ -3871,19 +3882,23 @@ var POST_COMPACT_MIN_RESERVED_TOKENS = 8000;
 var POST_COMPACT_MIN_GUIDE_CHARS = 500;
 var FALLBACK_CONTEXT_WINDOW_TOKENS = 200000;
 var MODEL_CONTEXT_BUDGETS = [
-  { slug: "gpt-5.6-sol", contextWindowTokens: 372000, effectivePercent: DEFAULT_EFFECTIVE_CONTEXT_WINDOW_PERCENT },
+  { slug: "gpt-5.6-sol", contextWindowTokens: 650000, effectivePercent: DEFAULT_EFFECTIVE_CONTEXT_WINDOW_PERCENT },
   {
     slug: "gpt-5.6-terra",
-    contextWindowTokens: 372000,
+    contextWindowTokens: 650000,
     effectivePercent: DEFAULT_EFFECTIVE_CONTEXT_WINDOW_PERCENT
   },
   {
     slug: "gpt-5.6-luna",
-    contextWindowTokens: 372000,
+    contextWindowTokens: 650000,
     effectivePercent: DEFAULT_EFFECTIVE_CONTEXT_WINDOW_PERCENT
   },
   { slug: "gpt-5.5", contextWindowTokens: 272000, effectivePercent: DEFAULT_EFFECTIVE_CONTEXT_WINDOW_PERCENT },
-  { slug: "gpt-5.6-luna-fast", contextWindowTokens: 272000, effectivePercent: DEFAULT_EFFECTIVE_CONTEXT_WINDOW_PERCENT },
+  {
+    slug: "gpt-5.6-luna-fast",
+    contextWindowTokens: 272000,
+    effectivePercent: DEFAULT_EFFECTIVE_CONTEXT_WINDOW_PERCENT
+  },
   {
     slug: "codex-auto-review",
     contextWindowTokens: 272000,
@@ -4146,7 +4161,7 @@ function recoverDynamicRulePaths(engine, transcriptText, staticRules) {
       if (staticRulePaths.has(rulePath)) {
         continue;
       }
-      if (transcriptText !== null && transcriptText.includes(rulePath)) {
+      if (transcriptText?.includes(rulePath)) {
         continue;
       }
       if (!existsSync4(rulePath)) {

package/packages/omo-codex/plugin/components/rules/hooks/hooks.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/dist/cli.js\" hook session-start",
 						"timeout": 10,
-						"statusMessage": "(OmO 5.0.0-beta.3) Loading Project Rules"
+						"statusMessage": "(OmO 5.0.0-beta.31) Loading Project Rules"
 					}
 				]
 			}
@@ -19,7 +19,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/dist/cli.js\" hook user-prompt-submit",
 						"timeout": 10,
-						"statusMessage": "(OmO 5.0.0-beta.3) Loading Project Rules"
+						"statusMessage": "(OmO 5.0.0-beta.31) Loading Project Rules"
 					}
 				]
 			}
@@ -32,7 +32,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/dist/cli.js\" hook post-tool-use",
 						"timeout": 10,
-						"statusMessage": "(OmO 5.0.0-beta.3) Matching Project Rules"
+						"statusMessage": "(OmO 5.0.0-beta.31) Matching Project Rules"
 					}
 				]
 			}
@@ -45,7 +45,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/dist/cli.js\" hook post-compact",
 						"timeout": 10,
-						"statusMessage": "(OmO 5.0.0-beta.3) Resetting Project Rule Cache"
+						"statusMessage": "(OmO 5.0.0-beta.31) Resetting Project Rule Cache"
 					}
 				]
 			}

package/packages/omo-codex/plugin/components/rules/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@code-yeongyu/codex-rules",
-	"version": "5.0.0-beta.3",
+	"version": "5.0.0-beta.31",
 	"description": "Codex plugin that injects project rule files into model context through lifecycle hooks.",
 	"type": "module",
 	"packageManager": "npm@11.12.1",
@@ -47,15 +47,15 @@
 		"check": "tsc --noEmit && biome check . && npm run build"
 	},
 	"dependencies": {
-		"picomatch": "^4.0.3"
+		"picomatch": "^4.0.7"
 	},
 	"devDependencies": {
 		"@oh-my-opencode/rules-engine": "file:../../../../rules-engine",
-		"@biomejs/biome": "2.4.16",
-		"@types/node": "^25.9.3",
-		"@types/picomatch": "^4.0.0",
-		"typescript": "^6.0.3",
-		"vitest": "^4.1.8"
+		"@biomejs/biome": "2.5.9",
+		"@types/node": "^26.2.0",
+		"@types/picomatch": "^4.0.3",
+		"typescript": "^7.0.2",
+		"vitest": "^4.1.11"
 	},
 	"engines": {
 		"node": ">=20.0.0"

package/packages/omo-codex/plugin/components/rules/src/config.ts

@@ -1,6 +1,5 @@
-import { SOURCE_PRIORITY } from "@oh-my-opencode/rules-engine/engine";
-import { defaultConfig } from "@oh-my-opencode/rules-engine/engine";
 import type { PiRulesConfig, RuleSource } from "@oh-my-opencode/rules-engine/engine";
+import { defaultConfig, SOURCE_PRIORITY } from "@oh-my-opencode/rules-engine/engine";
 
 export function configFromEnvironment(env: NodeJS.ProcessEnv = process.env): PiRulesConfig {
 	const config = defaultConfig();

package/packages/omo-codex/plugin/components/rules/src/persistent-cache.ts

@@ -1,7 +1,7 @@
 import { mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
-
+import type { Engine } from "@oh-my-opencode/rules-engine/engine";
 import {
 	type PostCompactPendingKind,
 	type PostCompactPendingState,
@@ -9,7 +9,6 @@ import {
 	postCompactPendingKinds,
 	postCompactRecoveringKinds,
 } from "./post-compact-state.js";
-import type { Engine } from "@oh-my-opencode/rules-engine/engine";
 import { SESSION_STATE_LOCK_CONTENDED, withSessionStateLock } from "./session-state-lock.js";
 
 export type PostCompactClaimResult = "claimed" | "not-pending" | "contended";

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

@@ -1,5 +1,5 @@
-import { hasContextPressureMarker } from "./context-pressure.js";
 import type { PiRulesConfig } from "@oh-my-opencode/rules-engine/engine";
+import { hasContextPressureMarker } from "./context-pressure.js";
 import { readTranscriptSearchText } from "./transcript-search.js";
 
 export interface PostCompactBudgetContext {
@@ -21,19 +21,23 @@ const POST_COMPACT_MIN_RESERVED_TOKENS = 8_000;
 const POST_COMPACT_MIN_GUIDE_CHARS = 500;
 const FALLBACK_CONTEXT_WINDOW_TOKENS = 200_000;
 const MODEL_CONTEXT_BUDGETS: readonly ModelContextBudget[] = [
-	{ slug: "gpt-5.6-sol", contextWindowTokens: 372_000, effectivePercent: DEFAULT_EFFECTIVE_CONTEXT_WINDOW_PERCENT },
+	{ slug: "gpt-5.6-sol", contextWindowTokens: 650_000, effectivePercent: DEFAULT_EFFECTIVE_CONTEXT_WINDOW_PERCENT },
 	{
 		slug: "gpt-5.6-terra",
-		contextWindowTokens: 372_000,
+		contextWindowTokens: 650_000,
 		effectivePercent: DEFAULT_EFFECTIVE_CONTEXT_WINDOW_PERCENT,
 	},
 	{
 		slug: "gpt-5.6-luna",
-		contextWindowTokens: 372_000,
+		contextWindowTokens: 650_000,
 		effectivePercent: DEFAULT_EFFECTIVE_CONTEXT_WINDOW_PERCENT,
 	},
 	{ slug: "gpt-5.5", contextWindowTokens: 272_000, effectivePercent: DEFAULT_EFFECTIVE_CONTEXT_WINDOW_PERCENT },
-	{ slug: "gpt-5.6-luna-fast", contextWindowTokens: 272_000, effectivePercent: DEFAULT_EFFECTIVE_CONTEXT_WINDOW_PERCENT },
+	{
+		slug: "gpt-5.6-luna-fast",
+		contextWindowTokens: 272_000,
+		effectivePercent: DEFAULT_EFFECTIVE_CONTEXT_WINDOW_PERCENT,
+	},
 	{
 		slug: "codex-auto-review",
 		contextWindowTokens: 272_000,

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

@@ -1,11 +1,8 @@
 import { readFileSync } from "node:fs";
 import { dirname } from "node:path";
 import { fileURLToPath } from "node:url";
-
+import { createEngine, findProjectRoot, findRuleCandidates } from "@oh-my-opencode/rules-engine/engine";
 import { configFromEnvironment } from "./config.js";
-import { createEngine } from "@oh-my-opencode/rules-engine/engine";
-import { findRuleCandidates } from "@oh-my-opencode/rules-engine/engine";
-import { findProjectRoot } from "@oh-my-opencode/rules-engine/engine";
 
 interface RulesEngineFactoryOptions {
 	env?: NodeJS.ProcessEnv;

package/packages/omo-codex/plugin/components/rules/src/static-injection.ts

@@ -1,5 +1,6 @@
 import { existsSync } from "node:fs";
-
+import type { Engine, LoadedRule, PiRulesConfig } from "@oh-my-opencode/rules-engine/engine";
+import { isNeverTruncatedRule } from "@oh-my-opencode/rules-engine/engine";
 import type { CodexRulesHookOptions } from "./codex-hook-options.js";
 import { configFromEnvironment } from "./config.js";
 import { withPromptBudget } from "./event-budget.js";
@@ -7,9 +8,6 @@ import { formatAdditionalContextOutput } from "./hook-output.js";
 import { completePostCompactRecovery, hydrateEngineState, persistEngineState } from "./persistent-cache.js";
 import { withPostCompactBudget } from "./post-compact-budget.js";
 import { buildPostCompactReadDirective } from "./post-compact-directive.js";
-import type { Engine } from "@oh-my-opencode/rules-engine/engine";
-import { isNeverTruncatedRule } from "@oh-my-opencode/rules-engine/engine";
-import type { LoadedRule, PiRulesConfig } from "@oh-my-opencode/rules-engine/engine";
 import { createRulesEngine } from "./rules-engine-factory.js";
 import { filterRulesAlreadyInTranscript, filterRulesNotInTranscriptText } from "./transcript-rule-filter.js";
 import type { TranscriptSearchOptions } from "./transcript-search.js";
@@ -120,10 +118,7 @@ function runPostCompactRecovery(input: PostCompactRecoveryInput): string {
 		engine.markStaticInjected(rule);
 	}
 	persistEngineState(engine, input.cachePath, input.channel);
-	return formatAdditionalContextOutput(
-		input.eventName,
-		combineStaticContext(bodyBlock, directive),
-	);
+	return formatAdditionalContextOutput(input.eventName, combineStaticContext(bodyBlock, directive));
 }
 
 function readRecoveryTranscriptText(transcriptPath: string | null): string | null {
@@ -153,7 +148,7 @@ function recoverDynamicRulePaths(
 			if (staticRulePaths.has(rulePath)) {
 				continue;
 			}
-			if (transcriptText !== null && transcriptText.includes(rulePath)) {
+			if (transcriptText?.includes(rulePath)) {
 				continue;
 			}
 			if (!existsSync(rulePath)) {