worktree-bay 1.2.0 → 1.3.0

package/dist/cli.js

@@ -78,9 +78,9 @@ program.command('completion <target> [shell]').description('install 一键装进
 catch (e) {
     die(e.message);
 } });
-program.command('mcp').description('启动 MCP 服务（stdio），供 AI 通过 MCP 调用 worktree-bay 完成并行开发')
-    .action(async () => { try {
-    await startMcp();
+program.command('mcp').description('启动 MCP 服务（stdio，轻量脚本，客户端按需 spawn），供 AI 调用 worktree-bay')
+    .action(() => { try {
+    startMcp();
 }
 catch (e) {
     die(e.message);

package/dist/mcp.js

@@ -1,18 +1,12 @@
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { z } from 'zod';
 import { spawnSync } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
 import { readFileSync } from 'node:fs';
+import readline from 'node:readline';
 import path from 'node:path';
+// 轻量脚本式 MCP：手写 JSON-RPC over stdio，零依赖。客户端按需 spawn，stdin 关闭即退出，非常驻守护进程。
 const CLI = path.join(path.dirname(fileURLToPath(import.meta.url)), 'cli.js');
 const VERSION = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version;
-// 工具实现：直接调底层 worktree-bay CLI 并捕获输出返回，复用全部逻辑
-function runCli(args) {
-    const r = spawnSync(process.execPath, [CLI, ...args], { encoding: 'utf8' });
-    const text = [r.stdout, r.stderr].filter(Boolean).join('\n').trim() || '(无输出)';
-    return { content: [{ type: 'text', text }] };
-}
+const PROTOCOL_VERSION = '2024-11-05';
 export const INSTRUCTIONS = `worktree-bay 是「功能 = 槽位」的并行开发编排器。当你需要在一个多服务工作区里并行开发多个功能、又不想让它们的端口/依赖/数据互相干扰时，用本服务的工具来完成开发工作。
 
 核心模型：一个功能占一个「槽位」→ 得到一个端口块；该功能用到哪些服务，就在哪些服务上各开一个 git worktree 挂进这个槽，端口自动错开，前端自动连到同槽的后端。
@@ -28,29 +22,65 @@ export const INSTRUCTIONS = `worktree-bay 是「功能 = 槽位」的并行开
 - 只起这个功能「实际要改」的服务，不要全起。
 - 拿不准当前状态时先调 worktree_bay_ls。
 - worktree_bay_gc 默认只读（dry-run 列出建议），apply=true 才真删，且只删「已合并到主分支且工作区干净」的，安全保守、不会误删未完成的工作。`;
-export function createServer() {
-    const server = new McpServer({ name: 'worktree-bay', version: VERSION }, { instructions: INSTRUCTIONS });
-    server.tool('worktree_bay_ls', '列出所有功能槽位与占用（每槽：功能名、端口块、已起服务及端口、是否已并入主分支）', {}, async () => runCli(['ls']));
-    server.tool('worktree_bay_up', '为一个功能一次性起多个服务（自动占槽 + 各服务开 worktree，分支默认 = 功能名，前端自动接同槽后端）。并行开发新功能首选。', {
-        feature: z.string().describe('功能名（同时作为默认分支名）'),
-        services: z.array(z.string()).describe('要起的服务名列表，如 ["api","lms"]'),
-    }, async ({ feature, services }) => runCli(['up', feature, ...services]));
-    server.tool('worktree_bay_add', '为功能在单个服务上开 worktree（branch 省略则用功能名）', {
-        feature: z.string(), service: z.string(), branch: z.string().optional(),
-    }, async ({ feature, service, branch }) => runCli(['add', feature, service, ...(branch ? [branch] : [])]));
-    server.tool('worktree_bay_run', '在某功能某服务的运行体里跑预设命令（如 test），可透传额外参数', {
-        feature: z.string(), service: z.string(),
-        name: z.string().describe('配置里 run.<name> 的名字，如 test'),
-        args: z.array(z.string()).optional(),
-    }, async ({ feature, service, name, args }) => runCli(['run', feature, service, name, ...(args ?? [])]));
-    server.tool('worktree_bay_down', '拆除整个功能的所有服务 worktree（默认查脏/未推保护，force=true 强删）', {
-        feature: z.string(), force: z.boolean().optional(),
-    }, async ({ feature, force }) => runCli(['down', feature, ...(force ? ['-f'] : [])]));
-    server.tool('worktree_bay_gc', '合并感知回收：默认 dry-run 只列建议，apply=true 才实际删除「已合并且干净」的功能', {
-        apply: z.boolean().optional(),
-    }, async ({ apply }) => runCli(['gc', ...(apply ? ['--apply'] : [])]));
-    return server;
+const str = { type: 'string' };
+export const TOOLS = [
+    { name: 'worktree_bay_ls', description: '列出所有功能槽位与占用（功能名、端口块、已起服务及端口、是否已并入主分支）',
+        inputSchema: { type: 'object', properties: {} }, toArgs: () => ['ls'] },
+    { name: 'worktree_bay_up', description: '为一个功能一次性起多个服务（自动占槽 + 各服务开 worktree，分支默认=功能名，前端自动接同槽后端）。并行开发新功能首选。',
+        inputSchema: { type: 'object', properties: { feature: str, services: { type: 'array', items: str } }, required: ['feature', 'services'] },
+        toArgs: (a) => ['up', String(a.feature), ...(a.services ?? [])] },
+    { name: 'worktree_bay_add', description: '为功能在单个服务上开 worktree（branch 省略则用功能名）',
+        inputSchema: { type: 'object', properties: { feature: str, service: str, branch: str }, required: ['feature', 'service'] },
+        toArgs: (a) => ['add', String(a.feature), String(a.service), ...(a.branch ? [String(a.branch)] : [])] },
+    { name: 'worktree_bay_run', description: '在某功能某服务的运行体里跑预设命令（如 test），可透传额外参数',
+        inputSchema: { type: 'object', properties: { feature: str, service: str, name: str, args: { type: 'array', items: str } }, required: ['feature', 'service', 'name'] },
+        toArgs: (a) => ['run', String(a.feature), String(a.service), String(a.name), ...(a.args ?? [])] },
+    { name: 'worktree_bay_down', description: '拆除整个功能的所有服务 worktree（默认查脏/未推保护，force=true 强删）',
+        inputSchema: { type: 'object', properties: { feature: str, force: { type: 'boolean' } }, required: ['feature'] },
+        toArgs: (a) => ['down', String(a.feature), ...(a.force ? ['-f'] : [])] },
+    { name: 'worktree_bay_gc', description: '合并感知回收：默认 dry-run 只列建议，apply=true 才实际删除「已合并且干净」的功能',
+        inputSchema: { type: 'object', properties: { apply: { type: 'boolean' } } },
+        toArgs: (a) => ['gc', ...(a.apply ? ['--apply'] : [])] },
+];
+function runCli(args) {
+    const r = spawnSync(process.execPath, [CLI, ...args], { encoding: 'utf8' });
+    return [r.stdout, r.stderr].filter(Boolean).join('\n').trim() || '(无输出)';
+}
+export function handle(msg) {
+    const { id, method, params } = msg;
+    if (method === 'initialize')
+        return { jsonrpc: '2.0', id, result: { protocolVersion: PROTOCOL_VERSION, capabilities: { tools: {} }, serverInfo: { name: 'worktree-bay', version: VERSION }, instructions: INSTRUCTIONS } };
+    if (method === 'tools/list')
+        return { jsonrpc: '2.0', id, result: { tools: TOOLS.map((t) => ({ name: t.name, description: t.description, inputSchema: t.inputSchema })) } };
+    if (method === 'tools/call') {
+        const tool = TOOLS.find((t) => t.name === params?.name);
+        if (!tool)
+            return { jsonrpc: '2.0', id, error: { code: -32602, message: 'unknown tool: ' + params?.name } };
+        return { jsonrpc: '2.0', id, result: { content: [{ type: 'text', text: runCli(tool.toArgs(params?.arguments ?? {})) }] } };
+    }
+    if (method === 'ping')
+        return { jsonrpc: '2.0', id, result: {} };
+    if (method?.startsWith('notifications/'))
+        return null;
+    if (id !== undefined)
+        return { jsonrpc: '2.0', id, error: { code: -32601, message: 'method not found: ' + method } };
+    return null;
 }
-export async function startMcp() {
-    await createServer().connect(new StdioServerTransport());
+export function startMcp() {
+    const rl = readline.createInterface({ input: process.stdin });
+    rl.on('line', (line) => {
+        const t = line.trim();
+        if (!t)
+            return;
+        let msg;
+        try {
+            msg = JSON.parse(t);
+        }
+        catch {
+            return;
+        }
+        const res = handle(msg);
+        if (res)
+            process.stdout.write(JSON.stringify(res) + '\n');
+    });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "worktree-bay",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Config-driven git worktree slot + port orchestrator for parallel multi-service development",
   "keywords": [
     "git",
@@ -43,9 +43,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.12.0",
-    "commander": "^12.1.0",
-    "zod": "^3.23.8"
+    "commander": "^12.1.0"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",