oh-my-opencode 4.7.5 → 4.8.0

package/dist/tools/delegate-task/sync-task-runner.d.ts

@@ -0,0 +1,30 @@
+import type { TaskToastManager } from "../../features/task-toast-manager/manager";
+import type { ModelFallbackInfo } from "../../features/task-toast-manager/types";
+import type { FallbackEntry } from "../../shared/model-requirements";
+import type { ExecutorContext, ParentContext } from "./executor-types";
+import type { SyncTaskDeps } from "./sync-task-deps";
+import type { DelegatedModelConfig, DelegateTaskArgs, ToolContextWithMetadata } from "./types";
+type SyncTaskRunnerInput = {
+    readonly args: DelegateTaskArgs;
+    readonly ctx: ToolContextWithMetadata;
+    readonly executorCtx: ExecutorContext;
+    readonly parentContext: ParentContext;
+    readonly agentToUse: string;
+    readonly categoryModel: DelegatedModelConfig | undefined;
+    readonly fallbackChain: FallbackEntry[] | undefined;
+    readonly deps: SyncTaskDeps;
+    readonly sessionID: string;
+    readonly spawnDepth: number;
+    readonly taskId: string;
+    readonly startTime: Date;
+    readonly syncPollTimeoutMs: number | undefined;
+    readonly systemContent: string | undefined;
+    readonly toastManager: TaskToastManager | undefined;
+    readonly modelInfo: ModelFallbackInfo | undefined;
+    readonly registerSyncSession: (newSessionID: string) => Promise<void>;
+    readonly publishSyncMetadata: (currentSessionID: string, currentModel: DelegatedModelConfig | undefined, spawnDepth: number) => Promise<void>;
+    readonly cleanupRetrySession: (currentSessionID: string) => void;
+    readonly setSyncSessionID: (currentSessionID: string) => void;
+};
+export declare function runSyncTaskLoop(input: SyncTaskRunnerInput): Promise<string>;
+export {};

package/dist/tools/delegate-task/sync-task.d.ts

@@ -1,5 +1,6 @@
 import type { ModelFallbackInfo } from "../../features/task-toast-manager/types";
+import type { FallbackEntry } from "../../shared/model-requirements";
 import type { ExecutorContext, ParentContext } from "./executor-types";
 import { type SyncTaskDeps } from "./sync-task-deps";
 import type { DelegatedModelConfig, DelegateTaskArgs, ToolContextWithMetadata } from "./types";
-export declare function executeSyncTask(args: DelegateTaskArgs, ctx: ToolContextWithMetadata, executorCtx: ExecutorContext, parentContext: ParentContext, agentToUse: string, categoryModel: DelegatedModelConfig | undefined, systemContent: string | undefined, modelInfo?: ModelFallbackInfo, fallbackChain?: import("../../shared/model-requirements").FallbackEntry[], deps?: SyncTaskDeps): Promise<string>;
+export declare function executeSyncTask(args: DelegateTaskArgs, ctx: ToolContextWithMetadata, executorCtx: ExecutorContext, parentContext: ParentContext, agentToUse: string, categoryModel: DelegatedModelConfig | undefined, systemContent: string | undefined, modelInfo?: ModelFallbackInfo, fallbackChain?: FallbackEntry[], deps?: SyncTaskDeps): Promise<string>;

package/dist/tools/hashline-edit/formatter-trigger.d.ts

@@ -21,8 +21,8 @@ export interface FormatterClient {
             query?: {
                 directory?: string;
             };
-        }) => Promise<{
-            data?: OpencodeConfig;
+        }) => Promise<OpencodeConfig | {
+            data: OpencodeConfig | undefined;
         }>;
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-opencode",
-  "version": "4.7.5",
+  "version": "4.8.0",
   "description": "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
   "main": "./dist/index.js",
   "types": "dist/index.d.ts",
@@ -43,6 +43,7 @@
     "packages/shared-skills/index.mjs",
     "packages/shared-skills/skills",
     "packages/omo-codex/marketplace.json",
+    "packages/omo-codex/lazycodex-repository",
     "packages/omo-codex/plugin",
     "packages/omo-codex/plugin/.codex-plugin",
     "packages/omo-codex/scripts"
