oh-my-opencode 4.9.2 → 4.10.0

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

@@ -331,9 +331,11 @@ function errorMessage(error) {
   return String(error);
 }
 // src/sg-cli-path.ts
-import { createRequire } from "module";
-import { dirname, join as join2 } from "path";
-import { existsSync, statSync as statSync2 } from "fs";
+import { createRequire } from "node:module";
+import { homedir as defaultHomedir } from "node:os";
+import { dirname, join as join2 } from "node:path";
+import { existsSync, statSync as statSync2 } from "node:fs";
+var SG_PATH_ENV_KEY = "OMO_AST_GREP_SG_PATH";
 var WINDOWS_EXECUTABLE_EXTENSIONS = [".exe", ".cmd", ".bat"];
 function isValidBinary(filePath) {
   try {
@@ -364,17 +366,15 @@ function executableCandidates(filePath, platform = process.platform) {
   }
   return candidates;
 }
-function findValidExecutable(filePath) {
-  for (const candidate of executableCandidates(filePath)) {
+function findValidExecutable(filePath, platform = process.platform) {
+  for (const candidate of executableCandidates(filePath, platform)) {
     if (existsSync(candidate) && isValidBinary(candidate)) {
       return candidate;
     }
   }
   return null;
 }
-function getPlatformPackageName() {
-  const platform = process.platform;
-  const arch = process.arch;
+function getPlatformPackageName(platform, arch) {
   const platformMap = {
     "darwin-arm64": "@ast-grep/cli-darwin-arm64",
     "darwin-x64": "@ast-grep/cli-darwin-x64",
@@ -389,14 +389,48 @@ function getPlatformPackageName() {
 function isModuleResolutionFailure(error) {
   return error instanceof Error && (error.message.includes("Cannot find module") || error.message.includes("Cannot find package"));
 }
-function findSgCliPathSync() {
+function defaultResolveModulePath(specifier) {
+  const require2 = createRequire(import.meta.url);
+  return require2.resolve(specifier);
+}
+function nonEmptyValue(value) {
+  if (value === undefined)
+    return;
+  const trimmed = value.trim();
+  return trimmed.length === 0 ? undefined : trimmed;
+}
+function findEnvOverrideSgPath(env, platform) {
+  const overridePath = nonEmptyValue(env[SG_PATH_ENV_KEY]);
+  if (overridePath === undefined)
+    return null;
+  return findValidExecutable(overridePath, platform);
+}
+function findRuntimeDirSgPath(env, platform, arch, homedir) {
+  const codexHome = nonEmptyValue(env["CODEX_HOME"]) ?? join2(homedir(), ".codex");
+  const binaryName = platform === "win32" ? "sg.exe" : "sg";
+  const runtimePath = join2(codexHome, "runtime", "ast-grep", `${platform}-${arch}`, binaryName);
+  return findValidExecutable(runtimePath, platform);
+}
+function findSgCliPathSync(options = {}) {
+  const env = options.env ?? process.env;
+  const platform = options.platform ?? process.platform;
+  const arch = options.arch ?? process.arch;
+  const homedir = options.homedir ?? defaultHomedir;
+  const resolveModulePath = options.resolveModulePath ?? defaultResolveModulePath;
+  const envOverridePath = findEnvOverrideSgPath(env, platform);
+  if (envOverridePath) {
+    return envOverridePath;
+  }
+  const runtimeDirPath = findRuntimeDirSgPath(env, platform, arch, homedir);
+  if (runtimeDirPath) {
+    return runtimeDirPath;
+  }
   const binaryName = "sg";
   try {
-    const require2 = createRequire(import.meta.url);
-    const cliPackageJsonPath = require2.resolve("@ast-grep/cli/package.json");
+    const cliPackageJsonPath = resolveModulePath("@ast-grep/cli/package.json");
     const cliDirectory = dirname(cliPackageJsonPath);
     const sgPath = join2(cliDirectory, binaryName);
-    const validSgPath = findValidExecutable(sgPath);
+    const validSgPath = findValidExecutable(sgPath, platform);
     if (validSgPath) {
       return validSgPath;
     }
@@ -405,15 +439,14 @@ function findSgCliPathSync() {
       throw error;
     }
   }
-  const platformPackage = getPlatformPackageName();
+  const platformPackage = getPlatformPackageName(platform, arch);
   if (platformPackage) {
     try {
-      const require2 = createRequire(import.meta.url);
-      const packageJsonPath = require2.resolve(`${platformPackage}/package.json`);
+      const packageJsonPath = resolveModulePath(`${platformPackage}/package.json`);
       const packageDirectory = dirname(packageJsonPath);
       const astGrepBinaryName = "ast-grep";
       const binaryPath = join2(packageDirectory, astGrepBinaryName);
-      const validBinaryPath = findValidExecutable(binaryPath);
+      const validBinaryPath = findValidExecutable(binaryPath, platform);
       if (validBinaryPath) {
         return validBinaryPath;
       }
@@ -423,7 +456,7 @@ function findSgCliPathSync() {
       }
     }
   }
-  if (process.platform === "darwin") {
+  if (platform === "darwin") {
     const homebrewPaths = ["/opt/homebrew/bin/sg", "/usr/local/bin/sg"];
     for (const path of homebrewPaths) {
       if (existsSync(path) && isValidBinary(path)) {

package/packages/lsp-daemon/dist/cli.js

@@ -552,7 +552,7 @@ function parseDiagnosticsParams(params) {
 }
 
 class LspClientTransport {
-  constructor(root, server) {
+  constructor(root, server, timeouts = {}) {
     this.root = root;
     this.server = server;
     this.proc = null;
@@ -560,6 +560,8 @@ class LspClientTransport {
     this.stderrBuffer = [];
     this.processExited = false;
     this.diagnosticsStore = new Map;
+    this.requestTimeoutMs = timeouts.requestTimeoutMs ?? REQUEST_TIMEOUT_MS;
+    this.initializeTimeoutMs = timeouts.initializeTimeoutMs ?? INIT_TIMEOUT_MS;
   }
   pid() {
     return this.proc?.pid;
@@ -634,13 +636,14 @@ class LspClientTransport {
 `);
       throw new LspProcessExitedError(this.server.id, this.root, this.proc?.exitCode ?? null, stderrTail || undefined);
     }
+    const timeoutMs = args[1]?.timeoutMs ?? this.requestTimeoutMs;
     let timeoutHandle = null;
     const timeoutPromise = new Promise((_, reject) => {
       timeoutHandle = setTimeout(() => {
         const stderrTail = this.stderrBuffer.slice(-5).join(`
 `);
         reject(new LspRequestTimeoutError(method, stderrTail || undefined));
-      }, REQUEST_TIMEOUT_MS);
+      }, timeoutMs);
     });
     try {
       const requestPromise = args.length === 0 ? this.connection.sendRequest(method) : this.connection.sendRequest(method, args[0]);
@@ -812,7 +815,7 @@ class LspClientConnection extends LspClientTransport {
         }
       },
       initializationOptions: this.server.initialization
-    });
+    }, { timeoutMs: this.initializeTimeoutMs });
     await this.sendNotification("initialized");
     await this.sendNotification("workspace/didChangeConfiguration", {
       settings: { json: { validate: { enable: true } } }
@@ -1569,7 +1572,7 @@ var BUILTIN_SERVERS = {
   zls: { command: ["zls"], extensions: [".zig", ".zon"] },
   csharp: { command: ["csharp-ls"], extensions: [".cs"] },
   fsharp: { command: ["fsautocomplete"], extensions: [".fs", ".fsi", ".fsx", ".fsscript"] },
-  "sourcekit-lsp": { command: ["sourcekit-lsp"], extensions: [".swift", ".objc", ".objcpp"] },
+  "sourcekit-lsp": { command: ["sourcekit-lsp"], extensions: [".swift", ".m", ".mm"] },
   rust: { command: ["rust-analyzer"], extensions: [".rs"] },
   clangd: {
     command: ["clangd", "--background-index", "--clang-tidy"],
@@ -1607,7 +1610,7 @@ var BUILTIN_SERVERS = {
     command: ["haskell-language-server-wrapper", "--lsp"],
     extensions: [".hs", ".lhs"]
   },
-  "kotlin-ls": { command: ["kotlin-lsp"], extensions: [".kt", ".kts"] },
+  "kotlin-ls": { command: ["kotlin-lsp", "--stdio"], extensions: [".kt", ".kts"] },
   julials: {
     command: ["julia", "--startup-file=no", "--history-file=no", "-e", "using LanguageServer; runserver()"],
     extensions: [".jl"]

package/packages/lsp-daemon/dist/index.js

@@ -527,7 +527,7 @@ function parseDiagnosticsParams(params) {
 }
 
 class LspClientTransport {
-  constructor(root, server) {
+  constructor(root, server, timeouts = {}) {
     this.root = root;
     this.server = server;
     this.proc = null;
@@ -535,6 +535,8 @@ class LspClientTransport {
     this.stderrBuffer = [];
     this.processExited = false;
     this.diagnosticsStore = new Map;
+    this.requestTimeoutMs = timeouts.requestTimeoutMs ?? REQUEST_TIMEOUT_MS;
+    this.initializeTimeoutMs = timeouts.initializeTimeoutMs ?? INIT_TIMEOUT_MS;
   }
   pid() {
     return this.proc?.pid;
@@ -609,13 +611,14 @@ class LspClientTransport {
 `);
       throw new LspProcessExitedError(this.server.id, this.root, this.proc?.exitCode ?? null, stderrTail || undefined);
     }
+    const timeoutMs = args[1]?.timeoutMs ?? this.requestTimeoutMs;
     let timeoutHandle = null;
     const timeoutPromise = new Promise((_, reject) => {
       timeoutHandle = setTimeout(() => {
         const stderrTail = this.stderrBuffer.slice(-5).join(`
 `);
         reject(new LspRequestTimeoutError(method, stderrTail || undefined));
-      }, REQUEST_TIMEOUT_MS);
+      }, timeoutMs);
     });
     try {
       const requestPromise = args.length === 0 ? this.connection.sendRequest(method) : this.connection.sendRequest(method, args[0]);
@@ -787,7 +790,7 @@ class LspClientConnection extends LspClientTransport {
         }
       },
       initializationOptions: this.server.initialization
-    });
+    }, { timeoutMs: this.initializeTimeoutMs });
     await this.sendNotification("initialized");
     await this.sendNotification("workspace/didChangeConfiguration", {
       settings: { json: { validate: { enable: true } } }
@@ -1770,7 +1773,7 @@ var BUILTIN_SERVERS = {
   zls: { command: ["zls"], extensions: [".zig", ".zon"] },
   csharp: { command: ["csharp-ls"], extensions: [".cs"] },
   fsharp: { command: ["fsautocomplete"], extensions: [".fs", ".fsi", ".fsx", ".fsscript"] },
-  "sourcekit-lsp": { command: ["sourcekit-lsp"], extensions: [".swift", ".objc", ".objcpp"] },
+  "sourcekit-lsp": { command: ["sourcekit-lsp"], extensions: [".swift", ".m", ".mm"] },
   rust: { command: ["rust-analyzer"], extensions: [".rs"] },
   clangd: {
     command: ["clangd", "--background-index", "--clang-tidy"],
@@ -1808,7 +1811,7 @@ var BUILTIN_SERVERS = {
     command: ["haskell-language-server-wrapper", "--lsp"],
     extensions: [".hs", ".lhs"]
   },
-  "kotlin-ls": { command: ["kotlin-lsp"], extensions: [".kt", ".kts"] },
+  "kotlin-ls": { command: ["kotlin-lsp", "--stdio"], extensions: [".kt", ".kts"] },
   julials: {
     command: ["julia", "--startup-file=no", "--history-file=no", "-e", "using LanguageServer; runserver()"],
     extensions: [".jl"]

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

@@ -55,7 +55,7 @@ export class LspClientConnection extends LspClientTransport {
                 },
             },
             initializationOptions: this.server.initialization,
-        });
+        }, { timeoutMs: this.initializeTimeoutMs });
         await this.sendNotification("initialized");
         await this.sendNotification("workspace/didChangeConfiguration", {
             settings: { json: { validate: { enable: true } } },

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

@@ -97,7 +97,7 @@ export const BUILTIN_SERVERS = {
     zls: { command: ["zls"], extensions: [".zig", ".zon"] },
     csharp: { command: ["csharp-ls"], extensions: [".cs"] },
     fsharp: { command: ["fsautocomplete"], extensions: [".fs", ".fsi", ".fsx", ".fsscript"] },
-    "sourcekit-lsp": { command: ["sourcekit-lsp"], extensions: [".swift", ".objc", ".objcpp"] },
+    "sourcekit-lsp": { command: ["sourcekit-lsp"], extensions: [".swift", ".m", ".mm"] },
     rust: { command: ["rust-analyzer"], extensions: [".rs"] },
     clangd: {
         command: ["clangd", "--background-index", "--clang-tidy"],
@@ -135,7 +135,7 @@ export const BUILTIN_SERVERS = {
         command: ["haskell-language-server-wrapper", "--lsp"],
         extensions: [".hs", ".lhs"],
     },
-    "kotlin-ls": { command: ["kotlin-lsp"], extensions: [".kt", ".kts"] },
+    "kotlin-ls": { command: ["kotlin-lsp", "--stdio"], extensions: [".kt", ".kts"] },
     julials: {
         command: ["julia", "--startup-file=no", "--history-file=no", "-e", "using LanguageServer; runserver()"],
         extensions: [".jl"],

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

@@ -1,6 +1,10 @@
 import { JsonRpcConnection } from "./json-rpc-connection.js";
 import { type SpawnedProcess } from "./process.js";
 import type { Diagnostic, ResolvedServer } from "./types.js";
+export interface LspClientTimeoutOptions {
+    requestTimeoutMs?: number;
+    initializeTimeoutMs?: number;
+}
 export declare class LspClientTransport {
     protected readonly root: string;
     protected readonly server: ResolvedServer;
@@ -9,7 +13,9 @@ export declare class LspClientTransport {
     protected readonly stderrBuffer: string[];
     protected processExited: boolean;
     protected readonly diagnosticsStore: Map<string, Diagnostic[]>;
-    constructor(root: string, server: ResolvedServer);
+    protected readonly requestTimeoutMs: number;
+    protected readonly initializeTimeoutMs: number;
+    constructor(root: string, server: ResolvedServer, timeouts?: LspClientTimeoutOptions);
     pid(): number | undefined;
     command(): string[];
     start(): Promise<void>;
@@ -17,6 +23,9 @@ export declare class LspClientTransport {
     private isConnectionClosedError;
     protected sendRequest<T>(method: string): Promise<T>;
     protected sendRequest<T>(method: string, params: unknown): Promise<T>;
+    protected sendRequest<T>(method: string, params: unknown, options: {
+        timeoutMs?: number;
+    }): Promise<T>;
     protected sendNotification(method: string): Promise<void>;
     protected sendNotification(method: string, params: unknown): Promise<void>;
     isAlive(): boolean;

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

@@ -1,5 +1,5 @@
 import { reportBestEffortCleanupError } from "./cleanup-errors.js";
-import { REQUEST_TIMEOUT_MS, STOP_HARD_KILL_TIMEOUT_MS, STOP_SIGKILL_GRACE_MS } from "./constants.js";
+import { INIT_TIMEOUT_MS, 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";
@@ -25,7 +25,7 @@ function parseDiagnosticsParams(params) {
     return { uri: params["uri"], diagnostics };
 }
 export class LspClientTransport {
-    constructor(root, server) {
+    constructor(root, server, timeouts = {}) {
         this.root = root;
         this.server = server;
         this.proc = null;
@@ -33,6 +33,8 @@ export class LspClientTransport {
         this.stderrBuffer = [];
         this.processExited = false;
         this.diagnosticsStore = new Map();
+        this.requestTimeoutMs = timeouts.requestTimeoutMs ?? REQUEST_TIMEOUT_MS;
+        this.initializeTimeoutMs = timeouts.initializeTimeoutMs ?? INIT_TIMEOUT_MS;
     }
     pid() {
         return this.proc?.pid;
@@ -106,12 +108,13 @@ export class LspClientTransport {
             const stderrTail = this.stderrBuffer.slice(-10).join("\n");
             throw new LspProcessExitedError(this.server.id, this.root, this.proc?.exitCode ?? null, stderrTail || undefined);
         }
+        const timeoutMs = args[1]?.timeoutMs ?? this.requestTimeoutMs;
         let timeoutHandle = null;
         const timeoutPromise = new Promise((_, reject) => {
             timeoutHandle = setTimeout(() => {
                 const stderrTail = this.stderrBuffer.slice(-5).join("\n");
                 reject(new LspRequestTimeoutError(method, stderrTail || undefined));
-            }, REQUEST_TIMEOUT_MS);
+            }, timeoutMs);
         });
         try {
             const requestPromise = args.length === 0

package/packages/omo-codex/lazycodex-repository/.github/workflows/pr-source-guidance.yml

@@ -7,30 +7,29 @@ on:
 permissions:
   contents: read
   issues: write
-  pull-requests: read
+  pull-requests: write
 
 jobs:
-  comment-source-repo:
+  close-with-source-guidance:
     runs-on: ubuntu-latest
     steps:
-      - name: Comment with source repository guidance
+      - name: Close PR with source repository guidance
         env:
           GH_TOKEN: ${{ github.token }}
           PR_NUMBER: ${{ github.event.pull_request.number }}
+          PR_TITLE: ${{ github.event.pull_request.title }}
         run: |
           set -euo pipefail
 
-          marker="canonical LazyCodex source lives in"
-          if gh pr view "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --json comments --jq '.comments[].body' | grep -F "$marker" >/dev/null; then
-            echo "Source guidance comment already exists."
-            exit 0
-          fi
+          PR_URL="https://github.com/$GITHUB_REPOSITORY/pull/$PR_NUMBER"
 
           body="$(mktemp)"
-          cat > "$body" <<'MARKDOWN'
-          Thanks for opening this PR. The canonical LazyCodex source lives in [oh-my-openagent](https://github.com/code-yeongyu/oh-my-openagent), and the Codex Light implementation is under [`packages/omo-codex`](https://github.com/code-yeongyu/oh-my-openagent/tree/dev/packages/omo-codex).
+          cat > "$body" <<MARKDOWN
+          Thanks for the PR! Changes to LazyCodex land through [oh-my-openagent](https://github.com/code-yeongyu/oh-my-openagent) — could you open this against [omo-codex](https://github.com/code-yeongyu/oh-my-openagent/tree/dev/packages/omo-codex) over there instead? PRs in this repository can't be merged.
 
-          Direct edits in this marketplace repository can be overwritten by the release sync. Please open the implementation PR in `code-yeongyu/oh-my-openagent` and add the `lazycodex` label there so it gets routed faster.
+          If you're working with a coding agent, prompt it like this:
+
+          > I opened $PR_URL ("$PR_TITLE") against code-yeongyu/lazycodex, but changes there land through code-yeongyu/oh-my-openagent, where the Codex implementation lives under packages/omo-codex. Read my original PR, then open an equivalent PR against code-yeongyu/oh-my-openagent. In the new PR body, link the original PR ($PR_URL), explain that it was first opened against lazycodex, and describe in detail what that PR changed and why.
           MARKDOWN
 
-          gh pr comment "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --body-file "$body"
+          gh pr close "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --comment "$(cat "$body")"

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

@@ -1,6 +1,6 @@
 {
   "name": "omo",
-  "version": "4.9.2",
+  "version": "4.10.0",
   "description": "One Codex plugin namespace for Yeongyu's local Codex components.",
   "author": {
     "name": "Yeongyu Kim",