anpord 0.1.16 → 0.1.18

package/README.md

@@ -11,9 +11,9 @@ npm install anpord
 ## Define an eval
 
 ```ts
-import { defineEval, empty } from "anpord";
+import { suite, empty } from "anpord";
 
-export default defineEval({
+export default suite({
   name: "greeting",
   source: empty,
   prompt: "{{task}}",
@@ -93,7 +93,7 @@ const correctness = judge({
   name: "correctness",
   harness: "codex",
   model: "gpt-5.6-sol",
-  rubric: "The answer matches the reference without inventing facts.",
+  prompt: "The answer matches the reference without inventing facts.",
   expected: "Ada",
   choices: { correct: 1, incorrect: 0 },
 });

package/dist/api-context.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_api_mocks = require("./api-mocks-B3qngoqS.cjs");
+const require_api_mocks = require("./api-mocks-CuVw86Qw.cjs");
 let effect = require("effect");
 let node_fs_promises = require("node:fs/promises");
 //#region src/mock-api/context.ts

package/dist/api-context.d.cts

@@ -1,4 +1,4 @@
-import { t as ApiCall } from "./api-mocks-Bz3G00ve.cjs";
+import { t as ApiCall } from "./api-mocks-CAQFqUgY.cjs";
 //#region src/mock-api/context.d.ts
 declare const apiContext: {
   url: (name: string) => Promise<string>;

package/dist/api-context.d.mts

@@ -1,4 +1,4 @@
-import { t as ApiCall } from "./api-mocks-Bz3G00ve.mjs";
+import { t as ApiCall } from "./api-mocks-CAQFqUgY.mjs";
 //#region src/mock-api/context.d.ts
 declare const apiContext: {
   url: (name: string) => Promise<string>;

package/dist/api-context.mjs

@@ -1,4 +1,4 @@
-import { a as ApiCall, n as API_MANIFEST, o as ApiManifest, t as API_JOURNAL } from "./api-mocks-BfKw_hXc.mjs";
+import { a as ApiCall, n as API_MANIFEST, o as ApiManifest, t as API_JOURNAL } from "./api-mocks-wNUnpzJf.mjs";
 import { Schema } from "effect";
 import { readFile } from "node:fs/promises";
 //#region src/mock-api/context.ts

package/dist/{api-mocks-Bz3G00ve.d.cts → api-mocks-CAQFqUgY.d.cts}

@@ -57,11 +57,11 @@ declare const ApiCall_base: Schema.Class<ApiCall, {
     truncated: typeof Schema.Boolean;
   }>>>;
 }>, never, {
+  readonly api: string;
+} & {
   readonly startedAt: number;
 } & {
   readonly status: number;
-} & {
-  readonly api: string;
 } & {
   readonly path: string;
 } & {

package/dist/{api-mocks-Bz3G00ve.d.mts → api-mocks-CAQFqUgY.d.mts}

@@ -57,11 +57,11 @@ declare const ApiCall_base: Schema.Class<ApiCall, {
     truncated: typeof Schema.Boolean;
   }>>>;
 }>, never, {
+  readonly api: string;
+} & {
   readonly startedAt: number;
 } & {
   readonly status: number;
-} & {
-  readonly api: string;
 } & {
   readonly path: string;
 } & {

package/dist/{api-mocks-B3qngoqS.cjs → api-mocks-CuVw86Qw.cjs}

@@ -1,4 +1,4 @@
-const require_eval_validations = require("./eval-validations-CqMUt5ra.cjs");
+const require_eval_validations = require("./eval-validations-BdlPhudg.cjs");
 let effect = require("effect");
 //#region ../schema/src/domain/api-mocks.ts
 const API_PROGRAM = "workspace/.anpord/api/program.json";

package/dist/{api-mocks-BfKw_hXc.mjs → api-mocks-wNUnpzJf.mjs}

@@ -1,4 +1,4 @@
-import { r as ValidationValue } from "./eval-validations-Bmagd2y7.mjs";
+import { r as ValidationValue } from "./eval-validations-BvX9dkYh.mjs";
 import { Schema } from "effect";
 //#region ../schema/src/domain/api-mocks.ts
 const API_PROGRAM = "workspace/.anpord/api/program.json";

package/dist/api-runtime.cjs

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_runtime = require("./runtime-YVJP5P2r.cjs");
+const require_runtime = require("./runtime-CXcsGvwP.cjs");
 exports.runApiServers = require_runtime.runApiServers;
 exports.withApi = require_runtime.withApi;

package/dist/api-runtime.d.cts

@@ -1,4 +1,4 @@
-import { t as ApiCall } from "./api-mocks-Bz3G00ve.cjs";
+import { t as ApiCall } from "./api-mocks-CAQFqUgY.cjs";
 import { t as ApiDefinition } from "./define-NZvmQuIv.cjs";
 //#region src/mock-api/runtime.d.ts
 declare const withApi: <A>({ api, run }: {

package/dist/api-runtime.d.mts

@@ -1,4 +1,4 @@
-import { t as ApiCall } from "./api-mocks-Bz3G00ve.mjs";
+import { t as ApiCall } from "./api-mocks-CAQFqUgY.mjs";
 import { t as ApiDefinition } from "./define-NZvmQuIv.mjs";
 //#region src/mock-api/runtime.d.ts
 declare const withApi: <A>({ api, run }: {

package/dist/api-runtime.mjs

@@ -1,2 +1,2 @@
-import { n as withApi, t as runApiServers } from "./runtime-C0_JPkef.mjs";
+import { n as withApi, t as runApiServers } from "./runtime-DDUrsAI-.mjs";
 export { runApiServers, withApi };

package/dist/api.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_runtime = require("./runtime-YVJP5P2r.cjs");
+const require_runtime = require("./runtime-CXcsGvwP.cjs");
 exports.api = require_runtime.api;
 exports.endpoint = require_runtime.endpoint;
 exports.withApi = require_runtime.withApi;

package/dist/api.d.cts

@@ -1,4 +1,4 @@
-import { t as ApiCall } from "./api-mocks-Bz3G00ve.cjs";
+import { t as ApiCall } from "./api-mocks-CAQFqUgY.cjs";
 import { a as endpoint, i as api, n as ApiHandlerContext, r as EndpointDefinition, t as ApiDefinition } from "./define-NZvmQuIv.cjs";
 import { withApi } from "./api-runtime.cjs";
 export { type ApiCall, type ApiDefinition, type ApiHandlerContext, type EndpointDefinition, api, endpoint, withApi };

package/dist/api.d.mts

@@ -1,4 +1,4 @@
-import { t as ApiCall } from "./api-mocks-Bz3G00ve.mjs";
+import { t as ApiCall } from "./api-mocks-CAQFqUgY.mjs";
 import { a as endpoint, i as api, n as ApiHandlerContext, r as EndpointDefinition, t as ApiDefinition } from "./define-NZvmQuIv.mjs";
 import { withApi } from "./api-runtime.mjs";
 export { type ApiCall, type ApiDefinition, type ApiHandlerContext, type EndpointDefinition, api, endpoint, withApi };

package/dist/api.mjs

@@ -1,2 +1,2 @@
-import { i as endpoint, n as withApi, r as api } from "./runtime-C0_JPkef.mjs";
+import { i as endpoint, n as withApi, r as api } from "./runtime-DDUrsAI-.mjs";
 export { api, endpoint, withApi };

package/dist/bin.cjs

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
-const require_client = require("./client-CfYNoI3L.cjs");
-const require_evals_api = require("./evals-api-kOuyIqvB.cjs");
+const require_client = require("./client-DziJjMFh.cjs");
+const require_evals_api = require("./evals-api-CqhPZCr5.cjs");
 const require_errors = require("./errors-BX1wry8K.cjs");
 const require_config = require("./config.cjs");
-const require_compiler = require("./compiler-4FKsNxZ-.cjs");
+const require_compiler = require("./compiler-XtLHSR2J.cjs");
 let effect = require("effect");
 let _effect_platform = require("@effect/platform");
 let _effect_cli = require("@effect/cli");
 let _effect_platform_node = require("@effect/platform-node");
 let yaml = require("yaml");
 //#region package.json
-var version$1 = "0.1.16";
+var version$1 = "0.1.18";
 //#endregion
 //#region ../template/src/extract.ts
 /** Reads escapes too, so text the renderer leaves literal is never reported as
@@ -262,7 +262,7 @@ const caseBlock$1 = (subject) => [
 	"      },",
 	"    },"
 ].join("\n");
-const IMPORTS = "import { defineEval, files } from \"anpord\";";
+const IMPORTS = "import { suite, files } from \"anpord\";";
 const helpersBlock = [
 	"const has = (answer: string, needle: string) =>",
 	"  answer.toLowerCase().includes(needle.toLowerCase());",
@@ -285,7 +285,7 @@ const renderEvalSuite = (file) => {
 		"",
 		...structured ? [helpersBlock, ""] : [],
 		...prose ? [placeholderBlock, ""] : [],
-		"export default defineEval({",
+		"export default suite({",
 		`  name: ${quoted(slug$1(file.skill_name, "imported-suite"))},`,
 		"  prompt: \"{{task}}\",",
 		"  trials: 3,",
@@ -414,11 +414,11 @@ const caseBlock = (file) => [
 ].join("\n");
 const suiteName = (files) => files.length === 1 ? slug(files[0]?.subject.name ?? "", "imported-suite") : "imported-suite";
 const renderYamlSuite = (files) => `${[
-	"import { defineEval, files } from \"anpord\";",
+	"import { suite, files } from \"anpord\";",
 	"",
 	placeholderBlock,
 	"",
-	"export default defineEval({",
+	"export default suite({",
 	`  name: ${quoted(suiteName(files))},`,
 	"  prompt: \"{{task}}\",",
 	"  trials: 3,",

package/dist/bin.mjs

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
-import { a as ChannelName, o as PromptId, s as VersionNumber, t as AnpordApi } from "./client-YWKJd3f-.mjs";
-import { f as EvalTrigger, i as EvalRun } from "./evals-api-DDv4gXU1.mjs";
+import { a as ChannelName, o as PromptId, s as VersionNumber, t as AnpordApi } from "./client-DE3YNtWc.mjs";
+import { f as EvalTrigger, i as EvalRun } from "./evals-api-CsdU741J.mjs";
 import { i as tokenMatcher, r as asAnpordError } from "./errors-B0YknR5V.mjs";
 import { ClientLayer, webUrlConfig } from "./config.mjs";
-import { n as compileEvalEffect } from "./compiler-Dsltkkj5.mjs";
+import { r as compileEvalEffect } from "./compiler-WpuZwsp9.mjs";
 import { Cause, Clock, Config, Console, Data, Duration, Effect, Layer, Option, ParseResult, Redacted, Ref, Schema } from "effect";
 import { FetchHttpClient, FileSystem, HttpClient, HttpClientError, HttpClientRequest } from "@effect/platform";
 import { Args, Command, Options } from "@effect/cli";
 import { NodeContext, NodeRuntime } from "@effect/platform-node";
 import { parseDocument } from "yaml";
 //#region package.json
-var version$1 = "0.1.16";
+var version$1 = "0.1.18";
 //#endregion
 //#region ../template/src/extract.ts
 /** Reads escapes too, so text the renderer leaves literal is never reported as
@@ -262,7 +262,7 @@ const caseBlock$1 = (subject) => [
 	"      },",
 	"    },"
 ].join("\n");
-const IMPORTS = "import { defineEval, files } from \"anpord\";";
+const IMPORTS = "import { suite, files } from \"anpord\";";
 const helpersBlock = [
 	"const has = (answer: string, needle: string) =>",
 	"  answer.toLowerCase().includes(needle.toLowerCase());",
@@ -285,7 +285,7 @@ const renderEvalSuite = (file) => {
 		"",
 		...structured ? [helpersBlock, ""] : [],
 		...prose ? [placeholderBlock, ""] : [],
-		"export default defineEval({",
+		"export default suite({",
 		`  name: ${quoted(slug$1(file.skill_name, "imported-suite"))},`,
 		"  prompt: \"{{task}}\",",
 		"  trials: 3,",
@@ -414,11 +414,11 @@ const caseBlock = (file) => [
 ].join("\n");
 const suiteName = (files) => files.length === 1 ? slug(files[0]?.subject.name ?? "", "imported-suite") : "imported-suite";
 const renderYamlSuite = (files) => `${[
-	"import { defineEval, files } from \"anpord\";",
+	"import { suite, files } from \"anpord\";",
 	"",
 	placeholderBlock,
 	"",
-	"export default defineEval({",
+	"export default suite({",
 	`  name: ${quoted(suiteName(files))},`,
 	"  prompt: \"{{task}}\",",
 	"  trials: 3,",

package/dist/{calls-Drj_dZpu.d.cts → calls-6Z1EoEa-.d.cts}

@@ -9,4 +9,4 @@ declare const CliCallSchema: Schema.Struct<{
 }>;
 type CliCall = typeof CliCallSchema.Type;
 //#endregion
-export { CliCall as t };
+export { CliCallSchema as n, CliCall as t };

package/dist/{calls-Drj_dZpu.d.mts → calls-6Z1EoEa-.d.mts}

@@ -9,4 +9,4 @@ declare const CliCallSchema: Schema.Struct<{
 }>;
 type CliCall = typeof CliCallSchema.Type;
 //#endregion
-export { CliCall as t };
+export { CliCallSchema as n, CliCall as t };

package/dist/{calls-DYqBi5FA.d.cts → calls-DJGZJPrF.d.cts}

@@ -10,4 +10,4 @@ declare const McpCallSchema: Schema.Struct<{
 }>;
 type McpCall = typeof McpCallSchema.Type;
 //#endregion
-export { McpCall as t };
+export { McpCallSchema as n, McpCall as t };

package/dist/{calls-DYqBi5FA.d.mts → calls-DJGZJPrF.d.mts}

@@ -10,4 +10,4 @@ declare const McpCallSchema: Schema.Struct<{
 }>;
 type McpCall = typeof McpCallSchema.Type;
 //#endregion
-export { McpCall as t };
+export { McpCallSchema as n, McpCall as t };

package/dist/cli-runtime.cjs

@@ -1,26 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_define = require("./define-CHx2lRp5.cjs");
+const require_mock_journal = require("./mock-journal-Bnaozlx4.cjs");
 let effect = require("effect");
-let node_fs_promises = require("node:fs/promises");
-let node_path = require("node:path");
 //#region src/mock-cli/runtime.ts
 const JOURNAL = ".anpord/cli-calls.jsonl";
-const errorOf = (cause) => cause instanceof Error ? cause : new Error(String(cause));
-const decode = (schema, value) => effect.Effect.tryPromise({
-	catch: errorOf,
-	try: async () => {
-		const result = await schema["~standard"].validate(value);
-		if (result.issues !== void 0) throw new Error(result.issues.map(({ message }) => message).join("; "));
-		return result.value;
-	}
-});
-const append = (path, call) => effect.Effect.tryPromise({
-	catch: errorOf,
-	try: async () => {
-		await (0, node_fs_promises.mkdir)((0, node_path.dirname)(path), { recursive: true });
-		await (0, node_fs_promises.appendFile)(path, `${JSON.stringify(call)}\n`);
-	}
-});
 const commandHelp = (definition, item) => {
 	const options = Object.entries(item.options).map(([key, option]) => `  ${require_define.optionName(key, option)}${option.type === "string" ? " <value>" : ""}${option.description ? `  ${option.description}` : ""}`);
 	return [
@@ -88,15 +71,15 @@ const executeCli = (definition, args, journal = JOURNAL) => effect.Effect.gen(fu
 	let input = {};
 	return yield* effect.Effect.gen(function* () {
 		input = yield* effect.Effect.try({
-			catch: errorOf,
+			catch: require_mock_journal.errorOf,
 			try: () => parseOptions(item, rest)
 		});
-		const decoded = yield* decode(item.inputSchema, input);
+		const decoded = yield* require_mock_journal.decodeStandard(item.inputSchema, input);
 		const output = yield* effect.Effect.tryPromise({
-			catch: errorOf,
+			catch: require_mock_journal.errorOf,
 			try: () => Promise.resolve(item.handler(decoded, { signal: new AbortController().signal }))
-		}).pipe(effect.Effect.flatMap((value) => decode(item.outputSchema, value)));
-		yield* append(journal, {
+		}).pipe(effect.Effect.flatMap((value) => require_mock_journal.decodeStandard(item.outputSchema, value)));
+		yield* require_mock_journal.appendCall(journal, {
 			cli: definition.path,
 			command: item.path.join(" "),
 			input: decoded,
@@ -107,14 +90,14 @@ const executeCli = (definition, args, journal = JOURNAL) => effect.Effect.gen(fu
 			stderr: "",
 			stdout: `${JSON.stringify(output, null, 2) ?? String(output)}\n`
 		};
-	}).pipe(effect.Effect.catchAll((cause) => append(journal, {
+	}).pipe(effect.Effect.catchAll((cause) => require_mock_journal.appendCall(journal, {
 		cli: definition.path,
 		command: item.path.join(" "),
-		error: errorOf(cause).message,
+		error: require_mock_journal.errorOf(cause).message,
 		input
 	}).pipe(effect.Effect.as({
 		exitCode: 1,
-		stderr: `${errorOf(cause).message}\n`,
+		stderr: `${require_mock_journal.errorOf(cause).message}\n`,
 		stdout: ""
 	}))));
 }).pipe(effect.Effect.withSpan("CliMock.execute"), effect.Effect.runPromise);

package/dist/cli-runtime.mjs

@@ -1,25 +1,8 @@
 import { r as optionName } from "./define-CLhfETBd.mjs";
+import { n as decodeStandard, r as errorOf, t as appendCall } from "./mock-journal-rbsXfDRs.mjs";
 import { Effect } from "effect";
-import { appendFile, mkdir } from "node:fs/promises";
-import { dirname } from "node:path";
 //#region src/mock-cli/runtime.ts
 const JOURNAL = ".anpord/cli-calls.jsonl";
-const errorOf = (cause) => cause instanceof Error ? cause : new Error(String(cause));
-const decode = (schema, value) => Effect.tryPromise({
-	catch: errorOf,
-	try: async () => {
-		const result = await schema["~standard"].validate(value);
-		if (result.issues !== void 0) throw new Error(result.issues.map(({ message }) => message).join("; "));
-		return result.value;
-	}
-});
-const append = (path, call) => Effect.tryPromise({
-	catch: errorOf,
-	try: async () => {
-		await mkdir(dirname(path), { recursive: true });
-		await appendFile(path, `${JSON.stringify(call)}\n`);
-	}
-});
 const commandHelp = (definition, item) => {
 	const options = Object.entries(item.options).map(([key, option]) => `  ${optionName(key, option)}${option.type === "string" ? " <value>" : ""}${option.description ? `  ${option.description}` : ""}`);
 	return [
@@ -90,12 +73,12 @@ const executeCli = (definition, args, journal = JOURNAL) => Effect.gen(function*
 			catch: errorOf,
 			try: () => parseOptions(item, rest)
 		});
-		const decoded = yield* decode(item.inputSchema, input);
+		const decoded = yield* decodeStandard(item.inputSchema, input);
 		const output = yield* Effect.tryPromise({
 			catch: errorOf,
 			try: () => Promise.resolve(item.handler(decoded, { signal: new AbortController().signal }))
-		}).pipe(Effect.flatMap((value) => decode(item.outputSchema, value)));
-		yield* append(journal, {
+		}).pipe(Effect.flatMap((value) => decodeStandard(item.outputSchema, value)));
+		yield* appendCall(journal, {
 			cli: definition.path,
 			command: item.path.join(" "),
 			input: decoded,
@@ -106,7 +89,7 @@ const executeCli = (definition, args, journal = JOURNAL) => Effect.gen(function*
 			stderr: "",
 			stdout: `${JSON.stringify(output, null, 2) ?? String(output)}\n`
 		};
-	}).pipe(Effect.catchAll((cause) => append(journal, {
+	}).pipe(Effect.catchAll((cause) => appendCall(journal, {
 		cli: definition.path,
 		command: item.path.join(" "),
 		error: errorOf(cause).message,

package/dist/cli.d.cts

@@ -1,3 +1,3 @@
-import { t as CliCall } from "./calls-Drj_dZpu.cjs";
+import { t as CliCall } from "./calls-6Z1EoEa-.cjs";
 import { a as cli, i as CliOption, n as CliDefinition, o as command, r as CliHandlerContext, t as CliCommandDefinition } from "./define-BEiYXrC5.cjs";
 export { type CliCall, type CliCommandDefinition, type CliDefinition, type CliHandlerContext, type CliOption, cli, command };

package/dist/cli.d.mts

@@ -1,3 +1,3 @@
-import { t as CliCall } from "./calls-Drj_dZpu.mjs";
+import { t as CliCall } from "./calls-6Z1EoEa-.mjs";
 import { a as cli, i as CliOption, n as CliDefinition, o as command, r as CliHandlerContext, t as CliCommandDefinition } from "./define-BEiYXrC5.mjs";
 export { type CliCall, type CliCommandDefinition, type CliDefinition, type CliHandlerContext, type CliOption, cli, command };