niceeval 0.17.1 → 0.19.0

package/dist/runner/attempt.d.cts

@@ -8,7 +8,7 @@ import { createSandboxCommandTarget } from "../sandbox/operations.cjs";
 import { SandboxSetupPrefixCacheAmbiguityError } from "../sandbox/backend.cjs";
 import type { SandboxPreparedSetupPrefixArtifact } from "../sandbox/layer.cjs";
 import { type SandboxActionData } from "../sandbox/action.cjs";
-import { type AttemptFailureClassifier, type FailureClass } from "../shared/failure-class.cjs";
+import { type FailureClass } from "../shared/failure-class.cjs";
 import type { Config, EvalResult, ResolvedJudgeConfig, JsonValue, Sandbox } from "../types.cjs";
 import type { AgentRun, Attempt, AttemptError, LifecyclePhase, RunOptions } from "./types.cjs";
 /**
@@ -23,7 +23,7 @@ export interface AttemptFailureDeclaration {
     readonly text: string;
 }
 /**
- * 一次终局失败的空间轴决议:走三道链(抛出点声明 → 实验分类器 → 缺省不可重试,见
+ * 一次终局失败的空间轴决议:读取抛出点声明，否则缺省不可重试(见
  * src/shared/failure-class.ts 的 `resolveAttemptFailureClass`),缺省档(`scope` 省略或
  * `"attempt"`)返回 undefined —— 死因只属于本次执行,没有闸可落。
  *
@@ -32,7 +32,7 @@ export interface AttemptFailureDeclaration {
  * attempt 内的失败(本文件的 `declareFailure`)与 attempt 开跑前的资源获取失败
  * (run.ts 的复用池租借)共用这一份决议,两处不各写一遍链。
  */
