reeval 0.6.1 → 0.7.0

package/dist/{assemble-BB_dcnfh.js → assemble-Dd_mZYnu.js}

@@ -3,11 +3,12 @@ import { o as redactSecrets } from "./redact-DJ9JCShu.js";
 import { u as environmentSandbox } from "./environment-DiCljXMD.js";
 import { i as evalSlug, l as sha256, n as attemptKey, s as recordFileName, t as attemptId } from "./ids-Bp6ut7ZD.js";
 import { c as judgeModelName } from "./judge-7WjNdU9z.js";
-import { d as sandboxId, s as harnessId, u as profileJudge } from "./options-DVB78W8X.js";
+import { d as sandboxId, s as harnessId, u as profileJudge } from "./options-Ge_x32XE.js";
 import { r as patchForJudge, t as collapseDependencies } from "./patch-CGCVipPu.js";
-import { o as round3, t as liftInterval } from "./stats-BNAHlNMD.js";
+import { $ as liftInterval, et as round3 } from "./model-DyQbu7KF.js";
 import { n as promptTokens, r as sumUsage } from "./usage-DsYUqIUM.js";
-import { a as packageVersions, r as judgeVersion, t as FINGERPRINT_SCOPE } from "./state-evRYxV_q.js";
+import { a as packageVersions, r as judgeVersion, t as FINGERPRINT_SCOPE } from "./state-DEj_utaE.js";
+import { a as previousAttempt, n as isCompletedAttempt } from "./resume-BL4Yw7Ld.js";
 import { dirname, join, relative, resolve, sep } from "node:path";
 import { readFile, stat } from "node:fs/promises";
 //#region src/history/sources.ts
