anpord 0.1.6 → 0.1.7

package/dist/cli.cjs

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
-const require_client = require("./client-BdGNFO_D.cjs");
+const require_client = require("./client-Dy5oayYb.cjs");
 const require_config = require("./config.cjs");
 const require_errors = require("./errors-Boum34f5.cjs");
-const require_compiler = require("./compiler-7cyJPuPr.cjs");
+const require_compiler = require("./compiler-CE-EYxtc.cjs");
 let _effect_platform = require("@effect/platform");
 let effect = require("effect");
 let _effect_cli = require("@effect/cli");
 let _effect_platform_node = require("@effect/platform-node");
 //#region package.json
-var version$1 = "0.1.6";
+var version$1 = "0.1.7";
 //#endregion
 //#region ../template/src/extract.ts
 /**
@@ -172,28 +172,25 @@ const summaryOf = (run, trials, drawn) => drawn ? "" : gridOf(run, trials, 0).jo
 const FIRST_POLL = 2e3;
 const SLOWEST_POLL = 1e4;
 const WIDENING = 1.5;
-const running = ({ run }) => run === null || run.status === "running";
-const widen = (gap) => Math.min(Math.round(gap * WIDENING), SLOWEST_POLL);
+const running = (run) => run.status === "running";
 const waitForRun = (id, onProgress) => effect.Effect.gen(function* () {
 	const api = yield* require_client.AnpordApi;
 	const startedAt = yield* effect.Clock.currentTimeMillis;
-	const step = ({ gap, run }) => effect.Effect.gen(function* () {
-		if (run !== null) yield* effect.Effect.sleep(effect.Duration.millis(gap));
-		const next = yield* api.evals.get({ payload: { id } });
-		yield* onProgress(next, (yield* effect.Clock.currentTimeMillis) - startedAt);
-		return {
-			gap: widen(gap),
-			run: next
-		};
+	const gap = yield* effect.Ref.make(FIRST_POLL);
+	const poll = effect.Effect.gen(function* () {
+		const run = yield* api.evals.get({ payload: { id } });
+		yield* onProgress(run, (yield* effect.Clock.currentTimeMillis) - startedAt);
+		return run;
 	});
-	const { run } = yield* effect.Effect.iterate({
-		gap: FIRST_POLL,
-		run: null
-	}, {
-		body: step,
+	const waitThenPoll = effect.Effect.gen(function* () {
+		const millis = yield* effect.Ref.getAndUpdate(gap, (current) => Math.min(Math.round(current * WIDENING), SLOWEST_POLL));
+		yield* effect.Effect.sleep(effect.Duration.millis(millis));
+		return yield* poll;
+	});
+	return yield* effect.Effect.iterate(yield* poll, {
+		body: () => waitThenPoll,
 		while: running
 	});
-	return run ?? (yield* api.evals.get({ payload: { id } }));
 }).pipe(effect.Effect.withSpan("Cli.waitForRun", { attributes: { runId: id } }));
 //#endregion
 //#region src/cli/commands.ts

package/dist/cli.mjs

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
-import { a as ChannelName, o as PromptId, r as layer, s as VersionNumber, t as AnpordApi } from "./client-POb2FNW1.mjs";
+import { a as ChannelName, o as PromptId, r as layer, s as VersionNumber, t as AnpordApi } from "./client-D0Rd_z6s.mjs";
 import { clientOptionsConfig } from "./config.mjs";
 import { i as tokenMatcher, r as asAnpordError } from "./errors-C9bQUcA3.mjs";
-import { n as compileEvalEffect } from "./compiler-Dk5l0aof.mjs";
+import { n as compileEvalEffect } from "./compiler-eCuSUgYl.mjs";
 import { FileSystem } from "@effect/platform";
 import { Cause, Clock, Console, Data, Duration, Effect, Layer, Option, Ref } from "effect";
 import { Args, Command, Options } from "@effect/cli";
 import { NodeContext, NodeRuntime } from "@effect/platform-node";
 //#region package.json
-var version$1 = "0.1.6";
+var version$1 = "0.1.7";
 //#endregion
 //#region ../template/src/extract.ts
 /**
@@ -172,28 +172,25 @@ const summaryOf = (run, trials, drawn) => drawn ? "" : gridOf(run, trials, 0).jo
 const FIRST_POLL = 2e3;
 const SLOWEST_POLL = 1e4;
 const WIDENING = 1.5;
-const running = ({ run }) => run === null || run.status === "running";
-const widen = (gap) => Math.min(Math.round(gap * WIDENING), SLOWEST_POLL);
+const running = (run) => run.status === "running";
 const waitForRun = (id, onProgress) => Effect.gen(function* () {
 	const api = yield* AnpordApi;
 	const startedAt = yield* Clock.currentTimeMillis;
-	const step = ({ gap, run }) => Effect.gen(function* () {
-		if (run !== null) yield* Effect.sleep(Duration.millis(gap));
-		const next = yield* api.evals.get({ payload: { id } });
-		yield* onProgress(next, (yield* Clock.currentTimeMillis) - startedAt);
-		return {
-			gap: widen(gap),
-			run: next
-		};
+	const gap = yield* Ref.make(FIRST_POLL);
+	const poll = Effect.gen(function* () {
+		const run = yield* api.evals.get({ payload: { id } });
+		yield* onProgress(run, (yield* Clock.currentTimeMillis) - startedAt);
+		return run;
 	});
-	const { run } = yield* Effect.iterate({
-		gap: FIRST_POLL,
-		run: null
-	}, {
-		body: step,
+	const waitThenPoll = Effect.gen(function* () {
+		const millis = yield* Ref.getAndUpdate(gap, (current) => Math.min(Math.round(current * WIDENING), SLOWEST_POLL));
+		yield* Effect.sleep(Duration.millis(millis));
+		return yield* poll;
+	});
+	return yield* Effect.iterate(yield* poll, {
+		body: () => waitThenPoll,
 		while: running
 	});
-	return run ?? (yield* api.evals.get({ payload: { id } }));
 }).pipe(Effect.withSpan("Cli.waitForRun", { attributes: { runId: id } }));
 //#endregion
 //#region src/cli/commands.ts

package/dist/{client-POb2FNW1.mjs → client-D0Rd_z6s.mjs}

@@ -133,19 +133,19 @@ const EvalValidator = Schema.Struct({
 	description: "A bundled TypeScript validator and its exported function name.",
 	identifier: "EvalValidator"
 });
-const EvalWorkspaceSetup = Schema.Struct({
+const EvalPrepare = Schema.Struct({
 	name: Schema.String.pipe(Schema.minLength(1), Schema.maxLength(100)),
 	source: Schema.String.pipe(Schema.minLength(1), Schema.maxLength(1e6))
 }).annotations({
 	description: "A bundled TypeScript workspace setup and its exported function name.",
-	identifier: "EvalWorkspaceSetup"
+	identifier: "EvalPrepare"
 });
-const EvalSetupValue = Schema.Record({
+const EvalPrepareValue = Schema.Record({
 	key: Schema.String,
 	value: Schema.Unknown
 }).annotations({
 	description: "What a workspace setup returned, handed to the validator.",
-	identifier: "EvalSetupValue"
+	identifier: "EvalPrepareValue"
 });
 const EvalVariables = Schema.Record({
 	key: Schema.String,
@@ -156,7 +156,7 @@ const EvalVariables = Schema.Record({
 });
 const EvalCase = Schema.Struct({
 	name: Schema.String,
-	setup: Schema.NullOr(EvalWorkspaceSetup),
+	prepare: Schema.NullOr(EvalPrepare),
 	source: EvalSource,
 	variables: Schema.optionalWith(EvalVariables, { default: () => ({}) }),
 	validator: Schema.optionalWith(Schema.NullOr(EvalValidator), { default: () => null }),
@@ -230,7 +230,7 @@ const EvalVerifyStep = Schema.Struct({
 });
 const EvalTrial = Schema.Struct({
 	commands: Schema.Int,
-	setupValue: Schema.NullOr(EvalSetupValue),
+	prepared: Schema.NullOr(EvalPrepareValue),
 	exitCode: Schema.Int,
 	failedCommands: Schema.Int,
 	filesChanged: Schema.Array(Schema.String),
@@ -280,7 +280,7 @@ const EvalSetup = Schema.Struct({
 	prompt: Schema.String,
 	repoRef: Schema.NullOr(Schema.String),
 	repoUrl: Schema.NullOr(Schema.String),
-	setupName: Schema.NullOr(Schema.String),
+	prepareName: Schema.NullOr(Schema.String),
 	validatorName: Schema.NullOr(Schema.String),
 	verifyCommand: Schema.NullOr(Schema.String),
 	workspace: Schema.String
@@ -487,7 +487,7 @@ const ListEvalsRequest = Schema.Struct({
 });
 const PublicEvalCase = Schema.Struct({
 	name: Schema.String,
-	setup: Schema.optional(Schema.NullOr(EvalWorkspaceSetup)),
+	prepare: Schema.optional(Schema.NullOr(EvalPrepare)),
 	source: Schema.optional(EvalSource),
 	validator: Schema.optional(Schema.NullOr(EvalValidator)),
 	variables: Schema.optional(EvalVariables),

package/dist/{client-BdGNFO_D.cjs → client-Dy5oayYb.cjs}

@@ -133,19 +133,19 @@ const EvalValidator = effect.Schema.Struct({
 	description: "A bundled TypeScript validator and its exported function name.",
 	identifier: "EvalValidator"
 });
-const EvalWorkspaceSetup = effect.Schema.Struct({
+const EvalPrepare = effect.Schema.Struct({
 	name: effect.Schema.String.pipe(effect.Schema.minLength(1), effect.Schema.maxLength(100)),
 	source: effect.Schema.String.pipe(effect.Schema.minLength(1), effect.Schema.maxLength(1e6))
 }).annotations({
 	description: "A bundled TypeScript workspace setup and its exported function name.",
-	identifier: "EvalWorkspaceSetup"
+	identifier: "EvalPrepare"
 });
-const EvalSetupValue = effect.Schema.Record({
+const EvalPrepareValue = effect.Schema.Record({
 	key: effect.Schema.String,
 	value: effect.Schema.Unknown
 }).annotations({
 	description: "What a workspace setup returned, handed to the validator.",
-	identifier: "EvalSetupValue"
+	identifier: "EvalPrepareValue"
 });
 const EvalVariables = effect.Schema.Record({
 	key: effect.Schema.String,
@@ -156,7 +156,7 @@ const EvalVariables = effect.Schema.Record({
 });
 const EvalCase = effect.Schema.Struct({
 	name: effect.Schema.String,
-	setup: effect.Schema.NullOr(EvalWorkspaceSetup),
+	prepare: effect.Schema.NullOr(EvalPrepare),
 	source: EvalSource,
 	variables: effect.Schema.optionalWith(EvalVariables, { default: () => ({}) }),
 	validator: effect.Schema.optionalWith(effect.Schema.NullOr(EvalValidator), { default: () => null }),
@@ -230,7 +230,7 @@ const EvalVerifyStep = effect.Schema.Struct({
 });
 const EvalTrial = effect.Schema.Struct({
 	commands: effect.Schema.Int,
-	setupValue: effect.Schema.NullOr(EvalSetupValue),
+	prepared: effect.Schema.NullOr(EvalPrepareValue),
 	exitCode: effect.Schema.Int,
 	failedCommands: effect.Schema.Int,
 	filesChanged: effect.Schema.Array(effect.Schema.String),
@@ -280,7 +280,7 @@ const EvalSetup = effect.Schema.Struct({
 	prompt: effect.Schema.String,
 	repoRef: effect.Schema.NullOr(effect.Schema.String),
 	repoUrl: effect.Schema.NullOr(effect.Schema.String),
-	setupName: effect.Schema.NullOr(effect.Schema.String),
+	prepareName: effect.Schema.NullOr(effect.Schema.String),
 	validatorName: effect.Schema.NullOr(effect.Schema.String),
 	verifyCommand: effect.Schema.NullOr(effect.Schema.String),
 	workspace: effect.Schema.String
@@ -487,7 +487,7 @@ const ListEvalsRequest = effect.Schema.Struct({
 });
 const PublicEvalCase = effect.Schema.Struct({
 	name: effect.Schema.String,
-	setup: effect.Schema.optional(effect.Schema.NullOr(EvalWorkspaceSetup)),
+	prepare: effect.Schema.optional(effect.Schema.NullOr(EvalPrepare)),
 	source: effect.Schema.optional(EvalSource),
 	validator: effect.Schema.optional(effect.Schema.NullOr(EvalValidator)),
 	variables: effect.Schema.optional(EvalVariables),

package/dist/{compiler-7cyJPuPr.cjs → compiler-CE-EYxtc.cjs}

@@ -59,7 +59,7 @@ const context = {
   exec,
   exists: path => access(path).then(() => true, () => false),
   readText: path => readFile(path, "utf8"),
-  setup: JSON.parse(process.env.ANPORD_SETUP_VALUE ?? "{}"),
+  prepared: JSON.parse(process.env.ANPORD_PREPARE_VALUE ?? "{}"),
 };
 
 try {
@@ -73,7 +73,7 @@ try {
 }
 `;
 const validatorEntry = (module, name) => `import { ${name} as validate } from ${JSON.stringify(module)};\n${runtime}`;
-const setupRuntime = `
+const prepareRuntime = `
 import { access, readFile } from "node:fs/promises";
 import { spawn } from "node:child_process";
 
@@ -109,13 +109,13 @@ const context = {
 
 try {
   const value = await setup(context) ?? {};
-  console.log("ANPORD_SETUP_RESULT=" + JSON.stringify(value));
+  console.log("ANPORD_PREPARE_RESULT=" + JSON.stringify(value));
 } catch (error) {
   console.error(error instanceof Error ? error.stack : String(error));
   process.exitCode = 1;
 }
 `;
-const setupEntry = (module, name) => `import { ${name} as setup } from ${JSON.stringify(module)};\n${setupRuntime}`;
+const prepareEntry = (module, name) => `import { ${name} as setup } from ${JSON.stringify(module)};\n${prepareRuntime}`;
 const definitionEntry = (entry) => `import definition from ${JSON.stringify(entry)}; export default definition;`;
 //#endregion
 //#region src/evals/compiler.ts
@@ -217,10 +217,10 @@ const compileEvalEffect = (path) => effect.Effect.gen(function* () {
 			const hasValidator = typeof subject.validate === "function";
 			if (hasValidator === (typeof subject.verify === "string")) return yield* effect.Effect.fail(/* @__PURE__ */ new Error(`${subject.name} must have exactly one of validate or verify`));
 			const validator = hasValidator ? yield* bundled(entry, loaded.inputs, subject.validate?.name || subject.name, validatorEntry) : null;
