@yeaft/webchat-agent 0.1.30 → 0.1.32

package/connection/message-router.js

@@ -22,6 +22,7 @@ import {
 } from '../crew.js';
 import { sendToServer, flushMessageBuffer } from './buffer.js';
 import { handleRestartAgent, handleUpgradeAgent } from './upgrade.js';
+import { loadMcpServers, updateMcpConfig } from '../mcp.js';
 
 export async function handleMessage(msg) {
   switch (msg.type) {
@@ -54,6 +55,11 @@ export async function handleMessage(msg) {
 
       // ★ Phase 1: 通知 server 同步完成
       sendToServer({ type: 'agent_sync_complete' });
+
+      // ★ 发送 MCP servers 列表给 server（供前端 Settings > Tools tab 使用）
+      if (ctx.mcpServers.length > 0) {
+        sendToServer({ type: 'mcp_servers_list', servers: ctx.mcpServers });
+      }
       break;
 
     case 'create_conversation':
@@ -267,5 +273,16 @@ export async function handleMessage(msg) {
     case 'upgrade_agent':
       await handleUpgradeAgent();
       break;
+
+    // MCP configuration
+    case 'get_mcp_servers':
+      sendToServer({ type: 'mcp_servers_list', servers: ctx.mcpServers });
+      break;
+
+    case 'update_mcp_config': {
+      const updated = updateMcpConfig(msg.config || {});
+      sendToServer({ type: 'mcp_config_updated', servers: updated });
+      break;
+    }
   }
 }

package/context.js

@@ -14,6 +14,8 @@ export default {
   agentCapabilities: [],
   // Agent 级别的 slash commands 缓存（所有 conversation 共用）
   slashCommands: [],
+  // MCP servers 列表 (从 ~/.claude.json 读取): [{ name, enabled, source }]
+  mcpServers: [],
   // 连接相关
   reconnectTimer: null,
   pendingAuthTempId: null,

package/crew/role-query.js

@@ -110,6 +110,7 @@ export async function createRoleQuery(session, roleName) {
 
   const queryOptions = {
     cwd: roleCwd,
+    projectDir: session.projectDir,
     permissionMode: 'bypassPermissions',
     abort: abortController.signal,
     model: role.model || undefined,

package/index.js

@@ -9,6 +9,7 @@ import ctx from './context.js';
 import { getConfigPath, loadServiceConfig } from './service.js';
 import { loadNodePty } from './terminal.js';
 import { connect } from './connection.js';
+import { loadMcpServers } from './mcp.js';
 
 const execAsync = promisify(exec);
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -62,58 +63,27 @@ const CONFIG = {
   workDir: process.env.WORK_DIR || fileConfig.workDir || process.cwd(),
   reconnectInterval: fileConfig.reconnectInterval,
   agentSecret: process.env.AGENT_SECRET || fileConfig.agentSecret,
-  // MCP 白名单：只允许这些 MCP 服务器的工具，其余自动禁用
-  // 通过 ALLOWED_MCP_SERVERS 环境变量（逗号分隔）或配置文件 allowedMcpServers 指定
-  // 默认只允许 playwright
-  disallowedTools: (() => {
-    // 解析显式禁用列表
+  // 显式禁用的工具（非 MCP 相关）
+  explicitDisallowedTools: (() => {
     const raw = process.env.DISALLOWED_TOOLS || fileConfig.disallowedTools || '';
-    const explicit = raw === 'none' ? [] : raw.split(',').map(s => s.trim()).filter(Boolean);
-
-    // 解析 MCP 白名单
-    const allowedRaw = process.env.ALLOWED_MCP_SERVERS || fileConfig.allowedMcpServers || 'playwright';
-    const allowedMcpServers = allowedRaw.split(',').map(s => s.trim()).filter(Boolean);
-
-    // 读取 ~/.claude.json 中所有配置的 MCP 服务器名
-    const claudeConfigPath = join(homedir(), '.claude.json');
-    const mcpDisallowed = [];
-    try {
-      if (existsSync(claudeConfigPath)) {
-        const claudeConfig = JSON.parse(readFileSync(claudeConfigPath, 'utf-8'));
-        const allMcpNames = new Set();
-        // 收集所有项目中配置的 MCP 服务器名
-        for (const [, projCfg] of Object.entries(claudeConfig.projects || {})) {
-          for (const name of Object.keys(projCfg.mcpServers || {})) {
-            allMcpNames.add(name);
-          }
-        }
-        // 顶层 mcpServers
-        for (const name of Object.keys(claudeConfig.mcpServers || {})) {
-          allMcpNames.add(name);
-        }
-        // 不在白名单中的 MCP 服务器 → 禁用
-        for (const name of allMcpNames) {
-          if (!allowedMcpServers.includes(name)) {
-            mcpDisallowed.push(`mcp__${name}`);
-          }
-        }
-        if (mcpDisallowed.length > 0) {
-          console.log(`[MCP] Allowed: ${allowedMcpServers.join(', ')}`);
-          console.log(`[MCP] Disallowed: ${mcpDisallowed.join(', ')}`);
-        }
-      }
-    } catch (e) {
-      console.warn('[MCP] Failed to read ~/.claude.json:', e.message);
-    }
-
-    return [...explicit, ...mcpDisallowed];
-  })()
+    return raw === 'none' ? [] : raw.split(',').map(s => s.trim()).filter(Boolean);
+  })(),
+  // MCP 白名单初始值（环境变量或配置文件指定）
+  allowedMcpServers: (() => {
+    const raw = process.env.ALLOWED_MCP_SERVERS || fileConfig.allowedMcpServers || 'playwright';
+    return raw.split(',').map(s => s.trim()).filter(Boolean);
+  })(),
+  // disallowedTools 会在 loadMcpServers() 中计算
+  disallowedTools: []
 };
 
 // 初始化共享上下文
 ctx.CONFIG = CONFIG;
 ctx.saveConfig = saveConfig;
 
+// 初始加载 MCP servers（必须在 ctx.CONFIG 赋值之后）
+loadMcpServers();
+
 // Agent capabilities（启动时自动检测）
 async function detectCapabilities() {
   const capabilities = ['background_tasks', 'file_editor'];

package/mcp.js

@@ -0,0 +1,83 @@
+import { homedir } from 'os';
+import { existsSync, readFileSync } from 'fs';
+import { join } from 'path';
+import ctx from './context.js';
+
+/**
+ * 读取 ~/.claude.json 中的 MCP servers 列表，
+ * 并根据 allowedMcpServers 白名单计算 disallowedTools。
+ * 返回 mcpServers 列表并同时存入 ctx.mcpServers。
+ */
+export function loadMcpServers() {
+  const claudeConfigPath = join(homedir(), '.claude.json');
+  const allMcpNames = new Set();
+  try {
+    if (existsSync(claudeConfigPath)) {
+      const claudeConfig = JSON.parse(readFileSync(claudeConfigPath, 'utf-8'));
+      for (const [, projCfg] of Object.entries(claudeConfig.projects || {})) {
+        for (const name of Object.keys(projCfg.mcpServers || {})) {
+          allMcpNames.add(name);
+        }
+      }
+      for (const name of Object.keys(claudeConfig.mcpServers || {})) {
+        allMcpNames.add(name);
+      }
+    }
+  } catch (e) {
+    console.warn('[MCP] Failed to read ~/.claude.json:', e.message);
+  }
+
+  const allowed = ctx.CONFIG.allowedMcpServers;
+  const mcpServers = [];
+  for (const name of allMcpNames) {
+    mcpServers.push({
+      name,
+      enabled: allowed.includes(name),
+      source: name === 'playwright' ? 'Built-in' : 'MCP'
+    });
+  }
+
+  // 重新计算 disallowedTools
+  recalcDisallowedTools(mcpServers);
+  ctx.mcpServers = mcpServers;
+
+  if (mcpServers.length > 0) {
+    const enabledNames = mcpServers.filter(s => s.enabled).map(s => s.name);
+    console.log(`[MCP] Enabled: ${enabledNames.join(', ') || 'none'}`);
+    const mcpDisallowed = mcpServers.filter(s => !s.enabled).map(s => s.name);
+    if (mcpDisallowed.length > 0) {
+      console.log(`[MCP] Disabled: ${mcpDisallowed.join(', ')}`);
+    }
+  }
+
+  return mcpServers;
+}
+
+/**
+ * 更新 MCP servers 的 enabled 状态（从前端 toggle 触发）
+ * @param {Object<string, boolean>} config - { serverName: enabled }
+ */
+export function updateMcpConfig(config) {
+  for (const server of ctx.mcpServers) {
+    if (config[server.name] !== undefined) {
+      server.enabled = config[server.name];
+    }
+  }
+
+  // 更新白名单
+  ctx.CONFIG.allowedMcpServers = ctx.mcpServers
+    .filter(s => s.enabled)
+    .map(s => s.name);
+
+  recalcDisallowedTools(ctx.mcpServers);
+
+  console.log(`[MCP] Config updated. Allowed: ${ctx.CONFIG.allowedMcpServers.join(', ') || 'none'}`);
+  return ctx.mcpServers;
+}
+
+function recalcDisallowedTools(mcpServers) {
+  const mcpDisallowed = mcpServers
+    .filter(s => !s.enabled)
+    .map(s => `mcp__${s.name}`);
+  ctx.CONFIG.disallowedTools = [...ctx.CONFIG.explicitDisallowedTools, ...mcpDisallowed];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "0.1.30",
+  "version": "0.1.32",
   "description": "Remote agent for Yeaft WebChat — connects worker machines to the central server",
   "main": "index.js",
   "type": "module",

package/sdk/query.js

@@ -272,6 +272,7 @@ export function query(config) {
       appendSystemPrompt,
       customSystemPrompt,
       cwd,
+      projectDir,
       disallowedTools = [],
       maxTurns,
       permissionMode = 'default',
@@ -301,6 +302,7 @@ export function query(config) {
   if (allowedTools.length > 0) args.push('--allowedTools', ...allowedTools);
   if (disallowedTools.length > 0) args.push('--disallowedTools', ...disallowedTools);
   if (permissionMode) args.push('--permission-mode', permissionMode);
+  if (projectDir) args.push('--project', projectDir);
 
   // Handle prompt input
   if (typeof prompt === 'string') {