@granular-software/sdk 0.4.45 → 0.4.47

package/dist/agent-evals.mjs

@@ -4003,6 +4003,9 @@ var MAX_TIMER_DELAY_MS = 2147483647;
 var DEBUG_WS = process.env.GRANULAR_DEBUG_WS === "1";
 var DEFAULT_RPC_TIMEOUT_MS = 3e4;
 var DOMAIN_PACKAGE_RPC_TIMEOUT_MS = 12e4;
+var EFFECT_CONTROL_RPC_TIMEOUT_MS = 12e4;
+var DEFAULT_RECONNECT_DELAY_MS = 3e3;
+var DEFAULT_MAX_RECONNECT_ATTEMPTS = 5;
 function debugWs(...args) {
   if (DEBUG_WS) {
     console.log(...args);
@@ -4013,6 +4016,10 @@ function rpcTimeoutMsForMethod(method) {
     case "domain.fetchPackagePart":
     case "domain.getSummary":
       return DOMAIN_PACKAGE_RPC_TIMEOUT_MS;
+    case "client.heartbeat":
+    case "effects.publishCatalog":
+    case "effects.refresh":
+      return EFFECT_CONTROL_RPC_TIMEOUT_MS;
     default:
       return DEFAULT_RPC_TIMEOUT_MS;
   }
@@ -4032,6 +4039,7 @@ var WSClient = class {
   reconnectTimer = null;
   tokenRefreshTimer = null;
   isExplicitlyDisconnected = false;
+  reconnectAttempts = 0;
   options;
   constructor(options) {
     this.options = options;
@@ -4186,6 +4194,7 @@ var WSClient = class {
               clearTimeout(this.reconnectTimer);
               this.reconnectTimer = null;
             }
+            this.reconnectAttempts = 0;
             this.emit("open", {});
             resolve();
           });
@@ -4217,6 +4226,7 @@ var WSClient = class {
               clearTimeout(this.reconnectTimer);
               this.reconnectTimer = null;
             }
+            this.reconnectAttempts = 0;
             this.emit("open", {});
             resolve();
           };
@@ -4276,7 +4286,8 @@ var WSClient = class {
     return new Error(`WebSocket disconnected${suffix}`);
   }
   handleDisconnect(close = {}) {
-    const reconnectDelayMs = 3e3;
+    const baseReconnectDelayMs = typeof this.options.reconnectDelayMs === "number" && Number.isFinite(this.options.reconnectDelayMs) && this.options.reconnectDelayMs > 0 ? this.options.reconnectDelayMs : DEFAULT_RECONNECT_DELAY_MS;
+    const maxReconnectAttempts = typeof this.options.maxReconnectAttempts === "number" && Number.isFinite(this.options.maxReconnectAttempts) && this.options.maxReconnectAttempts >= 0 ? Math.floor(this.options.maxReconnectAttempts) : DEFAULT_MAX_RECONNECT_ATTEMPTS;
     const unexpected = !this.isExplicitlyDisconnected;
     const info = {
       code: close.code,
@@ -4296,6 +4307,30 @@ var WSClient = class {
       const disconnectError = this.buildDisconnectError(info);
       this.rejectPending(disconnectError);
       this.emit("disconnect", info);
+      if (this.reconnectAttempts >= maxReconnectAttempts) {
+        const reconnectInfo = {
+          error: `WebSocket reconnect attempts exhausted after ${maxReconnectAttempts} attempt(s).`,
+          sessionId: this.sessionId,
+          timestamp: Date.now()
+        };
+        this.emit("reconnect_error", reconnectInfo);
+        if (this.options.onReconnectError) {
+          try {
+            this.options.onReconnectError(reconnectInfo);
+          } catch (callbackError) {
+            console.error(
+              "[Granular] onReconnectError callback failed:",
+              callbackError
+            );
+          }
+        }
+        return;
+      }
+      this.reconnectAttempts += 1;
+      const reconnectDelayMs = Math.min(
+        3e4,
+        baseReconnectDelayMs * 2 ** Math.max(0, this.reconnectAttempts - 1)
+      );
       info.reconnectScheduled = true;
       info.reconnectDelayMs = reconnectDelayMs;
       if (this.options.onUnexpectedClose) {
@@ -4750,6 +4785,9 @@ var Session = class {
   promptCache = /* @__PURE__ */ new Map();
   /** Prompt ids locally answered before the document sync catches up. */
   hiddenPromptIds = /* @__PURE__ */ new Set();
+  domainPackagePartCache = /* @__PURE__ */ new Map();
+  domainPackagePartPromises = /* @__PURE__ */ new Map();
+  domainPackageFetchQueue = Promise.resolve();
   constructor(client, clientId, options = {}) {
     this.client = client;
     this.clientId = clientId || `client_${Date.now()}`;
@@ -4957,12 +4995,18 @@ var Session = class {
     const resolvedAnswer = resolvePromptAnswer(prompt, answer);
     this.promptCache.delete(promptId);
     this.hiddenPromptIds.add(promptId);
+    this.emit("prompt", { id: promptId, status: "answered" });
     try {
-      await this.client.call("prompt.answer", {
+      const response = await this.client.call("prompt.answer", {
         promptId,
         answer: resolvedAnswer,
         value: resolvedAnswer
       });
+      if (response && typeof response === "object" && "ok" in response && response.ok === false) {
+        const rejected = response;
+        const errorMessage = typeof rejected.error === "string" ? rejected.error : "Prompt answer was rejected.";
+        throw new Error(errorMessage);
+      }
     } catch (error) {
       this.hiddenPromptIds.delete(promptId);
       if (prompt) {
@@ -5190,11 +5234,33 @@ var Session = class {
    * Fetch a domain package part from the backend (no fallback).
    */
   async fetchDomainPart(part) {
-    const result = await this.client.call("domain.fetchPackagePart", {
-      moduleSpecifier: "@sandbox/domain",
-      part
+    const cached = this.domainPackagePartCache.get(part);
+    if (cached !== void 0) {
+      return cached;
+    }
+    const inFlight = this.domainPackagePartPromises.get(part);
+    if (inFlight) {
+      return inFlight;
+    }
+    const fetchPromise = this.domainPackageFetchQueue.then(async () => {
+      const result = await this.client.call("domain.fetchPackagePart", {
+        moduleSpecifier: "@sandbox/domain",
+        part
+      });
+      const content = result?.content ?? "";
+      this.domainPackagePartCache.set(part, content);
+      return content;
     });
-    return result?.content ?? "";
+    this.domainPackagePartPromises.set(part, fetchPromise);
+    this.domainPackageFetchQueue = fetchPromise.then(
+      () => void 0,
+      () => void 0
+    );
+    try {
+      return await fetchPromise;
+    } finally {
+      this.domainPackagePartPromises.delete(part);
+    }
   }
   /**
    * Get TypeScript class declarations for the current domain (for LLM/code gen).
@@ -5444,7 +5510,10 @@ import { ${allImports} } from "./sandbox-tools";
     const emitPrompt = (payload) => {
       const prompt = normalizePrompt(payload);
       if (!prompt) return;
-      this.hiddenPromptIds.delete(prompt.id);
+      if (this.hiddenPromptIds.has(prompt.id)) {
+        this.emit("prompt", { ...prompt, status: "answered" });
+        return;
+      }
       this.promptCache.set(prompt.id, prompt);
       this.emit("prompt", prompt);
     };
@@ -13055,6 +13124,7 @@ var LOCAL_CONTROL_REQUEST_RETRY_DELAY_MS = 500;
 var SESSION_DATA_REQUEST_RETRY_COUNT = 4;
 var SESSION_DATA_REQUEST_RETRY_DELAY_MS = 500;
 var EFFECT_HOST_CONNECT_TIMEOUT_MS = 15e3;
+var SESSION_CONNECT_TIMEOUT_MS = 15e3;
 function filenameFromUploadBody(body) {
   const maybe = body;
   return typeof maybe.name === "string" && maybe.name.trim() ? maybe.name.trim() : null;
@@ -13074,7 +13144,7 @@ function bodyInitFromSessionFileUpload(body) {
   }
   return body;
 }
-var EFFECT_CATALOG_SYNC_TIMEOUT_MS = 3e4;
+var EFFECT_CATALOG_SYNC_TIMEOUT_MS = 12e4;
 var EFFECT_CATALOG_SYNC_RETRY_COUNT = 3;
 var EFFECT_CATALOG_SYNC_RETRY_DELAY_MS = 1e3;
 function planRecordObjectsChunks(records, batchSize) {
@@ -15030,7 +15100,14 @@ var Granular = class _Granular {
     return tag;
   }
   buildManagedEnvironmentName(tag, versionId) {
-    return `__sdk__${tag}__${versionId}`;
+    return `__sdk__${tag}__${versionId}__pinned`;
+  }
+  isManagedEnvironmentName(environment, tagName) {
+    const name = environment.environment || environment.envName || "";
+    return name.startsWith(`__sdk__${tagName}__`);
+  }
+  isPinnedToVersion(environment, versionId) {
+    return environment.buildPolicy.mode === "pinned" && (environment.versionId === versionId || environment.buildPolicy.versionId === versionId || environment.buildPolicy.buildId === versionId);
   }
   matchesTagTrackedEnvironment(environment, tagName, tagId) {
     const environmentTagName = environment.tag?.name || environment.buildPolicy.tagName || null;
@@ -15091,7 +15168,7 @@ var Granular = class _Granular {
     );
     const currentMatches = this.sortEnvironmentsByRecency(
       userEnvironments.filter(
-        (environment) => this.matchesTagTrackedEnvironment(environment, tagName, tag.tagId) && environment.versionId === targetVersionId
+        (environment) => this.matchesTagTrackedEnvironment(environment, tagName, tag.tagId) && environment.versionId === targetVersionId && (!this.isManagedEnvironmentName(environment, tagName) || this.isPinnedToVersion(environment, targetVersionId))
       )
     );
     if (currentMatches.length > 0) {
@@ -15120,6 +15197,7 @@ var Granular = class _Granular {
         subjectId: user.granularId,
         environment: this.buildManagedEnvironmentName(tagName, targetVersionId),
         tagId: tag.tagId,
+        versionId: targetVersionId,
         permissionProfileId: null
       }),
       requestedOntology: ontology,
@@ -15165,6 +15243,7 @@ var Granular = class _Granular {
         row.summaryUpdatedAt ?? row.summary_updated_at
       ) : null,
       subjectId: row.subjectId != null ? String(row.subjectId) : null,
+      sessionScope: row.sessionScope != null || row.session_scope != null ? String(row.sessionScope ?? row.session_scope) : null,
       jobCount: typeof row.jobCount === "number" ? row.jobCount : void 0,
       toolCallCount: typeof row.toolCallCount === "number" ? row.toolCallCount : void 0
     };
@@ -15372,7 +15451,11 @@ var Granular = class _Granular {
       onUnexpectedClose: this.onUnexpectedClose,
       onReconnectError: this.onReconnectError
     });
-    await client.connect();
+    await withTimeout(
+      client.connect(),
+      SESSION_CONNECT_TIMEOUT_MS,
+      `session WebSocket connect for ${session.sessionId}`
+    );
     const environmentSession = new EnvironmentSession(
       client,
       environment,
@@ -15543,12 +15626,24 @@ var Granular = class _Granular {
     host.heartbeatInFlight = false;
   }
   async synchronizeEffectHost(host) {
-    await host.wsClient.call("client.hello", {
-      clientId: host.clientId,
-      protocolVersion: "2.0"
-    });
-    this.startEffectHostHeartbeat(host);
-    await this.publishSandboxEffectCatalog(host);
+    if (host.syncPromise) {
+      return host.syncPromise;
+    }
+    host.syncPromise = (async () => {
+      await host.wsClient.call("client.hello", {
+        clientId: host.clientId,
+        protocolVersion: "2.0"
+      });
+      await this.publishSandboxEffectCatalog(host);
+      this.startEffectHostHeartbeat(host);
+    })();
+    try {
+      await host.syncPromise;
+    } finally {
+      if (host.syncPromise) {
+        host.syncPromise = null;
+      }
+    }
   }
   async ensureSandboxEffectHost(sandboxId) {
     const existing = this.sandboxEffectHosts.get(sandboxId);
@@ -15584,7 +15679,8 @@ var Granular = class _Granular {
         wsClient,
         heartbeatTimer: null,
         heartbeatInFlight: false,
-        recovering: false
+        recovering: false,
+        syncPromise: null
       };
       wsClient.registerRpcHandler("effect.invoke", async (params) => {
         const request = params;
@@ -16402,6 +16498,79 @@ function validateHarnessTemplateManifest(value, context = "HarnessTemplateManife
 function defineHarnessTemplateManifest(value, context) {
   return validateHarnessTemplateManifest(value, context);
 }
+var DEFAULT_IGNORED_REASONING_COMMENT_DIRECTIVES = [
+  /^@ts-ignore\b/i,
+  /^@ts-expect-error\b/i,
+  /^eslint-[\w-]+\b/i,
+  /^biome-ignore\b/i,
+  /^prettier-ignore\b/i,
+  /^istanbul ignore\b/i
+];
+var DEFAULT_LOW_SIGNAL_REASONING_LINES = [
+  /^running\.?$/i,
+  /^working\.?$/i,
+  /^thinking\.?$/i,
+  /^generating(?: code)?\.?$/i,
+  /^starting(?: execution)?\.?$/i
+];
+function parseReasoningCommentLine(line, options = {}) {
+  const trimmed = line.trimStart();
+  if (!trimmed.startsWith("//")) return null;
+  const text = trimmed.replace(/^\/\/\s?/, "").trim();
+  if (!text) return { kind: "ignored" };
+  const ignoredDirectives = options.ignoredCommentDirectives || DEFAULT_IGNORED_REASONING_COMMENT_DIRECTIVES;
+  if (ignoredDirectives.some((pattern) => pattern.test(text))) {
+    return { kind: "ignored" };
+  }
+  const lowSignalLines = options.lowSignalReasoningLines || DEFAULT_LOW_SIGNAL_REASONING_LINES;
+  if (lowSignalLines.some((pattern) => pattern.test(text))) {
+    return { kind: "ignored" };
+  }
+  return { kind: "reasoning", text };
+}
+function consumeGranularReasoningTraceChunk(buffer, chunk, options = {}) {
+  let text = buffer + chunk;
+  let visibleText = "";
+  const reasoningLines = [];
+  while (true) {
+    const newlineIndex = text.indexOf("\n");
+    if (newlineIndex === -1) break;
+    const rawLine = text.slice(0, newlineIndex);
+    text = text.slice(newlineIndex + 1);
+    const comment = parseReasoningCommentLine(
+      rawLine.replace(/\r$/, ""),
+      options
+    );
+    if (comment?.kind === "reasoning") {
+      reasoningLines.push(comment.text);
+    } else if (comment?.kind === "ignored") {
+      continue;
+    } else {
+      visibleText += `${rawLine}
+`;
+    }
+  }
+  if (options.final && text.length > 0) {
+    const comment = parseReasoningCommentLine(text.replace(/\r$/, ""), options);
+    if (comment?.kind === "reasoning") {
+      reasoningLines.push(comment.text);
+      text = "";
+    } else if (comment?.kind === "ignored") {
+      text = "";
+    } else {
+      visibleText += text;
+      text = "";
+    }
+  }
+  return { buffer: text, visibleText, reasoningLines };
+}
+function consumeGranularReasoningOnlyChunk(buffer, chunk, options = {}) {
+  const result = consumeGranularReasoningTraceChunk(buffer, chunk, options);
+  return {
+    buffer: result.buffer,
+    reasoningLines: result.reasoningLines
+  };
+}
 function asRecord4(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return null;
   return value;
@@ -17607,7 +17776,8 @@ function buildGranularAgentSessionBlock(sessionContext) {
     runtimeId: sessionContext?.sandboxId || null,
     environmentId: sessionContext?.environmentId || null,
     userName: sessionContext?.userName || null,
-    domainRevision: sessionContext?.domainRevision || null
+    domainRevision: sessionContext?.domainRevision || null,
+    uiContext: sessionContext?.uiContext || null
   });
 }
 function buildGranularAgentHeapBlock(heapSummary) {
@@ -17854,7 +18024,7 @@ function buildGranularAgentToolBlock(tools, capabilityOverrides) {
     const rightScope = `${right.className || "global"}:${right.static ? "static" : "instance"}`;
     return leftScope.localeCompare(rightScope) || left.name.localeCompare(right.name);
   });
-  const writeActions = normalizedTools.filter((tool) => tool.ready !== false).map((tool) => {
+  const availableActions = normalizedTools.filter((tool) => tool.ready !== false).map((tool) => {
     const scope = tool.className ? `${tool.static ? "class" : "record"}:${tool.className}` : "global";
     return {
       name: tool.name,
@@ -17865,7 +18035,8 @@ function buildGranularAgentToolBlock(tools, capabilityOverrides) {
   const capabilities = {
     executeCode: resolvedCapabilities.executeCode,
     readEntities: resolvedCapabilities.readEntities,
-    writeActions,
+    availableActions,
+    writeActions: availableActions,
     workflowHelpers: resolvedCapabilities.workflowHelpers,
     savedData: resolvedCapabilities.savedData,
     showRecords: resolvedCapabilities.showRecords
@@ -17879,7 +18050,7 @@ function buildGranularAgentActionIndex(tools) {
     return leftScope.localeCompare(rightScope) || left.name.localeCompare(right.name);
   });
   if (normalizedTools.length === 0) {
-    return "No domain write actions are available.";
+    return "No executable actions are available.";
   }
   const globalTools = normalizedTools.filter((tool) => !tool.className);
   const staticTools = normalizedTools.filter(
@@ -17973,6 +18144,76 @@ function splitDomainDocumentation(domainDocumentation) {
   }
   return { types: normalized, docs: "" };
 }
+var DOMAIN_HELPER_FUNCTION_NAMES = /* @__PURE__ */ new Set([
+  "agent_heap_objects",
+  "agent_message",
+  "agent_text_message"
+]);
+function inferGlobalActionToolsFromDomainTypes(domainTypes) {
+  const inferred = [];
+  const seen = /* @__PURE__ */ new Set();
+  const declarationPattern = /(?:export\s+)?declare\s+function\s+([A-Za-z_$][\w$]*)\s*\(/g;
+  let match;
+  while (match = declarationPattern.exec(domainTypes)) {
+    const name = match[1];
+    if (!name || DOMAIN_HELPER_FUNCTION_NAMES.has(name) || seen.has(name)) {
+      continue;
+    }
+    seen.add(name);
+    inferred.push({
+      name,
+      description: "Executable global action declared by the domain runtime."
+    });
+  }
+  const actionLinePattern = /^-\s*([A-Za-z_$][\w$]*)\s+\(global\):\s*(.+)$/gm;
+  while (match = actionLinePattern.exec(domainTypes)) {
+    const name = match[1];
+    if (!name || DOMAIN_HELPER_FUNCTION_NAMES.has(name) || seen.has(name)) {
+      continue;
+    }
+    seen.add(name);
+    inferred.push({
+      name,
+      description: match[2]?.trim() || "Executable global action declared by the domain runtime."
+    });
+  }
+  const scopedActionLinePattern = /^-\s*([A-Za-z_$][\w$]*)\.([A-Za-z_$][\w$]*)\s+\((record|class)\):\s*(.+)$/gm;
+  while (match = scopedActionLinePattern.exec(domainTypes)) {
+    const className = match[1]?.toLowerCase();
+    const name = match[2];
+    const scope = match[3];
+    if (!className || !name || DOMAIN_HELPER_FUNCTION_NAMES.has(name)) {
+      continue;
+    }
+    const key = `${className}:${scope}:${name}`;
+    if (seen.has(key)) {
+      continue;
+    }
+    seen.add(key);
+    inferred.push({
+      name,
+      className,
+      static: scope === "class",
+      description: match[4]?.trim() || "Executable action declared by the domain runtime."
+    });
+  }
+  return inferred;
+}
+function resolvePromptTools(tools, domainTypes) {
+  const byKey = /* @__PURE__ */ new Map();
+  for (const tool of tools || []) {
+    if (!tool?.name) continue;
+    const key = `${tool.className || "global"}:${tool.static ? "static" : "instance"}:${tool.name}`;
+    byKey.set(key, tool);
+  }
+  for (const tool of inferGlobalActionToolsFromDomainTypes(domainTypes)) {
+    const key = `global:instance:${tool.name}`;
+    if (!byKey.has(key)) {
+      byKey.set(key, tool);
+    }
+  }
+  return [...byKey.values()];
+}
 function buildGranularAgentCheckpointBlock(checkpoint) {
   if (!checkpoint) {
     return renderConstBlock("previousCodeResult", null);
@@ -18045,12 +18286,13 @@ function buildGranularAgentSystemPrompt(input) {
   const outputMode = input.outputMode || "agentMessages";
   const promptCapabilities = resolvePromptCapabilities(input.capabilities);
   const domainSections = splitDomainDocumentation(input.domainDocumentation);
+  const promptTools = resolvePromptTools(input.tools, domainSections.types);
   const sessionBlock = buildGranularAgentSessionBlock(input.sessionContext);
   const toolBlock = buildGranularAgentToolBlock(
-    input.tools,
+    promptTools,
     input.capabilities
   );
-  const actionIndex = buildGranularAgentActionIndex(input.tools);
+  const actionIndex = buildGranularAgentActionIndex(promptTools);
   const domainBlock = buildGranularAgentDomainBlock(domainSections.types);
   const workflowBlock = buildGranularAgentWorkflowBlock(input.workflowSummary);
   const checkpointBlock = buildGranularAgentCheckpointBlock(input.checkpoint);
@@ -18078,7 +18320,7 @@ function buildGranularAgentSystemPrompt(input) {
   - When \`agent_text_message(...)\` mentions a grounded record that should remain clickable/referable, wrap only the visible record label in a self-closing inline reference tag: \`<granular-object class="class_name" id="stable_id_or_path" label="Visible label" />\`. Use the actual class name and stable id/path from the runtime record or effect result; do not invent ids, field names, or snake/camel-case aliases that are not present in the type declarations or returned object.
   - Treat \`agent_heap_objects(...)\` as the UI display call for user-visible records, not as a general storage helper. Do not wrap records under an \`items\` key.
   - When records should remain reusable for follow-ups, first save the runtime record or ordered record array with \`await heap.setVar("stable_selection_name", value)\`, then display that saved selection exactly once with \`await agent_heap_objects({ variableNames: ["stable_selection_name"] })\`.
-  - \`heap.setVar(...)\` only accepts scalar values, runtime records/sandbox instances, or arrays of runtime records/sandbox instances. Do not save plain action/effect result objects. If an action returns an id/path for a created record that should remain referable, fetch the created record first, then save/display that fetched record.
+  - \`heap.setVar(...)\` only accepts scalar values, runtime records/sandbox instances, or arrays of runtime records/sandbox instances from one class. Do not save plain action/effect result objects or arrays of JSON summaries returned by actions. If an action returns ids/paths for records that should remain referable or displayed as records, fetch the matching runtime records first with the generated class \`.get(...)\`/query API, then save/display those fetched records. If the action returned only structured summaries, answer from those summaries with \`agent_text_message(...)\`.
   - Do not use \`agent_heap_objects({ entries: [...] })\` or \`agent_heap_objects({ saveAs, entries })\` as a shortcut for ordered pages, queues, search results, or ranked lists; those forms can create duplicate or poorly labelled displays. Save the selection with \`heap.setVar(...)\` and display it via \`variableNames\` instead.
   - Use \`entryPaths\` only for a few already-known individual records and \`listNames\` only for a host-created list that you intentionally want to show. Do not display both an entry/list selection and a heap variable for the same records.
   - When the user asks to show, list, display, open, or "show them" for records you found, call \`agent_heap_objects(...)\`; do not answer only with a count or text summary.
@@ -18128,10 +18370,11 @@ ${outputRules}` : `Code:
 - Use choice only for 2 to 5 short grounded options.
 - For record choices, set each option value to a stable scalar such as the record \`_graphPath\` or \`id\`, not a label-only value.
 - After \`await loop.ask_user(...)\` returns from a choice prompt, tolerate either the option value, the option object, or a human-readable label by matching against value, id/path, label, and description before failing. If a returned label is a prefix or substring of exactly one option label, treat it as that option.
-- Use \`loop.confirm(...)\` for yes/no confirmation only when the user explicitly asks for confirmation, action or permission metadata requires it, policy requires it, or material uncertainty remains after grounding.
+- Use \`loop.confirm(...)\` for yes/no confirmation only when the user explicitly asks for a separate confirmation step, policy requires confirmation outside the action runtime, or material uncertainty remains after grounding.
+- If action, effect, tool, or permission metadata already marks the invoked action as confirmation-gated, do not call \`loop.confirm(...)\` before invoking it. Ground the target and input, then call the action once; the runtime action policy will surface the confirmation prompt and resume the same invocation after approval.
 - Do not add a generic yes/no confirmation after the user has already made a grounded choice, unless one of those confirmation conditions still applies.
-- Do not add confirmation only because an allowed mutation is visible to other people, customer-facing, or consequential. If the user clearly requested the mutation and the grounded target, action, and condition are unique, perform the mutation unless confirmation is required by the user, policy, action metadata, or remaining material uncertainty.
-- A conditional request such as "if this is true, do that" is authorization to perform the requested action after you verify the condition. Once the condition, target, and action are grounded uniquely, call the action directly; do not ask "should I perform/post/send this?" unless the user, policy, action metadata, or unresolved material uncertainty requires confirmation. The visibility or impact of an allowed action is not by itself unresolved uncertainty.
+- Do not add confirmation only because an allowed mutation is visible to other people, customer-facing, or consequential. If the user clearly requested the mutation and the grounded target, action, and condition are unique, perform the mutation unless confirmation is required outside the action runtime or remaining material uncertainty exists.
+- A conditional request such as "if this is true, do that" is authorization to perform the requested action after you verify the condition. Once the condition, target, and action are grounded uniquely, call the action directly; do not ask "should I perform/post/send this?" unless the user, policy outside the action runtime, or unresolved material uncertainty requires confirmation. The visibility or impact of an allowed action is not by itself unresolved uncertainty.
 - If the user explicitly asks you to stop for confirmation, natural-language text such as "please confirm" is not enough: call \`await loop.confirm(...)\` before the mutation, then perform the approved mutation in the same resumed job when it returns true.
 - Reuse existing task, decision, and closure ids from [State].
 - If a user request matches both a domain record/action and a workflow helper, prefer the domain capability.` : "";
@@ -18277,7 +18520,8 @@ Query policy:
 - For operational blocker, risk, status, or "what is happening" questions, inspect the relevant record's scalar fields such as status, priority, blocker, summary, latest update/message, due date, amount, and other domain-specific descriptive fields before answering.
 - For read-only readiness, risk, health, or status summaries, call any visible read-only assessment/status action on the grounded primary record before ad-hoc aggregation when such an action semantically matches the request. Use the returned fields in the reply and supplement with counts or record reads only when useful.
 - Do not hide required visible read-only assessment/status actions inside broad try/catch blocks. The runtime action surface should show that the assessment action ran.
-- Treat action/effect results as structured values, not necessarily arrays. Before indexing, iterating, checking \`.length\`, or calling array methods, normalize the result first: use the result itself only when \`Array.isArray(result)\`; otherwise read the exact array field shown in the output schema, or a documented array field such as \`items\`, \`matches\`, \`results\`, \`records\`, \`entries\`, \`candidates\`, \`options\`, or a domain-specific array field. Never convert a non-array object result to \`[]\` before checking its documented fields.
+- Treat action/effect results as structured values, not necessarily arrays. Before indexing, iterating, checking \`.length\`, or calling array methods, normalize the result first: use the result itself only when \`Array.isArray(result)\`; otherwise read the exact array field shown in the output schema, or a documented array field such as \`items\`, \`matches\`, \`results\`, \`records\`, \`entries\`, \`candidates\`, \`options\`, \`requests\`, \`vendors\`, \`transactions\`, \`approvals\`, \`receipts\`, or another domain-specific array field. If a structured result has \`count > 0\`, never conclude there are no matches until you inspect every array-valued field on that result object, especially fields named by the output schema. Never convert a non-array object result to \`[]\` before checking its documented fields.
+- Plain JSON objects returned by actions are not sandbox record instances, even when they contain ids, titles, labels, or status fields. Use them for reasoning and text responses. Do not pass action-returned JSON objects or arrays directly to \`heap.setVar(...)\` or \`agent_heap_objects(...)\`; fetch corresponding runtime records first when the user needs record display or follow-up references.
 - When a visible search, lookup, availability, or assessment action returns candidates or matches, treat those returned records as already scoped by the action inputs unless the output schema gives reliable fields for further narrowing. When matching returned candidates to grounded records, use the output schema's actual identifier fields, including \`id\`, \`path\`, or fields ending in \`Id\`; do not assume candidates have \`_graphPath\`. Do not discard all returned candidates by re-filtering on guessed property names.
 - For scheduling actions, convert relative wording into concrete ISO timestamps before mutating records.
 - When a decision depends on fresh external state and a visible read-only status/lookup action exists on the grounded record, call it before deciding, mutating, or refusing based on stale stored fields.
@@ -18339,6 +18583,7 @@ ${domainSections.docs}
 
 Actions:
 ${actionIndex}
+- Global actions are executable functions exported by "./sandbox-tools"; import each global action you call, e.g. \`import { some_action } from "./sandbox-tools"; await some_action(...)\`. This includes frontend actions such as opening, focusing, or navigating the host UI.
 - Actions listed under "Record-level" are instance methods. First fetch or find the specific record, then call the action on that instance, e.g. \`const item = await Item.get({ path }); await item.action_name(...)\`.
 - Actions listed under "Class-level" are class/static methods. Call them on the imported class, e.g. \`await Item.action_name(...)\`.
 - The action index is the visibility contract. If an action is listed for a class, call it directly on fetched/listed instances of that class; do not use \`typeof record.action_name === "function"\` as a discovery gate. If an action is not listed, do not call it.
@@ -19114,7 +19359,7 @@ function extractJsonStringField(source, fieldName) {
 function modelOutputInstruction() {
   return [
     "Return only a JSON object with this shape:",
-    '{ "action": "reply" | "job", "reply": string, "code": string }',
+    '{ "action": "reply" | "job", "code": string, "reply": string }',
     'Use "action":"reply" only when a plain conversational answer is enough and no live session state should change.',
     'Do not use "action":"reply" to promise future tool work; if the user asks to check, find, look up, inspect, read, reopen, summarize, transform, update, post, send, approve, schedule, reschedule, calculate, or confirm around session state, session files, generated files, tools, or a domain action, use "action":"job".',
     'If the user asks to use an attached file, uploaded file, generated file, previous output file, or "the summary/workbook/file you just created", choose "action":"job" and read it through [Runtime Imports] instead of answering from memory.',
@@ -19122,7 +19367,8 @@ function modelOutputInstruction() {
     'Before claiming you lack access, inspect the visible action list. If a visible read-only search, lookup, list, guidance, note, policy, or knowledge action can satisfy a "check", "find", "look up", or "whether we have guidance" request, choose "action":"job" and call it.',
     "Generated code must not report no matches for the primary human-described anchor after a single zero-result list/find/page call. Before that primary no-match return, retry the primary anchor with fewer text constraints or a distinct fallback such as owner/container grounding, relationship traversal, exact-id/path lookup, or shorter target-local search.",
     'Use "action":"job" when the next step should run code or mutate workflow state.',
-    'When action is "job", include runnable code in "code".',
+    'When action is "job", include runnable code in "code" and emit the "code" field before any non-empty "reply" field so generated code comments can stream as progress.',
+    "Generated job code must use plain ASCII punctuation in string literals and comments. Do not use curly quotes, smart apostrophes, en dashes, em dashes, or other typographic punctuation in code.",
     "Generated code must not reference prompt-only symbols such as runtimeImports, savedData, sessionFileManifest, recentReferences, workflowContext, workflowState, or capabilities. Copy concrete paths/ids from the prompt into strings, fetch records with documented imports, or use documented runtime globals.",
     "Generated code must follow [Runtime Imports]: import module exports from their listed module, use listed globals directly without importing them, and do not leave undeclared identifiers in the job.",
     "Generated action calls must use the exact input property names from the visible action schema. Do not invent synonym keys for required inputs.",
@@ -19207,13 +19453,36 @@ ${modelOutputInstruction()}`
         let text = "";
         let usage = null;
         let requestId = null;
-        if (input.onTextDelta) {
-          const onTextDelta = input.onTextDelta;
+        if (input.onTextDelta || input.onReplyDelta || input.onCodeDelta) {
           const stream = await client.chat.completions.create({
             ...payload,
             stream: true,
             stream_options: { include_usage: true }
           });
+          let streamedReply = "";
+          let streamedCode = "";
+          const emitReplyDelta = async () => {
+            if (!input.onReplyDelta) return;
+            const replyField = extractJsonStringField(text, "reply");
+            if (!replyField) return;
+            const nextReply = replyField.value;
+            if (!nextReply.startsWith(streamedReply)) return;
+            const delta = nextReply.slice(streamedReply.length);
+            if (!delta) return;
+            streamedReply = nextReply;
+            await input.onReplyDelta(delta);
+          };
+          const emitCodeDelta = async () => {
+            if (!input.onCodeDelta) return;
+            const codeField = extractJsonStringField(text, "code");
+            if (!codeField) return;
+            const nextCode = codeField.value;
+            if (!nextCode.startsWith(streamedCode)) return;
+            const delta = nextCode.slice(streamedCode.length);
+            if (!delta) return;
+            streamedCode = nextCode;
+            await input.onCodeDelta(delta);
+          };
           for await (const event of stream) {
             requestId = requestId || event.id || event._request_id || null;
             usage = event.usage || usage;
@@ -19221,8 +19490,12 @@ ${modelOutputInstruction()}`
             const deltaText = typeof delta === "string" ? delta : Array.isArray(delta) ? delta.map((part) => asRecord6(part)?.text || "").join("") : "";
             if (!deltaText) continue;
             text += deltaText;
-            await onTextDelta(deltaText);
+            await input.onTextDelta?.(deltaText);
+            await emitReplyDelta();
+            await emitCodeDelta();
           }
+          await emitReplyDelta();
+          await emitCodeDelta();
           raw = { streamed: true, model, usage, request_id: requestId };
         } else {
           const completion = await client.chat.completions.create(
@@ -19324,6 +19597,64 @@ function normalizeHeapSnapshot2(heap) {
     updatedAt: typeof heap?.updatedAt === "number" ? heap.updatedAt : Date.now()
   };
 }
+function targetFromUiContext(context) {
+  const target = asRecord6(context?.target) || asRecord6(context?.currentPageObject) || asRecord6(context?.commentaryTarget);
+  const className = typeof target?.className === "string" ? target.className : "";
+  const id = typeof target?.id === "string" ? target.id : "";
+  if (!className || !id) return null;
+  return {
+    className,
+    id,
+    label: typeof target?.label === "string" ? target.label : void 0
+  };
+}
+function heapEntryMatchesTarget(entry, target) {
+  if (entry.className !== target.className) return false;
+  if (entry.id === target.id) return true;
+  const fields = asRecord6(entry.fields);
+  return fields?.real_id === target.id || fields?._realId === target.id;
+}
+function focusedHeapEntryPathsFromUiContext(heap, context) {
+  const target = targetFromUiContext(context);
+  if (!target) return [];
+  return Object.entries(heap.entriesByPath).filter(([, entry]) => heapEntryMatchesTarget(entry, target)).map(([path2]) => path2);
+}
+function hasSessionDocumentContext(document) {
+  const doc = asRecord6(document);
+  if (!doc) return false;
+  const heap = normalizeHeapSnapshot2(asRecord6(doc.heap));
+  if (Object.keys(heap.entriesByPath).length > 0 || Object.keys(heap.listsByName).length > 0 || Object.keys(heap.variablesByName).length > 0) {
+    return true;
+  }
+  const domain = asRecord6(doc.domain);
+  const packages = asRecord6(domain?.packages);
+  if (packages && Object.keys(packages).length > 0) return true;
+  const prompts = asRecord6(doc.prompts);
+  if (prompts && Object.keys(prompts).length > 0) return true;
+  const workflows = asRecord6(doc.workflows);
+  if (workflows && Object.keys(workflows).length > 0) return true;
+  return false;
+}
+async function waitForSessionDocumentContext(environment, timeoutMs = 3e3) {
+  if (hasSessionDocumentContext(environment.document)) return;
+  await new Promise((resolve) => {
+    let settled = false;
+    let unsubscribe = null;
+    const settle = () => {
+      if (settled) return;
+      settled = true;
+      if (unsubscribe) unsubscribe();
+      clearTimeout(timer);
+      resolve();
+    };
+    const timer = setTimeout(settle, timeoutMs);
+    unsubscribe = environment.on("sync", (document) => {
+      if (hasSessionDocumentContext(document)) {
+        settle();
+      }
+    });
+  });
+}
 function buildContinuationPreview(checkpoint, noProgressCount) {
   const lines = [
     `Controller no-progress count: ${noProgressCount}`,
@@ -19345,7 +19676,7 @@ function readableAgentMessage(message) {
   const show = asRecord6(record.show);
   const variableNames = asArray3(show?.variableNames).map((value) => String(value)).filter(Boolean);
   if (variableNames.length) {
-    return `Displayed ${variableNames.join(", ")}`;
+    return variableNames.length === 1 ? "Displayed the selected record" : "Displayed the selected records";
   }
   if (typeof record.kind === "string") {
     return `Agent ${record.kind} message`;
@@ -19531,6 +19862,202 @@ async function writeJson(filePath, value) {
   await writeFile(filePath, `${JSON.stringify(value, null, 2)}
 `);
 }
+function safePathSegment(value, fallback) {
+  const normalized = (value || "").trim().toLowerCase();
+  const sanitized = normalized.replace(/[^a-z0-9._-]+/g, "-").replace(/-+/g, "-").replace(/^-+|-+$/g, "").slice(0, 128);
+  return sanitized || fallback;
+}
+function extractToolCalls(rawGeneration) {
+  const raw = asRecord6(rawGeneration);
+  if (!raw) return null;
+  const choices = asArray3(raw.choices);
+  const firstChoiceMessage = asRecord6(choices[0]);
+  const message = asRecord6(firstChoiceMessage?.message);
+  const toolCalls = asArray3(message?.tool_calls);
+  if (toolCalls.length > 0) return toolCalls;
+  return asArray3(raw.tool_calls).length > 0 ? asArray3(raw.tool_calls) : null;
+}
+function buildTurnMdxReport(input) {
+  const {
+    status,
+    conversation,
+    request,
+    requestTimestamp,
+    turnLog,
+    responseText,
+    terminalKind,
+    actionSummary = [],
+    promptInteractions = [],
+    result,
+    prompts = [],
+    verification,
+    error
+  } = input;
+  const iterationLines = [];
+  for (const iteration of turnLog.iterations) {
+    iterationLines.push(`### Iteration ${iteration.iteration}`);
+    iterationLines.push(
+      `- Request: ${iteration.request}`,
+      `- Generation duration: ${iteration.generationDurationMs !== void 0 ? `${iteration.generationDurationMs}ms` : "unknown"}`
+    );
+    if (iteration.templateId) {
+      iterationLines.push(
+        `- Template: ${iteration.templateId}@${iteration.templateVersion || "unknown"}`
+      );
+    }
+    if (iteration.templateHash) {
+      iterationLines.push(`- Template hash: ${iteration.templateHash}`);
+    }
+    if (iteration.promptInstanceHash) {
+      iterationLines.push(`- Prompt hash: ${iteration.promptInstanceHash}`);
+    }
+    iterationLines.push("", "#### Full prompt sent to LLM", "");
+    iterationLines.push(fenced(iteration.systemPrompt, "text"));
+    if (iteration.generationReply?.trim()) {
+      iterationLines.push(
+        "",
+        "#### LLM reply text",
+        iteration.generationReply.trim(),
+        ""
+      );
+    }
+    if (iteration.generatedCode?.trim()) {
+      iterationLines.push("#### Generated code", "", fenced(iteration.generatedCode.trim(), "ts"));
+    }
+    const toolCalls = extractToolCalls(iteration.rawGeneration);
+    iterationLines.push("#### Tool calls / raw generation", "");
+    if (toolCalls) {
+      iterationLines.push(fenced(JSON.stringify(toolCalls, null, 2), "json"));
+    } else if (iteration.rawGeneration) {
+      iterationLines.push(fenced(JSON.stringify(iteration.rawGeneration, null, 2), "json"));
+    } else {
+      iterationLines.push("_No tool call information._");
+    }
+    if (iteration.tokenUsage) {
+      iterationLines.push("", "#### Token usage", ...formatTokenUsage(iteration.tokenUsage));
+    }
+    if (iteration.responseText?.trim()) {
+      iterationLines.push("", "#### Runtime/prompt outcome", iteration.responseText);
+    }
+    if (iteration.actionSummary?.length) {
+      iterationLines.push("", "#### Action summary", "");
+      iterationLines.push(...iteration.actionSummary.map((line) => `- ${line}`));
+    }
+    if (iteration.continuation) {
+      iterationLines.push("", "#### Continuation", "", jsonBlock(iteration.continuation));
+    }
+    if (iteration.result !== void 0) {
+      iterationLines.push("", "#### Result", "", jsonBlock(iteration.result));
+    }
+    if (iteration.error) {
+      iterationLines.push("", `#### Error`, "", iteration.error);
+    }
+    iterationLines.push("", "---", "");
+  }
+  const promptEventLines = conversation.promptEvents.filter((event) => event.receivedAt >= requestTimestamp).map((event, index) => {
+    const prompt = event.prompt;
+    return `${index + 1}. ${prompt.type} ${prompt.title || ""} ${prompt.message ? `\u2014 ${prompt.message}` : ""}`;
+  });
+  const historyLines = conversation.history.map((entry, index) => {
+    const label = `${index + 1}. ${entry.role}`;
+    const detail = entry.content || (entry.code ? "(code)" : "");
+    return `${label}: ${detail || "(no text)"}`;
+  });
+  const lines = [
+    "# Local Agent Query Report",
+    "",
+    `- timestamp: ${new Date(requestTimestamp).toISOString()}`,
+    `- turn: ${turnLog.turnNumber} (${turnLog.turnId})`,
+    `- status: ${status}`,
+    "",
+    "## Table of contents",
+    "- [Metadata](#metadata)",
+    "- [User query and context](#user-query-and-context)",
+    "- [Conversation history](#conversation-history)",
+    "- [Harness loop iterations](#harness-loop-iterations)",
+    "- [Result and interactions](#result-and-interactions)",
+    "",
+    "## Metadata",
+    `- Ontology: ${conversation.environment.ontologyId}`,
+    `- Subject: ${conversation.environment.subjectId}`,
+    `- Session: ${conversation.environment.sessionId}`,
+    `- Environment: ${conversation.environment.environmentId}`,
+    `- Sandbox: ${conversation.environment.sandboxId}`,
+    `- Permission profile: ${conversation.environment.permissionProfileId}`,
+    `- Conversation artifacts: ${turnLog.turnDir}`,
+    "",
+    "## User query and context",
+    "",
+    "### Request",
+    fenced(request, "text"),
+    "",
+    "### Open prompts at/after request time"
+  ];
+  if (promptEventLines.length) {
+    lines.push(...promptEventLines.map((line) => `- ${line}`));
+  } else {
+    lines.push("- _None");
+  }
+  lines.push(
+    "",
+    "## Conversation history",
+    ...historyLines.map((line) => `- ${line}`),
+    "",
+    "## Harness loop iterations",
+    "",
+    ...iterationLines,
+    "## Result and interactions",
+    ""
+  );
+  if (responseText) {
+    lines.push("### Final response", responseText, "");
+  }
+  if (terminalKind) {
+    lines.push(`### Terminal kind`, terminalKind, "");
+  }
+  lines.push("### Action summary");
+  if (actionSummary.length) {
+    lines.push(...actionSummary.map((line) => `- ${line}`));
+  } else {
+    lines.push("- None");
+  }
+  lines.push("", "### User interactions");
+  if (promptInteractions.length) {
+    for (const interaction of promptInteractions) {
+      lines.push(
+        `- ${interaction.type} ${interaction.message || interaction.title} -> ${JSON.stringify(interaction.answer)}`
+      );
+    }
+  } else {
+    lines.push("- None");
+  }
+  lines.push("", "### Pending prompts");
+  if (prompts.length) {
+    for (const prompt of prompts) {
+      lines.push(`- ${prompt.type} ${prompt.title || ""} ${prompt.message || ""}`);
+    }
+  } else {
+    lines.push("- None");
+  }
+  if (result !== void 0) {
+    lines.push("", "### Result payload", "", jsonBlock(result));
+  }
+  if (verification !== void 0) {
+    lines.push("", "### Verification", "", jsonBlock(verification));
+  }
+  if (error) {
+    lines.push("", `### Error`, "", error);
+  }
+  if (turnLog.error) {
+    lines.push("", "### Turn log error", "", turnLog.error);
+  }
+  lines.push("");
+  if (iterationLines.length === 0) {
+    lines.splice(lines.indexOf("## Harness loop iterations") + 1, 0, "- _No iterations recorded._");
+  }
+  return `${lines.join("\n")}
+`;
+}
 function describeScenarioBehavior(result) {
   if (result.scenario.description?.trim()) {
     return result.scenario.description.trim();
@@ -20311,6 +20838,16 @@ function createAgentEvalHarness(options) {
   const chatTimeoutMs = options.chatTimeoutMs ?? 12e4;
   const jobTimeoutMs = options.jobTimeoutMs ?? 9e4;
   const pollIntervalMs = options.pollIntervalMs ?? 250;
+  const isTruthyEnv = (value) => {
+    return value?.trim().toLowerCase() === "1" || value?.trim().toLowerCase() === "true" || value?.trim().toLowerCase() === "yes" || value?.trim().toLowerCase() === "on";
+  };
+  const localTurnReportsEnabled = (() => {
+    if (typeof options.local === "boolean") return options.local;
+    return process.env.NODE_ENV === "development" || isTruthyEnv(process.env.GRANULAR_LOCAL) || isTruthyEnv(process.env.GRANULAR_USE_LOCAL_ENDPOINTS) || isTruthyEnv(process.env.GRANULAR_USE_LOCAL) || process.env.GRANULAR_ENDPOINT_MODE?.toLowerCase() === "local";
+  })();
+  const localTurnReportBaseDir = path.resolve(
+    options.localTurnReportBaseDir || process.cwd()
+  );
   const resolvedTemplate = resolveHarnessTemplate(
     options.harnessTemplateId || process.env.GRANULAR_AGENT_HARNESS_TEMPLATE || "stable");
   const promptRenderer = options.promptRenderer || resolvedTemplate.renderPrompt;
@@ -20338,6 +20875,7 @@ function createAgentEvalHarness(options) {
       if (environment.getEffects().length > 0) break;
       await sleep2(250);
     }
+    await waitForSessionDocumentContext(environment);
     await ensureDir(path.join(artifactDir, slugify(label)));
     return {
       label,
@@ -20358,6 +20896,41 @@ function createAgentEvalHarness(options) {
     } catch {
     }
   }
+  async function writeLocalTurnReport(input) {
+    if (!localTurnReportsEnabled) return;
+    const { status, conversation, turnLog, request, requestTimestamp, error } = input;
+    const requestId = safePathSegment(
+      new Date(requestTimestamp).toISOString().replace(/[:.]/g, "-"),
+      "turn"
+    );
+    const reportDir = path.join(
+      localTurnReportBaseDir,
+      safePathSegment(conversation.environment.ontologyId, "ontology"),
+      safePathSegment(conversation.environment.subjectId, "subject"),
+      safePathSegment(conversation.environment.sessionId, "session")
+    );
+    await ensureDir(reportDir);
+    const completed = input.completed;
+    const pending = input.pending;
+    const report = buildTurnMdxReport({
+      status,
+      conversation,
+      request,
+      requestTimestamp,
+      turnLog,
+      responseText: completed?.responseText,
+      terminalKind: completed?.terminalKind,
+      actionSummary: completed?.actionSummary,
+      promptInteractions: completed?.promptInteractions || pending?.promptInteractions,
+      result: completed?.result,
+      prompts: pending?.prompts,
+      verification: completed?.verification,
+      error
+    });
+    const reportPath = path.join(reportDir, `${requestId}.mdx`);
+    await writeFile(reportPath, report);
+    console.log(`[agent][local] saved query report: ${reportPath}`);
+  }
   async function runCheckJob(code, session) {
     const job = await session.submitJob(code);
     return withTimeout2(job.result, jobTimeoutMs, `check job ${job.id}`);
@@ -20617,237 +21190,329 @@ function createAgentEvalHarness(options) {
     const baselineClosureId = getCurrentClosureId(
       cloneJson(conversation.environment.document)
     );
-    while (iteration < maxIterations) {
-      const liveDoc = cloneJson(conversation.environment.document);
-      const pendingPrompts = filterPromptsByBoundary(
-        liveDoc,
-        getOpenPromptsFromDoc(liveDoc),
-        boundaryTimestamp
-      );
-      const workflowFocus = projectWorkflowFocus(liveDoc, pendingPrompts, {
-        boundaryTimestamp
+    const writeTurnReport = async (status) => {
+      await writeLocalTurnReport({
+        status: status.type,
+        conversation,
+        turnLog,
+        request: input.request,
+        requestTimestamp: boundaryTimestamp,
+        completed: status.completed,
+        pending: status.pending,
+        error: status.error
       });
-      const referentFocus = projectConversationReferentFocus(liveDoc);
-      const heapFocus = {
-        variableNames: [
-          ...workflowFocus.variableNames,
-          ...referentFocus.variableNames
-        ],
-        listNames: [...workflowFocus.listNames, ...referentFocus.listNames],
-        entryPaths: [...workflowFocus.entryPaths, ...referentFocus.entryPaths]
-      };
-      const tools = conversation.environment.getEffects().map((tool) => ({
-        name: tool.name,
-        description: tool.description,
-        className: tool.className,
-        static: tool.static,
-        ready: tool.ready,
-        inputSchema: tool.inputSchema,
-        outputSchema: tool.outputSchema
-      }));
-      const renderedPrompt = promptRenderer({
-        domainDocumentation: await conversation.environment.getDomainDocumentation(),
-        sessionContext: {
-          sandboxId: conversation.environment.sandboxId,
-          environmentId: conversation.environment.environmentId,
-          domainRevision: conversation.environment.domainRevision
-        },
-        heapSummary: projectHeapSummary(asRecord6(liveDoc?.heap), {
-          focus: heapFocus
-        }),
-        fileSummary: projectSessionFileSummary(liveDoc),
-        referentSummary: projectConversationReferentSummary(liveDoc),
-        loopSummary: projectLoopSummary(liveDoc, pendingPrompts, {
+    };
+    try {
+      while (iteration < maxIterations) {
+        const liveDoc = cloneJson(conversation.environment.document);
+        const promptHeap = normalizeHeapSnapshot2(asRecord6(liveDoc?.heap));
+        const pendingPrompts = filterPromptsByBoundary(
+          liveDoc,
+          getOpenPromptsFromDoc(liveDoc),
           boundaryTimestamp
-        }),
-        workflowSummary: projectWorkflowSummary(liveDoc, pendingPrompts, {
+        );
+        const workflowFocus = projectWorkflowFocus(liveDoc, pendingPrompts, {
           boundaryTimestamp
-        }),
-        tools,
-        checkpoint: latestCheckpoint
-      });
-      const systemPrompt = renderedPrompt.prompt;
-      await emitProgress(onProgress, {
-        phase: "prompt",
-        status: "passed",
-        scenarioId: conversation.label,
-        stepId: turnId,
-        iteration: iteration + 1,
-        templateId: renderedPrompt.templateId,
-        templateVersion: renderedPrompt.templateVersion,
-        title: "Rendered harness prompt",
-        message: `${systemPrompt.split("\n").length} lines`,
-        data: {
-          templateId: renderedPrompt.templateId,
-          templateVersion: renderedPrompt.templateVersion,
-          templateHash: renderedPrompt.templateHash,
-          promptInstanceHash: renderedPrompt.promptInstanceHash,
-          prompt: systemPrompt
-        }
-      });
-      const request = iteration === 0 ? input.request : continuationRenderer(
-        buildContinuationPreview(latestCheckpoint, noProgressCount)
-      ).instruction;
-      await emitProgress(onProgress, {
-        phase: "generation",
-        status: "running",
-        scenarioId: conversation.label,
-        stepId: turnId,
-        iteration: iteration + 1,
-        templateId: renderedPrompt.templateId,
-        templateVersion: renderedPrompt.templateVersion,
-        title: iteration === 0 ? "Generating agent response" : "Generating continuation",
-        message: request
-      });
-      const generation = await withTimeout2(
-        generateTurnWithRepair(options.generator, {
-          systemPrompt,
-          history: buildHistory(conversation.history),
-          request,
-          attempt: 1,
-          tools,
-          usageContext: {
+        });
+        const referentFocus = projectConversationReferentFocus(liveDoc);
+        const heapFocus = {
+          variableNames: [
+            ...workflowFocus.variableNames,
+            ...referentFocus.variableNames
+          ],
+          listNames: [...workflowFocus.listNames, ...referentFocus.listNames],
+          entryPaths: [
+            ...workflowFocus.entryPaths,
+            ...referentFocus.entryPaths,
+            ...focusedHeapEntryPathsFromUiContext(promptHeap, input.uiContext)
+          ]
+        };
+        const tools = conversation.environment.getEffects().map((tool) => ({
+          name: tool.name,
+          description: tool.description,
+          className: tool.className,
+          static: tool.static,
+          ready: tool.ready,
+          inputSchema: tool.inputSchema,
+          outputSchema: tool.outputSchema
+        }));
+        const renderedPrompt = promptRenderer({
+          domainDocumentation: await conversation.environment.getDomainDocumentation(),
+          sessionContext: {
             sandboxId: conversation.environment.sandboxId,
             environmentId: conversation.environment.environmentId,
-            sessionId: conversation.environment.sessionId,
-            subjectId: conversation.environment.subjectId,
-            permissionProfileId: conversation.environment.permissionProfileId
+            domainRevision: conversation.environment.domainRevision,
+            uiContext: input.uiContext || null
+          },
+          heapSummary: projectHeapSummary(asRecord6(liveDoc?.heap), {
+            focus: heapFocus
+          }),
+          fileSummary: projectSessionFileSummary(liveDoc),
+          referentSummary: projectConversationReferentSummary(liveDoc),
+          loopSummary: projectLoopSummary(liveDoc, pendingPrompts, {
+            boundaryTimestamp
+          }),
+          workflowSummary: projectWorkflowSummary(liveDoc, pendingPrompts, {
+            boundaryTimestamp
+          }),
+          tools,
+          checkpoint: latestCheckpoint
+        });
+        const systemPrompt = renderedPrompt.prompt;
+        await emitProgress(onProgress, {
+          phase: "prompt",
+          status: "passed",
+          scenarioId: conversation.label,
+          stepId: turnId,
+          iteration: iteration + 1,
+          templateId: renderedPrompt.templateId,
+          templateVersion: renderedPrompt.templateVersion,
+          title: "Rendered harness prompt",
+          message: `${systemPrompt.split("\n").length} lines`,
+          data: {
+            templateId: renderedPrompt.templateId,
+            templateVersion: renderedPrompt.templateVersion,
+            templateHash: renderedPrompt.templateHash,
+            promptInstanceHash: renderedPrompt.promptInstanceHash,
+            prompt: systemPrompt
           }
-        }),
-        chatTimeoutMs,
-        `chat generation for ${conversation.label} iteration ${iteration + 1}`
-      );
-      await emitProgress(onProgress, {
-        phase: "generation",
-        status: "passed",
-        scenarioId: conversation.label,
-        stepId: turnId,
-        iteration: iteration + 1,
-        templateId: renderedPrompt.templateId,
-        templateVersion: renderedPrompt.templateVersion,
-        title: generation.code ? "Generated job code" : "Generated text reply",
-        message: generation.code || generation.reply || "",
-        data: {
-          reply: generation.reply,
-          code: generation.code,
-          attempts: generation.generationAttempts,
-          usage: tokenUsageForGenerationOutput(generation)
-        }
-      });
-      const iterationLog = {
-        iteration: iteration + 1,
-        request,
-        systemPrompt,
-        templateId: renderedPrompt.templateId,
-        templateVersion: renderedPrompt.templateVersion,
-        templateHash: renderedPrompt.templateHash,
-        promptInstanceHash: renderedPrompt.promptInstanceHash,
-        generationReply: generation.reply,
-        generatedCode: generation.code,
-        rawGeneration: generation.raw,
-        generationAttempts: generation.generationAttempts,
-        tokenUsage: tokenUsageForGenerationOutput(generation)
-      };
-      turnLog.iterations.push(iterationLog);
-      await writeJson(
-        path.join(turnDir, `iteration-${iteration + 1}-generation.json`),
-        generation
-      );
-      if (!generation.code) {
-        const responseText2 = generation.reply?.trim() || "Done.";
-        conversation.history.push({ role: "assistant", content: responseText2 });
-        const completed = {
-          conversation,
-          request: input.request,
-          turnDir,
-          responseText: responseText2,
-          terminalKind: "reply",
-          actionSummary: [],
-          promptInteractions: [],
-          verification: null,
-          result: generation.reply?.trim() || responseText2
-        };
-        if (input.verification) {
-          completed.verification = await runInspection(
-            conversation,
-            input.verification,
-            completed,
-            turnDir
-          );
-        }
-        iterationLog.responseText = responseText2;
-        iterationLog.terminalKind = "reply";
-        iterationLog.actionSummary = [];
-        iterationLog.promptInteractions = [];
-        iterationLog.result = completed.result;
-        turnLog.completed = {
-          responseText: responseText2,
-          terminalKind: "reply",
-          actionSummary: [],
-          promptInteractions: [],
-          result: completed.result
+        });
+        const request = iteration === 0 ? input.request : continuationRenderer(
+          buildContinuationPreview(latestCheckpoint, noProgressCount)
+        ).instruction;
+        await emitProgress(onProgress, {
+          phase: "generation",
+          status: "running",
+          scenarioId: conversation.label,
+          stepId: turnId,
+          iteration: iteration + 1,
+          templateId: renderedPrompt.templateId,
+          templateVersion: renderedPrompt.templateVersion,
+          title: iteration === 0 ? "Generating agent response" : "Generating continuation",
+          message: request
+        });
+        const emittedGeneratedReasoningLines = /* @__PURE__ */ new Set();
+        let generatedReasoningBuffer = "";
+        const emitGeneratedReasoningLine = async (line) => {
+          if (emittedGeneratedReasoningLines.has(line)) return;
+          emittedGeneratedReasoningLines.add(line);
+          await emitProgress(onProgress, {
+            phase: "generation",
+            status: "running",
+            scenarioId: conversation.label,
+            stepId: turnId,
+            iteration: iteration + 1,
+            templateId: renderedPrompt.templateId,
+            templateVersion: renderedPrompt.templateVersion,
+            title: "Generated reasoning comment",
+            message: line,
+            data: { source: "generated_code_comment" }
+          });
         };
-        await writeJson(path.join(turnDir, "result.json"), completed);
+        const generationStartedAt = Date.now();
+        const generation = await withTimeout2(
+          generateTurnWithRepair(options.generator, {
+            systemPrompt,
+            history: buildHistory(conversation.history),
+            request,
+            attempt: 1,
+            tools,
+            onReplyDelta: async (delta) => {
+              await emitProgress(onProgress, {
+                phase: "generation",
+                status: "running",
+                scenarioId: conversation.label,
+                stepId: turnId,
+                iteration: iteration + 1,
+                templateId: renderedPrompt.templateId,
+                templateVersion: renderedPrompt.templateVersion,
+                title: "Generated text reply delta",
+                message: delta,
+                data: { delta }
+              });
+            },
+            onCodeDelta: async (delta) => {
+              const parsed = consumeGranularReasoningOnlyChunk(
+                generatedReasoningBuffer,
+                delta
+              );
+              generatedReasoningBuffer = parsed.buffer;
+              for (const line of parsed.reasoningLines) {
+                await emitGeneratedReasoningLine(line);
+              }
+            },
+            usageContext: {
+              sandboxId: conversation.environment.sandboxId,
+              environmentId: conversation.environment.environmentId,
+              sessionId: conversation.environment.sessionId,
+              subjectId: conversation.environment.subjectId,
+              permissionProfileId: conversation.environment.permissionProfileId
+            }
+          }),
+          chatTimeoutMs,
+          `chat generation for ${conversation.label} iteration ${iteration + 1}`
+        );
+        const generationDurationMs = Date.now() - generationStartedAt;
         await emitProgress(onProgress, {
-          phase: "step",
+          phase: "generation",
           status: "passed",
           scenarioId: conversation.label,
           stepId: turnId,
-          title: "Step completed with text reply",
-          message: responseText2,
-          data: completed
+          iteration: iteration + 1,
+          templateId: renderedPrompt.templateId,
+          templateVersion: renderedPrompt.templateVersion,
+          title: generation.code ? "Generated job code" : "Generated text reply",
+          message: generation.code || generation.reply || "",
+          data: {
+            reply: generation.reply,
+            code: generation.code,
+            attempts: generation.generationAttempts,
+            usage: tokenUsageForGenerationOutput(generation)
+          }
         });
-        return completed;
-      }
-      const session = conversation.environment;
-      const job = await session.submitJob(generation.code, {
-        agent: {
-          userRequest: input.request,
-          generationRequest: request,
-          systemPrompt,
-          history: buildHistory(conversation.history),
-          scenarioLabel: conversation.label,
-          turnId,
+        const generatedReasoningLines = generation.code ? consumeGranularReasoningOnlyChunk("", generation.code, {
+          final: true
+        }).reasoningLines : [];
+        for (const line of generatedReasoningLines) {
+          await emitGeneratedReasoningLine(line);
+        }
+        const iterationLog = {
           iteration: iteration + 1,
-          tools,
+          request,
+          generationDurationMs,
+          systemPrompt,
+          templateId: renderedPrompt.templateId,
+          templateVersion: renderedPrompt.templateVersion,
+          templateHash: renderedPrompt.templateHash,
+          promptInstanceHash: renderedPrompt.promptInstanceHash,
           generationReply: generation.reply,
+          generatedCode: generation.code,
           rawGeneration: generation.raw,
-          repairIssues: generation.generationAttempts?.flatMap(
-            (attempt) => attempt.repairIssues || []
-          )
-        }
-      });
-      await emitProgress(onProgress, {
-        phase: "job",
-        status: "running",
-        scenarioId: conversation.label,
-        stepId: turnId,
-        iteration: iteration + 1,
-        jobId: job.id,
-        templateId: renderedPrompt.templateId,
-        templateVersion: renderedPrompt.templateVersion,
-        title: "Submitted Granular job",
-        message: job.id,
-        data: { code: generation.code }
-      });
-      const outcome = await waitForJobOutcome({
-        environment: conversation.environment,
-        job,
-        boundaryTimestamp,
-        timeoutMs: jobTimeoutMs,
-        pollIntervalMs,
-        onProgress: (event) => void onProgress?.(event),
-        progressContext: {
+          generationAttempts: generation.generationAttempts,
+          tokenUsage: tokenUsageForGenerationOutput(generation)
+        };
+        turnLog.iterations.push(iterationLog);
+        await writeJson(
+          path.join(turnDir, `iteration-${iteration + 1}-generation.json`),
+          generation
+        );
+        if (!generation.code) {
+          const responseText2 = generation.reply?.trim() || "Done.";
+          conversation.history.push({ role: "assistant", content: responseText2 });
+          const completed = {
+            conversation,
+            request: input.request,
+            turnDir,
+            responseText: responseText2,
+            terminalKind: "reply",
+            actionSummary: [],
+            promptInteractions: [],
+            verification: null,
+            result: generation.reply?.trim() || responseText2
+          };
+          if (input.verification) {
+            completed.verification = await runInspection(
+              conversation,
+              input.verification,
+              completed,
+              turnDir
+            );
+          }
+          iterationLog.responseText = responseText2;
+          iterationLog.terminalKind = "reply";
+          iterationLog.actionSummary = [];
+          iterationLog.promptInteractions = [];
+          iterationLog.result = completed.result;
+          turnLog.completed = {
+            responseText: responseText2,
+            terminalKind: "reply",
+            actionSummary: [],
+            promptInteractions: [],
+            result: completed.result
+          };
+          await writeJson(path.join(turnDir, "result.json"), completed);
+          await writeTurnReport({ type: "completed", completed });
+          await emitProgress(onProgress, {
+            phase: "step",
+            status: "passed",
+            scenarioId: conversation.label,
+            stepId: turnId,
+            title: "Step completed with text reply",
+            message: responseText2,
+            data: completed
+          });
+          return completed;
+        }
+        const session = conversation.environment;
+        const job = await session.submitJob(generation.code, {
+          agent: {
+            userRequest: input.request,
+            generationRequest: request,
+            systemPrompt,
+            history: buildHistory(conversation.history),
+            scenarioLabel: conversation.label,
+            turnId,
+            iteration: iteration + 1,
+            tools,
+            generationReply: generation.reply,
+            rawGeneration: generation.raw,
+            repairIssues: generation.generationAttempts?.flatMap(
+              (attempt) => attempt.repairIssues || []
+            )
+          }
+        });
+        await emitProgress(onProgress, {
+          phase: "job",
+          status: "running",
           scenarioId: conversation.label,
           stepId: turnId,
           iteration: iteration + 1,
+          jobId: job.id,
           templateId: renderedPrompt.templateId,
-          templateVersion: renderedPrompt.templateVersion
-        }
-      });
-      if (outcome.kind === "prompt") {
-        if (!autoAnswerPrompts) {
-          return {
+          templateVersion: renderedPrompt.templateVersion,
+          title: "Submitted Granular job",
+          message: job.id,
+          data: { code: generation.code }
+        });
+        const outcome = await waitForJobOutcome({
+          environment: conversation.environment,
+          job,
+          boundaryTimestamp,
+          timeoutMs: jobTimeoutMs,
+          pollIntervalMs,
+          onProgress: (event) => void onProgress?.(event),
+          progressContext: {
+            scenarioId: conversation.label,
+            stepId: turnId,
+            iteration: iteration + 1,
+            templateId: renderedPrompt.templateId,
+            templateVersion: renderedPrompt.templateVersion
+          }
+        });
+        if (outcome.kind === "prompt") {
+          if (!autoAnswerPrompts) {
+            const pending2 = {
+              conversation,
+              request: input.request,
+              turnDir,
+              boundaryTimestamp,
+              finalCode: generation.code,
+              finalReply: generation.reply?.trim() || "",
+              stdout: outcome.stdout,
+              stderr: outcome.stderr,
+              prompts: outcome.prompts,
+              promptInteractions: [],
+              job
+            };
+            await writeTurnReport({ type: "pending", pending: pending2 });
+            return pending2;
+          }
+          if (!input.human) {
+            throw new Error(
+              "This turn reached a human prompt but no responder was provided"
+            );
+          }
+          let pending = {
             conversation,
             request: input.request,
             turnDir,
@@ -20860,187 +21525,180 @@ function createAgentEvalHarness(options) {
             promptInteractions: [],
             job
           };
+          while ("prompts" in pending) {
+            const resumed = await resumePendingTurn(pending, input.human);
+            if ("prompts" in resumed) {
+              pending = resumed;
+              continue;
+            }
+            if (input.verification) {
+              resumed.verification = await runInspection(
+                conversation,
+                input.verification,
+                resumed,
+                turnDir
+              );
+            }
+            turnLog.completed = {
+              responseText: resumed.responseText,
+              terminalKind: resumed.terminalKind,
+              actionSummary: resumed.actionSummary,
+              promptInteractions: resumed.promptInteractions,
+              result: resumed.result
+            };
+            await writeTurnReport({ type: "completed", completed: resumed });
+            return resumed;
+          }
         }
-        if (!input.human) {
+        if (outcome.kind !== "completed") {
           throw new Error(
-            "This turn reached a human prompt but no responder was provided"
+            "Unexpected non-completed outcome after prompt handling"
           );
         }
-        let pending = {
-          conversation,
-          request: input.request,
-          turnDir,
-          boundaryTimestamp,
-          finalCode: generation.code,
-          finalReply: generation.reply?.trim() || "",
+        await sleep2(350);
+        const settledLiveDoc = cloneJson(
+          conversation.environment.document
+        );
+        const sessionHeap = normalizeHeapSnapshot2(asRecord6(settledLiveDoc?.heap));
+        const presentation = resolveJobPresentation({
+          jobId: job.id,
+          result: outcome.result,
           stdout: outcome.stdout,
-          stderr: outcome.stderr,
-          prompts: outcome.prompts,
-          promptInteractions: [],
-          job
+          agentMessages: getJobAgentMessages(settledLiveDoc, job.id),
+          sessionHeap
+        });
+        const responseText = presentation.responseText || generation.reply?.trim() || "Done.";
+        const verifierSnapshot = createHarnessVerifierSnapshot({
+          finalCode: generation.code,
+          resultPreview: JSON.stringify(outcome.result, null, 2),
+          liveDoc: settledLiveDoc,
+          projectionOptions: { boundaryTimestamp }
+        });
+        const continuation = evaluateContinuation({
+          iteration,
+          budgets: controllerBudgets,
+          baselineClosureId,
+          currentClosureId: getCurrentClosureId(settledLiveDoc),
+          liveDoc: settledLiveDoc,
+          pendingPrompts: filterPromptsByBoundary(
+            settledLiveDoc,
+            getOpenPromptsFromDoc(settledLiveDoc),
+            boundaryTimestamp
+          ),
+          projectionOptions: { boundaryTimestamp },
+          latestResponseText: responseText,
+          previousSnapshot,
+          currentSnapshot: verifierSnapshot,
+          previousNoProgressCount: noProgressCount
+        });
+        latestCheckpoint = {
+          iteration: iteration + 1,
+          latestJobStatus: "succeeded",
+          latestJobResult: JSON.stringify(outcome.result, null, 2),
+          latestActionSummary: getActionSummary(settledLiveDoc, job.id),
+          controllerOutcome: continuation.outcome,
+          controllerReason: continuation.reason,
+          noProgressCount: continuation.nextNoProgressCount
         };
-        while ("prompts" in pending) {
-          const resumed = await resumePendingTurn(pending, input.human);
-          if ("prompts" in resumed) {
-            pending = resumed;
-            continue;
+        await emitProgress(onProgress, {
+          phase: "continuation",
+          status: continuation.shouldContinue ? "running" : "passed",
+          scenarioId: conversation.label,
+          stepId: turnId,
+          iteration: iteration + 1,
+          jobId: job.id,
+          templateId: renderedPrompt.templateId,
+          templateVersion: renderedPrompt.templateVersion,
+          title: continuation.shouldContinue ? "Harness requested another loop" : "Harness accepted completion",
+          message: `${continuation.reason}; ${continuation.outcome}`,
+          data: {
+            continuation,
+            checkpoint: latestCheckpoint,
+            verifierSnapshot
           }
+        });
+        previousSnapshot = verifierSnapshot;
+        noProgressCount = continuation.nextNoProgressCount;
+        conversation.history.push({
+          role: "assistant",
+          content: responseText,
+          code: generation.code,
+          jobStatus: "succeeded",
+          jobResultPreview: JSON.stringify(outcome.result, null, 2)
+        });
+        await writeJson(
+          path.join(turnDir, `iteration-${iteration + 1}-result.json`),
+          {
+            responseText,
+            continuation,
+            actionSummary: latestCheckpoint.latestActionSummary,
+            result: outcome.result
+          }
+        );
+        iterationLog.responseText = responseText;
+        iterationLog.terminalKind = getCurrentClosureId(settledLiveDoc) ? "closure" : "reply";
+        iterationLog.actionSummary = latestCheckpoint.latestActionSummary || [];
+        iterationLog.promptInteractions = [];
+        iterationLog.continuation = continuation;
+        iterationLog.result = outcome.result;
+        if (!continuation.shouldContinue) {
+          const completed = {
+            conversation,
+            request: input.request,
+            turnDir,
+            responseText,
+            terminalKind: getCurrentClosureId(settledLiveDoc) ? "closure" : "reply",
+            finalCode: generation.code,
+            actionSummary: latestCheckpoint.latestActionSummary || [],
+            promptInteractions: [],
+            verification: null,
+            result: outcome.result
+          };
           if (input.verification) {
-            resumed.verification = await runInspection(
+            completed.verification = await runInspection(
               conversation,
               input.verification,
-              resumed,
+              completed,
               turnDir
             );
           }
           turnLog.completed = {
-            responseText: resumed.responseText,
-            terminalKind: resumed.terminalKind,
-            actionSummary: resumed.actionSummary,
-            promptInteractions: resumed.promptInteractions,
-            result: resumed.result
+            responseText,
+            terminalKind: completed.terminalKind,
+            actionSummary: completed.actionSummary,
+            promptInteractions: [],
+            result: outcome.result
           };
-          return resumed;
+          await writeJson(path.join(turnDir, "result.json"), completed);
+          await writeTurnReport({ type: "completed", completed });
+          await emitProgress(onProgress, {
+            phase: "step",
+            status: "passed",
+            scenarioId: conversation.label,
+            stepId: turnId,
+            iteration: iteration + 1,
+            jobId: job.id,
+            title: "Step completed",
+            message: responseText,
+            data: completed
+          });
+          return completed;
         }
+        iteration += 1;
       }
-      if (outcome.kind !== "completed") {
-        throw new Error(
-          "Unexpected non-completed outcome after prompt handling"
-        );
-      }
-      await sleep2(350);
-      const settledLiveDoc = cloneJson(
-        conversation.environment.document
-      );
-      const sessionHeap = normalizeHeapSnapshot2(asRecord6(settledLiveDoc?.heap));
-      const presentation = resolveJobPresentation({
-        jobId: job.id,
-        result: outcome.result,
-        stdout: outcome.stdout,
-        agentMessages: getJobAgentMessages(settledLiveDoc, job.id),
-        sessionHeap
-      });
-      const responseText = presentation.responseText || generation.reply?.trim() || "Done.";
-      const verifierSnapshot = createHarnessVerifierSnapshot({
-        finalCode: generation.code,
-        resultPreview: JSON.stringify(outcome.result, null, 2),
-        liveDoc: settledLiveDoc,
-        projectionOptions: { boundaryTimestamp }
-      });
-      const continuation = evaluateContinuation({
-        iteration,
-        budgets: controllerBudgets,
-        baselineClosureId,
-        currentClosureId: getCurrentClosureId(settledLiveDoc),
-        liveDoc: settledLiveDoc,
-        pendingPrompts: filterPromptsByBoundary(
-          settledLiveDoc,
-          getOpenPromptsFromDoc(settledLiveDoc),
-          boundaryTimestamp
-        ),
-        projectionOptions: { boundaryTimestamp },
-        latestResponseText: responseText,
-        previousSnapshot,
-        currentSnapshot: verifierSnapshot,
-        previousNoProgressCount: noProgressCount
-      });
-      latestCheckpoint = {
-        iteration: iteration + 1,
-        latestJobStatus: "succeeded",
-        latestJobResult: JSON.stringify(outcome.result, null, 2),
-        latestActionSummary: getActionSummary(settledLiveDoc, job.id),
-        controllerOutcome: continuation.outcome,
-        controllerReason: continuation.reason,
-        noProgressCount: continuation.nextNoProgressCount
-      };
-      await emitProgress(onProgress, {
-        phase: "continuation",
-        status: continuation.shouldContinue ? "running" : "passed",
-        scenarioId: conversation.label,
-        stepId: turnId,
-        iteration: iteration + 1,
-        jobId: job.id,
-        templateId: renderedPrompt.templateId,
-        templateVersion: renderedPrompt.templateVersion,
-        title: continuation.shouldContinue ? "Harness requested another loop" : "Harness accepted completion",
-        message: `${continuation.reason}; ${continuation.outcome}`,
-        data: {
-          continuation,
-          checkpoint: latestCheckpoint,
-          verifierSnapshot
-        }
-      });
-      previousSnapshot = verifierSnapshot;
-      noProgressCount = continuation.nextNoProgressCount;
-      conversation.history.push({
-        role: "assistant",
-        content: responseText,
-        code: generation.code,
-        jobStatus: "succeeded",
-        jobResultPreview: JSON.stringify(outcome.result, null, 2)
-      });
-      await writeJson(
-        path.join(turnDir, `iteration-${iteration + 1}-result.json`),
-        {
-          responseText,
-          continuation,
-          actionSummary: latestCheckpoint.latestActionSummary,
-          result: outcome.result
-        }
+      throw new Error(
+        `Turn exceeded iteration budget (${maxIterations}) for ${conversation.label}`
       );
-      iterationLog.responseText = responseText;
-      iterationLog.terminalKind = getCurrentClosureId(settledLiveDoc) ? "closure" : "reply";
-      iterationLog.actionSummary = latestCheckpoint.latestActionSummary || [];
-      iterationLog.promptInteractions = [];
-      iterationLog.continuation = continuation;
-      iterationLog.result = outcome.result;
-      if (!continuation.shouldContinue) {
-        const completed = {
-          conversation,
-          request: input.request,
-          turnDir,
-          responseText,
-          terminalKind: getCurrentClosureId(settledLiveDoc) ? "closure" : "reply",
-          finalCode: generation.code,
-          actionSummary: latestCheckpoint.latestActionSummary || [],
-          promptInteractions: [],
-          verification: null,
-          result: outcome.result
-        };
-        if (input.verification) {
-          completed.verification = await runInspection(
-            conversation,
-            input.verification,
-            completed,
-            turnDir
-          );
-        }
-        turnLog.completed = {
-          responseText,
-          terminalKind: completed.terminalKind,
-          actionSummary: completed.actionSummary,
-          promptInteractions: [],
-          result: outcome.result
-        };
-        await writeJson(path.join(turnDir, "result.json"), completed);
-        await emitProgress(onProgress, {
-          phase: "step",
-          status: "passed",
-          scenarioId: conversation.label,
-          stepId: turnId,
-          iteration: iteration + 1,
-          jobId: job.id,
-          title: "Step completed",
-          message: responseText,
-          data: completed
-        });
-        return completed;
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      const latestIteration = latestIterationLog(turnLog);
+      if (latestIteration) {
+        latestIteration.error = message;
       }
-      iteration += 1;
+      turnLog.error = message;
+      await writeTurnReport({ type: "failed", error: message });
+      throw error;
     }
-    throw new Error(
-      `Turn exceeded iteration budget (${maxIterations}) for ${conversation.label}`
-    );
   }
   return {
     artifactDir,
@@ -21075,6 +21733,7 @@ function createAgentTester(options) {
   const harness = createAgentEvalHarness({
     granular,
     environmentId: resolvedEnvironmentId || void 0,
+    local: options.local,
     openEnvironment: async ({ clientId }) => {
       if (resolvedEnvironmentId) {
         return granular.createSession({