From 472c2931415ca4bc5d0fc66b11fdaaf3a038072a Mon Sep 17 00:00:00 2001
From: YeonGyu-Kim <code.yeon.gyu@gmail.com>
Date: Mon, 18 May 2026 20:47:58 +0900
Subject: [PATCH] chore(packages): declare shared tool workspaces

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
---
 bun.lock     | 26 ++++++++++++++++++++++++++
 package.json | 14 +++++++++++---
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/bun.lock b/bun.lock
index 6e2e18881..21fadc2fb 100644
--- a/bun.lock
+++ b/bun.lock
@@ -24,6 +24,8 @@
         "vscode-jsonrpc": "^8.2.1",
       },
       "devDependencies": {
+        "@oh-my-opencode/ast-grep-mcp": "workspace:*",
+        "@oh-my-opencode/rules-core": "workspace:*",
         "@types/js-yaml": "^4.0.9",
         "@types/picomatch": "^4.0.3",
         "@typescript/native-preview": "7.0.0-dev.20260518.1",
@@ -48,6 +50,26 @@
         "zod": "^4.0.0",
       },
     },
+    "packages/ast-grep-mcp": {
+      "name": "@oh-my-opencode/ast-grep-mcp",
+      "version": "0.0.0",
+      "bin": {
+        "ast-grep-mcp": "dist/cli.js",
+      },
+      "dependencies": {
+        "@ast-grep/cli": "^0.41.1",
+      },
+      "devDependencies": {
+        "bun-types": "1.3.12",
+      },
+    },
+    "packages/rules-core": {
+      "name": "@oh-my-opencode/rules-core",
+      "version": "0.1.0",
+      "dependencies": {
+        "picomatch": "^4.0.4",
+      },
+    },
   },
   "trustedDependencies": [
     "@ast-grep/cli",
@@ -108,6 +130,10 @@
 
     "@modelcontextprotocol/sdk": ["@modelcontextprotocol/sdk@1.29.0", "", { "dependencies": { "@hono/node-server": "^1.19.9", "ajv": "^8.17.1", "ajv-formats": "^3.0.1", "content-type": "^1.0.5", "cors": "^2.8.5", "cross-spawn": "^7.0.5", "eventsource": "^3.0.2", "eventsource-parser": "^3.0.0", "express": "^5.2.1", "express-rate-limit": "^8.2.1", "hono": "^4.11.4", "jose": "^6.1.3", "json-schema-typed": "^8.0.2", "pkce-challenge": "^5.0.0", "raw-body": "^3.0.0", "zod": "^3.25 || ^4.0", "zod-to-json-schema": "^3.25.1" }, "peerDependencies": { "@cfworker/json-schema": "^4.1.1" }, "optionalPeers": ["@cfworker/json-schema"] }, "sha512-zo37mZA9hJWpULgkRpowewez1y6ML5GsXJPY8FI0tBBCd77HEvza4jDqRKOXgHNn867PVGCyTdzqpz0izu5ZjQ=="],
 
+    "@oh-my-opencode/ast-grep-mcp": ["@oh-my-opencode/ast-grep-mcp@workspace:packages/ast-grep-mcp"],
+
+    "@oh-my-opencode/rules-core": ["@oh-my-opencode/rules-core@workspace:packages/rules-core"],
+
     "@msgpackr-extract/msgpackr-extract-darwin-arm64": ["@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.3", "", { "os": "darwin", "cpu": "arm64" }, "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw=="],
 
     "@msgpackr-extract/msgpackr-extract-darwin-x64": ["@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.3", "", { "os": "darwin", "cpu": "x64" }, "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw=="],
diff --git a/package.json b/package.json
index ce58519c3..449ff7f05 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,10 @@
   "main": "./dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
+  "workspaces": [
+    "packages/rules-core",
+    "packages/ast-grep-mcp"
+  ],
   "bin": {
     "oh-my-opencode": "bin/oh-my-opencode.js",
     "oh-my-openagent": "bin/oh-my-opencode.js"
@@ -13,7 +17,8 @@
     "dist",
     "bin",
     "postinstall.mjs",
-    "packages/lsp-tools-mcp/dist"
+    "packages/lsp-tools-mcp/dist",
+    "packages/ast-grep-mcp/dist"
   ],
   "exports": {
     ".": {
@@ -33,11 +38,12 @@
     "clean": "rm -rf dist",
     "prepare": "bun run build",
     "postinstall": "node postinstall.mjs",
-    "prepublishOnly": "bun run clean && bun run build:lsp-tools-mcp && bun run build",
+    "prepublishOnly": "bun run clean && bun run build:lsp-tools-mcp && bun run build:ast-grep-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",
     "typecheck:script": "tsgo --noEmit -p script/tsconfig.json",
-    "test": "bun test"
+    "test": "bun test",
+    "build:ast-grep-mcp": "bun run --cwd packages/ast-grep-mcp build"
   },
   "keywords": [
     "opencode",
@@ -78,6 +84,8 @@
     "vscode-jsonrpc": "^8.2.1"
   },
   "devDependencies": {
+    "@oh-my-opencode/ast-grep-mcp": "workspace:*",
+    "@oh-my-opencode/rules-core": "workspace:*",
     "@typescript/native-preview": "7.0.0-dev.20260518.1",
     "@types/js-yaml": "^4.0.9",
     "@types/picomatch": "^4.0.3",