@a4hgehad/weave-mcp 0.9.6 → 0.9.8

package/dist/index.js

@@ -513,11 +513,18 @@ class ConfigHandler {
     return result;
   }
   applyAgentMcpDefaults(agentName, agentConfig) {
-    const defaults = getAgentMcpDefaults(agentName);
-    if (defaults.length === 0) {
+    const weaveConfig = agentConfig;
+    const userMcps = weaveConfig.mcps ?? weaveConfig.mcp;
+    const hasUserTools = agentConfig.tools !== undefined;
+    let mcpsToApply;
+    if (userMcps && userMcps.length > 0) {
+      mcpsToApply = userMcps;
+    } else if (hasUserTools) {
       return agentConfig;
+    } else {
+      mcpsToApply = getAgentMcpDefaults(agentName);
     }
-    if (agentConfig.tools !== undefined) {
+    if (mcpsToApply.length === 0) {
       return agentConfig;
     }
     const mcpTools = {
@@ -525,14 +532,16 @@ class ConfigHandler {
       context7: "context7_query_docs",
       grep_app: "grep_app_search"
     };
-    const tools = {};
-    for (const mcp of defaults) {
+    const mcpToolEntries = {};
+    for (const mcp of mcpsToApply) {
       const toolName = mcpTools[mcp];
       if (toolName) {
-        tools[toolName] = true;
+        mcpToolEntries[toolName] = true;
       }
     }
-    const mcpInfo = this.buildMcpInfoSection(defaults);
+    const existingTools = agentConfig.tools || {};
+    const mergedTools = { ...existingTools, ...mcpToolEntries };
+    const mcpInfo = this.buildMcpInfoSection(mcpsToApply);
     let prompt = agentConfig.prompt || "";
     if (!prompt.includes("<MCPs>")) {
       prompt = prompt + `
@@ -541,7 +550,7 @@ class ConfigHandler {
     }
     return {
       ...agentConfig,
-      tools: { ...agentConfig.tools || {}, ...tools },
+      tools: mergedTools,
       prompt
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a4hgehad/weave-mcp",
-  "version": "0.9.6",
+  "version": "0.9.8",
   "description": "Weave — lean OpenCode plugin with multi-agent orchestration + MCP support",
   "author": "3r3bu5",
   "license": "MIT",