@@ -68,11 +69,11 @@
     "postinstall": "node postinstall.mjs",
     "prepublishOnly": "bun run clean && bun run build:lsp-tools-mcp && bun run build",
     "test:model-capabilities": "bun test src/shared/model-capability-aliases.test.ts src/shared/model-capability-guardrails.test.ts src/shared/model-capabilities.test.ts src/cli/doctor/checks/model-resolution.test.ts --bail",
-    "typecheck": "tsgo --noEmit && bun run typecheck:packages",
+    "typecheck": "tsgo --noEmit && bun run typecheck:script && bun run typecheck:packages",
     "typecheck:packages": "tsgo --noEmit -p packages/rules-engine/tsconfig.json && tsgo --noEmit -p packages/ast-grep-core/tsconfig.json && tsgo --noEmit -p packages/ast-grep-mcp/tsconfig.json && tsgo --noEmit -p packages/git-bash-mcp/tsconfig.json && tsgo --noEmit -p packages/utils/tsconfig.json && tsgo --noEmit -p packages/model-core/tsconfig.json && tsgo --noEmit -p packages/prompts-core/tsconfig.json && tsgo --noEmit -p packages/comment-checker-core/tsconfig.json && tsgo --noEmit -p packages/hashline-core/tsconfig.json && tsgo --noEmit -p packages/boulder-state/tsconfig.json && tsgo --noEmit -p packages/agents-md-core/tsconfig.json && tsgo --noEmit -p packages/omo-codex/tsconfig.json",
     "typecheck:script": "tsgo --noEmit -p script/tsconfig.json",
     "test": "bun test",
