vibe-collab 0.8.6 → 0.8.7

package/dist/cli/commands/connect.js

@@ -5,20 +5,23 @@ import chalk from 'chalk';
 const SERVER_KEY = 'vibe-orchestrator';
 // Windows에서 npx는 cmd /c 래퍼 없이 stdio MCP 연결이 실패할 수 있음
 const IS_WIN = process.platform === 'win32';
-function getStandardMcpEntry() {
+function getStandardMcpEntry(cwdArg) {
+    const extra = cwdArg ? ['--cwd', cwdArg] : [];
     return IS_WIN
-        ? { command: 'cmd', args: ['/c', 'npx', 'vibe-collab', 'serve'], env: {} }
-        : { command: 'npx', args: ['vibe-collab', 'serve'], env: {} };
+        ? { command: 'cmd', args: ['/c', 'npx', 'vibe-collab', 'serve', ...extra], env: {} }
+        : { command: 'npx', args: ['vibe-collab', 'serve', ...extra], env: {} };
 }
-function getVscodeMcpEntry() {
+function getVscodeMcpEntry(cwdArg) {
+    const extra = cwdArg ? ['--cwd', cwdArg] : [];
     return IS_WIN
-        ? { type: 'stdio', command: 'cmd', args: ['/c', 'npx', 'vibe-collab', 'serve'] }
-        : { type: 'stdio', command: 'npx', args: ['vibe-collab', 'serve'] };
+        ? { type: 'stdio', command: 'cmd', args: ['/c', 'npx', 'vibe-collab', 'serve', ...extra] }
+        : { type: 'stdio', command: 'npx', args: ['vibe-collab', 'serve', ...extra] };
 }
-function getArrayMcpEntry() {
+function getArrayMcpEntry(cwdArg) {
+    const extra = cwdArg ? ['--cwd', cwdArg] : [];
     return IS_WIN
-        ? { name: SERVER_KEY, command: 'cmd', args: ['/c', 'npx', 'vibe-collab', 'serve'] }
-        : { name: SERVER_KEY, command: 'npx', args: ['vibe-collab', 'serve'] };
+        ? { name: SERVER_KEY, command: 'cmd', args: ['/c', 'npx', 'vibe-collab', 'serve', ...extra] }
+        : { name: SERVER_KEY, command: 'npx', args: ['vibe-collab', 'serve', ...extra] };
 }
 function getToolDefs() {
     return {
@@ -66,12 +69,12 @@ function writeJson(filePath, data) {
 function deepEqual(a, b) {
     return JSON.stringify(a) === JSON.stringify(b);
 }
-function checkConfigJson(existing, format) {
+function checkConfigJson(existing, format, cwdArg) {
     if (format === 'vscode') {
         const entry = existing['servers']?.[SERVER_KEY];
         if (!entry)
             return 'missing';
-        return deepEqual(entry, getVscodeMcpEntry()) ? 'match' : 'stale';
+        return deepEqual(entry, getVscodeMcpEntry(cwdArg)) ? 'match' : 'stale';
     }
     const raw = existing['mcpServers'];
     if (format === 'array') {
@@ -79,38 +82,38 @@ function checkConfigJson(existing, format) {
             const entry = raw.find((s) => s.name === SERVER_KEY);
             if (!entry)
                 return 'missing';
-            return deepEqual(entry, getArrayMcpEntry()) ? 'match' : 'stale';
+            return deepEqual(entry, getArrayMcpEntry(cwdArg)) ? 'match' : 'stale';
         }
         if (raw && typeof raw === 'object') {
             const entry = raw[SERVER_KEY];
             if (!entry)
                 return 'missing';
-            return deepEqual(entry, getStandardMcpEntry()) ? 'match' : 'stale';
+            return deepEqual(entry, getStandardMcpEntry(cwdArg)) ? 'match' : 'stale';
         }
         return 'missing';
     }
     const entry = raw?.[SERVER_KEY];
     if (!entry)
         return 'missing';
-    return deepEqual(entry, getStandardMcpEntry()) ? 'match' : 'stale';
+    return deepEqual(entry, getStandardMcpEntry(cwdArg)) ? 'match' : 'stale';
 }
-function addEntryJson(existing, format) {
+function addEntryJson(existing, format, cwdArg) {
     if (format === 'vscode') {
         const servers = existing['servers'] ?? {};
-        return { ...existing, servers: { ...servers, [SERVER_KEY]: getVscodeMcpEntry() } };
+        return { ...existing, servers: { ...servers, [SERVER_KEY]: getVscodeMcpEntry(cwdArg) } };
     }
     if (format === 'array') {
         const raw = existing['mcpServers'];
         // 이미 객체 형식이면 객체 형식 유지 (다른 도구가 먼저 설정한 경우)
         if (raw && typeof raw === 'object' && !Array.isArray(raw)) {
-            return { ...existing, mcpServers: { ...raw, [SERVER_KEY]: getStandardMcpEntry() } };
+            return { ...existing, mcpServers: { ...raw, [SERVER_KEY]: getStandardMcpEntry(cwdArg) } };
         }
         // 배열에서 기존 항목 제거 후 최신 항목 추가
         const arr = (Array.isArray(raw) ? raw.filter((s) => s.name !== SERVER_KEY) : []);
-        return { ...existing, mcpServers: [...arr, getArrayMcpEntry()] };
+        return { ...existing, mcpServers: [...arr, getArrayMcpEntry(cwdArg)] };
     }
     const mcpServers = existing['mcpServers'] ?? {};
-    return { ...existing, mcpServers: { ...mcpServers, [SERVER_KEY]: getStandardMcpEntry() } };
+    return { ...existing, mcpServers: { ...mcpServers, [SERVER_KEY]: getStandardMcpEntry(cwdArg) } };
 }
 // ── TOML 헬퍼 ────────────────────────────────────────────────────────────────
 function readFileSafe(filePath) {
@@ -157,12 +160,14 @@ function configureTool(cwd, def, force) {
         return { tool: def.label, configPath, status: 'added' };
     }
     // JSON 기반 형식
+    // global 도구는 --cwd를 주입해 MCP 서버가 프로젝트를 찾을 수 있게 함
+    const cwdArg = def.scope === 'global' ? cwd : undefined;
     const existing = readJsonSafe(configPath);
-    const state = checkConfigJson(existing, def.format);
+    const state = checkConfigJson(existing, def.format, cwdArg);
     if (state === 'match') {
         return { tool: def.label, configPath, status: 'already' };
     }
-    writeJson(configPath, addEntryJson(existing, def.format));
+    writeJson(configPath, addEntryJson(existing, def.format, cwdArg));
     return { tool: def.label, configPath, status: state === 'stale' ? 'updated' : 'added' };
 }
 // ── 메인 커맨드 ──────────────────────────────────────────────────────────────
@@ -242,9 +247,9 @@ export async function connectCommand(cwd, aiFlag) {
     const targetKeys = key
         ? (key === 'all' ? Object.keys(toolDefs) : [key])
         : Object.keys(toolDefs);
-    printManualGuide(targetKeys);
+    printManualGuide(targetKeys, cwd);
 }
-function buildGuideEntries() {
+function buildGuideEntries(projectCwd) {
     return [
         {
             keys: ['claude', 'cursor', 'roocode', 'kiro', 'continue', 'qoder', 'codebuddy', 'droid'],
@@ -257,10 +262,15 @@ function buildGuideEntries() {
             content: JSON.stringify({ servers: { [SERVER_KEY]: getVscodeMcpEntry() } }, null, 2),
         },
         {
-            keys: ['trae', 'gemini'],
-            label: 'Trae (.trae/mcp.json) / Gemini CLI (~/.gemini/settings.json):',
+            keys: ['trae'],
+            label: 'Trae (.trae/mcp.json):',
             content: JSON.stringify({ mcpServers: [getArrayMcpEntry()] }, null, 2),
         },
+        {
+            keys: ['gemini'],
+            label: 'Gemini CLI (~/.gemini/settings.json):',
+            content: JSON.stringify({ mcpServers: [getArrayMcpEntry(projectCwd)] }, null, 2),
+        },
         {
             keys: ['opencode'],
             label: 'OpenCode (.opencode/config.toml):',
@@ -274,17 +284,17 @@ function buildGuideEntries() {
         {
             keys: ['antigravity'],
             label: 'Antigravity (~/.gemini/antigravity/mcp_config.json):',
-            content: JSON.stringify({ mcpServers: { [SERVER_KEY]: getStandardMcpEntry() } }, null, 2),
+            content: JSON.stringify({ mcpServers: { [SERVER_KEY]: getStandardMcpEntry(projectCwd) } }, null, 2),
         },
         {
             keys: ['windsurf'],
             label: 'Windsurf (~/.codeium/windsurf/mcp_config.json):',
-            content: JSON.stringify({ mcpServers: { [SERVER_KEY]: getStandardMcpEntry() } }, null, 2),
+            content: JSON.stringify({ mcpServers: { [SERVER_KEY]: getStandardMcpEntry(projectCwd) } }, null, 2),
         },
     ];
 }
-function printManualGuide(targetKeys) {
-    const entries = buildGuideEntries();
+function printManualGuide(targetKeys, projectCwd) {
+    const entries = buildGuideEntries(projectCwd);
     const matched = entries.filter(e => e.keys.some(k => targetKeys.includes(k)));
     if (matched.length === 0)
         return;

package/dist/cli/commands/serve.d.ts

@@ -1,2 +1,4 @@
 import 'dotenv/config';
-export declare function serveCommand(): Promise<void>;
+export declare function serveCommand(options?: {
+    cwd?: string;
+}): Promise<void>;

package/dist/cli/commands/serve.js

@@ -2,7 +2,7 @@ import 'dotenv/config';
 import { startMCPServer } from '../../mcp/server.js';
 import { detectGitHubToken } from '../../github/auth.js';
 import { getAIProvider } from '../../ai/client.js';
-export async function serveCommand() {
+export async function serveCommand(options = {}) {
     // AI 제공자 확인 (경고만, 종료 안 함)
     const aiProvider = getAIProvider();
     if (!aiProvider) {
@@ -21,6 +21,6 @@ export async function serveCommand() {
     else {
         process.stderr.write('[Vibe Orchestrator] ✓ GitHub 인증 확인됨\n');
     }
-    await startMCPServer();
+    await startMCPServer(options.cwd);
 }
 //# sourceMappingURL=serve.js.map

package/dist/cli/index.js

@@ -36,8 +36,9 @@ program
 program
     .command('serve')
     .description('MCP 서버를 시작합니다 (AI 에이전트 연결용)')
-    .action(async () => {
-    await serveCommand();
+    .option('--cwd <path>', '프로젝트 디렉토리 경로 (전역 MCP 설정에서 필요)')
+    .action(async (options) => {
+    await serveCommand(options);
 });
 program
     .command('connect')

package/dist/mcp/server.d.ts

@@ -1 +1 @@
-export declare function startMCPServer(): Promise<void>;
+export declare function startMCPServer(explicitPath?: string): Promise<void>;

package/dist/mcp/server.js

@@ -1,3 +1,5 @@
+import path from 'path';
+import fs from 'fs';
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js';
@@ -9,8 +11,24 @@ import { requestQA } from './tools/requestQA.js';
 import { createPR } from './tools/createPR.js';
 import { requestMergeReview } from './tools/requestMergeReview.js';
 import { executeMerge } from './tools/executeMerge.js';
-export async function startMCPServer() {
-    const repoPath = process.cwd();
+// cwd에서 위로 올라가며 .vibe/state.json이 있는 프로젝트 루트를 탐색
+function findProjectRoot(startDir) {
+    let dir = startDir;
+    for (let i = 0; i < 20; i++) {
+        if (fs.existsSync(path.join(dir, '.vibe', 'state.json'))) {
+            return dir;
+        }
+        const parent = path.dirname(dir);
+        if (parent === dir)
+            break; // 파일시스템 루트 도달
+        dir = parent;
+    }
+    return startDir; // 못 찾으면 원래 cwd
+}
+export async function startMCPServer(explicitPath) {
+    const repoPath = explicitPath
+        ? path.resolve(explicitPath)
+        : findProjectRoot(process.cwd());
     const server = new Server({ name: 'vibe-orchestrator', version: '1.0.0' }, { capabilities: { tools: {} } });
     // ListTools 핸들러
     server.setRequestHandler(ListToolsRequestSchema, async () => ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vibe-collab",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "description": "누가 어떤 AI를 써도, 항상 한 팀처럼 작동하는 바이브 코딩 협업 도구",
   "type": "module",
   "bin": {