@code-yeongyu/senpi 2026.9.15 → 2026.9.16-2

package/node_modules/@code-yeongyu/senpi-codemode/src/kernels/rb/prelude.rb

@@ -140,13 +140,22 @@ def __senpi_bridge_request(path, payload)
   return body["value"] if body.is_a?(Hash) && body["ok"] == true
 
   error = body.is_a?(Hash) ? body["error"] : body
-  raise(error.is_a?(Hash) ? error["message"].to_s : error.to_s)
+  raise SenpiBridgeError.new(error.is_a?(Hash) ? error["message"].to_s : error.to_s, error.is_a?(Hash) ? error["code"] : nil)
 end
 
 def __senpi_call_tool(name, args)
   __senpi_bridge_request("/call", { "callId" => "rb-#{Process.pid}-#{rand(1_000_000)}", "toolName" => name, "args" => args })
 end
 
+class SenpiBridgeError < StandardError
+  attr_reader :code
+
+  def initialize(message, code = nil)
+    super(message)
+    @code = code
+  end
+end
+
 class SenpiToolCallable
   def initialize(name)
     @name = name
@@ -177,6 +186,8 @@ def tool
   $__senpi_tool_proxy ||= SenpiToolProxy.new
 end
 
+require_relative "workpool"
+
 def completion(prompt, model: "default", system: nil, schema: nil, **kwargs)
   options = { "model" => model }.merge(kwargs.transform_keys(&:to_s))
   options["system"] = system unless system.nil?
