oh-my-opencode 4.7.4 → 4.8.0

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

@@ -0,0 +1,271 @@
+import { RuleFrontmatterParseError } from "./errors.js";
+import type { RuleFrontmatter } from "./types.js";
+
+type ParsedGlobValue = {
+	readonly values: readonly string[];
+	readonly consumed: number;
+};
+
+export function parseYamlFrontmatter(yamlContent: string): RuleFrontmatter {
+	const lines = yamlContent.replace(/\r\n/g, "\n").split("\n");
+	const frontmatter: RuleFrontmatter = {};
+	const globValues: string[] = [];
+	const seenGlobs = new Set<string>();
+	let lineIndex = 0;
+
+	while (lineIndex < lines.length) {
+		const rawLine = lines[lineIndex];
+		if (rawLine === undefined) break;
+
+		const line = stripComment(rawLine).trim();
+		if (line.length === 0) {
+			lineIndex += 1;
+			continue;
+		}
+
+		const colonIndex = line.indexOf(":");
+		if (colonIndex === -1) {
+			throw new RuleFrontmatterParseError(`Expected key-value pair on line ${lineIndex + 1}`);
+		}
+
+		const key = line.slice(0, colonIndex).trim();
+		const rawValue = line.slice(colonIndex + 1).trim();
+
+		if (key === "description") {
+			frontmatter.description = parseStringValue(rawValue);
+			lineIndex += 1;
+			continue;
+		}
+
+		if (key === "alwaysApply") {
+			frontmatter.alwaysApply = parseBooleanValue(rawValue, lineIndex + 1);
+			lineIndex += 1;
+			continue;
+		}
+
+		if (key === "globs" || key === "paths" || key === "applyTo") {
+			const parsed = parseGlobValue(rawValue, lines, lineIndex);
+			for (const glob of parsed.values) {
+				if (!seenGlobs.has(glob)) {
+					seenGlobs.add(glob);
+					globValues.push(glob);
+				}
+			}
+			lineIndex += parsed.consumed;
+			continue;
+		}
+
+		lineIndex += 1;
+	}
+
+	const singleGlob = globValues[0];
+	if (globValues.length === 1 && singleGlob !== undefined) {
+		frontmatter.globs = singleGlob;
+	} else if (globValues.length > 1) {
+		frontmatter.globs = globValues;
+	}
+
+	return frontmatter;
+}
+
+function parseBooleanValue(value: string, lineNumber: number): boolean {
+	if (value === "true") return true;
+	if (value === "false") return false;
+	throw new RuleFrontmatterParseError(`Expected boolean on line ${lineNumber}`);
+}
+
+function parseGlobValue(rawValue: string, lines: readonly string[], lineIndex: number): ParsedGlobValue {
+	if (rawValue.startsWith("[")) {
+		return { values: parseInlineArray(rawValue), consumed: 1 };
+	}
+
+	if (rawValue.length === 0) {
+		return parseMultilineArray(lines, lineIndex);
+	}
+
+	const quotedScalar = isQuotedScalar(rawValue);
+	const value = parseStringValue(rawValue);
+	if (!quotedScalar && value.includes(",")) {
+		return {
+			values: value
+				.split(",")
+				.map((item) => item.trim())
+				.filter(Boolean),
+			consumed: 1,
+		};
+	}
+
+	return { values: [value], consumed: 1 };
+}
+
+function isQuotedScalar(value: string): boolean {
+	return value.startsWith('"') || value.startsWith("'");
+}
+
+function parseMultilineArray(lines: readonly string[], lineIndex: number): ParsedGlobValue {
+	const values: string[] = [];
+	let consumed = 1;
+
+	for (let index = lineIndex + 1; index < lines.length; index += 1) {
+		const rawLine = lines[index];
+		if (rawLine === undefined) break;
+
+		const lineWithoutComment = stripComment(rawLine);
+		if (lineWithoutComment.trim().length === 0) {
+			consumed += 1;
+			continue;
+		}
+
+		const arrayItem = lineWithoutComment.match(/^\s+-\s*(.*)$/);
+		if (arrayItem === null) break;
+
+		values.push(parseStringValue(arrayItem[1] ?? ""));
+		consumed += 1;
+	}
+
+	return { values: values.filter(Boolean), consumed };
+}
+
+function parseInlineArray(value: string): string[] {
+	const closingBracketIndex = findClosingBracket(value);
+	if (closingBracketIndex === -1) {
+		throw new RuleFrontmatterParseError("Unclosed inline array");
+	}
+
+	const trailing = value.slice(closingBracketIndex + 1).trim();
+	if (trailing.length > 0) {
+		throw new RuleFrontmatterParseError("Unexpected content after inline array");
+	}
+
+	const content = value.slice(1, closingBracketIndex).trim();
+	if (content.length === 0) return [];
+
+	return splitCommaSeparated(content).map(parseStringValue).filter(Boolean);
+}
+
+function findClosingBracket(value: string): number {
+	let quote: string | null = null;
+	let escaped = false;
+
+	for (let index = 0; index < value.length; index += 1) {
+		const character = value[index];
+		if (character === undefined) continue;
+
+		if (escaped) {
+			escaped = false;
+			continue;
+		}
+
+		if (quote !== null && character === "\\") {
+			escaped = true;
+			continue;
+		}
+
+		if (character === '"' || character === "'") {
+			if (quote === null) quote = character;
+			else if (quote === character) quote = null;
+			continue;
+		}
+
+		if (quote === null && character === "]") return index;
+	}
+
+	return -1;
+}
+
+function splitCommaSeparated(value: string): string[] {
+	const values: string[] = [];
+	let current = "";
+	let quote: string | null = null;
+	let escaped = false;
+
+	for (let index = 0; index < value.length; index += 1) {
+		const character = value[index];
+		if (character === undefined) continue;
+
+		if (escaped) {
+			current += character;
+			escaped = false;
+			continue;
+		}
+
+		if (quote !== null && character === "\\") {
+			current += character;
+			escaped = true;
+			continue;
+		}
+
+		if (character === '"' || character === "'") {
+			if (quote === null) quote = character;
+			else if (quote === character) quote = null;
+			current += character;
+			continue;
+		}
+
+		if (quote === null && character === ",") {
+			values.push(current.trim());
+			current = "";
+			continue;
+		}
+
+		current += character;
+	}
+
+	if (quote !== null) {
+		throw new RuleFrontmatterParseError("Unclosed quoted value");
+	}
+
+	values.push(current.trim());
+	return values.filter(Boolean);
+}
+
+function parseStringValue(value: string): string {
+	if (value.length === 0) return "";
+	if (value.startsWith('"')) return parseJsonString(value);
+	if (value.startsWith("'") && value.endsWith("'")) return value.slice(1, -1);
+	if (value.startsWith("'")) throw new RuleFrontmatterParseError("Unclosed quoted value");
+	return value;
+}
+
+function parseJsonString(value: string): string {
+	try {
+		const parsedValue: unknown = JSON.parse(value);
+		if (typeof parsedValue !== "string") {
+			throw new RuleFrontmatterParseError("Expected JSON-quoted string");
+		}
+		return parsedValue;
+	} catch (error) {
+		if (error instanceof RuleFrontmatterParseError) throw error;
+		throw new RuleFrontmatterParseError("Invalid JSON-quoted string");
+	}
+}
+
+function stripComment(line: string): string {
+	let quote: string | null = null;
+	let escaped = false;
+
+	for (let index = 0; index < line.length; index += 1) {
+		const character = line[index];
+		if (character === undefined) continue;
+
+		if (escaped) {
+			escaped = false;
+			continue;
+		}
+
+		if (quote !== null && character === "\\") {
+			escaped = true;
+			continue;
+		}
+
+		if (character === '"' || character === "'") {
+			if (quote === null) quote = character;
+			else if (quote === character) quote = null;
+			continue;
+		}
+
+		if (quote === null && character === "#") return line.slice(0, index);
+	}
+
+	return line;
+}

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

