@corbat-tech/coco 2.25.10 → 2.25.12

package/dist/index.js

@@ -4,7 +4,7 @@ import fs4__default, { readFileSync, constants } from 'fs';
 import * as path17 from 'path';
 import path17__default, { dirname, join, basename, resolve } from 'path';
 import * as fs16 from 'fs/promises';
-import fs16__default, { access, readFile, writeFile, mkdir, readdir } from 'fs/promises';
+import fs16__default, { access, readFile, readdir, writeFile, mkdir } from 'fs/promises';
 import { randomUUID, randomBytes, createHash } from 'crypto';
 import * as http from 'http';
 import { fileURLToPath, URL as URL$1 } from 'url';
@@ -14866,7 +14866,9 @@ var OpenAIProvider = class {
           input,
           instructions: instructions ?? void 0,
           max_output_tokens: options?.maxTokens ?? this.config.maxTokens ?? 8192,
-          ...supportsTemp && { temperature: options?.temperature ?? this.config.temperature ?? 0 },
+          ...supportsTemp && {
+            temperature: options?.temperature ?? this.config.temperature ?? 0
+          },
           store: false
         });
         return {
@@ -14901,7 +14903,9 @@ var OpenAIProvider = class {
           instructions: instructions ?? void 0,
           tools,
           max_output_tokens: options?.maxTokens ?? this.config.maxTokens ?? 8192,
-          ...supportsTemp && { temperature: options?.temperature ?? this.config.temperature ?? 0 },
+          ...supportsTemp && {
+            temperature: options?.temperature ?? this.config.temperature ?? 0
+          },
           store: false
         });
         let content = "";
@@ -27265,7 +27269,9 @@ function createProtectedMetadataCandidates(resourceUrl, headerUrl) {
   candidates.push(`${origin}/.well-known/oauth-protected-resource`);
   if (pathPart && pathPart !== "/") {
     candidates.push(`${origin}/.well-known/oauth-protected-resource${pathPart}`);
-    candidates.push(`${origin}/.well-known/oauth-protected-resource/${pathPart.replace(/^\//, "")}`);
+    candidates.push(
+      `${origin}/.well-known/oauth-protected-resource/${pathPart.replace(/^\//, "")}`
+    );
   }
   return Array.from(new Set(candidates));
 }
@@ -27647,14 +27653,6 @@ var HTTPTransport = class {
       if (this.shouldAttemptOAuth()) {
         this.oauthToken = await getStoredMcpOAuthToken(this.config.url);
       }
-      const response = await this.sendRequestWithOAuthRetry(
-        "GET",
-        void 0,
-        this.abortController.signal
-      );
-      if (!response.ok && response.status !== 404) {
-        throw new Error(`HTTP ${response.status}: ${response.statusText}`);
-      }
       this.connected = true;
     } catch (error) {
       if (error instanceof MCPError) {
@@ -28241,7 +28239,30 @@ function getMCPServerManager() {
   return globalManager;
 }
 
+// src/mcp/tools.ts
+init_errors2();
+
 // src/tools/mcp.ts
+async function loadConfiguredServers(projectPath) {
+  const registry = new MCPRegistryImpl();
+  await registry.load();
+  const resolvedProjectPath = projectPath || process.cwd();
+  return mergeMCPConfigs(
+    registry.listServers(),
+    await loadMCPServersFromCOCOConfig(),
+    await loadProjectMCPFile(resolvedProjectPath)
+  );
+}
+function findConfiguredServer(servers, requestedServer) {
+  const normalized = requestedServer.trim().toLowerCase();
+  return servers.find((server) => {
+    const name = server.name.toLowerCase();
+    if (name === normalized) return true;
+    if (name.includes(normalized) || normalized.includes(name)) return true;
+    if (name.includes("atlassian") && /^(atlassian|jira|confluence)$/.test(normalized)) return true;
+    return false;
+  });
+}
 var mcpListServersTool = defineTool({
   name: "mcp_list_servers",
   description: `Inspect Coco's MCP configuration and current runtime connections.
@@ -28255,14 +28276,9 @@ when you need to know which MCP servers are configured, connected, healthy, or w
     projectPath: z.string().optional().describe("Project path whose .mcp.json should be merged. Defaults to process.cwd()")
   }),
   async execute({ includeDisabled, includeTools, projectPath }) {
-    const registry = new MCPRegistryImpl();
-    await registry.load();
-    const resolvedProjectPath = projectPath || process.cwd();
-    const configuredServers = mergeMCPConfigs(
-      registry.listServers(),
-      await loadMCPServersFromCOCOConfig(),
-      await loadProjectMCPFile(resolvedProjectPath)
-    ).filter((server) => includeDisabled || server.enabled !== false);
+    const configuredServers = (await loadConfiguredServers(projectPath)).filter(
+      (server) => includeDisabled || server.enabled !== false
+    );
     const manager = getMCPServerManager();
     const servers = [];
     for (const server of configuredServers) {
@@ -28293,7 +28309,55 @@ when you need to know which MCP servers are configured, connected, healthy, or w
     };
   }
 });
-var mcpTools = [mcpListServersTool];
+var mcpConnectServerTool = defineTool({
+  name: "mcp_connect_server",
+  description: `Connect or reconnect a configured MCP server in the current Coco session.
+
+Use this when mcp_list_servers shows a service as configured but disconnected, or when
+the user explicitly asks you to use a specific MCP service. This tool can trigger the
+built-in MCP OAuth browser login flow. Do not ask the user for raw tokens when this exists.`,
+  category: "config",
+  parameters: z.object({
+    server: z.string().describe("Configured MCP server name, or a common alias like 'jira' or 'atlassian'"),
+    includeTools: z.boolean().optional().default(true).describe("Include discovered MCP tool names after connecting"),
+    projectPath: z.string().optional().describe("Project path whose .mcp.json should be merged. Defaults to process.cwd()")
+  }),
+  async execute({ server, includeTools, projectPath }) {
+    const configuredServers = await loadConfiguredServers(projectPath);
+    const target = findConfiguredServer(
+      configuredServers.filter((configuredServer) => configuredServer.enabled !== false),
+      server
+    );
+    if (!target) {
+      throw new Error(`MCP server '${server}' is not configured`);
+    }
+    const manager = getMCPServerManager();
+    const existingConnection = manager.getConnection(target.name);
+    if (existingConnection && existingConnection.healthy === false) {
+      await manager.stopServer(target.name);
+    }
+    const connection = await manager.startServer(target);
+    let tools;
+    if (includeTools) {
+      try {
+        const listed = await connection.client.listTools();
+        tools = listed.tools.map((tool) => tool.name);
+      } catch {
+        tools = [];
+      }
+    }
+    return {
+      requestedServer: server,
+      connected: true,
+      healthy: true,
+      toolCount: connection.toolCount,
+      ...includeTools ? { tools: tools ?? [] } : {},
+      authTriggered: target.transport === "http",
+      message: `MCP server '${target.name}' is connected for this session.`
+    };
+  }
+});
+var mcpTools = [mcpListServersTool, mcpConnectServerTool];
 init_allowed_paths();
 var BLOCKED_SYSTEM_PATHS = [
   "/etc",