openhorse 0.2.13 → 0.2.17

package/dist/runtime/agent-status.js

@@ -2,12 +2,38 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.agentStepStatus = agentStepStatus;
 exports.runningToolsStatus = runningToolsStatus;
+exports.verifyingStatus = verifyingStatus;
+exports.verificationGateStatus = verificationGateStatus;
+exports.batchingSuggestion = batchingSuggestion;
+exports.compactStatus = compactStatus;
+exports.permissionPendingStatus = permissionPendingStatus;
 exports.isLegacyTurnStatus = isLegacyTurnStatus;
 function agentStepStatus(turn) {
-    return turn <= 1 ? 'Thinking...' : 'Reading tool results...';
+    // request_start on turn 1 is fresh reasoning; later turns continue from
+    // tool results, so label them "reading tool results" to distinguish the phase.
+    // Tool execution, verification, compact, and permission states are emitted separately.
+    return turn <= 1 ? 'Working: thinking' : 'Working: reading tool results';
 }
 function runningToolsStatus(count) {
-    return count === 1 ? 'Running tool...' : `Running ${count} tools...`;
+    return count === 1 ? 'Working: running tool' : `Working: running ${count} tools`;
+}
+function verifyingStatus(profile) {
+    return `Verifying: running ${profile} checks...`;
+}
+function verificationGateStatus(reason) {
+    return `Verification required: ${reason}`;
+}
+function batchingSuggestion(readOnlyCount) {
+    if (readOnlyCount >= 3) {
+        return `${readOnlyCount} independent read-only tool calls detected. Use the batch_read tool to group related reads into a single turn and reduce model-tool roundtrips.`;
+    }
+    return '';
+}
+function compactStatus() {
+    return 'Compacting: summarizing conversation history...';
+}
+function permissionPendingStatus(toolName) {
+    return `Waiting: permission required for ${toolName}`;
 }
 function isLegacyTurnStatus(message) {
     return /^Turn\s+\d+\.\.\.$/.test(message.trim());

package/dist/runtime/agent-status.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-status.js","sourceRoot":"","sources":["../../src/runtime/agent-status.ts"],"names":[],"mappings":";;AAAA,0CAEC;AAED,gDAEC;AAED,gDAEC;AAVD,SAAgB,eAAe,CAAC,IAAY;IAC1C,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,yBAAyB,CAAC;AAC/D,CAAC;AAED,SAAgB,kBAAkB,CAAC,KAAa;IAC9C,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,WAAW,KAAK,WAAW,CAAC;AACvE,CAAC;AAED,SAAgB,kBAAkB,CAAC,OAAe;IAChD,OAAO,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;AACnD,CAAC"}
+{"version":3,"file":"agent-status.js","sourceRoot":"","sources":["../../src/runtime/agent-status.ts"],"names":[],"mappings":";;AAAA,0CAKC;AAED,gDAEC;AAED,0CAEC;AAED,wDAEC;AAED,gDAKC;AAED,sCAEC;AAED,0DAEC;AAED,gDAEC;AApCD,SAAgB,eAAe,CAAC,IAAY;IAC1C,wEAAwE;IACxE,+EAA+E;IAC/E,uFAAuF;IACvF,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,+BAA+B,CAAC;AAC3E,CAAC;AAED,SAAgB,kBAAkB,CAAC,KAAa;IAC9C,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,oBAAoB,KAAK,QAAQ,CAAC;AACnF,CAAC;AAED,SAAgB,eAAe,CAAC,OAAe;IAC7C,OAAO,sBAAsB,OAAO,YAAY,CAAC;AACnD,CAAC;AAED,SAAgB,sBAAsB,CAAC,MAAc;IACnD,OAAO,0BAA0B,MAAM,EAAE,CAAC;AAC5C,CAAC;AAED,SAAgB,kBAAkB,CAAC,aAAqB;IACtD,IAAI,aAAa,IAAI,CAAC,EAAE,CAAC;QACvB,OAAO,GAAG,aAAa,iJAAiJ,CAAC;IAC3K,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAgB,aAAa;IAC3B,OAAO,iDAAiD,CAAC;AAC3D,CAAC;AAED,SAAgB,uBAAuB,CAAC,QAAgB;IACtD,OAAO,oCAAoC,QAAQ,EAAE,CAAC;AACxD,CAAC;AAED,SAAgB,kBAAkB,CAAC,OAAe;IAChD,OAAO,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;AACnD,CAAC"}

package/dist/runtime/chat-controller.d.ts

@@ -1,3 +1,4 @@
+import type { CommandUiRenderer } from '../commands/types';
 import { query, type QueryEvent } from '../framework';
 import type { OpenHorseUiRuntime, TranscriptEntry, UiEventSink, UiRendererCapabilities } from './ui-events';
 export declare function sessionMessagesToTranscriptEntries(sessionId: string): TranscriptEntry[];
@@ -18,6 +19,7 @@ type ToolResultEvent = Extract<QueryEvent, {
 export interface ToolEventPresenter {
     start(event: ToolCallEvent): void;
     finish(event: ToolResultEvent): void;
+    finalizePendingAsSkipped(reason?: string): void;
 }
 export declare function createToolEventPresenter(events: UiEventSink): ToolEventPresenter;
 export interface RunInputOptions {
@@ -27,6 +29,8 @@ export interface RunInputOptions {
 export interface AgentChatControllerOptions {
     confirmToolUse?: Parameters<typeof query>[0]['confirmToolUse'];
     uiCapabilities?: UiRendererCapabilities;
+    uiRenderer?: CommandUiRenderer;
+    onVerificationStateChange?: (state: 'pending' | 'running' | 'passed' | 'failed' | 'gated') => void;
 }
 /** @deprecated Use AgentChatControllerOptions. Chat execution is renderer-independent. */
 export type InkChatControllerOptions = AgentChatControllerOptions;

package/dist/runtime/chat-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chat-controller.d.ts","sourceRoot":"","sources":["../../src/runtime/chat-controller.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,KAAK,EAAqJ,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAqBzM,OAAO,KAAK,EACV,kBAAkB,EAElB,eAAe,EACf,WAAW,EACX,sBAAsB,EACvB,MAAM,aAAa,CAAC;AA8jBrB,wBAAgB,kCAAkC,CAAC,SAAS,EAAE,MAAM,GAAG,eAAe,EAAE,CAwDvF;AAED,MAAM,WAAW,wBAAwB;IACvC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,YAAY,IAAI,IAAI,CAAC;IACrB,cAAc,IAAI,IAAI,CAAC;IACvB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACvC;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,wBAAwB,CA+DvH;AAED,KAAK,aAAa,GAAG,OAAO,CAAC,UAAU,EAAE;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC,CAAC;AAChE,KAAK,eAAe,GAAG,OAAO,CAAC,UAAU,EAAE;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,CAAC,CAAC;AAoFpE,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IAClC,MAAM,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CAAC;CACtC;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,WAAW,GAAG,kBAAkB,CAmDhF;AAwBD,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,0BAA0B;IACzC,cAAc,CAAC,EAAE,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;IAC/D,cAAc,CAAC,EAAE,sBAAsB,CAAC;CACzC;AAED,0FAA0F;AAC1F,MAAM,MAAM,wBAAwB,GAAG,0BAA0B,CAAC;AAElE,qBAAa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAFjB,OAAO,EAAE,kBAAkB,EAC3B,MAAM,EAAE,WAAW,EACnB,iBAAiB,GAAE,0BAA+B;IAGrE,OAAO,CAAC,YAAY;IAKd,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,eAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;YAsF7D,gBAAgB;IAwL9B,OAAO,CAAC,oBAAoB;YAiCd,OAAO;CA4jBtB;AAED,mFAAmF;AACnF,OAAO,EAAE,mBAAmB,IAAI,iBAAiB,EAAE,CAAC;AAEpD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAK7F;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAQ9D"}
+{"version":3,"file":"chat-controller.d.ts","sourceRoot":"","sources":["../../src/runtime/chat-controller.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAiC,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAmB1F,OAAO,EAAE,KAAK,EAAqJ,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAuBzM,OAAO,KAAK,EACV,kBAAkB,EAElB,eAAe,EACf,WAAW,EACX,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAgkBrB,wBAAgB,kCAAkC,CAAC,SAAS,EAAE,MAAM,GAAG,eAAe,EAAE,CAwDvF;AAED,MAAM,WAAW,wBAAwB;IACvC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,YAAY,IAAI,IAAI,CAAC;IACrB,cAAc,IAAI,IAAI,CAAC;IACvB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACvC;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,wBAAwB,CA+DvH;AAED,KAAK,aAAa,GAAG,OAAO,CAAC,UAAU,EAAE;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC,CAAC;AAChE,KAAK,eAAe,GAAG,OAAO,CAAC,UAAU,EAAE;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,CAAC,CAAC;AAqFpE,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IAClC,MAAM,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CAAC;IACrC,wBAAwB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjD;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,WAAW,GAAG,kBAAkB,CAmFhF;AAwBD,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,0BAA0B;IACzC,cAAc,CAAC,EAAE,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;IAC/D,cAAc,CAAC,EAAE,sBAAsB,CAAC;IACxC,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,yBAAyB,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,GAAG,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,KAAK,IAAI,CAAC;CACpG;AAED,0FAA0F;AAC1F,MAAM,MAAM,wBAAwB,GAAG,0BAA0B,CAAC;AAElE,qBAAa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAFjB,OAAO,EAAE,kBAAkB,EAC3B,MAAM,EAAE,WAAW,EACnB,iBAAiB,GAAE,0BAA+B;IAGrE,OAAO,CAAC,YAAY;IAKd,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,eAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;YAwF7D,gBAAgB;IA2L9B,OAAO,CAAC,oBAAoB;YAqCd,OAAO;CAqpBtB;AAED,mFAAmF;AACnF,OAAO,EAAE,mBAAmB,IAAI,iBAAiB,EAAE,CAAC;AAEpD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAK7F;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAQ9D"}

package/dist/runtime/chat-controller.js

@@ -53,14 +53,17 @@ const checkpoint_1 = require("../core/checkpoint");
 const skills_1 = require("../skills");
 const file_context_1 = require("../services/file-context");
 const prompt_context_1 = require("../services/prompt-context");
+const format_1 = require("../services/format");
 const workspace_state_1 = require("../services/workspace-state");
 const verification_profile_1 = require("../services/verification-profile");
 const ui_events_1 = require("./ui-events");
+const ui_view_model_1 = require("./ui-view-model");
 const agent_status_1 = require("./agent-status");
 const loop_budget_1 = require("./loop-budget");
 const ANSI_PATTERN = /\x1b\[[0-9;?]*[A-Za-z]/g;
 const LOCAL_FAST_PATH_INLINE_OUTPUT_BYTES = 2048;
 const TRACE_ARGS_ARTIFACT_THRESHOLD_BYTES = 160;
+const TOOL_TRANSCRIPT_ARG_BUDGET = 512;
 function stripAnsi(text) {
     return text.replace(ANSI_PATTERN, '');
 }
@@ -72,6 +75,29 @@ function isAbortError(error, abortSignal) {
     }
     return false;
 }
+function errorLayerForChatError(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    const lower = message.toLowerCase();
+    if (/NotEnoughCvError|code:\s*11210|provider|quota|rate.?limit|timeout|connection/i.test(message)) {
+        return 'provider';
+    }
+    if (/tool|command|exec_command|write_file|edit_file/i.test(message)) {
+        return 'tool';
+    }
+    if (/\bmcp\b/i.test(message))
+        return 'mcp';
+    if (/\b(session|resume|compact|harness)\b/i.test(message))
+        return 'session';
+    if (/\b(skill|skills)\b/i.test(message))
+        return 'skills';
+    if (/\b(memory|vector store|recall|forget)\b/i.test(message))
+        return 'memory';
+    if (/\b(renderer|terminal|tty|prompt|resize|scrollback)\b/i.test(message))
+        return 'renderer';
+    if (lower.includes('abort') || lower.includes('interrupted'))
+        return 'runtime';
+    return 'unknown';
+}
 function formatChatError(error) {
     const message = error instanceof Error ? error.message : String(error);
     if (/NotEnoughCvError|code:\s*11210/i.test(message)) {
@@ -170,10 +196,11 @@ function checkpointTargetsFromToolCalls(cwd, toolCalls) {
 function createPreToolCheckpoint(events, sessionId, turnId, checkpointId, cwd, toolCalls) {
     const targets = checkpointTargetsFromToolCalls(cwd, toolCalls);
     if (targets.length === 0)
-        return false;
+        return { created: false, targetCount: 0, risky: false };
+    const risky = (0, checkpoint_1.shouldCreateMultiFileCheckpoint)(targets.length);
     const checkpoint = (0, checkpoint_1.createCheckpoint)(cwd, checkpointId, targets);
     if (!sessionId)
-        return true;
+        return { created: true, targetCount: targets.length, risky };
     const relativeTargets = targets.map(target => path.relative(cwd, target));
     recordTraceEvent(events, sessionId, {
         turnId,
@@ -183,10 +210,10 @@ function createPreToolCheckpoint(events, sessionId, turnId, checkpointId, cwd, t
         checkpointFiles: checkpoint?.files.map(file => file.path) ?? [],
         workspaceFiles: relativeTargets,
         note: checkpoint
-            ? 'pre_edit_checkpoint'
+            ? (risky ? 'risky_multi_file_checkpoint' : 'pre_edit_checkpoint')
             : 'pre_edit_checkpoint_skipped',
     });
-    return true;
+    return { created: true, targetCount: targets.length, risky };
 }
 function byteLength(text) {
     return Buffer.byteLength(text, 'utf8');
@@ -273,6 +300,7 @@ function appendVerificationProfileTrace(events, sessionId, turnId, profile) {
         type: 'verification_profile',
         verificationProfile: profile.profile,
         verificationRequired: profile.required,
+        verificationRisky: (0, verification_profile_1.isRiskyEdit)(profile.changedFiles),
         verificationCommands: compactPathList(profile.commands, 8),
         verificationChangedFiles: compactPathList(profile.changedFiles),
         note: profile.reason,
@@ -416,34 +444,11 @@ function toHarnessDiagnostics(state) {
 function emitHarnessDiagnostics(events, state) {
     events.harnessDiagnosticsUpdated?.(toHarnessDiagnostics(state));
 }
-function toolStartContent(name, args) {
-    if (name === 'exec_command' && typeof args.command === 'string') {
-        return `Running ${name}\n  $ ${args.command}`;
-    }
-    const detail = compactToolArgs(args);
-    return `Running ${name}${detail ? ` ${detail}` : ''}`;
-}
-function toolSummary(name, args, success, duration) {
-    const details = compactToolArgs(args);
-    const suffix = details ? ` ${details}` : '';
-    return `${success ? '✓' : '✗'} ${name}${suffix} (${duration}ms)`;
+function toolStartContent(event) {
+    return (0, ui_view_model_1.formatToolActivityTranscript)((0, ui_view_model_1.toolActivityFromStarted)(event, compactToolArgs(event.args, TOOL_TRANSCRIPT_ARG_BUDGET)));
 }
 function toolFinishContent(event) {
-    const summary = event.summary || toolSummary(event.name, event.args, event.success, event.duration);
-    const lines = [summary];
-    if (event.name === 'exec_command' && typeof event.args.command === 'string') {
-        lines.push(`  $ ${event.args.command}`);
-    }
-    if (event.artifactRef) {
-        lines.push(`  artifact ${event.artifactRef.id} (${event.artifactRef.outputBytes}B full output)`);
-    }
-    else if (typeof event.outputBytes === 'number') {
-        lines.push(`  output ${event.outputBytes}B`);
-    }
-    if (event.error) {
-        lines.push(`Error: ${event.error}`);
-    }
-    return lines.filter(Boolean).join('\n');
+    return (0, ui_view_model_1.formatToolActivityTranscript)((0, ui_view_model_1.toolActivityFromFinished)(event, compactToolArgs(event.args, TOOL_TRANSCRIPT_ARG_BUDGET)));
 }
 function isSyntheticCompactContext(content) {
     return content.startsWith('[OpenHorse Context State v2]')
@@ -645,7 +650,8 @@ function parseLocalFastPath(input) {
 }
 function formatLocalFastPathAssistantContent(action, rawResult, projectPath) {
     const envelope = (0, tool_serializer_1.parseToolResultEnvelope)(rawResult);
-    const output = typeof envelope.output === 'string' ? envelope.output.trim() : '';
+    const rawOutput = typeof envelope.output === 'string' ? envelope.output : '';
+    const output = rawOutput.trim();
     const summary = envelope.summary || `${action.tool} ${envelope.success ? 'completed' : 'failed'}`;
     const lines = [
         envelope.success
@@ -658,41 +664,67 @@ function formatLocalFastPathAssistantContent(action, rawResult, projectPath) {
         lines.push(`Error: ${envelope.error}`);
     }
     if (!output) {
-        return lines.join('\n');
+        return { content: lines.join('\n'), artifactRef: envelope.artifactRef };
     }
     let artifactRef = envelope.artifactRef;
     let preview = output;
-    const outputBytes = envelope.outputBytes ?? byteLength(output);
-    if (byteLength(output) > LOCAL_FAST_PATH_INLINE_OUTPUT_BYTES) {
+    const outputBytes = envelope.outputBytes ?? byteLength(rawOutput);
+    if (byteLength(rawOutput) > LOCAL_FAST_PATH_INLINE_OUTPUT_BYTES) {
         if (!artifactRef) {
-            const artifact = (0, tool_artifacts_1.storeArtifact)(projectPath, action.tool, output, outputBytes);
+            const artifact = (0, tool_artifacts_1.storeArtifact)(projectPath, action.tool, rawOutput, outputBytes);
             artifactRef = artifact ? { id: artifact.id, outputBytes: artifact.outputBytes } : undefined;
         }
         preview = (0, tool_artifacts_1.truncateForContext)(output, LOCAL_FAST_PATH_INLINE_OUTPUT_BYTES);
     }
     if (artifactRef) {
-        lines.push('', `Full output: /artifacts show ${artifactRef.id} --full (${artifactRef.outputBytes}B)`);
+        lines.push('', `Full output: /artifacts show ${artifactRef.id} --full (${(0, format_1.formatBytes)(artifactRef.outputBytes)})`);
     }
     lines.push('', 'Preview:', preview);
-    return lines.join('\n');
+    return { content: lines.join('\n'), artifactRef };
 }
 function createToolEventPresenter(events) {
     const runningToolEntries = new Map();
     return {
         start(event) {
+            const entryId = events.append({
+                role: 'tool',
+                title: 'tool',
+                content: toolStartContent(event),
+            });
+            runningToolEntries.set(event.callId, {
+                entryId,
+                name: event.name,
+                args: event.args,
+                batchCount: event.batchCount,
+                batchIndex: event.batchIndex,
+            });
             events.toolStarted?.({
                 callId: event.callId,
                 name: event.name,
                 args: event.args,
+                batchCount: event.batchCount,
+                batchIndex: event.batchIndex,
             });
-            const entryId = events.append({
-                role: 'tool',
-                title: 'tool',
-                content: toolStartContent(event.name, event.args),
-            });
-            runningToolEntries.set(event.callId, entryId);
         },
         finish(event) {
+            const content = toolFinishContent(event);
+            const stored = runningToolEntries.get(event.callId);
+            if (stored) {
+                events.finalize(stored.entryId, {
+                    role: event.success ? 'tool' : 'error',
+                    title: 'tool',
+                    content,
+                });
+                runningToolEntries.delete(event.callId);
+            }
+            else {
+                const entryId = events.append({
+                    role: event.success ? 'tool' : 'error',
+                    title: 'tool',
+                    content,
+                });
+                events.finalize(entryId);
+            }
             events.toolFinished?.({
                 callId: event.callId,
                 name: event.name,
@@ -703,24 +735,30 @@ function createToolEventPresenter(events) {
                 error: event.error,
                 outputBytes: event.outputBytes,
                 artifactRef: event.artifactRef,
+                batchCount: event.batchCount,
+                batchIndex: event.batchIndex,
             });
-            const content = toolFinishContent(event);
-            const existingEntryId = runningToolEntries.get(event.callId);
-            if (existingEntryId) {
-                events.finalize(existingEntryId, {
-                    role: event.success ? 'tool' : 'error',
+        },
+        finalizePendingAsSkipped(reason = 'permission denied') {
+            for (const [callId, entry] of runningToolEntries) {
+                events.finalize(entry.entryId, {
+                    role: 'tool',
                     title: 'tool',
-                    content,
+                    content: `Skipped · ${reason}`,
+                });
+                events.toolFinished?.({
+                    callId,
+                    name: entry.name,
+                    args: entry.args,
+                    success: false,
+                    skipped: true,
+                    duration: 0,
+                    error: reason,
+                    batchCount: entry.batchCount,
+                    batchIndex: entry.batchIndex,
                 });
-                runningToolEntries.delete(event.callId);
-                return;
             }
-            const entryId = events.append({
-                role: event.success ? 'tool' : 'error',
-                title: 'tool',
-                content,
-            });
-            events.finalize(entryId);
+            runningToolEntries.clear();
         },
     };
 }
@@ -791,6 +829,7 @@ class AgentChatController {
                 content: suggestions.length > 0
                     ? `Unknown command: /${parsed.name}\nDid you mean: ${suggestions.map(item => `/${item}`).join(', ')}?`
                     : `Unknown command: /${parsed.name}`,
+                errorLayer: 'runtime',
             });
             return;
         }
@@ -815,6 +854,7 @@ class AgentChatController {
                 role: 'error',
                 title: `/${command.name}`,
                 content: result.error,
+                errorLayer: 'runtime',
             });
         }
         if (result.sessionPicker) {
@@ -898,7 +938,8 @@ class AgentChatController {
             const outputBytes = typeof envelope.outputBytes === 'number'
                 ? envelope.outputBytes
                 : Buffer.byteLength(result, 'utf8');
-            const assistantContent = formatLocalFastPathAssistantContent(action, result, this.runtime.cwd);
+            const formattedLocalResult = formatLocalFastPathAssistantContent(action, result, this.runtime.cwd);
+            const assistantContent = formattedLocalResult.content;
             const stats = (0, framework_1.createLocalFastPathLoopStats)({
                 finishReason: envelope.success ? 'completed' : 'failed',
                 toolCalls: 1,
@@ -923,6 +964,7 @@ class AgentChatController {
                     error: envelope.error,
                     summary: envelope.summary,
                     outputBytes,
+                    artifactRef: formattedLocalResult.artifactRef,
                 }),
             });
             this.runtime.store.addMessage({ role: 'assistant', content: assistantContent });
@@ -940,6 +982,7 @@ class AgentChatController {
                     duration,
                     outputBytes,
                     modelVisibleBytes: 0,
+                    artifactId: formattedLocalResult.artifactRef?.id,
                     error: envelope.error ? compactMiddle(envelope.error, 240) : undefined,
                 });
                 appendPostWorkspaceTrace(this.events, sessionId, turnId, this.runtime.cwd, preWorkspace);
@@ -967,7 +1010,7 @@ class AgentChatController {
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            this.events.append({ role: 'error', title: 'local', content: message });
+            this.events.append({ role: 'error', title: 'local', content: message, errorLayer: 'tool' });
             this.events.setStatus('Local command failed. Ready for the next input.');
             const assistantContent = `Local fast path failed for ${action.label}.\n\n${message}`;
             this.runtime.store.addMessage({ role: 'assistant', content: assistantContent });
@@ -1031,18 +1074,20 @@ class AgentChatController {
                     this.events.append({ role: 'system', content: text });
                 }
             },
-            uiCapabilities: (0, ui_events_1.resolveUiRendererCapabilities)(this.controllerOptions.uiCapabilities),
+            uiRenderer: this.controllerOptions.uiRenderer ?? this.runtime.config.ui?.renderer ?? 'terminal',
+            uiCapabilities: (0, ui_events_1.resolveUiRendererCapabilities)(this.controllerOptions.uiCapabilities, this.controllerOptions.uiRenderer ?? this.runtime.config.ui?.renderer),
         };
     }
     async runChat(input, options = {}) {
         if (!input) {
-            this.events.append({ role: 'error', content: 'Usage: /chat <message>' });
+            this.events.append({ role: 'error', content: 'Usage: /chat <message>', errorLayer: 'runtime' });
             return;
         }
         if (!this.runtime.llm || !(0, config_1.isConfigured)(this.runtime.config)) {
             this.events.append({
                 role: 'error',
                 content: 'LLM is not configured. Set OPENHORSE_API_KEY in ~/.openhorse/openhorse.json or environment.',
+                errorLayer: 'provider',
             });
             return;
         }
@@ -1090,6 +1135,10 @@ class AgentChatController {
         });
         const intent = harness.updateContractFromUserInput(input);
         harness.recordAppliedSkills(skillResolution.skills);
+        // Reconcile diagnostic: when harness state is present but objective may be incomplete
+        if (snapshot.harnessState && !snapshot.harnessState.rootObjective && !snapshot.harnessState.contract?.objective) {
+            this.events.setStatus('Resume diagnostic: harness state restored but objective may be incomplete. Run /harness explain to review.');
+        }
         const promptCtx = {
             cwd: this.runtime.cwd,
             platform: process.platform,
@@ -1212,16 +1261,40 @@ class AgentChatController {
                     case 'assistant_tool_calls':
                         assistantStream.ensureMessage(event.content || '');
                         assistantStream.closeSegment();
-                        if (event.toolCalls.length > 1) {
-                            this.events.setStatus((0, agent_status_1.runningToolsStatus)(event.toolCalls.length));
+                        this.events.setStatus((0, agent_status_1.runningToolsStatus)(event.toolCalls.length));
+                        {
+                            const batchReadOnlyCount = event.toolCalls.filter(tc => {
+                                const def = skillResolution.tools.find(t => t.name === tc.function.name);
+                                const args = parseToolCallArgsForRuntime(tc);
+                                return args && def?.isReadOnly?.(args) === true;
+                            }).length;
+                            const suggestion = (0, agent_status_1.batchingSuggestion)(batchReadOnlyCount);
+                            if (suggestion) {
+                                this.events.append({ role: 'status', content: suggestion });
+                            }
                         }
                         const checkpointId = checkpointSequence === 0
                             ? turnId
                             : `${turnId}-checkpoint-${checkpointSequence + 1}`;
-                        if (createPreToolCheckpoint(this.events, sessionId, turnId, checkpointId, this.runtime.cwd, event.toolCalls)) {
+                        const checkpointResult = createPreToolCheckpoint(this.events, sessionId, turnId, checkpointId, this.runtime.cwd, event.toolCalls);
+                        if (checkpointResult.created) {
                             checkpointIds.push(checkpointId);
                             checkpointSequence++;
                         }
+                        if (checkpointResult.created && checkpointResult.risky) {
+                            this.events.append({
+                                role: 'status',
+                                title: 'checkpoint',
+                                content: `Risky edit: ${checkpointResult.targetCount} files in one turn. Checkpoint ${checkpointId} created for rollback (/checkpoints restore ${checkpointId}).`,
+                            });
+                        }
+                        else if (checkpointResult.risky) {
+                            this.events.append({
+                                role: 'status',
+                                title: 'checkpoint',
+                                content: `Risky edit: ${checkpointResult.targetCount} files in one turn, but checkpoint creation failed. Restore any pre-existing checkpoint manually or revert via git.`,
+                            });
+                        }
                         if (sessionId) {
                             recordTraceEvent(this.events, sessionId, {
                                 turnId,
@@ -1353,6 +1426,9 @@ class AgentChatController {
                         }
                         break;
                     case 'complete':
+                        if (event.stats?.finishReason === 'blocked') {
+                            toolEvents.finalizePendingAsSkipped('permission denied');
+                        }
                         if (event.content && !finalContent) {
                             if (event.stats?.finishReason === 'budget_exceeded') {
                                 assistantStream.replaceMessage(event.content);
@@ -1412,12 +1488,22 @@ class AgentChatController {
                 this.events.setStatus('Interrupted.');
                 removeTrailingUserMessage(this.runtime);
                 if (sessionId) {
-                    appendPostWorkspaceTrace(this.events, sessionId, turnId, this.runtime.cwd, preWorkspace, verificationResults);
+                    const { delta } = appendPostWorkspaceTrace(this.events, sessionId, turnId, this.runtime.cwd, preWorkspace, verificationResults);
                     recordTraceEvent(this.events, sessionId, {
                         turnId,
                         type: 'aborted',
                         note: 'aborted_after_query',
                     });
+                    const recoveryNotice = workspaceDeltaHasTurnChanges(delta)
+                        ? formatFailureRecoveryNotice(turnId, delta, checkpointIds)
+                        : undefined;
+                    if (recoveryNotice) {
+                        this.events.append({
+                            role: 'status',
+                            title: 'recovery',
+                            content: recoveryNotice,
+                        });
+                    }
                     (0, session_storage_1.removeLastIncompleteAssistantMessage)(sessionId);
                 }
                 return;
@@ -1425,6 +1511,10 @@ class AgentChatController {
             assistantStream.closeSegment();
             if (sessionId) {
                 const { profile, summary } = appendPostWorkspaceTrace(this.events, sessionId, turnId, this.runtime.cwd, preWorkspace, verificationResults);
+                if (profile.changedFiles.length > 0 && profile.required) {
+                    this.events.setStatus((0, agent_status_1.verifyingStatus)(profile.profile));
+                    this.controllerOptions.onVerificationStateChange?.('running');
+                }
                 if (shouldRecordVerificationLoopStats(profile, summary)) {
                     const stats = pendingCompleteStats ?? this.runtime.store.getSnapshot().lastLoopStats;
                     if (stats) {
@@ -1432,6 +1522,8 @@ class AgentChatController {
                     }
                 }
                 if ((0, verification_profile_1.shouldGateCompletion)(summary)) {
+                    this.events.setStatus((0, agent_status_1.verificationGateStatus)(summary.skippedReason ?? 'verification checks not run'));
+                    this.controllerOptions.onVerificationStateChange?.('gated');
                     const notice = (0, verification_profile_1.formatVerificationGateNotice)(summary);
                     this.events.append({
                         role: 'status',
@@ -1453,6 +1545,36 @@ class AgentChatController {
                         };
                     }
                 }
+                else if (profile.changedFiles.length > 0 && profile.required) {
+                    this.controllerOptions.onVerificationStateChange?.('passed');
+                }
+            }
+            if (pendingCompleteStats?.finishReason === 'budget_exceeded') {
+                const stats = pendingCompleteStats;
+                const lines = ['Loop budget reached — stopping this turn.'];
+                if (stats.budgetExceededReason) {
+                    lines.push(`Reason: ${stats.budgetExceededReason}`);
+                }
+                const progressParts = [];
+                if (typeof stats.loopBudgetMaxLlmRequests === 'number') {
+                    progressParts.push(`${stats.llmRequests ?? 0}/${stats.loopBudgetMaxLlmRequests} LLM requests`);
+                }
+                if (typeof stats.loopBudgetMaxToolCalls === 'number') {
+                    progressParts.push(`${stats.toolCalls ?? 0}/${stats.loopBudgetMaxToolCalls} tool calls`);
+                }
+                if (progressParts.length) {
+                    lines.push(`Progress: ${progressParts.join(', ')}`);
+                }
+                if (stats.continuationActions?.length) {
+                    lines.push(`Next: ${stats.continuationActions.join('; ')}`);
+                }
+                else if (stats.continuationHint) {
+                    lines.push(`Next: ${stats.continuationHint}`);
+                }
+                const notice = lines.join('\n');
+                this.events.append({ role: 'status', title: 'budget', content: notice });
+                finalContent = finalContent ? `${finalContent}\n\n${notice}` : notice;
+                appendAssistantNotice(sessionMessagesToRecord, notice);
             }
             if (pendingCompleteStats) {
                 this.setLoopStats(pendingCompleteStats);
@@ -1494,18 +1616,28 @@ class AgentChatController {
                 this.events.setStatus('Interrupted.');
                 removeTrailingUserMessage(this.runtime);
                 if (sessionId) {
-                    appendPostWorkspaceTrace(this.events, sessionId, turnId, this.runtime.cwd, preWorkspace, verificationResults);
+                    const { delta } = appendPostWorkspaceTrace(this.events, sessionId, turnId, this.runtime.cwd, preWorkspace, verificationResults);
                     recordTraceEvent(this.events, sessionId, {
                         turnId,
                         type: 'aborted',
                         note: 'abort_error',
                     });
+                    const recoveryNotice = workspaceDeltaHasTurnChanges(delta)
+                        ? formatFailureRecoveryNotice(turnId, delta, checkpointIds)
+                        : undefined;
+                    if (recoveryNotice) {
+                        this.events.append({
+                            role: 'status',
+                            title: 'recovery',
+                            content: recoveryNotice,
+                        });
+                    }
                     (0, session_storage_1.removeLastIncompleteAssistantMessage)(sessionId);
                 }
                 return;
             }
             assistantStream.discardSegment();
-            this.events.append({ role: 'error', content: formatChatError(error) });
+            this.events.append({ role: 'error', content: formatChatError(error), errorLayer: errorLayerForChatError(error) });
             this.events.setStatus('Turn failed. Ready for the next input.');
             const failedStats = error instanceof framework_1.QueryLoopError
                 ? error.stats