@@ -1,8 +1,6 @@
-import { RuleFrontmatterParseError } from "./errors.js";
-import type { ParsedRule, RuleFrontmatter } from "./types.js";
-
-const FRONTMATTER_OPENING = "---\n";
-const FRONTMATTER_OPENING_CRLF = "---\r\n";
+import { findClosingDelimiter, getOpeningDelimiterLength, stripBom } from "./parser-frontmatter.js";
+import { parseYamlFrontmatter } from "./parser-yaml.js";
+import type { ParsedRule } from "./types.js";
 
 /** Parse markdown rule content and extract the supported YAML frontmatter subset. */
 export function parseRule(content: string): ParsedRule {
@@ -35,292 +33,3 @@ export function parseRule(content: string): ParsedRule {
 		};
 	}
 }
-
-function stripBom(content: string): string {
-	return content.startsWith("\uFEFF") ? content.slice(1) : content;
-}
-
-function getOpeningDelimiterLength(content: string): number {
-	if (content.startsWith(FRONTMATTER_OPENING_CRLF)) return FRONTMATTER_OPENING_CRLF.length;
-	if (content.startsWith(FRONTMATTER_OPENING)) return FRONTMATTER_OPENING.length;
-	return 0;
-}
-
-function findClosingDelimiter(content: string, openingLength: number): { start: number; bodyStart: number } | null {
-	let lineStart = openingLength;
-
-	while (lineStart <= content.length) {
-		const nextNewline = content.indexOf("\n", lineStart);
-		const lineEnd = nextNewline === -1 ? content.length : nextNewline;
-		const line = content.slice(lineStart, lineEnd).replace(/\r$/, "");
-
-		if (line === "---") {
-			return {
-				start: lineStart,
-				bodyStart: nextNewline === -1 ? content.length : nextNewline + 1,
-			};
-		}
-
-		if (nextNewline === -1) break;
-		lineStart = nextNewline + 1;
-	}
-
-	return null;
-}
-
-function parseYamlFrontmatter(yamlContent: string): RuleFrontmatter {
-	const lines = yamlContent.replace(/\r\n/g, "\n").split("\n");
-	const frontmatter: RuleFrontmatter = {};
-	const globValues: string[] = [];
-	let lineIndex = 0;
-
-	while (lineIndex < lines.length) {
-		const rawLine = lines[lineIndex];
-		if (rawLine === undefined) break;
-
-		const line = stripComment(rawLine).trim();
-		if (line.length === 0) {
-			lineIndex += 1;
-			continue;
-		}
-
-		const colonIndex = line.indexOf(":");
-		if (colonIndex === -1) {
-			throw new RuleFrontmatterParseError(`Expected key-value pair on line ${lineIndex + 1}`);
-		}
-
-		const key = line.slice(0, colonIndex).trim();
-		const rawValue = line.slice(colonIndex + 1).trim();
-
-		if (key === "description") {
-			frontmatter.description = parseStringValue(rawValue);
-			lineIndex += 1;
-			continue;
-		}
-
-		if (key === "alwaysApply") {
-			frontmatter.alwaysApply = parseBooleanValue(rawValue, lineIndex + 1);
-			lineIndex += 1;
-			continue;
-		}
-
-		if (key === "globs" || key === "paths" || key === "applyTo") {
-			const parsed = parseGlobValue(rawValue, lines, lineIndex);
-			for (const glob of parsed.values) {
-				if (!globValues.includes(glob)) globValues.push(glob);
-			}
-			lineIndex += parsed.consumed;
-			continue;
-		}
-
-		lineIndex += 1;
-	}
-
-	const singleGlob = globValues[0];
-	if (globValues.length === 1 && singleGlob !== undefined) {
-		frontmatter.globs = singleGlob;
-	} else if (globValues.length > 1) {
-		frontmatter.globs = globValues;
-	}
-
-	return frontmatter;
-}
-
-function parseBooleanValue(value: string, lineNumber: number): boolean {
-	if (value === "true") return true;
-	if (value === "false") return false;
-	throw new RuleFrontmatterParseError(`Expected boolean on line ${lineNumber}`);
-}
-
-function parseGlobValue(rawValue: string, lines: string[], lineIndex: number): { values: string[]; consumed: number } {
-	if (rawValue.startsWith("[")) {
-		return { values: parseInlineArray(rawValue), consumed: 1 };
-	}
-
-	if (rawValue.length === 0) {
-		return parseMultilineArray(lines, lineIndex);
-	}
-
-	const value = parseStringValue(rawValue);
-	if (value.includes(",")) {
-		return {
-			values: value
-				.split(",")
-				.map((item) => item.trim())
-				.filter(Boolean),
-			consumed: 1,
-		};
-	}
-
-	return { values: [value], consumed: 1 };
-}
-
-function parseMultilineArray(lines: string[], lineIndex: number): { values: string[]; consumed: number } {
-	const values: string[] = [];
-	let consumed = 1;
-
-	for (let index = lineIndex + 1; index < lines.length; index += 1) {
-		const rawLine = lines[index];
-		if (rawLine === undefined) break;
-
-		const lineWithoutComment = stripComment(rawLine);
-		if (lineWithoutComment.trim().length === 0) {
-			consumed += 1;
-			continue;
-		}
-
-		const arrayItem = lineWithoutComment.match(/^\s+-\s*(.*)$/);
-		if (arrayItem === null) break;
-
-		values.push(parseStringValue(arrayItem[1] ?? ""));
-		consumed += 1;
-	}
-
-	return { values: values.filter(Boolean), consumed };
-}
-
-function parseInlineArray(value: string): string[] {
-	const closingBracketIndex = findClosingBracket(value);
-	if (closingBracketIndex === -1) {
-		throw new RuleFrontmatterParseError("Unclosed inline array");
-	}
-
-	const trailing = value.slice(closingBracketIndex + 1).trim();
-	if (trailing.length > 0) {
-		throw new RuleFrontmatterParseError("Unexpected content after inline array");
-	}
-
-	const content = value.slice(1, closingBracketIndex).trim();
-	if (content.length === 0) return [];
-
-	return splitCommaSeparated(content).map(parseStringValue).filter(Boolean);
-}
-
-function findClosingBracket(value: string): number {
-	let quote: string | null = null;
-	let escaped = false;
-
-	for (let index = 0; index < value.length; index += 1) {
-		const character = value[index];
-		if (character === undefined) continue;
-
-		if (escaped) {
-			escaped = false;
-			continue;
-		}
-
-		if (quote !== null && character === "\\") {
-			escaped = true;
-			continue;
-		}
-
-		if (character === '"' || character === "'") {
-			if (quote === null) quote = character;
-			else if (quote === character) quote = null;
-			continue;
-		}
-
-		if (quote === null && character === "]") return index;
-	}
-
-	return -1;
-}
-
-function splitCommaSeparated(value: string): string[] {
-	const values: string[] = [];
-	let current = "";
-	let quote: string | null = null;
-	let escaped = false;
-
-	for (let index = 0; index < value.length; index += 1) {
-		const character = value[index];
-		if (character === undefined) continue;
-
-		if (escaped) {
-			current += character;
-			escaped = false;
-			continue;
-		}
-
-		if (quote !== null && character === "\\") {
-			current += character;
-			escaped = true;
-			continue;
-		}
-
-		if (character === '"' || character === "'") {
-			if (quote === null) quote = character;
-			else if (quote === character) quote = null;
-			current += character;
-			continue;
-		}
-
-		if (quote === null && character === ",") {
-			values.push(current.trim());
-			current = "";
-			continue;
-		}
-
-		current += character;
-	}
-
-	if (quote !== null) {
-		throw new RuleFrontmatterParseError("Unclosed quoted value");
-	}
-
-	values.push(current.trim());
-	return values.filter(Boolean);
-}
-
-function parseStringValue(value: string): string {
-	if (value.length === 0) return "";
-	if (value.startsWith('"')) return parseJsonString(value);
-	if (value.startsWith("'") && value.endsWith("'")) return value.slice(1, -1);
-	if (value.startsWith("'")) throw new RuleFrontmatterParseError("Unclosed quoted value");
-	return value;
-}
-
-function parseJsonString(value: string): string {
-	let parsedValue: unknown;
-	try {
-		parsedValue = JSON.parse(value);
-	} catch {
-		throw new RuleFrontmatterParseError("Invalid JSON-quoted string");
-	}
-
-	if (typeof parsedValue !== "string") {
-		throw new RuleFrontmatterParseError("Expected JSON-quoted string");
-	}
-
-	return parsedValue;
-}
-
-function stripComment(line: string): string {
-	let quote: string | null = null;
-	let escaped = false;
-
-	for (let index = 0; index < line.length; index += 1) {
-		const character = line[index];
-		if (character === undefined) continue;
-
-		if (escaped) {
-			escaped = false;
-			continue;
-		}
-
-		if (quote !== null && character === "\\") {
-			escaped = true;
-			continue;
-		}
-
-		if (character === '"' || character === "'") {
-			if (quote === null) quote = character;
-			else if (quote === character) quote = null;
-			continue;
-		}
-
-		if (quote === null && character === "#") return line.slice(0, index);
-	}
-
-	return line;
-}

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

