oh-my-opencode 4.19.1 → 4.19.2

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

@@ -1,6 +1,5 @@
-import { execFile, spawn } from "node:child_process";
+import { spawn } from "node:child_process";
 import { homedir } from "node:os";
-import { join } from "node:path";
 import {
 	cwd as processCwd,
 	env as processEnv,
@@ -13,7 +12,9 @@ import { fileURLToPath } from "node:url";
 
 import { buildCodegraphChildEnv, buildCodegraphEnv } from "../../../../../utils/src/codegraph/env.ts";
 import { buildCodegraphInitGuidanceForToolResult } from "../../../../../utils/src/codegraph/guidance.ts";
+import { resolvePinnedCodegraphBin } from "../../../../../utils/src/codegraph/managed-runtime.ts";
 import { resolveCodegraphCommand } from "../../../../../utils/src/codegraph/resolve.ts";
+import { runProcessWithTreeTimeout } from "../../../../../utils/src/process-tree.ts";
 import { shouldExcludeCodegraphProject } from "../../../../../utils/src/codegraph/workspace.ts";
 import { getCodexOmoConfig } from "../../../shared/src/config-loader.ts";
 import { pruneCodegraphProjectStoresBestEffort } from "./cache-gc.js";
@@ -66,13 +67,6 @@ export async function executeCodegraphSessionStartHook(options: SessionStartHook
 	const projectRoot = resolveProjectRoot(input, options.cwd ?? processCwd());
 	const homeDir = resolveHomeDir(env);
 	const config = options.config ?? getCodexOmoConfig({ cwd: projectRoot, env, homeDir });
-	pruneCodegraphProjectStoresBestEffort(homeDir, { debugLog: writeDebugLog });
-	await sweepCodegraphZombiesBestEffort({
-		env,
-		homeDir,
-		...(config.trustedCodegraphInstallDir === undefined ? {} : { trustedCodegraphInstallDir: config.trustedCodegraphInstallDir }),
-		log: writeDebugLog,
-	}, options.sweepZombies);
 
 	if (config.codegraph?.enabled === false) {
 		return { action: "skipped-disabled", exitCode: 0 };
@@ -86,8 +80,16 @@ export async function executeCodegraphSessionStartHook(options: SessionStartHook
 		return { action: "skipped-excluded", exitCode: 0 };
 	}
 
+	pruneCodegraphProjectStoresBestEffort(homeDir, { debugLog: writeDebugLog });
+	await sweepCodegraphZombiesBestEffort({
+		env,
+		homeDir,
+		...(config.trustedCodegraphInstallDir === undefined ? {} : { trustedCodegraphInstallDir: config.trustedCodegraphInstallDir }),
+		log: writeDebugLog,
+	}, options.sweepZombies);
+
 	const isInitialized = await (options.statusProbe ?? isCodegraphProjectInitialized)({
-		daemon: config.codegraph?.daemon === true,
+		daemon: config.codegraph?.daemon !== false,
 		env,
 		homeDir,
 		projectRoot,
@@ -145,27 +147,14 @@ function runStatusProbe(
 	args: readonly string[],
 	env: Record<string, string>,
 ): Promise<{ readonly exitCode: number; readonly stdout: string; readonly timedOut: boolean }> {
-	return new Promise((resolveProbe) => {
-		execFile(
-			command,
-			[...args],
-			{
-				cwd: projectRoot,
-				encoding: "utf8",
-				env,
-				maxBuffer: 1024 * 1024,
-				timeout: STATUS_PROBE_TIMEOUT_MS,
-				windowsHide: true,
-			},
-			(error, stdout) => {
-				if (error === null) {
-					resolveProbe({ exitCode: 0, stdout: toOutputText(stdout), timedOut: false });
-					return;
-				}
-				resolveProbe({ exitCode: resolveExitCode(error), stdout: toOutputText(stdout), timedOut: error.killed === true });
-			},
-		);
-	});
+	return runProcessWithTreeTimeout({
+		args,
+		command,
+		cwd: projectRoot,
+		env,
+		maxBuffer: 1024 * 1024,
+		timeoutMs: STATUS_PROBE_TIMEOUT_MS,
+	}).then(({ exitCode, stdout, timedOut }) => ({ exitCode, stdout, timedOut }));
 }
 
 function codegraphStatusSaysInitialized(stdout: string): boolean {
@@ -180,8 +169,7 @@ function codegraphStatusSaysInitialized(stdout: string): boolean {
 }
 
 function provisionedBinFromInstallDir(installDir: string | undefined): string | null {
-	if (installDir === undefined) return null;
-	return join(installDir, "bin", process.platform === "win32" ? "codegraph.cmd" : "codegraph");
+	return resolvePinnedCodegraphBin(installDir);
 }
 
 export async function executeCodegraphPostToolUseHook(options: PostToolUseHookOptions = {}): Promise<PostToolUseHookResult> {
@@ -233,15 +221,6 @@ function resolveHomeDir(env: Record<string, string | undefined>): string {
 	return env["HOME"] ?? env["USERPROFILE"] ?? homedir();
 }
 
-function resolveExitCode(error: Error): number {
-	if ("code" in error && typeof error.code === "number") return error.code;
-	return 1;
-}
-
-function toOutputText(value: string | Buffer): string {
-	return Buffer.isBuffer(value) ? value.toString("utf8") : value;
-}
-
 function resolveProjectRoot(input: unknown, fallback: string): string {
 	if (!isRecord(input)) return fallback;
 	const cwd = input["cwd"];

package/packages/omo-codex/plugin/components/codegraph/src/serve.ts

@@ -16,6 +16,7 @@ import {
 	buildCodegraphChildEnv,
 	buildCodegraphEnv,
 } from "../../../../../utils/src/codegraph/env.ts";
+import { resolvePinnedCodegraphBin } from "../../../../../utils/src/codegraph/managed-runtime.ts";
 import type { ParentWatchdogConfig } from "../../../../../mcp-stdio-core/src/index.ts";
 import { CODEGRAPH_PINNED_VERSION } from "../../../../../utils/src/codegraph/manifest.ts";
 import {
@@ -142,7 +143,7 @@ export async function runCodegraphServe(options: RunCodegraphServeOptions = {}):
 	}
 
 	const runProcess = options.runProcess ?? runBridgedCodegraphProcess;
-	const codegraphEnv = codegraphEnvForConfig(trustedInstallDir, homeDir, codegraphConfig.daemon === true, options.buildEnv);
+	const codegraphEnv = codegraphEnvForConfig(trustedInstallDir, homeDir, codegraphConfig.daemon !== false, options.buildEnv);
 	const mergedEnv = buildCodegraphChildEnv({ ambientEnv: env, codegraphEnv, runtimeEnv: env });
 	return runProcess(resolution.command, [...resolution.argsPrefix, "serve", "--mcp"], {
 		cwd: projectCwd,
@@ -221,9 +222,7 @@ function resolveProjectCwd(env: Record<string, string | undefined>, fallback: st
 }
 
 function provisionedBinFromInstallDir(installDir: string | undefined): string | null {
-	if (installDir === undefined) return null;
-	const candidate = join(installDir, "bin", process.platform === "win32" ? "codegraph.cmd" : "codegraph");
-	return existsSync(candidate) ? candidate : null;
+	return resolvePinnedCodegraphBin(installDir);
 }
 
 export async function runCodegraphServeCli(): Promise<void> {

package/packages/omo-codex/plugin/components/codegraph/src/session-start-worker.ts

@@ -1,11 +1,11 @@
-import { execFile } from "node:child_process";
-import { appendFileSync, existsSync, mkdirSync } from "node:fs";
+import { appendFileSync, mkdirSync } from "node:fs";
 import { homedir } from "node:os";
 import { extname, join } from "node:path";
 import { cwd as processCwd, env as processEnv, execPath as processExecPath, stderr as processStderr } from "node:process";
 
 import { getCodexOmoConfig } from "../../../shared/src/config-loader.ts";
 import { buildCodegraphChildEnv, buildCodegraphEnv } from "../../../../../utils/src/codegraph/env.ts";
+import { resolvePinnedCodegraphBin } from "../../../../../utils/src/codegraph/managed-runtime.ts";
 import { CODEGRAPH_PINNED_VERSION } from "../../../../../utils/src/codegraph/manifest.ts";
 import { evaluateCodegraphNodeSupport, type CodegraphNodeSupport } from "../../../../../utils/src/codegraph/node-support.ts";
 import { ensureCodegraphProvisioned } from "../../../../../utils/src/codegraph/provision.ts";
@@ -15,6 +15,7 @@ import {
 	type CodegraphCommandResolution,
 } from "../../../../../utils/src/codegraph/resolve.ts";
 import { ensureCodegraphGitignored, prepareCodegraphWorkspace } from "../../../../../utils/src/codegraph/workspace.ts";
+import { runProcessWithTreeTimeout } from "../../../../../utils/src/process-tree.ts";
 import type {
 	CodegraphCommandResult,
 	CodegraphConfig,
@@ -164,15 +165,14 @@ function jsonSaysInitialized(value: unknown): boolean | undefined {
 
 async function runCodegraphCommand(projectRoot: string, command: string, args: readonly string[], options: { readonly env: Record<string, string>; readonly timeoutMs: number }): Promise<CodegraphCommandResult> {
 	const invocation = resolveCodegraphCommandInvocation(command, args);
-	return new Promise((resolvePromise) => {
-		execFile(invocation.command, [...invocation.args], { cwd: projectRoot, encoding: "utf8", env: buildCodegraphChildEnv({ ambientEnv: processEnv, codegraphEnv: options.env }), maxBuffer: 1024 * 1024, timeout: options.timeoutMs, windowsHide: true }, (error, stdout, stderr) => {
-			if (error === null) {
-				resolvePromise({ exitCode: 0, stderr: toOutputText(stderr), stdout: toOutputText(stdout), timedOut: false });
-				return;
-			}
-			resolvePromise({ exitCode: resolveExitCode(error), stderr: toOutputText(stderr), stdout: toOutputText(stdout), timedOut: error.killed === true });
-		});
-	});
+	return runProcessWithTreeTimeout({
+		args: invocation.args,
+		command: invocation.command,
+		cwd: projectRoot,
+		env: buildCodegraphChildEnv({ ambientEnv: processEnv, codegraphEnv: options.env }),
+		maxBuffer: 1024 * 1024,
+		timeoutMs: options.timeoutMs,
+	}).then(({ exitCode, stderr, stdout, timedOut }) => ({ exitCode, stderr, stdout, timedOut }));
 }
 
 export function resolveCodegraphCommandInvocation(
@@ -203,18 +203,7 @@ function safeLogOutcome(logOutcome: (outcome: CodegraphSessionStartOutcome) => v
 }
 
 function provisionedBinFromInstallDir(installDir: string | undefined): string | null {
-	if (installDir === undefined) return null;
-	const candidate = join(installDir, "bin", process.platform === "win32" ? "codegraph.cmd" : "codegraph");
-	return existsSync(candidate) ? candidate : null;
-}
-
-function resolveExitCode(error: Error): number {
-	if ("code" in error && typeof error.code === "number") return error.code;
-	return 1;
-}
-
-function toOutputText(value: string | Buffer): string {
-	return Buffer.isBuffer(value) ? value.toString("utf8") : value;
+	return resolvePinnedCodegraphBin(installDir);
 }
 
 function resolveHomeDir(env: Record<string, string | undefined>): string {

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

@@ -20,6 +20,7 @@ describe("CodeGraph SessionStart exclusion policy", () => {
 		// given
 		const stdout: string[] = [];
 		const spawned: WorkerSpawnInvocation[] = [];
+		let sweepCalls = 0;
 		const stateRoot = createAllowedWorkspace("codegraph-omo-state");
 		const workspace = join(stateRoot, ".omo", "ulw-research", "run", "clones", "repo");
 		mkdirSync(workspace, { recursive: true });
@@ -36,10 +37,14 @@ describe("CodeGraph SessionStart exclusion policy", () => {
 				statusProbe: () => {
 					throw new Error("excluded projects must not probe CodeGraph status");
 				},
+				sweepZombies: () => {
+					sweepCalls += 1;
+				},
 			});
 
 			// then
 			expect(result).toEqual({ action: "skipped-excluded", exitCode: 0 });
+			expect(sweepCalls).toBe(0);
 			expect(spawned).toEqual([]);
 			expect(stdout.join("")).toBe("");
 		} finally {

package/packages/omo-codex/plugin/components/codegraph/test/hook-store-upgrade.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "bun:test";
-import { chmodSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { chmodSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join, resolve } from "node:path";
 import { Readable } from "node:stream";
@@ -44,11 +44,16 @@ function createAllowedWorkspace(prefix: string): string {
 
 // On win32 execFile cannot run a #!/bin/sh script, so emit a codegraph.cmd batch file instead;
 // resolveCodegraphCommandInvocation wraps .cmd in `cmd.exe /d /s /c`, exactly like the real codegraph.cmd.
-function createFakeCodegraphBin(scripts: { readonly posix: string; readonly win32: string }): { readonly binPath: string; readonly dir: string } {
+function createFakeCodegraphBin(scripts: {
+	readonly posix: string;
+	readonly win32: string;
+	readonly win32Sidecar?: string;
+}): { readonly binPath: string; readonly dir: string } {
 	const dir = mkdtempSync(join(tmpdir(), "omo-codegraph-fake-bin-"));
 	if (process.platform === "win32") {
 		const binPath = join(dir, "codegraph.cmd");
 		writeFileSync(binPath, scripts.win32);
+		if (scripts.win32Sidecar !== undefined) writeFileSync(join(dir, "hang.cjs"), scripts.win32Sidecar);
 		return { binPath, dir };
 	}
 	const binPath = join(dir, "codegraph");
@@ -74,6 +79,15 @@ function probeEnv(homeDir: string, binPath: string): Record<string, string> {
 	return { HOME: homeDir, OMO_CODEGRAPH_BIN: binPath, PATH: "/usr/bin:/bin" };
 }
 
+function isProcessAlive(pid: number): boolean {
+	try {
+		process.kill(pid, 0);
+		return true;
+	} catch {
+		return false;
+	}
+}
+
 describe("CodeGraph SessionStart hook with a 1.0.1-era project store under the 1.4.1 binary", () => {
 	it("#given a real 1.4.1 status payload for a migrated 1.0.1 store #when SessionStart probes via the default probe #then it stays silent without spawning a re-init worker", async () => {
 		// given
@@ -110,16 +124,27 @@ describe("CodeGraph SessionStart hook with a 1.0.1-era project store under the 1
 		}
 	});
 
-	it("#given the status probe hangs past its 2s timeout #when SessionStart fires #then it exits zero promptly and spawns at most one bounded worker", async () => {
+	it("#given the status probe spawns a hanging descendant #when SessionStart times out #then it exits promptly and reaps the descendant", async () => {
 		// given
 		const stdout: string[] = [];
 		const spawned: WorkerSpawnInvocation[] = [];
 		const homeDir = mkdtempSync(join(tmpdir(), "omo-codegraph-slow-home-"));
+		const survivorPidPath = join(homeDir, "survivor.pid");
 		const fake = createFakeCodegraphBin({
-			posix: "#!/bin/sh\nsleep 30\n",
-			win32: "@echo off\r\nset /p _probe_hang=\r\n",
+			posix: "#!/bin/sh\nsleep 30 &\necho \"$!\" > \"$HOME/survivor.pid\"\nwait\n",
+			win32: '@echo off\r\nnode "%~dp0hang.cjs"\r\n',
+			win32Sidecar: [
+				'const { spawn } = require("node:child_process");',
+				'const { writeFileSync } = require("node:fs");',
+				'const { join } = require("node:path");',
+				'const child = spawn(process.execPath, ["-e", "setInterval(() => {}, 1000)"], { stdio: "ignore" });',
+				'writeFileSync(join(process.env.HOME, "survivor.pid"), String(child.pid));',
+				"setInterval(() => {}, 1000);",
+				"",
+			].join("\n"),
 		});
 		const workspace = createAllowedWorkspace("codegraph-slow-probe-workspace");
+		let descendantPid: number | undefined;
 
 		try {
 			// when
@@ -133,13 +158,16 @@ describe("CodeGraph SessionStart hook with a 1.0.1-era project store under the 1
 				spawnWorker: (invocation) => spawned.push(invocation),
 			});
 			const elapsedMs = Date.now() - startedAt;
+			descendantPid = Number.parseInt(readFileSync(survivorPidPath, "utf8").trim(), 10);
 
 			// then
 			expect(result.exitCode).toBe(0);
 			expect(result.action).toBe("spawned");
 			expect(spawned).toHaveLength(1);
 			expect(elapsedMs).toBeLessThan(15_000);
+			expect(isProcessAlive(descendantPid)).toBeFalse();
 		} finally {
+			if (descendantPid !== undefined && isProcessAlive(descendantPid)) process.kill(descendantPid, "SIGKILL");
 			rmSync(homeDir, { recursive: true, force: true });
 			rmSync(fake.dir, { recursive: true, force: true });
 			rmSync(workspace, { recursive: true, force: true, maxRetries: 10, retryDelay: 500 });

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

@@ -215,6 +215,7 @@ describe("CodeGraph SessionStart hook", () => {
 		// given
 		const stdout: string[] = [];
 		const spawned: WorkerSpawnInvocation[] = [];
+		const statusProbeDaemonValues: boolean[] = [];
 		const workspace = createAllowedWorkspace("codegraph-workspace");
 
 		try {
@@ -226,12 +227,16 @@ describe("CodeGraph SessionStart hook", () => {
 				stdin: Readable.from(["{}"]),
 				stdout: { write: (chunk) => stdout.push(chunk) },
 				spawnWorker: (invocation) => spawned.push(invocation),
-				statusProbe: () => Promise.resolve(false),
+				statusProbe: (options) => {
+					statusProbeDaemonValues.push(options.daemon);
+					return Promise.resolve(false);
+				},
 				workerCliPath: "/plugin/components/codegraph/dist/cli.js",
 			});
 
 			// then
 			expect(result).toEqual({ action: "spawned", exitCode: 0 });
+			expect(statusProbeDaemonValues).toEqual([true]);
 			expect(spawned).toEqual([
 				{
 					args: ["/plugin/components/codegraph/dist/cli.js", "hook", "session-start-worker"],

package/packages/omo-codex/plugin/components/codegraph/test/provisioned-node-guard.test.ts

@@ -3,6 +3,7 @@ import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 
+import { CODEGRAPH_PINNED_VERSION } from "../../../../../utils/src/codegraph/manifest.ts";
 import { runCodegraphSessionStartWorker } from "../src/hook.ts";
 import { runCodegraphServe } from "../src/serve.ts";
 
@@ -41,7 +42,12 @@ describe("CodeGraph provisioned launcher Node guard", () => {
 
 		try {
 			mkdirSync(join(installDir, "bin"), { recursive: true });
+			mkdirSync(join(installDir, ".provisioned"), { recursive: true });
 			writeFileSync(binPath, "");
+			writeFileSync(
+				join(installDir, ".provisioned", `codegraph-${CODEGRAPH_PINNED_VERSION}.json`),
+				`${JSON.stringify({ binPath, version: CODEGRAPH_PINNED_VERSION })}\n`,
+			);
 
 			// when
 			const result = await runCodegraphSessionStartWorker({

package/packages/omo-codex/plugin/components/codegraph/test/serve-mcp-facade.test.ts

@@ -17,6 +17,7 @@ describe("runCodegraphServe MCP unavailable facade", () => {
 		const run = runCodegraphServe({
 			config: { codegraph: { auto_provision: false, enabled: true }, sources: [], warnings: [] },
 			env: { PATH: "/bin" },
+			nodeVersion: "22.14.0",
 			buildEnv: () => ({}),
 			resolve: () => ({ argsPrefix: [], command: "codegraph", exists: false, source: "path" }),
 			stderr: { write: (chunk: string) => stderr.push(chunk) },

package/packages/omo-codex/plugin/components/codegraph/test/serve-provision.test.ts

@@ -4,7 +4,7 @@ import { join } from "node:path";
 import { runCodegraphServe } from "../src/serve.ts";
 
 describe("runCodegraphServe provisioning", () => {
-	it("#given CodeGraph is unresolved and daemon is off by default #when serving MCP #then provisions CodeGraph before spawning with CODEGRAPH_NO_DAEMON=1", async () => {
+	it("#given CodeGraph is unresolved and daemon is omitted #when serving MCP #then provisions CodeGraph with daemon-on", async () => {
 		// given
 		const binPath = join("/tmp/home/.omo/codegraph", "bin", "codegraph");
 		const calls: Array<{
@@ -42,7 +42,6 @@ describe("runCodegraphServe provisioning", () => {
 				command: binPath,
 				env: {
 					CODEGRAPH_INSTALL_DIR: join("/tmp/home", ".omo", "codegraph"),
-					CODEGRAPH_NO_DAEMON: "1",
 					CODEGRAPH_NO_DOWNLOAD: "1",
 					CODEGRAPH_TELEMETRY: "0",
 					DO_NOT_TRACK: "1",
@@ -52,7 +51,7 @@ describe("runCodegraphServe provisioning", () => {
 		]);
 	});
 
-	it("#given CodeGraph is unresolved and codegraph.daemon=true #when serving MCP #then provisions CodeGraph and omits CODEGRAPH_NO_DAEMON so the daemon may run", async () => {
+	it("#given CodeGraph is unresolved and codegraph.daemon=false #when serving MCP #then provisions CodeGraph with daemon-off", async () => {
 		// given
 		const binPath = join("/tmp/home/.omo/codegraph", "bin", "codegraph");
 		const calls: Array<{
@@ -64,7 +63,7 @@ describe("runCodegraphServe provisioning", () => {
 
 		// when
 		const exitCode = await runCodegraphServe({
-			config: { codegraph: { daemon: true, enabled: true }, sources: [], warnings: [] },
+			config: { codegraph: { daemon: false, enabled: true }, sources: [], warnings: [] },
 			env: { PATH: "/bin" },
 			homeDir: "/tmp/home",
 			nodeVersion: "22.14.0",
@@ -90,6 +89,7 @@ describe("runCodegraphServe provisioning", () => {
 				command: binPath,
 				env: {
 					CODEGRAPH_INSTALL_DIR: join("/tmp/home", ".omo", "codegraph"),
+					CODEGRAPH_NO_DAEMON: "1",
 					CODEGRAPH_NO_DOWNLOAD: "1",
 					CODEGRAPH_TELEMETRY: "0",
 					DO_NOT_TRACK: "1",
@@ -97,6 +97,6 @@ describe("runCodegraphServe provisioning", () => {
 				},
 			},
 		]);
-		expect(calls[0]?.env["CODEGRAPH_NO_DAEMON"]).toBeUndefined();
+		expect(calls[0]?.env["CODEGRAPH_NO_DAEMON"]).toBe("1");
 	});
 });

package/packages/omo-codex/plugin/components/codegraph/test/serve-unavailable.test.ts

@@ -17,6 +17,7 @@ describe("runCodegraphServe unavailable CodeGraph paths", () => {
 			...closedMcpStdio(),
 			config: { codegraph: { auto_provision: false, enabled: true }, sources: [], warnings: [] },
 			env: { PATH: "/bin" },
+			nodeVersion: "22.14.0",
 			buildEnv: () => ({}),
 			resolve: () => ({ argsPrefix: [], command: "codegraph", exists: false, source: "path" }),
 			runProcess: (command: string) => {

package/packages/omo-codex/plugin/components/codegraph/test/serve.test.ts

@@ -5,6 +5,7 @@ import { dirname, join, resolve } from "node:path";
 import { Readable, Writable } from "node:stream";
 import { fileURLToPath } from "node:url";
 
+import { CODEGRAPH_PINNED_VERSION } from "../../../../../utils/src/codegraph/manifest.ts";
 import { resolveServeProcessInvocation, runCodegraphServe } from "../src/serve.ts";
 
 const componentRoot = resolve(dirname(fileURLToPath(import.meta.url)), "..");
@@ -48,7 +49,6 @@ describe("runCodegraphServe", () => {
 				cwd: resolve(runCwd),
 				env: {
 					CODEGRAPH_INSTALL_DIR: join("/tmp/home", ".omo", "codegraph"),
-					CODEGRAPH_NO_DAEMON: "1",
 					CODEGRAPH_NO_DOWNLOAD: "1",
 					CODEGRAPH_TELEMETRY: "0",
 					DO_NOT_TRACK: "1",
@@ -61,7 +61,7 @@ describe("runCodegraphServe", () => {
 		expect(calls[0]?.env["OPENAI_API_KEY"]).toBeUndefined();
 	});
 
-	it("#given codegraph.daemon=true #when serving MCP #then CODEGRAPH_NO_DAEMON is omitted so the daemon may run", async () => {
+	it("#given codegraph.daemon=false #when serving MCP #then CODEGRAPH_NO_DAEMON pins daemon-off", async () => {
 		// given
 		const runCwd = componentRoot;
 		const calls: Array<{
@@ -74,7 +74,7 @@ describe("runCodegraphServe", () => {
 
 		// when
 		const exitCode = await runCodegraphServe({
-			config: { codegraph: { daemon: true, enabled: true }, sources: [], warnings: [] },
+			config: { codegraph: { daemon: false, enabled: true }, sources: [], warnings: [] },
 			cwd: runCwd,
 			env: { CUSTOM: "drop", HOME: "/tmp/home", OPENAI_API_KEY: "sk-test-secret" },
 			nodeVersion: "22.14.0",
@@ -100,6 +100,7 @@ describe("runCodegraphServe", () => {
 				cwd: resolve(runCwd),
 				env: {
 					CODEGRAPH_INSTALL_DIR: join("/tmp/home", ".omo", "codegraph"),
+					CODEGRAPH_NO_DAEMON: "1",
 					CODEGRAPH_NO_DOWNLOAD: "1",
 					CODEGRAPH_TELEMETRY: "0",
 					DO_NOT_TRACK: "1",
@@ -108,7 +109,7 @@ describe("runCodegraphServe", () => {
 				stdio: "pipe",
 			},
 		]);
-		expect(calls[0]?.env["CODEGRAPH_NO_DAEMON"]).toBeUndefined();
+		expect(calls[0]?.env["CODEGRAPH_NO_DAEMON"]).toBe("1");
 		expect(calls[0]?.env["CUSTOM"]).toBeUndefined();
 		expect(calls[0]?.env["OPENAI_API_KEY"]).toBeUndefined();
 	});
@@ -182,12 +183,12 @@ describe("runCodegraphServe", () => {
 		expect(spawned).toEqual([{ args: ["serve", "--mcp"], command: commandPath }]);
 	});
 
-	it("#given Windows Codex SOT install_dir has codegraph.cmd and daemon is off by default #when serving MCP #then it resolves there, exports CODEGRAPH_INSTALL_DIR, and pins CODEGRAPH_NO_DAEMON=1", async () => {
-		await withProcessPlatform("win32", async () => {
+	it("#given Codex SOT install_dir has the pinned launcher and daemon is omitted #when serving MCP #then it defaults daemon-on", async () => {
+		await withProcessPlatform(process.platform, async () => {
 			// given
 			const tempRoot = mkdtempSync(join(tmpdir(), "omo-codegraph-serve-install-dir-"));
 			const installDir = join(tempRoot, "custom-codegraph");
-			const binPath = join(installDir, "bin", "codegraph.cmd");
+			const binPath = join(installDir, "bin", process.platform === "win32" ? "codegraph.cmd" : "codegraph");
 			const calls: Array<{
 				readonly args: readonly string[];
 				readonly command: string;
@@ -196,7 +197,12 @@ describe("runCodegraphServe", () => {
 
 			try {
 				mkdirSync(join(installDir, "bin"), { recursive: true });
+				mkdirSync(join(installDir, ".provisioned"), { recursive: true });
 				writeFileSync(binPath, "");
+				writeFileSync(
+					join(installDir, ".provisioned", `codegraph-${CODEGRAPH_PINNED_VERSION}.json`),
+					`${JSON.stringify({ binPath, version: CODEGRAPH_PINNED_VERSION })}\n`,
+				);
 
 				// when
 				const exitCode = await runCodegraphServe({
@@ -223,7 +229,6 @@ describe("runCodegraphServe", () => {
 						command: binPath,
 						env: {
 							CODEGRAPH_INSTALL_DIR: installDir,
-							CODEGRAPH_NO_DAEMON: "1",
 							CODEGRAPH_NO_DOWNLOAD: "1",
 							CODEGRAPH_TELEMETRY: "0",
 							DO_NOT_TRACK: "1",
@@ -237,12 +242,12 @@ describe("runCodegraphServe", () => {
 		});
 	});
 
-	it("#given Windows Codex SOT install_dir with codegraph.daemon=true #when serving MCP #then CODEGRAPH_NO_DAEMON is omitted so the daemon may run", async () => {
-		await withProcessPlatform("win32", async () => {
+	it("#given Codex SOT install_dir with codegraph.daemon=false #when serving MCP #then CODEGRAPH_NO_DAEMON pins daemon-off", async () => {
+		await withProcessPlatform(process.platform, async () => {
 			// given
 			const tempRoot = mkdtempSync(join(tmpdir(), "omo-codegraph-serve-install-dir-daemon-"));
 			const installDir = join(tempRoot, "custom-codegraph");
-			const binPath = join(installDir, "bin", "codegraph.cmd");
+			const binPath = join(installDir, "bin", process.platform === "win32" ? "codegraph.cmd" : "codegraph");
 			const calls: Array<{
 				readonly args: readonly string[];
 				readonly command: string;
@@ -251,11 +256,16 @@ describe("runCodegraphServe", () => {
 
 			try {
 				mkdirSync(join(installDir, "bin"), { recursive: true });
+				mkdirSync(join(installDir, ".provisioned"), { recursive: true });
 				writeFileSync(binPath, "");
+				writeFileSync(
+					join(installDir, ".provisioned", `codegraph-${CODEGRAPH_PINNED_VERSION}.json`),
+					`${JSON.stringify({ binPath, version: CODEGRAPH_PINNED_VERSION })}\n`,
+				);
 
 				// when
 				const exitCode = await runCodegraphServe({
-					config: { codegraph: { daemon: true, enabled: true, install_dir: installDir }, sources: [], trustedCodegraphInstallDir: installDir, warnings: [] },
+					config: { codegraph: { daemon: false, enabled: true, install_dir: installDir }, sources: [], trustedCodegraphInstallDir: installDir, warnings: [] },
 					env: { HOME: "/tmp/home" },
 					nodeVersion: "22.14.0",
 					homeDir: "/tmp/home",
@@ -278,6 +288,7 @@ describe("runCodegraphServe", () => {
 						command: binPath,
 						env: {
 							CODEGRAPH_INSTALL_DIR: installDir,
+							CODEGRAPH_NO_DAEMON: "1",
 							CODEGRAPH_NO_DOWNLOAD: "1",
 							CODEGRAPH_TELEMETRY: "0",
 							DO_NOT_TRACK: "1",
@@ -285,7 +296,7 @@ describe("runCodegraphServe", () => {
 						},
 					},
 				]);
-				expect(calls[0]?.env["CODEGRAPH_NO_DAEMON"]).toBeUndefined();
+				expect(calls[0]?.env["CODEGRAPH_NO_DAEMON"]).toBe("1");
 			} finally {
 				rmSync(tempRoot, { recursive: true, force: true });
 			}