@mcpc-tech/core 0.3.23 → 0.3.24

package/index.cjs

@@ -534,6 +534,7 @@ __export(mod_exports, {
   composeMcpDepTools: () => composeMcpDepTools,
   convertToAISDKTools: () => convertToAISDKTools,
   extractJsonSchema: () => extractJsonSchema,
+  isMarkdownFile: () => isMarkdownFile,
   isProdEnv: () => isProdEnv,
   isSCF: () => isSCF,
   isWrappedSchema: () => isWrappedSchema,
@@ -542,6 +543,7 @@ __export(mod_exports, {
   optionalObject: () => optionalObject,
   parseJSON: () => parseJSON,
   parseMcpcConfigs: () => parseMcpcConfigs,
+  setMarkdownAgentLoader: () => setMarkdownAgentLoader,
   truncateJSON: () => truncateJSON
 });
 module.exports = __toCommonJS(mod_exports);
@@ -14868,7 +14870,9 @@ var Client = class extends Protocol {
           }
           return taskValidationResult.data;
         }
-        const validationResult = safeParse3(CreateMessageResultSchema, result);
+        const hasTools = params.tools || params.toolChoice;
+        const resultSchema = hasTools ? CreateMessageResultWithToolsSchema : CreateMessageResultSchema;
+        const validationResult = safeParse3(resultSchema, result);
         if (!validationResult.success) {
           const errorMessage = validationResult.error instanceof Error ? validationResult.error.message : String(validationResult.error);
           throw new McpError(ErrorCode.InvalidParams, `Invalid sampling result: ${errorMessage}`);
@@ -20406,12 +20410,44 @@ function convertToAISDKTools(server, helpers) {
 }
 
 // __mcpc__core_latest/node_modules/@mcpc/core/src/set-up-mcp-compose.js
+var markdownAgentLoader = null;
+function setMarkdownAgentLoader(loader) {
+  markdownAgentLoader = loader;
+}
+function isMarkdownFile(path) {
+  return path.endsWith(".md") || path.endsWith(".markdown");
+}
+async function resolveComposeInput(input) {
+  if (typeof input !== "string") {
+    return input;
+  }
+  if (!isMarkdownFile(input)) {
+    throw new Error(`Invalid compose input: "${input}". Expected a Markdown file path (.md) or a ComposeDefinition object.`);
+  }
+  if (!markdownAgentLoader) {
+    throw new Error(`Cannot load Markdown agent file "${input}": Markdown loader not available. Use markdownLoaderPlugin() from "@mcpc/plugin-markdown-loader", or use inline ComposeDefinition objects.`);
+  }
+  return await markdownAgentLoader(input);
+}
 function parseMcpcConfigs(conf) {
   return conf ?? [];
 }
-async function mcpc(serverConf, composeConf, setupCallback) {
+async function mcpc(serverConf, composeConf, optionsOrSetup) {
   const server = new ComposableMCPServer(...serverConf);
-  const parsed = parseMcpcConfigs(composeConf);
+  const options = typeof optionsOrSetup === "function" ? {
+    setup: optionsOrSetup
+  } : optionsOrSetup ?? {};
+  if (options.plugins) {
+    for (const plugin of options.plugins) {
+      if (typeof plugin === "string") {
+        await server.loadPluginFromPath(plugin);
+      } else {
+        await server.addPlugin(plugin);
+      }
+    }
+  }
+  const resolvedConfigs = composeConf ? await Promise.all(composeConf.map(resolveComposeInput)) : [];
+  const parsed = parseMcpcConfigs(resolvedConfigs);
   await server.initBuiltInPlugins();
   for (const mcpcConfig of parsed) {
     if (mcpcConfig.plugins) {
@@ -20424,8 +20460,8 @@ async function mcpc(serverConf, composeConf, setupCallback) {
       }
     }
   }
-  if (setupCallback) {
-    await setupCallback(server);
+  if (options.setup) {
+    await options.setup(server);
   }
   for (const mcpcConfig of parsed) {
     await server.compose(mcpcConfig.name, mcpcConfig.description ?? "", mcpcConfig.deps, mcpcConfig.options);
@@ -20438,6 +20474,7 @@ async function mcpc(serverConf, composeConf, setupCallback) {
   composeMcpDepTools,
   convertToAISDKTools,
   extractJsonSchema,
+  isMarkdownFile,
   isProdEnv,
   isSCF,
   isWrappedSchema,
@@ -20446,5 +20483,6 @@ async function mcpc(serverConf, composeConf, setupCallback) {
   optionalObject,
   parseJSON,
   parseMcpcConfigs,
+  setMarkdownAgentLoader,
   truncateJSON
 });

package/index.mjs

@@ -14856,7 +14856,9 @@ var Client = class extends Protocol {
           }
           return taskValidationResult.data;
         }
-        const validationResult = safeParse3(CreateMessageResultSchema, result);
+        const hasTools = params.tools || params.toolChoice;
+        const resultSchema = hasTools ? CreateMessageResultWithToolsSchema : CreateMessageResultSchema;
+        const validationResult = safeParse3(resultSchema, result);
         if (!validationResult.success) {
           const errorMessage = validationResult.error instanceof Error ? validationResult.error.message : String(validationResult.error);
           throw new McpError(ErrorCode.InvalidParams, `Invalid sampling result: ${errorMessage}`);
@@ -20393,12 +20395,44 @@ function convertToAISDKTools(server, helpers) {
 }
 
 // __mcpc__core_latest/node_modules/@mcpc/core/src/set-up-mcp-compose.js
+var markdownAgentLoader = null;
+function setMarkdownAgentLoader(loader) {
+  markdownAgentLoader = loader;
+}
+function isMarkdownFile(path) {
+  return path.endsWith(".md") || path.endsWith(".markdown");
+}
+async function resolveComposeInput(input) {
+  if (typeof input !== "string") {
+    return input;
+  }
+  if (!isMarkdownFile(input)) {
+    throw new Error(`Invalid compose input: "${input}". Expected a Markdown file path (.md) or a ComposeDefinition object.`);
+  }
+  if (!markdownAgentLoader) {
+    throw new Error(`Cannot load Markdown agent file "${input}": Markdown loader not available. Use markdownLoaderPlugin() from "@mcpc/plugin-markdown-loader", or use inline ComposeDefinition objects.`);
+  }
+  return await markdownAgentLoader(input);
+}
 function parseMcpcConfigs(conf) {
   return conf ?? [];
 }
-async function mcpc(serverConf, composeConf, setupCallback) {
+async function mcpc(serverConf, composeConf, optionsOrSetup) {
   const server = new ComposableMCPServer(...serverConf);
-  const parsed = parseMcpcConfigs(composeConf);
+  const options = typeof optionsOrSetup === "function" ? {
+    setup: optionsOrSetup
+  } : optionsOrSetup ?? {};
+  if (options.plugins) {
+    for (const plugin of options.plugins) {
+      if (typeof plugin === "string") {
+        await server.loadPluginFromPath(plugin);
+      } else {
+        await server.addPlugin(plugin);
+      }
+    }
+  }
+  const resolvedConfigs = composeConf ? await Promise.all(composeConf.map(resolveComposeInput)) : [];
+  const parsed = parseMcpcConfigs(resolvedConfigs);
   await server.initBuiltInPlugins();
   for (const mcpcConfig of parsed) {
     if (mcpcConfig.plugins) {
@@ -20411,8 +20445,8 @@ async function mcpc(serverConf, composeConf, setupCallback) {
       }
     }
   }
-  if (setupCallback) {
-    await setupCallback(server);
+  if (options.setup) {
+    await options.setup(server);
   }
   for (const mcpcConfig of parsed) {
     await server.compose(mcpcConfig.name, mcpcConfig.description ?? "", mcpcConfig.deps, mcpcConfig.options);
@@ -20424,6 +20458,7 @@ export {
   composeMcpDepTools,
   convertToAISDKTools,
   extractJsonSchema,
+  isMarkdownFile,
   isProdEnv,
   isSCF,
   isWrappedSchema,
@@ -20432,5 +20467,6 @@ export {
   optionalObject,
   parseJSON,
   parseMcpcConfigs,
+  setMarkdownAgentLoader,
   truncateJSON
 };

package/package.json

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

package/types/mod.d.ts

@@ -47,11 +47,13 @@
  *
  * @module
  */ export * from "./src/compose.js";
+export type { McpServerConfig, MCPSetting, SseServerConfig, StdioServerConfig, StreamableHTTPServerConfig } from "./src/service/tools.js";
+export type { SamplingConfig, ToolRefXml } from "./src/types.js";
 export type { AgentToolRegistrationContext, ComposedTool, ComposeEndContext, ComposeStartContext, FinalizeContext, ToolConfig, ToolPlugin, TransformContext } from "./src/plugin-types.js";
 export * from "./src/utils/common/env.js";
 export * from "./src/utils/common/json.js";
 export * from "./src/utils/common/mcp.js";
-export * from "./src/set-up-mcp-compose.js";
+export { type ComposeDefinition, type ComposeInput, type ComposibleMCPConfig, isMarkdownFile, type MarkdownAgentLoader, mcpc, type McpcOptions, parseMcpcConfigs, setMarkdownAgentLoader } from "./src/set-up-mcp-compose.js";
 export { extractJsonSchema, isWrappedSchema, jsonSchema, type Schema } from "./src/utils/schema.js";
 export { convertToAISDKTools, type JsonSchemaHelper, type ToolHelper } from "./src/ai-sdk-adapter.js";
 //# sourceMappingURL=mod.d.ts.map

package/types/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sources":["../mod.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgDC,GAED,iCAAiC;AAGjC,cACE,4BAA4B,EAC5B,YAAY,EACZ,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,EACf,UAAU,EACV,UAAU,EACV,gBAAgB,gCACa;AAE/B,0CAA0C;AAC1C,2CAA2C;AAC3C,0CAA0C;AAE1C,4CAA4C;AAG5C,SACE,iBAAiB,EACjB,eAAe,EACf,UAAU,EACV,KAAK,MAAM,gCACkB;AAG/B,SACE,mBAAmB,EACnB,KAAK,gBAAgB,EACrB,KAAK,UAAU,kCACgB"}
+{"version":3,"file":"mod.d.ts","sources":["../mod.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgDC,GAED,iCAAiC;AAGjC,cACE,eAAe,EACf,UAAU,EACV,eAAe,EACf,iBAAiB,EACjB,0BAA0B,iCACI;AAGhC,cAAc,cAAc,EAAE,UAAU,yBAAyB;AAGjE,cACE,4BAA4B,EAC5B,YAAY,EACZ,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,EACf,UAAU,EACV,UAAU,EACV,gBAAgB,gCACa;AAE/B,0CAA0C;AAC1C,2CAA2C;AAC3C,0CAA0C;AAE1C,SACE,KAAK,iBAAiB,EACtB,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACxB,cAAc,EACd,KAAK,mBAAmB,EACxB,IAAI,EACJ,KAAK,WAAW,EAChB,gBAAgB,EAChB,sBAAsB,sCACa;AAGrC,SACE,iBAAiB,EACjB,eAAe,EACf,UAAU,EACV,KAAK,MAAM,gCACkB;AAG/B,SACE,mBAAmB,EACnB,KAAK,gBAAgB,EACrB,KAAK,UAAU,kCACgB"}

package/types/src/set-up-mcp-compose.d.ts

@@ -95,10 +95,52 @@ export interface ComposeDefinition {
      */ refs?: Array<ToolRefXml>;
   };
 }
+/**
+ * Input type for mcpc() that supports both inline definitions and file paths.
+ * - ComposeDefinition: Inline agent definition object
+ * - string: Path to a Markdown agent file (.md)
+ *
+ * @example
+ * ```typescript
+ * // Mix of inline and file-based definitions
+ * await mcpc(serverConf, [
+ *   './agents/coding-agent.md',           // Load from file
+ *   { name: 'inline-agent', description: '...' }  // Inline definition
+ * ]);
+ * ```
+ */ export type ComposeInput = ComposeDefinition | string;
 export interface ComposibleMCPConfig {
   [key: string]: ComposeDefinition[];
 }
+/**
+ * Markdown agent file loader function type.
+ * This is registered by markdownLoaderPlugin() to avoid circular dependencies.
+ */ export type MarkdownAgentLoader = (filePath: string) => Promise<ComposeDefinition>;
+/**
+ * Register the Markdown agent loader (called by markdownLoaderPlugin())
+ */ export declare function setMarkdownAgentLoader(loader: MarkdownAgentLoader): void;
+/**
+ * Check if a path is a Markdown file (.md or .markdown)
+ */ export declare function isMarkdownFile(path: string): boolean;
 export declare function parseMcpcConfigs(conf?: ComposeDefinition[]): ComposeDefinition[];
+/**
+ * Options for mcpc() function
+ */ export interface McpcOptions {
+  /**
+   * Loader plugins to load BEFORE resolving compose inputs.
+   * These plugins register file loaders (e.g., markdown-loader) that are needed
+   * to parse file paths in composeConf.
+   *
+   * Supports both plugin objects and string paths (e.g., "@mcpc/plugin-markdown-loader").
+   *
+   * Note: This is different from ComposeDefinition.plugins which are runtime plugins
+   * that transform tool descriptions and results AFTER composition.
+   */ plugins?: (ToolPlugin | string)[];
+  /**
+   * Callback to register custom tools or perform additional setup before composition.
+   * Useful for adding internal tools or custom configurations.
+   */ setup?: (server: ComposableMCPServer) => void | Promise<void>;
+}
 /**
  * Create and configure an agentic MCP server with composed tools.
  *
@@ -110,6 +152,7 @@ export declare function parseMcpcConfigs(conf?: ComposeDefinition[]): ComposeDef
  *
  * @example
  * ```typescript
+ * // Using inline definitions
  * const server = await mcpc(
  *   [
  *     { name: "coding-agent", version: "1.0.0" },
@@ -139,6 +182,16 @@ export declare function parseMcpcConfigs(conf?: ComposeDefinition[]): ComposeDef
  *     options: { mode: "ai_sampling" }
  *   }]
  * );
+ *
+ * // Using Markdown file paths with plugin
+ * import { markdownLoaderPlugin } from "@mcpc/plugin-markdown-loader";
+ *
+ * const server = await mcpc(
+ *   [{ name: "my-server", version: "1.0.0" }, { capabilities: { tools: {} } }],
+ *   ["./agents/coding-agent.md"],
+ *   { plugins: [markdownLoaderPlugin()] }
+ * );
+ *
  * await server.connect(new StdioServerTransport());
  * ```
  *
@@ -146,20 +199,17 @@ export declare function parseMcpcConfigs(conf?: ComposeDefinition[]): ComposeDef
  *   - First element: Server metadata (name, version)
  *   - Second element: Server capabilities (tools, sampling, etc.)
  *
- * @param composeConf - Array of agent composition definitions. Each definition includes:
- *   - name: Agent name (set to null for composition-only mode)
- *   - description: Agent purpose with XML-like tool references (e.g., `<tool name="server.tool"/>`)
- *   - deps: MCP server dependencies with transport configurations (stdio, sse, streamable-http)
- *   - plugins: Global plugins to transform/extend tool behavior (objects or file paths)
- *   - options: Execution mode settings (agentic, ai_sampling, ai_acp)
+ * @param composeConf - Array of agent composition definitions or Markdown file paths.
+ *   - ComposeDefinition: Inline agent definition object
+ *   - string: Path to a Markdown agent file (.md) - requires markdown-loader plugin
  *
- * @param setupCallback - Optional callback to register custom tools or perform additional setup
- *   before composition. Useful for adding internal tools or custom configurations.
+ * @param options - Optional configuration for mcpc()
+ *   - plugins: Plugins to load before resolving compose inputs (e.g., markdown-loader)
  *
  * @returns A configured MCP Server instance ready to connect to a transport
  *
  * @see {@link ComposeDefinition} for detailed composition configuration options
  * @see {@link ToolPlugin} for plugin development guide
  * @see https://github.com/mcpc-tech/mcpc/tree/main/docs for complete documentation
- */ export declare function mcpc(serverConf: ConstructorParameters<typeof ComposableMCPServer>, composeConf?: ComposeDefinition[], setupCallback?: (server: ComposableMCPServer) => void | Promise<void>): Promise<InstanceType<typeof ComposableMCPServer>>;
+ */ export declare function mcpc(serverConf: ConstructorParameters<typeof ComposableMCPServer>, composeConf?: ComposeInput[], optionsOrSetup?: McpcOptions | ((server: ComposableMCPServer) => void | Promise<void>)): Promise<InstanceType<typeof ComposableMCPServer>>;
 //# sourceMappingURL=set-up-mcp-compose.d.ts.map

package/types/src/set-up-mcp-compose.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"set-up-mcp-compose.d.ts","sources":["../../src/set-up-mcp-compose.ts"],"names":[],"mappings":"AAAA,SAAS,mBAAmB,oBAAoB;AAChD,cAAc,UAAU,6BAA6B;AACrD,cAAc,cAAc,qBAAqB;AACjD,cAAc,UAAU,4BAA4B;AACpD,cAAc,UAAU,qBAAqB;AAC7C,cAAc,aAAa,6BAA6B;AAExD,iBAAiB;EACf;;;GAGC,GACD,MAAM,MAAM,GAAG,IAAI;EACnB;;GAEC,GACD,cAAc,MAAM;EACpB,OAAO;EAEP;;;;;;;;;;;GAWC,GACD,WAAW,aAAa,MAAM;EAE9B;IACE;;;;;;KAMC,GACD,OAAO;IAEP;;KAEC,GACD,iBAAiB;IAEjB;;;;KAIC,GACD;MACE;QACE,QAAQ;UAAQ,OAAO,MAAM;;QAC7B,eAAe,MAAM;QACrB,gBAAgB,MAAM;QACtB,uBAAuB,MAAM;;;IAIjC;;;;KAIC,GACD;MACE,SAAS,MAAM;MACf,OAAO,MAAM;MACb,MAAM,OAAO,MAAM,EAAE,MAAM;MAC3B;QACE,MAAM,MAAM;QACZ,aAAa;UACX,MAAM,MAAM;UACZ,SAAS,MAAM;UACf,OAAO,MAAM;UACb,MAAM,OAAO,MAAM,EAAE,MAAM;;;MAG/B,iBAAiB,OAAO;;IAG1B;;;;KAIC,GACD,WAAW,MAAM;IAEjB;;;;KAIC,GACD,YAAY,MAAM;IAElB;;;;KAIC,GACD,iBAAiB,OAAO;IAExB;;;;;KAKC,GACD;;;KAGC,GACD,OAAO,MAAM;;;AAMjB,iBAAiB;GACd,KAAK,MAAM,GAAG;;AAGjB,OAAO,iBAAS,iBACd,OAAO,mBAAmB,GACzB;AAIH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8DC,GACD,OAAO,iBAAe,KACpB,YAAY,6BAA6B,oBAAoB,EAC7D,cAAc,mBAAmB,EACjC,iBAAiB,QAAQ,wBAAwB,IAAI,GAAG,QAAQ,IAAI,CAAC,GACpE,QAAQ,oBAAoB"}
+{"version":3,"file":"set-up-mcp-compose.d.ts","sources":["../../src/set-up-mcp-compose.ts"],"names":[],"mappings":"AAAA,SAAS,mBAAmB,oBAAoB;AAChD,cAAc,UAAU,6BAA6B;AACrD,cAAc,cAAc,qBAAqB;AACjD,cAAc,UAAU,4BAA4B;AACpD,cAAc,UAAU,qBAAqB;AAC7C,cAAc,aAAa,6BAA6B;AAExD,iBAAiB;EACf;;;GAGC,GACD,MAAM,MAAM,GAAG,IAAI;EACnB;;GAEC,GACD,cAAc,MAAM;EACpB,OAAO;EAEP;;;;;;;;;;;GAWC,GACD,WAAW,aAAa,MAAM;EAE9B;IACE;;;;;;KAMC,GACD,OAAO;IAEP;;KAEC,GACD,iBAAiB;IAEjB;;;;KAIC,GACD;MACE;QACE,QAAQ;UAAQ,OAAO,MAAM;;QAC7B,eAAe,MAAM;QACrB,gBAAgB,MAAM;QACtB,uBAAuB,MAAM;;;IAIjC;;;;KAIC,GACD;MACE,SAAS,MAAM;MACf,OAAO,MAAM;MACb,MAAM,OAAO,MAAM,EAAE,MAAM;MAC3B;QACE,MAAM,MAAM;QACZ,aAAa;UACX,MAAM,MAAM;UACZ,SAAS,MAAM;UACf,OAAO,MAAM;UACb,MAAM,OAAO,MAAM,EAAE,MAAM;;;MAG/B,iBAAiB,OAAO;;IAG1B;;;;KAIC,GACD,WAAW,MAAM;IAEjB;;;;KAIC,GACD,YAAY,MAAM;IAElB;;;;KAIC,GACD,iBAAiB,OAAO;IAExB;;;;;KAKC,GACD;;;KAGC,GACD,OAAO,MAAM;;;AAIjB;;;;;;;;;;;;;CAaC,GACD,YAAY,eAAe,oBAAoB,MAAM;AAIrD,iBAAiB;GACd,KAAK,MAAM,GAAG;;AAGjB;;;CAGC,GACD,YAAY,uBACV,UAAU,MAAM,KACb,QAAQ;AAKb;;CAEC,GACD,OAAO,iBAAS,uBAAuB,QAAQ,mBAAmB,GAAG,IAAI;AAIzE;;CAEC,GACD,OAAO,iBAAS,eAAe,MAAM,MAAM,GAAG,OAAO;AAgCrD,OAAO,iBAAS,iBACd,OAAO,mBAAmB,GACzB;AAIH;;CAEC,GACD,iBAAiB;EACf;;;;;;;;;GASC,GACD,WAAW,aAAa,MAAM;EAE9B;;;GAGC,GACD,SAAS,QAAQ,wBAAwB,IAAI,GAAG,QAAQ,IAAI;;AAG9D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsEC,GACD,OAAO,iBAAe,KACpB,YAAY,6BAA6B,oBAAoB,EAC7D,cAAc,cAAc,EAC5B,iBACI,gBACE,QAAQ,wBAAwB,IAAI,GAAG,QAAQ,IAAI,EAAE,GAC1D,QAAQ,oBAAoB"}