-export declare function attemptFailureDeclaration(classify: AttemptFailureClassifier | undefined, phase: LifecyclePhase, e: unknown): AttemptFailureDeclaration | undefined;
+export declare function attemptFailureDeclaration(phase: LifecyclePhase, e: unknown): AttemptFailureDeclaration | undefined;
 export interface RunAttemptEffectOptions<SealRequirements = never> {
     /** Retains staged attachment files through publication and releases them on every Invocation exit. */
     readonly attachmentScope: Scope.Scope;

package/dist/runner/attempt.d.mts

@@ -8,7 +8,7 @@ import { createSandboxCommandTarget } from "../sandbox/operations.mjs";
 import { SandboxSetupPrefixCacheAmbiguityError } from "../sandbox/backend.mjs";
 import type { SandboxPreparedSetupPrefixArtifact } from "../sandbox/layer.mjs";
 import { type SandboxActionData } from "../sandbox/action.mjs";
-import { type AttemptFailureClassifier, type FailureClass } from "../shared/failure-class.mjs";
+import { type FailureClass } from "../shared/failure-class.mjs";
 import type { Config, EvalResult, ResolvedJudgeConfig, JsonValue, Sandbox } from "../types.mjs";
 import type { AgentRun, Attempt, AttemptError, LifecyclePhase, RunOptions } from "./types.mjs";
 /**
@@ -23,7 +23,7 @@ export interface AttemptFailureDeclaration {
     readonly text: string;
 }
 /**
- * 一次终局失败的空间轴决议:走三道链(抛出点声明 → 实验分类器 → 缺省不可重试,见
+ * 一次终局失败的空间轴决议:读取抛出点声明，否则缺省不可重试(见
  * src/shared/failure-class.ts 的 `resolveAttemptFailureClass`),缺省档(`scope` 省略或
  * `"attempt"`)返回 undefined —— 死因只属于本次执行,没有闸可落。
  *
@@ -32,7 +32,7 @@ export interface AttemptFailureDeclaration {
  * attempt 内的失败(本文件的 `declareFailure`)与 attempt 开跑前的资源获取失败
  * (run.ts 的复用池租借)共用这一份决议,两处不各写一遍链。
  */
-export declare function attemptFailureDeclaration(classify: AttemptFailureClassifier | undefined, phase: LifecyclePhase, e: unknown): AttemptFailureDeclaration | undefined;
+export declare function attemptFailureDeclaration(phase: LifecyclePhase, e: unknown): AttemptFailureDeclaration | undefined;
 export interface RunAttemptEffectOptions<SealRequirements = never> {
     /** Retains staged attachment files through publication and releases them on every Invocation exit. */
     readonly attachmentScope: Scope.Scope;

package/dist/runner/attempt.d.ts

@@ -8,7 +8,7 @@ import { createSandboxCommandTarget } from "../sandbox/operations.js";
 import { SandboxSetupPrefixCacheAmbiguityError } from "../sandbox/backend.js";
 import type { SandboxPreparedSetupPrefixArtifact } from "../sandbox/layer.js";
 import { type SandboxActionData } from "../sandbox/action.js";
-import { type AttemptFailureClassifier, type FailureClass } from "../shared/failure-class.js";
+import { type FailureClass } from "../shared/failure-class.js";
 import type { Config, EvalResult, ResolvedJudgeConfig, JsonValue, Sandbox } from "../types.js";
 import type { AgentRun, Attempt, AttemptError, LifecyclePhase, RunOptions } from "./types.js";
 /**
@@ -23,7 +23,7 @@ export interface AttemptFailureDeclaration {
     readonly text: string;
 }
 /**
- * 一次终局失败的空间轴决议:走三道链(抛出点声明 → 实验分类器 → 缺省不可重试,见
+ * 一次终局失败的空间轴决议:读取抛出点声明，否则缺省不可重试(见
  * src/shared/failure-class.ts 的 `resolveAttemptFailureClass`),缺省档(`scope` 省略或
  * `"attempt"`)返回 undefined —— 死因只属于本次执行,没有闸可落。
  *
@@ -32,7 +32,7 @@ export interface AttemptFailureDeclaration {
  * attempt 内的失败(本文件的 `declareFailure`)与 attempt 开跑前的资源获取失败
  * (run.ts 的复用池租借)共用这一份决议,两处不各写一遍链。
  */
-export declare function attemptFailureDeclaration(classify: AttemptFailureClassifier | undefined, phase: LifecyclePhase, e: unknown): AttemptFailureDeclaration | undefined;
+export declare function attemptFailureDeclaration(phase: LifecyclePhase, e: unknown): AttemptFailureDeclaration | undefined;
 export interface RunAttemptEffectOptions<SealRequirements = never> {
     /** Retains staged attachment files through publication and releases them on every Invocation exit. */
     readonly attachmentScope: Scope.Scope;

package/dist/runner/command-plan.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupPrefixPlanOf = setupPrefixPlanOf;
+exports.beforeCachePlanOf = beforeCachePlanOf;
 exports.providerDeclaredSetupPrefixCapability = providerDeclaredSetupPrefixCapability;
 exports.assembleCommandPlan = assembleCommandPlan;
 const post_setup_ts_1 = require("../agents/post-setup.cjs");
@@ -11,7 +11,7 @@ const identity_ts_1 = require("../sandbox/identity.cjs");
 const sandbox_selection_ts_1 = require("./sandbox-selection.cjs");
 const sandbox_reuse_ts_1 = require("./sandbox-reuse.cjs");
 /** Deduplicate the selected command plan by the setup-prefix declaration identity. */
-function setupPrefixPlanOf(commandPlan) {
+function beforeCachePlanOf(commandPlan) {
     const nodes = new Map();
     const visit = (step, experimentId, evalId) => {
         const cache = step.cache;
@@ -334,7 +334,7 @@ function scheduledBeforeSteps(pair, capabilityOf) {
         ? providerDeclaredSetupPrefixReason(pair)
         : undefined;
     return Object.freeze(scheduled.map((entry) => {
-        const projected = stepForLinkedBefore(pair, entry);
+        const projected = { ...stepForLinkedBefore(pair, entry), ...(entry.pluginSource === undefined ? {} : { label: entry.pluginSource }) };
         const currentOpaque = containsOpaque(projected);
         const declaredState = entry.kind === "action" ? entry.data.plan.state : "opaque";
         if (entry.kind === "action" && !opaqueAncestor) {
@@ -427,10 +427,11 @@ function stepForAfter(entry) {
             phase: "sandbox.after",
             truth: "exact",
             owner,
+            ...(entry.pluginSource === undefined ? {} : { label: entry.pluginSource }),
             action: Object.freeze({ ...entry.data.plan, kind: "action" }),
         };
     }
-    return opaque("sandbox.after", "sandbox-cleanup-command", "cleanup command is registered for LIFO execution and is only known when it runs", { owner });
+    return opaque("sandbox.after", "sandbox-cleanup-command", "cleanup command is registered for LIFO execution and is only known when it runs", { owner, ...(entry.pluginSource === undefined ? {} : { label: entry.pluginSource }) });
 }
 function afterSteps(pair) {
     if (pair.plan._tag !== "Sandbox")
@@ -439,7 +440,7 @@ function afterSteps(pair) {
 }
 function declaredAgentHookStep(command, index, phase, owner, condition) {
     const declaration = (0, commands_ts_1.sandboxCommandPlanOf)(command);
-    const label = `${phase === "agent.post-setup" ? "postSetup" : "preTeardown"} #${index}`;
+    const label = `${phase === "agent.before" ? "before" : "after"} #${index}`;
     return declaration === undefined
         ? opaque(phase, "agent-lifecycle-hook-callback", "callback-backed Agent lifecycle hook; commands are only known when it runs", { owner, label, ...(condition === undefined ? {} : { condition }) })
         : stepFromDeclaration({ ...declaration, label }, phase, owner, condition);
@@ -449,19 +450,16 @@ function agentSetupSteps(pair, owner) {
     if (agent === undefined) {
         return [opaque("adapter.create", "adapter-create-callback", "Adapter context creation is a runtime callback and may acquire cleanup-bound resources", { owner })];
     }
-    if (agent.setup === undefined) {
-        return [knownNoCommand("agent.setup", "hook-omitted", "Agent has no setup callback", { owner })];
-    }
-    if (agent.kind !== "sandbox") {
-        return [opaque("agent.setup", "agent-setup-callback", "Agent setup callback may execute commands; its body is not inspected", { owner })];
+    if (agent.before === undefined) {
+        return [knownNoCommand("agent.setup", "hook-omitted", "Agent has no before callback", { owner })];
     }
     const hooks = (0, post_setup_ts_1.agentLifecycleHookCommandsOf)(agent);
     if (hooks === undefined) {
-        return [opaque("agent.setup", "agent-setup-callback", "Agent setup callback may execute commands; its body is not inspected", { owner })];
+        return [opaque("agent.setup", "agent-setup-callback", "Agent before callback may execute commands; its body is not inspected", { owner })];
     }
     return [
-        opaque("agent.setup", "adapter-setup-internals", "Adapter setup before declared postSetup hooks may execute commands", { owner, label: "adapter setup" }),
-        ...hooks.postSetup.map((hook, index) => declaredAgentHookStep(hook, index, "agent.post-setup", owner)),
+        opaque("agent.setup", "adapter-setup-internals", "Adapter setup before declared before hooks may execute commands", { owner, label: "adapter setup" }),
+        ...hooks.postSetup.map((hook, index) => declaredAgentHookStep(hook, index, "agent.before", owner)),
     ];
 }
 function agentTeardownSteps(pair, owner) {
@@ -469,28 +467,25 @@ function agentTeardownSteps(pair, owner) {
     if (agent === undefined) {
         return [opaque("adapter.cleanup", "adapter-cleanup-callbacks", "Adapter cleanup callbacks are registered dynamically and run in LIFO order", { owner })];
     }
-    if (agent.teardown === undefined) {
-        return [knownNoCommand("agent.teardown", "hook-omitted", "Agent has no teardown callback", { owner })];
-    }
-    if (agent.kind !== "sandbox") {
-        return [opaque("agent.teardown", "agent-teardown-callback", "Agent teardown callback may execute commands; its body is not inspected", { owner })];
+    if (agent.after === undefined) {
+        return [knownNoCommand("agent.teardown", "hook-omitted", "Agent has no after callback", { owner })];
     }
     const hooks = (0, post_setup_ts_1.agentLifecycleHookCommandsOf)(agent);
     if (hooks === undefined) {
-        return [opaque("agent.teardown", "agent-teardown-callback", "Agent teardown callback may execute commands; its body is not inspected", { owner })];
+        return [opaque("agent.teardown", "agent-teardown-callback", "Agent after callback may execute commands; its body is not inspected", { owner })];
     }
     const preTeardown = hooks.preTeardown
         .map((hook, index) => ({ hook, index }))
         .reverse()
-        .map(({ hook, index }) => declaredAgentHookStep(hook, index, "agent.pre-teardown", owner, AGENT_POST_SETUP_REACHED));
+        .map(({ hook, index }) => declaredAgentHookStep(hook, index, "agent.after", owner, AGENT_POST_SETUP_REACHED));
     const mayRegisterCleanup = [...hooks.postSetup, ...hooks.preTeardown]
         .some((hook) => (0, commands_ts_1.sandboxCommandPlanOf)(hook) === undefined);
     return [
         ...preTeardown,
         ...(mayRegisterCleanup
-            ? [opaque("agent.pre-teardown.cleanup", "registered-agent-cleanup-callbacks", "callback-backed Agent hooks may register LIFO cleanup commands", { owner, condition: AGENT_POST_SETUP_REACHED })]
+            ? [opaque("agent.after.cleanup", "registered-agent-cleanup-callbacks", "callback-backed Agent hooks may register LIFO cleanup commands", { owner, condition: AGENT_POST_SETUP_REACHED })]
             : []),
-        opaque("agent.teardown", "adapter-teardown-remainder", "Adapter teardown after declared preTeardown hooks may execute commands", { owner, label: "adapter teardown" }),
+        opaque("agent.teardown", "adapter-teardown-remainder", "Adapter teardown after declared after hooks may execute commands", { owner, label: "adapter teardown" }),
     ];
 }
 function sandboxLifecycleHooks(pair, phase, condition) {
@@ -507,17 +502,17 @@ function pluginLifecycleSteps(lifecycles, phase, owner, condition) {
     const ordered = phase === "teardown" ? [...lifecycles].reverse() : lifecycles;
     return ordered
         .filter((entry) => phase === "setup" ? entry.hasSetup : entry.hasTeardown)
-        .map((entry) => opaque(`plugin.lifecycle.${phase}`, `plugin-lifecycle-${phase}-callback`, `Plugin ${entry.name} (${entry.instanceKey}) ${phase} callback is opaque`, { owner, label: `${entry.name}:${entry.instanceKey}`, ...(condition === undefined ? {} : { condition }) }));
+        .flatMap((entry) => Array.from({ length: phase === "setup" ? entry.beforeCount : entry.afterCount }, (_, index) => opaque(`plugin.lifecycle.${phase}`, `plugin-lifecycle-${phase}-callback`, `Plugin ${entry.name} (${entry.key}) ${phase === "setup" ? "before" : "after"}[${phase === "setup" ? index : entry.afterCount - index - 1}] callback is opaque`, { owner, label: `${entry.name}:${entry.key}`, ...(condition === undefined ? {} : { condition }) })));
 }
 function sandboxPluginLifecycleSteps(lifecycles, phase, condition) {
     const ordered = phase === "teardown" ? [...lifecycles].reverse() : lifecycles;
     return ordered
         .filter((entry) => phase === "setup" ? entry.lifecycle.hasSetup : entry.lifecycle.hasTeardown)
-        .map(({ lifecycle, owner }) => opaque(`plugin.lifecycle.${phase}`, `plugin-lifecycle-${phase}-callback`, `Plugin ${lifecycle.name} (${lifecycle.instanceKey}) ${phase} callback is opaque`, {
+        .flatMap(({ lifecycle, owner }) => Array.from({ length: phase === "setup" ? lifecycle.beforeCount : lifecycle.afterCount }, (_, index) => opaque(`plugin.lifecycle.${phase}`, `plugin-lifecycle-${phase}-callback`, `Plugin ${lifecycle.name} (${lifecycle.key}) ${phase === "setup" ? "before" : "after"}[${phase === "setup" ? index : lifecycle.afterCount - index - 1}] callback is opaque`, {
         owner,
-        label: `${lifecycle.name}:${lifecycle.instanceKey}`,
+        label: `${lifecycle.name}:${lifecycle.key}`,
         ...(condition === undefined ? {} : { condition }),
-    }));
+    })));
 }
 function physicalBefore(pair, shared) {
     if (pair.plan._tag !== "Sandbox")