@mcpc-tech/core 0.3.37 → 0.3.39

package/index.cjs

@@ -13969,6 +13969,147 @@ var ExperimentalServerTasks = class {
   requestStream(request, resultSchema, options) {
     return this._server.requestStream(request, resultSchema, options);
   }
+  /**
+   * Sends a sampling request and returns an AsyncGenerator that yields response messages.
+   * The generator is guaranteed to end with either a 'result' or 'error' message.
+   *
+   * For task-augmented requests, yields 'taskCreated' and 'taskStatus' messages
+   * before the final result.
+   *
+   * @example
+   * ```typescript
+   * const stream = server.experimental.tasks.createMessageStream({
+   *     messages: [{ role: 'user', content: { type: 'text', text: 'Hello' } }],
+   *     maxTokens: 100
+   * }, {
+   *     onprogress: (progress) => {
+   *         // Handle streaming tokens via progress notifications
+   *         console.log('Progress:', progress.message);
+   *     }
+   * });
+   *
+   * for await (const message of stream) {
+   *     switch (message.type) {
+   *         case 'taskCreated':
+   *             console.log('Task created:', message.task.taskId);
+   *             break;
+   *         case 'taskStatus':
+   *             console.log('Task status:', message.task.status);
+   *             break;
+   *         case 'result':
+   *             console.log('Final result:', message.result);
+   *             break;
+   *         case 'error':
+   *             console.error('Error:', message.error);
+   *             break;
+   *     }
+   * }
+   * ```
+   *
+   * @param params - The sampling request parameters
+   * @param options - Optional request options (timeout, signal, task creation params, onprogress, etc.)
+   * @returns AsyncGenerator that yields ResponseMessage objects
+   *
+   * @experimental
+   */
+  createMessageStream(params, options) {
+    const clientCapabilities = this._server.getClientCapabilities();
+    if ((params.tools || params.toolChoice) && !clientCapabilities?.sampling?.tools) {
+      throw new Error("Client does not support sampling tools capability.");
+    }
+    if (params.messages.length > 0) {
+      const lastMessage = params.messages[params.messages.length - 1];
+      const lastContent = Array.isArray(lastMessage.content) ? lastMessage.content : [lastMessage.content];
+      const hasToolResults = lastContent.some((c) => c.type === "tool_result");
+      const previousMessage = params.messages.length > 1 ? params.messages[params.messages.length - 2] : void 0;
+      const previousContent = previousMessage ? Array.isArray(previousMessage.content) ? previousMessage.content : [previousMessage.content] : [];
+      const hasPreviousToolUse = previousContent.some((c) => c.type === "tool_use");
+      if (hasToolResults) {
+        if (lastContent.some((c) => c.type !== "tool_result")) {
+          throw new Error("The last message must contain only tool_result content if any is present");
+        }
+        if (!hasPreviousToolUse) {
+          throw new Error("tool_result blocks are not matching any tool_use from the previous message");
+        }
+      }
+      if (hasPreviousToolUse) {
+        const toolUseIds = new Set(previousContent.filter((c) => c.type === "tool_use").map((c) => c.id));
+        const toolResultIds = new Set(lastContent.filter((c) => c.type === "tool_result").map((c) => c.toolUseId));
+        if (toolUseIds.size !== toolResultIds.size || ![...toolUseIds].every((id) => toolResultIds.has(id))) {
+          throw new Error("ids of tool_result blocks and tool_use blocks from previous message do not match");
+        }
+      }
+    }
+    return this.requestStream({
+      method: "sampling/createMessage",
+      params
+    }, CreateMessageResultSchema, options);
+  }
+  /**
+   * Sends an elicitation request and returns an AsyncGenerator that yields response messages.
+   * The generator is guaranteed to end with either a 'result' or 'error' message.
+   *
+   * For task-augmented requests (especially URL-based elicitation), yields 'taskCreated'
+   * and 'taskStatus' messages before the final result.
+   *
+   * @example
+   * ```typescript
+   * const stream = server.experimental.tasks.elicitInputStream({
+   *     mode: 'url',
+   *     message: 'Please authenticate',
+   *     elicitationId: 'auth-123',
+   *     url: 'https://example.com/auth'
+   * }, {
+   *     task: { ttl: 300000 } // Task-augmented for long-running auth flow
+   * });
+   *
+   * for await (const message of stream) {
+   *     switch (message.type) {
+   *         case 'taskCreated':
+   *             console.log('Task created:', message.task.taskId);
+   *             break;
+   *         case 'taskStatus':
+   *             console.log('Task status:', message.task.status);
+   *             break;
+   *         case 'result':
+   *             console.log('User action:', message.result.action);
+   *             break;
+   *         case 'error':
+   *             console.error('Error:', message.error);
+   *             break;
+   *     }
+   * }
+   * ```
+   *
+   * @param params - The elicitation request parameters
+   * @param options - Optional request options (timeout, signal, task creation params, etc.)
+   * @returns AsyncGenerator that yields ResponseMessage objects
+   *
+   * @experimental
+   */
+  elicitInputStream(params, options) {
+    const clientCapabilities = this._server.getClientCapabilities();
+    const mode = params.mode ?? "form";
+    switch (mode) {
+      case "url": {
+        if (!clientCapabilities?.elicitation?.url) {
+          throw new Error("Client does not support url elicitation.");
+        }
+        break;
+      }
+      case "form": {
+        if (!clientCapabilities?.elicitation?.form) {
+          throw new Error("Client does not support form elicitation.");
+        }
+        break;
+      }
+    }
+    const normalizedParams = mode === "form" && params.mode === void 0 ? { ...params, mode: "form" } : params;
+    return this.requestStream({
+      method: "elicitation/create",
+      params: normalizedParams
+    }, ElicitResultSchema, options);
+  }
   /**
    * Gets the current status of a task.
    *
@@ -16224,22 +16365,45 @@ async function auth(provider, options) {
   }
 }
 async function authInternal(provider, { serverUrl, authorizationCode, scope, resourceMetadataUrl, fetchFn }) {
+  const cachedState = await provider.discoveryState?.();
   let resourceMetadata;
   let authorizationServerUrl;
-  try {
-    resourceMetadata = await discoverOAuthProtectedResourceMetadata(serverUrl, { resourceMetadataUrl }, fetchFn);
-    if (resourceMetadata.authorization_servers && resourceMetadata.authorization_servers.length > 0) {
-      authorizationServerUrl = resourceMetadata.authorization_servers[0];
+  let metadata;
+  let effectiveResourceMetadataUrl = resourceMetadataUrl;
+  if (!effectiveResourceMetadataUrl && cachedState?.resourceMetadataUrl) {
+    effectiveResourceMetadataUrl = new URL(cachedState.resourceMetadataUrl);
+  }
+  if (cachedState?.authorizationServerUrl) {
+    authorizationServerUrl = cachedState.authorizationServerUrl;
+    resourceMetadata = cachedState.resourceMetadata;
+    metadata = cachedState.authorizationServerMetadata ?? await discoverAuthorizationServerMetadata(authorizationServerUrl, { fetchFn });
+    if (!resourceMetadata) {
+      try {
+        resourceMetadata = await discoverOAuthProtectedResourceMetadata(serverUrl, { resourceMetadataUrl: effectiveResourceMetadataUrl }, fetchFn);
+      } catch {
+      }
     }
-  } catch {
-  }
-  if (!authorizationServerUrl) {
-    authorizationServerUrl = new URL("/", serverUrl);
+    if (metadata !== cachedState.authorizationServerMetadata || resourceMetadata !== cachedState.resourceMetadata) {
+      await provider.saveDiscoveryState?.({
+        authorizationServerUrl: String(authorizationServerUrl),
+        resourceMetadataUrl: effectiveResourceMetadataUrl?.toString(),
+        resourceMetadata,
+        authorizationServerMetadata: metadata
+      });
+    }
+  } else {
+    const serverInfo = await discoverOAuthServerInfo(serverUrl, { resourceMetadataUrl: effectiveResourceMetadataUrl, fetchFn });
+    authorizationServerUrl = serverInfo.authorizationServerUrl;
+    metadata = serverInfo.authorizationServerMetadata;
+    resourceMetadata = serverInfo.resourceMetadata;
+    await provider.saveDiscoveryState?.({
+      authorizationServerUrl: String(authorizationServerUrl),
+      resourceMetadataUrl: effectiveResourceMetadataUrl?.toString(),
+      resourceMetadata,
+      authorizationServerMetadata: metadata
+    });
   }
   const resource = await selectResourceURL(serverUrl, provider, resourceMetadata);
-  const metadata = await discoverAuthorizationServerMetadata(authorizationServerUrl, {
-    fetchFn
-  });
   let clientInformation = await Promise.resolve(provider.clientInformation());
   if (!clientInformation) {
     if (authorizationCode !== void 0) {
@@ -16494,6 +16658,26 @@ async function discoverAuthorizationServerMetadata(authorizationServerUrl, { fet
   }
   return void 0;
 }
+async function discoverOAuthServerInfo(serverUrl, opts) {
+  let resourceMetadata;
+  let authorizationServerUrl;
+  try {
+    resourceMetadata = await discoverOAuthProtectedResourceMetadata(serverUrl, { resourceMetadataUrl: opts?.resourceMetadataUrl }, opts?.fetchFn);
+    if (resourceMetadata.authorization_servers && resourceMetadata.authorization_servers.length > 0) {
+      authorizationServerUrl = resourceMetadata.authorization_servers[0];
+    }
+  } catch {
+  }
+  if (!authorizationServerUrl) {
+    authorizationServerUrl = String(new URL("/", serverUrl));
+  }
+  const authorizationServerMetadata = await discoverAuthorizationServerMetadata(authorizationServerUrl, { fetchFn: opts?.fetchFn });
+  return {
+    authorizationServerUrl,
+    authorizationServerMetadata,
+    resourceMetadata
+  };
+}
 async function startAuthorization(authorizationServerUrl, { metadata, clientInformation, redirectUrl, scope, state, resource }) {
   let authorizationUrl;
   if (metadata) {
@@ -17391,18 +17575,6 @@ var cleanToolSchema = (schema) => {
 var import_node_process3 = require("node:process");
 var import_node_process4 = __toESM(require("node:process"), 1);
 var import_node_crypto = require("node:crypto");
-var mcpClientPool = /* @__PURE__ */ new Map();
-var mcpClientConnecting = /* @__PURE__ */ new Map();
-var shortHash = (s) => (0, import_node_crypto.createHash)("sha256").update(s).digest("hex").slice(0, 8);
-function defSignature(def) {
-  const defCopy = {
-    ...def
-  };
-  if (defCopy.transportType === "memory" || defCopy.transport) {
-    return `memory:${Date.now()}:${Math.random()}`;
-  }
-  return JSON.stringify(defCopy);
-}
 function createTransport(def) {
   const defAny = def;
   const explicitType = defAny.transportType || defAny.type;
@@ -17450,90 +17622,43 @@ function createTransport(def) {
   }
   throw new Error(`Unsupported transport configuration: ${JSON.stringify(def)}`);
 }
-async function getOrCreateMcpClient(defKey, def) {
-  const pooled = mcpClientPool.get(defKey);
-  if (pooled) {
-    pooled.refCount += 1;
-    return pooled.client;
-  }
-  const existingConnecting = mcpClientConnecting.get(defKey);
-  if (existingConnecting) {
-    const client = await existingConnecting;
-    const entry = mcpClientPool.get(defKey);
-    if (entry) entry.refCount += 1;
-    return client;
-  }
-  const transport = createTransport(def);
-  const connecting = (async () => {
-    const client = new Client({
-      name: `mcp_${shortHash(defSignature(def))}`,
-      version: "1.0.0"
-    });
-    await client.connect(transport, {
-      timeout: 6e4 * 10
-    });
-    return client;
-  })();
-  mcpClientConnecting.set(defKey, connecting);
-  try {
-    const client = await connecting;
-    mcpClientPool.set(defKey, {
-      client,
-      refCount: 1
-    });
-    return client;
-  } finally {
-    mcpClientConnecting.delete(defKey);
+function defSignature(def) {
+  const defCopy = {
+    ...def
+  };
+  if (defCopy.transportType === "memory" || defCopy.transport) {
+    return `memory:${Date.now()}:${Math.random()}`;
   }
+  return JSON.stringify(defCopy);
 }
-async function releaseMcpClient(defKey) {
-  const entry = mcpClientPool.get(defKey);
-  if (!entry) return;
-  entry.refCount -= 1;
-  if (entry.refCount <= 0) {
-    mcpClientPool.delete(defKey);
-    try {
-      await entry.client.close();
-    } catch (err) {
-      console.error("Error closing MCP client:", err);
-    }
-  }
+var shortHash = (s) => (0, import_node_crypto.createHash)("sha256").update(s).digest("hex").slice(0, 8);
+async function createMcpClient(def) {
+  const transport = createTransport(def);
+  const client = new Client({
+    name: `mcp_${shortHash(defSignature(def))}`,
+    version: "1.0.0"
+  });
+  await client.connect(transport, {
+    timeout: 6e4 * 10
+  });
+  return client;
 }
-var cleanupAllPooledClients = async () => {
-  const entries = Array.from(mcpClientPool.entries());
-  mcpClientPool.clear();
-  await Promise.all(entries.map(async ([, { client }]) => {
-    try {
-      await client.close();
-    } catch (err) {
-      console.error("Error closing MCP client:", err);
-    }
-  }));
-};
-import_node_process4.default.once?.("exit", () => {
-  cleanupAllPooledClients();
-});
-import_node_process4.default.once?.("SIGINT", () => {
-  cleanupAllPooledClients().finally(() => import_node_process4.default.exit(0));
-});
 async function composeMcpDepTools(mcpConfig, filterIn) {
   const allTools = {};
   const allClients = {};
-  const acquiredKeys = [];
+  const clientsToClose = [];
   for (const [name, definition] of Object.entries(mcpConfig.mcpServers)) {
     const def = definition;
     if (def.disabled) continue;
-    const defKey = shortHash(defSignature(def));
-    const serverId = name;
     try {
-      const client = await getOrCreateMcpClient(defKey, def);
-      acquiredKeys.push(defKey);
-      allClients[serverId] = client;
+      const client = await createMcpClient(def);
+      clientsToClose.push(client);
+      allClients[name] = client;
       const { tools } = await client.listTools();
       tools.forEach((tool2) => {
         const toolNameWithScope = `${name}.${tool2.name}`;
         const internalToolName = tool2.name;
-        const rawToolId = `${serverId}_${internalToolName}`;
+        const rawToolId = `${name}_${internalToolName}`;
         const toolId = sanitizePropertyKey(rawToolId);
         if (filterIn && !filterIn({
           action: internalToolName,
@@ -17545,7 +17670,7 @@ async function composeMcpDepTools(mcpConfig, filterIn) {
         })) {
           return;
         }
-        const execute = (args) => allClients[serverId].callTool({
+        const execute = (args) => allClients[name].callTool({
           name: internalToolName,
           arguments: args
         }, void 0, {
@@ -17562,10 +17687,12 @@ async function composeMcpDepTools(mcpConfig, filterIn) {
     }
   }
   const cleanupClients = async () => {
-    await Promise.all(acquiredKeys.map((k) => releaseMcpClient(k)));
-    acquiredKeys.length = 0;
-    Object.keys(allTools).forEach((key) => delete allTools[key]);
-    Object.keys(allClients).forEach((key) => delete allClients[key]);
+    await Promise.all(clientsToClose.map((client) => {
+      try {
+        return client.close();
+      } catch {
+      }
+    }));
   };
   return {
     tools: allTools,

package/index.mjs

@@ -13957,6 +13957,147 @@ var ExperimentalServerTasks = class {
   requestStream(request, resultSchema, options) {
     return this._server.requestStream(request, resultSchema, options);
   }
+  /**
+   * Sends a sampling request and returns an AsyncGenerator that yields response messages.
+   * The generator is guaranteed to end with either a 'result' or 'error' message.
+   *
+   * For task-augmented requests, yields 'taskCreated' and 'taskStatus' messages
+   * before the final result.
+   *
+   * @example
+   * ```typescript
+   * const stream = server.experimental.tasks.createMessageStream({
+   *     messages: [{ role: 'user', content: { type: 'text', text: 'Hello' } }],
+   *     maxTokens: 100
+   * }, {
+   *     onprogress: (progress) => {
+   *         // Handle streaming tokens via progress notifications
+   *         console.log('Progress:', progress.message);
+   *     }
+   * });
+   *
+   * for await (const message of stream) {
+   *     switch (message.type) {
+   *         case 'taskCreated':
+   *             console.log('Task created:', message.task.taskId);
+   *             break;
+   *         case 'taskStatus':
+   *             console.log('Task status:', message.task.status);
+   *             break;
+   *         case 'result':
+   *             console.log('Final result:', message.result);
+   *             break;
+   *         case 'error':
+   *             console.error('Error:', message.error);
+   *             break;
+   *     }
+   * }
+   * ```
+   *
+   * @param params - The sampling request parameters
+   * @param options - Optional request options (timeout, signal, task creation params, onprogress, etc.)
+   * @returns AsyncGenerator that yields ResponseMessage objects
+   *
+   * @experimental
+   */
+  createMessageStream(params, options) {
+    const clientCapabilities = this._server.getClientCapabilities();
+    if ((params.tools || params.toolChoice) && !clientCapabilities?.sampling?.tools) {
+      throw new Error("Client does not support sampling tools capability.");
+    }
+    if (params.messages.length > 0) {
+      const lastMessage = params.messages[params.messages.length - 1];
+      const lastContent = Array.isArray(lastMessage.content) ? lastMessage.content : [lastMessage.content];
+      const hasToolResults = lastContent.some((c) => c.type === "tool_result");
+      const previousMessage = params.messages.length > 1 ? params.messages[params.messages.length - 2] : void 0;
+      const previousContent = previousMessage ? Array.isArray(previousMessage.content) ? previousMessage.content : [previousMessage.content] : [];
+      const hasPreviousToolUse = previousContent.some((c) => c.type === "tool_use");
+      if (hasToolResults) {
+        if (lastContent.some((c) => c.type !== "tool_result")) {
+          throw new Error("The last message must contain only tool_result content if any is present");
+        }
+        if (!hasPreviousToolUse) {
+          throw new Error("tool_result blocks are not matching any tool_use from the previous message");
+        }
+      }
+      if (hasPreviousToolUse) {
+        const toolUseIds = new Set(previousContent.filter((c) => c.type === "tool_use").map((c) => c.id));
+        const toolResultIds = new Set(lastContent.filter((c) => c.type === "tool_result").map((c) => c.toolUseId));
+        if (toolUseIds.size !== toolResultIds.size || ![...toolUseIds].every((id) => toolResultIds.has(id))) {
+          throw new Error("ids of tool_result blocks and tool_use blocks from previous message do not match");
+        }
+      }
+    }
+    return this.requestStream({
+      method: "sampling/createMessage",
+      params
+    }, CreateMessageResultSchema, options);
+  }
+  /**
+   * Sends an elicitation request and returns an AsyncGenerator that yields response messages.
+   * The generator is guaranteed to end with either a 'result' or 'error' message.
+   *
+   * For task-augmented requests (especially URL-based elicitation), yields 'taskCreated'
+   * and 'taskStatus' messages before the final result.
+   *
+   * @example
+   * ```typescript
+   * const stream = server.experimental.tasks.elicitInputStream({
+   *     mode: 'url',
+   *     message: 'Please authenticate',
+   *     elicitationId: 'auth-123',
+   *     url: 'https://example.com/auth'
+   * }, {
+   *     task: { ttl: 300000 } // Task-augmented for long-running auth flow
+   * });
+   *
+   * for await (const message of stream) {
+   *     switch (message.type) {
+   *         case 'taskCreated':
+   *             console.log('Task created:', message.task.taskId);
+   *             break;
+   *         case 'taskStatus':
+   *             console.log('Task status:', message.task.status);
+   *             break;
+   *         case 'result':
+   *             console.log('User action:', message.result.action);
+   *             break;
+   *         case 'error':
+   *             console.error('Error:', message.error);
+   *             break;
+   *     }
+   * }
+   * ```
+   *
+   * @param params - The elicitation request parameters
+   * @param options - Optional request options (timeout, signal, task creation params, etc.)
+   * @returns AsyncGenerator that yields ResponseMessage objects
+   *
+   * @experimental
+   */
+  elicitInputStream(params, options) {
+    const clientCapabilities = this._server.getClientCapabilities();
+    const mode = params.mode ?? "form";
+    switch (mode) {
+      case "url": {
+        if (!clientCapabilities?.elicitation?.url) {
+          throw new Error("Client does not support url elicitation.");
+        }
+        break;
+      }
+      case "form": {
+        if (!clientCapabilities?.elicitation?.form) {
+          throw new Error("Client does not support form elicitation.");
+        }
+        break;
+      }
+    }
+    const normalizedParams = mode === "form" && params.mode === void 0 ? { ...params, mode: "form" } : params;
+    return this.requestStream({
+      method: "elicitation/create",
+      params: normalizedParams
+    }, ElicitResultSchema, options);
+  }
   /**
    * Gets the current status of a task.
    *
@@ -16212,22 +16353,45 @@ async function auth(provider, options) {
   }
 }
 async function authInternal(provider, { serverUrl, authorizationCode, scope, resourceMetadataUrl, fetchFn }) {
+  const cachedState = await provider.discoveryState?.();
   let resourceMetadata;
   let authorizationServerUrl;
-  try {
-    resourceMetadata = await discoverOAuthProtectedResourceMetadata(serverUrl, { resourceMetadataUrl }, fetchFn);
-    if (resourceMetadata.authorization_servers && resourceMetadata.authorization_servers.length > 0) {
-      authorizationServerUrl = resourceMetadata.authorization_servers[0];
+  let metadata;
+  let effectiveResourceMetadataUrl = resourceMetadataUrl;
+  if (!effectiveResourceMetadataUrl && cachedState?.resourceMetadataUrl) {
+    effectiveResourceMetadataUrl = new URL(cachedState.resourceMetadataUrl);
+  }
+  if (cachedState?.authorizationServerUrl) {
+    authorizationServerUrl = cachedState.authorizationServerUrl;
+    resourceMetadata = cachedState.resourceMetadata;
+    metadata = cachedState.authorizationServerMetadata ?? await discoverAuthorizationServerMetadata(authorizationServerUrl, { fetchFn });
+    if (!resourceMetadata) {
+      try {
+        resourceMetadata = await discoverOAuthProtectedResourceMetadata(serverUrl, { resourceMetadataUrl: effectiveResourceMetadataUrl }, fetchFn);
+      } catch {
+      }
     }
-  } catch {
-  }
-  if (!authorizationServerUrl) {
-    authorizationServerUrl = new URL("/", serverUrl);
+    if (metadata !== cachedState.authorizationServerMetadata || resourceMetadata !== cachedState.resourceMetadata) {
+      await provider.saveDiscoveryState?.({
+        authorizationServerUrl: String(authorizationServerUrl),
+        resourceMetadataUrl: effectiveResourceMetadataUrl?.toString(),
+        resourceMetadata,
+        authorizationServerMetadata: metadata
+      });
+    }
+  } else {
+    const serverInfo = await discoverOAuthServerInfo(serverUrl, { resourceMetadataUrl: effectiveResourceMetadataUrl, fetchFn });
+    authorizationServerUrl = serverInfo.authorizationServerUrl;
+    metadata = serverInfo.authorizationServerMetadata;
+    resourceMetadata = serverInfo.resourceMetadata;
+    await provider.saveDiscoveryState?.({
+      authorizationServerUrl: String(authorizationServerUrl),
+      resourceMetadataUrl: effectiveResourceMetadataUrl?.toString(),
+      resourceMetadata,
+      authorizationServerMetadata: metadata
+    });
   }
   const resource = await selectResourceURL(serverUrl, provider, resourceMetadata);
-  const metadata = await discoverAuthorizationServerMetadata(authorizationServerUrl, {
-    fetchFn
-  });
   let clientInformation = await Promise.resolve(provider.clientInformation());
   if (!clientInformation) {
     if (authorizationCode !== void 0) {
@@ -16482,6 +16646,26 @@ async function discoverAuthorizationServerMetadata(authorizationServerUrl, { fet
   }
   return void 0;
 }
+async function discoverOAuthServerInfo(serverUrl, opts) {
+  let resourceMetadata;
+  let authorizationServerUrl;
+  try {
+    resourceMetadata = await discoverOAuthProtectedResourceMetadata(serverUrl, { resourceMetadataUrl: opts?.resourceMetadataUrl }, opts?.fetchFn);
+    if (resourceMetadata.authorization_servers && resourceMetadata.authorization_servers.length > 0) {
+      authorizationServerUrl = resourceMetadata.authorization_servers[0];
+    }
+  } catch {
+  }
+  if (!authorizationServerUrl) {
+    authorizationServerUrl = String(new URL("/", serverUrl));
+  }
+  const authorizationServerMetadata = await discoverAuthorizationServerMetadata(authorizationServerUrl, { fetchFn: opts?.fetchFn });
+  return {
+    authorizationServerUrl,
+    authorizationServerMetadata,
+    resourceMetadata
+  };
+}
 async function startAuthorization(authorizationServerUrl, { metadata, clientInformation, redirectUrl, scope, state, resource }) {
   let authorizationUrl;
   if (metadata) {
@@ -17379,18 +17563,6 @@ var cleanToolSchema = (schema) => {
 import { cwd } from "node:process";
 import process5 from "node:process";
 import { createHash } from "node:crypto";
-var mcpClientPool = /* @__PURE__ */ new Map();
-var mcpClientConnecting = /* @__PURE__ */ new Map();
-var shortHash = (s) => createHash("sha256").update(s).digest("hex").slice(0, 8);
-function defSignature(def) {
-  const defCopy = {
-    ...def
-  };
-  if (defCopy.transportType === "memory" || defCopy.transport) {
-    return `memory:${Date.now()}:${Math.random()}`;
-  }
-  return JSON.stringify(defCopy);
-}
 function createTransport(def) {
   const defAny = def;
   const explicitType = defAny.transportType || defAny.type;
@@ -17438,90 +17610,43 @@ function createTransport(def) {
   }
   throw new Error(`Unsupported transport configuration: ${JSON.stringify(def)}`);
 }
-async function getOrCreateMcpClient(defKey, def) {
-  const pooled = mcpClientPool.get(defKey);
-  if (pooled) {
-    pooled.refCount += 1;
-    return pooled.client;
-  }
-  const existingConnecting = mcpClientConnecting.get(defKey);
-  if (existingConnecting) {
-    const client = await existingConnecting;
-    const entry = mcpClientPool.get(defKey);
-    if (entry) entry.refCount += 1;
-    return client;
-  }
-  const transport = createTransport(def);
-  const connecting = (async () => {
-    const client = new Client({
-      name: `mcp_${shortHash(defSignature(def))}`,
-      version: "1.0.0"
-    });
-    await client.connect(transport, {
-      timeout: 6e4 * 10
-    });
-    return client;
-  })();
-  mcpClientConnecting.set(defKey, connecting);
-  try {
-    const client = await connecting;
-    mcpClientPool.set(defKey, {
-      client,
-      refCount: 1
-    });
-    return client;
-  } finally {
-    mcpClientConnecting.delete(defKey);
+function defSignature(def) {
+  const defCopy = {
+    ...def
+  };
+  if (defCopy.transportType === "memory" || defCopy.transport) {
+    return `memory:${Date.now()}:${Math.random()}`;
   }
+  return JSON.stringify(defCopy);
 }
-async function releaseMcpClient(defKey) {
-  const entry = mcpClientPool.get(defKey);
-  if (!entry) return;
-  entry.refCount -= 1;
-  if (entry.refCount <= 0) {
-    mcpClientPool.delete(defKey);
-    try {
-      await entry.client.close();
-    } catch (err) {
-      console.error("Error closing MCP client:", err);
-    }
-  }
+var shortHash = (s) => createHash("sha256").update(s).digest("hex").slice(0, 8);
+async function createMcpClient(def) {
+  const transport = createTransport(def);
+  const client = new Client({
+    name: `mcp_${shortHash(defSignature(def))}`,
+    version: "1.0.0"
+  });
+  await client.connect(transport, {
+    timeout: 6e4 * 10
+  });
+  return client;
 }
-var cleanupAllPooledClients = async () => {
-  const entries = Array.from(mcpClientPool.entries());
-  mcpClientPool.clear();
-  await Promise.all(entries.map(async ([, { client }]) => {
-    try {
-      await client.close();
-    } catch (err) {
-      console.error("Error closing MCP client:", err);
-    }
-  }));
-};
-process5.once?.("exit", () => {
-  cleanupAllPooledClients();
-});
-process5.once?.("SIGINT", () => {
-  cleanupAllPooledClients().finally(() => process5.exit(0));
-});
 async function composeMcpDepTools(mcpConfig, filterIn) {
   const allTools = {};
   const allClients = {};
-  const acquiredKeys = [];
+  const clientsToClose = [];
   for (const [name, definition] of Object.entries(mcpConfig.mcpServers)) {
     const def = definition;
     if (def.disabled) continue;
-    const defKey = shortHash(defSignature(def));
-    const serverId = name;
     try {
-      const client = await getOrCreateMcpClient(defKey, def);
-      acquiredKeys.push(defKey);
-      allClients[serverId] = client;
+      const client = await createMcpClient(def);
+      clientsToClose.push(client);
+      allClients[name] = client;
       const { tools } = await client.listTools();
       tools.forEach((tool2) => {
         const toolNameWithScope = `${name}.${tool2.name}`;
         const internalToolName = tool2.name;
-        const rawToolId = `${serverId}_${internalToolName}`;
+        const rawToolId = `${name}_${internalToolName}`;
         const toolId = sanitizePropertyKey(rawToolId);
         if (filterIn && !filterIn({
           action: internalToolName,
@@ -17533,7 +17658,7 @@ async function composeMcpDepTools(mcpConfig, filterIn) {
         })) {
           return;
         }
-        const execute = (args) => allClients[serverId].callTool({
+        const execute = (args) => allClients[name].callTool({
           name: internalToolName,
           arguments: args
         }, void 0, {
@@ -17550,10 +17675,12 @@ async function composeMcpDepTools(mcpConfig, filterIn) {
     }
   }
   const cleanupClients = async () => {
-    await Promise.all(acquiredKeys.map((k) => releaseMcpClient(k)));
-    acquiredKeys.length = 0;
-    Object.keys(allTools).forEach((key) => delete allTools[key]);
-    Object.keys(allClients).forEach((key) => delete allClients[key]);
+    await Promise.all(clientsToClose.map((client) => {
+      try {
+        return client.close();
+      } catch {
+      }
+    }));
   };
   return {
     tools: allTools,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcpc-tech/core",
-  "version": "0.3.37",
+  "version": "0.3.39",
   "homepage": "https://jsr.io/@mcpc/core",
   "dependencies": {
     "@ai-sdk/provider": "^2.0.0",

package/plugins/skills.cjs

@@ -105,7 +105,7 @@ Usage:
 - ${toolName}({ skill: "skill-name" }) - Load main SKILL.md content
 - ${toolName}({ skill: "skill-name", ref: "path/to/file" }) - Load reference file
 
-Note: For scripts/ and assets/, use appropriate tools directly.`;
+Note: For scripts/, use the bash tool with the script path to execute.`;
 }
 function createSkillsPlugin(options) {
   const { paths } = options;
@@ -205,7 +205,13 @@ Available skills: ${available.join(", ")}` : "\n\nNo skills available.";
                 "utf-8"
               );
               const body = extractBody(content);
-              return { content: [{ type: "text", text: body }] };
+              const skillPathInfo = `
+---
+Skill path: ${meta.basePath}
+`;
+              return {
+                content: [{ type: "text", text: body + skillPathInfo }]
+              };
             } catch {
               return {
                 content: [

package/plugins/skills.mjs

@@ -83,7 +83,7 @@ Usage:
 - ${toolName}({ skill: "skill-name" }) - Load main SKILL.md content
 - ${toolName}({ skill: "skill-name", ref: "path/to/file" }) - Load reference file
 
-Note: For scripts/ and assets/, use appropriate tools directly.`;
+Note: For scripts/, use the bash tool with the script path to execute.`;
 }
 function createSkillsPlugin(options) {
   const { paths } = options;
@@ -183,7 +183,13 @@ Available skills: ${available.join(", ")}` : "\n\nNo skills available.";
                 "utf-8"
               );
               const body = extractBody(content);
-              return { content: [{ type: "text", text: body }] };
+              const skillPathInfo = `
+---
+Skill path: ${meta.basePath}
+`;
+              return {
+                content: [{ type: "text", text: body + skillPathInfo }]
+              };
             } catch {
               return {
                 content: [

package/plugins.cjs

@@ -29,6 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // __mcpc__core_latest/node_modules/@mcpc/core/plugins.ts
 var plugins_exports = {};
 __export(plugins_exports, {
+  createBashPlugin: () => createBashPlugin,
   createLargeResultPlugin: () => createLargeResultPlugin,
   createSearchPlugin: () => createSearchPlugin,
   createSkillsPlugin: () => createSkillsPlugin,
@@ -447,7 +448,7 @@ Usage:
 - ${toolName}({ skill: "skill-name" }) - Load main SKILL.md content
 - ${toolName}({ skill: "skill-name", ref: "path/to/file" }) - Load reference file
 
-Note: For scripts/ and assets/, use appropriate tools directly.`;
+Note: For scripts/, use the bash tool with the script path to execute.`;
 }
 function createSkillsPlugin(options) {
   const { paths } = options;
@@ -555,11 +556,15 @@ Available skills: ${available.join(", ")}` : "\n\nNo skills available.";
           try {
             const content = await (0, import_promises2.readFile)((0, import_node_path4.join)(meta.basePath, "SKILL.md"), "utf-8");
             const body = extractBody(content);
+            const skillPathInfo = `
+---
+Skill path: ${meta.basePath}
+`;
             return {
               content: [
                 {
                   type: "text",
-                  text: body
+                  text: body + skillPathInfo
                 }
               ]
             };
@@ -585,8 +590,147 @@ Available skills: ${available.join(", ")}` : "\n\nNo skills available.";
     }
   };
 }
+
+// __mcpc__core_latest/node_modules/@mcpc/core/src/plugins/bash.js
+var import_node_child_process = require("node:child_process");
+var import_node_process = __toESM(require("node:process"), 1);
+var DEFAULT_MAX_BYTES = 1e5;
+var DEFAULT_MAX_LINES = 2e3;
+var DEFAULT_TIMEOUT_MS = 6e4;
+function truncateOutput(stdout, stderr, maxBytes = DEFAULT_MAX_BYTES, maxLines = DEFAULT_MAX_LINES) {
+  const fullOutput = (stderr ? `STDERR:
+${stderr}
+
+STDOUT:
+` : "") + stdout;
+  const lines = fullOutput.split("\n");
+  if (lines.length > maxLines) {
+    const truncatedLines = lines.slice(-maxLines);
+    return {
+      output: `[OUTPUT TRUNCATED] Showing last ${maxLines} lines of ${lines.length} total
+
+` + truncatedLines.join("\n"),
+      truncated: true
+    };
+  }
+  if (fullOutput.length > maxBytes) {
+    const truncatedBytes = fullOutput.slice(-maxBytes);
+    return {
+      output: `[OUTPUT TRUNCATED] Showing last ${maxBytes} bytes of ${fullOutput.length} total
+
+` + truncatedBytes,
+      truncated: true
+    };
+  }
+  return {
+    output: fullOutput,
+    truncated: false
+  };
+}
+function executeBash(command, cwd, timeoutMs) {
+  return new Promise((resolve3) => {
+    const stdout = [];
+    const stderr = [];
+    const proc = (0, import_node_child_process.spawn)("bash", [
+      "-c",
+      command
+    ], {
+      cwd,
+      stdio: [
+        "ignore",
+        "pipe",
+        "pipe"
+      ]
+    });
+    proc.stdout?.on("data", (data) => {
+      stdout.push(data.toString());
+    });
+    proc.stderr?.on("data", (data) => {
+      stderr.push(data.toString());
+    });
+    proc.on("close", (code) => {
+      resolve3({
+        stdout: stdout.join(""),
+        stderr: stderr.join(""),
+        exitCode: code
+      });
+    });
+    proc.on("error", (err) => {
+      resolve3({
+        stdout: "",
+        stderr: err.message,
+        exitCode: null
+      });
+    });
+    setTimeout(() => {
+      proc.kill("SIGTERM");
+      resolve3({
+        stdout: stdout.join(""),
+        stderr: stderr.join("") + "\n\n[TIMEOUT] Command execution timed out",
+        exitCode: null
+      });
+    }, timeoutMs);
+  });
+}
+function createBashPlugin(options = {}) {
+  const { maxBytes, maxLines, timeoutMs } = {
+    maxBytes: DEFAULT_MAX_BYTES,
+    maxLines: DEFAULT_MAX_LINES,
+    timeoutMs: DEFAULT_TIMEOUT_MS,
+    ...options
+  };
+  return {
+    name: "plugin-bash",
+    version: "1.0.0",
+    // Store server reference for tool registration
+    configureServer: (server) => {
+      server.tool("bash", "Execute a bash command and return its output.\n\nUse this for:\n- Running shell commands\n- Executing scripts\n- System operations\n\nNote: Output is truncated if too large.", {
+        type: "object",
+        properties: {
+          command: {
+            type: "string",
+            description: "The bash command to execute"
+          },
+          cwd: {
+            type: "string",
+            description: "Optional: Working directory for the command (defaults to current directory)"
+          }
+        },
+        required: [
+          "command"
+        ]
+      }, async (args) => {
+        const cwd = args.cwd || import_node_process.default.cwd();
+        const result = await executeBash(args.command, cwd, timeoutMs);
+        const { output, truncated } = truncateOutput(result.stdout, result.stderr, maxBytes, maxLines);
+        let finalOutput = output;
+        if (result.exitCode !== null && result.exitCode !== 0) {
+          finalOutput = `[EXIT CODE: ${result.exitCode}]
+` + finalOutput;
+        }
+        if (truncated) {
+          finalOutput += `
+
+[Note: Output was truncated]`;
+        }
+        return {
+          content: [
+            {
+              type: "text",
+              text: finalOutput
+            }
+          ],
+          isError: result.exitCode !== null && result.exitCode !== 0
+        };
+      }, {
+        internal: true
+      });
+    }
+  };
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  createBashPlugin,
   createLargeResultPlugin,
   createSearchPlugin,
   createSkillsPlugin,

package/plugins.mjs

@@ -411,7 +411,7 @@ Usage:
 - ${toolName}({ skill: "skill-name" }) - Load main SKILL.md content
 - ${toolName}({ skill: "skill-name", ref: "path/to/file" }) - Load reference file
 
-Note: For scripts/ and assets/, use appropriate tools directly.`;
+Note: For scripts/, use the bash tool with the script path to execute.`;
 }
 function createSkillsPlugin(options) {
   const { paths } = options;
@@ -519,11 +519,15 @@ Available skills: ${available.join(", ")}` : "\n\nNo skills available.";
           try {
             const content = await readFile(join2(meta.basePath, "SKILL.md"), "utf-8");
             const body = extractBody(content);
+            const skillPathInfo = `
+---
+Skill path: ${meta.basePath}
+`;
             return {
               content: [
                 {
                   type: "text",
-                  text: body
+                  text: body + skillPathInfo
                 }
               ]
             };
@@ -549,7 +553,146 @@ Available skills: ${available.join(", ")}` : "\n\nNo skills available.";
     }
   };
 }
+
+// __mcpc__core_latest/node_modules/@mcpc/core/src/plugins/bash.js
+import { spawn } from "node:child_process";
+import process from "node:process";
+var DEFAULT_MAX_BYTES = 1e5;
+var DEFAULT_MAX_LINES = 2e3;
+var DEFAULT_TIMEOUT_MS = 6e4;
+function truncateOutput(stdout, stderr, maxBytes = DEFAULT_MAX_BYTES, maxLines = DEFAULT_MAX_LINES) {
+  const fullOutput = (stderr ? `STDERR:
+${stderr}
+
+STDOUT:
+` : "") + stdout;
+  const lines = fullOutput.split("\n");
+  if (lines.length > maxLines) {
+    const truncatedLines = lines.slice(-maxLines);
+    return {
+      output: `[OUTPUT TRUNCATED] Showing last ${maxLines} lines of ${lines.length} total
+
+` + truncatedLines.join("\n"),
+      truncated: true
+    };
+  }
+  if (fullOutput.length > maxBytes) {
+    const truncatedBytes = fullOutput.slice(-maxBytes);
+    return {
+      output: `[OUTPUT TRUNCATED] Showing last ${maxBytes} bytes of ${fullOutput.length} total
+
+` + truncatedBytes,
+      truncated: true
+    };
+  }
+  return {
+    output: fullOutput,
+    truncated: false
+  };
+}
+function executeBash(command, cwd, timeoutMs) {
+  return new Promise((resolve3) => {
+    const stdout = [];
+    const stderr = [];
+    const proc = spawn("bash", [
+      "-c",
+      command
+    ], {
+      cwd,
+      stdio: [
+        "ignore",
+        "pipe",
+        "pipe"
+      ]
+    });
+    proc.stdout?.on("data", (data) => {
+      stdout.push(data.toString());
+    });
+    proc.stderr?.on("data", (data) => {
+      stderr.push(data.toString());
+    });
+    proc.on("close", (code) => {
+      resolve3({
+        stdout: stdout.join(""),
+        stderr: stderr.join(""),
+        exitCode: code
+      });
+    });
+    proc.on("error", (err) => {
+      resolve3({
+        stdout: "",
+        stderr: err.message,
+        exitCode: null
+      });
+    });
+    setTimeout(() => {
+      proc.kill("SIGTERM");
+      resolve3({
+        stdout: stdout.join(""),
+        stderr: stderr.join("") + "\n\n[TIMEOUT] Command execution timed out",
+        exitCode: null
+      });
+    }, timeoutMs);
+  });
+}
+function createBashPlugin(options = {}) {
+  const { maxBytes, maxLines, timeoutMs } = {
+    maxBytes: DEFAULT_MAX_BYTES,
+    maxLines: DEFAULT_MAX_LINES,
+    timeoutMs: DEFAULT_TIMEOUT_MS,
+    ...options
+  };
+  return {
+    name: "plugin-bash",
+    version: "1.0.0",
+    // Store server reference for tool registration
+    configureServer: (server) => {
+      server.tool("bash", "Execute a bash command and return its output.\n\nUse this for:\n- Running shell commands\n- Executing scripts\n- System operations\n\nNote: Output is truncated if too large.", {
+        type: "object",
+        properties: {
+          command: {
+            type: "string",
+            description: "The bash command to execute"
+          },
+          cwd: {
+            type: "string",
+            description: "Optional: Working directory for the command (defaults to current directory)"
+          }
+        },
+        required: [
+          "command"
+        ]
+      }, async (args) => {
+        const cwd = args.cwd || process.cwd();
+        const result = await executeBash(args.command, cwd, timeoutMs);
+        const { output, truncated } = truncateOutput(result.stdout, result.stderr, maxBytes, maxLines);
+        let finalOutput = output;
+        if (result.exitCode !== null && result.exitCode !== 0) {
+          finalOutput = `[EXIT CODE: ${result.exitCode}]
+` + finalOutput;
+        }
+        if (truncated) {
+          finalOutput += `
+
+[Note: Output was truncated]`;
+        }
+        return {
+          content: [
+            {
+              type: "text",
+              text: finalOutput
+            }
+          ],
+          isError: result.exitCode !== null && result.exitCode !== 0
+        };
+      }, {
+        internal: true
+      });
+    }
+  };
+}
 export {
+  createBashPlugin,
   createLargeResultPlugin,
   createSearchPlugin,
   createSkillsPlugin,

package/types/plugins.d.ts

@@ -38,6 +38,7 @@
  */ export { createSearchPlugin } from "./src/plugins/search-tool.js";
 export { createLargeResultPlugin } from "./src/plugins/large-result.js";
 export { createSkillsPlugin } from "./src/plugins/skills.js";
+export { createBashPlugin } from "./src/plugins/bash.js";
 export { default as defaultSearchPlugin } from "./src/plugins/search-tool.js";
 export { default as defaultLargeResultPlugin } from "./src/plugins/large-result.js";
 export type { SearchOptions } from "./src/plugins/search-tool.js";

package/types/plugins.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugins.d.ts","sources":["../plugins.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqCC,GAGD,SAAS,kBAAkB,uCAAuC;AAClE,SAAS,uBAAuB,wCAAwC;AACxE,SAAS,kBAAkB,kCAAkC;AAG7D,SAAS,WAAW,mBAAmB,uCAAuC;AAC9E,SAAS,WAAW,wBAAwB,wCAAwC;AAGpF,cAAc,aAAa,uCAAuC"}
+{"version":3,"file":"plugins.d.ts","sources":["../plugins.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqCC,GAGD,SAAS,kBAAkB,uCAAuC;AAClE,SAAS,uBAAuB,wCAAwC;AACxE,SAAS,kBAAkB,kCAAkC;AAC7D,SAAS,gBAAgB,gCAAgC;AAGzD,SAAS,WAAW,mBAAmB,uCAAuC;AAC9E,SAAS,WAAW,wBAAwB,wCAAwC;AAGpF,cAAc,aAAa,uCAAuC"}

package/types/src/plugins/bash.d.ts

@@ -0,0 +1,10 @@
+import type { ToolPlugin } from "../plugin-types.js";
+export interface BashPluginOptions {
+  /** Maximum output bytes to return */ maxBytes?: number;
+  /** Maximum output lines to return */ maxLines?: number;
+  /** Command execution timeout in ms */ timeoutMs?: number;
+}
+/**
+ * Create a bash plugin that provides command execution capability
+ */ export declare function createBashPlugin(options?: BashPluginOptions): ToolPlugin;
+//# sourceMappingURL=bash.d.ts.map

package/types/src/plugins/bash.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bash.d.ts","sources":["../../../src/plugins/bash.ts"],"names":[],"mappings":"AAWA,cAAc,UAAU,6BAA6B;AASrD,iBAAiB;EACf,mCAAmC,GACnC,WAAW,MAAM;EACjB,mCAAmC,GACnC,WAAW,MAAM;EACjB,oCAAoC,GACpC,YAAY,MAAM;;AA8FpB;;CAEC,GACD,OAAO,iBAAS,iBAAiB,UAAS,iBAAsB,GAAG"}

package/types/src/plugins/skills.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skills.d.ts","sources":["../../../src/plugins/skills.ts"],"names":[],"mappings":"AAOA,cAAmC,UAAU,6BAA6B;UAWhE;EACR,mCAAmC,GACnC,OAAO,MAAM;;AAoGf;;CAEC,GACD,OAAO,iBAAS,mBAAmB,SAAS,mBAAmB,GAAG;AA8IlE;;;;;;;;;;;;;CAaC,GACD,OAAO,iBAAS,aAAa,QAAQ,OAAO,MAAM,EAAE,MAAM,CAAC,GAAG;AAM9D,eAAe,mBAAmB"}
+{"version":3,"file":"skills.d.ts","sources":["../../../src/plugins/skills.ts"],"names":[],"mappings":"AAOA,cAAmC,UAAU,6BAA6B;UAWhE;EACR,mCAAmC,GACnC,OAAO,MAAM;;AAoGf;;CAEC,GACD,OAAO,iBAAS,mBAAmB,SAAS,mBAAmB,GAAG;AAkJlE;;;;;;;;;;;;;CAaC,GACD,OAAO,iBAAS,aAAa,QAAQ,OAAO,MAAM,EAAE,MAAM,CAAC,GAAG;AAM9D,eAAe,mBAAmB"}

package/types/src/utils/common/mcp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.d.ts","sources":["../../../../src/utils/common/mcp.ts"],"names":[],"mappings":"AAKA,cAA+B,UAAU,iCAAiC;AAwL1E,OAAO,iBAAe,mBACpB,WAAW,UAAU,EACrB,YAAY;EACV,QAAQ,MAAM;EACd,MAAM,GAAG;EACT,SAAS,MAAM;EACf,mBAAmB,MAAM;EACzB,kBAAkB,MAAM;EACxB,QAAQ,MAAM;MACV,OAAO,GACZ,QAAQ,OAAO,MAAM,EAAE,GAAG"}
+{"version":3,"file":"mcp.d.ts","sources":["../../../../src/utils/common/mcp.ts"],"names":[],"mappings":"AAKA,cAA+B,UAAU,iCAAiC;AAiG1E,OAAO,iBAAe,mBACpB,WAAW,UAAU,EACrB,YAAY;EACV,QAAQ,MAAM;EACd,MAAM,GAAG;EACT,SAAS,MAAM;EACf,mBAAmB,MAAM;EACzB,kBAAkB,MAAM;EACxB,QAAQ,MAAM;MACV,OAAO,GACZ,QAAQ,OAAO,MAAM,EAAE,GAAG"}