-    "test:codex": "bun run build:ast-grep-mcp && bun run build:lsp-tools-mcp && npm --prefix packages/omo-codex/plugin ci && bun run --cwd packages/omo-codex/plugin build && bun test src/cli/cli-installer.platform.test.ts src/cli/install-codex/codex-cache.test.ts src/cli/install-codex/codex-cleanup.test.ts src/cli/install-codex/codex-config-agent-cleanup.test.ts src/cli/install-codex/codex-config-autonomous-features.test.ts src/cli/install-codex/codex-config-reasoning.test.ts src/cli/install-codex/codex-config-toml.test.ts src/cli/install-codex/codex-project-local-cleanup.test.ts src/cli/install-codex/install-codex-project-local-cleanup.test.ts src/cli/install-codex/install-codex.test.ts src/cli/install-codex/install-codex-packaged.test.ts src/cli/install-codex/link-cached-plugin-agents.test.ts packages/omo-codex/src/**/*.test.ts packages/utils/src/jsonc-parser.test.ts packages/utils/src/frontmatter.test.ts packages/hashline-core/src/hash-computation.test.ts packages/hashline-core/src/smoke-untested-modules.test.ts packages/rules-engine/src/index.test.ts packages/rules-engine/src/security-boundary.test.ts packages/agents-md-core/src/injector.test.ts packages/omo-codex/plugin/components/lsp/test/package-smoke.test.ts && node --test packages/omo-codex/plugin/test/*.test.mjs packages/omo-codex/scripts/install-cache-copy.test.mjs packages/omo-codex/scripts/install-cli-args.test.mjs packages/omo-codex/scripts/install-config-autonomous-features.test.mjs packages/omo-codex/scripts/install-config-autonomous.test.mjs packages/omo-codex/scripts/install-config-reasoning.test.mjs packages/omo-codex/scripts/install-config.test.mjs packages/omo-codex/scripts/install-project-local-cleanup.test.mjs packages/omo-codex/scripts/install-local-entrypoint.test.mjs packages/omo-codex/scripts/install-local-git-bash-preflight.test.mjs packages/omo-codex/scripts/install-local.test.mjs packages/omo-codex/scripts/install-mcp-runtime.test.mjs packages/omo-codex/scripts/install-packaged-local.test.mjs packages/omo-codex/scripts/install/git-bash.test.mjs packages/omo-codex/scripts/install-agent-links.test.mjs packages/omo-codex/scripts/install-bin-links.test.mjs packages/omo-codex/scripts/sync-telemetry-component.test.mjs",
+    "test:codex": "bun run build:ast-grep-mcp && bun run build:git-bash-mcp && bun run build:lsp-tools-mcp && npm --prefix packages/lsp-tools-mcp test && npm --prefix packages/omo-codex/plugin ci && bun run --cwd packages/omo-codex/plugin build && bun test src/cli/cli-installer.platform.test.ts src/cli/install-codex/codex-cache.test.ts src/cli/install-codex/codex-cleanup.test.ts src/cli/install-codex/codex-config-agent-cleanup.test.ts src/cli/install-codex/codex-config-autonomous-features.test.ts src/cli/install-codex/codex-config-reasoning.test.ts src/cli/install-codex/codex-config-toml.test.ts src/cli/install-codex/codex-project-local-cleanup.test.ts src/cli/install-codex/install-codex-project-local-cleanup.test.ts src/cli/install-codex/install-codex.test.ts src/cli/install-codex/install-codex-packaged.test.ts src/cli/install-codex/link-cached-plugin-agents.test.ts packages/omo-codex/src/**/*.test.ts packages/utils/src/jsonc-parser.test.ts packages/utils/src/frontmatter.test.ts packages/hashline-core/src/hash-computation.test.ts packages/hashline-core/src/smoke-untested-modules.test.ts packages/rules-engine/src/index.test.ts packages/rules-engine/src/security-boundary.test.ts packages/agents-md-core/src/injector.test.ts packages/omo-codex/plugin/components/lsp/test/package-smoke.test.ts && node --test packages/omo-codex/plugin/test/*.test.mjs packages/omo-codex/scripts/install-cache-copy.test.mjs packages/omo-codex/scripts/install-cli-args.test.mjs packages/omo-codex/scripts/install-config-autonomous-features.test.mjs packages/omo-codex/scripts/install-config-autonomous.test.mjs packages/omo-codex/scripts/install-config-reasoning.test.mjs packages/omo-codex/scripts/install-config.test.mjs packages/omo-codex/scripts/install-project-local-cleanup.test.mjs packages/omo-codex/scripts/install-lazycodex-version-stamp.test.mjs packages/omo-codex/scripts/install-local-entrypoint.test.mjs packages/omo-codex/scripts/install-local-git-bash-preflight.test.mjs packages/omo-codex/scripts/install-local.test.mjs packages/omo-codex/scripts/install-marketplace-cache.test.mjs packages/omo-codex/scripts/install-mcp-runtime.test.mjs packages/omo-codex/scripts/install-packaged-local.test.mjs packages/omo-codex/scripts/install/git-bash.test.mjs packages/omo-codex/scripts/install-agent-links.test.mjs packages/omo-codex/scripts/install-bin-links.test.mjs packages/omo-codex/scripts/sync-telemetry-component.test.mjs",
     "test:windows-codex": "bun run test:codex",
     "build:ast-grep-mcp": "bun run --cwd packages/ast-grep-mcp build",
     "build:git-bash-mcp": "bun run --cwd packages/git-bash-mcp build"
