@code-yeongyu/senpi-codemode 2026.9.4-3 → 2026.9.5-2

package/CHANGELOG.md

@@ -12,6 +12,32 @@
 
 ### Removed
 
+## [2026.9.5-2] - 2026-09-05
+
+### Breaking Changes
+
+### Added
+
+### Changed
+
+- The GPT eval dialect now routes a wait or a long run through `tool.monitor` inside the cell (the subscription line precedes the detach note, and the `## Tool Guidelines` line says so when `monitor` is reachable), so a GPT model no longer reads "long cells detach" as the way to wait on a `--watch`.
+
+### Fixed
+
+### Removed
+
+## [2026.9.5] - 2026-09-05
+
+### Breaking Changes
+
+### Added
+
+### Changed
+
+### Fixed
+
+### Removed
+
 ## [2026.9.4-3] - 2026-09-04
 
 ### Breaking Changes

package/README.md

@@ -112,12 +112,12 @@ options object and asynchronous helpers are `await`-able.
 
 | Helper | Contract |
 | --- | --- |
-| `display(value)` | Emits text, structured JSON, markdown, or supported image display data. |
+| `display(value)` | Emits text, structured JSON, markdown, or image display data. Images reach the model only through `display`: pass a figure, raw image bytes (PNG/JPEG/GIF/WebP/BMP sniffed), a `data:` URL, a `Blob`-like or `Bun.Image` value, a marshalled tool result, or one of its `images[i]` frames. |
 | `print(value, ...)` | Emits text output. |
 | `read(path, offset?, limit?)` | Reads text with 1-indexed line slicing. `local://` paths resolve under the session artifact root. |
 | `write(path, content)` | Creates parent directories and writes text. `local://` paths persist in the session artifact root. |
 | `env(key?, value?)` | Reads all kernel environment values, one value, or sets one value. |
-| `tool.<name>(args)` | Invokes an active Senpi tool through the normal `pi.executeTool` pipeline. |
+| `tool.<name>(args)` | Invokes an active Senpi tool through the normal `pi.executeTool` pipeline and returns `{ text, images?, details?, hasError? }` in every kernel; image blocks arrive as `images[i] = { mimeType, dataBase64 }`. |
 | `tool_schema(name?)` | Returns a tool's parameter schema without calling it; omit `name` to list tool names. |
 | `completion(prompt, model?, system?, schema?)` | Requests a one-shot host completion; `schema` asks the host to parse structured output. |
 | `agent(prompt, ...)` | Delegates to the configured active `taskTools.task` tool. Supports background handles and structured JSON results. |

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@code-yeongyu/senpi-codemode",
-	"version": "2026.9.4-3",
+	"version": "2026.9.5-2",
 	"description": "Source-only senpi extension package for codemode evaluation tools",
 	"type": "module",
 	"main": "./src/index.ts",
@@ -30,14 +30,14 @@
 	},
 	"dependencies": {
 		"@babel/parser": "8.0.4",
-		"@earendil-works/pi-ai": "npm:@code-yeongyu/senpi-ai@2026.9.4-3",
+		"@earendil-works/pi-ai": "npm:@code-yeongyu/senpi-ai@2026.9.5-2",
 		"typebox": "1.3.18"
 	},
 	"peerDependencies": {
-		"@code-yeongyu/senpi": "2026.9.4-3"
+		"@code-yeongyu/senpi": "2026.9.5-2"
 	},
 	"devDependencies": {
-		"@code-yeongyu/senpi": "2026.9.4-3"
+		"@code-yeongyu/senpi": "2026.9.5-2"
 	},
 	"keywords": [
 		"senpi",

package/src/extension/session-manager.ts

@@ -92,12 +92,16 @@ class DefaultCodemodeSessionManager implements CodemodeSessionManager {
 		});
 	}
 
