@ian-pascoe/pi-codemode 0.2.0 → 0.3.0

package/README.md

@@ -87,12 +87,18 @@ type CodeModeSessionsResult = {
 The execute, result, and cancel tools return:
 
 ```ts
+type CodeModeConsoleEntry = {
+  method: "log" | "info" | "warn" | "error" | "debug";
+  text: string;
+};
+
 type CodeModeResult =
   | {
       result: "success";
       sessionId: string;
       data?: JsonValue;
       reclaimedSessionId?: string;
+      console?: CodeModeConsoleEntry[];
     }
   | { result: "pending"; sessionId: string }
   | {
@@ -112,6 +118,7 @@ type CodeModeResult =
           | "runtime";
         message: string;
       };
+      console?: CodeModeConsoleEntry[];
     };
 ```
 
@@ -119,15 +126,41 @@ type CodeModeResult =
 result text returned to the model. Pi retains additional bounded Presentation
 Snapshots in tool-result details for Transcript replay and the TUI.
 
+Cells may call `console.log`, `console.info`, `console.warn`, `console.error`,
+and `console.debug`. One call creates one ordered entry without a trailing
+newline, while embedded newlines remain intact:
+
+```ts
+console.log("answer:", 42);
+return 42;
+```
+
+```json
+{
+  "result": "success",
+  "sessionId": "...",
+  "data": 42,
+  "console": [{ "method": "log", "text": "answer: 42" }]
+}
+```
+
+Formatting matches the pinned Deno Console for format tokens, primitives,
+spacing, and multiline inspection. Getters, coercion hooks, and custom
+inspectors do not run; CodeMode uses safe inspection instead when that differs
+from Deno. Console output arrives only with terminal results. Ordinary script,
+serialization, and worker-reported runtime failures retain prior calls. A
+timeout, cancellation, termination, or process death may omit them because the
+parent kills the worker before it can reply.
+
 ## Transcript and Observer UI
 
 The CodeMode Transcript gives all four tools semantic collapsed and expanded
 rendering. Collapsed rows prioritize Cell lifecycle, a short Session ID, Cell
-Ordinal, returned-value shape, nested-tool count, and elapsed time. Expanded
-rows show the full Session ID, explicit call arguments, TypeScript source,
-structured returned data or error, and bounded nested-tool names, outcomes, and
-durations. Nested arguments and raw nested outputs are never copied into the
-presentation.
+Ordinal, returned-value shape, Console-call count, nested-tool count, and elapsed
+time. Expanded rows show the full Session ID, explicit call arguments,
+TypeScript source, bounded Console output before structured returned data or the
+error, and bounded nested-tool names, outcomes, and durations. Nested arguments
+and raw nested outputs are never copied into the presentation.
 
 Status always uses a symbol and text together:
 
@@ -255,13 +288,16 @@ generated helper source out of ordinary source locations. Every operating-system
 permission class is denied: filesystem read/write, network, environment, system
 information, subprocesses, FFI, and remote imports.
 
-Guest code receives ECMAScript built-ins, a read-only `tools` object, and only a
-frozen `Deno.version` identity. Raw process and standard-stream access,
-`console`, `Worker`, timers, filesystem/network APIs, and module loading are
-withheld. The parent watchdog terminates the subprocess for timeout or an
-infinite loop. Deno/V8 bounds each Session to a 128 MiB old-space heap and a
-1 MiB stack. Protocol inputs, tool results, and Cell results remain JSON-only
-and limited to 8 MiB of UTF-8.
+Guest code receives ECMAScript built-ins, a read-only `tools` object, a frozen
+five-method Console facade, and only a frozen `Deno.version` identity. Raw
+process and standard-stream access, `Worker`, timers, filesystem/network APIs,
+and module loading are withheld. Console calls never write to worker streams and
+do not include output from registered Pi tool handlers. The parent watchdog
+terminates the subprocess for timeout or an infinite loop. Deno/V8 bounds each
+Session to a 128 MiB old-space heap and a 1 MiB stack. Protocol inputs, tool
+results, returned data, and Console entries share one 8 MiB UTF-8 worker-message
+limit. An oversized response becomes the bounded `serialization` failure and
+may omit its Console entries.
 
 Registered Pi tools still execute in Pi's parent process with their normal
 permissions and lifecycle hooks. Cancellation aborts them through Pi's

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ian-pascoe/pi-codemode",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "private": false,
   "description": "Process-isolated persistent TypeScript tool composition for Pi",
   "keywords": [

package/src/codemode-console-output.ts

@@ -0,0 +1,11 @@
+/** Console methods captured from a CodeMode Cell in call order. */
+export const CODEMODE_CONSOLE_METHODS = ["log", "info", "warn", "error", "debug"] as const;
+
+/** One supported CodeMode Cell Console method. */
+export type CodeModeConsoleMethod = (typeof CODEMODE_CONSOLE_METHODS)[number];
+
+/** One captured CodeMode Cell Console call without a synthetic trailing newline. */
+export type CodeModeConsoleEntry = {
+  readonly method: CodeModeConsoleMethod;
+  readonly text: string;
+};

package/src/codemode-observer-ui.ts

@@ -12,6 +12,11 @@ import type {
   CodeModeObserverSnapshot,
   CodeModeUnexpectedFailure,
 } from "./codemode-session-coordinator.js";
+import {
+  boundedCodeModeElapsedMs,
+  formatCodeModeDuration,
+  shortestUniqueCodeModeSessionPrefix,
+} from "./codemode-session-coordinator.js";
 
 const CODEMODE_OBSERVER_UI_KEY = "codemode-observer";
 const CODEMODE_OBSERVER_ROW_LIMIT = 8;
@@ -131,25 +136,12 @@ function shortestUniqueCodeModeSessionPrefixes(
     const safe = sanitizeCodeModeObserverText(session.sessionId);
     return safe.length === 0 ? "unknown" : safe;
   });
-  return identifiers.map((identifier, index) => {
-    let length = Math.min(8, identifier.length);
-    while (
-      length < identifier.length &&
-      identifiers.some(
-        (candidate, candidateIndex) =>
-          candidateIndex !== index && candidate.startsWith(identifier.slice(0, length)),
-      )
-    ) {
-      length += 1;
-    }
-    return identifier.slice(0, length);
-  });
-}
-
-function boundedElapsedMilliseconds(nowMs: number, startedAtMs: number): number {
-  const elapsed = Math.round(nowMs - startedAtMs);
-  if (!Number.isFinite(elapsed)) return 0;
-  return Math.min(Number.MAX_SAFE_INTEGER, Math.max(0, elapsed));
+  return identifiers.map((identifier, index) =>
+    shortestUniqueCodeModeSessionPrefix(
+      identifier,
+      identifiers.filter((_candidate, candidateIndex) => candidateIndex !== index),
+    ),
+  );
 }
 
 function codeModeTerminalObserverState(
@@ -182,7 +174,7 @@ function projectCodeModeObserverRow(
       sessionPrefix,
       state: "running",
       cellOrdinal: session.current_cell.ordinal,
-      elapsedMs: boundedElapsedMilliseconds(nowMs, session.current_cell.started_at_ms),
+      elapsedMs: boundedCodeModeElapsedMs(session.current_cell.started_at_ms, nowMs),
       activeToolNames,
       activeToolCount: Math.max(session.current_cell.active_tool_count, activeToolNames.length),
     };
@@ -232,13 +224,6 @@ export function buildCodeModeObserverView(
   };
 }
 