@@ -0,0 +1,57 @@
+type RuntimeEnv = Readonly<Record<string, string | undefined>>;
+
+const SPARKSHELL_AWARENESS_MARKER = "## Sparkshell Runtime";
+
+export const SPARKSHELL_AWARENESS_DEDUP_KEY = "__omo_sparkshell_awareness__";
+
+export function isCodexAppServerActive(env: RuntimeEnv = process.env): boolean {
+	const originator = env["CODEX_INTERNAL_ORIGINATOR_OVERRIDE"]?.toLowerCase() ?? "";
+	const bundleIdentifier = env["__CFBundleIdentifier"]?.toLowerCase() ?? "";
+	const shellActive = isTruthy(env["CODEX_SHELL"]);
+
+	return (
+		shellActive &&
+		(originator.includes("codex desktop") ||
+			originator.includes("codex app") ||
+			bundleIdentifier === "com.openai.codex")
+	);
+}
+
+function isSparkShellAppServerConfigured(env: RuntimeEnv = process.env): boolean {
+	const codexSocketPath = env["CODEX_APP_SERVER_SOCKET"]?.trim() ?? "";
+	const omoSocketPath = env["OMO_SPARKSHELL_APP_SERVER_SOCKET"]?.trim() ?? "";
+	return codexSocketPath.length > 0 || omoSocketPath.length > 0;
+}
+
+export function getSparkShellRuntimeAwareness(env: RuntimeEnv = process.env): string {
+	const override = env["OMO_SPARKSHELL_AWARENESS"] ?? env["LAZYCODEX_SPARKSHELL_AWARENESS"];
+	if (isFalsy(override)) {
+		return "";
+	}
+	if (!isTruthy(override) && !isCodexAppServerActive(env) && !isSparkShellAppServerConfigured(env)) {
+		return "";
+	}
+
+	return [
+		SPARKSHELL_AWARENESS_MARKER,
+		"",
+		"- Prefer `omo sparkshell <command>` for repo inspection, CLI smoke tests, git/history checks, and bounded verification before falling back to raw shell commands.",
+		"- Use `omo sparkshell --shell '<command>'` only when shell metacharacters are required.",
+		"- Use `omo sparkshell --tmux-pane <pane-id> --tail-lines 400` to inspect an existing tmux pane. Tail lines must stay between 100 and 1000.",
+		"- When no native sidecar or appserver is available, Sparkshell silently falls back to raw command execution. `OMO_SPARKSHELL_BIN` selects a native sidecar path.",
+	].join("\n");
+}
+
+function isTruthy(value: string | undefined): boolean {
+	if (value === undefined) {
+		return false;
+	}
+	return ["1", "true", "yes", "on"].includes(value.trim().toLowerCase());
+}
+
+function isFalsy(value: string | undefined): boolean {
+	if (value === undefined) {
+		return false;
+	}
+	return ["0", "false", "no", "off"].includes(value.trim().toLowerCase());
+}

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

