oh-my-opencode 4.12.1 → 4.13.0

package/packages/omo-codex/plugin/components/codegraph/dist/serve.js

@@ -3,13 +3,15 @@
 // src/serve.ts
 import { spawn } from "node:child_process";
 import { existsSync as existsSync5, realpathSync } from "node:fs";
-import { homedir as homedir5 } from "node:os";
+import { homedir as homedir6 } from "node:os";
 import { basename as basename3, extname, join as join6, resolve as resolve2 } from "node:path";
 import {
   cwd as processCwd,
   env as processEnv,
   execPath as processExecPath,
-  stderr as processStderr
+  stdin as processStdin,
+  stderr as processStderr,
+  stdout as processStdout
 } from "node:process";
 import { fileURLToPath } from "node:url";
 
@@ -473,6 +475,9 @@ function resolveCodegraphCommand(options = {}) {
   };
 }
 
+// ../../shared/src/config-loader.ts
+import { homedir as homedir5 } from "node:os";
+
 // ../../../../utils/src/omo-config/loader.ts
 import { existsSync as existsSync4, readFileSync } from "node:fs";
 import { homedir as homedir4 } from "node:os";
@@ -1698,18 +1703,278 @@ function loadOmoConfig(options) {
 
 // ../../shared/src/config-loader.ts
 function getCodexOmoConfig(options = {}) {
+  const env = options.env ?? process.env;
+  const homeDir = resolveHomeDir(options);
   const result = loadOmoConfig({
     ...options.cwd === undefined ? {} : { cwd: options.cwd },
-    ...options.env === undefined ? {} : { env: options.env },
-    ...options.homeDir === undefined ? {} : { homeDir: options.homeDir },
+    env,
+    homeDir,
+    harness: "codex"
+  });
+  const trustedConfig = loadOmoConfig({
+    cwd: homeDir,
+    env,
+    homeDir,
     harness: "codex"
   });
+  const trustedCodegraphInstallDir = trustedConfig.config.codegraph?.install_dir;
   return {
     ...result.config,
     sources: result.sources,
+    ...trustedCodegraphInstallDir === undefined ? {} : { trustedCodegraphInstallDir },
     warnings: result.warnings
   };
 }
+function resolveHomeDir(options) {
+  const env = options.env ?? process.env;
+  return options.homeDir ?? env["HOME"] ?? env["USERPROFILE"] ?? homedir5();
+}
+
+// ../../../../mcp-stdio-core/src/record.ts
+function isPlainRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+// ../../../../mcp-stdio-core/src/responses.ts
+function successResponse(id, result) {
+  return { jsonrpc: "2.0", id, result };
+}
+function errorResponse(id, code, message, data) {
+  return { jsonrpc: "2.0", id, error: data === undefined ? { code, message } : { code, message, data } };
+}
+function jsonRpcId(value) {
+  return typeof value === "string" || typeof value === "number" || value === null ? value : null;
+}
+// ../../../../mcp-stdio-core/src/transport.ts
+var HEADER_SEPARATOR = Buffer.from(`\r
+\r
+`);
+async function* readStdioJsonRpcMessages(input) {
+  let buffer = Buffer.alloc(0);
+  for await (const chunk of input) {
+    buffer = Buffer.concat([buffer, bufferFromChunk(chunk)]);
+    while (true) {
+      const result = readNextMessage(buffer);
+      if (result.kind === "incomplete")
+        break;
+      buffer = result.remaining;
+      if (result.message)
+        yield result.message;
+    }
+  }
+  const trailing = buffer.toString("utf8").trim();
+  if (trailing.length > 0) {
+    yield parseJsonPayload(trailing, "line");
+  }
+}
+function writeStdioJsonRpcResponse(output, response, responseMode) {
+  const body = JSON.stringify(response);
+  if (responseMode === "framed") {
+    output.write(`Content-Length: ${Buffer.byteLength(body, "utf8")}\r
+\r
+${body}`);
+    return;
+  }
+  output.write(`${body}
+`);
+}
+function readNextMessage(buffer) {
+  if (buffer.length === 0)
+    return { kind: "incomplete" };
+  return startsWithContentLength(buffer) ? readFramedMessage(buffer) : readLineMessage(buffer);
+}
+function readLineMessage(buffer) {
+  const newlineIndex = buffer.indexOf(10);
+  if (newlineIndex === -1)
+    return { kind: "incomplete" };
+  const line = buffer.subarray(0, newlineIndex).toString("utf8").replace(/\r$/, "");
+  if (line.trim().length === 0) {
+    return { kind: "complete", remaining: buffer.subarray(newlineIndex + 1) };
+  }
+  return {
+    kind: "complete",
+    message: parseJsonPayload(line, "line"),
+    remaining: buffer.subarray(newlineIndex + 1)
+  };
+}
+function readFramedMessage(buffer) {
+  const separatorIndex = buffer.indexOf(HEADER_SEPARATOR);
+  if (separatorIndex === -1)
+    return { kind: "incomplete" };
+  const headers = buffer.subarray(0, separatorIndex).toString("ascii");
+  const contentLength = parseContentLength(headers);
+  const bodyStart = separatorIndex + HEADER_SEPARATOR.length;
+  if (contentLength === undefined) {
+    return {
+      kind: "complete",
+      message: {
+        kind: "parse_error",
+        message: "Missing or invalid Content-Length header",
+        responseMode: "framed"
+      },
+      remaining: buffer.subarray(bodyStart)
+    };
+  }
+  const bodyEnd = bodyStart + contentLength;
+  if (buffer.length < bodyEnd)
+    return { kind: "incomplete" };
+  const body = buffer.subarray(bodyStart, bodyEnd).toString("utf8");
+  return {
+    kind: "complete",
+    message: parseJsonPayload(body, "framed"),
+    remaining: buffer.subarray(bodyEnd)
+  };
+}
+function startsWithContentLength(buffer) {
+  const prefix = buffer.subarray(0, "content-length:".length).toString("ascii").toLowerCase();
+  return prefix === "content-length:";
+}
+function parseContentLength(headers) {
+  for (const line of headers.split(`\r
+`)) {
+    const match = /^content-length:\s*(\d+)$/i.exec(line);
+    if (match === null)
+      continue;
+    const value = match[1];
+    if (value === undefined)
+      return;
+    return Number(value);
+  }
+  return;
+}
+function parseJsonPayload(payload, responseMode) {
+  try {
+    return { kind: "request", payload: JSON.parse(payload), responseMode };
+  } catch (error) {
+    return { kind: "parse_error", message: error instanceof Error ? error.message : String(error), responseMode };
+  }
+}
+function bufferFromChunk(chunk) {
+  if (Buffer.isBuffer(chunk))
+    return chunk;
+  if (typeof chunk === "string")
+    return Buffer.from(chunk);
+  throw new TypeError(`Unsupported stdio chunk type: ${typeof chunk}`);
+}
+
+// ../../../../mcp-stdio-core/src/server.ts
+var DEFAULT_IDLE_TIMEOUT_MS = 10 * 60000;
+var noopLog = () => {};
+async function runJsonRpcStdioServer(config) {
+  const log = config.log ?? noopLog;
+  const idleTimeoutMs = config.idleTimeoutMs ?? DEFAULT_IDLE_TIMEOUT_MS;
+  const idleTimer = createIdleTimer(idleTimeoutMs, log, config.onIdleTimeout);
+  log("stdio_started", { cwd: process.cwd(), idle_timeout_ms: idleTimeoutMs });
+  idleTimer.arm();
+  try {
+    for await (const message of readStdioJsonRpcMessages(config.input)) {
+      if (idleTimer.closed())
+        break;
+      idleTimer.arm();
+      if (message.kind === "parse_error") {
+        handleParseError(message, config, log);
+        continue;
+      }
+      await handleRequest(message, config, log);
+    }
+  } finally {
+    idleTimer.clear();
+    log("stdio_stopped");
+  }
+}
+function handleParseError(message, config, log) {
+  log("parse_error", { message: message.message });
+  const response = config.parseErrorResponse?.(message.message) ?? errorResponse(null, -32700, "Parse error", message.message);
+  if (response !== undefined) {
+    writeStdioJsonRpcResponse(config.output, response, message.responseMode);
+  }
+}
+async function handleRequest(message, config, log) {
+  const parsed = message.payload;
+  const id = isPlainRecord(parsed) ? jsonRpcId(parsed["id"]) : null;
+  const method = isPlainRecord(parsed) && typeof parsed["method"] === "string" ? parsed["method"] : null;
+  log("request", { id: id === null ? null : String(id), method });
+  try {
+    const response = await config.handler(parsed, config.handlerOptions);
+    if (response === undefined)
+      return;
+    writeStdioJsonRpcResponse(config.output, response, message.responseMode);
+    log("response", { id: String(response.id), method, is_error: response.error !== undefined });
+  } catch (error) {
+    if (config.onHandlerError === undefined)
+      throw error;
+    config.onHandlerError(error);
+  }
+}
+function createIdleTimer(idleTimeoutMs, log, onIdleTimeout) {
+  let timer = null;
+  let isClosed = false;
+  return {
+    arm: () => {
+      if (timer !== null)
+        clearTimeout(timer);
+      if (idleTimeoutMs <= 0)
+        return;
+      timer = setTimeout(() => {
+        isClosed = true;
+        log("idle_timeout", { idle_timeout_ms: idleTimeoutMs });
+        onIdleTimeout?.();
+      }, idleTimeoutMs);
+      timer.unref();
+    },
+    clear: () => {
+      if (timer === null)
+        return;
+      clearTimeout(timer);
+      timer = null;
+    },
+    closed: () => isClosed
+  };
+}
+// src/mcp-unavailable.ts
+async function runUnavailableCodegraphMcpServer(options) {
+  await runJsonRpcStdioServer({
+    handler: handleUnavailableCodegraphMcpRequest,
+    handlerOptions: {
+      reason: options.reason.trim(),
+      serverVersion: options.serverVersion
+    },
+    input: options.input,
+    output: options.output
+  });
+}
+async function handleUnavailableCodegraphMcpRequest(input, options) {
+  if (!isPlainRecord(input)) {
+    return errorResponse(null, -32600, "Invalid Request");
+  }
+  const id = jsonRpcId(input["id"]);
+  const method = input["method"];
+  if (method === "notifications/initialized")
+    return;
+  if (method === "ping")
+    return successResponse(id, {});
+  if (method === "initialize") {
+    return successResponse(id, {
+      capabilities: { tools: { listChanged: false } },
+      protocolVersion: requestedProtocolVersion(input["params"]),
+      serverInfo: { name: "codegraph", version: options.serverVersion }
+    });
+  }
+  if (method === "tools/list") {
+    return successResponse(id, { tools: [] });
+  }
+  if (method === "tools/call") {
+    return successResponse(id, {
+      content: [{ text: options.reason, type: "text" }],
+      isError: true
+    });
+  }
+  return errorResponse(id, -32601, `Method not found: ${String(method)}`);
+}
+function requestedProtocolVersion(params) {
+  if (!isPlainRecord(params) || typeof params["protocolVersion"] !== "string")
+    return "2024-11-05";
+  return params["protocolVersion"];
+}
 
 // src/serve.ts
 var CODEGRAPH_SKIP_HINT = `CodeGraph MCP skipped: codegraph binary not found. Install CodeGraph or set OMO_CODEGRAPH_BIN.
@@ -1721,43 +1986,41 @@ var WINDOWS_CMD_EXTENSIONS = new Set([".bat", ".cmd"]);
 var WINDOWS_NODE_SCRIPT_EXTENSIONS = new Set([".cjs", ".js", ".mjs"]);
 async function runCodegraphServe(options = {}) {
   const env = options.env ?? processEnv;
-  const homeDir = options.homeDir ?? homedir5();
+  const homeDir = options.homeDir ?? homedir6();
   const config = options.config ?? getCodexOmoConfig({ cwd: options.cwd ?? processCwd(), env, homeDir });
   const codegraphConfig = config.codegraph ?? {};
   if (codegraphConfig.enabled === false) {
-    (options.stderr ?? processStderr).write(CODEGRAPH_DISABLED_HINT);
-    return 1;
+    return runUnavailableMcp(CODEGRAPH_DISABLED_HINT, options);
   }
+  const trustedInstallDir = config.trustedCodegraphInstallDir;
   const resolutionOptions = {
     env,
     homeDir,
-    provisioned: () => provisionedBinFromInstallDir(codegraphConfig.install_dir)
+    provisioned: () => provisionedBinFromInstallDir(trustedInstallDir)
   };
   let resolution = options.resolve?.(resolutionOptions) ?? resolveCodegraphCommand(resolutionOptions);
   const nodeSupport = evaluateCodegraphNodeSupport({ env, nodeVersion: options.nodeVersion });
   if (!resolution.exists || shouldSkipResolvedCommand(resolution, options.commandExists ?? existsSync5)) {
     if (resolution.source === "path" && !nodeSupport.supported) {
-      (options.stderr ?? processStderr).write(buildCodegraphNodeSkipHint(nodeSupport));
-      return 1;
+      return runUnavailableMcp(buildCodegraphNodeSkipHint(nodeSupport), options);
     }
     const provisioned = await provisionMissingCodegraph({
       config: codegraphConfig,
       ensureProvisioned: options.ensureProvisioned ?? ensureCodegraphProvisioned,
       homeDir,
-      resolution
+      resolution,
+      ...trustedInstallDir === undefined ? {} : { trustedInstallDir }
     });
     if (provisioned === null) {
-      (options.stderr ?? processStderr).write(CODEGRAPH_SKIP_HINT);
-      return 1;
+      return runUnavailableMcp(CODEGRAPH_SKIP_HINT, options);
     }
     resolution = provisioned;
   }
   if (codegraphCommandRequiresSupportedLocalNode(resolution) && !nodeSupport.supported) {
-    (options.stderr ?? processStderr).write(buildCodegraphNodeSkipHint(nodeSupport));
-    return 1;
+    return runUnavailableMcp(buildCodegraphNodeSkipHint(nodeSupport), options);
   }
   const runProcess = options.runProcess ?? runChildProcess;
-  const codegraphEnv = codegraphEnvForConfig(codegraphConfig, homeDir, options.buildEnv);
+  const codegraphEnv = codegraphEnvForConfig(trustedInstallDir, homeDir, options.buildEnv);
   const mergedEnv = {
     ...env,
     ...codegraphEnv
@@ -1767,12 +2030,22 @@ async function runCodegraphServe(options = {}) {
     stdio: "inherit"
   });
 }
+async function runUnavailableMcp(reason, options) {
+  (options.stderr ?? processStderr).write(reason);
+  await runUnavailableCodegraphMcpServer({
+    input: options.stdin ?? processStdin,
+    output: options.stdout ?? processStdout,
+    reason,
+    serverVersion: CODEGRAPH_VERSION
+  });
+  return 0;
+}
 async function provisionMissingCodegraph(options) {
   if (options.resolution.source === "env")
     return null;
   if (options.config.auto_provision === false)
     return null;
-  const installDir = options.config.install_dir ?? join6(options.homeDir, ".omo", "codegraph");
+  const installDir = options.trustedInstallDir ?? join6(options.homeDir, ".omo", "codegraph");
   const result = await options.ensureProvisioned({
     installDir,
     lockDir: join6(installDir, ".locks"),
@@ -1792,9 +2065,9 @@ function shouldSkipResolvedCommand(resolution, commandExists) {
 function looksLikePath2(command) {
   return command.includes("/") || command.includes("\\");
 }
-function codegraphEnvForConfig(config, homeDir, buildEnv) {
+function codegraphEnvForConfig(trustedInstallDir, homeDir, buildEnv) {
   const env = buildEnv?.({ homeDir }) ?? buildCodegraphEnv({ homeDir });
-  return config.install_dir === undefined ? env : { ...env, CODEGRAPH_INSTALL_DIR: config.install_dir };
+  return trustedInstallDir === undefined ? env : { ...env, CODEGRAPH_INSTALL_DIR: trustedInstallDir };
 }
 function provisionedBinFromInstallDir(installDir) {
   if (installDir === undefined)

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

@@ -1,6 +1,6 @@
 {
 	"name": "@sisyphuslabs/codex-codegraph",
-	"version": "4.12.1",
+	"version": "4.13.0",
 	"description": "Codex plugin MCP wrapper for CodeGraph.",
 	"type": "module",
 	"private": true,
@@ -8,10 +8,13 @@
 		"omo-codegraph": "./dist/cli.js"
 	},
 	"files": [
-		"dist"
+		"dist",
+		"LICENSE",
+		"NODE-RUNTIME-LICENSES.md",
+		"NOTICE"
 	],
 	"scripts": {
-		"build": "bun build src/serve.ts --target node --format esm --outfile dist/serve.js && bun build src/cli.ts --target node --format esm --outfile dist/cli.js",
+		"build": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\" && bun build src/serve.ts --target node --format esm --outfile dist/serve.js && bun build src/cli.ts --target node --format esm --outfile dist/cli.js",
 		"test": "bun test test/*.test.ts",
 		"typecheck": "tsc --noEmit"
 	},
@@ -21,6 +24,9 @@
 		"bun-types": "^1.3.1",
 		"typescript": "^6.0.3"
 	},
+	"optionalDependencies": {
+		"@colbymchenry/codegraph": "1.0.1"
+	},
 	"engines": {
 		"node": ">=20.0.0"
 	}

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

@@ -0,0 +1,75 @@
+import type { Readable, Writable } from "node:stream";
+
+import {
+	errorResponse,
+	isPlainRecord,
+	jsonRpcId,
+	runJsonRpcStdioServer,
+	successResponse,
+	type JsonRpcResponse,
+} from "../../../../../mcp-stdio-core/src/index.ts";
+
+export interface UnavailableCodegraphMcpOptions {
+	readonly input: Readable;
+	readonly output: Writable;
+	readonly reason: string;
+	readonly serverVersion: string;
+}
+
+interface UnavailableCodegraphMcpHandlerOptions {
+	readonly reason: string;
+	readonly serverVersion: string;
+}
+
+export async function runUnavailableCodegraphMcpServer(
+	options: UnavailableCodegraphMcpOptions,
+): Promise<void> {
+	await runJsonRpcStdioServer({
+		handler: handleUnavailableCodegraphMcpRequest,
+		handlerOptions: {
+			reason: options.reason.trim(),
+			serverVersion: options.serverVersion,
+		},
+		input: options.input,
+		output: options.output,
+	});
+}
+
+async function handleUnavailableCodegraphMcpRequest(
+	input: unknown,
+	options: UnavailableCodegraphMcpHandlerOptions,
+): Promise<JsonRpcResponse | undefined> {
+	if (!isPlainRecord(input)) {
+		return errorResponse(null, -32600, "Invalid Request");
+	}
+
+	const id = jsonRpcId(input["id"]);
+	const method = input["method"];
+	if (method === "notifications/initialized") return undefined;
+	if (method === "ping") return successResponse(id, {});
+	if (method === "initialize") {
+		return successResponse(id, {
+			capabilities: { tools: { listChanged: false } },
+			protocolVersion: requestedProtocolVersion(input["params"]),
+			serverInfo: { name: "codegraph", version: options.serverVersion },
+		});
+	}
+
+	if (method === "tools/list") {
+		return successResponse(id, { tools: [] });
+	}
+
+	if (method === "tools/call") {
+		return successResponse(id, {
+			content: [{ text: options.reason, type: "text" }],
+			isError: true,
+		});
+	}
+
+	return errorResponse(id, -32601, `Method not found: ${String(method)}`);
+}
+
+function requestedProtocolVersion(params: unknown): string {
+	if (!isPlainRecord(params) || typeof params["protocolVersion"] !== "string") return "2024-11-05";
+	return params["protocolVersion"];
+}

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

@@ -7,8 +7,11 @@ import {
 	cwd as processCwd,
 	env as processEnv,
 	execPath as processExecPath,
+	stdin as processStdin,
 	stderr as processStderr,
+	stdout as processStdout,
 } from "node:process";
+import type { Readable, Writable } from "node:stream";
 import { fileURLToPath } from "node:url";
 
 import { buildCodegraphEnv } from "../../../../../utils/src/codegraph/env.ts";
@@ -28,6 +31,7 @@ import {
 } from "../../../../../utils/src/codegraph/resolve.ts";
 import { getCodexOmoConfig, type CodexOmoConfig } from "../../../shared/src/config-loader.ts";
 import type { CodegraphConfig } from "./hook.js";
+import { runUnavailableCodegraphMcpServer } from "./mcp-unavailable.js";
 
 export type ServeStdio = "inherit";
 
@@ -61,6 +65,8 @@ export interface RunCodegraphServeOptions {
 	readonly cwd?: string;
 	readonly env?: Record<string, string | undefined>;
 	readonly homeDir?: string;
+	readonly stdin?: Readable;
+	readonly stdout?: Writable;
 	readonly nodeVersion?: string;
 	readonly resolve?: (options: ResolveCodegraphCommandOptions) => ReturnType<typeof resolveCodegraphCommand>;
 	readonly runProcess?: CodegraphServeProcessRunner;
@@ -82,42 +88,40 @@ export async function runCodegraphServe(options: RunCodegraphServeOptions = {}):
 	const config = options.config ?? getCodexOmoConfig({ cwd: options.cwd ?? processCwd(), env, homeDir });
 	const codegraphConfig = config.codegraph ?? {};
 	if (codegraphConfig.enabled === false) {
-		(options.stderr ?? processStderr).write(CODEGRAPH_DISABLED_HINT);
-		return 1;
+		return runUnavailableMcp(CODEGRAPH_DISABLED_HINT, options);
 	}
 
+	const trustedInstallDir = config.trustedCodegraphInstallDir;
 	const resolutionOptions = {
 		env,
 		homeDir,
-		provisioned: () => provisionedBinFromInstallDir(codegraphConfig.install_dir),
+		provisioned: () => provisionedBinFromInstallDir(trustedInstallDir),
 	} satisfies ResolveCodegraphCommandOptions;
 	let resolution = options.resolve?.(resolutionOptions) ?? resolveCodegraphCommand(resolutionOptions);
 	const nodeSupport = evaluateCodegraphNodeSupport({ env, nodeVersion: options.nodeVersion });
 	if (!resolution.exists || shouldSkipResolvedCommand(resolution, options.commandExists ?? existsSync)) {
 		if (resolution.source === "path" && !nodeSupport.supported) {
-			(options.stderr ?? processStderr).write(buildCodegraphNodeSkipHint(nodeSupport));
-			return 1;
+			return runUnavailableMcp(buildCodegraphNodeSkipHint(nodeSupport), options);
 		}
 		const provisioned = await provisionMissingCodegraph({
 			config: codegraphConfig,
 			ensureProvisioned: options.ensureProvisioned ?? ensureCodegraphProvisioned,
 			homeDir,
 			resolution,
+			...(trustedInstallDir === undefined ? {} : { trustedInstallDir }),
 		});
 		if (provisioned === null) {
-			(options.stderr ?? processStderr).write(CODEGRAPH_SKIP_HINT);
-			return 1;
+			return runUnavailableMcp(CODEGRAPH_SKIP_HINT, options);
 		}
 		resolution = provisioned;
 	}
 
 	if (codegraphCommandRequiresSupportedLocalNode(resolution) && !nodeSupport.supported) {
-		(options.stderr ?? processStderr).write(buildCodegraphNodeSkipHint(nodeSupport));
-		return 1;
+		return runUnavailableMcp(buildCodegraphNodeSkipHint(nodeSupport), options);
 	}
 
 	const runProcess = options.runProcess ?? runChildProcess;
-	const codegraphEnv = codegraphEnvForConfig(codegraphConfig, homeDir, options.buildEnv);
+	const codegraphEnv = codegraphEnvForConfig(trustedInstallDir, homeDir, options.buildEnv);
 	const mergedEnv = {
 		...env,
 		...codegraphEnv,
@@ -128,16 +132,28 @@ export async function runCodegraphServe(options: RunCodegraphServeOptions = {}):
 	});
 }
 
+async function runUnavailableMcp(reason: string, options: RunCodegraphServeOptions): Promise<number> {
+	(options.stderr ?? processStderr).write(reason);
+	await runUnavailableCodegraphMcpServer({
+		input: options.stdin ?? processStdin,
+		output: options.stdout ?? processStdout,
+		reason,
+		serverVersion: CODEGRAPH_VERSION,
+	});
+	return 0;
+}
+
 async function provisionMissingCodegraph(options: {
 	readonly config: CodegraphConfig;
 	readonly ensureProvisioned: CodegraphProvisioner;
 	readonly homeDir: string;
 	readonly resolution: CodegraphCommandResolution;
+	readonly trustedInstallDir?: string;
 }): Promise<CodegraphCommandResolution | null> {
 	if (options.resolution.source === "env") return null;
 	if (options.config.auto_provision === false) return null;
 
-	const installDir = options.config.install_dir ?? join(options.homeDir, ".omo", "codegraph");
+	const installDir = options.trustedInstallDir ?? join(options.homeDir, ".omo", "codegraph");
 	const result = await options.ensureProvisioned({
 		installDir,
 		lockDir: join(installDir, ".locks"),
@@ -161,12 +177,12 @@ function looksLikePath(command: string): boolean {
 }
 
 function codegraphEnvForConfig(
-	config: CodegraphConfig,
+	trustedInstallDir: string | undefined,
 	homeDir: string,
 	buildEnv: ((options: { readonly homeDir: string }) => Record<string, string>) | undefined,
 ): Record<string, string> {
 	const env = buildEnv?.({ homeDir }) ?? buildCodegraphEnv({ homeDir });
-	return config.install_dir === undefined ? env : { ...env, CODEGRAPH_INSTALL_DIR: config.install_dir };
+	return trustedInstallDir === undefined ? env : { ...env, CODEGRAPH_INSTALL_DIR: trustedInstallDir };
 }
 
 function provisionedBinFromInstallDir(installDir: string | undefined): string | null {