@@ -136,17 +137,17 @@
     "zod": "^4.4.3"
   },
   "optionalDependencies": {
-    "oh-my-opencode-darwin-arm64": "4.7.5",
-    "oh-my-opencode-darwin-x64": "4.7.5",
-    "oh-my-opencode-darwin-x64-baseline": "4.7.5",
-    "oh-my-opencode-linux-arm64": "4.7.5",
-    "oh-my-opencode-linux-arm64-musl": "4.7.5",
-    "oh-my-opencode-linux-x64": "4.7.5",
-    "oh-my-opencode-linux-x64-baseline": "4.7.5",
-    "oh-my-opencode-linux-x64-musl": "4.7.5",
-    "oh-my-opencode-linux-x64-musl-baseline": "4.7.5",
-    "oh-my-opencode-windows-x64": "4.7.5",
-    "oh-my-opencode-windows-x64-baseline": "4.7.5"
+    "oh-my-opencode-darwin-arm64": "4.8.0",
+    "oh-my-opencode-darwin-x64": "4.8.0",
+    "oh-my-opencode-darwin-x64-baseline": "4.8.0",
+    "oh-my-opencode-linux-arm64": "4.8.0",
+    "oh-my-opencode-linux-arm64-musl": "4.8.0",
+    "oh-my-opencode-linux-x64": "4.8.0",
+    "oh-my-opencode-linux-x64-baseline": "4.8.0",
+    "oh-my-opencode-linux-x64-musl": "4.8.0",
+    "oh-my-opencode-linux-x64-musl-baseline": "4.8.0",
+    "oh-my-opencode-windows-x64": "4.8.0",
+    "oh-my-opencode-windows-x64-baseline": "4.8.0"
   },
   "overrides": {
     "hono": "^4.12.18",

package/packages/git-bash-mcp/dist/cli.js

@@ -80,37 +80,54 @@ function whereCommand(command) {
 
 // src/runner.ts
 import { spawn } from "node:child_process";
+import { closeSync, mkdtempSync, openSync, readFileSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
 async function runGitBashCommand(input) {
   return await new Promise((resolve, reject) => {
+    const outputDirectory = mkdtempSync(join(tmpdir(), "omo-git-bash-run-"));
+    const stdoutPath = join(outputDirectory, "stdout");
+    const stderrPath = join(outputDirectory, "stderr");
+    const stdoutFd = openSync(stdoutPath, "w+");
+    const stderrFd = openSync(stderrPath, "w+");
+    let outputClosed = false;
+    function closeOutputFiles() {
+      if (outputClosed) {
+        return;
+      }
+      closeSync(stdoutFd);
+      closeSync(stderrFd);
+      outputClosed = true;
+    }
+    function readAndRemoveOutput() {
+      closeOutputFiles();
+      const stdout = readFileSync(stdoutPath, "utf8");
+      const stderr = readFileSync(stderrPath, "utf8");
+      rmSync(outputDirectory, { recursive: true, force: true });
+      return { stdout, stderr };
+    }
     const child = spawn(input.bashPath, ["-lc", input.command], {
       cwd: input.cwd,
       env: input.env,
       windowsHide: true,
-      stdio: ["ignore", "pipe", "pipe"]
+      stdio: ["ignore", stdoutFd, stderrFd]
     });
-    let stdout = "";
-    let stderr = "";
     let timedOut = false;
     const timeout = setTimeout(() => {
       timedOut = true;
       child.kill();
     }, input.timeoutMs);
     timeout.unref();
-    child.stdout.setEncoding("utf8");
-    child.stderr.setEncoding("utf8");
-    child.stdout.on("data", (chunk) => {
-      stdout += chunk;
-    });
-    child.stderr.on("data", (chunk) => {
-      stderr += chunk;
-    });
     child.on("error", (error) => {
       clearTimeout(timeout);
+      closeOutputFiles();
+      rmSync(outputDirectory, { recursive: true, force: true });
       reject(error);
     });
     child.on("close", (exitCode) => {
       clearTimeout(timeout);
-      resolve({ exitCode, stdout, stderr, timedOut });
+      const output = readAndRemoveOutput();
+      resolve({ exitCode, ...output, timedOut });
     });
   });
 }

package/packages/lsp-tools-mcp/dist/lsp/client-wrapper.d.ts

@@ -10,4 +10,4 @@ export interface WithLspClientOptions {
     signal?: AbortSignal;
     manager?: LspManager;
 }
-export declare function withLspClient<T>(filePath: string, fn: (client: LspClient) => Promise<T>, toolName: string, options?: WithLspClientOptions): Promise<T>;
+export declare function withLspClient<T>(filePath: string, fn: (client: LspClient, workspaceRoot: string) => Promise<T>, toolName: string, options?: WithLspClientOptions): Promise<T>;

package/packages/lsp-tools-mcp/dist/lsp/client-wrapper.js

@@ -87,7 +87,7 @@ export async function withLspClient(filePath, fn, toolName, options = {}) {
     const acquireAndCall = async (allowRetry) => {
         const client = await manager.getClient(root, server, options.signal);
         try {
-            return await fn(client);
+            return await fn(client, root);
         }
         catch (err) {
             if (allowRetry && READ_ONLY_RETRY_TOOLS.has(toolName) && isLspDeadConnectionError(err)) {

package/packages/lsp-tools-mcp/dist/lsp/config-loader.js

@@ -1,23 +1,29 @@
 import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
-import { isAbsolute, join } from "node:path";
+import { delimiter, isAbsolute, join } from "node:path";
 import { BUILTIN_SERVERS } from "./server-definitions.js";
 export function getConfigPaths() {
+    return {
+        project: getProjectConfigPaths()[0] ?? join(process.cwd(), ".codex", "lsp-client.json"),
+        user: getUserConfigPath(),
+    };
+}
+function resolveProjectConfigPath(path) {
     const cwd = process.cwd();
+    return isAbsolute(path) ? path : join(cwd, path);
+}
+function getProjectConfigPaths() {
     const projectOverride = process.env["LSP_TOOLS_MCP_PROJECT_CONFIG"];
+    if (projectOverride) {
+        return projectOverride.split(delimiter).filter(Boolean).map(resolveProjectConfigPath);
+    }
+    return [join(process.cwd(), ".codex", "lsp-client.json")];
+}
+function getUserConfigPath() {
     const userOverride = process.env["LSP_TOOLS_MCP_USER_CONFIG"];
-    return {
-        project: projectOverride
-            ? isAbsolute(projectOverride)
-                ? projectOverride
-                : join(cwd, projectOverride)
-            : join(cwd, ".codex", "lsp-client.json"),
-        user: userOverride
-            ? isAbsolute(userOverride)
-                ? userOverride
-                : join(homedir(), userOverride)
-            : join(homedir(), ".codex", "lsp-client.json"),
-    };
+    if (!userOverride)
+        return join(homedir(), ".codex", "lsp-client.json");
+    return isAbsolute(userOverride) ? userOverride : join(homedir(), userOverride);
 }
 function loadJsonFile(path) {
     if (!existsSync(path))
@@ -31,16 +37,23 @@ function loadJsonFile(path) {
     }
 }
 export function loadAllConfigs() {
-    const paths = getConfigPaths();
     const configs = new Map();
-    const project = loadJsonFile(paths.project);
+    const project = loadFirstJsonFile(getProjectConfigPaths());
     if (project)
         configs.set("project", project);
-    const user = loadJsonFile(paths.user);
+    const user = loadJsonFile(getUserConfigPath());
     if (user)
         configs.set("user", user);
     return configs;
 }
+function loadFirstJsonFile(paths) {
+    for (const path of paths) {
+        const config = loadJsonFile(path);
+        if (config)
+            return config;
+    }
+    return null;
+}
 export function getMergedServers() {
     const configs = loadAllConfigs();
     const servers = [];
@@ -61,21 +74,9 @@ export function getMergedServers() {
             }
             if (seen.has(id))
                 continue;
-            if (!entry.command || !entry.extensions)
+            const server = createServerFromEntry(id, entry, source);
+            if (!server)
                 continue;
-            const server = {
-                id,
-                command: entry.command,
-                extensions: entry.extensions,
-                priority: entry.priority ?? 0,
-                source,
-            };
-            if (entry.env !== undefined) {
-                server.env = entry.env;
-            }
-            if (entry.initialization !== undefined) {
-                server.initialization = entry.initialization;
-            }
             servers.push(server);
             seen.add(id);
         }
@@ -103,6 +104,70 @@ export function getMergedServers() {
         return b.priority - a.priority;
     });
 }
+function createServerFromEntry(id, entry, source) {
+    const builtin = BUILTIN_SERVERS[id];
+    if (source === "project") {
+        if (!builtin)
+            return null;
+        const server = createServer({
+            id,
+            command: builtin.command,
+            extensions: entry.extensions ?? builtin.extensions,
+            priority: entry.priority ?? 0,
+            source,
+        });
+        if (entry.initialization !== undefined) {
+            server.initialization = entry.initialization;
+        }
+        return server;
+    }
+    if (entry.command && entry.extensions) {
+        const server = createServer({
+            id,
+            command: entry.command,
+            extensions: entry.extensions,
+            priority: entry.priority ?? 0,
+            source,
+        });
+        applyOptionalServerFields(server, entry);
+        return server;
+    }
+    if (!builtin)
+        return null;
+    const server = createServer({
+        id,
+        command: entry.command ?? builtin.command,
+        extensions: entry.extensions ?? builtin.extensions,
+        priority: entry.priority ?? 0,
+        source,
+    });
+    applyOptionalServerFields(server, entry);
+    return server;
+}
+function createServer(input) {
+    const server = {
+        id: input.id,
+        command: input.command,
+        extensions: input.extensions,
+        priority: input.priority,
+        source: input.source,
+    };
+    if (input.env !== undefined) {
+        server.env = input.env;
+    }
+    if (input.initialization !== undefined) {
+        server.initialization = input.initialization;
+    }
+    return server;
+}
+function applyOptionalServerFields(server, entry) {
+    if (entry.env !== undefined) {
+        server.env = entry.env;
+    }
+    if (entry.initialization !== undefined) {
+        server.initialization = entry.initialization;
+    }
+}
 function isConfigJson(value) {
     if (!isRecord(value))
         return false;

package/packages/lsp-tools-mcp/dist/lsp/server-installation.d.ts

@@ -1,2 +1 @@
-export declare function getAdditionalPathBases(workingDirectory: string): string[];
-export declare function isServerInstalled(command: string[]): boolean;
+export declare function isServerInstalled(command: string[], _workingDirectory?: string): boolean;

package/packages/lsp-tools-mcp/dist/lsp/server-installation.js

@@ -1,9 +1,6 @@
 import { existsSync } from "node:fs";
 import { delimiter, join } from "node:path";
-export function getAdditionalPathBases(workingDirectory) {
-    return [join(workingDirectory, "node_modules", ".bin")];
-}
-export function isServerInstalled(command) {
+export function isServerInstalled(command, _workingDirectory) {
     if (command.length === 0)
         return false;
     const [cmd] = command;
@@ -37,13 +34,6 @@ export function isServerInstalled(command) {
             }
         }
     }
-    for (const base of getAdditionalPathBases(process.cwd())) {
-        for (const suffix of exts) {
-            if (existsSync(join(base, cmd + suffix))) {
-                return true;
-            }
-        }
-    }
     if (cmd === "node")
         return true;
     return false;

package/packages/lsp-tools-mcp/dist/lsp/transport.d.ts

@@ -23,3 +23,4 @@ export declare class LspClientTransport {
     stop(): Promise<void>;
     getStoredDiagnostics(uri: string): Diagnostic[];
 }
+export declare function createLspSpawnEnv(_root: string, input: Record<string, string | undefined>): Record<string, string | undefined>;

package/packages/lsp-tools-mcp/dist/lsp/transport.js

@@ -1,10 +1,8 @@
-import { delimiter } from "node:path";
 import { reportBestEffortCleanupError } from "./cleanup-errors.js";
 import { REQUEST_TIMEOUT_MS, STOP_HARD_KILL_TIMEOUT_MS, STOP_SIGKILL_GRACE_MS } from "./constants.js";
 import { LspConnectionClosedError, LspProcessExitedError, LspRequestTimeoutError } from "./errors.js";
 import { JsonRpcConnection } from "./json-rpc-connection.js";
 import { spawnProcess } from "./process.js";
-import { getAdditionalPathBases } from "./server-installation.js";
 function isRecord(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -43,16 +41,10 @@ export class LspClientTransport {
         return [...this.server.command];
     }
     async start() {
-        const env = {
+        const env = createLspSpawnEnv(this.root, {
             ...process.env,
             ...this.server.env,
-        };
-        const pathValue = process.platform === "win32" ? (env["PATH"] ?? env["Path"] ?? "") : (env["PATH"] ?? "");
-        const spawnPath = [pathValue, ...getAdditionalPathBases(this.root)].filter(Boolean).join(delimiter);
-        if (process.platform === "win32" && env["Path"] !== undefined) {
-            env["Path"] = spawnPath;
-        }
-        env["PATH"] = spawnPath;
+        });
         this.proc = spawnProcess(this.server.command, {
             cwd: this.root,
             env,
@@ -232,6 +224,9 @@ export class LspClientTransport {
         return this.diagnosticsStore.get(uri) ?? [];
     }
 }
+export function createLspSpawnEnv(_root, input) {
+    return { ...input };
+}
 function isDiagnostic(value) {
     return isRecord(value) && isRange(value["range"]) && typeof value["message"] === "string";
 }

package/packages/lsp-tools-mcp/dist/lsp/workspace-edit.d.ts

@@ -5,4 +5,7 @@ export interface ApplyResult {
     totalEdits: number;
     errors: string[];
 }
-export declare function applyWorkspaceEdit(edit: WorkspaceEdit | null): ApplyResult;
+export interface ApplyWorkspaceEditOptions {
+    readonly workspaceRoot?: string;
+}
+export declare function applyWorkspaceEdit(edit: WorkspaceEdit | null, options?: ApplyWorkspaceEditOptions): ApplyResult;

package/packages/lsp-tools-mcp/dist/lsp/workspace-edit.js

@@ -1,5 +1,39 @@
-import { readFileSync, unlinkSync, writeFileSync } from "node:fs";
-import { uriToPath } from "./formatters.js";
+import { existsSync, readFileSync, realpathSync, unlinkSync, writeFileSync } from "node:fs";
+import { dirname, isAbsolute, relative, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+function errorMessage(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+function isPathInsideWorkspace(filePath, workspaceRoot) {
+    const relativePath = relative(workspaceRoot, filePath);
+    return relativePath === "" || (!relativePath.startsWith("..") && !isAbsolute(relativePath));
+}
+function realpathForValidation(filePath) {
+    if (existsSync(filePath))
+        return realpathSync(filePath);
+    const parent = dirname(filePath);
+    return resolve(realpathSync(parent), relative(parent, filePath));
+}
+function uriToWorkspacePath(uri, workspaceRoot) {
+    let filePath;
+    try {
+        filePath = fileURLToPath(uri);
+    }
+    catch (error) {
+        return { success: false, error: `non-file URI ${uri}: ${errorMessage(error)}` };
+    }
+    let validatedPath;
+    try {
+        validatedPath = realpathForValidation(filePath);
+    }
+    catch (error) {
+        return { success: false, error: `${filePath}: ${errorMessage(error)}` };
+    }
+    if (!isPathInsideWorkspace(validatedPath, workspaceRoot)) {
+        return { success: false, error: `${filePath}: outside workspace ${workspaceRoot}` };
+    }
+    return { success: true, path: filePath };
+}
 function applyTextEditsToFile(filePath, edits) {
     try {
         const content = readFileSync(filePath, "utf-8");
@@ -37,45 +71,61 @@ function applyTextEditsToFile(filePath, edits) {
         };
     }
 }
-export function applyWorkspaceEdit(edit) {
+export function applyWorkspaceEdit(edit, options = {}) {
     if (!edit) {
         return { success: false, filesModified: [], totalEdits: 0, errors: ["No edit provided"] };
     }
     const result = { success: true, filesModified: [], totalEdits: 0, errors: [] };
+    const workspaceRoot = realpathSync(options.workspaceRoot ?? process.cwd());
     if (edit.changes) {
         for (const [uri, edits] of Object.entries(edit.changes)) {
-            const filePath = uriToPath(uri);
-            const applyResult = applyTextEditsToFile(filePath, edits);
+            const validatedPath = uriToWorkspacePath(uri, workspaceRoot);
+            if (!validatedPath.success) {
+                result.success = false;
+                result.errors.push(validatedPath.error);
+                continue;
+            }
+            const applyResult = applyTextEditsToFile(validatedPath.path, edits);
             if (applyResult.success) {
-                result.filesModified.push(filePath);
+                result.filesModified.push(validatedPath.path);
                 result.totalEdits += applyResult.editCount;
             }
             else {
                 result.success = false;
-                result.errors.push(`${filePath}: ${applyResult.error}`);
+                result.errors.push(`${validatedPath.path}: ${applyResult.error}`);
             }
         }
     }
     if (edit.documentChanges) {
         for (const change of edit.documentChanges) {
             if (!("kind" in change)) {
-                const filePath = uriToPath(change.textDocument.uri);
-                const applyResult = applyTextEditsToFile(filePath, change.edits);
+                const validatedPath = uriToWorkspacePath(change.textDocument.uri, workspaceRoot);
+                if (!validatedPath.success) {
+                    result.success = false;
+                    result.errors.push(validatedPath.error);
+                    continue;
+                }
+                const applyResult = applyTextEditsToFile(validatedPath.path, change.edits);
                 if (applyResult.success) {
-                    result.filesModified.push(filePath);
+                    result.filesModified.push(validatedPath.path);
                     result.totalEdits += applyResult.editCount;
                 }
                 else {
                     result.success = false;
-                    result.errors.push(`${filePath}: ${applyResult.error}`);
+                    result.errors.push(`${validatedPath.path}: ${applyResult.error}`);
                 }
                 continue;
             }
             if (change.kind === "create") {
                 try {
-                    const filePath = uriToPath(change.uri);
-                    writeFileSync(filePath, "", "utf-8");
-                    result.filesModified.push(filePath);
+                    const validatedPath = uriToWorkspacePath(change.uri, workspaceRoot);
+                    if (!validatedPath.success) {
+                        result.success = false;
+                        result.errors.push(`Create ${change.uri}: ${validatedPath.error}`);
+                        continue;
+                    }
+                    writeFileSync(validatedPath.path, "", "utf-8");
+                    result.filesModified.push(validatedPath.path);
                 }
                 catch (err) {
                     result.success = false;
@@ -84,12 +134,18 @@ export function applyWorkspaceEdit(edit) {
             }
             else if (change.kind === "rename") {
                 try {
-                    const oldPath = uriToPath(change.oldUri);
-                    const newPath = uriToPath(change.newUri);
-                    const content = readFileSync(oldPath, "utf-8");
-                    writeFileSync(newPath, content, "utf-8");
-                    unlinkSync(oldPath);
-                    result.filesModified.push(newPath);
+                    const oldPath = uriToWorkspacePath(change.oldUri, workspaceRoot);
+                    const newPath = uriToWorkspacePath(change.newUri, workspaceRoot);
+                    if (!oldPath.success || !newPath.success) {
+                        const error = oldPath.success ? (newPath.success ? "invalid URI" : newPath.error) : oldPath.error;
+                        result.success = false;
+                        result.errors.push(`Rename ${change.oldUri}: ${error}`);
+                        continue;
+                    }
+                    const content = readFileSync(oldPath.path, "utf-8");
+                    writeFileSync(newPath.path, content, "utf-8");
+                    unlinkSync(oldPath.path);
+                    result.filesModified.push(newPath.path);
                 }
                 catch (err) {
                     result.success = false;
@@ -98,9 +154,14 @@ export function applyWorkspaceEdit(edit) {
             }
             else if (change.kind === "delete") {
                 try {
-                    const filePath = uriToPath(change.uri);
-                    unlinkSync(filePath);
-                    result.filesModified.push(filePath);
+                    const validatedPath = uriToWorkspacePath(change.uri, workspaceRoot);
+                    if (!validatedPath.success) {
+                        result.success = false;
+                        result.errors.push(`Delete ${change.uri}: ${validatedPath.error}`);
+                        continue;
+                    }
+                    unlinkSync(validatedPath.path);
+                    result.filesModified.push(validatedPath.path);
                 }
                 catch (err) {
                     result.success = false;

package/packages/lsp-tools-mcp/dist/missing-dependency-result.d.ts

@@ -0,0 +1,2 @@
+import type { ToolExecutionResult } from "./tools.js";
+export declare function missingDependencyResult<TDetails extends object>(error: unknown, details: TDetails): ToolExecutionResult | null;

package/packages/lsp-tools-mcp/dist/missing-dependency-result.js

@@ -0,0 +1,14 @@
+import { handleMissingDependencyError } from "./lsp/startup-failure.js";
+export function missingDependencyResult(error, details) {
+    const message = handleMissingDependencyError(error);
+    if (!message)
+        return null;
+    return {
+        content: [{ type: "text", text: message }],
+        details: {
+            ...details,
+            error: message,
+            errorKind: "missing_dependency",
+        },
+    };
+}