reeval 0.8.0 → 0.10.0

package/dist/{client-CwzU9CiW.js → assert-EUIoRdIt.js}

@@ -1,12 +1,13 @@
-import { n as toolTarget, t as SKILL_LOAD_TOOLS } from "./tool-target-BU1JnSE9.js";
-import { t as Scheduler } from "./core-tLN-z1Be.js";
+import { t as isObjectLike } from "./object-CLf2-tNq.js";
+import { n as toolTarget, t as SKILL_LOAD_TOOLS } from "./tool-target-D2mcYlSQ.js";
+import picomatch from "picomatch";
 //#region src/assert.ts
 /** A check the turn's harness can't answer either way, e.g. a web fetch it never reports. */
 var HarnessCapabilityError = class extends Error {
 	name = "HarnessCapabilityError";
 };
-const isTurn = (value) => typeof value === "object" && value !== null && Array.isArray(value.transcript) && Array.isArray(value.unreported);
-const isContext = (value) => typeof value === "object" && value !== null && Array.isArray(value.turns);
+const isTurn = (value) => isObjectLike(value) && Array.isArray(value.transcript) && Array.isArray(value.unreported);
+const isContext = (value) => isObjectLike(value) && Array.isArray(value.turns);
 /** A turn from `c.send()`, or `c` (every turn so far). */
 function transcriptSubject(actual, matcher) {
 	if (isTurn(actual)) return actual;
@@ -19,7 +20,7 @@ function transcriptSubject(actual, matcher) {
 const matches = (value, pattern) => pattern === void 0 || (typeof pattern === "string" ? value.includes(pattern) : pattern.test(value));
 const listed = (values) => values.length ? JSON.stringify(values) : "none";
 const targetOf = (pattern) => pattern === void 0 ? "" : ` matching ${pattern}`;
-const record = (value) => typeof value === "object" && value !== null ? value : {};
+const record = (value) => isObjectLike(value) ? value : {};
 const toolsOf = (transcript) => transcript.flatMap((e) => e.type === "tool" ? [e] : []);
 const editsOf = (transcript) => transcript.flatMap((e) => e.type === "file-edit" ? [e] : []);
 const skillLoadName = (event) => {
@@ -44,10 +45,9 @@ function inputMatches(input, expected) {
 	const text = typeof input === "string" ? input : JSON.stringify(input ?? "");
 	if (typeof expected === "string") return text.includes(expected);
 	if (expected instanceof RegExp) return expected.test(text);
-	if (typeof input !== "object" || input === null) return false;
-	const rec = input;
+	if (!isObjectLike(input)) return false;
 	return Object.entries(expected).every(([key, value]) => {
-		const actual = rec[key];
+		const actual = input[key];
 		if (value instanceof RegExp) return value.test(String(actual ?? ""));
 		if (typeof value === "string") return actual === value || String(actual ?? "").includes(value);
 		return JSON.stringify(actual) === JSON.stringify(value);
@@ -142,6 +142,34 @@ function edited(actual, path) {
 		message: () => pass ? `expected no file edits${targetOf(path)}, got ${listed(seen)}` : `expected file edits${targetOf(path)}, got ${listed(seen)}`
 	};
 }
+const hasDiff = (value) => isObjectLike(value) && isObjectLike(value.diff) && Array.isArray(value.diff.files);
+/** A turn's changed files, or `c`'s as of its latest turn: the diff is cumulative. */
+function changedFiles(actual) {
+	if (hasDiff(actual)) return actual.diff.files;
+	if (isContext(actual)) return actual.turns.at(-1)?.diff.files ?? [];
+	throw new TypeError("toHaveChanged() expects a turn from c.send(), or c");
+}
+/** A glob also matches every file under the directory it names, so `test` is `test/**` too. */
+const pathTest = (pattern) => {
+	if (pattern instanceof RegExp) return (path) => pattern.test(path);
+	const glob = pattern.replace(/^\.?\/+/, "").replace(/\/+$/, "");
+	const self = picomatch(glob, { dot: true });
+	const inside = picomatch(`${glob}/**`, { dot: true });
+	return (path) => self(path) || inside(path);
+};
+/** Files in the workspace diff, so every write counts: a tool's, a shell command's or a subprocess's. */
+function changed(actual, paths) {
+	const files = changedFiles(actual);
+	const patterns = paths === void 0 ? [] : typeof paths === "string" || paths instanceof RegExp ? [paths] : [...paths];
+	const tests = patterns.map(pathTest);
+	const hits = files.filter((f) => tests.length === 0 || tests.some((t) => t(f.path)));
+	const label = (list) => list.length ? `[${list.map((f) => `${JSON.stringify(f.path)} (${f.status})`).join(", ")}]` : "none";
+	const target = patterns.length ? ` to ${patterns.map(String).join(", ")}` : "";
+	return {
+		pass: hits.length > 0,
+		message: () => hits.length > 0 ? `expected no changes${target}, got ${label(hits)}` : `expected changes${target}, got ${label(files)}`
+	};
+}
 function searched(actual, query) {
 	return webEvent("toHaveSearched", actual, "web-search", (e) => "query" in e ? e.query : "", query);
 }
@@ -149,108 +177,6 @@ function fetched(actual, url) {
 	return webEvent("toHaveFetched", actual, "web-fetch", (e) => "url" in e ? e.url : "", url);
 }
 //#endregion
-//#region src/scheduler/client.ts
-var LocalTransport = class {
-	#pending = /* @__PURE__ */ new Map();
-	#scheduler = new Scheduler((r) => {
-		this.#pending.get(r.id)?.resolve();
-		this.#pending.delete(r.id);
-	});
-	request(id, limits, rank, pending) {
-		this.#pending.set(id, pending);
-		this.#scheduler.request({
-			id,
-			owner: "local",
-			limits,
-			...rank ? { rank } : {}
-		});
-	}
-	release(id) {
-		this.#pending.delete(id);
-		this.#scheduler.release(id);
-	}
-};
-/** Over the worker's IPC channel to reeval's own engine: requests out, grants back. */
-var ChannelTransport = class {
-	#pending = /* @__PURE__ */ new Map();
-	#send;
-	constructor(send) {
-		this.#send = send;
-	}
-	grant(id) {
-		const pending = this.#pending.get(id);
-		this.#pending.delete(id);
-		pending?.resolve();
-	}
-	request(id, limits, rank, pending) {
-		this.#pending.set(id, pending);
-		this.#send({
-			t: "request",
-			id,
-			limits,
-			...rank ? { rank } : {}
-		});
-	}
-	release(id) {
-		this.#pending.delete(id);
-		this.#send({
-			t: "release",
-			id
-		});
-	}
-};
-let transport;
-let ids = 0;
-/** Points this process at the run's scheduler over `send`; returns what delivers its grants. */
-function useSchedulerChannel(send) {
-	const channel = new ChannelTransport(send);
-	transport = channel;
-	return (id) => channel.grant(id);
-}
-/**
-* Waits until every resource in `limits` has room, then holds a lease on each until released.
-* Rejects with the signal's reason if it aborts first.
-*/
-function acquire(limits, options = {}) {
-	const { rank, signal } = options;
-	if (signal?.aborted) return Promise.reject(signal.reason);
-	transport ??= new LocalTransport();
-	const via = transport;
-	const id = String(++ids);
-	let released = false;
-	const lease = { release() {
-		if (released) return;
-		released = true;
-		via.release(id);
-	} };
-	return new Promise((resolve, reject) => {
-		const onAbort = () => {
-			lease.release();
-			reject(signal?.reason);
-		};
-		signal?.addEventListener("abort", onAbort, { once: true });
-		via.request(id, limits, rank, {
-			resolve: () => {
-				signal?.removeEventListener("abort", onAbort);
-				resolve(lease);
-			},
-			reject: (error) => {
-				signal?.removeEventListener("abort", onAbort);
-				reject(error);
-			}
-		});
-	});
-}
-/** Runs `fn` while holding leases on `limits`. */
-async function withLease(limits, fn, signal) {
-	const lease = await acquire(limits, signal ? { signal } : {});
-	try {
-		return await fn();
-	} finally {
-		lease.release();
-	}
-}
-//#endregion
-export { calledMcp as a, edited as c, searched as d, HarnessCapabilityError as i, fetched as l, useSchedulerChannel as n, calledSkill as o, withLease as r, calledTool as s, acquire as t, ran as u };
+export { changed as a, ran as c, calledTool as i, searched as l, calledMcp as n, edited as o, calledSkill as r, fetched as s, HarnessCapabilityError as t };
 
