@oisincoveney/pipeline 1.6.0 → 1.7.0

package/dist/config.js

@@ -1,5 +1,5 @@
 import { existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
+import { isAbsolute, join } from "node:path";
 import { parseDocument } from "yaml";
 import { z } from "zod";
 //#region src/config.ts
@@ -125,6 +125,21 @@ const mcpServerSchema = z.object({
 		path: ["bearer_token_env_var"]
 	});
 });
+const mcpServerRefSchema = z.object({
+	format: z.literal("mcp-json").default("mcp-json"),
+	id: z.string().min(1).optional(),
+	path: z.string().min(1)
+}).strict();
+const mcpServerDefinitionSchema = z.union([mcpServerSchema, z.object({ ref: mcpServerRefSchema }).strict()]);
+const mcpJsonServerSchema = z.object({
+	args: z.array(z.string()).optional(),
+	bearer_token_env_var: z.string().min(1).optional(),
+	command: z.string().min(1).optional(),
+	env: z.record(z.string(), z.string()).optional(),
+	headers: z.record(z.string(), z.string()).optional(),
+	url: z.string().min(1).optional()
+}).passthrough();
+const mcpJsonFileSchema = z.object({ mcpServers: strictRecord(mcpJsonServerSchema) }).passthrough();
 const instructionsSchema = z.object({
 	inline: z.string().min(1).optional(),
 	path: z.string().min(1).optional()
@@ -286,7 +301,7 @@ const runnersFileSchema = z.object({
 	version: z.literal(1)
 }).strict();
 const profilesFileSchema = z.object({
-	mcp_servers: strictRecord(mcpServerSchema).default({}),
+	mcp_servers: strictRecord(mcpServerDefinitionSchema).default({}),
 	profiles: strictRecord(profileSchema).default({}),
 	rules: strictRecord(pathRefSchema).default({}),
 	skills: strictRecord(pathRefSchema).default({}),
@@ -356,11 +371,12 @@ function parsePipelineConfigParts(sources, projectRoot, sourcePaths = {
 	const runners = parseYamlAs(sources.runners, sourcePaths.runners, runnersFileSchema);
 	const profiles = parseYamlAs(sources.profiles, sourcePaths.profiles, profilesFileSchema);
 	const pipeline = parseYamlAs(sources.pipeline, sourcePaths.pipeline, pipelineFileSchema);
+	const mcpServers = resolveMcpServerDefinitions(profiles.mcp_servers, projectRoot);
 	return validatePipelineConfig({
 		default_workflow: pipeline.default_workflow,
 		entrypoints: pipeline.entrypoints,
 		hooks: pipeline.hooks,
-		mcp_servers: profiles.mcp_servers,
+		mcp_servers: mcpServers,
 		orchestrator: pipeline.orchestrator,
 		profiles: profiles.profiles,
 		rules: profiles.rules,
@@ -387,6 +403,61 @@ function parseYamlAs(source, sourcePath, schema) {
 	})));
 	return parsed.data;
 }
+function resolveMcpServerDefinitions(registry, projectRoot) {
+	return Object.fromEntries(Object.entries(registry).map(([id, definition]) => [id, "ref" in definition ? resolveMcpServerRef(id, definition.ref, projectRoot) : definition]));
+}
+function resolveMcpServerRef(id, ref, projectRoot) {
+	if (!projectRoot) throw validationError([{
+		path: `mcp_servers.${id}.ref.path`,
+		message: "MCP server refs require a project root"
+	}]);
+	const filePath = isAbsolute(ref.path) ? ref.path : join(projectRoot, ref.path);
+	if (!existsSync(filePath)) throw validationError([{
+		path: `mcp_servers.${id}.ref.path`,
+		message: `referenced MCP config file '${ref.path}' does not exist`
+	}]);
+	const parsed = parseMcpJsonFile(id, ref, filePath);
+	const importedId = ref.id ?? id;
+	const imported = parsed.mcpServers[importedId];
+	if (!imported) throw validationError([{
+		path: `mcp_servers.${id}.ref.id`,
+		message: `MCP config '${ref.path}' does not declare server '${importedId}'`
+	}]);
+	const normalized = normalizeMcpJsonServer(imported);
+	const result = mcpServerSchema.safeParse(normalized);
+	if (!result.success) throw validationError(result.error.issues.map((issue) => ({
+		path: [`mcp_servers.${id}.ref`, ...issue.path].join("."),
+		message: issue.message
+	})));
+	return result.data;
+}
+function parseMcpJsonFile(id, ref, filePath) {
+	let raw;
+	try {
+		raw = JSON.parse(readFileSync(filePath, "utf8"));
+	} catch (err) {
+		throw new PipelineConfigError("PIPELINE_CONFIG_PARSE_ERROR", `Failed to parse MCP config ${ref.path}`, [{
+			path: `mcp_servers.${id}.ref.path`,
+			message: err instanceof Error ? err.message : String(err)
+		}]);
+	}
+	const parsed = mcpJsonFileSchema.safeParse(raw);
+	if (!parsed.success) throw validationError(parsed.error.issues.map((issue) => ({
+		path: [`mcp_servers.${id}.ref`, ...issue.path].join("."),
+		message: issue.message
+	})));
+	return parsed.data;
+}
+function normalizeMcpJsonServer(server) {
+	return {
+		...server.command ? { command: server.command } : {},
+		...server.args ? { args: server.args } : {},
+		...server.env ? { env: server.env } : {},
+		...server.url ? { url: server.url } : {},
+		...server.headers ? { headers: server.headers } : {},
+		...server.bearer_token_env_var ? { bearer_token_env_var: server.bearer_token_env_var } : {}
+	};
+}
 function validatePipelineConfig(config, projectRoot) {
 	const issues = [];
 	validateRegistryIds("runners", config.runners, issues);

package/docs/config-architecture.md

@@ -154,6 +154,26 @@ Exactly one of `command` or `url` is required. `args` and `env` apply only to
 command servers. `headers` and `bearer_token_env_var` apply only to URL
 servers.
 
+MCP registry entries can also reference an existing MCP JSON config file. This
+keeps the pipeline config decoupled from whatever generated the MCP config:
+
+```yaml
+mcp_servers:
+  serena:
+    ref:
+      path: .mcp.json
+      id: serena
+
+profiles:
+  inspector:
+    runner: codex
+    mcp_servers: [serena]
+```
+
+`ref.path` is resolved from the repository root and currently supports the
+standard `mcp-json` shape: `{ "mcpServers": { "<id>": { ... } } }`. If `id` is
+omitted, the registry key is used.
+
 JSON Schema outputs are hard contracts. The runtime validates normalized agent
 output before the node can pass. Schema outputs also get a bounded repair pass
 by default:

package/package.json

@@ -81,7 +81,7 @@
     "prepack": "bun run build:cli"
   },
   "type": "module",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "Config-driven multi-agent pipeline runner for repository work",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",