anpord 0.1.8 → 0.1.9

package/README.md

@@ -72,8 +72,8 @@ suites concurrently. Pass files or directories to run a smaller set.
 
 ## Mock MCP servers
 
-Define local MCP dependencies once and Anpord gives every OpenCode trial a
-fresh stdio server:
+Define local MCP dependencies once and Anpord gives every built-in agent trial
+a fresh stdio server:
 
 ```ts
 import { z } from "zod";

package/dist/cli.cjs

@@ -2,14 +2,14 @@
 const require_client = require("./client-Ci0woWLW.cjs");
 const require_errors = require("./errors-Boum34f5.cjs");
 const require_config = require("./config.cjs");
-const require_compiler = require("./compiler-DpQHrrv6.cjs");
+const require_compiler = require("./compiler-SWgcA32c.cjs");
 let _effect_cli = require("@effect/cli");
 let _effect_platform = require("@effect/platform");
 let _effect_platform_node = require("@effect/platform-node");
 let effect = require("effect");
 let yaml = require("yaml");
 //#region package.json
-var version$1 = "0.1.8";
+var version$1 = "0.1.9";
 //#endregion
 //#region ../template/src/extract.ts
 /**

package/dist/cli.mjs

@@ -2,14 +2,14 @@
 import { a as ChannelName, o as PromptId, s as VersionNumber, t as AnpordApi } from "./client-5K3dMI5Q.mjs";
 import { i as tokenMatcher, r as asAnpordError } from "./errors-C9bQUcA3.mjs";
 import { ClientLayer, webUrlConfig } from "./config.mjs";
-import { n as compileEvalEffect } from "./compiler-Dj-0uzC6.mjs";
+import { n as compileEvalEffect } from "./compiler-iVu8fped.mjs";
 import { Args, Command, Options } from "@effect/cli";
 import { FetchHttpClient, FileSystem, HttpClient, HttpClientError, HttpClientRequest } from "@effect/platform";
 import { NodeContext, NodeRuntime } from "@effect/platform-node";
 import { Cause, Clock, Config, Console, Data, Duration, Effect, Layer, Option, ParseResult, Redacted, Ref, Schema } from "effect";
 import { parseDocument } from "yaml";
 //#region package.json
-var version$1 = "0.1.8";
+var version$1 = "0.1.9";
 //#endregion
 //#region ../template/src/extract.ts
 /**

package/dist/{compiler-DpQHrrv6.cjs → compiler-SWgcA32c.cjs}

@@ -10,6 +10,7 @@ let node_os = require("node:os");
 let node_child_process = require("node:child_process");
 let node_util = require("node:util");
 let node_zlib = require("node:zlib");
+let smol_toml = require("smol-toml");
 //#region src/evals/eval-bundle.ts
 const authoringExports = ["export const defineEval = value => value;", `export { empty, files, repo } from "./source";`].join("\n");
 const authoringDir = (0, node_path.dirname)((0, node_url.fileURLToPath)(require("url").pathToFileURL(__filename).href));
@@ -232,7 +233,15 @@ const loadDefinition = (entry) => bundle(definitionEntry(entry), entry).pipe(eff
 	force: true,
 	recursive: true
 })).pipe(effect.Effect.ignore))));
-const isDefinition = (value) => typeof value === "object" && value !== null && typeof value.name === "string" && typeof value.prompt === "string" && Array.isArray(value.cases) && Array.isArray(value.tasks) && Number.isInteger(value.trials);
+const DefinitionShape = effect.Schema.Struct({
+	cases: effect.Schema.Array(effect.Schema.Unknown),
+	name: effect.Schema.String,
+	prompt: effect.Schema.String,
+	tasks: effect.Schema.Array(effect.Schema.Unknown),
+	trials: effect.Schema.Int
+});
+const decodeShape = effect.Schema.decodeUnknownOption(DefinitionShape);
+const isDefinition = (value) => effect.Option.isSome(decodeShape(value));
 //#endregion
 //#region src/evals/local-repo.ts
 const run = (0, node_util.promisify)(node_child_process.execFile);
@@ -268,13 +277,111 @@ const localRepo = (cwd) => effect.Effect.gen(function* () {
 	});
 }).pipe(effect.Effect.withSpan("Eval.localRepo"));
 //#endregion
-//#region src/evals/mcp-profile.ts
-const CHUNK_SIZE = 9e4;
+//#region src/evals/mcp-harness.ts
 const Entries = effect.Schema.Record({
 	key: effect.Schema.String,
 	value: effect.Schema.Unknown
 });
-const OpenCodeConfig = effect.Schema.parseJson(effect.Schema.Struct({ mcp: effect.Schema.optional(Entries) }, Entries));
+const JsonConfig = effect.Schema.parseJson(effect.Schema.Struct({
+	mcp: effect.Schema.optional(Entries),
+	mcpServers: effect.Schema.optional(Entries)
+}, Entries));
+const CodexConfig = effect.Schema.Struct({ mcp_servers: effect.Schema.optional(Entries) }, Entries);
+const relativeEntry = ({ entry }) => entry.slice(10);
+const addServers = (current, harness, servers, configure) => {
+	const configured = { ...current };
+	for (const server of servers) {
+		if (configured[server.name] !== void 0) throw new Error(`${harness} MCP server ${server.name} is already configured`);
+		configured[server.name] = configure(server);
+	}
+	return configured;
+};
+const configureJson = (content, key, harness, servers, configure) => {
+	const config = effect.Schema.decodeUnknownSync(JsonConfig)(content);
+	return effect.Schema.encodeSync(JsonConfig)({
+		...config,
+		[key]: addServers(config[key], harness, servers, configure)
+	});
+};
+const jsonAdapter = (harness, path, configure, key = "mcpServers") => ({ apply: (profile, servers) => {
+	const files = { ...profile.files };
+	files[path] = configureJson(files[path] ?? "{}", key, harness, servers, configure);
+	return {
+		...profile,
+		files
+	};
+} });
+const stdio = (server) => ({
+	args: [relativeEntry(server)],
+	command: "node"
+});
+const trustedStdio = (server) => ({
+	...stdio(server),
+	trust: true
+});
+const claude = jsonAdapter("Claude", "workspace/.mcp.json", stdio);
+const cursor = jsonAdapter("Cursor", "workspace/.cursor/mcp.json", stdio);
+const gemini = jsonAdapter("Gemini", "workspace/.gemini/settings.json", trustedStdio);
+const qwen = jsonAdapter("Qwen", "workspace/.qwen/settings.json", trustedStdio);
+const piBase = jsonAdapter("Pi", "home/.pi/agent/mcp.json", stdio);
+const adapters = {
+	claude,
+	codex: { apply: (profile, servers) => {
+		const path = "home/.codex/config.toml";
+		const files = { ...profile.files };
+		const config = effect.Schema.decodeUnknownSync(CodexConfig)((0, smol_toml.parse)(files[path] ?? ""));
+		files[path] = (0, smol_toml.stringify)({
+			...config,
+			mcp_servers: addServers(config.mcp_servers, "Codex", servers, (server) => ({
+				...stdio(server),
+				default_tools_approval_mode: "approve",
+				required: true
+			}))
+		});
+		return {
+			...profile,
+			files
+		};
+	} },
+	command: null,
+	cursor,
+	fx: jsonAdapter("FX", "home/.fx/mcp.json", (server) => ({
+		command: ["node", relativeEntry(server)],
+		enabled: true,
+		required: true,
+		type: "local"
+	}), "mcp"),
+	gemini,
+	opencode: { apply: (profile, servers) => {
+		const env = { ...profile.env };
+		env.OPENCODE_CONFIG_CONTENT = configureJson(env.OPENCODE_CONFIG_CONTENT ?? "{}", "mcp", "OpenCode", servers, (server) => ({
+			command: ["node", relativeEntry(server)],
+			enabled: true,
+			type: "local"
+		}));
+		return {
+			...profile,
+			env
+		};
+	} },
+	pi: { apply: (profile, servers) => {
+		const configured = piBase.apply(profile, servers);
+		const install = "~/.local/bin/pi install npm:pi-mcp-adapter@2.32.1";
+		return {
+			...configured,
+			install: profile.install ? `${profile.install} && ${install}` : install
+		};
+	} },
+	qwen
+};
+const applyMcpHarness = (harness, profile, servers) => {
+	const adapter = adapters[harness];
+	if (adapter === null) throw new Error(`MCP mock servers are not supported by ${harness}`);
+	return effect.Schema.decodeUnknownSync(require_harness_profile.HarnessProfile)(adapter.apply(profile, servers));
+};
+//#endregion
+//#region src/evals/mcp-profile.ts
+const CHUNK_SIZE = 9e4;
 const packaged = (index, source) => {
 	const root = `workspace/.anpord/mcp/${index}`;
 	const archive = (0, node_zlib.gzipSync)(source).toString("base64");
@@ -297,7 +404,6 @@ const compileMcpServers = (entry, definitions) => effect.Effect.gen(function* ()
 });
 const withMcpServers = (task, servers) => {
 	if (servers.length === 0) return task;
-	if (task.harness !== "opencode") throw new Error(`MCP mock servers are not supported by the ${task.harness} harness`);
 	const profile = task.profile ?? {
 		files: {},
 		name: "anpord-mcp"
@@ -307,28 +413,12 @@ const withMcpServers = (task, servers) => {
 		if (files[path] !== void 0) throw new Error(`Profile file ${path} is reserved for MCP mocks`);
 		files[path] = source;
 	}
-	const env = { ...profile.env };
-	const config = effect.Schema.decodeUnknownSync(OpenCodeConfig)(env.OPENCODE_CONFIG_CONTENT ?? "{}");
-	const mcp = { ...config.mcp };
-	for (const item of servers) {
-		if (mcp[item.name] !== void 0) throw new Error(`OpenCode MCP server ${item.name} is already configured`);
-		mcp[item.name] = {
-			command: ["node", item.entry.slice(10)],
-			enabled: true,
-			type: "local"
-		};
-	}
-	env.OPENCODE_CONFIG_CONTENT = effect.Schema.encodeSync(OpenCodeConfig)({
-		...config,
-		mcp
-	});
 	return {
 		...task,
-		profile: effect.Schema.decodeUnknownSync(require_harness_profile.HarnessProfile)({
+		profile: applyMcpHarness(task.harness, {
 			...profile,
-			env,
 			files
-		})
+		}, servers)
 	};
 };
 //#endregion

package/dist/{compiler-Dj-0uzC6.mjs → compiler-iVu8fped.mjs}

@@ -10,6 +10,7 @@ import { tmpdir } from "node:os";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 import { gzipSync } from "node:zlib";
+import { parse, stringify } from "smol-toml";
 //#region src/evals/eval-bundle.ts
 const authoringExports = ["export const defineEval = value => value;", `export { empty, files, repo } from "./source";`].join("\n");
 const authoringDir = dirname(fileURLToPath(import.meta.url));
@@ -232,7 +233,15 @@ const loadDefinition = (entry) => bundle(definitionEntry(entry), entry).pipe(Eff
 	force: true,
 	recursive: true
 })).pipe(Effect.ignore))));
-const isDefinition = (value) => typeof value === "object" && value !== null && typeof value.name === "string" && typeof value.prompt === "string" && Array.isArray(value.cases) && Array.isArray(value.tasks) && Number.isInteger(value.trials);
+const DefinitionShape = Schema.Struct({
+	cases: Schema.Array(Schema.Unknown),
+	name: Schema.String,
+	prompt: Schema.String,
+	tasks: Schema.Array(Schema.Unknown),
+	trials: Schema.Int
+});
+const decodeShape = Schema.decodeUnknownOption(DefinitionShape);
+const isDefinition = (value) => Option.isSome(decodeShape(value));
 //#endregion
 //#region src/evals/local-repo.ts
 const run = promisify(execFile);
@@ -268,13 +277,111 @@ const localRepo = (cwd) => Effect.gen(function* () {
 	});
 }).pipe(Effect.withSpan("Eval.localRepo"));
 //#endregion
-//#region src/evals/mcp-profile.ts
-const CHUNK_SIZE = 9e4;
+//#region src/evals/mcp-harness.ts
 const Entries = Schema.Record({
 	key: Schema.String,
 	value: Schema.Unknown
 });
-const OpenCodeConfig = Schema.parseJson(Schema.Struct({ mcp: Schema.optional(Entries) }, Entries));
+const JsonConfig = Schema.parseJson(Schema.Struct({
+	mcp: Schema.optional(Entries),
+	mcpServers: Schema.optional(Entries)
+}, Entries));
+const CodexConfig = Schema.Struct({ mcp_servers: Schema.optional(Entries) }, Entries);
+const relativeEntry = ({ entry }) => entry.slice(10);
+const addServers = (current, harness, servers, configure) => {
+	const configured = { ...current };
+	for (const server of servers) {
+		if (configured[server.name] !== void 0) throw new Error(`${harness} MCP server ${server.name} is already configured`);
+		configured[server.name] = configure(server);
+	}
+	return configured;
+};
+const configureJson = (content, key, harness, servers, configure) => {
+	const config = Schema.decodeUnknownSync(JsonConfig)(content);
+	return Schema.encodeSync(JsonConfig)({
+		...config,
+		[key]: addServers(config[key], harness, servers, configure)
+	});
+};
+const jsonAdapter = (harness, path, configure, key = "mcpServers") => ({ apply: (profile, servers) => {
+	const files = { ...profile.files };
+	files[path] = configureJson(files[path] ?? "{}", key, harness, servers, configure);
+	return {
+		...profile,
+		files
+	};
+} });
+const stdio = (server) => ({
+	args: [relativeEntry(server)],
+	command: "node"
+});
+const trustedStdio = (server) => ({
+	...stdio(server),
+	trust: true
+});
+const claude = jsonAdapter("Claude", "workspace/.mcp.json", stdio);
+const cursor = jsonAdapter("Cursor", "workspace/.cursor/mcp.json", stdio);
+const gemini = jsonAdapter("Gemini", "workspace/.gemini/settings.json", trustedStdio);
+const qwen = jsonAdapter("Qwen", "workspace/.qwen/settings.json", trustedStdio);
+const piBase = jsonAdapter("Pi", "home/.pi/agent/mcp.json", stdio);
+const adapters = {
+	claude,
+	codex: { apply: (profile, servers) => {
+		const path = "home/.codex/config.toml";
+		const files = { ...profile.files };
+		const config = Schema.decodeUnknownSync(CodexConfig)(parse(files[path] ?? ""));
+		files[path] = stringify({
+			...config,
+			mcp_servers: addServers(config.mcp_servers, "Codex", servers, (server) => ({
+				...stdio(server),
+				default_tools_approval_mode: "approve",
+				required: true
+			}))
+		});
+		return {
+			...profile,
+			files
+		};
+	} },
+	command: null,
+	cursor,
+	fx: jsonAdapter("FX", "home/.fx/mcp.json", (server) => ({
+		command: ["node", relativeEntry(server)],
+		enabled: true,
+		required: true,
+		type: "local"
+	}), "mcp"),
+	gemini,
+	opencode: { apply: (profile, servers) => {
+		const env = { ...profile.env };
+		env.OPENCODE_CONFIG_CONTENT = configureJson(env.OPENCODE_CONFIG_CONTENT ?? "{}", "mcp", "OpenCode", servers, (server) => ({
+			command: ["node", relativeEntry(server)],
+			enabled: true,
+			type: "local"
+		}));
+		return {
+			...profile,
+			env
+		};
+	} },
+	pi: { apply: (profile, servers) => {
+		const configured = piBase.apply(profile, servers);
+		const install = "~/.local/bin/pi install npm:pi-mcp-adapter@2.32.1";
+		return {
+			...configured,
+			install: profile.install ? `${profile.install} && ${install}` : install
+		};
+	} },
+	qwen
+};
+const applyMcpHarness = (harness, profile, servers) => {
+	const adapter = adapters[harness];
+	if (adapter === null) throw new Error(`MCP mock servers are not supported by ${harness}`);
+	return Schema.decodeUnknownSync(HarnessProfile)(adapter.apply(profile, servers));
+};
+//#endregion
+//#region src/evals/mcp-profile.ts
+const CHUNK_SIZE = 9e4;
 const packaged = (index, source) => {
 	const root = `workspace/.anpord/mcp/${index}`;
 	const archive = gzipSync(source).toString("base64");
@@ -297,7 +404,6 @@ const compileMcpServers = (entry, definitions) => Effect.gen(function* () {
 });
 const withMcpServers = (task, servers) => {
 	if (servers.length === 0) return task;
-	if (task.harness !== "opencode") throw new Error(`MCP mock servers are not supported by the ${task.harness} harness`);
 	const profile = task.profile ?? {
 		files: {},
 		name: "anpord-mcp"
@@ -307,28 +413,12 @@ const withMcpServers = (task, servers) => {
 		if (files[path] !== void 0) throw new Error(`Profile file ${path} is reserved for MCP mocks`);
 		files[path] = source;
 	}
-	const env = { ...profile.env };
-	const config = Schema.decodeUnknownSync(OpenCodeConfig)(env.OPENCODE_CONFIG_CONTENT ?? "{}");
-	const mcp = { ...config.mcp };
-	for (const item of servers) {
-		if (mcp[item.name] !== void 0) throw new Error(`OpenCode MCP server ${item.name} is already configured`);
-		mcp[item.name] = {
-			command: ["node", item.entry.slice(10)],
-			enabled: true,
-			type: "local"
-		};
-	}
-	env.OPENCODE_CONFIG_CONTENT = Schema.encodeSync(OpenCodeConfig)({
-		...config,
-		mcp
-	});
 	return {
 		...task,
-		profile: Schema.decodeUnknownSync(HarnessProfile)({
+		profile: applyMcpHarness(task.harness, {
 			...profile,
-			env,
 			files
-		})
+		}, servers)
 	};
 };
 //#endregion

package/dist/eval.cjs

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_compiler = require("./compiler-DpQHrrv6.cjs");
+const require_compiler = require("./compiler-SWgcA32c.cjs");
 exports.compileEval = require_compiler.compileEval;
 exports.compileEvalEffect = require_compiler.compileEvalEffect;

package/dist/eval.d.cts

@@ -98,7 +98,7 @@ declare const compileEvalEffect: (path: string) => Effect.Effect<{
   name: string;
   prompt: string;
   tasks: {
-    readonly harness: "cursor" | "codex" | "opencode" | "pi" | "fx" | "claude" | "gemini" | "qwen" | "command";
+    readonly harness: "codex" | "opencode" | "pi" | "fx" | "claude" | "gemini" | "qwen" | "cursor" | "command";
     readonly model: string;
     readonly profile?: {
       readonly name: string;

package/dist/eval.d.mts

@@ -98,7 +98,7 @@ declare const compileEvalEffect: (path: string) => Effect.Effect<{
   name: string;
   prompt: string;
   tasks: {
-    readonly harness: "cursor" | "codex" | "opencode" | "pi" | "fx" | "claude" | "gemini" | "qwen" | "command";
+    readonly harness: "codex" | "opencode" | "pi" | "fx" | "claude" | "gemini" | "qwen" | "cursor" | "command";
     readonly model: string;
     readonly profile?: {
       readonly name: string;

package/dist/eval.mjs

@@ -1,2 +1,2 @@
-import { n as compileEvalEffect, t as compileEval } from "./compiler-Dj-0uzC6.mjs";
+import { n as compileEvalEffect, t as compileEval } from "./compiler-iVu8fped.mjs";
 export { compileEval, compileEvalEffect };

package/dist/mcp.cjs

@@ -8,12 +8,14 @@ const resource = (definition) => ({
 	...definition,
 	_tag: "Resource"
 });
+const SERVER_NAME = /^[A-Za-z0-9_-]{1,64}$/;
 const unique = (label, values) => {
 	const duplicate = values.find((value, index) => values.indexOf(value) !== index);
 	if (duplicate !== void 0) throw new Error(`Duplicate MCP ${label}: ${duplicate}`);
 };
 const server = (definition) => {
-	if (!(definition.name.trim() && definition.version.trim())) throw new Error("MCP servers need a name and version");
+	if (!SERVER_NAME.test(definition.name)) throw new Error("MCP server names need 1-64 letters, digits, underscores, or hyphens");
+	if (!definition.version.trim()) throw new Error("MCP servers need a name and version");
 	const resources = definition.resources ?? [];
 	const tools = definition.tools ?? [];
 	unique("tool", tools.map(({ name }) => name));

package/dist/mcp.mjs

@@ -7,12 +7,14 @@ const resource = (definition) => ({
 	...definition,
 	_tag: "Resource"
 });
+const SERVER_NAME = /^[A-Za-z0-9_-]{1,64}$/;
 const unique = (label, values) => {
 	const duplicate = values.find((value, index) => values.indexOf(value) !== index);
 	if (duplicate !== void 0) throw new Error(`Duplicate MCP ${label}: ${duplicate}`);
 };
 const server = (definition) => {
-	if (!(definition.name.trim() && definition.version.trim())) throw new Error("MCP servers need a name and version");
+	if (!SERVER_NAME.test(definition.name)) throw new Error("MCP server names need 1-64 letters, digits, underscores, or hyphens");
+	if (!definition.version.trim()) throw new Error("MCP servers need a name and version");
 	const resources = definition.resources ?? [];
 	const tools = definition.tools ?? [];
 	unique("tool", tools.map(({ name }) => name));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anpord",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "TypeScript SDK and CLI for coding agent evals and prompt management.",
   "license": "MIT",
   "type": "module",
@@ -105,6 +105,7 @@
     "@modelcontextprotocol/server": "^2.0.0",
     "effect": "^3.21.2",
     "esbuild": "^0.25.12",
+    "smol-toml": "^1.8.0",
     "yaml": "^2.9.0"
   },
   "bin": {