oh-my-opencode 5.0.0-beta.33 → 5.0.0-beta.35

package/packages/omo-codex/plugin/test/canonical-ultrawork-directive.test.mjs

@@ -0,0 +1,53 @@
+import assert from "node:assert/strict";
+import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import test from "node:test";
+
+import {
+	canonicalUltraworkDirectiveRelativePath,
+	resolveCanonicalUltraworkDirectivePath,
+} from "../scripts/canonical-ultrawork-directive.mjs";
+
+test("#given a repo checkout #when resolving the ultrawork directive #then the checkout copy wins over a plugin-internal copy", async () => {
+	// given
+	const root = await mkdtemp(join(tmpdir(), "omo-canonical-prompt-"));
+	const pluginRoot = join(root, "plugin");
+	const repoRoot = join(root, "checkout");
+	const checkoutPrompt = join(repoRoot, canonicalUltraworkDirectiveRelativePath);
+	const pluginPrompt = join(pluginRoot, canonicalUltraworkDirectiveRelativePath);
+	await mkdir(join(checkoutPrompt, ".."), { recursive: true });
+	await mkdir(join(pluginPrompt, ".."), { recursive: true });
+	await writeFile(checkoutPrompt, "checkout");
+	await writeFile(pluginPrompt, "staged");
+
+	try {
+		// when
+		const resolved = resolveCanonicalUltraworkDirectivePath(pluginRoot, repoRoot);
+
+		// then
+		assert.equal(resolved, checkoutPrompt);
+	} finally {
+		await rm(root, { recursive: true, force: true });
+	}
+});
+
+test("#given the flattened plugin cache #when the repo-relative directive is absent #then the plugin-internal copy is resolved", async () => {
+	// given
+	const root = await mkdtemp(join(tmpdir(), "omo-canonical-prompt-"));
+	const pluginRoot = join(root, "plugins", "cache", "sisyphuslabs", "omo", "0.1.0");
+	const repoRoot = join(pluginRoot, "..", "..", "..");
+	const pluginPrompt = join(pluginRoot, canonicalUltraworkDirectiveRelativePath);
+	await mkdir(join(pluginPrompt, ".."), { recursive: true });
+	await writeFile(pluginPrompt, "staged");
+
+	try {
+		// when
+		const resolved = resolveCanonicalUltraworkDirectivePath(pluginRoot, repoRoot);
+
+		// then
+		assert.equal(resolved, pluginPrompt);
+	} finally {
+		await rm(root, { recursive: true, force: true });
+	}
+});

package/packages/omo-codex/plugin/test/component-bundled-cli.test.mjs

@@ -1,6 +1,5 @@
 import assert from "node:assert/strict";
 import {
-	chmodSync,
 	cpSync,
 	existsSync,
 	mkdirSync,
@@ -31,7 +30,6 @@ const HOOK_EVENTS_BY_COMPONENT = {
 	ultrawork: "user-prompt-submit",
 	"ulw-loop": "pre-tool-use",
 };
-const MCP_ONLY_COMPONENTS = new Set(["codegraph"]);
 const HOOK_CLI_TEST_TIMEOUT_MS = 45_000;
 const DAEMON_EXIT_TIMEOUT_MS = 5_000;
 
@@ -84,38 +82,6 @@ test("#given built workspace component CLIs #when dynamically imported with hook
 	assert.deepEqual(failures, []);
 });
 