-//# sourceMappingURL=client-CwzU9CiW.js.map
+//# sourceMappingURL=assert-EUIoRdIt.js.map

package/dist/assert-EUIoRdIt.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"assert-EUIoRdIt.js","names":[],"sources":["../src/assert.ts"],"mappings":";;;;;AAQA,IAAa,yBAAb,cAA4C,MAAM;CAChD,OAAgB;AAClB;AAQA,MAAM,UAAU,UACd,aAAa,KAAK,KAAK,MAAM,QAAQ,MAAM,UAAU,KAAK,MAAM,QAAQ,MAAM,UAAU;AAE1F,MAAM,aAAa,UACjB,aAAa,KAAK,KAAK,MAAM,QAAQ,MAAM,KAAK;;AAGlD,SAAgB,kBAAkB,QAAiB,SAA0B;CAC3E,IAAI,OAAO,MAAM,GAAG,OAAO;CAC3B,IAAI,UAAU,MAAM,GAClB,OAAO;EACL,YAAY,OAAO,MAAM,SAAS,MAAM,EAAE,UAAU;EACpD,YAAY,CAAC,GAAG,IAAI,IAAI,OAAO,MAAM,SAAS,MAAM,EAAE,UAAU,CAAC,CAAC;CACpE;CAEF,MAAM,IAAI,UAAU,GAAG,QAAQ,sCAAsC;AACvE;AAEA,MAAM,WAAW,OAAe,YAC9B,YAAY,KAAA,MACX,OAAO,YAAY,WAAW,MAAM,SAAS,OAAO,IAAI,QAAQ,KAAK,KAAK;AAE7E,MAAM,UAAU,WAAsB,OAAO,SAAS,KAAK,UAAU,MAAM,IAAI;AAE/E,MAAM,YAAY,YAChB,YAAY,KAAA,IAAY,KAAK,aAAa;AAE5C,MAAM,UAAU,UAA6C,aAAa,KAAK,IAAI,QAAQ,CAAC;AAE5F,MAAM,WAAW,eACf,WAAW,SAAS,MAAO,EAAE,SAAS,SAAS,CAAC,CAAC,IAAI,CAAC,CAAE;AAE1D,MAAM,WAAW,eACf,WAAW,SAAS,MAAO,EAAE,SAAS,cAAc,CAAC,CAAC,IAAI,CAAC,CAAE;AAE/D,MAAM,iBAAiB,UAAyC;CAC9D,IAAI,CAAC,iBAAiB,IAAI,MAAM,IAAI,GAAG,OAAO,KAAA;CAC9C,MAAM,QAAQ,OAAO,MAAM,KAAK;CAChC,IAAI,OAAO,MAAM,OAAO,UAAU,OAAO,MAAM;CAC/C,IAAI,OAAO,MAAM,SAAS,UAAU,OAAO,MAAM;AACnD;AAEA,MAAM,aAAa,UAAyC;CAC1D,MAAM,SAAS,cAAc,KAAK;CAClC,IAAI,QAAQ,OAAO,GAAG,MAAM,KAAK,GAAG;CACpC,MAAM,SAAS,WAAW,MAAM,OAAO,MAAM,IAAI;CACjD,IAAI,OAAO,SAAS,SAAS,GAAG,OAAO,GAAG,MAAM,KAAK,GAAG;AAC1D;AAEA,MAAM,eAAe,OAAkB,SAA0B;CAC/D,IAAI,cAAc,KAAK,MAAM,MAAM,OAAO;CAC1C,OAAO,WAAW,MAAM,OAAO,MAAM,IAAI,CAAC,CAAC,SAAS,UAAU,KAAK,EAAE;AACvE;AAEA,MAAM,eAAe,MAAc,SACjC,OAAO,SAAS,WAAW,SAAS,OAAO,KAAK,KAAK,IAAI;AAE3D,SAAgB,aAAa,OAAgB,UAAoC;CAC/E,IAAI,aAAa,KAAA,GAAW,OAAO;CACnC,MAAM,OAAO,OAAO,UAAU,WAAW,QAAQ,KAAK,UAAU,SAAS,EAAE;CAC3E,IAAI,OAAO,aAAa,UAAU,OAAO,KAAK,SAAS,QAAQ;CAC/D,IAAI,oBAAoB,QAAQ,OAAO,SAAS,KAAK,IAAI;CACzD,IAAI,CAAC,aAAa,KAAK,GAAG,OAAO;CACjC,OAAO,OAAO,QAAQ,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,WAAW;EACtD,MAAM,SAAS,MAAM;EACrB,IAAI,iBAAiB,QAAQ,OAAO,MAAM,KAAK,OAAO,UAAU,EAAE,CAAC;EACnE,IAAI,OAAO,UAAU,UACnB,OAAO,WAAW,SAAS,OAAO,UAAU,EAAE,CAAC,CAAC,SAAS,KAAK;EAEhE,OAAO,KAAK,UAAU,MAAM,MAAM,KAAK,UAAU,KAAK;CACxD,CAAC;AACH;AAEA,MAAM,8BAAc,IAAI,IAAI,CAAC,QAAQ,OAAO,CAAC;AAE7C,MAAM,aAAa,UAA6B;CAC9C,MAAM,UAAU,OAAO,MAAM,KAAK,CAAC,CAAC;CACpC,OAAO,OAAO,YAAY,WAAW,UAAU;AACjD;AAEA,MAAM,cAAc,WAClB,OAAO,WAAW,WAAW,SAAS,KAAK,UAAU,UAAU,EAAE;AAEnE,MAAM,gBAAgB,OAAkB,SAAmC;CACzE,MAAM,SAAS,WAAW,MAAM,OAAO,MAAM,IAAI;CACjD,OAAO,QAAQ,QAAQ,IAAI,KAAK,QAAQ,WAAW,MAAM,MAAM,GAAG,IAAI;AACxE;AAEA,SAAS,SACP,SACA,QACA,MACA,OACA,SACQ;CACR,MAAM,UAAU,kBAAkB,QAAQ,OAAO;CACjD,MAAM,OAAO,SAAS,eAAe,iBAAiB;CACtD,IAAI,QAAQ,WAAW,SAAS,IAAI,GAClC,MAAM,IAAI,uBACR,GAAG,QAAQ,uDAAuD,KAAK,KAAK,KAAK,+IACnF;CAEF,MAAM,OAAO,QAAQ,WAAW,QAAQ,MAAM,EAAE,SAAS,IAAI,CAAC,CAAC,IAAI,KAAK;CACxE,MAAM,OAAO,KAAK,MAAM,MAAM,QAAQ,GAAG,OAAO,CAAC;CACjD,OAAO;EACL;EACA,eACE,OACI,eAAe,OAAO,SAAS,OAAO,EAAE,QAAQ,OAAO,IAAI,MAC3D,YAAY,OAAO,SAAS,OAAO,EAAE,QAAQ,OAAO,IAAI;CAChE;AACF;AAEA,SAAgB,YAAY,QAAiB,MAAsB;CACjE,MAAM,EAAE,eAAe,kBAAkB,QAAQ,mBAAmB;CACpE,MAAM,QAAQ,QAAQ,UAAU;CAChC,MAAM,OAAO,MAAM,SAAS,MAAM;EAChC,MAAM,QAAQ,UAAU,CAAC;EACzB,OAAO,QAAQ,CAAC,KAAK,IAAI,CAAC;CAC5B,CAAC;CACD,MAAM,OAAO,MAAM,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC;CACnD,OAAO;EACL;EACA,eACE,OACI,yCAAyC,KAAK,QAAQ,OAAO,IAAI,MACjE,sCAAsC,KAAK,QAAQ,OAAO,IAAI;CACtE;AACF;AAEA,SAAgB,WAAW,QAAiB,MAAuB,OAAgC;CACjG,MAAM,EAAE,eAAe,kBAAkB,QAAQ,kBAAkB;CACnE,MAAM,QAAQ,QAAQ,UAAU;CAChC,MAAM,YAAY,UAAU,KAAA,IAAY,KAAK,eAAe,YAAY,KAAK;CAC7E,MAAM,OAAO,MAAM,KAAK,MACtB,UAAU,KAAA,IAAY,EAAE,OAAO,GAAG,EAAE,KAAK,GAAG,KAAK,UAAU,EAAE,KAAK,GACpE;CACA,MAAM,OAAO,MAAM,MAAM,MAAM,YAAY,EAAE,MAAM,IAAI,KAAK,aAAa,EAAE,OAAO,KAAK,CAAC;CACxF,OAAO;EACL;EACA,eACE,OACI,mCAAmC,OAAO,UAAU,QAAQ,OAAO,IAAI,MACvE,gCAAgC,OAAO,UAAU,QAAQ,OAAO,IAAI;CAC5E;AACF;AAEA,MAAM,WAAW;AAEjB,MAAM,YAAY,SAAiB;CACjC,MAAM,IAAI,SAAS,KAAK,IAAI;CAC5B,OAAO,IAAI,GAAG,EAAE,GAAG,GAAG,EAAE,OAAO;AACjC;;AAGA,SAAgB,UACd,QACA,QACA,MACA,OACQ;CACR,MAAM,UAAU,kBAAkB,QAAQ,iBAAiB;CAC3D,MAAM,SAAS,WAAW,SAAS,QAAQ,OAAO,IAAI,QAAQ,KAAK;CACnE,MAAM,WAAW,QAAQ,QAAQ,UAAU,CAAC,CAAC,QAAQ,MAAM,EAAE,KAAK,WAAW,OAAO,CAAC;CACrF,MAAM,YAAY,UAAU,KAAA,IAAY,KAAK,eAAe,YAAY,KAAK;CAC7E,MAAM,OAAO,SAAS,KAAK,MACzB,UAAU,KAAA,IAAY,SAAS,EAAE,IAAI,IAAI,GAAG,SAAS,EAAE,IAAI,EAAE,GAAG,KAAK,UAAU,EAAE,KAAK,GACxF;CACA,OAAO;EACL,MAAM,OAAO;EACb,eACE,OAAO,OACH,kCAAkC,OAAO,GAAG,OAAO,UAAU,QAAQ,OAAO,IAAI,MAChF,+BAA+B,OAAO,GAAG,OAAO,UAAU,QAAQ,OAAO,IAAI;CACrF;AACF;AAEA,SAAS,YAAY,OAA+B;CAClD,IAAI,OAAO,UAAU,YAAY,iBAAiB,QAAQ,OAAO,OAAO,KAAK;CAC7E,OAAO,KAAK,UAAU,KAAK;AAC7B;AAEA,SAAgB,IAAI,QAAiB,SAAmC;CACtE,MAAM,EAAE,eAAe,kBAAkB,QAAQ,WAAW;CAC5D,MAAM,SAAS,QAAQ,UAAU,CAAC,CAAC,QAAQ,MAAM,YAAY,IAAI,EAAE,IAAI,CAAC;CACxE,MAAM,OAAO,OAAO,IAAI,SAAS;CACjC,MAAM,OAAO,OAAO,MAAM,MAAM,QAAQ,UAAU,CAAC,GAAG,OAAO,CAAC;CAC9D,OAAO;EACL;EACA,eACE,OACI,6BAA6B,SAAS,OAAO,EAAE,QAAQ,OAAO,IAAI,MAClE,0BAA0B,SAAS,OAAO,EAAE,QAAQ,OAAO,IAAI;CACvE;AACF;AAEA,SAAgB,OAAO,QAAiB,MAAgC;CACtE,MAAM,EAAE,eAAe,kBAAkB,QAAQ,cAAc;CAC/D,MAAM,QAAQ,QAAQ,UAAU;CAChC,MAAM,QAAQ,QAAQ,UAAU;CAChC,MAAM,UAAU,MAAM,MAAM,MAAM,QAAQ,EAAE,MAAM,IAAI,CAAC;CACvD,MAAM,UAAU,SAAS,KAAA,KAAa,MAAM,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC;CAC7E,MAAM,OAAO,WAAW;CACxB,MAAM,OAAO,CACX,GAAG,MAAM,KAAK,MAAM,EAAE,IAAI,GAC1B,GAAG,MACA,QAAQ,MAAM,SAAS,KAAA,KAAa,aAAa,GAAG,IAAI,CAAC,CAAC,CAC1D,KAAK,MAAM,GAAG,EAAE,KAAK,GAAG,WAAW,EAAE,OAAO,EAAE,IAAI,GAAG,CAC1D;CACA,OAAO;EACL;EACA,eACE,OACI,yBAAyB,SAAS,IAAI,EAAE,QAAQ,OAAO,IAAI,MAC3D,sBAAsB,SAAS,IAAI,EAAE,QAAQ,OAAO,IAAI;CAChE;AACF;AAIA,MAAM,WAAW,UACf,aAAa,KAAK,KAAK,aAAa,MAAM,IAAI,KAAK,MAAM,QAAQ,MAAM,KAAK,KAAK;;AAGnF,SAAS,aAAa,QAA+B;CACnD,IAAI,QAAQ,MAAM,GAAG,OAAO,OAAO,KAAK;CACxC,IAAI,UAAU,MAAM,GAAG,OAAO,OAAO,MAAM,GAAG,EAAE,CAAC,EAAE,KAAK,SAAS,CAAC;CAClE,MAAM,IAAI,UAAU,oDAAoD;AAC1E;;AAGA,MAAM,YAAY,YAA0D;CAC1E,IAAI,mBAAmB,QAAQ,QAAQ,SAAS,QAAQ,KAAK,IAAI;CACjE,MAAM,OAAO,QAAQ,QAAQ,WAAW,EAAE,CAAC,CAAC,QAAQ,QAAQ,EAAE;CAC9D,MAAM,OAAO,UAAU,MAAM,EAAE,KAAK,KAAK,CAAC;CAC1C,MAAM,SAAS,UAAU,GAAG,KAAK,MAAM,EAAE,KAAK,KAAK,CAAC;CACpD,QAAQ,SAAS,KAAK,IAAI,KAAK,OAAO,IAAI;AAC5C;;AAGA,SAAgB,QAAQ,QAAiB,OAA2B;CAClE,MAAM,QAAQ,aAAa,MAAM;CACjC,MAAM,WACJ,UAAU,KAAA,IACN,CAAC,IACD,OAAO,UAAU,YAAY,iBAAiB,SAC5C,CAAC,KAAK,IACN,CAAC,GAAG,KAAK;CACjB,MAAM,QAAQ,SAAS,IAAI,QAAQ;CACnC,MAAM,OAAO,MAAM,QAAQ,MAAM,MAAM,WAAW,KAAK,MAAM,MAAM,MAAM,EAAE,EAAE,IAAI,CAAC,CAAC;CACnF,MAAM,SAAS,SACb,KAAK,SACD,IAAI,KAAK,KAAK,MAAM,GAAG,KAAK,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,KAAK,IAAI,EAAE,KAC1E;CACN,MAAM,SAAS,SAAS,SAAS,OAAO,SAAS,IAAI,MAAM,CAAC,CAAC,KAAK,IAAI,MAAM;CAC5E,OAAO;EACL,MAAM,KAAK,SAAS;EACpB,eACE,KAAK,SAAS,IACV,sBAAsB,OAAO,QAAQ,MAAM,IAAI,MAC/C,mBAAmB,OAAO,QAAQ,MAAM,KAAK;CACrD;AACF;AAEA,SAAgB,SAAS,QAAiB,OAAiC;CACzE,OAAO,SACL,kBACA,QACA,eACC,MAAO,WAAW,IAAI,EAAE,QAAQ,IACjC,KACF;AACF;AAEA,SAAgB,QAAQ,QAAiB,KAA+B;CACtE,OAAO,SAAS,iBAAiB,QAAQ,cAAc,MAAO,SAAS,IAAI,EAAE,MAAM,IAAK,GAAG;AAC7F"}

