oh-my-opencode 4.2.3 → 4.3.1

package/packages/ast-grep-mcp/dist/cli.js

@@ -6,7 +6,7 @@ import { argv, stderr } from "node:process";
 // src/mcp.ts
 import { createInterface } from "node:readline";
 
-// src/language-support.ts
+// ../ast-grep-core/src/language-support.ts
 var CLI_LANGUAGES = [
   "bash",
   "c",
@@ -37,81 +37,7 @@ var CLI_LANGUAGES = [
 var DEFAULT_TIMEOUT_MS = 300000;
 var DEFAULT_MAX_OUTPUT_BYTES = 1 * 1024 * 1024;
 var DEFAULT_MAX_MATCHES = 500;
-// src/sg-cli-path.ts
-import { createRequire } from "module";
-import { dirname, join } from "path";
-import { existsSync, statSync } from "fs";
-function isValidBinary(filePath) {
-  try {
-    return statSync(filePath).size > 1e4;
-  } catch {
-    return false;
-  }
-}
-function getPlatformPackageName() {
-  const platform = process.platform;
-  const arch = process.arch;
-  const platformMap = {
-    "darwin-arm64": "@ast-grep/cli-darwin-arm64",
-    "darwin-x64": "@ast-grep/cli-darwin-x64",
-    "linux-arm64": "@ast-grep/cli-linux-arm64-gnu",
-    "linux-x64": "@ast-grep/cli-linux-x64-gnu",
-    "win32-x64": "@ast-grep/cli-win32-x64-msvc",
-    "win32-arm64": "@ast-grep/cli-win32-arm64-msvc",
-    "win32-ia32": "@ast-grep/cli-win32-ia32-msvc"
-  };
-  return platformMap[`${platform}-${arch}`] ?? null;
-}
-function findSgCliPathSync() {
-  const binaryName = process.platform === "win32" ? "sg.exe" : "sg";
-  try {
-    const require2 = createRequire(import.meta.url);
-    const cliPackageJsonPath = require2.resolve("@ast-grep/cli/package.json");
-    const cliDirectory = dirname(cliPackageJsonPath);
-    const sgPath = join(cliDirectory, binaryName);
-    if (existsSync(sgPath) && isValidBinary(sgPath)) {
-      return sgPath;
-    }
-  } catch {}
-  const platformPackage = getPlatformPackageName();
-  if (platformPackage) {
-    try {
-      const require2 = createRequire(import.meta.url);
-      const packageJsonPath = require2.resolve(`${platformPackage}/package.json`);
-      const packageDirectory = dirname(packageJsonPath);
-      const astGrepBinaryName = process.platform === "win32" ? "ast-grep.exe" : "ast-grep";
-      const binaryPath = join(packageDirectory, astGrepBinaryName);
-      if (existsSync(binaryPath) && isValidBinary(binaryPath)) {
-        return binaryPath;
-      }
-    } catch {}
-  }
-  if (process.platform === "darwin") {
-    const homebrewPaths = ["/opt/homebrew/bin/sg", "/usr/local/bin/sg"];
-    for (const path of homebrewPaths) {
-      if (existsSync(path) && isValidBinary(path)) {
-        return path;
-      }
-    }
-  }
-  return null;
-}
-var resolvedCliPath = null;
-function getSgCliPath() {
-  if (resolvedCliPath !== null) {
-    return resolvedCliPath;
-  }
-  const syncPath = findSgCliPathSync();
-  if (syncPath) {
-    resolvedCliPath = syncPath;
-    return syncPath;
-  }
-  return null;
-}
-function setSgCliPath(path) {
-  resolvedCliPath = path;
-}
-// src/pattern-hints.ts
+// ../ast-grep-core/src/pattern-hints.ts
 function detectRegexMisuse(pattern) {
   const src = pattern.trim();
   if (/\\[wWdDsSbB]/.test(src)) {
@@ -158,8 +84,7 @@ function detectLanguageSpecificMistake(pattern, lang) {
 function getPatternHint(pattern, lang) {
   return detectRegexMisuse(pattern) ?? detectLanguageSpecificMistake(pattern, lang);
 }
-
-// src/result-formatter.ts
+// ../ast-grep-core/src/result-formatter.ts
 function formatSearchResult(result) {
   if (result.error) {
     return `Error: ${result.error}`;
@@ -212,6 +137,253 @@ function formatReplaceResult(result, isDryRun) {
   return lines.join(`
 `);
 }
+// ../ast-grep-core/src/sg-compact-json-output.ts
+function createSgResultFromStdout(stdout) {
+  if (!stdout.trim()) {
+    return { matches: [], totalMatches: 0, truncated: false };
+  }
+  const outputTruncated = stdout.length >= DEFAULT_MAX_OUTPUT_BYTES;
+  const outputToProcess = outputTruncated ? stdout.substring(0, DEFAULT_MAX_OUTPUT_BYTES) : stdout;
+  let matches = [];
+  try {
+    matches = JSON.parse(outputToProcess);
+  } catch {
+    if (outputTruncated) {
+      try {
+        const lastValidIndex = outputToProcess.lastIndexOf("}");
+        if (lastValidIndex > 0) {
+          const bracketIndex = outputToProcess.lastIndexOf("},", lastValidIndex);
+          if (bracketIndex > 0) {
+            const truncatedJson = outputToProcess.substring(0, bracketIndex + 1) + "]";
+            matches = JSON.parse(truncatedJson);
+          }
+        }
+      } catch {
+        return {
+          matches: [],
+          totalMatches: 0,
+          truncated: true,
+          truncatedReason: "max_output_bytes",
+          error: "Output too large and could not be parsed"
+        };
+      }
+    } else {
+      return { matches: [], totalMatches: 0, truncated: false };
+    }
+  }
+  const totalMatches = matches.length;
+  const matchesTruncated = totalMatches > DEFAULT_MAX_MATCHES;
+  const finalMatches = matchesTruncated ? matches.slice(0, DEFAULT_MAX_MATCHES) : matches;
+  return {
+    matches: finalMatches,
+    totalMatches,
+    truncated: outputTruncated || matchesTruncated,
+    truncatedReason: outputTruncated ? "max_output_bytes" : matchesTruncated ? "max_matches" : undefined
+  };
+}
+// ../ast-grep-core/src/runner.ts
+var SG_BINARY_NOT_FOUND_MESSAGE = `ast-grep (sg) binary not found.
+
+` + `Install options:
+` + `  bun add -D @ast-grep/cli
+` + `  cargo install ast-grep --locked
+` + `  brew install ast-grep`;
+function buildSgArgs(options, flags) {
+  const args = ["run", "-p", options.pattern, "--lang", options.lang];
+  if (flags.includeJson) {
+    args.push("--json=compact");
+  }
+  if (options.rewrite) {
+    args.push("-r", options.rewrite);
+    if (flags.includeUpdateAll) {
+      args.push("--update-all");
+    }
+  }
+  if (typeof options.context === "number" && options.context > 0) {
+    args.push("-C", String(options.context));
+  }
+  if (options.globs) {
+    for (const glob of options.globs) {
+      args.push("--globs", glob);
+    }
+  }
+  const paths = options.paths && options.paths.length > 0 ? options.paths : ["."];
+  args.push("--", ...paths);
+  return args;
+}
+async function runSg(options, deps) {
+  const shouldSeparateWritePass = Boolean(options.rewrite && options.updateAll);
+  const args = buildSgArgs(options, { includeJson: true, includeUpdateAll: false });
+  let binary;
+  try {
+    binary = await deps.resolveBinary();
+  } catch (error) {
+    return {
+      matches: [],
+      totalMatches: 0,
+      truncated: false,
+      error: isNoEntryError(error) ? SG_BINARY_NOT_FOUND_MESSAGE : `Failed to resolve ast-grep binary: ${errorMessage(error)}`
+    };
+  }
+  const searchResult = await trySpawn(binary, args, options.cwd, deps);
+  if (searchResult.error) {
+    return searchResult.error;
+  }
+  const output = searchResult.value;
+  if (output.exitCode !== 0 && output.stdout.trim() === "") {
+    if (output.stderr.includes("No files found")) {
+      return { matches: [], totalMatches: 0, truncated: false };
+    }
+    if (output.stderr.trim()) {
+      return { matches: [], totalMatches: 0, truncated: false, error: output.stderr.trim() };
+    }
+    return { matches: [], totalMatches: 0, truncated: false };
+  }
+  const jsonResult = createSgResultFromStdout(output.stdout);
+  if (!(shouldSeparateWritePass && jsonResult.matches.length > 0)) {
+    return jsonResult;
+  }
+  const writeArgs = buildSgArgs(options, { includeJson: false, includeUpdateAll: true });
+  const writeResult = await trySpawn(binary, writeArgs, options.cwd, deps);
+  if (writeResult.error) {
+    return { ...jsonResult, error: `Replace failed: ${writeResult.error.error ?? "unknown error"}` };
+  }
+  if (writeResult.value.exitCode !== 0) {
+    const errorDetail = writeResult.value.stderr.trim() || `ast-grep exited with code ${writeResult.value.exitCode}`;
+    return { ...jsonResult, error: `Replace failed: ${errorDetail}` };
+  }
+  return jsonResult;
+}
+async function trySpawn(binary, args, cwd, deps) {
+  try {
+    const value = await deps.spawnProcess(binary, args, {
+      cwd,
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    return { value };
+  } catch (error) {
+    if (error instanceof Error && error.message.includes("timeout")) {
+      return {
+        error: {
+          matches: [],
+          totalMatches: 0,
+          truncated: true,
+          truncatedReason: "timeout",
+          error: error.message
+        }
+      };
+    }
+    if (isNoEntryError(error)) {
+      return {
+        error: {
+          matches: [],
+          totalMatches: 0,
+          truncated: false,
+          error: SG_BINARY_NOT_FOUND_MESSAGE
+        }
+      };
+    }
+    return {
+      error: {
+        matches: [],
+        totalMatches: 0,
+        truncated: false,
+        error: `Failed to spawn ast-grep: ${errorMessage(error)}`
+      }
+    };
+  }
+}
+function isNoEntryError(error) {
+  if (typeof error !== "object" || error === null) {
+    return false;
+  }
+  const code = Reflect.get(error, "code");
+  const message = errorMessage(error);
+  return code === "ENOENT" || message.includes("ENOENT") || message.includes("not found");
+}
+function errorMessage(error) {
+  if (error instanceof Error) {
+    return error.message;
+  }
+  return String(error);
+}
+// src/sg-cli-path.ts
+import { createRequire } from "module";
+import { dirname, join } from "path";
+import { existsSync, statSync } from "fs";
+function isValidBinary(filePath) {
+  try {
+    return statSync(filePath).size > 1e4;
+  } catch {
+    return false;
+  }
+}
+function getPlatformPackageName() {
+  const platform = process.platform;
+  const arch = process.arch;
+  const platformMap = {
+    "darwin-arm64": "@ast-grep/cli-darwin-arm64",
+    "darwin-x64": "@ast-grep/cli-darwin-x64",
+    "linux-arm64": "@ast-grep/cli-linux-arm64-gnu",
+    "linux-x64": "@ast-grep/cli-linux-x64-gnu",
+    "win32-x64": "@ast-grep/cli-win32-x64-msvc",
+    "win32-arm64": "@ast-grep/cli-win32-arm64-msvc",
+    "win32-ia32": "@ast-grep/cli-win32-ia32-msvc"
+  };
+  return platformMap[`${platform}-${arch}`] ?? null;
+}
+function findSgCliPathSync() {
+  const binaryName = process.platform === "win32" ? "sg.exe" : "sg";
+  try {
+    const require2 = createRequire(import.meta.url);
+    const cliPackageJsonPath = require2.resolve("@ast-grep/cli/package.json");
+    const cliDirectory = dirname(cliPackageJsonPath);
+    const sgPath = join(cliDirectory, binaryName);
+    if (existsSync(sgPath) && isValidBinary(sgPath)) {
+      return sgPath;
+    }
+  } catch {}
+  const platformPackage = getPlatformPackageName();
+  if (platformPackage) {
+    try {
+      const require2 = createRequire(import.meta.url);
+      const packageJsonPath = require2.resolve(`${platformPackage}/package.json`);
+      const packageDirectory = dirname(packageJsonPath);
+      const astGrepBinaryName = process.platform === "win32" ? "ast-grep.exe" : "ast-grep";
+      const binaryPath = join(packageDirectory, astGrepBinaryName);
+      if (existsSync(binaryPath) && isValidBinary(binaryPath)) {
+        return binaryPath;
+      }
+    } catch {}
+  }
+  if (process.platform === "darwin") {
+    const homebrewPaths = ["/opt/homebrew/bin/sg", "/usr/local/bin/sg"];
+    for (const path of homebrewPaths) {
+      if (existsSync(path) && isValidBinary(path)) {
+        return path;
+      }
+    }
+  }
+  return null;
+}
+var resolvedCliPath = null;
+function getSgCliPath() {
+  if (resolvedCliPath !== null) {
+    return resolvedCliPath;
+  }
+  const syncPath = findSgCliPathSync();
+  if (syncPath) {
+    resolvedCliPath = syncPath;
+    return syncPath;
+  }
+  return null;
+}
+function setSgCliPath(path) {
+  resolvedCliPath = path;
+}
+// src/runner.ts
+import { existsSync as existsSync3 } from "node:fs";
 
 // src/bun-spawn-shim.ts
 import { spawn as nodeSpawn, spawnSync as nodeSpawnSync } from "node:child_process";
@@ -325,9 +497,6 @@ function spawn(cmdOrOpts, opts) {
   }));
 }
 
-// src/runner.ts
-import { existsSync as existsSync3 } from "fs";
-
 // src/cli-binary-path-resolution.ts
 import { existsSync as existsSync2 } from "fs";
 var resolvedCliPath2 = null;
@@ -368,178 +537,33 @@ async function collectProcessOutputWithTimeout(process2, timeoutMs) {
   return { stdout, stderr, exitCode };
 }
 
-// src/sg-compact-json-output.ts
-function createSgResultFromStdout(stdout) {
-  if (!stdout.trim()) {
-    return { matches: [], totalMatches: 0, truncated: false };
-  }
-  const outputTruncated = stdout.length >= DEFAULT_MAX_OUTPUT_BYTES;
-  const outputToProcess = outputTruncated ? stdout.substring(0, DEFAULT_MAX_OUTPUT_BYTES) : stdout;
-  let matches = [];
-  try {
-    matches = JSON.parse(outputToProcess);
-  } catch {
-    if (outputTruncated) {
-      try {
-        const lastValidIndex = outputToProcess.lastIndexOf("}");
-        if (lastValidIndex > 0) {
-          const bracketIndex = outputToProcess.lastIndexOf("},", lastValidIndex);
-          if (bracketIndex > 0) {
-            const truncatedJson = outputToProcess.substring(0, bracketIndex + 1) + "]";
-            matches = JSON.parse(truncatedJson);
-          }
-        }
-      } catch {
-        return {
-          matches: [],
-          totalMatches: 0,
-          truncated: true,
-          truncatedReason: "max_output_bytes",
-          error: "Output too large and could not be parsed"
-        };
-      }
-    } else {
-      return { matches: [], totalMatches: 0, truncated: false };
-    }
-  }
-  const totalMatches = matches.length;
-  const matchesTruncated = totalMatches > DEFAULT_MAX_MATCHES;
-  const finalMatches = matchesTruncated ? matches.slice(0, DEFAULT_MAX_MATCHES) : matches;
-  return {
-    matches: finalMatches,
-    totalMatches,
-    truncated: outputTruncated || matchesTruncated,
-    truncatedReason: outputTruncated ? "max_output_bytes" : matchesTruncated ? "max_matches" : undefined
-  };
-}
-
 // src/runner.ts
-async function runSg(options) {
-  const shouldSeparateWritePass = !!(options.rewrite && options.updateAll);
-  const args = createSgArgs(options, { includeJson: true, includeUpdateAll: false });
-  let cliPath = getSgCliPath();
-  if (!cliPath || !existsSync3(cliPath)) {
-    const resolvedPath = await getAstGrepPath();
-    if (resolvedPath) {
-      cliPath = resolvedPath;
-    } else {
-      return {
-        matches: [],
-        totalMatches: 0,
-        truncated: false,
-        error: `ast-grep (sg) binary not found.
-
-` + `Install options:
-` + `  bun add -D @ast-grep/cli
-` + `  cargo install ast-grep --locked
-` + `  brew install ast-grep`
-      };
-    }
-  }
-  const timeout = DEFAULT_TIMEOUT_MS;
-  const proc = spawn([cliPath, ...args], {
-    cwd: options.cwd,
-    stdout: "pipe",
-    stderr: "pipe"
+async function runSg2(options) {
+  return runSg(options, {
+    resolveBinary: resolveBinaryPath,
+    spawnProcess
   });
-  let stdout;
-  let stderr;
-  let exitCode;
-  try {
-    const output = await collectProcessOutputWithTimeout(proc, timeout);
-    stdout = output.stdout;
-    stderr = output.stderr;
-    exitCode = output.exitCode;
-  } catch (error) {
-    if (error instanceof Error && error.message.includes("timeout")) {
-      return {
-        matches: [],
-        totalMatches: 0,
-        truncated: true,
-        truncatedReason: "timeout",
-        error: error.message
-      };
-    }
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    const errorCode = errorCodeFrom(error);
-    const isNoEntry = errorCode === "ENOENT" || errorMessage.includes("ENOENT") || errorMessage.includes("not found");
-    if (isNoEntry) {
-      return {
-        matches: [],
-        totalMatches: 0,
-        truncated: false,
-        error: `ast-grep CLI binary not found.
-
-` + `Install options:
-` + `  bun add -D @ast-grep/cli
-` + `  cargo install ast-grep --locked
-` + `  brew install ast-grep`
-      };
-    }
-    return {
-      matches: [],
-      totalMatches: 0,
-      truncated: false,
-      error: `Failed to spawn ast-grep: ${errorMessage}`
-    };
-  }
-  if (exitCode !== 0 && stdout.trim() === "") {
-    if (stderr.includes("No files found")) {
-      return { matches: [], totalMatches: 0, truncated: false };
-    }
-    if (stderr.trim()) {
-      return { matches: [], totalMatches: 0, truncated: false, error: stderr.trim() };
-    }
-    return { matches: [], totalMatches: 0, truncated: false };
-  }
-  const jsonResult = createSgResultFromStdout(stdout);
-  if (shouldSeparateWritePass && jsonResult.matches.length > 0) {
-    const writeArgs = createSgArgs(options, { includeJson: false, includeUpdateAll: true });
-    const writeProc = spawn([cliPath, ...writeArgs], {
-      cwd: options.cwd,
-      stdout: "pipe",
-      stderr: "pipe"
-    });
-    try {
-      const writeOutput = await collectProcessOutputWithTimeout(writeProc, timeout);
-      if (writeOutput.exitCode !== 0) {
-        const errorDetail = writeOutput.stderr.trim() || `ast-grep exited with code ${writeOutput.exitCode}`;
-        return { ...jsonResult, error: `Replace failed: ${errorDetail}` };
-      }
-    } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      return { ...jsonResult, error: `Replace failed: ${errorMessage}` };
-    }
-  }
-  return jsonResult;
 }
-function createSgArgs(options, flags) {
-  const args = ["run", "-p", options.pattern, "--lang", options.lang];
-  if (flags.includeJson) {
-    args.push("--json=compact");
-  }
-  if (options.rewrite) {
-    args.push("-r", options.rewrite);
-    if (flags.includeUpdateAll) {
-      args.push("--update-all");
-    }
-  }
-  if (options.context && options.context > 0) {
-    args.push("-C", String(options.context));
+async function resolveBinaryPath() {
+  const cliPath = getSgCliPath();
+  if (cliPath && existsSync3(cliPath)) {
+    return cliPath;
   }
-  if (options.globs) {
-    for (const glob of options.globs) {
-      args.push("--globs", glob);
-    }
+  const resolvedPath = await getAstGrepPath();
+  if (!resolvedPath) {
+    const noEntryError = new Error("ENOENT: ast-grep binary not found");
+    Reflect.set(noEntryError, "code", "ENOENT");
+    throw noEntryError;
   }
-  const paths = options.paths && options.paths.length > 0 ? options.paths : ["."];
-  args.push("--", ...paths);
-  return args;
+  return resolvedPath;
 }
-function errorCodeFrom(error) {
-  if (typeof error !== "object" || error === null || !("code" in error))
-    return;
-  return Reflect.get(error, "code");
+async function spawnProcess(binary, args, options) {
+  const proc = spawn([binary, ...args], {
+    cwd: options?.cwd,
+    stdout: options?.stdout ?? "pipe",
+    stderr: options?.stderr ?? "pipe"
+  });
+  return collectProcessOutputWithTimeout(proc, DEFAULT_TIMEOUT_MS);
 }
 
 // src/tool-descriptions.ts
@@ -720,7 +744,7 @@ async function handleToolCall(id, params, options) {
 async function executeAstGrepTool(name, args, options) {
   if (disabledToolNames(options).has(name))
     throw new Error(`ast-grep tool is disabled: ${name}`);
-  const runner = options.runSg ?? runSg;
+  const runner = options.runSg ?? runSg2;
   const workspaceDirectory = normalizeWorkspaceDirectory(options.workspaceDirectory ?? process.env.OMO_AST_GREP_WORKSPACE ?? process.cwd());
   if (name === "search") {
     const input = parseSearchArgs(args, workspaceDirectory);

package/dist/hooks/comment-checker/apply-patch-edits.d.ts

@@ -1,2 +0,0 @@
-import type { ApplyPatchEdit } from "./cli-runner";
-export declare function extractApplyPatchEdits(details: unknown, args?: Record<string, unknown>): ApplyPatchEdit[];

package/dist/shared/known-variants.d.ts

@@ -1,6 +0,0 @@
-/**
- * Canonical set of recognised variant / effort tokens.
- * Used by parseFallbackModelEntry (space-suffix detection) and
- * flattenToFallbackModelStrings (inline-variant stripping).
- */
-export declare const KNOWN_VARIANTS: Set<string>;

package/dist/shared/model-capabilities/bundled-snapshot.d.ts

@@ -1,2 +0,0 @@
-import type { ModelCapabilitiesSnapshot } from "./types";
-export declare function getBundledModelCapabilitiesSnapshot(): ModelCapabilitiesSnapshot;

package/dist/shared/model-capabilities/get-model-capabilities.d.ts

@@ -1,2 +0,0 @@
-import type { GetModelCapabilitiesInput, ModelCapabilities } from "./types";
-export declare function getModelCapabilities(input: GetModelCapabilitiesInput): ModelCapabilities;

package/dist/shared/model-capabilities/runtime-model-readers.d.ts

@@ -1,11 +0,0 @@
-import type { ModelMetadata } from "../connected-providers-cache";
-import type { ModelCapabilities } from "./types";
-export declare function readRuntimeModel(runtimeModel: ModelMetadata | Record<string, unknown> | undefined): Record<string, unknown> | undefined;
-export declare function readRuntimeModelVariants(runtimeModel: Record<string, unknown> | undefined): string[] | undefined;
-export declare function readRuntimeModelModalities(runtimeModel: Record<string, unknown> | undefined): ModelCapabilities["modalities"] | undefined;
-export declare function readRuntimeModelReasoningSupport(runtimeModel: Record<string, unknown> | undefined): boolean | undefined;
-export declare function readRuntimeModelThinkingSupport(runtimeModel: Record<string, unknown> | undefined): boolean | undefined;
-export declare function readRuntimeModelTemperatureSupport(runtimeModel: Record<string, unknown> | undefined): boolean | undefined;
-export declare function readRuntimeModelTopPSupport(runtimeModel: Record<string, unknown> | undefined): boolean | undefined;
-export declare function readRuntimeModelToolCallSupport(runtimeModel: Record<string, unknown> | undefined): boolean | undefined;
-export declare function readRuntimeModelLimitOutput(runtimeModel: Record<string, unknown> | undefined): number | undefined;

package/dist/shared/model-capabilities/supplemental-entries.d.ts

@@ -1,2 +0,0 @@
-import type { ModelCapabilitiesSnapshotEntry } from "./types";
-export declare const SUPPLEMENTAL_MODEL_CAPABILITIES: Record<string, ModelCapabilitiesSnapshotEntry>;