-function formatCodeModeObserverDuration(elapsedMs: number): string {
-  if (elapsedMs < 1_000) return `${elapsedMs}ms`;
-  if (elapsedMs < 60_000) return `${(elapsedMs / 1_000).toFixed(1)}s`;
-  const seconds = Math.floor(elapsedMs / 1_000);
-  return `${Math.floor(seconds / 60)}m ${String(seconds % 60).padStart(2, "0")}s`;
-}
-
 function formatCodeModeObserverToolActivity(
   row: Extract<CodeModeObserverRow, { state: "running" }>,
 ): string | undefined {
@@ -256,10 +241,6 @@ function codeModeObserverRowDetail(row: CodeModeObserverRow): string {
     : `Cell ${row.cellOrdinal}`;
 }
 
-function joinCodeModeObserverRow(parts: readonly string[], separator: string): string {
-  return parts.join(separator);
-}
-
 function renderCodeModeObserverRow(
   row: CodeModeObserverRow,
   width: number,
@@ -270,9 +251,7 @@ function renderCodeModeObserverRow(
   const status = theme.fg(presentation.color, presentation.label);
   const detail = theme.fg("muted", codeModeObserverRowDetail(row));
   const duration =
-    row.state === "running"
-      ? theme.fg("muted", formatCodeModeObserverDuration(row.elapsedMs))
-      : undefined;
+    row.state === "running" ? theme.fg("muted", formatCodeModeDuration(row.elapsedMs)) : undefined;
   const toolActivity =
     row.state === "running" ? formatCodeModeObserverToolActivity(row) : undefined;
   const themedToolActivity =
@@ -285,13 +264,13 @@ function renderCodeModeObserverRow(
     [identity, status],
   ].map((parts) => parts.filter((part): part is string => part !== undefined));
   for (const parts of candidates) {
-    const line = joinCodeModeObserverRow(parts, separator);
+    const line = parts.join(separator);
     if (visibleWidth(line) <= width) return line;
   }
 
   const compactSeparator = theme.fg("dim", CODEMODE_OBSERVER_COMPACT_SEPARATOR_TEXT);
   const compactIdentity = `${theme.fg(presentation.color, presentation.symbol)} ${theme.bold(row.sessionPrefix)}`;
-  const compact = joinCodeModeObserverRow([compactIdentity, status], compactSeparator);
+  const compact = [compactIdentity, status].join(compactSeparator);
   if (visibleWidth(compact) <= width) return compact;
   return truncateToWidth(compact, width, CODEMODE_OBSERVER_ELLIPSIS);
 }

package/src/codemode-session-coordinator.ts

@@ -2,6 +2,7 @@ import type { AgentToolResult } from "@earendil-works/pi-agent-core";
 import type { Usage } from "@earendil-works/pi-ai";
 import { truncateHead } from "@earendil-works/pi-coding-agent";
 import { transformCodeModeCell } from "./codemode-cell-transform.js";
+import type { CodeModeConsoleEntry } from "./codemode-console-output.js";
 import { CodeModeWorkerProcess } from "./codemode-deno-process.js";
 import { formatCodeModePresentationData } from "./codemode-presentation-output.js";
 import type { CodeModeRuntime, CodeModeTimerHandle } from "./codemode-runtime.js";
@@ -35,9 +36,6 @@ const CODEMODE_RESULT_PRESENTATION_MAX_LINES = 2_000;
 const CODEMODE_WATCHDOG_GRACE_MS = 100;
 const INVALID_CODEMODE_SESSION_ID = "invalid-session-id";
 
-/** Branded identifier for one retained CodeMode Session. */
-export type CodeModeSessionId = string & { readonly CodeModeSessionId: unique symbol };
-
 /** Observer state of one settled CodeMode Cell. */
 export type CodeModeObservedCellState = "completed" | "failed" | "cancelled" | "timed_out";
 
@@ -70,7 +68,7 @@ export type CodeModeObservedLastCell = {
 
 /** Immutable read-only facts for one CodeMode Session with at least one Cell. */
 export type CodeModeObservedSession = {
-  readonly sessionId: CodeModeSessionId;
+  readonly sessionId: string;
   readonly lifecycle: "running" | "idle" | "terminal";
   /** Number of Cells started in this CodeMode Session. */
   readonly cell_count: number;
@@ -88,7 +86,7 @@ export type CodeModeObserverSnapshot = {
 
 /** Read-only facts for one live CodeMode Session, ordered by admission priority. */
 export type CodeModeListedSession = {
-  readonly sessionId: CodeModeSessionId;
+  readonly sessionId: string;
   readonly state: "running" | "idle";
   readonly cellCount: number;
   /** Parent wall-clock time of the latest execution-visible transition in Unix-epoch milliseconds. */
@@ -97,7 +95,7 @@ export type CodeModeListedSession = {
 
 /** One idle CodeMode worker failure not represented by an active Cell result. */
 export type CodeModeUnexpectedFailure = {
-  readonly sessionId: CodeModeSessionId;
+  readonly sessionId: string;
   readonly message: string;
 };
 
@@ -122,7 +120,7 @@ export type CodeModeNestedToolUpdate = AgentToolResult<unknown>;
 
 /** One complete guest batch plus its Cell-scoped cancellation and update capabilities. */
 export type CodeModeNestedToolBatch = {
-  readonly sessionId: CodeModeSessionId;
+  readonly sessionId: string;
   readonly batchId: string;
   readonly calls: readonly CodeModeNestedToolCall[];
   readonly signal: AbortSignal;
@@ -187,14 +185,14 @@ type MutableCodeModeOuterToolMetadata = {
 
 type CreateActiveCodeModeCellOptions = {
   onUpdate?: (update: CodeModeNestedToolUpdate) => void;
-  reclaimedSessionId?: CodeModeSessionId;
+  reclaimedSessionId?: string;
 };
 
 type ActiveCodeModeCell = {
   readonly cellId: string;
   readonly ordinal: number;
   readonly startedAtMs: number;
-  readonly reclaimedSessionId?: CodeModeSessionId;
+  readonly reclaimedSessionId?: string;
   readonly abortController: AbortController;
   readonly completion: Promise<CodeModeResult>;
   readonly resolveCompletion: (result: CodeModeResult) => void;
@@ -213,7 +211,7 @@ type ActiveCodeModeCell = {
 
 type LiveCodeModeSession = {
   readonly state: "live";
-  readonly sessionId: CodeModeSessionId;
+  readonly sessionId: string;
   readonly worker: CodeModeWorkerProcess;
   lastAccess: number;
   lastActivityAtMs: number;
@@ -227,7 +225,7 @@ type LiveCodeModeSession = {
 
 type TerminalCodeModeSession = {
   readonly state: "terminal";
-  readonly sessionId: CodeModeSessionId;
+  readonly sessionId: string;
   lastAccess: number;
   readonly lastActivityAtMs: number;
   readonly cellCount: number;
@@ -242,23 +240,50 @@ type CodeModeSessionRecord = LiveCodeModeSession | TerminalCodeModeSession;
 type LocateCodeModeSessionResult =
   | {
       readonly record: CodeModeSessionRecord;
-      readonly reclaimedSessionId?: CodeModeSessionId;
+      readonly reclaimedSessionId?: string;
     }
   | { readonly failure: CodeModeResult };
 
 type FatalCodeModeSessionFailure = {
   readonly code: Extract<CodeModeErrorCode, "timeout" | "cancellation" | "termination" | "runtime">;
   readonly message: string;
+  readonly console?: readonly CodeModeConsoleEntry[];
 };
 
-type ParseCodeModeSessionIdResult =
-  | { readonly ok: true; readonly value: CodeModeSessionId }
-  | { readonly ok: false };
+type ParsestringResult = { readonly ok: true; readonly value: string } | { readonly ok: false };
+
+function parsestring(value: string): ParsestringResult {
+  return value.length === 0 ? { ok: false } : { ok: true, value };
+}
+
+/** Return the shortest prefix of the identifier that no candidate shares. */
+export function shortestUniqueCodeModeSessionPrefix(
+  identifier: string,
+  candidates: readonly string[],
+): string {
+  let length = Math.min(8, identifier.length);
+  while (
+    length < identifier.length &&
+    candidates.some((candidate) => candidate.startsWith(identifier.slice(0, length)))
+  ) {
+    length += 1;
+  }
+  return identifier.slice(0, length);
+}
 
-function parseCodeModeSessionId(value: string): ParseCodeModeSessionIdResult {
-  if (value.length === 0) return { ok: false };
-  // SAFETY: This parser establishes the only CodeMode Session ID invariant (non-empty) before applying the domain brand.
-  return { ok: true, value: value as CodeModeSessionId };
+/** Render one elapsed duration as ms, seconds, or minutes + padded seconds. */
+export function formatCodeModeDuration(elapsedMs: number): string {
+  if (elapsedMs < 1_000) return `${elapsedMs}ms`;
+  if (elapsedMs < 60_000) return `${(elapsedMs / 1_000).toFixed(1)}s`;
+  const seconds = Math.floor(elapsedMs / 1_000);
+  return `${Math.floor(seconds / 60)}m ${String(seconds % 60).padStart(2, "0")}s`;
+}
+
+/** Round one elapsed measurement and clamp it to a safe non-negative integer. */
+export function boundedCodeModeElapsedMs(startedAtMs: number, observedAtMs: number): number {
+  const elapsed = Math.round(observedAtMs - startedAtMs);
+  if (!Number.isFinite(elapsed)) return 0;
+  return Math.min(Number.MAX_SAFE_INTEGER, Math.max(0, elapsed));
 }
 
 function invalidCodeModeSessionResult(): CodeModeSessionOperationResult {
@@ -275,12 +300,11 @@ function emptyMetadataAccumulator(): CodeModeMetadataAccumulator {
   return { addedToolNames: new Set(), terminate: false };
 }
 
-function combineCodeModeUsage(left: Usage | undefined, right: Usage): Usage {
+/** Sums two Usage values; optional fields appear only when either side carries them. */
+export function addCodeModeUsage(left: Usage | undefined, right: Usage | undefined): Usage {
+  if (right === undefined) throw new Error("Pi CodeMode usage: missing increment");
   if (left === undefined) {
-    return {
-      ...right,
-      cost: { ...right.cost },
-    };
+    return { ...right, cost: { ...right.cost } };
   }
   const combined: Usage = {
     input: left.input + right.input,
@@ -310,7 +334,7 @@ function mergeCodeModeOuterMetadata(
   metadata: CodeModeOuterToolMetadata,
 ): void {
   if (metadata.usage !== undefined) {
-    accumulator.usage = combineCodeModeUsage(accumulator.usage, metadata.usage);
+    accumulator.usage = addCodeModeUsage(accumulator.usage, metadata.usage);
   }
   for (const name of metadata.addedToolNames ?? []) accumulator.addedToolNames.add(name);
   if (metadata.terminate === true) accumulator.terminate = true;
@@ -331,7 +355,7 @@ function finalizeCodeModeMetadata(
 
 /** Owns bounded CodeMode Session records and one isolated Deno process per live Session. */
 export class CodeModeSessionCoordinator {
-  private readonly records = new Map<CodeModeSessionId, CodeModeSessionRecord>();
+  private readonly records = new Map<string, CodeModeSessionRecord>();
   private readonly runtime: CodeModeRuntime;
   private accessSequence = 0;
   private cellSequence = 0;
@@ -357,7 +381,7 @@ export class CodeModeSessionCoordinator {
   ): Promise<CodeModeSessionOperationResult> {
     if (this.shuttingDown) {
       const candidateSessionId = input.sessionId ?? this.runtime.createSessionId();
-      const parsedSessionId = parseCodeModeSessionId(candidateSessionId);
+      const parsedSessionId = parsestring(candidateSessionId);
       if (!parsedSessionId.ok) return invalidCodeModeSessionResult();
       return {
         result: createCodeModeFailure(
@@ -373,7 +397,7 @@ export class CodeModeSessionCoordinator {
       let located: LocateCodeModeSessionResult;
       if (input.sessionId === undefined) located = await this.createLiveSession();
       else {
-        const parsedSessionId = parseCodeModeSessionId(input.sessionId);
+        const parsedSessionId = parsestring(input.sessionId);
         if (!parsedSessionId.ok) return invalidCodeModeSessionResult();
         located = this.findSession(parsedSessionId.value);
       }
@@ -446,7 +470,7 @@ export class CodeModeSessionCoordinator {
 
   /** Polls the latest retained Cell result without consuming that public result. */
   result(sessionIdValue: string): CodeModeSessionOperationResult {
-    const parsedSessionId = parseCodeModeSessionId(sessionIdValue);
+    const parsedSessionId = parsestring(sessionIdValue);
     if (!parsedSessionId.ok) return invalidCodeModeSessionResult();
     const sessionId = parsedSessionId.value;
     const record = this.records.get(sessionId);
@@ -495,25 +519,33 @@ export class CodeModeSessionCoordinator {
 
   /** Return the shortest currently unique Session prefix, or the full unknown historical ID. */
   formatSessionPrefix(sessionIdValue: string): string {
-    const parsed = parseCodeModeSessionId(sessionIdValue);
+    const parsed = parsestring(sessionIdValue);
     if (!parsed.ok || !this.records.has(parsed.value)) return sessionIdValue;
-    const sessionIds = [...this.records.keys()];
-    let length = Math.min(8, sessionIdValue.length);
-    while (
-      length < sessionIdValue.length &&
-      sessionIds.some(
-        (candidate) =>
-          candidate !== parsed.value && candidate.startsWith(sessionIdValue.slice(0, length)),
-      )
-    ) {
-      length += 1;
-    }
-    return sessionIdValue.slice(0, length);
+    const others = [...this.records.keys()].filter((candidate) => candidate !== parsed.value);
+    return shortestUniqueCodeModeSessionPrefix(sessionIdValue, others);
+  }
+
+  private closedCellPresentation(
+    cellState: CodeModePresentationSnapshot["cell_state"],
+  ): CodeModePresentationSnapshot {
+    return {
+      version: 1,
+      cell_state: cellState,
+      session_state: "closed",
+      elapsed_ms: 0,
+      active_tool_names: [],
+      active_tool_count: 0,
+      nested_tool_count: 0,
+      succeeded_nested_tool_count: 0,
+      failed_nested_tool_count: 0,
+      nested_tools: [],
+      omitted_nested_tool_count: 0,
+    };
   }
 
   /** Force-terminates one live CodeMode Session and retains its cancellation result. */
   async cancel(sessionIdValue: string): Promise<CodeModeSessionOperationResult> {
-    const parsedSessionId = parseCodeModeSessionId(sessionIdValue);
+    const parsedSessionId = parsestring(sessionIdValue);
     if (!parsedSessionId.ok) return invalidCodeModeSessionResult();
     const sessionId = parsedSessionId.value;
     const record = this.records.get(sessionId);
@@ -535,19 +567,7 @@ export class CodeModeSessionCoordinator {
       });
     } else {
       record.lastActivityAtMs = this.runtime.now();
-      record.latestPresentation = {
-        version: 1,
-        cell_state: "cancelled",
-        session_state: "closed",
-        elapsed_ms: 0,
-        active_tool_names: [],
-        active_tool_count: 0,
-        nested_tool_count: 0,
-        succeeded_nested_tool_count: 0,
-        failed_nested_tool_count: 0,
-        nested_tools: [],
-        omitted_nested_tool_count: 0,
-      };
+      record.latestPresentation = this.closedCellPresentation("cancelled");
       this.replaceWithTerminal(
         record,
         createCodeModeFailure(sessionId, "cancellation", "CodeMode Session was cancelled"),
@@ -564,7 +584,7 @@ export class CodeModeSessionCoordinator {
   }
 
   /** Releases every live Deno process; repeated shutdown calls share one completion. */
-  shutdown(_reason: string): Promise<void> {
+  shutdown(): Promise<void> {
     if (this.shutdownPromise !== undefined) return this.shutdownPromise;
     this.shuttingDown = true;
     this.shutdownPromise = this.shutdownAllSessions();
@@ -594,7 +614,7 @@ export class CodeModeSessionCoordinator {
   }
 
   private async createLiveSession(): Promise<LocateCodeModeSessionResult> {
-    const parsedSessionId = parseCodeModeSessionId(this.runtime.createSessionId());
+    const parsedSessionId = parsestring(this.runtime.createSessionId());
     if (!parsedSessionId.ok) {
       return {
         failure: createCodeModeFailure(
@@ -618,7 +638,7 @@ export class CodeModeSessionCoordinator {
     const liveRecords = [...this.records.values()].filter(
       (record): record is LiveCodeModeSession => record.state === "live",
     );
-    let reclaimedSessionId: CodeModeSessionId | undefined;
+    let reclaimedSessionId: string | undefined;
     if (liveRecords.length >= this.options.maxSessions) {
       const reclaimedRecord = liveRecords
         .filter((record) => record.currentCell === undefined)
@@ -698,7 +718,7 @@ export class CodeModeSessionCoordinator {
     return reclaimedSessionId === undefined ? { record } : { record, reclaimedSessionId };
   }
 
-  private findSession(sessionId: CodeModeSessionId): LocateCodeModeSessionResult {
+  private findSession(sessionId: string): LocateCodeModeSessionResult {
     const record = this.records.get(sessionId);
     return record === undefined
       ? { failure: createCodeModeFailure(sessionId, "unknown", "Unknown CodeMode Session") }
@@ -794,10 +814,7 @@ export class CodeModeSessionCoordinator {
     }
   }
 
-  private handleWorkerResponse(
-    sessionId: CodeModeSessionId,
-    response: CodeModeWorkerResponse,
-  ): void {
+  private handleWorkerResponse(sessionId: string, response: CodeModeWorkerResponse): void {
     const record = this.records.get(sessionId);
     if (record?.state !== "live" || record.currentCell === undefined) return;
     const cell = record.currentCell;
@@ -810,7 +827,11 @@ export class CodeModeSessionCoordinator {
         return;
       }
       if (response.resultJson === undefined) {
-        this.settleReusableCell(record, cell, createCodeModeSuccess(sessionId));
+        this.settleReusableCell(
+          record,
+          cell,
+          createCodeModeSuccess(sessionId, undefined, response.console),
+        );
         return;
       }
       const data = this.parseJsonString(response.resultJson, { allowUndefined: true });
@@ -818,11 +839,15 @@ export class CodeModeSessionCoordinator {
         this.settleReusableCell(
           record,
           cell,
-          createCodeModeFailure(sessionId, "serialization", data.message),
+          createCodeModeFailure(sessionId, "serialization", data.message, response.console),
         );
         return;
       }
-      this.settleReusableCell(record, cell, createCodeModeSuccess(sessionId, data.value));
+      this.settleReusableCell(
+        record,
+        cell,
+        createCodeModeSuccess(sessionId, data.value, response.console),
+      );
       return;
     }
     if (response.type === "cell-error") {
@@ -834,15 +859,25 @@ export class CodeModeSessionCoordinator {
         return;
       }
       if (response.error.code === "runtime") {
-        this.fatalizeSession(record, cell, {
+        const failure = {
           code: response.error.code,
           message: response.error.message,
-        });
+        } as const;
+        this.fatalizeSession(
+          record,
+          cell,
+          response.console === undefined ? failure : { ...failure, console: response.console },
+        );
       } else {
         this.settleReusableCell(
           record,
           cell,
-          createCodeModeFailure(sessionId, response.error.code, response.error.message),
+          createCodeModeFailure(
+            sessionId,
+            response.error.code,
+            response.error.message,
+            response.console,
+          ),
         );
       }
       return;
@@ -1170,10 +1205,19 @@ export class CodeModeSessionCoordinator {
   ): void {
     if (!this.isCurrentCell(record, cell)) return;
     this.clearCellResources(cell);
-    const retainedResult =
-      result.result === "success" && cell.reclaimedSessionId !== undefined
-        ? { ...result, reclaimedSessionId: cell.reclaimedSessionId }
-        : result;
+    let retainedResult = result;
+    if (result.result === "success" && cell.reclaimedSessionId !== undefined) {
+      if (result.console === undefined) {
+        retainedResult = { ...result, reclaimedSessionId: cell.reclaimedSessionId };
+      } else {
+        const { console: consoleEntries, ...resultWithoutConsole } = result;
+        retainedResult = {
+          ...resultWithoutConsole,
+          reclaimedSessionId: cell.reclaimedSessionId,
+          console: consoleEntries,
+        };
+      }
+    }
     const presentation = this.settledCellPresentation(cell, retainedResult, "live");
     const settledAtMs = this.runtime.now();
     record.latestResult = retainedResult;
@@ -1199,7 +1243,12 @@ export class CodeModeSessionCoordinator {
     if (failure.code === "termination") cell.metadata.terminate = true;
     cell.abortController.abort();
     this.clearCellResources(cell);
-    const result = createCodeModeFailure(record.sessionId, failure.code, failure.message);
+    const result = createCodeModeFailure(
+      record.sessionId,
+      failure.code,
+      failure.message,
+      failure.console,
+    );
     const settledAtMs = this.runtime.now();
     record.latestPresentation = this.cellPresentation(
       cell,
@@ -1247,26 +1296,14 @@ export class CodeModeSessionCoordinator {
     return stop;
   }
 
-  private handleWorkerFailure(sessionId: CodeModeSessionId, message: string): void {
+  private handleWorkerFailure(sessionId: string, message: string): void {
     const record = this.records.get(sessionId);
     if (record?.state !== "live") return;
     if (record.currentCell !== undefined) {
       this.fatalizeSession(record, record.currentCell, { code: "runtime", message });
     } else {
       record.lastActivityAtMs = this.runtime.now();
-      record.latestPresentation = {
-        version: 1,
-        cell_state: "failed",
-        session_state: "closed",
-        elapsed_ms: 0,
-        active_tool_names: [],
-        active_tool_count: 0,
-        nested_tool_count: 0,
-        succeeded_nested_tool_count: 0,
-        failed_nested_tool_count: 0,
-        nested_tools: [],
-        omitted_nested_tool_count: 0,
-      };
+      record.latestPresentation = this.closedCellPresentation("failed");
       this.replaceWithTerminal(record, createCodeModeFailure(sessionId, "runtime", message));
       try {
         this.options.onUnexpectedFailure?.(Object.freeze({ sessionId, message }));
@@ -1387,7 +1424,7 @@ export class CodeModeSessionCoordinator {
     }
   }
 
-  private retainTerminalFailure(sessionId: CodeModeSessionId, failure: CodeModeResult): void {
+  private retainTerminalFailure(sessionId: string, failure: CodeModeResult): void {
     this.records.set(sessionId, {
       state: "terminal",
       sessionId,