@@ -4,6 +4,7 @@ import { formatAdditionalContextOutput } from "./hook-output.js";
 import { completePostCompactRecovery, hydrateEngineState, persistEngineState } from "./persistent-cache.js";
 import { withPostCompactBudget } from "./post-compact-budget.js";
 import { createRulesEngine } from "./rules-engine-factory.js";
+import { getSparkShellRuntimeAwareness, SPARKSHELL_AWARENESS_DEDUP_KEY } from "./sparkshell-awareness.js";
 import { filterRulesAlreadyInTranscript } from "./transcript-rule-filter.js";
 import type { TranscriptSearchOptions } from "./transcript-search.js";
 
@@ -42,7 +43,10 @@ export function runStaticInjection(
 		},
 		transcriptSearchOptions,
 	);
-	if (rules.length === 0) {
+	const sparkshellAwareness = engine.state.staticDedup.has(SPARKSHELL_AWARENESS_DEDUP_KEY)
+		? ""
+		: getSparkShellRuntimeAwareness(options.env);
+	if (rules.length === 0 && sparkshellAwareness.length === 0) {
 		persistEngineState(engine, cachePath, completedPostCompactChannel);
 		return "";
 	}
@@ -51,6 +55,13 @@ export function runStaticInjection(
 	for (const rule of rules) {
 		engine.markStaticInjected(rule);
 	}
+	if (sparkshellAwareness.length > 0) {
+		engine.state.staticDedup.add(SPARKSHELL_AWARENESS_DEDUP_KEY);
+	}
 	persistEngineState(engine, cachePath, completedPostCompactChannel);
-	return formatAdditionalContextOutput(eventName, block);
+	return formatAdditionalContextOutput(eventName, combineStaticContext(block, sparkshellAwareness));
+}
+
+function combineStaticContext(...blocks: readonly string[]): string {
+	return blocks.filter((block) => block.trim().length > 0).join("\n\n");
 }

package/packages/omo-codex/plugin/components/rules/src/transcript-rule-filter.ts

@@ -30,6 +30,14 @@ export function filterRulesAlreadyInTranscript(
 }
 
 function isRuleAlreadyInTranscript(rule: LoadedRule, transcriptText: string): boolean {
+	const staticReferenceNeedles = [
+		`- [${displayFilename(rule)}]{${rule.path}}`,
+		`- [${displayFilename(rule)}]{${rule.realPath}}`,
+	];
+	if (staticReferenceNeedles.some((needle) => transcriptText.includes(needle))) {
+		return true;
+	}
+
 	const bodyNeedle = rule.body.trim().slice(0, 2_000);
 	if (bodyNeedle.length === 0 || !transcriptText.includes(bodyNeedle)) {
 		return false;
@@ -42,3 +50,12 @@ function isRuleAlreadyInTranscript(rule: LoadedRule, transcriptText: string): bo
 	].filter((marker): marker is string => marker !== null);
 	return markers.some((marker) => transcriptText.includes(marker));
 }
+
+function displayFilename(rule: LoadedRule): string {
+	const normalizedPath = rule.relativePath.length > 0 ? rule.relativePath : rule.path;
+	const segments = normalizedPath
+		.replace(/\\/g, "/")
+		.split("/")
+		.filter((segment) => segment.length > 0);
+	return segments.at(-1) ?? normalizedPath;
+}

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

@@ -63,7 +63,7 @@ describe("plugin bundled rule priority", () => {
 		expect(SOURCE_PRIORITY.get("plugin-bundled")).toBe(200);
 	});
 
-	it("#given user-home and bundled rules share a description #when formatting static rules #then user-home wins", () => {
+	it("#given user-home and bundled rules share a description #when formatting static rules #then user-home file wins", () => {
 		// given
 		const bundledCandidate = globalCandidate("plugin-bundled", bundledPath);
 		const homeCandidate = globalCandidate("~/.opencode/rules", homePath);
@@ -85,6 +85,7 @@ 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);
 	});