-test("#given built MCP-only CodeGraph entries #when executed with a fake binary #then each entry is self-contained", () => {
-	const tempRoot = mkdtempSync(join(tmpdir(), "omo-codex-mcp-wrapper-"));
-	try {
-		const fakeBinaryPath = join(tempRoot, "codegraph-fake.cjs");
-		const invocationLogPath = join(tempRoot, "invocations.log");
-		writeFileSync(
-			fakeBinaryPath,
-			[
-				"#!/usr/bin/env node",
-				"const fs = require('node:fs');",
-				"fs.appendFileSync(process.env.CODEGRAPH_FAKE_LOG, JSON.stringify(process.argv.slice(2)) + '\\n');",
-				"",
-			].join("\n"),
-		);
-		chmodSync(fakeBinaryPath, 0o755);
-
-		const serveResult = runCodegraphMcpEntry("serve.js", tempRoot, fakeBinaryPath, invocationLogPath);
-		const cliResult = runCodegraphMcpEntry("cli.js", tempRoot, fakeBinaryPath, invocationLogPath);
-
-		assert.equal(serveResult.status, 0, `serve.js stderr: ${serveResult.stderr}`);
-		assert.equal(cliResult.status, 0, `cli.js stderr: ${cliResult.stderr}`);
-		assert.equal(serveResult.stderr, "");
-		assert.equal(cliResult.stderr, "");
-		assert.deepEqual(readFileSync(invocationLogPath, "utf8").trim().split("\n"), [
-			'["serve","--mcp"]',
-			'["serve","--mcp"]',
-		]);
-	} finally {
-		rmSync(tempRoot, { recursive: true, force: true });
-	}
-});
-
 test("#given representative component hook payloads #when executed through dist CLI contract #then current hook behavior is preserved", async () => {
 	const tempRoot = mkdtempSync(join(tmpdir(), "omo-codex-cli-contract-"));
 	try {
@@ -264,7 +230,6 @@ test("#given aggregate hook manifest #when command hooks are inspected #then com
 	// when
 	const missingContracts = components.filter(
 		(component) =>
-			!MCP_ONLY_COMPONENTS.has(component) &&
 			!commands.some((command) =>
 				command.startsWith(`node "\${PLUGIN_ROOT}/components/${component}/dist/cli.js" hook `),
 			),
@@ -279,7 +244,6 @@ async function workspaceComponents() {
 	return packageJson.workspaces
 		.filter((workspace) => workspace.startsWith("components/"))
 		.map((workspace) => workspace.slice("components/".length))
-		.filter((component) => !MCP_ONLY_COMPONENTS.has(component))
 		.sort();
 }
 
@@ -306,20 +270,6 @@ function componentCliPath(component) {
 	return join(root, "components", component, "dist", "cli.js");
 }
 
-function runCodegraphMcpEntry(entryName, tempRoot, fakeBinaryPath, invocationLogPath) {
-	return spawnSync(process.execPath, [join(root, "components", "codegraph", "dist", entryName)], {
-		cwd: root,
-		encoding: "utf8",
-		env: {
-			...process.env,
-			CODEGRAPH_FAKE_LOG: invocationLogPath,
-			HOME: tempRoot,
-			OMO_CODEGRAPH_BIN: fakeBinaryPath,
-		},
-		timeout: HOOK_CLI_TEST_TIMEOUT_MS,
-	});
-}
-
 function runHookCli(component, event, payload, tempRoot, extraEnv = {}) {
 	return runHookCliAsync(component, event, `${JSON.stringify(payload)}\n`, tempRoot, extraEnv);
 }

package/packages/omo-codex/plugin/test/hook-status-message.test.mjs

@@ -25,7 +25,6 @@ const AGGREGATE_EXPECTED_LABELS = new Map([
 	["hooks/hooks.json:PreToolUse:1:0", "Enforcing Unlimited Goal Budget"],
 	["hooks/hooks.json:PostToolUse:0:0", "Checking Comments"],
 	["hooks/hooks.json:PostToolUse:0:1", "Checking LSP Diagnostics"],
-	["hooks/hooks.json:PostToolUse:0:2", "Checking CodeGraph Init Guidance"],
 	["hooks/hooks.json:PostToolUse:1:0", "Matching Project Rules"],
 	["hooks/hooks.json:PostCompact:0:0", "Resetting Git Bash MCP Reminder"],
 	["hooks/hooks.json:PostCompact:1:0", "Resetting Project Rule Cache"],

package/packages/omo-codex/plugin/test/mcp-research-servers.test.mjs

@@ -14,11 +14,9 @@ test("#given aggregate MCP config #when inspected #then registers research MCPs
 	const serverNames = Object.keys(mcp.mcpServers).sort();
 
 	// then
-	assert.deepEqual(serverNames, ["codegraph", "context7", "git_bash", "grep_app", "lsp"]);
+	assert.deepEqual(serverNames, ["context7", "git_bash", "grep_app", "lsp"]);
 	assert.equal(mcp.mcpServers.grep_app.url, "https://mcp.grep.app");
 	assert.equal(mcp.mcpServers.context7.url, "https://mcp.context7.com/mcp");
 	assert.equal(Object.hasOwn(mcp.mcpServers, "ast_grep"), false);
-	assert.deepEqual(mcp.mcpServers.codegraph.args, ["components/codegraph/dist/serve.js"]);
-	assert.equal(mcp.mcpServers.codegraph.required, false);
 	assert.equal(mcp.mcpServers.lsp.startup_timeout_sec, 10);
 });

package/packages/omo-codex/scripts/install-cache-copy.test.mjs

@@ -1,7 +1,7 @@
 import assert from "node:assert/strict";
 import { realpathSync } from "node:fs";
 import { mkdir, readdir, readFile, rename, stat, writeFile } from "node:fs/promises";
-import { basename, join, relative, sep } from "node:path";
+import { basename, dirname, join, relative, sep } from "node:path";
 import test from "node:test";
 
 import { installCachedPlugin } from "./install-dist/install-local.mjs";
@@ -166,6 +166,32 @@ test("#given packaged root CLI runtimes #when caching omo plugin #then root dist
 	assert.equal(await readFile(join(installed.path, "dist", "cli-node", "index.js"), "utf8"), "console.log('omo node')\n");
 });
 
+test("#given packaged prompts-core directive #when caching omo plugin #then the ultrawork directive is materialized into the plugin cache", async () => {
+	// given
+	const root = await makeTempDir();
+	const repoRoot = join(root, "repo");
+	const codexHome = join(root, "codex-home");
+	const sourceRoot = join(repoRoot, "packages", "omo-codex", "plugin");
+	const directiveRelativePath = join("packages", "prompts-core", "prompts", "ultrawork", "codex.md");
+	await mkdir(sourceRoot, { recursive: true });
+	await mkdir(dirname(join(repoRoot, directiveRelativePath)), { recursive: true });
+	await writeFile(join(sourceRoot, "package.json"), JSON.stringify({ name: "@scope/omo", version: "0.1.0" }));
+	await writeFile(join(repoRoot, directiveRelativePath), "# ultrawork directive\n");
+
+	// when
+	const installed = await installCachedPlugin({
+		codexHome,
+		marketplaceName: "sisyphuslabs",
+		name: "omo",
+		sourcePath: sourceRoot,
+		version: "0.1.0",
+		runCommand: async () => {},
+	});
+
+	// then
+	assert.equal(await readFile(join(installed.path, directiveRelativePath), "utf8"), "# ultrawork directive\n");
+});
+
 test("#given existing cache #when npm install fails #then previous active cache is preserved", async () => {
 	// given
 	const root = await makeTempDir();

package/packages/omo-codex/scripts/install-config-git-bash.test.mjs

@@ -89,26 +89,3 @@ test("#given non-windows platforms #when updating config #then disables git_bash
 		assert.match(content, /\[plugins\."omo@sisyphuslabs"\.mcp_servers\.git_bash\][\s\S]*?enabled = false/);
 	}
 });
-
-test("#given CodeGraph MCP disabled by installer policy #when updating config #then disables only codegraph plugin mcp policy", async () => {
-	// given
-	const root = await mkdtemp(join(tmpdir(), "omo-codex-config-codegraph-disabled-"));
-	const configPath = join(root, "config.toml");
-
-	// when
-	await updateCodexConfig({
-		configPath,
-		repoRoot: "/repo/packages/omo-codex",
-		marketplaceName: "sisyphuslabs",
-		marketplaceSource: { sourceType: "local", source: "/repo/packages/omo-codex/cache/sisyphuslabs" },
-		pluginNames: ["omo"],
-		platform: "darwin",
-		codegraphMcpEnabled: false,
-	});
-
-	// then
-	const content = await readFile(configPath, "utf8");
-	assert.match(content, /\[plugins\."omo@sisyphuslabs"\][\s\S]*?enabled = true/);
-	assert.match(content, /\[plugins\."omo@sisyphuslabs"\.mcp_servers\.codegraph\][\s\S]*?enabled = false/);
-	assert.match(content, /\[plugins\."omo@sisyphuslabs"\.mcp_servers\.context7\][\s\S]*?enabled = true/);
-});