oh-my-opencode 4.9.2 → 4.11.0

package/package.json

@@ -1,21 +1,29 @@
 {
   "name": "oh-my-opencode",
-  "version": "4.9.2",
+  "version": "4.11.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",
   "type": "module",
   "workspaces": [
     "packages/rules-engine",
-    "packages/ast-grep-core",
-    "packages/ast-grep-mcp",
+    "packages/delegate-core",
     "packages/git-bash-mcp",
+    "packages/mcp-stdio-core",
+    "packages/mcp-client-core",
+    "packages/lsp-core",
     "packages/utils",
     "packages/model-core",
     "packages/prompts-core",
     "packages/comment-checker-core",
     "packages/hashline-core",
+    "packages/tmux-core",
+    "packages/team-core",
+    "packages/openclaw-core",
     "packages/boulder-state",
+    "packages/telemetry-core",
+    "packages/claude-code-compat-core",
+    "packages/skills-loader-core",
     "packages/agents-md-core",
     "packages/shared-skills",
     "packages/omo-codex",
@@ -29,6 +37,7 @@
     "lazycodex-ai": "bin/oh-my-opencode.js"
   },
   "files": [
+    "THIRD-PARTY-NOTICES.md",
     "dist",
     "bin",
     "postinstall.mjs",
@@ -37,21 +46,26 @@
     ".agents/command",
     ".agents/skills",
     "packages/lsp-tools-mcp/package.json",
+    "packages/lsp-core/package.json",
+    "packages/lsp-core/src",
     "packages/lsp-tools-mcp/dist",
     "packages/lsp-daemon/package.json",
     "packages/lsp-daemon/dist",
-    "packages/ast-grep-mcp/dist",
     "packages/git-bash-mcp/dist",
     "packages/shared-skills/package.json",
     "packages/shared-skills/index.mjs",
     "packages/shared-skills/skills",
+    "packages/omo-codex/THIRD-PARTY-NOTICES.md",
     "packages/omo-codex/marketplace.json",
     "packages/omo-codex/lazycodex-repository",
     "packages/omo-codex/plugin",
+    "packages/omo-codex/plugin/components/start-work-continuation/dist/cli.js",
+    "packages/omo-codex/plugin/components/ulw-loop/dist/cli.js",
     "packages/omo-codex/plugin/.codex-plugin",
     "!packages/omo-codex/plugin/node_modules",
     "!packages/omo-codex/plugin/**/node_modules",
-    "packages/omo-codex/scripts"
+    "packages/omo-codex/scripts",
+    "!packages/omo-codex/scripts/install"
   ],
   "exports": {
     ".": {
@@ -59,11 +73,15 @@
       "import": "./dist/index.js"
     },
     "./server": "./dist/index.js",
+    "./tui": "./dist/tui.js",
     "./schema.json": "./dist/oh-my-opencode.schema.json"
   },
   "scripts": {
-    "build": "bun run build:ast-grep-mcp && bun run build:git-bash-mcp && bun build packages/omo-opencode/src/index.ts --outdir dist --target bun --format esm --external @ast-grep/napi --external zod && bun run build:node-require-shim && tsc --emitDeclarationOnly && bun build packages/omo-opencode/src/cli/index.ts --outdir dist/cli --target bun --format esm --external @ast-grep/napi && bun run build:cli-node && bun run build:schema",
+    "build": "bun run build:git-bash-mcp && bun run build:lsp-tools-mcp && bun run build:lsp-daemon && bun run build:codex-plugin && bun build packages/omo-opencode/src/index.ts --outdir dist --target bun --format esm --external zod && bun build packages/omo-opencode/src/tui.ts --outdir dist --target bun --format esm --external @opentui/core --external @opentui/keymap --external @opentui/solid && bun run build:shared-skills-assets && bun run build:node-require-shim && tsc --emitDeclarationOnly && bun build packages/omo-opencode/src/cli/index.ts --outdir dist/cli --target bun --format esm && bun run build:cli-node && bun run build:codex-install && bun run build:schema",
     "build:cli-node": "bun run script/build-cli-node.ts",
+    "build:codex-install": "bun run script/build-codex-install.ts",
+    "build:codex-plugin": "npm --prefix packages/omo-codex/plugin ci && bun run --cwd packages/omo-codex/plugin build",
+    "build:shared-skills-assets": "rm -rf dist/skills && cp -R packages/shared-skills/skills dist/skills",
     "build:lsp-tools-mcp": "npm --prefix packages/lsp-tools-mcp ci && npm --prefix packages/lsp-tools-mcp run build",
     "build:lsp-daemon": "npm --prefix packages/lsp-daemon ci && npm --prefix packages/lsp-daemon run build",
     "build:node-require-shim": "bun run script/patch-node-require-shim.ts",
@@ -75,14 +93,13 @@
     "prepare": "bun run build",
     "postinstall": "node postinstall.mjs",
     "prepublishOnly": "bun run clean && bun run build:lsp-tools-mcp && bun run build:lsp-daemon && bun run build",
-    "test:model-capabilities": "bun test packages/omo-opencode/src/shared/model-capability-aliases.test.ts packages/omo-opencode/src/shared/model-capability-guardrails.test.ts packages/omo-opencode/src/shared/model-capabilities.test.ts packages/omo-opencode/src/cli/doctor/checks/model-resolution.test.ts --bail",
+    "test:model-capabilities": "bun test packages/model-core/src/model-capability-aliases.test.ts packages/model-core/src/model-capability-guardrails.test.ts packages/model-core/src/model-capabilities.test.ts packages/omo-opencode/src/cli/doctor/checks/model-resolution.test.ts --bail",
     "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 && tsgo --noEmit -p packages/omo-opencode/tsconfig.json",
+    "typecheck:packages": "tsgo --noEmit -p packages/rules-engine/tsconfig.json && tsgo --noEmit -p packages/delegate-core/tsconfig.json && tsgo --noEmit -p packages/mcp-stdio-core/tsconfig.json && tsgo --noEmit -p packages/mcp-client-core/tsconfig.json && tsgo --noEmit -p packages/git-bash-mcp/tsconfig.json && tsgo --noEmit -p packages/lsp-core/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/tmux-core/tsconfig.json && tsgo --noEmit -p packages/team-core/tsconfig.json && tsgo --noEmit -p packages/openclaw-core/tsconfig.json && tsgo --noEmit -p packages/boulder-state/tsconfig.json && tsgo --noEmit -p packages/telemetry-core/tsconfig.json && tsgo --noEmit -p packages/claude-code-compat-core/tsconfig.json && tsgo --noEmit -p packages/skills-loader-core/tsconfig.json && tsgo --noEmit -p packages/agents-md-core/tsconfig.json && tsgo --noEmit -p packages/omo-codex/plugin/shared/tsconfig.json && tsgo --noEmit -p packages/omo-codex/tsconfig.json && tsgo --noEmit -p packages/omo-opencode/tsconfig.json",
     "typecheck:script": "tsgo --noEmit -p script/tsconfig.json",
     "test": "bun test",
-    "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 packages/omo-opencode/src/cli/cli-installer.platform.test.ts packages/omo-opencode/src/cli/install-codex/codex-cache.test.ts packages/omo-opencode/src/cli/install-codex/codex-cleanup.test.ts packages/omo-opencode/src/cli/install-codex/codex-config-agent-cleanup.test.ts packages/omo-opencode/src/cli/install-codex/codex-config-autonomous-features.test.ts packages/omo-opencode/src/cli/install-codex/codex-config-reasoning.test.ts packages/omo-opencode/src/cli/install-codex/codex-config-toml.test.ts packages/omo-opencode/src/cli/install-codex/codex-project-local-cleanup.test.ts packages/omo-opencode/src/cli/install-codex/install-codex-project-local-cleanup.test.ts packages/omo-opencode/src/cli/install-codex/install-codex.test.ts packages/omo-opencode/src/cli/install-codex/install-codex-packaged.test.ts packages/omo-opencode/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-delegated-command.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-hook-targets.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:codex": "bun run build:codex-install && bun run build:git-bash-mcp && bun run build:lsp-tools-mcp && bun run build:lsp-daemon && npm --prefix packages/lsp-tools-mcp test && npm --prefix packages/omo-codex/plugin ci && bun run --cwd packages/omo-codex/plugin build && node scripts/check-third-party-notices.mjs --ship && bun test packages/omo-opencode/src/cli/cli-installer.platform.test.ts packages/omo-codex/src/install/codex-cache.test.ts packages/omo-codex/src/install/codex-cleanup.test.ts packages/omo-codex/src/install/codex-config-agent-cleanup.test.ts packages/omo-codex/src/install/codex-config-autonomous-features.test.ts packages/omo-codex/src/install/codex-config-reasoning.test.ts packages/omo-codex/src/install/codex-config-toml.test.ts packages/omo-codex/src/install/codex-project-local-cleanup.test.ts packages/omo-codex/src/install/install-codex-project-local-cleanup.test.ts packages/omo-codex/src/install/install-codex.test.ts packages/omo-codex/src/install/install-codex-packaged.test.ts packages/omo-codex/src/install/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-delegated-command.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-hook-targets.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-generated-bundle.test.mjs packages/omo-codex/scripts/install-agent-links.test.mjs packages/omo-codex/scripts/install-bin-links.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"
   },
   "keywords": [
@@ -105,13 +122,14 @@
   },
   "homepage": "https://github.com/code-yeongyu/oh-my-openagent#readme",
   "dependencies": {
-    "@ast-grep/cli": "^0.42.2",
-    "@ast-grep/napi": "^0.42.2",
     "@clack/prompts": "^1.4.0",
     "@code-yeongyu/comment-checker": "^0.8.0",
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "@opencode-ai/plugin": "^1.15.4",
-    "@opencode-ai/sdk": "^1.15.4",
+    "@opencode-ai/plugin": "1.15.13",
+    "@opencode-ai/sdk": "1.15.13",
+    "@opentui/core": "^0.2.16",
+    "@opentui/keymap": "^0.2.16",
+    "@opentui/solid": "^0.2.16",
     "commander": "^14.0.3",
     "detect-libc": "^2.1.2",
     "diff": "^9.0.0",
@@ -120,41 +138,50 @@
     "picocolors": "^1.1.1",
     "picomatch": "^4.0.4",
     "posthog-node": "^5.34.3",
-    "vscode-jsonrpc": "^8.2.1"
+    "vscode-jsonrpc": "^8.2.1",
+    "zod": "^4.4.3"
   },
   "devDependencies": {
-    "@oh-my-opencode/ast-grep-core": "workspace:*",
-    "@oh-my-opencode/ast-grep-mcp": "workspace:*",
     "@oh-my-opencode/git-bash-mcp": "workspace:*",
+    "@oh-my-opencode/lsp-core": "workspace:*",
+    "@oh-my-opencode/mcp-stdio-core": "workspace:*",
+    "@oh-my-opencode/mcp-client-core": "workspace:*",
     "@oh-my-opencode/agents-md-core": "workspace:*",
     "@oh-my-opencode/boulder-state": "workspace:*",
+    "@oh-my-opencode/claude-code-compat-core": "workspace:*",
+    "@oh-my-opencode/skills-loader-core": "workspace:*",
     "@oh-my-opencode/comment-checker-core": "workspace:*",
+    "@oh-my-opencode/delegate-core": "workspace:*",
     "@oh-my-opencode/hashline-core": "workspace:*",
+    "@oh-my-opencode/tmux-core": "workspace:*",
+    "@oh-my-opencode/team-core": "workspace:*",
+    "@oh-my-opencode/openclaw-core": "workspace:*",
     "@oh-my-opencode/model-core": "workspace:*",
     "@oh-my-opencode/omo-codex": "workspace:*",
     "@oh-my-opencode/prompts-core": "workspace:*",
     "@oh-my-opencode/rules-engine": "workspace:*",
     "@oh-my-opencode/shared-skills": "workspace:*",
+    "@oh-my-opencode/telemetry-core": "workspace:*",
     "@oh-my-opencode/utils": "workspace:*",
     "@typescript/native-preview": "7.0.0-dev.20260518.1",
     "@types/js-yaml": "^4.0.9",
     "@types/picomatch": "^4.0.3",
     "bun-types": "1.3.14",
-    "typescript": "^6.0.3",
-    "zod": "^4.4.3"
+    "typescript": "^6.0.3"
   },
   "optionalDependencies": {
-    "oh-my-opencode-darwin-arm64": "4.9.2",
-    "oh-my-opencode-darwin-x64": "4.9.2",
-    "oh-my-opencode-darwin-x64-baseline": "4.9.2",
-    "oh-my-opencode-linux-arm64": "4.9.2",
-    "oh-my-opencode-linux-arm64-musl": "4.9.2",
-    "oh-my-opencode-linux-x64": "4.9.2",
-    "oh-my-opencode-linux-x64-baseline": "4.9.2",
-    "oh-my-opencode-linux-x64-musl": "4.9.2",
-    "oh-my-opencode-linux-x64-musl-baseline": "4.9.2",
-    "oh-my-opencode-windows-x64": "4.9.2",
-    "oh-my-opencode-windows-x64-baseline": "4.9.2"
+    "oh-my-opencode-darwin-arm64": "4.11.0",
+    "oh-my-opencode-darwin-x64": "4.11.0",
+    "oh-my-opencode-darwin-x64-baseline": "4.11.0",
+    "oh-my-opencode-linux-arm64": "4.11.0",
+    "oh-my-opencode-linux-arm64-musl": "4.11.0",
+    "oh-my-opencode-linux-x64": "4.11.0",
+    "oh-my-opencode-linux-x64-baseline": "4.11.0",
+    "oh-my-opencode-linux-x64-musl": "4.11.0",
+    "oh-my-opencode-linux-x64-musl-baseline": "4.11.0",
+    "oh-my-opencode-windows-arm64": "4.11.0",
+    "oh-my-opencode-windows-x64": "4.11.0",
+    "oh-my-opencode-windows-x64-baseline": "4.11.0"
   },
   "overrides": {
     "hono": "^4.12.18",
@@ -164,11 +191,6 @@
     "path-to-regexp": "^8.4.2"
   },
   "trustedDependencies": [
-    "@ast-grep/cli",
-    "@ast-grep/napi",
     "@code-yeongyu/comment-checker"
-  ],
-  "peerDependencies": {
-    "zod": "^4.0.0"
-  }
+  ]
 }

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