@@ -98,7 +99,7 @@ function capText(text, cap = OUTPUT_CAP) {
 const readRecord = async (path) => JSON.parse(await readFile(path, "utf8").catch(() => "null"));
 /** The engine and the worker's record can disagree, e.g. when a timeout fails the eval first. */
 function mergeOutcome(e, record) {
-	if (e.state === "skipped" && record && record.outcome !== "pass") return {
+	if (e.state === "skipped" && record) return {
 		outcome: record.outcome,
 		error: record.error
 	};
@@ -375,10 +376,92 @@ function cellOf(entry, cell, gate, harness) {
 	}
 	return found;
 }
+async function copyRef(ref, from, out) {
+	if (!from) return ref;
+	const bytes = await readFile(join(from, ...ref.path.split("/"))).catch(() => null);
+	if (!bytes) return ref;
+	return out.add(ref.path, Buffer.from(bytes).toString("utf8"));
+}
+/** A completed attempt from a previous assemble of this runId, kept on resume. */
+async function addPreviousAttempt(e, kept, seen, out, judge, previousArtifacts, sources) {
+	const cell = e.attempt?.cell ?? {
+		...UNKNOWN_CELL,
+		key: kept.cell,
+		harness: kept.cell.split("/")[0] ?? "unknown",
+		environment: kept.cell.split("/")[1] ?? "unknown",
+		sandbox: kept.cell.split("/")[2]?.replace(/#\d+$/, "") ?? "unknown"
+	};
+	if (!seen.sources.has(e.file) && sources) seen.sources.set(e.file, sources);
+	if (!seen.sources.has(e.file)) seen.sources.set(e.file, []);
+	const resolved = sources ?? seen.sources.get(e.file) ?? [];
+	const stub = {
+		id: e.id,
+		key: e.key,
+		file: e.file,
+		group: e.group,
+		name: e.name,
+		attempt: e.attempt,
+		state: "skipped",
+		durationMs: kept.durationMs,
+		errors: [],
+		formattedErrors: [],
+		meta: void 0
+	};
+	seen.add(null, cell, stub);
+	const entry = seen.entry(stub, resolved);
+	const cellRecord = cellOf(entry, cell, e.attempt?.gate ?? "all", e.attempt?.harness);
+	const files = {};
+	for (const [name, ref] of Object.entries(kept.files)) {
+		if (!ref) continue;
+		if (Array.isArray(ref)) {
+			const copied = [];
+			for (const art of ref) {
+				if (!previousArtifacts) {
+					copied.push(art);
+					continue;
+				}
+				const bytes = await readFile(join(previousArtifacts, ...art.path.split("/"))).catch(() => null);
+				copied.push(bytes ? out.addBinary(art.path, bytes) : art);
+			}
+			if (copied.length) files[name] = copied;
+			continue;
+		}
+		files[name] = await copyRef(ref, previousArtifacts, out);
+	}
+	const checks = [];
+	for (const c of kept.checks) checks.push({
+		...c,
+		log: c.log ? await copyRef(c.log, previousArtifacts, out) : c.log
+	});
+	entry.attempts.push({
+		...kept,
+		seq: null,
+		files,
+		checks
+	});
+	if (!cellRecord.fingerprint && kept.outcome !== "skipped") {
+		const parts = {
+			sources: sha256(JSON.stringify(resolved)),
+			harness: sha256(JSON.stringify(e.attempt ? withoutCaps(e.attempt.harness) : null)),
+			environment: cellRecord.environmentDigest,
+			image: kept.imageId,
+			agentCli: null,
+			judge,
+			context: sha256(JSON.stringify(kept.context))
+		};
+		cellRecord.fingerprintParts = parts;
+		cellRecord.fingerprint = fingerprintOf(parts);
+	}
+}
 /** Reads one attempt's worker record, files its artifacts and adds it to its eval and cell. */
-async function addAttempt(e, ctx, seen, out, judge) {
+async function addAttempt(e, ctx, seen, out, judge, previous, previousArtifacts) {
 	const cell = e.attempt?.cell ?? UNKNOWN_CELL;
 	const n = e.attempt?.n ?? 1;
+	const kept = previousAttempt(previous, e.key);
+	if (e.state === "skipped" && kept && isCompletedAttempt(kept.outcome, kept.error)) {
+		await addPreviousAttempt(e, kept, seen, out, judge, previousArtifacts);
+		return;
+	}
 	const record = await readRecord(join(ctx.stagingDir, "evals", recordFileName(e.key)));
 	const { outcome, error } = mergeOutcome(e, record);
 	if (!seen.sources.has(e.file)) seen.sources.set(e.file, await traceSources(ctx.config.root, e.file));
@@ -649,7 +732,26 @@ async function assembleRun(input) {
 		threshold: runJudge.threshold,
 		version: judgeVersion(input.es, packageVersions(input.enginePackages), judgeModel ?? "")
 	}));
-	for (const e of engine.evals) await addAttempt(e, ctx, seen, out, judge);
+	for (const e of engine.evals) await addAttempt(e, ctx, seen, out, judge, input.previous, input.previousArtifacts);
+	if (input.previous) {
+		const have = new Set([...seen.byEval.values()].flatMap((entry) => entry.attempts.map((a) => a.key)));
+		for (const entry of input.previous.evals) for (const a of entry.attempts) {
+			if (have.has(a.key) || !isCompletedAttempt(a.outcome, a.error)) continue;
+			await addPreviousAttempt({
+				id: entry.id,
+				key: a.key,
+				file: entry.file,
+				group: entry.group,
+				name: entry.name,
+				attempt: void 0,
+				state: "skipped",
+				durationMs: a.durationMs,
+				errors: [],
+				formattedErrors: [],
+				meta: void 0
+			}, a, seen, out, judge, input.previousArtifacts, entry.sources);
+		}
+	}
 	const evals = [...seen.byEval.values()];
 	rollUp(evals);
 	sequence(evals);
@@ -727,4 +829,4 @@ async function assembleRun(input) {
 //#endregion
 export { fingerprintOf as a, transcriptLines as c, cellOutcome as i, worstOutcome as l, assembleRun as n, judgementKey as o, capText as r, mergeOutcome as s, OUTPUT_CAP as t };
 
-//# sourceMappingURL=assemble-BB_dcnfh.js.map
+//# sourceMappingURL=assemble-Dd_mZYnu.js.map

package/dist/assemble-Dd_mZYnu.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"assemble-Dd_mZYnu.js","names":[],"sources":["../src/history/sources.ts","../src/history/assemble.ts"],"mappings":"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"}

package/dist/bridge/index.mjs

@@ -1,4 +1,4 @@
-// Modified by Invertase with patches/@ai-sdk__harness-claude-code@1.0.142.patch; see THIRD_PARTY_NOTICES.md.
+// Modified by Invertase with patches/@ai-sdk__harness-claude-code@1.0.152.patch; see THIRD_PARTY_NOTICES.md.
 import { appendFile, mkdir, writeFile } from "node:fs/promises";
 import { existsSync, readFileSync } from "node:fs";
 import { randomUUID } from "node:crypto";
@@ -6,6 +6,7 @@ import { argv, env, pid, stdout } from "node:process";
 import { WebSocketServer } from "ws";
 import * as claudeAgentSdk from "@anthropic-ai/claude-agent-sdk";
 import * as mcpServerModule from "@modelcontextprotocol/sdk/server/mcp.js";
+import { isDeepStrictEqual } from "node:util";
 import { z } from "zod/v4";
 //#region ../harness/dist/bridge/index.js
 const DEBUG_LEVEL_WEIGHT = {
@@ -633,7 +634,8 @@ function createClaudeStreamEventState() {
 		pendingStepUsage: void 0,
 		pendingResponseUsage: void 0,
 		stepOpen: false,
-		mcpToolUseIds: /* @__PURE__ */ new Set(),
+		mcpToolCalls: /* @__PURE__ */ new Map(),
+		mcpHandlerCalls: /* @__PURE__ */ new Map(),
 		externalMcpToolUseIds: /* @__PURE__ */ new Set(),
 		structuredOutputToolUseIds: /* @__PURE__ */ new Set(),
 		observedTerminalError: void 0
@@ -693,7 +695,7 @@ function createEmitStreamEvent({ state, emit, emitWarning, emitTerminalError, on
 			});
 			return;
 		}
-		if (type === "tool_progress" || type === "system" && msg.subtype != null && RAW_TASK_MESSAGE_SUBTYPES.has(msg.subtype)) {
+		if (type === "tool_progress" || type === "rate_limit_event" || type === "system" && msg.subtype != null && RAW_TASK_MESSAGE_SUBTYPES.has(msg.subtype)) {
 			emit({
 				type: "raw",
 				rawValue: msg
@@ -730,7 +732,10 @@ function createEmitStreamEvent({ state, emit, emitWarning, emitTerminalError, on
 				}
 				if (block.name.startsWith(HOST_TOOL_PREFIX)) {
 					state.pendingStepToolUseIds.add(block.id);
-					state.mcpToolUseIds.add(block.id);
+					state.mcpToolCalls.set(block.id, {
+						toolName: block.name.slice(20),
+						input: block.input ?? {}
+					});
 					opensStep = true;
 					continue;
 				}
@@ -768,9 +773,37 @@ function createEmitStreamEvent({ state, emit, emitWarning, emitTerminalError, on
 			const toolUseResult = messageContent.filter((block) => block.type === "tool_result").length === 1 ? msg.tool_use_result : void 0;
 			for (const block of messageContent) if (block.type === "tool_result" && typeof block.tool_use_id === "string") {
 				if (state.structuredOutputToolUseIds.delete(block.tool_use_id)) continue;
-				if (state.mcpToolUseIds.has(block.tool_use_id)) {
-					state.mcpToolUseIds.delete(block.tool_use_id);
+				const mcpToolCall = state.mcpToolCalls.get(block.tool_use_id);
+				if (mcpToolCall != null) {
+					const handlerReportedCall = takeMcpHandlerCall({
+						state,
+						toolCallId: block.tool_use_id,
+						toolCall: mcpToolCall
+					});
+					state.mcpToolCalls.delete(block.tool_use_id);
 					state.pendingStepToolUseIds.delete(block.tool_use_id);
+					if (handlerReportedCall) continue;
+					const isError = !!block.is_error;
+					const result = toolUseResult !== void 0 ? toolUseResult : resolveToolResult({
+						toolName: mcpToolCall.toolName,
+						dynamic: false,
+						isError,
+						rawContent: block.content
+					});
+					emit({
+						type: "tool-call",
+						toolCallId: block.tool_use_id,
+						toolName: mcpToolCall.toolName,
+						input: JSON.stringify(mcpToolCall.input),
+						providerExecuted: true
+					});
+					emit({
+						type: "tool-result",
+						toolCallId: block.tool_use_id,
+						toolName: mcpToolCall.toolName,
+						result,
+						isError
+					});
 					continue;
 				}
 				state.approvalRequestedToolUseIds.delete(block.tool_use_id);
@@ -802,6 +835,20 @@ function createEmitStreamEvent({ state, emit, emitWarning, emitTerminalError, on
 		}
 	};
 }
+function takeMcpHandlerCall({ state, toolCallId, toolCall }) {
+	if (state.mcpHandlerCalls.delete(toolCallId)) return true;
+	for (const [handlerCallId, handlerCall] of state.mcpHandlerCalls) if (handlerCall.toolName === toolCall.toolName && isDeepStrictEqual(handlerCall.input, toolCall.input)) {
+		state.mcpHandlerCalls.delete(handlerCallId);
+		return true;
+	}
+	const matchingHandlerCallIds = Array.from(state.mcpHandlerCalls).filter(([, handlerCall]) => handlerCall.toolName === toolCall.toolName).map(([handlerCallId]) => handlerCallId);
+	const matchingToolCallCount = Array.from(state.mcpToolCalls.values()).filter((pendingCall) => pendingCall.toolName === toolCall.toolName).length;
+	if (matchingHandlerCallIds.length > 0 && matchingHandlerCallIds.length === matchingToolCallCount) {
+		state.mcpHandlerCalls.delete(matchingHandlerCallIds[0]);
+		return true;
+	}
+	return false;
+}
 function finishApprovalStep({ state, emit, approvalId }) {
 	state.stepOpen = true;
 	state.pendingStepToolUseIds.delete(approvalId);
@@ -1415,6 +1462,10 @@ async function runTurn(start, turn) {
 			const [input, extra] = handlerArgs;
 			const metadataToolCallId = extra._meta?.["claudecode/toolUseId"];
 			const toolCallId = typeof metadataToolCallId === "string" ? metadataToolCallId : randomUUID();
+			streamEventState.mcpHandlerCalls.set(toolCallId, {
+				toolName: tool.name,
+				input
+			});
 			emit({
 				type: "tool-call",
 				toolCallId,
@@ -1444,7 +1495,15 @@ async function runTurn(start, turn) {
 			instance: server
 		};
 	}
-	const compaction = createCompactionLatch((event) => emit(event));
+	const compaction = createCompactionLatch((event) => {
+		const hasOpenStep = streamEventState.stepOpen;
+		emit(event);
+		if (!hasOpenStep) emitFinishStep({
+			state: streamEventState,
+			emit,
+			usage: void 0
+		});
+	});
 	const queryInput = createQueryInput({
 		initialUserMessage: start.prompt,
 		userMessages: turn.experimental_userMessages,
@@ -1561,7 +1620,7 @@ async function runTurn(start, turn) {
 					}
 					const harnessUsage = mapUsage(msg.usage ?? msg.message?.usage);
 					if (harnessUsage) turnUsage = addUsage(turnUsage, harnessUsage);
-					if (typeof msg.total_cost_usd === "number") totalCostUsd = (totalCostUsd ?? 0) + msg.total_cost_usd;
+					if (typeof msg.total_cost_usd === "number") totalCostUsd = msg.total_cost_usd;
 					if (start.responseFormat?.type === "json" && msg.structured_output !== void 0) {
 						const id = randomUUID();
 						emit({
@@ -1584,6 +1643,7 @@ async function runTurn(start, turn) {
 						emit,
 						usage: streamEventState.pendingStepUsage ?? harnessUsage
 					});
+					if (!queryInput.answersSentMessage(msg)) continue;
 					queryInput.observeResult();
 					if (!queryInput.hasActiveUserMessages()) {
 						queryInput.close();
@@ -1631,6 +1691,14 @@ function createQueryInput({ initialUserMessage, userMessages, abortSignal }) {
 	let closed = false;
 	let observedResult = false;
 	const submittedMessages = /* @__PURE__ */ new Map();
+	const initialMessageId = randomUUID();
+	const sentMessageIds = /* @__PURE__ */ new Set([initialMessageId]);
+	let cliEchoesMessageIds = false;
+	const noteEcho = (ids) => {
+		const echoed = ids.some((id) => typeof id === "string" && sentMessageIds.has(id));
+		if (echoed) cliEchoesMessageIds = true;
+		return echoed;
+	};
 	const close = (error) => {
 		if (closed) return;
 		closed = true;
@@ -1657,6 +1725,8 @@ function createQueryInput({ initialUserMessage, userMessages, abortSignal }) {
 		handleLifecycle: (message) => {
 			const lifecycle = message;
 			if (lifecycle.command_uuid == null || lifecycle.state == null) return;
+			noteEcho([lifecycle.command_uuid]);
+			if (lifecycle.command_uuid === initialMessageId && (lifecycle.state === "cancelled" || lifecycle.state === "discarded")) observedResult = true;
 			const submitted = submittedMessages.get(lifecycle.command_uuid);
 			if (submitted == null) return;
 			if (lifecycle.state === "queued" || lifecycle.state === "started") {
@@ -1667,6 +1737,10 @@ function createQueryInput({ initialUserMessage, userMessages, abortSignal }) {
 			submittedMessages.delete(lifecycle.command_uuid);
 		},
 		hasActiveUserMessages: () => submittedMessages.size > 0 || userMessages.pendingCount > 0,
+		answersSentMessage: (result) => {
+			const { user_message_uuid, user_message_uuids, origin } = result;
+			return noteEcho([user_message_uuid, ...Array.isArray(user_message_uuids) ? user_message_uuids : []]) || !cliEchoesMessageIds && origin?.kind !== "task-notification";
+		},
 		observeResult: () => {
 			observedResult = true;
 		},
@@ -1685,7 +1759,7 @@ function createQueryInput({ initialUserMessage, userMessages, abortSignal }) {
 					return {
 						value: toUserMessage({
 							text: initialUserMessage,
-							messageId: randomUUID()
+							messageId: initialMessageId
 						}),
 						done: false
 					};
@@ -1696,6 +1770,7 @@ function createQueryInput({ initialUserMessage, userMessages, abortSignal }) {
 					done: true
 				};
 				submittedMessages.set(nextMessage.value.messageId, nextMessage.value);
+				sentMessageIds.add(nextMessage.value.messageId);
 				return {
 					value: toUserMessage({
 						text: nextMessage.value.text,

package/dist/bridge/package.json

@@ -4,9 +4,9 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "0.3.281",
-    "@anthropic-ai/claude-code": "2.1.281",
-    "@modelcontextprotocol/sdk": "1.30.0",
+    "@anthropic-ai/claude-agent-sdk": "0.3.290",
+    "@anthropic-ai/claude-code": "2.1.290",
+    "@modelcontextprotocol/sdk": "1.32.1",
     "ws": "8.21.0",
     "zod": "4.4.3"
   }