@@ -213,7 +224,7 @@ def agent(prompt, agent: "task", model: nil, label: nil, schema: nil, isolated:
   text_value = record.fetch("text", response)
   result = schema.nil? ? text_value : record.key?("data") ? record["data"] : JSON.parse(text_value.to_s)
   return result unless handle
-  { "text" => text_value, "output" => text_value, "handle" => record["handle"] || (record["id"] && "agent://#{record["id"]}"), "id" => record["id"], "agent" => record.fetch("agent", agent) }.tap do |node|
+  { "text" => text_value, "output" => text_value, "handle" => record["handle"] || (record["id"] && "agent://#{record["id"]}"), "id" => record["id"], "run_epoch" => record["run_epoch"], "agent" => record.fetch("agent", agent) }.tap do |node|
     node["data"] = result unless schema.nil?
   end
 end

package/node_modules/@code-yeongyu/senpi-codemode/src/kernels/rb/workpool.rb

@@ -0,0 +1,38 @@
+# Only an opaque host identity is retained; all work remains engine-owned.
+def __senpi_workpool_call(args)
+  tool.workpool(args)
+rescue SenpiBridgeError => error
+  raise SenpiBridgeError.new("No active host workpool tool", "workpool_unavailable") if ["unknown_tool", "inactive_tool"].include?(error.code)
+  raise
+end
+
+class SenpiWorkpool
+  attr_reader :pool_id
+
+  def initialize(pool_id)
+    @pool_id = pool_id
+    freeze
+  end
+
+  def push(items)
+    __senpi_workpool_call({ "op" => "push", "pool_id" => @pool_id, "items" => items })
+  end
+
+  [:close, :inspect, :cancel].each do |op|
+    define_method(op) { __senpi_workpool_call({ "op" => op.to_s, "pool_id" => @pool_id }) }
+  end
+end
+
+def workpool(agent, name, mode: nil)
+  args = { "op" => "create", "agent" => agent, "name" => name }
+  args["mode"] = mode unless mode.nil?
+  result = __senpi_workpool_call(args)
+  details = result["details"]
+  if details.is_a?(Hash)
+    error = details["error"]
+    raise SenpiBridgeError.new(error["message"], error["code"]) if error.is_a?(Hash)
+    pool_id = details["pool_id"]
+    return SenpiWorkpool.new(pool_id) if !result["hasError"] && pool_id.is_a?(String) && /\Awp_[0-9a-f]{32}\z/.match?(pool_id)
+  end
+  raise SenpiBridgeError.new("Host did not return a workpool identity", "workpool_unavailable")
+end

package/node_modules/@code-yeongyu/senpi-codemode/src/kernels/shared/subprocess-kernel.ts

@@ -1,6 +1,7 @@
 import type { HostToKernelMessage, KernelToHostMessage } from "../../bridge/protocol.ts";
 import { decodeBridgeFrame, encodeBridgeFrame, isKernelToHostMessage } from "../../bridge/protocol.ts";
 import type { KernelInterruptHandle } from "../../tool/types.ts";
+import { rejectKernelToolsUnavailable } from "../kernel-tools-unavailable.ts";
 import { applySessionEnvironment } from "../session-env.ts";
 import type { KernelResult, KernelRunInput, SubprocessKernelOptions, ToolCallMessage } from "./subprocess-contract.ts";
 import { type SubprocessLike, SubprocessProcess, type SubprocessSpawn, spawnSubprocess } from "./subprocess-process.ts";
@@ -69,6 +70,18 @@ export class SubprocessKernel {
 		return { stateRetained: Promise.resolve(false) };
 	}
 
+	listKernelToolNames(): readonly string[] {
+		return [];
+	}
+
+	describeKernelTools(_names: readonly string[]): Promise<never> {
+		return rejectKernelToolsUnavailable();
+	}
+
+	invokeKernelTool(_request: unknown, _signal?: AbortSignal): Promise<never> {
+		return rejectKernelToolsUnavailable();
+	}
+
 	nextToolCall(): Promise<ToolCallMessage> {
 		return this.runs.nextToolCall();
 	}

package/node_modules/@code-yeongyu/senpi-codemode/src/kernels/shared/subprocess-queue.ts

@@ -2,6 +2,9 @@ import type { KernelToHostMessage } from "../../bridge/protocol.ts";
 import type { KernelResult, KernelRunInput, ToolCallMessage } from "./subprocess-contract.ts";
 import { createPendingRun, failureResult, type PendingRun, settlePendingRun } from "./subprocess-run.ts";
 
+// Same bound as the JS kernel's pull-API fallback queue (context-manager.ts); clears happen at run teardown.
+const MAX_PENDING_TOOL_CALLS = 256;
+
 export class SubprocessRunQueue {
 	readonly #queue: PendingRun[] = [];
 	readonly #pendingCalls: ToolCallMessage[] = [];
@@ -59,7 +62,10 @@ export class SubprocessRunQueue {
 	pushToolCall(message: ToolCallMessage): void {
 		const waiter = this.#callWaiters.shift();
 		if (waiter) waiter(message);
-		else this.#pendingCalls.push(message);
+		else {
+			this.#pendingCalls.push(message);
+			if (this.#pendingCalls.length > MAX_PENDING_TOOL_CALLS) this.#pendingCalls.shift();
+		}
 	}
 
 	handleMessage(
@@ -90,6 +96,8 @@ export class SubprocessRunQueue {
 			case "ready":
 			case "init-failed":
 			case "closed":
+			case "kernel-tool-describe-reply":
+			case "kernel-tool-invoke-reply":
 				onMessage?.(message);
 				return false;
 			default: {

package/node_modules/@code-yeongyu/senpi-codemode/src/prompt/eval-prompt-template.ts

@@ -57,8 +57,10 @@ tool_schema(name?) → dict
 completion(prompt, model?="default", system?=None, schema?=None) → str | dict
     Oneshot, stateless. \`model\`: \`"smol"\` fast | \`"default"\` session | \`"slow"\` most capable. \`schema\` (JSON-Schema) → parsed structured output.
 {{#if spawns}}agent(prompt, agent?="{{spawnDefaultAgent}}", model?=None, label?=None, schema?=None, handle?=False) → str | dict
-    Run a subagent → final output. \`agent\` picks a discovered agent. \`schema\` as in completion(). \`handle\` → workflow node { text, output, handle: \`agent://<id>\`, id, agent } (parsed under \`data\` with \`schema\`).
-{{/if}}parallel(thunks) → list
+    Run a subagent → final output. \`agent\` picks a discovered agent. \`schema\` as in completion(). \`handle\` → workflow node { text, output, handle: \`agent://<id>\`, id, run_epoch, agent } (parsed under \`data\` with \`schema\`).
+{{/if}}workpool(agent, name, mode?) → { pool_id, push(items), close(), inspect(), cancel() }
+    Thin host-tool adapter; agent is a plain-data spec. The host owns scheduling and keyed yields; explicitly close for automatic aggregate delivery. Requires the host workpool tool; omitted mode uses its default.
+parallel(thunks) → list
     Thunks through a bounded pool (as wide as a \`task\` batch), input order kept; a throwing thunk propagates.
 pipeline(items, ...stages) → list
     Map items through one-arg stages with a barrier between stages; each stage receives the previous stage's result.

package/node_modules/@code-yeongyu/senpi-codemode/src/tool/cell-handler.ts

@@ -1,4 +1,9 @@
-import { type AgentToolResult, type ExtensionContext, sanitizeTerminalLabel } from "@code-yeongyu/senpi";
+import {
+	type AgentToolResult,
+	type ExtensionContext,
+	kernelToolsStorage,
+	sanitizeTerminalLabel,
+} from "@code-yeongyu/senpi";
 import type { KernelToHostMessage } from "../bridge/protocol.ts";
 import { RESERVED_SCHEMA_TOOL } from "../bridge/reserved.ts";
 import type { AgentExecuteTool } from "../bridges/agent-bridge.ts";
@@ -8,6 +13,7 @@ import { appendSchemaHint } from "../bridges/schema-hint.ts";
 import type { CompletionRequest, CompletionResult } from "../completion/handler.ts";
 import { handleCompletionToolCall } from "../completion/tool-bridge.ts";
 import type { ResolvedCodemodeSettings } from "../config/settings.ts";
+import type { KernelToolsCapability } from "../kernels/js/kernel-tools-types.ts";
 import {
 	boundToolCallArgs,
 	capCodePoints,
@@ -39,6 +45,8 @@ export interface CellBridgeRuntime {
 	readonly ctx: ExtensionContext;
 	readonly artifactPath?: string;
 	readonly imageResizer?: EvalImageResizer;
+	/** This cell's live kernel-tool capability; only a JS kernel has one (#1754). */
+	readonly kernelTools?: KernelToolsCapability;
 }
 
 export class CellHandler {
@@ -81,7 +89,7 @@ export class CellHandler {
 				this.#resultBuilder.display(message);
 				return;
 			case "tool-call": {
-				const pending = this.#handleToolCall(message);
+				const pending = this.#dispatchToolCall(message);
 				this.#state.pendingBridgeCalls.push(pending);
 				await pending;
 				return;
@@ -90,6 +98,8 @@ export class CellHandler {
 			case "init-failed":
 			case "result":
 			case "closed":
+			case "kernel-tool-describe-reply":
+			case "kernel-tool-invoke-reply":
 				return;
 			default:
 				throw new TypeError(`Unhandled kernel message: ${String(message)}`);
@@ -112,6 +122,19 @@ export class CellHandler {
 		return this.#resultBuilder.liveResult();
 	}
 
+	/**
+	 * The worker's message loop fires outside the async context `run-eval-cell.ts` enters around the
+	 * awaited run chain, so the capability has to be entered here — around the whole dispatch, including
+	 * the reserved agent()/output() bridges where a host task tool resolves the parent's kernel tools —
+	 * for exactly the duration of each host tool call this cell makes (#1754). Without a capability
+	 * (py/rb/jl) the store stays empty and `ctx.kernelTools` remains undefined.
+	 */
+	async #dispatchToolCall(message: Extract<KernelToHostMessage, { type: "tool-call" }>): Promise<void> {
+		const kernelTools = this.#runtime.kernelTools;
+		if (kernelTools === undefined) return await this.#handleToolCall(message);
+		return await kernelToolsStorage.run(kernelTools, async () => await this.#handleToolCall(message));
+	}
+
 	async #handleToolCall(message: Extract<KernelToHostMessage, { type: "tool-call" }>): Promise<void> {
 		const startedAt = Date.now();
 		const metric = createToolCallMetric(message.toolName, startedAt);
@@ -223,7 +246,12 @@ export class CellHandler {
 				type: "tool-reply",
 				callId: message.callId,
 				ok: false,
-				error: { message: text },
+				error: {
+					message: text,
+					...(error instanceof Error && "code" in error && typeof error.code === "string"
+						? { code: error.code }
+						: {}),
+				},
 			});
 		}
 		this.#resultBuilder.emitUpdate(false);

package/node_modules/@code-yeongyu/senpi-codemode/src/tool/detached-cell-manager.ts

@@ -1,14 +1,12 @@
 import type { AgentToolResult } from "@code-yeongyu/senpi";
 import { DEFAULT_HARD_LIMIT_SECONDS, DEFAULT_RUN_BUDGET_SECONDS } from "../config/settings.ts";
 import type { WakeSourceState } from "../extension/wake-source-state.ts";
-import { type CellDeadlineExpiry, CellDeadlines } from "./cell-deadlines.ts";
+import type { CellDeadlineExpiry } from "./cell-deadlines.ts";
 import type {
 	EvalDetachedCellManagerOptions,
 	EvalDetachedCellSnapshot,
-	EvalDetachedCellState,
 	EvalDetachedCellStatusEntry,
 } from "./detached-cell-contract.ts";
-import { detachedNotificationSpillPath } from "./detached-cell-notification.ts";
 import { currentDetachedResult, detachedErrorResult, snapshotDetachedCell } from "./detached-cell-snapshot.ts";
 import {
 	activeDetachedCellReuseError,
@@ -17,6 +15,8 @@ import {
 } from "./detached-cell-state.ts";
 import { detachedStatusEntries, detachedWakeSourceState } from "./detached-cell-status.ts";
 import { DetachedNotificationQueue } from "./detached-notification-queue.ts";
+import { createManagedCell, type LiveResultProvider, type ManagedCell } from "./managed-cell.ts";
+import { TerminalSnapshotStore } from "./terminal-snapshot-store.ts";
 import type { EvalKernel, EvalLanguage, EvalToolDetails, EvalToolInput } from "./types.ts";
 
 export type {
@@ -28,40 +28,13 @@ export type {
 	EvalDetachedCellStatusEntry,
 } from "./detached-cell-contract.ts";
 
-type LiveResultProvider = () => AgentToolResult<EvalToolDetails>;
-
-type ManagedCell = {
-	readonly cellId: string;
-	readonly input: EvalToolInput;
-	readonly spillPath: string | undefined;
-	readonly startedAtMs: number;
-	readonly terminal: PromiseWithResolvers<EvalDetachedCellSnapshot>;
-	state: EvalDetachedCellState;
-	canDetach: boolean;
-	wasDetached: boolean;
-	kernel: EvalKernel | undefined;
-	stateRetained: boolean | undefined;
-	interruptNote: string | undefined;
-	/** Holds the completion notification until the interrupt has reported whether kernel state survived. */
-	interruptOutcome: PromiseWithResolvers<void> | undefined;
-	liveResult: LiveResultProvider | undefined;
-	terminalResult: AgentToolResult<EvalToolDetails> | undefined;
-	notificationQueued: boolean;
-	readonly deadlines: CellDeadlines;
-	readonly hardLimitSeconds: number;
-	readonly runBudgetSeconds: number;
-	hardLimited: boolean;
-	runBudgetExhausted: boolean;
-	/** Foreground killer: the still-awaited CellExecution owns interrupting and rejecting its own call; bound from creation so a deadline firing during kernel boot still ends it. */
-	onKill: ((error: Error) => void) | undefined;
-};
-
 export class EvalDetachedCellManager {
 	readonly #artifactsDir: string | undefined;
 	readonly #onStatusChange: ((entries: readonly EvalDetachedCellStatusEntry[]) => void) | undefined;
 	readonly #onWakeSourceState: ((state: WakeSourceState) => void) | undefined;
 	readonly #cells = new Map<string, ManagedCell>();
 	readonly #detachedByLanguage = new Map<EvalLanguage, ManagedCell>();
+	readonly #terminalSnapshots = new TerminalSnapshotStore();
 	readonly #notificationQueue: DetachedNotificationQueue;
 	readonly #now: () => number;
 	readonly #hardLimitSeconds: number;
@@ -83,40 +56,20 @@ export class EvalDetachedCellManager {
 			if (detachedCellIsActive(existing.state)) throw activeDetachedCellReuseError(existing);
 			this.#cells.delete(cellId);
 		}
-		// An explicit longer per-call timeout raises the deadline, mirroring bash keeping explicit timeouts.
-		const hardLimitSeconds = Math.max(this.#hardLimitSeconds, input.timeout ?? 0);
-		const runBudgetSeconds = input.timeout ?? this.#runBudgetSeconds;
-		const cell: ManagedCell = {
+		this.#terminalSnapshots.delete(cellId);
+		const cell = createManagedCell({
 			cellId,
 			input,
-			spillPath: detachedNotificationSpillPath(this.#artifactsDir, cellId),
-			startedAtMs: this.#now(),
-			state: "running",
-			canDetach: false,
-			wasDetached: false,
-			kernel: undefined,
-			stateRetained: undefined,
-			interruptNote: undefined,
-			interruptOutcome: undefined,
-			liveResult: undefined,
-			terminalResult: undefined,
-			notificationQueued: false,
-			deadlines: new CellDeadlines({
-				cellId,
-				hardLimitSeconds,
-				runBudgetSeconds,
-				onExpire: (expiry) => {
-					const managed = this.#cells.get(cellId);
-					if (managed !== undefined) void this.#expireDeadline(managed, expiry);
-				},
-			}),
-			hardLimitSeconds,
-			runBudgetSeconds,
-			hardLimited: false,
-			runBudgetExhausted: false,
+			artifactsDir: this.#artifactsDir,
+			now: this.#now,
+			defaultHardLimitSeconds: this.#hardLimitSeconds,
+			defaultRunBudgetSeconds: this.#runBudgetSeconds,
 			onKill,
-			terminal: Promise.withResolvers<EvalDetachedCellSnapshot>(),
-		};
+			onExpire: (expiredId, expiry) => {
+				const managed = this.#cells.get(expiredId);
+				if (managed !== undefined) void this.#expireDeadline(managed, expiry);
+			},
+		});
 		this.#cells.set(cellId, cell);
 		return cell;
 	}
@@ -166,13 +119,15 @@ export class EvalDetachedCellManager {
 	}
 
 	async stop(cellId: string, reason = "Stopped detached eval cell"): Promise<EvalDetachedCellSnapshot> {
-		const cell = this.#get(cellId);
-		if (cell.state === "detached") await this.#cancel(cell, reason);
-		return this.#snapshot(cell);
+		const live = this.#cells.get(cellId);
+		if (live === undefined) return this.#terminal(cellId);
+		if (live.state === "detached") await this.#cancel(live, reason);
+		return this.#snapshot(live);
 	}
 
 	peek(cellId: string): EvalDetachedCellSnapshot {
-		return this.#snapshot(this.#get(cellId));
+		const live = this.#cells.get(cellId);
+		return live === undefined ? this.#terminal(cellId) : this.#snapshot(live);
 	}
 
 	busyFor(language: EvalLanguage): EvalDetachedCellSnapshot | undefined {
@@ -181,7 +136,8 @@ export class EvalDetachedCellManager {
 	}
 
 	async waitForTerminal(cellId: string): Promise<EvalDetachedCellSnapshot> {
-		return await this.#get(cellId).terminal.promise;
+		const live = this.#cells.get(cellId);
+		return live === undefined ? this.#terminal(cellId) : await live.terminal.promise;
 	}
 
 	async dispose(): Promise<void> {
@@ -191,6 +147,8 @@ export class EvalDetachedCellManager {
 		);
 		if (detached.length === 0) this.#emitWakeSourceState([]);
 		await this.#notificationQueue.flush();
+		this.#cells.clear();
+		this.#terminalSnapshots.clear();
 	}
 
 	async flushNotifications(): Promise<void> {
@@ -213,6 +171,8 @@ export class EvalDetachedCellManager {
 		cell.terminalResult = result;
 		cell.liveResult = undefined;
 		cell.terminal.resolve(this.#snapshot(cell));
+		this.#cells.delete(cell.cellId);
+		this.#refreshTerminalSnapshot(cell);
 		if (cell.wasDetached) {
 			if (this.#detachedByLanguage.get(cell.input.language) === cell)
 				this.#detachedByLanguage.delete(cell.input.language);
@@ -257,9 +217,14 @@ export class EvalDetachedCellManager {
 			cell.stateRetained = await handle.stateRetained;
 		} finally {
 			outcome.resolve();
+			this.#refreshTerminalSnapshot(cell);
 		}
 	}
 
+	#refreshTerminalSnapshot(cell: ManagedCell): void {
+		if (!this.#cells.has(cell.cellId)) this.#terminalSnapshots.remember(this.#snapshot(cell));
+	}
+
 	#emitStatus(): void {
 		const liveCells = [...this.#detachedByLanguage.values()];
 		this.#onStatusChange?.(detachedStatusEntries(liveCells));
@@ -274,9 +239,9 @@ export class EvalDetachedCellManager {
 		return snapshotDetachedCell(cell, this.#now());
 	}
 
-	#get(cellId: string): ManagedCell {
-		const cell = this.#cells.get(cellId);
-		if (cell === undefined) throw new Error(`Unknown detached eval cell "${cellId}"`);
-		return cell;
+	#terminal(cellId: string): EvalDetachedCellSnapshot {
+		const snapshot = this.#terminalSnapshots.get(cellId);
+		if (snapshot === undefined) throw new Error(`Unknown detached eval cell "${cellId}"`);
+		return snapshot;
 	}
 }

package/node_modules/@code-yeongyu/senpi-codemode/src/tool/image-resize.ts

@@ -0,0 +1,52 @@
+import type { ExtensionContext } from "@code-yeongyu/senpi";
+import { convertToPng, formatDimensionNote, resizeImage } from "@code-yeongyu/senpi";
+
+export interface EvalImageContent {
+	readonly type: "image";
+	readonly data: string;
+	readonly mimeType: string;
+}
+
+export interface EvalImageResizeResult {
+	readonly image: EvalImageContent;
+	readonly dimensionNote?: string;
+}
+
+export type EvalImageResizer = (
+	image: EvalImageContent,
+	model: ExtensionContext["model"],
+) => Promise<EvalImageResizeResult>;
+
+type WebpModel = { readonly provider: string; readonly api: string } | undefined;
+
+export function webpExclusionForModel(model: WebpModel): true | undefined {
+	if (model === undefined) return undefined;
+	return model.provider === "ollama" ||
+		model.provider === "ollama-cloud" ||
+		model.provider === "llama.cpp" ||
+		model.provider === "lm-studio" ||
+		model.provider === "local-server" ||
+		model.api === "ollama-chat"
+		? true
+		: undefined;
+}
+
+export const resizeEvalImage: EvalImageResizer = async (image, model) => {
+	const excludeWebP = webpExclusionForModel(model);
+	const forceWebpConversion = excludeWebP === true && image.mimeType === "image/webp";
+	const resized = await resizeImage(
+		Buffer.from(image.data, "base64"),
+		image.mimeType,
+		forceWebpConversion ? { maxBytes: Buffer.byteLength(image.data, "utf8") } : undefined,
+	);
+	let output: EvalImageContent =
+		resized === null ? image : { type: "image", data: resized.data, mimeType: resized.mimeType };
+	if (excludeWebP === true && output.mimeType === "image/webp") {
+		const converted = await convertToPng(output.data, output.mimeType);
+		if (converted === null)
+			throw new TypeError(`Unable to convert ${output.mimeType} display output for the active model`);
+		output = { type: "image", data: converted.data, mimeType: converted.mimeType };
+	}
+	const dimensionNote = resized === null ? undefined : formatDimensionNote(resized);
+	return { image: output, ...(dimensionNote === undefined ? {} : { dimensionNote }) };
+};

package/node_modules/@code-yeongyu/senpi-codemode/src/tool/image.ts

@@ -1,6 +1,5 @@
 import { writeFile } from "node:fs/promises";
-import type { AgentToolResult, ExtensionContext } from "@code-yeongyu/senpi";
-import { convertToPng, formatDimensionNote, resizeImage } from "@code-yeongyu/senpi";
+import type { ExtensionContext } from "@code-yeongyu/senpi";
 import type { KernelToHostMessage } from "../bridge/protocol.ts";
 import type { TruncationMeta } from "../output/output-meta.ts";
 import {
@@ -12,24 +11,24 @@ import {
 	TailBuffer,
 	truncateTail,
 } from "../output/streaming-output.ts";
+import { type EvalImageContent, type EvalImageResizer, resizeEvalImage } from "./image-resize.ts";
 
-const MAX_DISPLAY_TEXT_BYTES = 8_000;
-
-export interface EvalImageContent {
-	readonly type: "image";
-	readonly data: string;
-	readonly mimeType: string;
-}
+export {
+	type EvalImageContent,
+	type EvalImageResizeResult,
+	type EvalImageResizer,
+	resizeEvalImage,
+	webpExclusionForModel,
+} from "./image-resize.ts";
+export { marshalToolResult, toolResultIsError } from "./tool-result-marshal.ts";
 
-export interface EvalImageResizeResult {
-	readonly image: EvalImageContent;
-	readonly dimensionNote?: string;
-}
+const MAX_DISPLAY_TEXT_BYTES = 8_000;
 
-export type EvalImageResizer = (
-	image: EvalImageContent,
-	model: ExtensionContext["model"],
-) => Promise<EvalImageResizeResult>;
+// Per-cell display caps: display payloads are retained for the whole result lifetime, so an unbounded
+// burst pins base64 originals plus resized copies on the session heap (#1695).
+const MAX_DISPLAY_IMAGES_PER_CELL = 8;
+const MAX_DISPLAY_IMAGE_BYTES_PER_CELL = 24 * 1024 * 1024;
+const MAX_JSON_OUTPUTS_PER_CELL = 64;
 
 export interface EvalOutputOptions {
 	readonly artifactPath?: string;
@@ -51,7 +50,6 @@ export interface EvalOutputResult {
 }
 
 type DisplayMessage = Extract<KernelToHostMessage, { type: "display" }>;
-type WebpModel = { readonly provider: string; readonly api: string } | undefined;
 
 class DisplayPayloadError extends Error {
 	readonly name = "DisplayPayloadError";
@@ -69,6 +67,9 @@ export class EvalOutputCollector {
 	readonly #displayImages: EvalImageContent[] = [];
 	readonly #images: EvalImageContent[] = [];
 	readonly #jsonOutputs: unknown[] = [];
+	#displayImageBytes = 0;
+	#displayImagesElided = 0;
+	#jsonOutputsElided = 0;
 	#hasMarkdown = false;
 	#imagesProcessed = false;
 
@@ -92,11 +93,23 @@ export class EvalOutputCollector {
 
 	display(message: DisplayMessage): void {
 		if (message.mimeType.startsWith("image/")) {
+			if (
+				this.#displayImages.length >= MAX_DISPLAY_IMAGES_PER_CELL ||
+				this.#displayImageBytes + message.dataBase64.length > MAX_DISPLAY_IMAGE_BYTES_PER_CELL
+			) {
+				this.#displayImagesElided++;
+				return;
+			}
 			this.#displayImages.push({ type: "image", mimeType: message.mimeType, data: message.dataBase64 });
+			this.#displayImageBytes += message.dataBase64.length;
 			return;
 		}
 		const text = Buffer.from(message.dataBase64, "base64").toString("utf8");
 		if (message.mimeType === "application/json") {
+			if (this.#jsonOutputs.length >= MAX_JSON_OUTPUTS_PER_CELL) {
+				this.#jsonOutputsElided++;
+				return;
+			}
 			let value: unknown;
 			try {
 				value = JSON.parse(text);
@@ -118,6 +131,12 @@ export class EvalOutputCollector {
 
 	async finish(): Promise<EvalOutputResult> {
 		await this.#processImages();
+		const elided = this.#displayImagesElided + this.#jsonOutputsElided;
+		if (elided > 0) {
+			this.#sink.push(
+				`[${this.#displayImagesElided} display image(s) and ${this.#jsonOutputsElided} JSON output(s) elided beyond per-cell caps]\n`,
+			);
+		}
 		const summary = await this.#finalSummary();
 		const meta = truncationMetaFromSummary(summary, this.#options.maxColumns);
 		const notice = summary.artifactId === undefined ? undefined : artifactNotice(summary.artifactId);
@@ -171,38 +190,6 @@ export class EvalOutputCollector {
 	}
 }
 
-export function webpExclusionForModel(model: WebpModel): true | undefined {
-	if (model === undefined) return undefined;
-	return model.provider === "ollama" ||
-		model.provider === "ollama-cloud" ||
-		model.provider === "llama.cpp" ||
-		model.provider === "lm-studio" ||
-		model.provider === "local-server" ||
-		model.api === "ollama-chat"
-		? true
-		: undefined;
-}
-
-export const resizeEvalImage: EvalImageResizer = async (image, model) => {
-	const excludeWebP = webpExclusionForModel(model);
-	const forceWebpConversion = excludeWebP === true && image.mimeType === "image/webp";
-	const resized = await resizeImage(
-		Buffer.from(image.data, "base64"),
-		image.mimeType,
-		forceWebpConversion ? { maxBytes: Buffer.byteLength(image.data, "utf8") } : undefined,
-	);
-	let output: EvalImageContent =
-		resized === null ? image : { type: "image", data: resized.data, mimeType: resized.mimeType };
-	if (excludeWebP === true && output.mimeType === "image/webp") {
-		const converted = await convertToPng(output.data, output.mimeType);
-		if (converted === null)
-			throw new TypeError(`Unable to convert ${output.mimeType} display output for the active model`);
-		output = { type: "image", data: converted.data, mimeType: converted.mimeType };
-	}
-	const dimensionNote = resized === null ? undefined : formatDimensionNote(resized);
-	return { image: output, ...(dimensionNote === undefined ? {} : { dimensionNote }) };
-};
-
 function formatDisplayJson(value: unknown): string {
 	let text: string;
 	try {
@@ -259,25 +246,3 @@ function truncationMetaFromSummary(summary: OutputSummary, maxColumns: number):
 		...artifact,
 	};
 }
-
-export function marshalToolResult(result: AgentToolResult<unknown>) {
-	const texts = result.content.filter((part) => part.type === "text").map((part) => part.text);
-	const images = result.content
-		.filter((part) => part.type === "image")
-		.map((part) => ({ mimeType: part.mimeType, dataBase64: part.data }));
-	const details =
-		typeof result.details === "object" &&
-		result.details !== null &&
-		!Array.isArray(result.details) &&
-		Object.keys(result.details).length === 0
-			? undefined
-			: result.details;
-	const hasError = toolResultIsError(result);
-	const text = texts.join("\n");
-	return images.length === 0 && details === undefined && !hasError ? { text } : { text, details, images, hasError };
-}
-
-export function toolResultIsError(result: AgentToolResult<unknown>): boolean {
-	const details = result.details;
-	return typeof details === "object" && details !== null && "isError" in details && details.isError === true;
-}