@@ -3,12 +3,213 @@
 // src/cli.ts
 import { argv, stderr } from "node:process";
 
-// src/git-bash-resolver.ts
+// ../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
+  };
+}
+// ../utils/src/runtime/git-bash.ts
 import { execFileSync } from "node:child_process";
 import { existsSync } from "node:fs";
 var GIT_BASH_ENV_KEY = "OMO_CODEX_GIT_BASH_PATH";
 var PROGRAM_FILES_GIT_BASH = "C:\\Program Files\\Git\\bin\\bash.exe";
 var PROGRAM_FILES_X86_GIT_BASH = "C:\\Program Files (x86)\\Git\\bin\\bash.exe";
+var NON_GIT_BASH_LAUNCHER_DIR_SEGMENTS = ["\\windows\\system32\\", "\\microsoft\\windowsapps\\"];
 function resolveGitBash(input) {
   if (input.platform !== "win32")
     return { found: true, path: null, source: "not-required", checkedPaths: [] };
@@ -16,8 +217,9 @@ function resolveGitBash(input) {
   const envPath = nonEmptyEnvValue(input.env, GIT_BASH_ENV_KEY);
   if (envPath !== undefined) {
     checkedPaths.push(envPath);
-    if (isBashExePath(envPath) && input.exists(envPath))
+    if (isBashExePath(envPath) && input.exists(envPath)) {
       return { found: true, path: envPath, source: "env", checkedPaths };
+    }
     return missingGitBash(checkedPaths);
   }
   for (const candidate of [
@@ -40,20 +242,20 @@ function resolveGitBash(input) {
   }
   return missingGitBash(checkedPaths);
 }
-function resolveGitBashForCurrentProcess(input = {}) {
+var resolveGitBashForCurrentProcess = (input = {}) => {
   return resolveGitBash({
     platform: input.platform ?? process.platform,
     env: input.env ?? process.env,
     exists: existsSync,
     where: whereCommand
   });
-}
+};
 function missingGitBash(checkedPaths) {
   return {
     found: false,
     checkedPaths,
     installHint: [
-      "Git Bash is required before the git_bash MCP can run commands on native Windows.",
+      "Git Bash is required on native Windows.",
       "Install it with: winget install --id Git.Git -e --source winget",
       `For a custom install, set ${GIT_BASH_ENV_KEY}=C:\\path\\to\\bash.exe`
     ].join(`
@@ -70,7 +272,6 @@ function nonEmptyEnvValue(env, key) {
 function isBashExePath(path) {
   return path.toLowerCase().endsWith("bash.exe");
 }
-var NON_GIT_BASH_LAUNCHER_DIR_SEGMENTS = ["\\windows\\system32\\", "\\microsoft\\windowsapps\\"];
 function isKnownNonGitBashLauncher(path) {
   const normalized = path.replaceAll("/", "\\").toLowerCase();
   return NON_GIT_BASH_LAUNCHER_DIR_SEGMENTS.some((segment) => normalized.includes(segment));
@@ -84,9 +285,8 @@ function whereCommand(command) {
     throw error;
   }
 }
-
 // src/runner.ts
-import { spawn } from "node:child_process";
+import { spawn as spawn2 } from "node:child_process";
 import { closeSync, mkdtempSync, openSync, readFileSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
@@ -113,7 +313,7 @@ async function runGitBashCommand(input) {
       rmSync(outputDirectory, { recursive: true, force: true });
       return { stdout, stderr };
     }
-    const child = spawn(input.bashPath, ["-lc", input.command], {
+    const child = spawn2(input.bashPath, ["-lc", input.command], {
       cwd: input.cwd,
       env: input.env,
       windowsHide: true,
@@ -149,10 +349,10 @@ var EXEC_COMMAND_TIMEOUT_ENV_KEYS = [
   "EXEC_COMMAND_TIMEOUT_MS"
 ];
 async function handleGitBashMcpRequest(input, options = {}) {
-  if (!isRecord(input))
+  if (!isPlainRecord(input))
     return errorResponse(null, -32600, "Invalid Request");
-  const id = jsonRpcId(input.id);
-  const method = typeof input.method === "string" ? input.method : null;
+  const id = jsonRpcId(input["id"]);
+  const method = typeof input["method"] === "string" ? input["method"] : null;
   if (method === "initialize") {
     const protocolVersion = protocolVersionFromInput(input) ?? "2024-11-05";
     return successResponse(id, {
@@ -164,9 +364,9 @@ async function handleGitBashMcpRequest(input, options = {}) {
   if (method === "tools/list")
     return successResponse(id, { tools: toolsForOptions(options) });
   if (method === "tools/call") {
-    const params = isRecord(input.params) ? input.params : {};
-    const name = typeof params.name === "string" ? params.name : "";
-    const args = isRecord(params.arguments) ? params.arguments : {};
+    const params = isPlainRecord(input["params"]) ? input["params"] : {};
+    const name = typeof params["name"] === "string" ? params["name"] : "";
+    const args = isPlainRecord(params["arguments"]) ? params["arguments"] : {};
     return await callTool(id, name, args, options);
   }
   if (method === "notifications/initialized")
@@ -176,24 +376,13 @@ async function handleGitBashMcpRequest(input, options = {}) {
 async function runMcpStdioServer(input, output, options = {}) {
   if (!canRunGitBash(options))
     return;
-  let buffer = "";
-  for await (const chunk of input) {
-    buffer += String(chunk);
-    while (true) {
-      const lineEnd = buffer.indexOf(`
-`);
-      if (lineEnd === -1)
-        break;
-      const line = buffer.slice(0, lineEnd).trim();
-      buffer = buffer.slice(lineEnd + 1);
-      if (line.length === 0)
-        continue;
-      const response = await handleGitBashMcpRequest(parseJsonRpcLine(line), options);
-      if (response !== undefined)
-        output.write(`${JSON.stringify(response)}
-`);
-    }
-  }
+  await runJsonRpcStdioServer({
+    input,
+    output,
+    handler: handleGitBashMcpRequest,
+    handlerOptions: options,
+    parseErrorResponse: () => errorResponse(null, -32601, "Method not found")
+  });
 }
 async function callTool(id, name, args, options) {
   if (name === "which_bash")
@@ -315,12 +504,6 @@ function runPayload(result) {
 function toolResponse(id, text, isError = false) {
   return successResponse(id, { content: [{ type: "text", text }], isError });
 }
-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 parseWorkdir(args) {
   const value = args.workdir ?? args.cwd;
   if (value === undefined)
@@ -354,23 +537,10 @@ function normalizeTimeoutMs(value) {
   return timeoutMs;
 }
 function protocolVersionFromInput(input) {
-  if (!isRecord(input.params))
+  if (!isPlainRecord(input["params"]))
     return null;
-  return typeof input.params.protocolVersion === "string" ? input.params.protocolVersion : null;
-}
-function parseJsonRpcLine(line) {
-  try {
-    const parsed = JSON.parse(line);
-    return parsed;
-  } catch (error) {
-    return { jsonrpc: "2.0", id: null, method: null, parseError: error instanceof Error ? error.message : String(error) };
-  }
-}
-function jsonRpcId(value) {
-  return typeof value === "string" || typeof value === "number" || value === null ? value : null;
-}
-function isRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
+  const params = input["params"];
+  return typeof params["protocolVersion"] === "string" ? params["protocolVersion"] : null;
 }
 
 // src/cli.ts

package/packages/lsp-core/package.json

@@ -0,0 +1,41 @@
+{
+  "name": "@oh-my-opencode/lsp-core",
+  "version": "0.1.0",
+  "type": "module",
+  "private": true,
+  "description": "Harness-neutral Language Server Protocol engine and tool definitions for oh-my-opencode.",
+  "exports": {
+    ".": {
+      "types": "./src/index.ts",
+      "import": "./src/index.ts"
+    },
+    "./tools": {
+      "types": "./src/tools.ts",
+      "import": "./src/tools.ts"
+    },
+    "./request-context": {
+      "types": "./src/request-context.ts",
+      "import": "./src/request-context.ts"
+    },
+    "./missing-dependency-result": {
+      "types": "./src/missing-dependency-result.ts",
+      "import": "./src/missing-dependency-result.ts"
+    },
+    "./mcp": {
+      "types": "./src/mcp.ts",
+      "import": "./src/mcp.ts"
+    },
+    "./lsp/*": {
+      "types": "./src/lsp/*.ts",
+      "import": "./src/lsp/*.ts"
+    }
+  },
+  "types": "./src/index.ts",
+  "scripts": {
+    "typecheck": "tsgo --noEmit -p tsconfig.json",
+    "test": "bun test src/*.test.ts src/**/*.test.ts"
+  },
+  "dependencies": {
+    "@oh-my-opencode/mcp-stdio-core": "workspace:*"
+  }
+}

package/packages/lsp-core/src/index.ts

@@ -0,0 +1,28 @@
+export * from "./lsp/cleanup-errors.js";
+export * from "./lsp/client-wrapper.js";
+export * from "./lsp/client.js";
+export * from "./lsp/config-loader.js";
+export * from "./lsp/connection.js";
+export * from "./lsp/constants.js";
+export * from "./lsp/directory-diagnostics.js";
+export * from "./lsp/effective-extension.js";
+export * from "./lsp/errors.js";
+export * from "./lsp/formatters.js";
+export * from "./lsp/infer-extension.js";
+export * from "./lsp/json-rpc-connection.js";
+export * from "./lsp/language-mappings.js";
+export * from "./lsp/manager.js";
+export * from "./lsp/process-signal-cleanup.js";
+export * from "./lsp/process.js";
+export * from "./lsp/server-definitions.js";
+export * from "./lsp/server-install-state.js";
+export * from "./lsp/server-installation.js";
+export * from "./lsp/server-resolution.js";
+export * from "./lsp/transport.js";
+export * from "./lsp/types.js";
+export * from "./lsp/utils.js";
+export * from "./lsp/workspace-edit.js";
+export * from "./mcp.js";
+export * from "./missing-dependency-result.js";
+export * from "./request-context.js";
+export * from "./tools.js";