-			const setup = typeof subject.setup === "function" ? yield* bundled(entry, loaded.inputs, subject.setup.name || `${subject.name}-setup`, setupEntry) : null;
+			const prepare = typeof subject.prepare === "function" ? yield* bundled(entry, loaded.inputs, subject.prepare.name || `${subject.name}-prepare`, prepareEntry) : null;
 			return {
 				name: subject.name,
-				setup,
+				prepare,
 				...sourceFor(definition, subject, fallback),
 				validator,
 				variables: subject.variables ?? {},

package/dist/{compiler-Dk5l0aof.mjs → compiler-eCuSUgYl.mjs}

@@ -60,7 +60,7 @@ const context = {
   exec,
   exists: path => access(path).then(() => true, () => false),
   readText: path => readFile(path, "utf8"),
-  setup: JSON.parse(process.env.ANPORD_SETUP_VALUE ?? "{}"),
+  prepared: JSON.parse(process.env.ANPORD_PREPARE_VALUE ?? "{}"),
 };
 
 try {
@@ -74,7 +74,7 @@ try {
 }
 `;
 const validatorEntry = (module, name) => `import { ${name} as validate } from ${JSON.stringify(module)};\n${runtime}`;
-const setupRuntime = `
+const prepareRuntime = `
 import { access, readFile } from "node:fs/promises";
 import { spawn } from "node:child_process";
 
@@ -110,13 +110,13 @@ const context = {
 
 try {
   const value = await setup(context) ?? {};
-  console.log("ANPORD_SETUP_RESULT=" + JSON.stringify(value));
+  console.log("ANPORD_PREPARE_RESULT=" + JSON.stringify(value));
 } catch (error) {
   console.error(error instanceof Error ? error.stack : String(error));
   process.exitCode = 1;
 }
 `;
-const setupEntry = (module, name) => `import { ${name} as setup } from ${JSON.stringify(module)};\n${setupRuntime}`;
+const prepareEntry = (module, name) => `import { ${name} as setup } from ${JSON.stringify(module)};\n${prepareRuntime}`;
 const definitionEntry = (entry) => `import definition from ${JSON.stringify(entry)}; export default definition;`;
 //#endregion
 //#region src/evals/compiler.ts
@@ -218,10 +218,10 @@ const compileEvalEffect = (path) => Effect.gen(function* () {
 			const hasValidator = typeof subject.validate === "function";
 			if (hasValidator === (typeof subject.verify === "string")) return yield* Effect.fail(/* @__PURE__ */ new Error(`${subject.name} must have exactly one of validate or verify`));
 			const validator = hasValidator ? yield* bundled(entry, loaded.inputs, subject.validate?.name || subject.name, validatorEntry) : null;
-			const setup = typeof subject.setup === "function" ? yield* bundled(entry, loaded.inputs, subject.setup.name || `${subject.name}-setup`, setupEntry) : null;
+			const prepare = typeof subject.prepare === "function" ? yield* bundled(entry, loaded.inputs, subject.prepare.name || `${subject.name}-prepare`, prepareEntry) : null;
 			return {
 				name: subject.name,
-				setup,
+				prepare,
 				...sourceFor(definition, subject, fallback),
 				validator,
 				variables: subject.variables ?? {},

package/dist/config.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_client = require("./client-BdGNFO_D.cjs");
+const require_client = require("./client-Dy5oayYb.cjs");
 let effect = require("effect");
 //#region src/client/config.ts
 const apiKeyConfig = effect.Config.redacted("ANPORD_API_KEY");

package/dist/config.mjs

@@ -1,4 +1,4 @@
-import { n as DEFAULT_BASE_URL } from "./client-POb2FNW1.mjs";
+import { n as DEFAULT_BASE_URL } from "./client-D0Rd_z6s.mjs";
 import { Config } from "effect";
 //#region src/client/config.ts
 const apiKeyConfig = Config.redacted("ANPORD_API_KEY");

package/dist/eval.cjs

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

package/dist/eval.d.cts

@@ -1,4 +1,4 @@
-import { t as PublicStartEvalRequest } from "./evals-api-BW7WsvHI.cjs";
+import { t as PublicStartEvalRequest } from "./evals-api-w3tR6UNj.cjs";
 import { Effect } from "effect";
 //#region src/evals/compiler.d.ts
 declare const compileEvalEffect: (path: string) => Effect.Effect<{
@@ -10,7 +10,7 @@ declare const compileEvalEffect: (path: string) => Effect.Effect<{
     variables: Readonly<Record<string, string>>;
     verify: string | null;
     name: string;
-    setup: {
+    prepare: {
       name: string;
       source: string;
     } | null;

package/dist/eval.d.mts

@@ -1,4 +1,4 @@
-import { t as PublicStartEvalRequest } from "./evals-api-D-86RBA4.mjs";
+import { t as PublicStartEvalRequest } from "./evals-api-7CuLOvxe.mjs";
 import { Effect } from "effect";
 //#region src/evals/compiler.d.ts
 declare const compileEvalEffect: (path: string) => Effect.Effect<{
@@ -10,7 +10,7 @@ declare const compileEvalEffect: (path: string) => Effect.Effect<{
     variables: Readonly<Record<string, string>>;
     verify: string | null;
     name: string;
-    setup: {
+    prepare: {
       name: string;
       source: string;
     } | null;

package/dist/eval.mjs

@@ -1,2 +1,2 @@
-import { n as compileEvalEffect, t as compileEval } from "./compiler-Dk5l0aof.mjs";
+import { n as compileEvalEffect, t as compileEval } from "./compiler-eCuSUgYl.mjs";
 export { compileEval, compileEvalEffect };

package/dist/{evals-api-D-86RBA4.d.mts → evals-api-7CuLOvxe.d.mts}

@@ -39,7 +39,7 @@ declare class Forbidden extends Forbidden_base {}
 declare const PublicStartEvalRequest: Schema.Struct<{
   cases: Schema.filter<Schema.Array$<Schema.refine<{
     readonly name: string;
-    readonly setup?: {
+    readonly prepare?: {
       readonly name: string;
       readonly source: string;
     } | null | undefined;
@@ -65,7 +65,7 @@ declare const PublicStartEvalRequest: Schema.Struct<{
     readonly verify: string | null;
   }, Schema.Struct<{
     name: typeof Schema.String;
-    setup: Schema.optional<Schema.NullOr<Schema.Struct<{
+    prepare: Schema.optional<Schema.NullOr<Schema.Struct<{
       name: Schema.filter<Schema.filter<typeof Schema.String>>;
       source: Schema.filter<Schema.filter<typeof Schema.String>>;
     }>>>;

package/dist/{evals-api-BW7WsvHI.d.cts → evals-api-w3tR6UNj.d.cts}

@@ -39,7 +39,7 @@ declare class Forbidden extends Forbidden_base {}
 declare const PublicStartEvalRequest: Schema.Struct<{
   cases: Schema.filter<Schema.Array$<Schema.refine<{
     readonly name: string;
-    readonly setup?: {
+    readonly prepare?: {
       readonly name: string;
       readonly source: string;
     } | null | undefined;
@@ -65,7 +65,7 @@ declare const PublicStartEvalRequest: Schema.Struct<{
     readonly verify: string | null;
   }, Schema.Struct<{
     name: typeof Schema.String;
-    setup: Schema.optional<Schema.NullOr<Schema.Struct<{
+    prepare: Schema.optional<Schema.NullOr<Schema.Struct<{
       name: Schema.filter<Schema.filter<typeof Schema.String>>;
       source: Schema.filter<Schema.filter<typeof Schema.String>>;
     }>>>;

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_client = require("./client-BdGNFO_D.cjs");
+const require_client = require("./client-Dy5oayYb.cjs");
 const require_errors = require("./errors-Boum34f5.cjs");
 const require_source = require("./source-DvlGawEw.cjs");
 let _effect_platform = require("@effect/platform");