-	// Subprocess kernels (py/rb/jl) reach the host only through this route, so reserved
-	// helper names must dispatch exactly as the in-process JS path does in tool/cell-handler.ts.
-	// Forwarding them to executeTool made agent() fail with "Unknown tool __agent__".
+	// Subprocess kernels (py/rb/jl) reach the host only through this route, so every reply
+	// must match the in-process JS path in tool/cell-handler.ts: reserved helper names dispatch
+	// through runReservedTool (forwarding them made agent() fail with "Unknown tool __agent__"),
+	// and ordinary tool results are marshalled to { text, images, details, hasError } — the raw
+	// { content } shape left python cells unable to reach tool.read image blocks.
 	async #call(request: { toolName: string; args: unknown; callId: string; signal: AbortSignal }): Promise<unknown> {
 		if (!isReservedToolName(request.toolName)) {
-			return await this.#options.executeTool(request.toolName, request.args, { signal: request.signal });
+			return marshalToolResult(
+				await this.#options.executeTool(request.toolName, request.args, { signal: request.signal }),
+			);
 		}
 		const taskTools = this.#options.settings.taskTools ?? defaultCodemodeSettings.taskTools;
 		return await runReservedTool(request.toolName, {

package/src/kernels/js/display-image.js

@@ -0,0 +1,162 @@
+const BASE64_STRICT_RE = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/u;
+const DECIMAL_CSV_RE = /^\d{1,3}(?:,\d{1,3})*$/u;
+const DATA_URL_RE = /^data:([^;,]+)(?:;[^,]*)?;base64,([\s\S]*)$/u;
+
+const IMAGE_SIGNATURES = [
+	{ mimeType: "image/png", offset: 0, bytes: [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a] },
+	{ mimeType: "image/jpeg", offset: 0, bytes: [0xff, 0xd8, 0xff] },
+	{ mimeType: "image/gif", offset: 0, bytes: [0x47, 0x49, 0x46, 0x38] },
+	{ mimeType: "image/webp", offset: 8, bytes: [0x57, 0x45, 0x42, 0x50] },
+	{ mimeType: "image/bmp", offset: 0, bytes: [0x42, 0x4d] },
+];
+
+export function sniffImageMimeType(bytes) {
+	for (const signature of IMAGE_SIGNATURES) {
+		if (bytes.length < signature.offset + signature.bytes.length) continue;
+		if (signature.bytes.every((byte, index) => bytes[signature.offset + index] === byte)) return signature.mimeType;
+	}
+	return undefined;
+}
+
+export function isBinaryData(value) {
+	return value instanceof ArrayBuffer || ArrayBuffer.isView(value);
+}
+
+function bytesOf(value) {
+	if (value instanceof Uint8Array) return value;
+	if (value instanceof ArrayBuffer) return new Uint8Array(value);
+	if (ArrayBuffer.isView(value)) return new Uint8Array(value.buffer, value.byteOffset, value.byteLength);
+	return undefined;
+}
+
+function normalizeBase64(text) {
+	const compact = text.replace(/\s+/gu, "").replace(/-/gu, "+").replace(/_/gu, "/");
+	const padded = compact.length % 4 === 0 ? compact : `${compact}${"=".repeat(4 - (compact.length % 4))}`;
+	return padded.length > 0 && BASE64_STRICT_RE.test(padded) ? padded : undefined;
+}
+
+function decimalCsvBase64(text) {
+	const parts = text.split(",");
+	const bytes = new Uint8Array(parts.length);
+	for (let index = 0; index < parts.length; index += 1) {
+		const byte = Number(parts[index]);
+		if (!Number.isInteger(byte) || byte < 0 || byte > 255) return undefined;
+		bytes[index] = byte;
+	}
+	return Buffer.from(bytes).toString("base64");
+}
+
+function serializedBufferBase64(data) {
+	const bytes = new Uint8Array(data.length);
+	for (let index = 0; index < data.length; index += 1) {
+		const byte = data[index];
+		if (typeof byte !== "number" || !Number.isInteger(byte) || byte < 0 || byte > 255) return undefined;
+		bytes[index] = byte;
+	}
+	return Buffer.from(bytes).toString("base64");
+}
+
+export function imagePayload(data) {
+	if (typeof data === "string") {
+		const dataUrl = DATA_URL_RE.exec(data);
+		if (dataUrl) {
+			const dataBase64 = normalizeBase64(dataUrl[2]);
+			return dataBase64 === undefined ? undefined : { dataBase64, mimeType: dataUrl[1] };
+		}
+		const dataBase64 = normalizeBase64(data);
+		if (dataBase64 !== undefined) return { dataBase64 };
+		return DECIMAL_CSV_RE.test(data) ? wrap(decimalCsvBase64(data)) : undefined;
+	}
+	const bytes = bytesOf(data);
+	if (bytes !== undefined) return { dataBase64: Buffer.from(bytes).toString("base64"), mimeType: sniffImageMimeType(bytes) };
+	if (isSerializedBuffer(data)) return wrap(serializedBufferBase64(data.data));
+	return undefined;
+}
+
+function wrap(dataBase64) {
+	return dataBase64 === undefined ? undefined : { dataBase64 };
+}
+
+function isSerializedBuffer(data) {
+	return (
+		typeof data === "object" &&
+		data !== null &&
+		Object.getPrototypeOf(data) === Object.prototype &&
+		data.type === "Buffer" &&
+		Array.isArray(data.data)
+	);
+}
+
+function describeImageData(data) {
+	if (data === null) return "null";
+	if (data instanceof Uint8Array) return "Uint8Array";
+	if (data instanceof ArrayBuffer) return "ArrayBuffer";
+	if (ArrayBuffer.isView(data)) return data.constructor.name;
+	if (typeof data === "string") return `string(${data.length})`;
+	return typeof data;
+}
+
+function isImageFrame(value) {
+	return (
+		typeof value === "object" &&
+		value !== null &&
+		typeof value.mimeType === "string" &&
+		typeof value.dataBase64 === "string"
+	);
+}
+
+function isMarshalledToolResult(value) {
+	return typeof value.text === "string" && Array.isArray(value.images) && value.images.every(isImageFrame);
+}
+
+function isEncodableImage(value) {
+	return !isBinaryData(value) && (typeof value.arrayBuffer === "function" || typeof value.bytes === "function");
+}
+
+function frame(mimeType, dataBase64) {
+	return { kind: "frame", mimeType, dataBase64 };
+}
+
+function dropped(reason) {
+	return [{ kind: "text", text: `[display: image dropped — ${reason}]` }];
+}
+
+export function resolveDisplayOps(value) {
+	if (typeof value !== "object" || value === null) return undefined;
+	if (value.type === "image" && typeof value.mimeType === "string") {
+		const payload = imagePayload(value.data);
+		return payload === undefined
+			? dropped(
+					`\`data\` must be a base64 string, data: URL, Uint8Array/Buffer, or ArrayBuffer; got ${describeImageData(value.data)}`,
+				)
+			: [frame(value.mimeType, payload.dataBase64)];
+	}
+	if (isImageFrame(value)) return [frame(value.mimeType, value.dataBase64)];
+	if (isMarshalledToolResult(value)) {
+		const frames = value.images.map((image) => frame(image.mimeType, image.dataBase64));
+		return value.text === "" ? frames : [{ kind: "text", text: value.text }, ...frames];
+	}
+	if (isBinaryData(value)) {
+		const payload = imagePayload(value);
+		return [frame(payload.mimeType ?? "application/octet-stream", payload.dataBase64)];
+	}
+	if (isEncodableImage(value)) return [{ kind: "encode", value }];
+	return undefined;
+}
+
+export async function encodeDisplayImage(value) {
+	let raw;
+	try {
+		raw = typeof value.bytes === "function" ? await value.bytes() : await value.arrayBuffer();
+	} catch (error) {
+		if (!(error instanceof Error)) throw error;
+		return dropped(`encoding failed: ${error.message}`);
+	}
+	const bytes = bytesOf(raw);
+	if (bytes === undefined) return dropped(`encoder returned ${describeImageData(raw)}, not bytes`);
+	const declared = typeof value.type === "string" && value.type.startsWith("image/") ? value.type : undefined;
+	const mimeType = declared ?? sniffImageMimeType(bytes);
+	return mimeType === undefined
+		? dropped("bytes carry no recognizable image signature")
+		: [frame(mimeType, Buffer.from(bytes).toString("base64"))];
+}

package/src/kernels/js/prelude.ts

@@ -1,12 +1,12 @@
 export const JAVASCRIPT_KERNEL_PRELUDE = [
 	"print(...values): write stdout text.",
-	"display(value): emit JSON, image, or markdown display output.",
+	"display(value): emit JSON, markdown, or image display output; image bytes, data: URLs, Blob-like values, tool results, and their images[i] frames all render as images.",
 	"log(message): emit a progress log line.",
 	"phase(title): emit a progress phase.",
 	"env(key?, value?): read, set, or list environment values.",
 	"read(path, options?): read UTF-8 text; plain paths use cwd and local:// uses the session local root.",
 	"write(path, content): write UTF-8 or binary data and return the resolved path.",
-	"tool.<name>(args): request a host tool call through the bridge.",
+	"tool.<name>(args): request a host tool call through the bridge; resolves to { text, images?, details?, hasError? }.",
 	"completion(prompt, options?): request a host completion bridge call.",
 	"output(...ids, options?): retrieve task output through the reserved output bridge.",
 	"agent(prompt, options?): delegate work through the reserved agent bridge.",

package/src/kernels/js/worker-runtime.js

@@ -2,13 +2,12 @@
 import { mkdir, readFile, stat, writeFile } from "node:fs/promises";
 import { dirname, isAbsolute, join, normalize, resolve, sep } from "node:path";
 import { inspect } from "node:util";
+import { encodeDisplayImage, resolveDisplayOps } from "./display-image.js";
 import { awaitMaybePromise, indirectEval, wrapUserCode } from "./worker-indirect-eval.js";
 import { installShellCapture } from "./worker-shell-capture.js";
 
 const PREPARED_CELL_PREFIX = "/*senpi:prepared-cell*/";
 const INTERNAL_URL = /^([a-z][a-z0-9+.-]*):\/\/(.*)$/iu;
-const BASE64_STRICT_RE = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/u;
-const DECIMAL_CSV_RE = /^\d{1,3}(?:,\d{1,3})*$/u;
 
 export class JsWorkerRuntime {
 	#cwd;
@@ -16,6 +15,7 @@ export class JsWorkerRuntime {
 	#localRoots;
 	#env = new Map();
 	#hooks = null;
+	#pendingDisplays = [];
 
 	constructor(options) {
 		this.#cwd = options.cwd;
@@ -36,12 +36,23 @@ export class JsWorkerRuntime {
 				({ prelude, code: cellCode } = prepared);
 			}
 			if (prelude) indirectEval(prelude, `${cellId}:prelude`);
-			return await awaitMaybePromise(indirectEval(wrapUserCode(cellCode), cellId));
+			const value = await awaitMaybePromise(indirectEval(wrapUserCode(cellCode), cellId));
+			await this.#drainPendingDisplays();
+			return value;
 		} finally {
+			this.#pendingDisplays = [];
 			this.#hooks = null;
 		}
 	}
 
+	async #drainPendingDisplays() {
+		while (this.#pendingDisplays.length > 0) {
+			const pending = this.#pendingDisplays;
+			this.#pendingDisplays = [];
+			await Promise.all(pending);
+		}
+	}
+
 	#installGlobals() {
 		globalThis.print = (...values) => this.#emitText("stdout", `${values.map(formatValue).join(" ")}\n`);
 		globalThis.display = value => this.#display(value);
@@ -112,22 +123,8 @@ export class JsWorkerRuntime {
 				this.#hooks?.emit({ type: "display", mimeType: "text/markdown", dataBase64: encodeBase64(value.text) });
 				return;
 			}
-			if (value.type === "image" && typeof value.mimeType === "string") {
-				const dataBase64 = imageBase64(value.data);
-				if (dataBase64 !== undefined) {
-					this.#hooks?.emit({ type: "display", mimeType: value.mimeType, dataBase64 });
-					return;
-				}
-				this.#emitText(
-					"stdout",
-					`[display: image dropped — \`data\` must be a base64 string, Uint8Array/Buffer, or ArrayBuffer; got ${describeImageData(value.data)}]\n`,
-				);
-				return;
-			}
-			if (typeof value.mimeType === "string" && typeof value.dataBase64 === "string") {
-				this.#hooks?.emit({ type: "display", mimeType: value.mimeType, dataBase64: value.dataBase64 });
-				return;
-			}
+			const ops = resolveDisplayOps(value);
+			if (ops !== undefined) return this.#applyDisplayOps(ops);
 			try {
 				this.#hooks?.emit({ type: "display", mimeType: "application/json", dataBase64: encodeBase64(JSON.stringify(value)) });
 			} catch (error) {
@@ -139,6 +136,19 @@ export class JsWorkerRuntime {
 		this.#emitText("stdout", `${String(value)}\n`);
 	}
 
+	#applyDisplayOps(ops) {
+		let pending;
+		for (const op of ops) {
+			if (op.kind === "frame") this.#hooks?.emit({ type: "display", mimeType: op.mimeType, dataBase64: op.dataBase64 });
+			else if (op.kind === "text") this.#emitText("stdout", `${op.text}\n`);
+			else {
+				pending = encodeDisplayImage(op.value).then((encoded) => this.#applyDisplayOps(encoded));
+				this.#pendingDisplays.push(pending);
+			}
+		}
+		return pending;
+	}
+
 	#envHelper(key, value) {
 		if (key === undefined || key === null || key === "") {
 			const merged = Object.fromEntries(Object.entries({ ...process.env, ...Object.fromEntries(this.#env) }).sort());
@@ -357,47 +367,6 @@ async function writeData(value) {
 	throw new TypeError("write() expects string, Blob, ArrayBuffer, or TypedArray data");
 }
 
-function imageBase64(data) {
-	if (typeof data === "string") {
-		if (isStrictBase64(data)) return data;
-		if (!DECIMAL_CSV_RE.test(data)) return undefined;
-		const parts = data.split(",");
-		const bytes = new Uint8Array(parts.length);
-		for (let index = 0; index < parts.length; index += 1) {
-			const byte = Number(parts[index]);
-			if (!Number.isInteger(byte) || byte < 0 || byte > 255) return undefined;
-			bytes[index] = byte;
-		}
-		return Buffer.from(bytes).toString("base64");
-	}
-	if (data instanceof Uint8Array) return Buffer.from(data).toString("base64");
-	if (data instanceof ArrayBuffer) return Buffer.from(data).toString("base64");
-	if (ArrayBuffer.isView(data)) return Buffer.from(data.buffer, data.byteOffset, data.byteLength).toString("base64");
-	if (isPlainObject(data) && data.type === "Buffer" && Array.isArray(data.data)) {
-		const bytes = new Uint8Array(data.data.length);
-		for (let index = 0; index < data.data.length; index += 1) {
-			const byte = data.data[index];
-			if (typeof byte !== "number" || !Number.isInteger(byte) || byte < 0 || byte > 255) return undefined;
-			bytes[index] = byte;
-		}
-		return Buffer.from(bytes).toString("base64");
-	}
-	return undefined;
-}
-
-function isStrictBase64(value) {
-	return value.length > 0 && value.length % 4 === 0 && BASE64_STRICT_RE.test(value);
-}
-
-function describeImageData(data) {
-	if (data === null) return "null";
-	if (data instanceof Uint8Array) return "Uint8Array";
-	if (data instanceof ArrayBuffer) return "ArrayBuffer";
-	if (ArrayBuffer.isView(data)) return data.constructor.name;
-	if (typeof data === "string") return `string(${data.length})`;
-	return typeof data;
-}
-
 function chunkToString(chunk, encoding) {
 	if (typeof chunk === "string") return chunk;
 	if (chunk instanceof Uint8Array) return Buffer.from(chunk).toString(encoding ?? "utf8");

package/src/kernels/py/prelude.py

@@ -91,6 +91,68 @@ def b64_text(value: str) -> str:
     return base64.b64encode(value.encode("utf-8")).decode("ascii")
 
 
+_IMAGE_SIGNATURES: tuple[tuple[str, int, bytes], ...] = (
+    ("image/png", 0, b"\x89PNG\r\n\x1a\n"),
+    ("image/jpeg", 0, b"\xff\xd8\xff"),
+    ("image/gif", 0, b"GIF8"),
+    ("image/webp", 8, b"WEBP"),
+    ("image/bmp", 0, b"BM"),
+)
+_DATA_URL_RE = re.compile(r"^data:([^;,]+)(?:;[^,]*)?;base64,(.*)$", re.DOTALL)
+
+
+def _sniff_image_mime_type(data: bytes) -> str | None:
+    for mime_type, offset, magic in _IMAGE_SIGNATURES:
+        if data[offset : offset + len(magic)] == magic:
+            return mime_type
+    return None
+
+
+def _image_base64(data: Any) -> tuple[str, str | None] | None:
+    if isinstance(data, (bytes, bytearray)):
+        raw = bytes(data)
+        return base64.b64encode(raw).decode("ascii"), _sniff_image_mime_type(raw)
+    if not isinstance(data, str):
+        return None
+    declared: str | None = None
+    match = _DATA_URL_RE.match(data)
+    if match:
+        declared, data = match.group(1), match.group(2)
+    compact = re.sub(r"\s+", "", data).replace("-", "+").replace("_", "/")
+    compact += "=" * (-len(compact) % 4)
+    try:
+        base64.b64decode(compact, validate=True)
+    except (ValueError, TypeError):
+        return None
+    return (compact, declared) if compact else None
+
+
+def _display_image_dict(value: dict[str, Any]) -> bool:
+    mime_type = value.get("mimeType")
+    payload = value.get("dataBase64") if "dataBase64" in value else value.get("data")
+    if not isinstance(mime_type, str) or not mime_type.startswith("image/") or payload is None:
+        return False
+    encoded = _image_base64(payload)
+    if encoded is None:
+        print(f"[display: image dropped \u2014 `data` must be base64, a data: URL, or bytes; got {type(payload).__name__}]")
+        return True
+    emit({"type": "display", "mimeType": mime_type, "dataBase64": encoded[0]})
+    return True
+
+
+def _display_tool_result(value: dict[str, Any]) -> bool:
+    text, images = value.get("text"), value.get("images")
+    if not isinstance(text, str) or not isinstance(images, list):
+        return False
+    if not all(isinstance(image, dict) and isinstance(image.get("mimeType"), str) and isinstance(image.get("dataBase64"), str) for image in images):
+        return False
+    if text:
+        print(text)
+    for image in images:
+        emit({"type": "display", "mimeType": image["mimeType"], "dataBase64": image["dataBase64"]})
+    return True
+
+
 def _emit_display(mime_type: str, data: Any) -> None:
     if isinstance(data, (bytes, bytearray)):
         encoded = base64.b64encode(bytes(data)).decode("ascii")
@@ -188,11 +250,14 @@ def _rich_bundle(value: Any) -> dict[str, Any]:
 
 
 def display(value: Any) -> None:
+    if isinstance(value, dict) and (_display_tool_result(value) or _display_image_dict(value)):
+        return
     if isinstance(value, (dict, list, tuple)):
         _emit_display("application/json", value)
         return
     if isinstance(value, (bytes, bytearray)):
-        _emit_display("application/octet-stream", bytes(value))
+        raw = bytes(value)
+        _emit_display(_sniff_image_mime_type(raw) or "application/octet-stream", raw)
         return
     bundle = _rich_bundle(value)
     if bundle and _display_bundle(bundle):

package/src/prompt/eval-prompt.ts

@@ -77,9 +77,9 @@ const EVAL_PROMPT_TEMPLATE = `Run one step of code in a persistent kernel.
 {{#if monitor}}- Start long-running work (build, test run, deploy, or watch) through \`tool.monitor({ command, filter })\`, putting the decisive-line filter inside the same cell, then keep working until its event wakes the turn.{{/if}}
 </eval_first_batching>{{/if}}{{#if styleGpt}}<gpt_eval_dialect>
 GPT eval: compose multi-tool work inside one cell with \`tool.<name>(args)\` and \`parallel(thunks)\`; do not split a planned step into serial tool calls.
-- Long cells detach on timeout and notify on completion; do not poll or re-run them.
+{{#if monitor}}- A wait or a long run (build, test run, deploy, watch) starts through \`tool.monitor({ command, filter })\` in that same cell with the decisive-line filter; its event wakes the turn, so no cell sits on the wait and no child is spawned for it.
+{{/if}}- Long cells detach on timeout and notify on completion; do not poll or re-run them.
 - Filter, join, and aggregate tool results in the cell; return only decision-relevant facts.
-{{#if monitor}}- For long-running build, test run, deploy, or watch work, start \`tool.monitor({ command, filter })\` with the decisive-line filter in the same cell; keep working until its event wakes the turn.{{/if}}
 </gpt_eval_dialect>{{/if}}{{#if styleCodex}}Route multi-call steps through eval: one cell per step, independent lookups dispatched together via \`parallel(thunks)\`; keep work sequential only when one result determines the next action.
 - Loop or comprehend over file sets with \`read()\`/stdlib instead of reading files one call at a time; post-process \`tool.<name>()\` results programmatically — filter, join, aggregate.
 - Wrap failable calls in try/except inside the cell; a failed item degrades only itself. After two distinct failed strategies for the same fact, fall back to direct tool calls.
@@ -112,7 +112,7 @@ On error, fix and re-run only the failing step; a normal error keeps state, whil
 {{#ifAll py js}}Same helpers + arg order, both runtimes. Python: sync, options = trailing kwargs. JS: async/\`await\`able, options = ONE trailing object literal, never positional (extras throw).{{else}}{{#if py}}Sync; options = trailing kwargs.{{/if}}{{#if js}}Async/\`await\`able; options = ONE trailing object literal, never positional (extras throw).{{/if}}{{/ifAll}}{{#if rb}} Ruby: sync, options = trailing keyword args.{{/if}}{{#if jl}} Julia: sync, options = trailing keyword args.{{/if}}
 \`\`\`
 display(value) → None
-    Cell output; figures/images/dataframes shown natively.
+    Cell output. Images reach you only through display: pass a figure, image bytes, a tool result, or its \`images[i]\`.
 print(value, ...) → None
     Text output.
 read(path, offset?=1, limit?=None) → str
@@ -123,8 +123,8 @@ env(key?=None, value?=None) → str | None | dict
     No args → full env dict; one → value; two → set \`key=value\`.
 {{#if spawns}}output(*ids, format?="raw", offset?=None, limit?=None) → str | dict | list[dict]
     Task/agent output by id. Reads immediately: running tasks return their status; \`format\` \`"raw"\` = full, \`"tail"\` = trailing.
-{{/if}}tool.<name>(args) → unknown
-    Invoke any session tool; \`args\` = its parameter object.
+{{/if}}tool.<name>(args) → { text, images?, details?, hasError? }
+    Invoke any session tool; image results (e.g. \`tool.read\` on a png) arrive in \`images[i]\` as { mimeType, dataBase64 }.
 tool_schema(name?) → dict
     Parameter schema of a tool (omit \`name\` to list tool names); a failed \`tool.<name>()\` call also returns the expected parameters.
 completion(prompt, model?="default", system?=None, schema?=None) → str | dict
@@ -182,7 +182,7 @@ export function buildEvalPrompt(
 		description,
 		promptSnippet: "Run one incremental code cell in a persistent language kernel.",
 		promptGuidelines: [
-			BATCHING_GUIDELINES[style],
+			style === "gpt" && context.monitor === true ? GPT_MONITOR_BATCHING_GUIDELINE : BATCHING_GUIDELINES[style],
 			"Use eval reset only when a language kernel must be wiped; reset is scoped to the selected language.",
 		],
 	};
@@ -191,8 +191,13 @@ export function buildEvalPrompt(
 /**
  * System-prompt guideline per emphasis dialect. The default dialect carries
  * maximum emphasis so unmapped models still batch through eval; the others are
- * tuned to what steers that family reliably.
+ * tuned to what steers that family reliably. The GPT line routes waits to the
+ * subscription when `monitor` is reachable, because a GPT model that reads
+ * "long cells detach" as the way to wait awaits a `--watch` inside a cell.
  */
+const GPT_MONITOR_BATCHING_GUIDELINE =
+	"Use eval to compose tool work in one cell; a wait or a long run starts through `tool.monitor` in that cell, so no cell sits on it and nothing polls.";
+
 const BATCHING_GUIDELINES: Record<EvalEmphasisStyle, string> = {
 	default:
 		"**EVAL FIRST.** Any step needing MORE THAN ONE tool call MUST be ONE eval cell: run independent calls in parallel, wrap risky calls in try/except, and return distilled facts — NEVER a chain of single tool calls.",

package/src/tool/types.ts

@@ -3,7 +3,7 @@ import { type TUnsafe, Type } from "typebox";
 import type { HostToKernelMessage, KernelToHostMessage } from "../bridge/protocol.ts";
 import type { TruncationMeta } from "../output/output-meta.ts";
 
-export const evalLanguageOrder = ["py", "js", "rb", "jl"] as const;
+export const evalLanguageOrder = ["js", "py", "rb", "jl"] as const;
 export type EvalLanguage = (typeof evalLanguageOrder)[number];
 export type EnabledEvalLanguages = Readonly<Record<EvalLanguage, boolean>>;
 
@@ -43,7 +43,7 @@ const fullEvalInputSchema = Type.Object({
 		}),
 	),
 	language: Type.Optional(
-		Type.Union([Type.Literal("py"), Type.Literal("js"), Type.Literal("rb"), Type.Literal("jl")]),
+		Type.Union([Type.Literal("js"), Type.Literal("py"), Type.Literal("rb"), Type.Literal("jl")]),
 	),
 	code: Type.Optional(Type.String({ description: "Cell body, verbatim." })),
 	summary: Type.Optional(