niceeval 0.12.2-canary.31 → 0.13.0

package/dist/context/assert-first.d.cts

@@ -10,7 +10,7 @@ import { type SourceRegistry } from "../source-loc.cjs";
 import { SessionManager, type SessionDeps } from "./session.cjs";
 import type { ConcurrencySlot } from "./send-retry.cjs";
 import type { AnswerValue } from "../agents/types.cjs";
-import type { Agent, InputFile, InputRequest, InputRequestFilter, JsonValue, JudgeMaterial, ResolvedJudgeConfig, Sandbox, SandboxOperations, SandboxTransferOperations, StreamEvent, Usage } from "../types.cjs";
+import type { Agent, InputFile, InputRequest, InputRequestFilter, JsonValue, JudgeMaterial, PriceOverride, ResolvedJudgeConfig, Sandbox, SandboxOperations, SandboxTransferOperations, StreamEvent, Usage } from "../types.cjs";
 export interface AssertFirstLateResult {
     diff: PostRunWorkspaceDiffState;
     scripts: globalThis.Record<string, import("../types.cjs").ScriptResult>;
@@ -29,6 +29,8 @@ export interface AssertFirstContextDeps {
     readonly attempt?: import("../types.cjs").AgentContext["attempt"];
     readonly evalGroup?: import("../types.cjs").AgentContext["evalGroup"];
     readonly model?: string;
+    /** defineConfig({ pricing }) 的价目表,只供 maxCost 的 estimatedCostUSD 估算(estimateCost);与 observed usage.costUSD 无关。 */
+    readonly pricing?: globalThis.Record<string, PriceOverride>;
     readonly reasoningEffort?: string;
     readonly flags: globalThis.Record<string, JsonValue>;
     readonly experimentId?: string;
@@ -37,15 +39,12 @@ export interface AssertFirstContextDeps {
     readonly telemetry?: import("../types.cjs").Telemetry;
     readonly otel?: import("../o11y/otlp/turn-otel.cjs").AgentOtelChannel;
     readonly feedback?: import("../types.cjs").ScopedFeedback;
-    readonly fact?: (key: string, value: string | number | boolean) => void;
     readonly onSendActive?: (active: boolean) => void;
     readonly ledgerHooks?: import("./session.cjs").SessionDeps["ledgerHooks"];
     readonly timingNow?: import("./session.cjs").SessionDeps["timingNow"];
     readonly onTurn?: import("./session.cjs").SessionDeps["onTurn"];
     readonly concurrencySlot?: ConcurrencySlot;
     readonly experimentClassifier?: import("./session.cjs").SessionDeps["experimentClassifier"];
-    readonly retryRandom?: import("./session.cjs").SessionDeps["retryRandom"];
-    readonly retrySleep?: import("./session.cjs").SessionDeps["retrySleep"];
     /** Attempt-owned source snapshot registry; never inferred from an Effect fiber. */
     readonly sourceRegistry?: SourceRegistry;
     /** Shared ordering with Assertion runtime source facts and Session user events. */

package/dist/context/assert-first.d.mts

@@ -10,7 +10,7 @@ import { type SourceRegistry } from "../source-loc.mjs";
 import { SessionManager, type SessionDeps } from "./session.mjs";
 import type { ConcurrencySlot } from "./send-retry.mjs";
 import type { AnswerValue } from "../agents/types.mjs";
-import type { Agent, InputFile, InputRequest, InputRequestFilter, JsonValue, JudgeMaterial, ResolvedJudgeConfig, Sandbox, SandboxOperations, SandboxTransferOperations, StreamEvent, Usage } from "../types.mjs";
+import type { Agent, InputFile, InputRequest, InputRequestFilter, JsonValue, JudgeMaterial, PriceOverride, ResolvedJudgeConfig, Sandbox, SandboxOperations, SandboxTransferOperations, StreamEvent, Usage } from "../types.mjs";
 export interface AssertFirstLateResult {
     diff: PostRunWorkspaceDiffState;
     scripts: globalThis.Record<string, import("../types.mjs").ScriptResult>;
@@ -29,6 +29,8 @@ export interface AssertFirstContextDeps {
     readonly attempt?: import("../types.mjs").AgentContext["attempt"];
     readonly evalGroup?: import("../types.mjs").AgentContext["evalGroup"];
     readonly model?: string;
+    /** defineConfig({ pricing }) 的价目表,只供 maxCost 的 estimatedCostUSD 估算(estimateCost);与 observed usage.costUSD 无关。 */
+    readonly pricing?: globalThis.Record<string, PriceOverride>;
     readonly reasoningEffort?: string;
     readonly flags: globalThis.Record<string, JsonValue>;
     readonly experimentId?: string;
@@ -37,15 +39,12 @@ export interface AssertFirstContextDeps {
     readonly telemetry?: import("../types.mjs").Telemetry;
     readonly otel?: import("../o11y/otlp/turn-otel.mjs").AgentOtelChannel;
     readonly feedback?: import("../types.mjs").ScopedFeedback;
-    readonly fact?: (key: string, value: string | number | boolean) => void;
     readonly onSendActive?: (active: boolean) => void;
     readonly ledgerHooks?: import("./session.mjs").SessionDeps["ledgerHooks"];
     readonly timingNow?: import("./session.mjs").SessionDeps["timingNow"];
     readonly onTurn?: import("./session.mjs").SessionDeps["onTurn"];
     readonly concurrencySlot?: ConcurrencySlot;
     readonly experimentClassifier?: import("./session.mjs").SessionDeps["experimentClassifier"];
-    readonly retryRandom?: import("./session.mjs").SessionDeps["retryRandom"];
-    readonly retrySleep?: import("./session.mjs").SessionDeps["retrySleep"];
     /** Attempt-owned source snapshot registry; never inferred from an Effect fiber. */
     readonly sourceRegistry?: SourceRegistry;
     /** Shared ordering with Assertion runtime source facts and Session user events. */

package/dist/context/assert-first.d.ts

@@ -10,7 +10,7 @@ import { type SourceRegistry } from "../source-loc.js";
 import { SessionManager, type SessionDeps } from "./session.js";
 import type { ConcurrencySlot } from "./send-retry.js";
 import type { AnswerValue } from "../agents/types.js";
-import type { Agent, InputFile, InputRequest, InputRequestFilter, JsonValue, JudgeMaterial, ResolvedJudgeConfig, Sandbox, SandboxOperations, SandboxTransferOperations, StreamEvent, Usage } from "../types.js";
+import type { Agent, InputFile, InputRequest, InputRequestFilter, JsonValue, JudgeMaterial, PriceOverride, ResolvedJudgeConfig, Sandbox, SandboxOperations, SandboxTransferOperations, StreamEvent, Usage } from "../types.js";
 export interface AssertFirstLateResult {
     diff: PostRunWorkspaceDiffState;
     scripts: globalThis.Record<string, import("../types.js").ScriptResult>;
@@ -29,6 +29,8 @@ export interface AssertFirstContextDeps {
     readonly attempt?: import("../types.js").AgentContext["attempt"];
     readonly evalGroup?: import("../types.js").AgentContext["evalGroup"];
     readonly model?: string;
+    /** defineConfig({ pricing }) 的价目表,只供 maxCost 的 estimatedCostUSD 估算(estimateCost);与 observed usage.costUSD 无关。 */
+    readonly pricing?: globalThis.Record<string, PriceOverride>;
     readonly reasoningEffort?: string;
     readonly flags: globalThis.Record<string, JsonValue>;
     readonly experimentId?: string;
@@ -37,15 +39,12 @@ export interface AssertFirstContextDeps {
     readonly telemetry?: import("../types.js").Telemetry;
     readonly otel?: import("../o11y/otlp/turn-otel.js").AgentOtelChannel;
     readonly feedback?: import("../types.js").ScopedFeedback;
-    readonly fact?: (key: string, value: string | number | boolean) => void;
     readonly onSendActive?: (active: boolean) => void;
     readonly ledgerHooks?: import("./session.js").SessionDeps["ledgerHooks"];
     readonly timingNow?: import("./session.js").SessionDeps["timingNow"];
     readonly onTurn?: import("./session.js").SessionDeps["onTurn"];
     readonly concurrencySlot?: ConcurrencySlot;
     readonly experimentClassifier?: import("./session.js").SessionDeps["experimentClassifier"];
-    readonly retryRandom?: import("./session.js").SessionDeps["retryRandom"];
-    readonly retrySleep?: import("./session.js").SessionDeps["retrySleep"];
     /** Attempt-owned source snapshot registry; never inferred from an Effect fiber. */
     readonly sourceRegistry?: SourceRegistry;
     /** Shared ordering with Assertion runtime source facts and Session user events. */

package/dist/context/send-retry.cjs

@@ -28,14 +28,8 @@ function interruptWhenAborted(signal) {
         return effect_1.Effect.sync(() => signal.removeEventListener("abort", onAbort));
     });
 }
-function retrySleep(deps, delayMs) {
-    const delay = deps.sleep
-        ? effect_1.Effect.tryPromise({
-            try: (signal) => deps.sleep(delayMs, signal),
-            catch: (error) => error,
-        })
-        : effect_1.Effect.sleep(delayMs);
-    return effect_1.Effect.raceFirst(delay, interruptWhenAborted(deps.signal));
+function retrySleep(signal, delayMs) {
+    return effect_1.Effect.raceFirst(effect_1.Effect.sleep(delayMs), interruptWhenAborted(signal));
 }
 /**
  * A retried Attempt gives its global slot back while waiting. acquireUseRelease
@@ -52,26 +46,27 @@ function sleepWithReleasedSlot(slot, sleep) {
  * 保守归一为 acceptance=unknown，因此会得到稳定 agent-send-failed，而不会被误重发。
  */
 function sendWithTurnRetry(callOnce, deps) {
-    const random = deps.random ?? Math.random;
-    const retry = (sendAttempt) => effect_1.Effect.suspend(() => {
-        const startedAtMs = Date.now();
-        const monotonicStartedAt = performance.now();
-        return callOnce.pipe(effect_1.Effect.mapError(send_failures_ts_1.normalizeSendFailure), effect_1.Effect.catchAll((failure) => {
-            const durationMs = Math.max(0, performance.now() - monotonicStartedAt);
+    const retry = (sendAttempt) => effect_1.Effect.gen(function* () {
+        const startedAtMs = yield* effect_1.Clock.currentTimeMillis;
+        const monotonicStartedAt = yield* effect_1.Clock.currentTimeNanos;
+        return yield* callOnce.pipe(effect_1.Effect.mapError(send_failures_ts_1.normalizeSendFailure), effect_1.Effect.catchAll((failure) => effect_1.Effect.gen(function* () {
+            const monotonicEndedAt = yield* effect_1.Clock.currentTimeNanos;
+            const durationMs = Math.max(0, Number(monotonicEndedAt - monotonicStartedAt) / 1000000);
             const cls = (0, send_failures_ts_1.resolveSendFailureClass)(failure, {
                 experiment: deps.experimentClassifier,
                 adapter: deps.classifier,
             });
             if (!cls.retryable)
-                return effect_1.Effect.fail((0, failure_class_ts_1.attachFailureClass)(failure, cls));
+                return yield* effect_1.Effect.fail((0, failure_class_ts_1.attachFailureClass)(failure, cls));
             if (sendAttempt + 1 >= exports.SEND_MAX_ATTEMPTS) {
-                return effect_1.Effect.fail(finalizeExhausted(failure, cls, "send"));
+                return yield* effect_1.Effect.fail(finalizeExhausted(failure, cls, "send"));
             }
             if (deps.budget.remaining <= 0) {
-                return effect_1.Effect.fail(finalizeExhausted(failure, cls, "attempt"));
+                return yield* effect_1.Effect.fail(finalizeExhausted(failure, cls, "attempt"));
             }
-            const delayMs = BASE_DELAY_MS * 2 ** sendAttempt * random();
-            return effect_1.Effect.sync(() => {
+            const jitter = yield* effect_1.Random.next;
+            const delayMs = BASE_DELAY_MS * 2 ** sendAttempt * jitter;
+            yield* effect_1.Effect.sync(() => {
                 deps.onRetryAttempt?.({
                     sendAttempt,
                     startedAt: new Date(startedAtMs).toISOString(),
@@ -86,8 +81,10 @@ function sendWithTurnRetry(callOnce, deps) {
                     reason: cls.reason,
                     seconds: Math.round(delayMs / 1000),
                 }));
-            }).pipe(effect_1.Effect.zipRight(sleepWithReleasedSlot(deps.slot, retrySleep(deps, delayMs))), effect_1.Effect.zipRight(retry(sendAttempt + 1)));
-        }));
+            });
+            yield* sleepWithReleasedSlot(deps.slot, retrySleep(deps.signal, delayMs));
+            return yield* retry(sendAttempt + 1);
+        })));
     });
     return retry(0);
 }

package/dist/context/send-retry.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"send-retry.js","sourceRoot":"","sources":["send-retry.ts"],"names":[],"mappings":"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","sourcesContent":["// Agent send 的唯一重试执行体。正常返回的三种 Turn status 都原样交回；只有 reject 的\n// SendFailure 进入分类和重试（docs/feature/error-classification/architecture.md）。\nimport { Effect } from \"effect\";\nimport { t } from \"../i18n/index.ts\";\nimport { attachFailureClass, type AttemptFailureClassifier, type FailureClass } from \"../shared/failure-class.ts\";\nimport { makeSendFailure, normalizeSendFailure, resolveSendFailureClass, sendFailureText, type SendFailure, type SendFailureClassifier, } from \"./send-failures.ts\";\nimport { normalizeExternalCause } from \"../shared/external-cause.ts\";\nexport const SEND_MAX_ATTEMPTS = 4;\nexport const ATTEMPT_MAX_RETRIES = 8;\nconst BASE_DELAY_MS = 5000;\nexport interface AttemptRetryBudget {\n    remaining: number;\n}\nexport function createAttemptRetryBudget(): AttemptRetryBudget {\n    return { remaining: ATTEMPT_MAX_RETRIES };\n}\nexport interface ConcurrencySlot {\n    readonly release: Effect.Effect<void>;\n    readonly reacquire: Effect.Effect<void>;\n}\nexport interface RetriedSendFailure {\n    /** 同一逻辑 send 内从 0 开始的物理尝试序号。 */\n    sendAttempt: number;\n    startedAt: string;\n    durationMs: number;\n    failure: SendFailure;\n    classification: Extract<FailureClass, {\n        retryable: true;\n    }>;\n}\nexport interface SendRetryDeps {\n    classifier?: SendFailureClassifier;\n    experimentClassifier?: AttemptFailureClassifier;\n    /** 只回报被自动重试吸收的物理失败；终局失败由抛出值承载。 */\n    onRetryAttempt?: (attempt: RetriedSendFailure) => void;\n    budget: AttemptRetryBudget;\n    slot?: ConcurrencySlot;\n    reportRetry?: (message: string) => void;\n    signal: AbortSignal;\n    random?: () => number;\n    /** 仅供既有确定性测试注入；生产退避始终使用 Effect.sleep。 */\n    sleep?: (ms: number, signal: AbortSignal) => Promise<void>;\n}\n/** Adapt the Attempt-owned AbortSignal into interruption, without turning it into a send failure. */\nfunction interruptWhenAborted(signal: AbortSignal): Effect.Effect<never> {\n    return Effect.async<never>((resume) => {\n        if (signal.aborted) {\n            resume(Effect.interrupt);\n            return;\n        }\n        const onAbort = () => resume(Effect.interrupt);\n        signal.addEventListener(\"abort\", onAbort, { once: true });\n        return Effect.sync(() => signal.removeEventListener(\"abort\", onAbort));\n    });\n}\nfunction retrySleep(deps: SendRetryDeps, delayMs: number): Effect.Effect<void, unknown> {\n    const delay = deps.sleep\n        ? Effect.tryPromise({\n            try: (signal) => deps.sleep!(delayMs, signal),\n            catch: (error) => error,\n        })\n        : Effect.sleep(delayMs);\n    return Effect.raceFirst(delay, interruptWhenAborted(deps.signal));\n}\n/**\n * A retried Attempt gives its global slot back while waiting. acquireUseRelease\n * registers reacquire before entering the interruptible sleep, so interruption\n * cannot permanently shrink available capacity.\n */\nfunction sleepWithReleasedSlot(slot: ConcurrencySlot | undefined, sleep: Effect.Effect<void, unknown>): Effect.Effect<void, unknown> {\n    if (slot === undefined)\n        return sleep;\n    return Effect.acquireUseRelease(Effect.suspend(() => slot.release), () => sleep, () => Effect.suspend(() => slot.reacquire));\n}\n/**\n * 对同一个物理输入至多调用四次。adapter 未使用 makeSendFailure 而直接抛出的值在这里\n * 保守归一为 acceptance=unknown，因此会得到稳定 agent-send-failed，而不会被误重发。\n */\nexport function sendWithTurnRetry<T>(callOnce: Effect.Effect<T, unknown>, deps: SendRetryDeps): Effect.Effect<T, unknown> {\n    const random = deps.random ?? Math.random;\n    const retry = (sendAttempt: number): Effect.Effect<T, unknown> => Effect.suspend(() => {\n        const startedAtMs = Date.now();\n        const monotonicStartedAt = performance.now();\n        return callOnce.pipe(Effect.mapError(normalizeSendFailure), Effect.catchAll((failure) => {\n            const durationMs = Math.max(0, performance.now() - monotonicStartedAt);\n            const cls = resolveSendFailureClass(failure, {\n                experiment: deps.experimentClassifier,\n                adapter: deps.classifier,\n            });\n            if (!cls.retryable)\n                return Effect.fail(attachFailureClass(failure, cls));\n            if (sendAttempt + 1 >= SEND_MAX_ATTEMPTS) {\n                return Effect.fail(finalizeExhausted(failure, cls, \"send\"));\n            }\n            if (deps.budget.remaining <= 0) {\n                return Effect.fail(finalizeExhausted(failure, cls, \"attempt\"));\n            }\n            const delayMs = BASE_DELAY_MS * 2 ** sendAttempt * random();\n            return Effect.sync(() => {\n                deps.onRetryAttempt?.({\n                    sendAttempt,\n                    startedAt: new Date(startedAtMs).toISOString(),\n                    durationMs,\n                    failure,\n                    classification: cls,\n                });\n                deps.budget.remaining -= 1;\n                deps.reportRetry?.(t(\"session.turnRetry\", {\n                    attempt: sendAttempt + 2,\n                    maxAttempts: SEND_MAX_ATTEMPTS,\n                    reason: cls.reason,\n                    seconds: Math.round(delayMs / 1000),\n                }));\n            }).pipe(Effect.zipRight(sleepWithReleasedSlot(deps.slot, retrySleep(deps, delayMs))), Effect.zipRight(retry(sendAttempt + 1)));\n        }));\n    });\n    return retry(0);\n}\nfunction finalizeExhausted(failure: SendFailure, cls: Extract<FailureClass, {\n    retryable: true;\n}>, layer: \"send\" | \"attempt\"): SendFailure {\n    const suffix = layer === \"send\"\n        ? t(\"session.turnRetrySendExhausted\", { maxAttempts: SEND_MAX_ATTEMPTS, reason: cls.reason })\n        : t(\"session.turnRetryBudgetExhausted\", { maxRetries: ATTEMPT_MAX_RETRIES, reason: cls.reason });\n    const wrapped = makeSendFailure({\n        ...failure,\n        message: sendFailureText(failure) + suffix,\n        cause: normalizeExternalCause(failure),\n    });\n    return attachFailureClass(wrapped, cls);\n}\n"]}
+{"version":3,"file":"send-retry.js","sourceRoot":"","sources":["send-retry.ts"],"names":[],"mappings":"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","sourcesContent":["// Agent send 的唯一重试执行体。正常返回的三种 Turn status 都原样交回；只有 reject 的\n// SendFailure 进入分类和重试（docs/feature/error-classification/architecture.md）。\nimport { Clock, Effect, Random } from \"effect\";\nimport { t } from \"../i18n/index.ts\";\nimport { attachFailureClass, type AttemptFailureClassifier, type FailureClass } from \"../shared/failure-class.ts\";\nimport { makeSendFailure, normalizeSendFailure, resolveSendFailureClass, sendFailureText, type SendFailure, type SendFailureClassifier, } from \"./send-failures.ts\";\nimport { normalizeExternalCause } from \"../shared/external-cause.ts\";\nexport const SEND_MAX_ATTEMPTS = 4;\nexport const ATTEMPT_MAX_RETRIES = 8;\nconst BASE_DELAY_MS = 5000;\nexport interface AttemptRetryBudget {\n    remaining: number;\n}\nexport function createAttemptRetryBudget(): AttemptRetryBudget {\n    return { remaining: ATTEMPT_MAX_RETRIES };\n}\nexport interface ConcurrencySlot {\n    readonly release: Effect.Effect<void>;\n    readonly reacquire: Effect.Effect<void>;\n}\nexport interface RetriedSendFailure {\n    /** 同一逻辑 send 内从 0 开始的物理尝试序号。 */\n    sendAttempt: number;\n    startedAt: string;\n    durationMs: number;\n    failure: SendFailure;\n    classification: Extract<FailureClass, {\n        retryable: true;\n    }>;\n}\nexport interface SendRetryDeps {\n    classifier?: SendFailureClassifier;\n    experimentClassifier?: AttemptFailureClassifier;\n    /** 只回报被自动重试吸收的物理失败；终局失败由抛出值承载。 */\n    onRetryAttempt?: (attempt: RetriedSendFailure) => void;\n    budget: AttemptRetryBudget;\n    slot?: ConcurrencySlot;\n    reportRetry?: (message: string) => void;\n    signal: AbortSignal;\n}\n/** Adapt the Attempt-owned AbortSignal into interruption, without turning it into a send failure. */\nfunction interruptWhenAborted(signal: AbortSignal): Effect.Effect<never> {\n    return Effect.async<never>((resume) => {\n        if (signal.aborted) {\n            resume(Effect.interrupt);\n            return;\n        }\n        const onAbort = () => resume(Effect.interrupt);\n        signal.addEventListener(\"abort\", onAbort, { once: true });\n        return Effect.sync(() => signal.removeEventListener(\"abort\", onAbort));\n    });\n}\nfunction retrySleep(signal: AbortSignal, delayMs: number): Effect.Effect<void> {\n    return Effect.raceFirst(Effect.sleep(delayMs), interruptWhenAborted(signal));\n}\n/**\n * A retried Attempt gives its global slot back while waiting. acquireUseRelease\n * registers reacquire before entering the interruptible sleep, so interruption\n * cannot permanently shrink available capacity.\n */\nfunction sleepWithReleasedSlot(slot: ConcurrencySlot | undefined, sleep: Effect.Effect<void, unknown>): Effect.Effect<void, unknown> {\n    if (slot === undefined)\n        return sleep;\n    return Effect.acquireUseRelease(Effect.suspend(() => slot.release), () => sleep, () => Effect.suspend(() => slot.reacquire));\n}\n/**\n * 对同一个物理输入至多调用四次。adapter 未使用 makeSendFailure 而直接抛出的值在这里\n * 保守归一为 acceptance=unknown，因此会得到稳定 agent-send-failed，而不会被误重发。\n */\nexport function sendWithTurnRetry<T>(callOnce: Effect.Effect<T, unknown>, deps: SendRetryDeps): Effect.Effect<T, unknown> {\n    const retry = (sendAttempt: number): Effect.Effect<T, unknown> => Effect.gen(function* () {\n        const startedAtMs = yield* Clock.currentTimeMillis;\n        const monotonicStartedAt = yield* Clock.currentTimeNanos;\n        return yield* callOnce.pipe(Effect.mapError(normalizeSendFailure), Effect.catchAll((failure) => Effect.gen(function* () {\n            const monotonicEndedAt = yield* Clock.currentTimeNanos;\n            const durationMs = Math.max(0, Number(monotonicEndedAt - monotonicStartedAt) / 1000000);\n            const cls = resolveSendFailureClass(failure, {\n                experiment: deps.experimentClassifier,\n                adapter: deps.classifier,\n            });\n            if (!cls.retryable)\n                return yield* Effect.fail(attachFailureClass(failure, cls));\n            if (sendAttempt + 1 >= SEND_MAX_ATTEMPTS) {\n                return yield* Effect.fail(finalizeExhausted(failure, cls, \"send\"));\n            }\n            if (deps.budget.remaining <= 0) {\n                return yield* Effect.fail(finalizeExhausted(failure, cls, \"attempt\"));\n            }\n            const jitter = yield* Random.next;\n            const delayMs = BASE_DELAY_MS * 2 ** sendAttempt * jitter;\n            yield* Effect.sync(() => {\n                deps.onRetryAttempt?.({\n                    sendAttempt,\n                    startedAt: new Date(startedAtMs).toISOString(),\n                    durationMs,\n                    failure,\n                    classification: cls,\n                });\n                deps.budget.remaining -= 1;\n                deps.reportRetry?.(t(\"session.turnRetry\", {\n                    attempt: sendAttempt + 2,\n                    maxAttempts: SEND_MAX_ATTEMPTS,\n                    reason: cls.reason,\n                    seconds: Math.round(delayMs / 1000),\n                }));\n            });\n            yield* sleepWithReleasedSlot(deps.slot, retrySleep(deps.signal, delayMs));\n            return yield* retry(sendAttempt + 1);\n        })));\n    });\n    return retry(0);\n}\nfunction finalizeExhausted(failure: SendFailure, cls: Extract<FailureClass, {\n    retryable: true;\n}>, layer: \"send\" | \"attempt\"): SendFailure {\n    const suffix = layer === \"send\"\n        ? t(\"session.turnRetrySendExhausted\", { maxAttempts: SEND_MAX_ATTEMPTS, reason: cls.reason })\n        : t(\"session.turnRetryBudgetExhausted\", { maxRetries: ATTEMPT_MAX_RETRIES, reason: cls.reason });\n    const wrapped = makeSendFailure({\n        ...failure,\n        message: sendFailureText(failure) + suffix,\n        cause: normalizeExternalCause(failure),\n    });\n    return attachFailureClass(wrapped, cls);\n}\n"]}

package/dist/context/send-retry.d.cts

@@ -30,9 +30,6 @@ export interface SendRetryDeps {
     slot?: ConcurrencySlot;
     reportRetry?: (message: string) => void;
     signal: AbortSignal;
-    random?: () => number;
-    /** 仅供既有确定性测试注入；生产退避始终使用 Effect.sleep。 */
-    sleep?: (ms: number, signal: AbortSignal) => Promise<void>;
 }
 /**
  * 对同一个物理输入至多调用四次。adapter 未使用 makeSendFailure 而直接抛出的值在这里

package/dist/context/send-retry.d.mts

@@ -30,9 +30,6 @@ export interface SendRetryDeps {
     slot?: ConcurrencySlot;
     reportRetry?: (message: string) => void;
     signal: AbortSignal;
-    random?: () => number;
-    /** 仅供既有确定性测试注入；生产退避始终使用 Effect.sleep。 */
-    sleep?: (ms: number, signal: AbortSignal) => Promise<void>;
 }
 /**
  * 对同一个物理输入至多调用四次。adapter 未使用 makeSendFailure 而直接抛出的值在这里

package/dist/context/send-retry.d.ts

@@ -30,9 +30,6 @@ export interface SendRetryDeps {
     slot?: ConcurrencySlot;
     reportRetry?: (message: string) => void;
     signal: AbortSignal;
-    random?: () => number;
-    /** 仅供既有确定性测试注入；生产退避始终使用 Effect.sleep。 */
-    sleep?: (ms: number, signal: AbortSignal) => Promise<void>;
 }
 /**
  * 对同一个物理输入至多调用四次。adapter 未使用 makeSendFailure 而直接抛出的值在这里

package/dist/context/session.cjs

@@ -11,7 +11,6 @@ const source_loc_ts_1 = require("../source-loc.cjs");
 const index_ts_1 = require("../i18n/index.cjs");
 const send_retry_ts_1 = require("./send-retry.cjs");
 const send_failures_ts_1 = require("./send-failures.cjs");
-const facts_ts_1 = require("../shared/facts.cjs");
 const turn_label_ts_1 = require("../shared/turn-label.cjs");
 /**
  * 一条会话线的存取器实现。slot 值只按 factory 创建的 symbol 身份存取；
@@ -183,14 +182,6 @@ class SessionManager {
                     ? this.deps.feedback.progress(u)
                     : this.deps.log(u.current !== undefined && u.total !== undefined ? `${u.message} (${u.current}/${u.total})` : u.message),
                 diagnostic: (d) => this.deps.feedback?.diagnostic(d),
-                fact: (key, value) => {
-                    // 没有 runner 绑定的落点时(测试直调 SessionManager)仍要校验,只是无处落盘——
-                    // 与 progress 退回 log、diagnostic 静默丢弃是同一种「测试直调降级」纪律。
-                    if (this.deps.fact)
-                        this.deps.fact(key, value);
-                    else
-                        (0, facts_ts_1.recordFact)({}, key, value);
-                },
                 // log 是 progress({ message }) 的别名(见 AgentContext.log)。
                 log: this.deps.log,
             };
@@ -283,48 +274,60 @@ class SessionManager {
                 slot: this.deps.concurrencySlot,
                 reportRetry: (message) => ctx.progress({ message }),
                 signal: ctx.signal,
-                random: this.deps.retryRandom,
-                sleep: this.deps.retrySleep,
             };
-            const send = (0, send_retry_ts_1.sendWithTurnRetry)(sendOnce, retryDeps).pipe(effect_1.Effect.tapError((error) => effect_1.Effect.sync(() => {
-                // 最终失败的物理尝试没有进入 retryAttempts，但已经真实花掉的 usage 仍计入顶层聚合。
-                if ((0, send_failures_ts_1.isSendFailure)(error) && error.usage) {
-                    accumulateUsage(this.usage, error.usage);
-                    accumulateUsage(session.usage, error.usage);
+            const send = effect_1.Effect.uninterruptibleMask((restore) => effect_1.Effect.flatMap(effect_1.Effect.exit(restore((0, send_retry_ts_1.sendWithTurnRetry)(sendOnce, retryDeps))), (exit) => effect_1.Effect.flatMap(effect_1.Effect.sync(() => {
+                const durationMs = Math.max(0, timingNow() - startOffsetMs);
+                if (effect_1.Exit.isSuccess(exit)) {
+                    const { turn, traceId, attribution, window } = exit.value;
+                    const traceAttribution = attribution ?? "none";
+                    const terminalEvents = Object.freeze([userEvent, ...turn.events]);
+                    const timingActivity = this.deps.onTurn?.({
+                        sessionIndex: session.index,
+                        turnIndex,
+                        label: windowLabel,
+                        outcome: turn.status === "failed" ? "failed" : "completed",
+                        events: terminalEvents,
+                        startOffsetMs,
+                        durationMs,
+                        failed: turn.status === "failed" ? true : undefined,
+                        ...(loc === undefined ? {} : { loc }),
+                        ...(sourceOrder === undefined ? {} : { sourceOrder }),
+                        ...(traceAttribution !== "none" && traceId !== undefined ? { traceId } : {}),
+                        traceAttribution,
+                        otelWindow: window,
+                        usage: turn.usage,
+                    });
+                    if (window !== undefined) {
+                        this.otelTurnRecords.push({
+                            window,
+                            activity: timingActivity,
+                            hasSpans: traceAttribution !== "none",
+                        });
+                    }
+                    return;
+                }
+                const failure = effect_1.Option.getOrUndefined(effect_1.Cause.failureOption(exit.cause));
+                const sendFailure = failure !== undefined && (0, send_failures_ts_1.isSendFailure)(failure) ? failure : undefined;
+                if (sendFailure?.usage !== undefined) {
+                    accumulateUsage(this.usage, sendFailure.usage);
+                    accumulateUsage(session.usage, sendFailure.usage);
                 }
                 this.deps.onTurn?.({
                     sessionIndex: session.index,
                     turnIndex,
                     label: windowLabel,
+                    outcome: effect_1.Cause.isInterruptedOnly(exit.cause) ? "interrupted" : "failed",
+                    events: Object.freeze([userEvent, ...(sendFailure?.events ?? [])]),
                     startOffsetMs,
-                    durationMs: Math.max(0, timingNow() - startOffsetMs),
+                    durationMs,
                     failed: true,
                     ...(loc === undefined ? {} : { loc }),
                     ...(sourceOrder === undefined ? {} : { sourceOrder }),
-                    ...((0, send_failures_ts_1.isSendFailure)(error) && error.usage !== undefined ? { usage: error.usage } : {}),
-                });
-            })), effect_1.Effect.flatMap(({ turn, traceId, attribution, window }) => effect_1.Effect.sync(() => {
-                const timingActivity = this.deps.onTurn?.({
-                    sessionIndex: session.index,
-                    turnIndex,
-                    label: windowLabel,
-                    startOffsetMs,
-                    durationMs: Math.max(0, timingNow() - startOffsetMs),
-                    failed: turn.status === "failed" ? true : undefined,
-                    ...(loc === undefined ? {} : { loc }),
-                    ...(sourceOrder === undefined ? {} : { sourceOrder }),
-                    ...(attribution !== "none" && traceId !== undefined ? { traceId } : {}),
-                    traceAttribution: attribution,
-                    otelWindow: window,
-                    usage: turn.usage,
+                    ...(sendFailure?.usage !== undefined ? { usage: sendFailure.usage } : {}),
                 });
-                if (window !== undefined) {
-                    this.otelTurnRecords.push({
-                        window,
-                        activity: timingActivity,
-                        hasSpans: attribution !== "none",
-                    });
-                }
+            }), () => effect_1.Exit.isSuccess(exit)
+                ? effect_1.Effect.succeed(exit.value)
+                : effect_1.Effect.failCause(exit.cause)))).pipe(effect_1.Effect.flatMap(({ turn }) => effect_1.Effect.sync(() => {
                 this.allEvents.push(...turn.events);
                 session.events.push(...turn.events);
                 session.pendingInputRequests.push(...turn.events
@@ -497,7 +500,8 @@ function accumulateUsage(acc, add) {
         acc.reasoningTokens = (acc.reasoningTokens ?? 0) + add.reasoningTokens;
     if (add.requests !== undefined)
         acc.requests = (acc.requests ?? 0) + add.requests;
-    if (add.costUSD !== undefined)
-        acc.costUSD = (acc.costUSD ?? 0) + add.costUSD;
+    if (add.costUSD !== undefined) {
+        acc.costUSD = acc.costUSD === undefined ? add.costUSD : acc.costUSD + add.costUSD;
+    }
 }
 //# sourceMappingURL=session.cjs.map