package/dist/bridge/index.mjs

@@ -1,4 +1,4 @@
-// Modified by Invertase with patches/@ai-sdk__harness-claude-code@1.0.152.patch; see THIRD_PARTY_NOTICES.md.
+// Modified by Invertase with patches/@ai-sdk__harness-claude-code@1.0.158.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";
@@ -9,6 +9,71 @@ 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 name = "AI_HarnessBridgeCapabilityUnsupportedError";
+/**
+* Signals an unsupported capability discovered inside a sandbox bridge.
+* `isInstance` also recognizes the serialized error shape received by the
+* host, where it can be translated to `HarnessCapabilityUnsupportedError`.
+*/
+var HarnessBridgeCapabilityUnsupportedError = class extends Error {
+	constructor({ message, harnessId, cause }) {
+		super(message);
+		Object.defineProperty(this, "name", { value: name });
+		this.harnessId = harnessId;
+		this.cause = cause;
+	}
+	static isInstance(error) {
+		return error != null && typeof error === "object" && "name" in error && error.name === name && "message" in error && typeof error.message === "string";
+	}
+};
+function getNormalizedInlineImage(part) {
+	if (part.type === "file" && part.mediaType.startsWith("image/") && part.mediaType !== "image/*" && part.data.type === "data" && typeof part.data.data === "string") return {
+		data: part.data.data,
+		mediaType: part.mediaType
+	};
+}
+function convertHarnessToolModelOutput({ output }) {
+	switch (output.type) {
+		case "text":
+		case "error-text": return {
+			content: [{
+				type: "text",
+				text: output.value
+			}],
+			isError: output.type === "error-text"
+		};
+		case "json":
+		case "error-json": return {
+			content: [{
+				type: "text",
+				text: JSON.stringify(output.value)
+			}],
+			isError: output.type === "error-json"
+		};
+		case "execution-denied": return {
+			content: [{
+				type: "text",
+				text: output.reason ?? "Tool execution denied."
+			}],
+			isError: true
+		};
+		case "content": return {
+			content: output.value.map((part) => {
+				if (part.type === "text") return {
+					type: "text",
+					text: part.text
+				};
+				const image = getNormalizedInlineImage(part);
+				if (image != null) return {
+					type: "image",
+					...image
+				};
+				throw new HarnessBridgeCapabilityUnsupportedError({ message: `Harnesses support only text and inline images in tool model output; unsupported content '${part.type}'.` });
+			}),
+			isError: false
+		};
+	}
+}
 const DEBUG_LEVEL_WEIGHT = {
 	error: 0,
 	warn: 1,
@@ -633,12 +698,17 @@ function createClaudeStreamEventState() {
 		pendingStepDeltaUsage: void 0,
 		pendingStepUsage: void 0,
 		pendingResponseUsage: void 0,
+		responseOpen: false,
 		stepOpen: false,
 		mcpToolCalls: /* @__PURE__ */ new Map(),
 		mcpHandlerCalls: /* @__PURE__ */ new Map(),
 		externalMcpToolUseIds: /* @__PURE__ */ new Set(),
 		structuredOutputToolUseIds: /* @__PURE__ */ new Set(),
-		observedTerminalError: void 0
+		observedTerminalError: void 0,
+		hostInputWaitingToolUseIds: /* @__PURE__ */ new Set(),
+		earlyFinishStepToolUseIds: /* @__PURE__ */ new Set(),
+		emittedToolCallIds: /* @__PURE__ */ new Set(),
+		modelResponseStreaming: false
 	};
 }
 const UNRECOVERABLE_API_RETRY_STATUSES = /* @__PURE__ */ new Set([
@@ -731,12 +801,34 @@ function createEmitStreamEvent({ state, emit, emitWarning, emitTerminalError, on
 					continue;
 				}
 				if (block.name.startsWith(HOST_TOOL_PREFIX)) {
+					const hostToolName = block.name.slice(20);
 					state.pendingStepToolUseIds.add(block.id);
 					state.mcpToolCalls.set(block.id, {
-						toolName: block.name.slice(20),
+						toolName: hostToolName,
 						input: block.input ?? {}
 					});
 					opensStep = true;
+					const handlerCallId = findMcpHandlerCallId({
+						state,
+						toolCallId: block.id,
+						toolCall: state.mcpToolCalls.get(block.id)
+					});
+					if (handlerCallId != null) {
+						state.mcpHandlerCalls.get(handlerCallId).toolUseId = block.id;
+						state.emittedToolCallIds.add(block.id);
+						continue;
+					}
+					state.hostInputWaitingToolUseIds.add(block.id);
+					if (!state.emittedToolCallIds.has(block.id)) {
+						state.emittedToolCallIds.add(block.id);
+						emit({
+							type: "tool-call",
+							toolCallId: block.id,
+							toolName: hostToolName,
+							input: JSON.stringify(block.input ?? {}),
+							providerExecuted: false
+						});
+					}
 					continue;
 				}
 				state.nativeToolCallNames.set(block.id, block.name);
@@ -747,9 +839,10 @@ function createEmitStreamEvent({ state, emit, emitWarning, emitTerminalError, on
 				}
 				const dynamic = isExternalMcpTool(block.name);
 				if (dynamic) state.externalMcpToolUseIds.add(block.id);
-				if (state.approvalRequestedToolUseIds.has(block.id)) continue;
 				state.pendingStepToolUseIds.add(block.id);
 				opensStep = true;
+				if (state.emittedToolCallIds.has(block.id)) continue;
+				state.emittedToolCallIds.add(block.id);
 				emit({
 					type: "tool-call",
 					toolCallId: block.id,
@@ -766,6 +859,10 @@ function createEmitStreamEvent({ state, emit, emitWarning, emitTerminalError, on
 					state.pendingStepAssistantUsage = usage;
 					updatePendingStepUsage(state);
 				}
+				if (state.hostInputWaitingToolUseIds.size > 0) closeStepIfReady({
+					state,
+					emit
+				});
 			}
 			return;
 		}
@@ -782,6 +879,7 @@ function createEmitStreamEvent({ state, emit, emitWarning, emitTerminalError, on
 					});
 					state.mcpToolCalls.delete(block.tool_use_id);
 					state.pendingStepToolUseIds.delete(block.tool_use_id);
+					state.hostInputWaitingToolUseIds.delete(block.tool_use_id);
 					if (handlerReportedCall) continue;
 					const isError = !!block.is_error;
 					const result = toolUseResult !== void 0 ? toolUseResult : resolveToolResult({
@@ -790,13 +888,16 @@ function createEmitStreamEvent({ state, emit, emitWarning, emitTerminalError, on
 						isError,
 						rawContent: block.content
 					});
-					emit({
-						type: "tool-call",
-						toolCallId: block.tool_use_id,
-						toolName: mcpToolCall.toolName,
-						input: JSON.stringify(mcpToolCall.input),
-						providerExecuted: true
-					});
+					if (!state.emittedToolCallIds.has(block.tool_use_id)) {
+						state.emittedToolCallIds.add(block.tool_use_id);
+						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,
@@ -836,27 +937,40 @@ 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 handlerCallId = findMcpHandlerCallId({
+		state,
+		toolCallId,
+		toolCall
+	});
+	if (handlerCallId != null) return state.mcpHandlerCalls.delete(handlerCallId);
 	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;
-	}
+	if (matchingHandlerCallIds.length > 0 && matchingHandlerCallIds.length === matchingToolCallCount) return state.mcpHandlerCalls.delete(matchingHandlerCallIds[0]);
 	return false;
 }
-function finishApprovalStep({ state, emit, approvalId }) {
+function findMcpHandlerCallId({ state, toolCallId, toolCall }) {
+	if (state.mcpHandlerCalls.has(toolCallId)) return toolCallId;
+	for (const [handlerCallId, handlerCall] of state.mcpHandlerCalls) {
+		if (handlerCall.toolUseId != null && handlerCall.toolUseId !== toolCallId || handlerCallId !== toolCallId && state.mcpToolCalls.has(handlerCallId)) continue;
+		if (handlerCall.toolName === toolCall.toolName && isDeepStrictEqual(handlerCall.input, toolCall.input)) return handlerCallId;
+	}
+}
+function markWaitingOnHostInput({ state, emit, toolUseId }) {
 	state.stepOpen = true;
-	state.pendingStepToolUseIds.delete(approvalId);
+	state.pendingStepToolUseIds.add(toolUseId);
+	state.hostInputWaitingToolUseIds.add(toolUseId);
 	closeStepIfReady({
 		state,
 		emit
 	});
 }
+function clearWaitingOnHostInput({ state, toolUseId }) {
+	state.hostInputWaitingToolUseIds.delete(toolUseId);
+}
+function resolveMcpHandlerToolUseId({ state, metadataToolUseId, toolName, input }) {
+	if (metadataToolUseId != null) return metadataToolUseId;
+	for (const [toolUseId, toolCall] of state.mcpToolCalls) if (!state.mcpHandlerCalls.has(toolUseId) && toolCall.toolName === toolName && isDeepStrictEqual(toolCall.input, input)) return toolUseId;
+}
 function emitFinishStep({ state, emit, usage }) {
 	emit({
 		type: "finish-step",
@@ -871,14 +985,37 @@ function emitFinishStep({ state, emit, usage }) {
 	state.pendingStepDeltaUsage = void 0;
 	state.pendingStepUsage = void 0;
 	state.pendingStepToolUseIds = /* @__PURE__ */ new Set();
+	state.earlyFinishStepToolUseIds = /* @__PURE__ */ new Set();
 	state.stepOpen = false;
 }
 function closeStepIfReady({ state, emit }) {
-	if (!state.stepOpen || state.pendingStepToolUseIds.size > 0 || state.partialBlocks.size > 0) return;
-	emitFinishStep({
+	if (!state.stepOpen || state.responseOpen || state.partialBlocks.size > 0) return;
+	if (state.pendingStepToolUseIds.size === 0) {
+		emitFinishStep({
+			state,
+			emit,
+			usage: state.pendingStepUsage
+		});
+		return;
+	}
+	emitEarlyFinishStepIfReady({
 		state,
-		emit,
-		usage: state.pendingStepUsage
+		emit
+	});
+}
+function emitEarlyFinishStepIfReady({ state, emit }) {
+	if (!state.stepOpen || state.partialBlocks.size > 0 || state.modelResponseStreaming || state.pendingStepToolUseIds.size === 0) return;
+	const uncovered = [...state.hostInputWaitingToolUseIds].filter((toolUseId) => state.pendingStepToolUseIds.has(toolUseId) && !state.earlyFinishStepToolUseIds.has(toolUseId));
+	if (uncovered.length === 0) return;
+	for (const toolUseId of uncovered) state.earlyFinishStepToolUseIds.add(toolUseId);
+	emit({
+		type: "finish-step",
+		finishReason: {
+			unified: "tool-calls",
+			raw: "host-input"
+		},
+		usage: defaultUsage(),
+		harnessMetadata: { "claude-code": { inferredStep: true } }
 	});
 }
 function formatApiRetryWarning(msg) {
@@ -895,7 +1032,9 @@ function formatApiRetryWarning(msg) {
 function handleStreamEvent({ event, message, state, send, toCommonName }) {
 	if (!event) return;
 	if (event.type === "message_start") {
+		state.modelResponseStreaming = true;
 		state.pendingResponseUsage = toUsageRecord(event.message?.usage);
+		state.responseOpen = true;
 		return;
 	}
 	if (event.type === "message_delta") {
@@ -916,6 +1055,12 @@ function handleStreamEvent({ event, message, state, send, toCommonName }) {
 			}
 		});
 		state.pendingResponseUsage = void 0;
+		state.modelResponseStreaming = false;
+		state.responseOpen = false;
+		closeStepIfReady({
+			state,
+			emit: send
+		});
 		return;
 	}
 	if (typeof event.index !== "number") return;
@@ -1281,6 +1426,7 @@ const NATIVE_TOOL_KINDS = {
 	TaskGet: "readonly",
 	TaskList: "readonly",
 	TaskOutput: "readonly",
+	ListAgents: "readonly",
 	ListMcpResources: "readonly",
 	ReadMcpResource: "readonly",
 	Write: "edit",
@@ -1355,22 +1501,26 @@ function createPermissionOptions(input) {
 			const approvalId = options.toolUseID;
 			input.approvalRequestedToolUseIds.add(approvalId);
 			input.nativeToolCallNames.set(approvalId, toolName);
-			input.emit({
-				type: "tool-call",
-				toolCallId: approvalId,
-				toolName: toCommonName(toolName),
-				nativeName: toolName,
-				input: JSON.stringify(toolInput ?? {}),
-				providerExecuted: true,
-				...isExternalMcpTool(toolName) ? { dynamic: true } : {}
-			});
+			if (!input.emittedToolCallIds.has(approvalId)) {
+				input.emittedToolCallIds.add(approvalId);
+				input.emit({
+					type: "tool-call",
+					toolCallId: approvalId,
+					toolName: toCommonName(toolName),
+					nativeName: toolName,
+					input: JSON.stringify(toolInput ?? {}),
+					providerExecuted: true,
+					...isExternalMcpTool(toolName) ? { dynamic: true } : {}
+				});
+			}
+			const decisionPromise = input.turn.requestToolApproval(approvalId);
 			input.emit({
 				type: "tool-approval-request",
 				approvalId,
 				toolCallId: approvalId
 			});
-			input.finishApprovalStep(approvalId);
-			const decision = await input.turn.requestToolApproval(approvalId);
+			input.markWaitingOnHostInput(approvalId);
+			const decision = await decisionPromise.finally(() => input.clearWaitingOnHostInput(approvalId));
 			return decision.approved ? {
 				behavior: "allow",
 				updatedInput: toolInput,
@@ -1400,6 +1550,7 @@ function createQuestionPreToolUseHook(input) {
 			providerMetadata: { "claude-code": { nativeRequest: nativeInput } }
 		});
 		const questionKey = claudeCodeQuestionKey(nativeInput);
+		input.markWaitingOnHostInput(toolCallId);
 		const nativeResult = toClaudeCodeQuestionResult({
 			nativeInput,
 			output: (await input.turn.requestToolResult({
@@ -1408,7 +1559,7 @@ function createQuestionPreToolUseHook(input) {
 					const nativeRequest = candidate.toolResult?.providerOptions?.["claude-code"]?.nativeRequest;
 					return nativeRequest != null && claudeCodeQuestionKey(nativeRequest) === questionKey;
 				}
-			})).output
+			}).finally(() => input.clearWaitingOnHostInput(toolCallId))).output
 		});
 		return { hookSpecificOutput: {
 			hookEventName: "PreToolUse",
@@ -1461,19 +1612,38 @@ async function runTurn(start, turn) {
 		}, async (...handlerArgs) => {
 			const [input, extra] = handlerArgs;
 			const metadataToolCallId = extra._meta?.["claudecode/toolUseId"];
-			const toolCallId = typeof metadataToolCallId === "string" ? metadataToolCallId : randomUUID();
+			const toolCallId = resolveMcpHandlerToolUseId({
+				state: streamEventState,
+				metadataToolUseId: typeof metadataToolCallId === "string" ? metadataToolCallId : void 0,
+				toolName: tool.name,
+				input
+			}) ?? randomUUID();
 			streamEventState.mcpHandlerCalls.set(toolCallId, {
 				toolName: tool.name,
 				input
 			});
-			emit({
-				type: "tool-call",
-				toolCallId,
-				toolName: tool.name,
-				input: JSON.stringify(input),
-				providerExecuted: false
+			if (!streamEventState.emittedToolCallIds.has(toolCallId)) {
+				streamEventState.emittedToolCallIds.add(toolCallId);
+				emit({
+					type: "tool-call",
+					toolCallId,
+					toolName: tool.name,
+					input: JSON.stringify(input),
+					providerExecuted: false
+				});
+				markWaitingOnHostInput({
+					state: streamEventState,
+					emit,
+					toolUseId: toolCallId
+				});
+			}
+			const { output, isError, toolResult } = await turn.requestToolResult(toolCallId).finally(() => {
+				clearWaitingOnHostInput({
+					state: streamEventState,
+					toolUseId: toolCallId
+				});
+				if (!streamEventState.mcpToolCalls.has(toolCallId)) streamEventState.pendingStepToolUseIds.delete(toolCallId);
 			});
-			const { output, isError } = await turn.requestToolResult(toolCallId);
 			emit({
 				type: "tool-result",
 				toolCallId,
@@ -1481,6 +1651,17 @@ async function runTurn(start, turn) {
 				result: output ?? null,
 				isError: !!isError
 			});
+			if (toolResult != null) {
+				const converted = convertHarnessToolModelOutput({ output: toolResult.output });
+				return {
+					content: converted.content.map((part) => part.type === "text" ? part : {
+						type: "image",
+						data: part.data,
+						mimeType: part.mediaType
+					}),
+					isError: isError === true || converted.isError
+				};
+			}
 			return {
 				content: [{
 					type: "text",
@@ -1517,20 +1698,32 @@ async function runTurn(start, turn) {
 		inactiveNativeTools,
 		turn,
 		emit,
-		finishApprovalStep: (approvalId) => {
-			finishApprovalStep({
-				state: streamEventState,
-				emit,
-				approvalId
-			});
-		},
+		markWaitingOnHostInput: (toolUseId) => markWaitingOnHostInput({
+			state: streamEventState,
+			emit,
+			toolUseId
+		}),
+		clearWaitingOnHostInput: (toolUseId) => clearWaitingOnHostInput({
+			state: streamEventState,
+			toolUseId
+		}),
 		nativeToolCallNames: streamEventState.nativeToolCallNames,
-		approvalRequestedToolUseIds: streamEventState.approvalRequestedToolUseIds
+		approvalRequestedToolUseIds: streamEventState.approvalRequestedToolUseIds,
+		emittedToolCallIds: streamEventState.emittedToolCallIds
 	});
 	const questionPreToolUseHook = createQuestionPreToolUseHook({
 		turn,
 		emit,
-		nativeToolCallNames: streamEventState.nativeToolCallNames
+		nativeToolCallNames: streamEventState.nativeToolCallNames,
+		markWaitingOnHostInput: (toolUseId) => markWaitingOnHostInput({
+			state: streamEventState,
+			emit,
+			toolUseId
+		}),
+		clearWaitingOnHostInput: (toolUseId) => clearWaitingOnHostInput({
+			state: streamEventState,
+			toolUseId
+		})
 	});
 	const q = claudeSdk.query({
 		prompt: queryInput.input,