@orion-agents/orion-code 0.1.4 → 0.1.6

package/dist/runtime/chat-controller.js

@@ -1,989 +1,49 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InkChatController = exports.AgentChatController = void 0;
-exports.sessionMessagesToTranscriptEntries = sessionMessagesToTranscriptEntries;
-exports.createAssistantStreamPresenter = createAssistantStreamPresenter;
-exports.createToolEventPresenter = createToolEventPresenter;
+exports.InkChatController = exports.AgentChatController = exports.sessionMessagesToTranscriptEntries = exports.createToolEventPresenter = exports.createAssistantStreamPresenter = void 0;
 exports.loadSessionIntoRuntime = loadSessionIntoRuntime;
 exports.closeSession = closeSession;
 const commands_1 = require("../commands");
-const async_hooks_1 = require("async_hooks");
+const crypto_1 = require("crypto");
 const parser_1 = require("../commands/parser");
-const path = __importStar(require("path"));
 const session_storage_1 = require("../services/session-storage");
 const config_1 = require("../services/config");
+const provider_resilience_1 = require("../services/provider-resilience");
 const tool_allowlist_1 = require("../services/tool-allowlist");
 const framework_1 = require("../framework");
 const prompt_1 = require("./goals/prompt");
 const harness_1 = require("../harness");
 const tools_1 = require("../tools");
+const tool_scheduler_1 = require("../framework/tool-scheduler");
 const tool_serializer_1 = require("../framework/tool-serializer");
 const tool_artifacts_1 = require("../core/tool-artifacts");
-const checkpoint_1 = require("../core/checkpoint");
 const skills_1 = require("../skills");
 const subagents_1 = require("./subagents");
 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 tool_output_presentation_1 = require("./tool-output-presentation");
-const aggregate_tool_presenter_1 = require("./aggregate-tool-presenter");
-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, '');
-}
-function isAbortError(error, abortSignal) {
-    if (abortSignal?.aborted)
-        return true;
-    if (error instanceof Error) {
-        return error.name === 'AbortError' || error.message.toLowerCase().includes('aborted');
-    }
-    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)) {
-        return [
-            message,
-            '',
-            'Provider quota or credit appears insufficient. The Orion Code session is still active; switch model/provider or recharge the provider account, then continue.',
-        ].join('\n');
-    }
-    return message;
-}
-function compactMiddle(text, maxLength) {
-    const compact = text.replace(/\s+/g, ' ').trim();
-    if (compact.length <= maxLength)
-        return compact;
-    if (maxLength <= 3)
-        return compact.slice(0, maxLength);
-    const headLength = Math.ceil((maxLength - 3) * 0.55);
-    const tailLength = Math.floor((maxLength - 3) * 0.45);
-    return `${compact.slice(0, headLength)}...${compact.slice(-tailLength)}`;
-}
-function compactToolArgs(args, maxLength = 160) {
-    for (const key of [
-        'path',
-        'file_path',
-        'file',
-        'cwd',
-        'command',
-        'pattern',
-        'query',
-        'url',
-        'target',
-        'sessionId',
-    ]) {
-        const value = args[key];
-        if (typeof value === 'string') {
-            return compactMiddle(value, maxLength);
-        }
-    }
-    const firstString = Object.values(args).find(value => typeof value === 'string');
-    if (typeof firstString === 'string') {
-        return compactMiddle(firstString, maxLength);
-    }
-    return '';
-}
-function fullToolArgsForTrace(name, args) {
-    if (name === 'exec_command' && typeof args.command === 'string') {
-        return `$ ${args.command}`;
-    }
-    try {
-        return JSON.stringify(args, null, 2);
-    }
-    catch {
-        return compactToolArgs(args, 2048);
-    }
-}
-function buildTraceArgsDetails(projectPath, name, args) {
-    const argsSummary = compactToolArgs(args);
-    const fullArgs = (0, session_storage_1.redactTraceText)(fullToolArgsForTrace(name, args)).trim();
-    const argsBytes = byteLength(fullArgs);
-    if (!projectPath ||
-        !fullArgs ||
-        fullArgs === (0, session_storage_1.redactTraceText)(argsSummary) ||
-        argsBytes <= TRACE_ARGS_ARTIFACT_THRESHOLD_BYTES) {
-        return { argsSummary };
-    }
-    const artifact = (0, tool_artifacts_1.storeArtifact)(projectPath, `${name}-args`, fullArgs, argsBytes);
-    return artifact ? { argsSummary, argsArtifactId: artifact.id, argsBytes } : { argsSummary };
-}
-function parseToolCallArgsForRuntime(toolCall) {
-    try {
-        const parsed = JSON.parse(toolCall.function.arguments || '{}');
-        return typeof parsed === 'object' && parsed !== null && !Array.isArray(parsed)
-            ? parsed
-            : null;
-    }
-    catch {
-        return null;
-    }
-}
-function resolveProjectScopedPath(cwd, filePath) {
-    const absolute = path.resolve(cwd, filePath);
-    const relative = path.relative(cwd, absolute);
-    if (relative.startsWith('..') || path.isAbsolute(relative))
-        return null;
-    return absolute;
-}
-function checkpointTargetsFromToolCalls(cwd, toolCalls) {
-    const targets = new Set();
-    for (const toolCall of toolCalls) {
-        const name = toolCall.function.name;
-        if (name !== 'write_file' && name !== 'edit_file')
-            continue;
-        const args = parseToolCallArgsForRuntime(toolCall);
-        if (!args || typeof args.path !== 'string')
-            continue;
-        if (name === 'edit_file' && args.preview === true)
-            continue;
-        const target = resolveProjectScopedPath(cwd, args.path);
-        if (target)
-            targets.add(target);
-    }
-    return Array.from(targets);
-}
-function createPreToolCheckpoint(events, sessionId, turnId, checkpointId, cwd, toolCalls) {
-    const targets = checkpointTargetsFromToolCalls(cwd, toolCalls);
-    if (targets.length === 0)
-        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 { created: true, targetCount: targets.length, risky };
-    const relativeTargets = targets.map(target => path.relative(cwd, target));
-    recordTraceEvent(events, sessionId, {
-        turnId,
-        type: 'checkpoint',
-        checkpointId,
-        checkpointFileCount: checkpoint?.files.length ?? 0,
-        checkpointFiles: checkpoint?.files.map(file => file.path) ?? [],
-        workspaceFiles: relativeTargets,
-        note: checkpoint
-            ? risky
-                ? 'risky_multi_file_checkpoint'
-                : 'pre_edit_checkpoint'
-            : 'pre_edit_checkpoint_skipped',
-    });
-    return { created: true, targetCount: targets.length, risky };
-}
-function byteLength(text) {
-    return Buffer.byteLength(text, 'utf8');
-}
-function traceTurnId(turnId) {
-    return turnId == null ? `turn-${Date.now()}` : String(turnId);
-}
-function compactTraceError(error) {
-    const message = error instanceof Error ? error.message : String(error);
-    return compactMiddle(message, 240);
-}
-function getLastRequestDiagnostics(llm) {
-    if (!llm)
-        return undefined;
-    const reader = llm.getLastRequestDiagnostics;
-    return typeof reader === 'function' ? reader.call(llm) : undefined;
-}
-function compactPathList(paths, maxItems = 40) {
-    return paths.slice(0, maxItems);
-}
-function formatWorkspaceFileForTrace(file) {
-    const metadata = [
-        typeof file.sizeBytes === 'number' ? `${file.sizeBytes}B` : '',
-        typeof file.mtimeMs === 'number' ? `mtime=${file.mtimeMs}` : '',
-    ]
-        .filter(Boolean)
-        .join(' ');
-    return `${file.status} ${file.path}${metadata ? ` (${metadata})` : ''}`;
-}
-function appendWorkspaceSnapshotTrace(events, sessionId, turnId, phase, snapshot) {
-    if (!sessionId)
-        return;
-    recordTraceEvent(events, sessionId, {
-        turnId,
-        type: 'workspace_snapshot',
-        workspacePhase: phase,
-        workspaceGitAvailable: snapshot.gitAvailable,
-        workspaceDirty: snapshot.dirty,
-        workspaceBranch: snapshot.branch,
-        workspaceFileCount: snapshot.fileCount,
-        workspaceFiles: compactPathList(snapshot.files.map(formatWorkspaceFileForTrace)),
-        error: snapshot.error ? compactMiddle(snapshot.error, 240) : undefined,
-    });
-}
-function appendWorkspaceDeltaTrace(events, sessionId, turnId, before, after) {
-    const delta = (0, workspace_state_1.diffWorkspaceSnapshots)(before, after);
-    if (sessionId) {
-        recordTraceEvent(events, sessionId, {
-            turnId,
-            type: 'workspace_delta',
-            workspaceFileCount: delta.filesAfterTurn.length,
-            workspaceFiles: compactPathList(delta.filesAfterTurn),
-            workspaceNewByTurn: compactPathList(delta.newFilesByTurn),
-            workspaceChangedByTurn: compactPathList(delta.changedByTurn),
-            workspaceModifiedPreExistingByTurn: compactPathList(delta.modifiedPreExistingByTurn),
-            workspaceResolvedByTurn: compactPathList(delta.resolvedByTurn),
-            note: `pre_existing=${delta.preExistingFiles.length}`,
-        });
-    }
-    return delta;
-}
-function workspaceDeltaHasTurnChanges(delta) {
-    return (delta.newFilesByTurn.length > 0 ||
-        delta.changedByTurn.length > 0 ||
-        delta.resolvedByTurn.length > 0);
-}
-function formatFailureRecoveryNotice(turnId, delta, checkpointIds) {
-    const files = compactPathList([...delta.newFilesByTurn, ...delta.changedByTurn, ...delta.resolvedByTurn], 8);
-    const fileText = files.length > 0 ? files.join(', ') : 'workspace changes recorded';
-    const checkpointText = checkpointIds.length > 0
-        ? ` Checkpoints: ${checkpointIds.join(', ')}. Preview rollback with /checkpoint restore <id>; restore each listed checkpoint if multiple.`
-        : '';
-    return `Turn failed after modifying files: ${fileText}. Inspect /trace ${turnId}.${checkpointText}`;
-}
-function appendVerificationProfileTrace(events, sessionId, turnId, profile) {
-    if (!sessionId || profile.changedFiles.length === 0)
-        return;
-    recordTraceEvent(events, sessionId, {
-        turnId,
-        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,
-    });
-}
-function appendVerificationResultTrace(events, sessionId, turnId, result) {
-    if (!sessionId)
-        return;
-    recordTraceEvent(events, sessionId, {
-        turnId,
-        type: 'verification_result',
-        verificationCommand: result.command,
-        verificationPassed: result.success,
-        outputBytes: result.outputBytes,
-        error: result.error ? compactMiddle(result.error, 240) : undefined,
-    });
-}
-function appendVerificationSummaryTrace(events, sessionId, turnId, summary, changedFiles) {
-    if (!sessionId || changedFiles.length === 0)
-        return;
-    recordTraceEvent(events, sessionId, {
-        turnId,
-        type: 'verification_summary',
-        verificationProfile: summary.profile,
-        verificationRequired: summary.required,
-        verificationCommands: compactPathList(summary.commandsRun, 12),
-        verificationPassedCommands: compactPathList(summary.passedCommands, 12),
-        verificationFailedCommands: compactPathList(summary.failedCommands, 12),
-        verificationMissingCommands: compactPathList(summary.missingCommands, 12),
-        verificationChangedFiles: compactPathList(changedFiles),
-        verificationClaimAllowed: summary.claimAllowed,
-        note: summary.skippedReason,
-    });
-}
-function compactVerificationCommands(commands, maxItems = 12) {
-    return commands.slice(0, maxItems).map(session_storage_1.redactTraceText);
-}
-function withVerificationLoopStats(stats, summary) {
-    return {
-        ...stats,
-        verificationProfile: summary.profile,
-        verificationRequired: summary.required,
-        verificationClaimAllowed: summary.claimAllowed,
-        verificationPassedCommands: compactVerificationCommands(summary.passedCommands),
-        verificationFailedCommands: compactVerificationCommands(summary.failedCommands),
-        verificationMissingCommands: compactVerificationCommands(summary.missingCommands),
-        verificationSkippedReason: summary.skippedReason
-            ? (0, session_storage_1.redactTraceText)(summary.skippedReason)
-            : undefined,
-    };
-}
-function shouldRecordVerificationLoopStats(profile, summary) {
-    return (profile.changedFiles.length > 0 ||
-        summary.commandsRun.length > 0 ||
-        summary.passedCommands.length > 0 ||
-        summary.failedCommands.length > 0 ||
-        summary.missingCommands.length > 0);
-}
-function appendPostWorkspaceTrace(events, sessionId, turnId, cwd, before, verificationResults = []) {
-    const postWorkspace = (0, workspace_state_1.captureWorkspaceSnapshot)(cwd);
-    appendWorkspaceSnapshotTrace(events, sessionId, turnId, 'post_turn', postWorkspace);
-    const delta = appendWorkspaceDeltaTrace(events, sessionId, turnId, before, postWorkspace);
-    const profile = (0, verification_profile_1.selectVerificationProfile)(cwd, delta.changedByTurn);
-    const summary = (0, verification_profile_1.summarizeVerificationState)(profile, verificationResults);
-    appendVerificationProfileTrace(events, sessionId, turnId, profile);
-    appendVerificationSummaryTrace(events, sessionId, turnId, summary, profile.changedFiles);
-    return { delta, profile, summary };
-}
-function appendAssistantNotice(messages, notice) {
-    for (let index = messages.length - 1; index >= 0; index--) {
-        const message = messages[index];
-        if (message.role === 'assistant' && !message.tool_calls) {
-            message.content = message.content ? `${message.content}\n\n${notice}` : notice;
-            return;
-        }
-    }
-    messages.push({
-        role: 'assistant',
-        content: notice,
-        timestamp: Date.now(),
-    });
-}
-function recordTraceEvent(events, sessionId, event) {
-    if (!sessionId)
-        return null;
-    const goal = goalTraceContext.getStore();
-    const traceEvent = (0, session_storage_1.appendSessionTraceEvent)(sessionId, {
-        ...event,
-        goalId: goal?.goalId,
-        goalRevision: goal?.goalRevision,
-        goalInputKind: goal?.goalInputKind,
-        goalStopReason: goal?.getStopReason(),
-    });
-    if (traceEvent) {
-        events.traceEventRecorded?.(traceEvent);
-    }
-    return traceEvent;
-}
-function recordProviderTraceEvents(events, sessionId, turnId, stats) {
-    if ((stats.providerRetryCount ?? 0) > 0) {
-        recordTraceEvent(events, sessionId, {
-            turnId,
-            type: 'provider_retry',
-            providerRetryCount: stats.providerRetryCount,
-            providerRetryDelayMs: stats.providerRetryDelayMs,
-            providerRetryErrorTypes: stats.providerRetryErrorTypes,
-            providerLastRetryErrorType: stats.providerLastRetryErrorType,
-            providerLastRetryStatus: stats.providerLastRetryStatus,
-            providerFinalModel: stats.providerFinalModel,
-            providerUsingFallback: stats.providerUsingFallback,
-        });
-    }
-    if ((stats.providerFallbackCount ?? 0) > 0 || stats.providerUsingFallback) {
-        recordTraceEvent(events, sessionId, {
-            turnId,
-            type: 'provider_fallback',
-            providerFallbackCount: stats.providerFallbackCount,
-            providerFallbackFromModel: stats.providerFallbackFromModel,
-            providerFallbackToModel: stats.providerFallbackToModel,
-            providerFinalModel: stats.providerFinalModel,
-            providerUsingFallback: stats.providerUsingFallback,
-        });
-    }
-}
-function toHarnessDiagnostics(state) {
-    const stats = state.promptAssemblyStats;
-    const redactOptional = (value) => typeof value === 'string' ? (0, session_storage_1.redactTraceText)(value) : undefined;
-    const redactList = (values) => values?.slice(0, 6).map(session_storage_1.redactTraceText);
-    return {
-        taskEpoch: state.taskEpoch,
-        rootObjective: redactOptional(state.rootObjective ?? state.contract?.objective),
-        activeInstruction: redactOptional(state.activeInstruction ?? state.contract?.userIntent),
-        openQuestions: redactList(state.openQuestions),
-        diagnostics: redactList(state.diagnostics?.slice(-6)),
-        ledgerSize: state.ledger?.length ?? 0,
-        evidenceSize: state.evidenceIndex?.length ?? 0,
-        turnSummaryCount: state.turnSummaries?.length ?? 0,
-        promptAssembly: stats
-            ? {
-                modelId: stats.modelId,
-                estimatedTokens: stats.estimatedTokens,
-                budgetTokens: stats.budgetTokens,
-                sections: stats.sections.slice(0, 12),
-                includedEvidence: stats.includedEvidence.length,
-                omittedEvidence: stats.omittedEvidence.length,
-            }
-            : undefined,
-    };
-}
-function emitHarnessDiagnostics(events, state) {
-    events.harnessDiagnosticsUpdated?.(toHarnessDiagnostics(state));
-}
-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) {
-    return (0, ui_view_model_1.formatToolActivityTranscript)((0, ui_view_model_1.toolActivityFromFinished)(event, compactToolArgs(event.args, TOOL_TRANSCRIPT_ARG_BUDGET)));
-}
-function structuredToolStartActivity(event, seq) {
-    const command = event.name === 'exec_command' && typeof event.args.command === 'string'
-        ? event.args.command
-        : undefined;
-    const safeCommand = command ? (0, session_storage_1.redactTraceText)(command) : undefined;
-    return {
-        state: 'running',
-        name: event.name,
-        detail: command ? '' : (0, session_storage_1.redactTraceText)(compactToolArgs(event.args, TOOL_TRANSCRIPT_ARG_BUDGET)),
-        command: safeCommand,
-        body: '',
-        seq,
-    };
-}
-function structuredToolFinishActivity(event, seq, options = {}) {
-    const modelVisible = (0, tool_serializer_1.parseToolResultEnvelope)(event.modelVisibleResult);
-    const durable = (0, tool_serializer_1.parseToolResultEnvelope)(event.result);
-    const durableOutput = typeof durable.output === 'string' ? durable.output : '';
-    const displayOutput = typeof modelVisible.output === 'string' ? modelVisible.output : durableOutput;
-    const outputBytes = event.outputBytes ?? Buffer.byteLength(durableOutput, 'utf8');
-    const aggregatePresentation = (0, aggregate_tool_presenter_1.presentAggregateToolResult)(event.name, durableOutput, outputBytes);
-    const aggregate = aggregatePresentation?.view;
-    const storedArtifact = event.artifactRef ??
-        (options.projectPath &&
-            durableOutput &&
-            (outputBytes > tool_output_presentation_1.DEFAULT_TOOL_OUTPUT_POLICY.inlineMaxBytes || aggregate)
-            ? ((0, tool_artifacts_1.storeArtifact)(options.projectPath, event.name, durableOutput, outputBytes) ?? undefined)
-            : undefined);
-    const artifactRef = storedArtifact
-        ? { id: storedArtifact.id, outputBytes: storedArtifact.outputBytes }
-        : undefined;
-    const outputView = (0, tool_output_presentation_1.createToolOutputView)({
-        toolName: event.name,
-        success: event.success,
-        summary: event.summary,
-        rawOutput: durableOutput.length <= 64 * 1024 ? durableOutput : displayOutput,
-        outputBytes,
-        artifactRef,
-        callId: event.callId,
-        sequence: seq,
-        turnId: options.turnId,
-        policy: tool_output_presentation_1.DEFAULT_TOOL_OUTPUT_POLICY,
-    });
-    if (aggregate) {
-        outputView.aggregate = {
-            ...aggregate,
-            steps: aggregate.steps.map(step => ({ ...step, detailRef: outputView.detailRef })),
-        };
-    }
-    const command = event.name === 'exec_command' && typeof event.args.command === 'string'
-        ? event.args.command
-        : undefined;
-    const safeCommand = command ? (0, session_storage_1.redactTraceText)(command) : undefined;
-    return {
-        state: event.success ? 'success' : 'error',
-        name: event.name,
-        detail: command ? '' : (0, session_storage_1.redactTraceText)(compactToolArgs(event.args, TOOL_TRANSCRIPT_ARG_BUDGET)),
-        command: safeCommand,
-        duration: `${event.duration}ms`,
-        summary: event.summary ? (0, session_storage_1.redactTraceText)(event.summary.split(/\r?\n/u, 1)[0]) : undefined,
-        outputBytes,
-        body: (0, session_storage_1.redactTraceText)(modelVisible.output),
-        error: event.error ? (0, session_storage_1.redactTraceText)(event.error) : undefined,
-        seq,
-        artifactHint: artifactRef ? `/artifacts show ${artifactRef.id} --full` : undefined,
-        callId: event.callId,
-        turnId: options.turnId,
-        outputView,
-    };
-}
-function isSyntheticCompactContext(content) {
-    return (content.startsWith('[Orion Code Context State v2]') ||
-        content.startsWith('[Context Summary]') ||
-        content.startsWith('I will continue from this Orion Code Context State') ||
-        content.startsWith('I understand the context. I will continue the conversation with this background information.'));
-}
-function sessionToolCallSummaries(message) {
-    return (message.tool_calls ?? []).map(call => {
-        const args = parseToolCallArgs(call.function.arguments);
-        const detail = compactToolArgs(args);
-        return {
-            id: call.id,
-            content: `Requested ${call.function.name}${detail ? ` ${detail}` : ''}`,
-        };
-    });
-}
-function parseToolCallArgs(rawArgs) {
-    try {
-        return rawArgs ? JSON.parse(rawArgs) : {};
-    }
-    catch {
-        return rawArgs ? { arguments: rawArgs } : {};
-    }
-}
-function parseSessionToolResult(content) {
-    try {
-        const parsed = JSON.parse(content);
-        return {
-            success: parsed.success === true,
-            error: typeof parsed.error === 'string' ? parsed.error : undefined,
-            summary: typeof parsed.summary === 'string' ? parsed.summary : undefined,
-        };
-    }
-    catch {
-        return { success: false, error: 'Invalid JSON result' };
-    }
-}
-function removeTrailingUserMessage(runtime) {
-    const history = runtime.store.getSnapshot().conversationHistory;
-    if (history.length === 0)
-        return;
-    const lastMsg = history[history.length - 1];
-    if (lastMsg?.role === 'user') {
-        runtime.store.setState({ conversationHistory: history.slice(0, -1) });
-    }
-}
-function sessionToolResultSummary(message, toolCallsById) {
-    if (!message.toolCallId)
-        return null;
-    const call = toolCallsById.get(message.toolCallId);
-    if (!call)
-        return null;
-    const args = parseToolCallArgs(call.function.arguments);
-    const detail = compactToolArgs(args);
-    const parsed = parseSessionToolResult(message.content);
-    const firstLine = parsed.summary ||
-        `${parsed.success ? '✓' : '✗'} ${call.function.name}${detail ? ` ${detail}` : ''}`;
-    return parsed.error ? `${firstLine}\nError: ${parsed.error}` : firstLine;
-}
-function sessionMessagesToTranscriptEntries(sessionId, options = {}) {
-    const messages = (0, session_storage_1.loadSessionTranscriptMessages)(sessionId);
-    const resultTraces = options.includeToolOutputViews
-        ? (0, session_storage_1.readSessionTraceEvents)(sessionId).filter(trace => trace.type === 'tool_result' && trace.callId)
-        : [];
-    const resultTraceByCallId = new Map(resultTraces.map(trace => [trace.callId, trace]));
-    const sequenceByCallId = new Map();
-    resultTraces.forEach((trace, index) => {
-        if (!sequenceByCallId.has(trace.callId))
-            sequenceByCallId.set(trace.callId, index + 1);
-    });
-    const entries = [];
-    const toolCallsById = new Map();
-    const completedToolCallIds = new Set();
-    let fallbackToolSequence = 0;
-    for (const message of messages) {
-        for (const call of message.tool_calls ?? []) {
-            toolCallsById.set(call.id, call);
-        }
-        if (message.role === 'tool' && message.toolCallId) {
-            completedToolCallIds.add(message.toolCallId);
-        }
-    }
-    messages.forEach((message, index) => {
-        if (isSyntheticCompactContext(message.content))
-            return;
-        const idBase = `session-${sessionId.slice(0, 8)}-${index}`;
-        if (message.role === 'user') {
-            entries.push({ id: `${idBase}-user`, role: 'user', content: message.content });
-            return;
-        }
-        if (message.role === 'assistant') {
-            if (message.content?.trim()) {
-                entries.push({ id: `${idBase}-assistant`, role: 'assistant', content: message.content });
-            }
-            for (const summary of sessionToolCallSummaries(message)) {
-                if (!completedToolCallIds.has(summary.id)) {
-                    entries.push({
-                        id: `${idBase}-tool-call-${entries.length}`,
-                        role: 'tool',
-                        content: summary.content,
-                    });
-                }
-            }
-            return;
-        }
-        if (message.role === 'tool') {
-            const summary = sessionToolResultSummary(message, toolCallsById);
-            const call = message.toolCallId ? toolCallsById.get(message.toolCallId) : undefined;
-            const trace = message.toolCallId ? resultTraceByCallId.get(message.toolCallId) : undefined;
-            const durable = (0, tool_serializer_1.parseToolResultEnvelope)(message.content);
-            const modelVisible = message.modelVisibleContent
-                ? (0, tool_serializer_1.parseToolResultEnvelope)(message.modelVisibleContent)
-                : durable;
-            const durableOutput = typeof durable.output === 'string' ? durable.output : '';
-            const displayOutput = typeof modelVisible.output === 'string' ? modelVisible.output : durableOutput;
-            const outputBytes = trace?.outputBytes ??
-                (durable.schemaVersion === 1 ? durable.outputBytes : undefined) ??
-                Buffer.byteLength(durableOutput, 'utf8');
-            const artifactId = durable.artifactRef?.id ?? trace?.artifactId;
-            fallbackToolSequence += 1;
-            const sequence = message.toolCallId
-                ? (sequenceByCallId.get(message.toolCallId) ?? fallbackToolSequence)
-                : fallbackToolSequence;
-            const outputView = options.includeToolOutputViews && call && message.toolCallId
-                ? (0, tool_output_presentation_1.createToolOutputView)({
-                    toolName: call.function.name,
-                    success: durable.success,
-                    summary: durable.summary,
-                    rawOutput: durableOutput.length <= 64 * 1024 ? durableOutput : displayOutput,
-                    outputBytes,
-                    artifactRef: artifactId ? { id: artifactId, outputBytes } : undefined,
-                    callId: message.toolCallId,
-                    sequence,
-                    turnId: trace?.turnId,
-                    policy: tool_output_presentation_1.DEFAULT_TOOL_OUTPUT_POLICY,
-                })
-                : undefined;
-            entries.push({
-                id: `${idBase}-tool`,
-                role: 'tool',
-                content: summary ??
-                    (message.toolCallId
-                        ? `Tool result ${message.toolCallId}\n${message.content}`
-                        : message.content),
-                toolActivity: call && message.toolCallId && outputView
-                    ? {
-                        state: durable.success ? 'success' : 'error',
-                        name: call.function.name,
-                        detail: (0, session_storage_1.redactTraceText)(compactToolArgs(parseToolCallArgs(call.function.arguments))),
-                        summary: durable.summary
-                            ? (0, session_storage_1.redactTraceText)(durable.summary.split(/\r?\n/u, 1)[0])
-                            : undefined,
-                        outputBytes,
-                        body: (0, session_storage_1.redactTraceText)(durableOutput.length <= 64 * 1024 ? durableOutput : displayOutput),
-                        error: durable.error ? (0, session_storage_1.redactTraceText)(durable.error) : undefined,
-                        duration: typeof trace?.duration === 'number' ? `${trace.duration}ms` : undefined,
-                        seq: sequence,
-                        artifactHint: artifactId ? `/artifacts show ${artifactId} --full` : undefined,
-                        callId: message.toolCallId,
-                        turnId: trace?.turnId,
-                        outputView,
-                    }
-                    : undefined,
-            });
-            return;
-        }
-        if (message.role === 'system') {
-            entries.push({ id: `${idBase}-system`, role: 'system', content: message.content });
-        }
-    });
-    return entries;
-}
-function createAssistantStreamPresenter(events, abortSignal) {
-    let activeSegmentText = '';
-    let activeEntryId = null;
-    const ensureLiveEntry = () => {
-        if (abortSignal?.aborted || !activeSegmentText)
-            return null;
-        if (activeEntryId) {
-            events.update(activeEntryId, { content: activeSegmentText });
-            return activeEntryId;
-        }
-        activeEntryId = events.append({
-            role: 'assistant',
-            content: activeSegmentText,
-            live: true,
-        });
-        return activeEntryId;
-    };
-    const flushSegment = () => {
-        if (abortSignal?.aborted) {
-            if (activeEntryId)
-                events.remove(activeEntryId);
-            activeEntryId = null;
-            activeSegmentText = '';
-            return;
-        }
-        const entryId = ensureLiveEntry();
-        if (!entryId)
-            return;
-        events.finalize(entryId);
-        activeEntryId = null;
-        activeSegmentText = '';
-    };
-    return {
-        appendChunk(chunk) {
-            if (abortSignal?.aborted || !chunk)
-                return;
-            activeSegmentText += chunk;
-            ensureLiveEntry();
-        },
-        closeSegment() {
-            flushSegment();
-        },
-        discardSegment() {
-            if (activeEntryId)
-                events.remove(activeEntryId);
-            activeEntryId = null;
-            activeSegmentText = '';
-        },
-        ensureMessage(content) {
-            if (abortSignal?.aborted || !content || activeSegmentText.length > 0)
-                return;
-            activeSegmentText = content;
-            ensureLiveEntry();
-        },
-        replaceMessage(content) {
-            if (abortSignal?.aborted || !content)
-                return;
-            activeSegmentText = content;
-            ensureLiveEntry();
-        },
-    };
-}
-const goalTraceContext = new async_hooks_1.AsyncLocalStorage();
-class LocalFastPathBlockedError extends Error {
-    constructor(message) {
-        super(message);
-        this.name = 'LocalFastPathBlockedError';
-    }
-}
-function parseLocalFastPath(input) {
-    const text = input.trim();
-    if (/^git\s+status$/i.test(text)) {
-        return { tool: 'git_status', args: {}, label: 'git status' };
-    }
-    const readMatch = /^(?:read|读取)\s+(.+)$/i.exec(text);
-    const readTarget = readMatch?.[1]?.trim();
-    const looksLikePath = Boolean(readTarget) &&
-        !/\s/.test(readTarget) &&
-        (/[/\\.]/.test(readTarget) || readTarget.startsWith('~'));
-    if (readTarget && looksLikePath) {
-        return { tool: 'read_file', args: { path: readTarget }, label: `read ${readTarget}` };
-    }
-    const grepMatch = /^(?:grep|搜索)\s+(.+)$/i.exec(text);
-    if (grepMatch?.[1]?.trim()) {
-        return {
-            tool: 'grep',
-            args: { pattern: grepMatch[1].trim() },
-            label: `grep ${grepMatch[1].trim()}`,
-        };
-    }
-    const runTestMatch = /^(?:run\s+test|运行测试)\s*[:：]\s*(.+)$/i.exec(text);
-    if (runTestMatch?.[1]?.trim()) {
-        return {
-            tool: 'exec_command',
-            args: { command: runTestMatch[1].trim() },
-            label: `run test: ${runTestMatch[1].trim()}`,
-        };
-    }
-    return null;
-}
-function formatLocalFastPathAssistantContent(action, rawResult, projectPath) {
-    const envelope = (0, tool_serializer_1.parseToolResultEnvelope)(rawResult);
-    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
-            ? `Local fast path completed ${action.label}.`
-            : `Local fast path failed ${action.label}.`,
-        '',
-        summary,
-    ];
-    if (!envelope.success && envelope.error) {
-        lines.push(`Error: ${envelope.error}`);
-    }
-    if (!output) {
-        return { content: lines.join('\n'), artifactRef: envelope.artifactRef };
-    }
-    let artifactRef = envelope.artifactRef;
-    let preview = output;
-    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, 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 (${(0, format_1.formatBytes)(artifactRef.outputBytes)})`);
-    }
-    lines.push('', 'Preview:', preview);
-    return { content: lines.join('\n'), artifactRef };
-}
-function createToolEventPresenter(events, options = {}) {
-    const runningToolEntries = new Map();
-    let toolSequenceCounter = 0;
-    return {
-        start(event) {
-            const seq = ++toolSequenceCounter;
-            const entryId = events.append({
-                role: 'tool',
-                title: 'tool',
-                content: toolStartContent(event),
-                toolActivity: structuredToolStartActivity(event, seq),
-            });
-            runningToolEntries.set(event.callId, {
-                entryId,
-                name: event.name,
-                args: event.args,
-                sequence: seq,
-                batchCount: event.batchCount,
-                batchIndex: event.batchIndex,
-            });
-            events.toolStarted?.({
-                callId: event.callId,
-                name: event.name,
-                args: event.args,
-                sequence: seq,
-                batchCount: event.batchCount,
-                batchIndex: event.batchIndex,
-            });
-        },
-        finish(event) {
-            const content = toolFinishContent(event);
-            const stored = runningToolEntries.get(event.callId);
-            const seq = stored?.sequence ?? ++toolSequenceCounter;
-            const toolActivity = structuredToolFinishActivity(event, seq, options);
-            if (stored) {
-                events.finalize(stored.entryId, {
-                    role: event.success ? 'tool' : 'error',
-                    title: 'tool',
-                    content,
-                    toolActivity,
-                });
-                runningToolEntries.delete(event.callId);
-            }
-            else {
-                const entryId = events.append({
-                    role: event.success ? 'tool' : 'error',
-                    title: 'tool',
-                    content,
-                    toolActivity,
-                });
-                events.finalize(entryId);
-            }
-            events.toolFinished?.({
-                callId: event.callId,
-                name: event.name,
-                args: event.args,
-                success: event.success,
-                duration: event.duration,
-                summary: event.summary,
-                error: event.error,
-                outputBytes: event.outputBytes,
-                artifactRef: toolActivity.outputView?.detailRef?.artifactId
-                    ? {
-                        id: toolActivity.outputView.detailRef.artifactId,
-                        outputBytes: toolActivity.outputView.detailRef.outputBytes,
-                    }
-                    : event.artifactRef,
-                externalAssertion: event.externalAssertion,
-                sequence: seq,
-                batchCount: event.batchCount,
-                batchIndex: event.batchIndex,
-            });
-        },
-        finalizePendingAsSkipped(reason = 'permission denied') {
-            for (const [callId, entry] of runningToolEntries) {
-                events.finalize(entry.entryId, {
-                    role: 'tool',
-                    title: 'tool',
-                    content: `Skipped · ${reason}`,
-                    toolActivity: {
-                        state: 'skipped',
-                        name: entry.name,
-                        detail: '',
-                        body: '',
-                        error: reason,
-                        seq: entry.sequence,
-                    },
-                });
-                events.toolFinished?.({
-                    callId,
-                    name: entry.name,
-                    args: entry.args,
-                    success: false,
-                    skipped: true,
-                    duration: 0,
-                    error: reason,
-                    sequence: entry.sequence,
-                    batchCount: entry.batchCount,
-                    batchIndex: entry.batchIndex,
-                });
-            }
-            runningToolEntries.clear();
-        },
-    };
-}
-async function captureConsoleOutput(fn) {
-    const lines = [];
-    const originalLog = console.log;
-    const originalError = console.error;
-    const originalWarn = console.warn;
-    const capture = (...args) => {
-        lines.push(stripAnsi(args.map(arg => (typeof arg === 'string' ? arg : JSON.stringify(arg))).join(' ')));
-    };
-    console.log = capture;
-    console.error = capture;
-    console.warn = capture;
-    try {
-        const result = await fn();
-        return { result, output: lines.join('\n').trim() };
-    }
-    finally {
-        console.log = originalLog;
-        console.error = originalError;
-        console.warn = originalWarn;
-    }
-}
+const observability_1 = require("../utils/observability");
+const chat_trace_1 = require("./chat-trace");
+const chat_checkpoint_1 = require("./chat-checkpoint");
+const chat_workspace_1 = require("./chat-workspace");
+const chat_presentation_1 = require("./chat-presentation");
+const chat_effort_1 = require("./chat-effort");
+var chat_presentation_2 = require("./chat-presentation");
+Object.defineProperty(exports, "createAssistantStreamPresenter", { enumerable: true, get: function () { return chat_presentation_2.createAssistantStreamPresenter; } });
+Object.defineProperty(exports, "createToolEventPresenter", { enumerable: true, get: function () { return chat_presentation_2.createToolEventPresenter; } });
+Object.defineProperty(exports, "sessionMessagesToTranscriptEntries", { enumerable: true, get: function () { return chat_presentation_2.sessionMessagesToTranscriptEntries; } });
 class AgentChatController {
     setGoalCoordinator(coord) {
         this.goalCoordinator = coord;
     }
     resolveToolAllowlist() {
-        const cwd = this.runtime.cwd;
-        if (this.toolAllowlistCache?.cwd !== cwd) {
-            this.toolAllowlistCache = { cwd, evaluator: (0, tool_allowlist_1.resolveProjectToolAllowlist)(cwd).evaluator };
-        }
-        return this.toolAllowlistCache.evaluator;
+        // Reload on every scheduling boundary so a project/global approval selected
+        // by the interactive prompt affects the very next tool call in this process.
+        return (0, tool_allowlist_1.resolveProjectToolAllowlist)(this.runtime.cwd).evaluator;
     }
     constructor(runtime, events, controllerOptions = {}) {
         this.runtime = runtime;
@@ -1010,7 +70,7 @@ class AgentChatController {
         });
         const parsed = (0, parser_1.parseInput)(text);
         if (!parsed.isCommand) {
-            const localFastPath = parseLocalFastPath(text);
+            const localFastPath = (0, chat_presentation_1.parseLocalFastPath)(text);
             if (localFastPath) {
                 await this.runLocalFastPath(text, localFastPath, options);
                 return;
@@ -1050,6 +110,23 @@ class AgentChatController {
             });
             return;
         }
+        const compatibilityAlias = command.compatibilityAliases?.find(alias => alias.name.toLowerCase() === parsed.name.toLowerCase());
+        const deprecation = compatibilityAlias?.lifecycle ??
+            (command.lifecycle.status === 'deprecated' ? command.lifecycle : undefined);
+        if (deprecation) {
+            this.events.append({
+                role: 'system',
+                title: `/${parsed.name} deprecated`,
+                content: `/${parsed.name} is deprecated${deprecation.replacement ? `; use ${deprecation.replacement}` : ''}. It will be removed in ${deprecation.removeIn ?? 'a future release'}.`,
+                statusTone: 'warning',
+                command: {
+                    id: command.id,
+                    name: command.name,
+                    source: command.source,
+                    success: true,
+                },
+            });
+        }
         const ctx = this.createCommandContext(options.abortSignal, options.turnId);
         let commandProviderAttempts = 0;
         const commandProviderPreflight = async (context) => {
@@ -1073,7 +150,13 @@ class AgentChatController {
         let result;
         let output;
         try {
-            ({ result, output } = await captureConsoleOutput(() => command.execute(ctx, parsed.args)));
+            if (command.audience === 'primary') {
+                result = await command.execute(ctx, parsed.args);
+                output = '';
+            }
+            else {
+                ({ result, output } = await (0, chat_presentation_1.captureConsoleOutput)(() => command.execute(ctx, parsed.args)));
+            }
         }
         finally {
             unsubscribeCommandUsage?.();
@@ -1083,7 +166,7 @@ class AgentChatController {
             }
             const providerRequests = Math.max(commandProviderAttempts, commandUsageEvents);
             if (providerRequests > 0) {
-                const diagnostics = getLastRequestDiagnostics(this.runtime.llm);
+                const diagnostics = (0, chat_trace_1.getLastRequestDiagnostics)(this.runtime.llm);
                 const retryCount = diagnostics?.retryCount ?? 0;
                 const fallbackCount = diagnostics?.fallbackTriggered ? 1 : 0;
                 this.setLoopStats({
@@ -1112,11 +195,18 @@ class AgentChatController {
                 });
             }
         }
+        const commandMeta = {
+            id: command.id,
+            name: command.name,
+            source: command.source,
+            success: result.success,
+        };
         if (output) {
             this.events.append({
                 role: result.success ? 'system' : 'error',
                 title: `/${command.name}`,
                 content: output,
+                command: commandMeta,
             });
         }
         if (result.output) {
@@ -1124,6 +214,7 @@ class AgentChatController {
                 role: result.success ? 'system' : 'error',
                 title: `/${command.name}`,
                 content: result.output,
+                command: commandMeta,
             });
         }
         if (result.error) {
@@ -1132,6 +223,7 @@ class AgentChatController {
                 title: `/${command.name}`,
                 content: result.error,
                 errorLayer: 'runtime',
+                command: commandMeta,
             });
         }
         if (result.sessionPicker) {
@@ -1146,6 +238,9 @@ class AgentChatController {
             this.events.showEditPreview(result.editPreview);
             return;
         }
+        if (result.effortEvent) {
+            this.events.effortEvent?.(result.effortEvent);
+        }
         if (result.continueAsChat) {
             await this.runChat(result.chatInput ?? parsed.args, options);
         }
@@ -1162,7 +257,7 @@ class AgentChatController {
             await run();
             return;
         }
-        await goalTraceContext.run({
+        await chat_trace_1.goalTraceContext.run({
             goalId: request.goal.goalId,
             goalRevision: request.goal.revision,
             goalInputKind: request.inputKind,
@@ -1174,30 +269,35 @@ class AgentChatController {
             this.runtime.ensureSession() ??
             (0, session_storage_1.loadSessionMeta)(this.runtime.getSession()?.id ?? '');
         const sessionId = activeSession?.id;
-        const turnId = traceTurnId(options.turnId);
+        const turnId = (0, chat_trace_1.traceTurnId)(options.turnId);
+        (0, observability_1.setDiagnosticTraceContext)({
+            traceId: `${sessionId ?? 'local'}:${turnId}`,
+            ...(sessionId ? { sessionId } : {}),
+            turnId,
+        });
         const localCallId = `local-${turnId}`;
         const start = Date.now();
         const preWorkspace = (0, workspace_state_1.captureWorkspaceSnapshot)(this.runtime.cwd);
-        const traceArgs = buildTraceArgsDetails(this.runtime.cwd, action.tool, action.args);
+        const traceArgs = (0, chat_trace_1.buildTraceArgsDetails)(this.runtime.cwd, action.tool, action.args);
         if (sessionId) {
             (0, session_storage_1.appendSessionMessage)(sessionId, {
                 role: 'user',
                 content: input,
                 timestamp: Date.now(),
             });
-            recordTraceEvent(this.events, sessionId, {
+            (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                 turnId,
                 type: 'turn_start',
-                inputBytes: byteLength(input),
+                inputBytes: (0, chat_trace_1.byteLength)(input),
                 localFastPathUsed: true,
             });
-            appendWorkspaceSnapshotTrace(this.events, sessionId, turnId, 'pre_turn', preWorkspace);
-            recordTraceEvent(this.events, sessionId, {
+            (0, chat_workspace_1.appendWorkspaceSnapshotTrace)(this.events, sessionId, turnId, 'pre_turn', preWorkspace);
+            (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                 turnId,
                 type: 'local_fast_path',
                 name: action.tool,
                 ...traceArgs,
-                note: compactMiddle(action.label, 160),
+                note: (0, chat_trace_1.compactMiddle)(action.label, 160),
             });
         }
         if (options.persistAsUserMessage !== false) {
@@ -1206,6 +306,11 @@ class AgentChatController {
         this.events.setStatus(`Running local ${action.label}...`);
         try {
             const tool = (0, tools_1.getRuntimeTools)().find(candidate => candidate.name === action.tool);
+            if (!tool) {
+                throw new chat_presentation_1.LocalFastPathBlockedError(`Local fast path tool ${action.tool} is unavailable.`);
+            }
+            const effectivePermissionMode = this.runtime.store.getEffectivePermissionMode();
+            const toolAllowlist = this.resolveToolAllowlist();
             const toolContext = {
                 cwd: this.runtime.cwd,
                 config: {
@@ -1214,17 +319,57 @@ class AgentChatController {
                 },
                 sessionId,
                 turnId,
+                permissionMode: effectivePermissionMode,
+                toolAllowlist,
+                toolConfirmation: this.runtime.config.toolConfirmation,
+                confirmToolUse: this.controllerOptions.confirmToolUse,
             };
-            const permission = tool?.checkPermissions?.(action.args, toolContext);
-            if (permission?.behavior === 'deny' || tool?.isDestructive?.(action.args) === true) {
-                const reason = permission?.reason || 'Local fast path blocked a destructive tool request.';
-                throw new LocalFastPathBlockedError(reason);
+            let permission;
+            try {
+                permission = tool.checkPermissions?.(action.args, toolContext);
             }
-            if (permission?.behavior === 'ask') {
-                throw new LocalFastPathBlockedError(permission.reason || 'Local fast path requires an allow-safe command.');
+            catch (error) {
+                const detail = error instanceof Error ? error.message : String(error);
+                throw new chat_presentation_1.LocalFastPathBlockedError(`Permission check failed closed: ${detail}`);
+            }
+            const effective = (0, tool_scheduler_1.resolveEffectivePermission)({
+                toolName: action.tool,
+                tool,
+                args: action.args,
+                permission,
+                permissionMode: effectivePermissionMode,
+                allowlist: toolAllowlist?.(action.tool, action.args),
+                toolConfirmation: this.runtime.config.toolConfirmation,
+            });
+            // Local exec is a hidden shortcut rather than a plan artifact. Even a
+            // read-only command must not execute through that shortcut in plan mode.
+            if (effectivePermissionMode === 'plan' && action.tool === 'exec_command') {
+                throw new chat_presentation_1.LocalFastPathBlockedError('Local run-test fast path is blocked in plan mode; switch mode before executing commands.');
+            }
+            if (effective.outcome === 'deny' || effective.outcome === 'block') {
+                throw new chat_presentation_1.LocalFastPathBlockedError(effective.reason ||
+                    `Local fast path blocked by ${effective.source ?? 'permission policy'}.`);
+            }
+            if (effective.outcome === 'confirm') {
+                if (this.runtime.config.toolConfirmation === 'deny' ||
+                    !this.controllerOptions.confirmToolUse) {
+                    throw new chat_presentation_1.LocalFastPathBlockedError(effective.reason || 'Local fast path requires user confirmation.');
+                }
+                const approved = await this.controllerOptions.confirmToolUse({
+                    name: action.tool,
+                    args: action.args,
+                    reason: effective.reason,
+                    abortSignal: options.abortSignal,
+                });
+                if (!approved) {
+                    throw new chat_presentation_1.LocalFastPathBlockedError(`Local fast path ${action.tool} requires confirmation and was denied by user.`);
+                }
+            }
+            if (options.abortSignal?.aborted) {
+                throw new chat_presentation_1.LocalFastPathBlockedError('Local fast path was cancelled before tool execution.');
             }
             if (sessionId) {
-                recordTraceEvent(this.events, sessionId, {
+                (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                     turnId,
                     type: 'tool_call',
                     name: action.tool,
@@ -1242,7 +387,7 @@ class AgentChatController {
             const outputBytes = typeof envelope.outputBytes === 'number'
                 ? envelope.outputBytes
                 : Buffer.byteLength(result, 'utf8');
-            const formattedLocalResult = formatLocalFastPathAssistantContent(action, result, this.runtime.cwd);
+            const formattedLocalResult = (0, chat_presentation_1.formatLocalFastPathAssistantContent)(action, result, this.runtime.cwd);
             const assistantContent = formattedLocalResult.content;
             const stats = (0, framework_1.createLocalFastPathLoopStats)({
                 finishReason: envelope.success ? 'completed' : 'failed',
@@ -1270,8 +415,8 @@ class AgentChatController {
             this.events.append({
                 role: envelope.success ? 'tool' : 'error',
                 title: 'local',
-                content: toolFinishContent(localToolResultEvent),
-                toolActivity: structuredToolFinishActivity(localToolResultEvent, 1, {
+                content: (0, chat_presentation_1.toolFinishContent)(localToolResultEvent),
+                toolActivity: (0, chat_presentation_1.structuredToolFinishActivity)(localToolResultEvent, 1, {
                     projectPath: this.runtime.cwd,
                     turnId,
                 }),
@@ -1279,7 +424,7 @@ class AgentChatController {
             this.runtime.store.addMessage({ role: 'assistant', content: assistantContent });
             this.setLoopStats(stats);
             if (sessionId) {
-                recordTraceEvent(this.events, sessionId, {
+                (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                     turnId,
                     type: 'tool_result',
                     name: action.tool,
@@ -1292,10 +437,10 @@ class AgentChatController {
                     outputBytes,
                     modelVisibleBytes: 0,
                     artifactId: formattedLocalResult.artifactRef?.id,
-                    error: envelope.error ? compactMiddle(envelope.error, 240) : undefined,
+                    error: envelope.error ? (0, chat_trace_1.compactMiddle)(envelope.error, 240) : undefined,
                 });
-                appendPostWorkspaceTrace(this.events, sessionId, turnId, this.runtime.cwd, preWorkspace);
-                recordTraceEvent(this.events, sessionId, {
+                (0, chat_workspace_1.appendPostWorkspaceTrace)(this.events, sessionId, turnId, this.runtime.cwd, preWorkspace);
+                (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                     turnId,
                     type: 'complete',
                     finishReason: stats.finishReason,
@@ -1323,21 +468,21 @@ class AgentChatController {
             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 });
-            const finishReason = error instanceof LocalFastPathBlockedError ? 'blocked' : 'failed';
+            const finishReason = error instanceof chat_presentation_1.LocalFastPathBlockedError ? 'blocked' : 'failed';
             const stats = (0, framework_1.createLocalFastPathLoopStats)({
                 finishReason,
                 toolCalls: 0,
             });
             this.setLoopStats(stats);
             if (sessionId) {
-                recordTraceEvent(this.events, sessionId, {
+                (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                     turnId,
                     type: 'error',
                     name: action.tool,
-                    error: compactTraceError(error),
+                    error: (0, chat_trace_1.compactTraceError)(error),
                 });
-                appendPostWorkspaceTrace(this.events, sessionId, turnId, this.runtime.cwd, preWorkspace);
-                recordTraceEvent(this.events, sessionId, {
+                (0, chat_workspace_1.appendPostWorkspaceTrace)(this.events, sessionId, turnId, this.runtime.cwd, preWorkspace);
+                (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                     turnId,
                     type: 'complete',
                     finishReason: stats.finishReason,
@@ -1367,8 +512,9 @@ class AgentChatController {
             ensureSession: this.runtime.ensureSession,
             setSession: session => {
                 this.runtime.setSession(session);
+                (0, chat_effort_1.applySessionEffort)(this.runtime, this.events, session);
                 const renderer = this.controllerOptions.uiRenderer ?? this.runtime.config.ui?.renderer ?? 'terminal';
-                this.events.replaceTranscript(sessionMessagesToTranscriptEntries(session.id, {
+                this.events.replaceTranscript((0, chat_presentation_1.sessionMessagesToTranscriptEntries)(session.id, {
                     includeToolOutputViews: renderer === 'tui',
                 }));
             },
@@ -1423,7 +569,7 @@ class AgentChatController {
         if (sessionId) {
             const traceType = stateToTraceType[event.state];
             if (traceType) {
-                recordTraceEvent(this.events, sessionId, {
+                (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                     turnId: String(turnId),
                     type: traceType,
                     name: `${event.role}:${event.taskId}`,
@@ -1501,11 +647,16 @@ class AgentChatController {
         // any provider request so failures without usage cannot inherit stale data.
         this.runtime.store.setState({ tokenUsage: null });
         const abortSignal = options.abortSignal;
-        const turnId = traceTurnId(options.turnId);
+        const turnId = (0, chat_trace_1.traceTurnId)(options.turnId);
         const activeSession = this.runtime.getSession() ??
             this.runtime.ensureSession() ??
             (0, session_storage_1.loadSessionMeta)(this.runtime.getSession()?.id ?? '');
         const sessionId = activeSession?.id;
+        (0, observability_1.setDiagnosticTraceContext)({
+            traceId: `${sessionId ?? 'unsaved'}:${turnId}`,
+            ...(sessionId ? { sessionId } : {}),
+            turnId,
+        });
         const preWorkspace = (0, workspace_state_1.captureWorkspaceSnapshot)(this.runtime.cwd);
         const runtimeTools = (0, tools_1.getRuntimeTools)();
         const skillResolution = (0, skills_1.resolveSkillsForTurn)({
@@ -1523,19 +674,20 @@ class AgentChatController {
                 timestamp: Date.now(),
                 appliedSkills: appliedSkillNames.length > 0 ? appliedSkillNames : undefined,
             });
-            recordTraceEvent(this.events, sessionId, {
+            (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                 turnId,
                 type: 'turn_start',
-                inputBytes: byteLength(input),
+                inputBytes: (0, chat_trace_1.byteLength)(input),
                 note: appliedSkillNames.length > 0 ? `skills=${appliedSkillNames.join(',')}` : undefined,
             });
-            appendWorkspaceSnapshotTrace(this.events, sessionId, turnId, 'pre_turn', preWorkspace);
+            (0, chat_workspace_1.appendWorkspaceSnapshotTrace)(this.events, sessionId, turnId, 'pre_turn', preWorkspace);
         }
         if (options.persistAsUserMessage !== false) {
             this.runtime.store.addMessage({ role: 'user', content: input });
         }
         (0, prompt_context_1.refreshProjectInstructions)(this.runtime.store, this.runtime.cwd);
         const snapshot = this.runtime.store.getSnapshot();
+        const effectivePermissionMode = this.runtime.store.getEffectivePermissionMode();
         const harness = (0, harness_1.createContextHarness)({
             cwd: this.runtime.cwd,
             modelId: this.runtime.llm.getModel(),
@@ -1576,7 +728,7 @@ class AgentChatController {
                 onSubtaskEvent: event => {
                     this.handleSubtaskEvent(event, sessionId, turnId);
                 },
-                onSubtaskResult: (result, _batchId, objective) => {
+                onSubtaskResult: (result, _batchId, objective, researchContext) => {
                     if (!projectPath)
                         return;
                     const json = JSON.stringify(result);
@@ -1586,7 +738,7 @@ class AgentChatController {
                         // The subtask state transition (subtask_completed) is already
                         // emitted by handleSubtaskEvent above.
                         if (sessionId) {
-                            recordTraceEvent(this.events, sessionId, {
+                            (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                                 turnId: String(turnId),
                                 type: 'subtask_artifact_stored',
                                 name: `${result.role}:${result.id}`,
@@ -1606,19 +758,38 @@ class AgentChatController {
                         const goal = this.goalCoordinator?.goal;
                         const objectiveRevision = goal?.contract?.objectiveRevision;
                         const hasGoalBinding = typeof goal?.goalId === 'string' && typeof objectiveRevision === 'number';
-                        const request = (0, subagents_1.createLocalResearchRequest)(objective?.trim() || result.summary || 'repository research', projectPath, hasGoalBinding
-                            ? {
-                                goalBinding: {
-                                    goalId: goal.goalId,
-                                    objectiveRevision,
-                                },
-                            }
-                            : undefined);
+                        // Preserve the authoritative request produced from the
+                        // original subtask capability. Reconstruct local-only only for
+                        // legacy callers that predate the additive callback context.
+                        const baseRequest = researchContext?.request ??
+                            (0, subagents_1.createLocalResearchRequest)(objective?.trim() || result.summary || 'repository research', projectPath);
+                        const request = {
+                            ...baseRequest,
+                            scope: { ...baseRequest.scope, projectRoot: projectPath },
+                            ...(hasGoalBinding
+                                ? {
+                                    goalBinding: {
+                                        goalId: goal.goalId,
+                                        objectiveRevision,
+                                    },
+                                }
+                                : {}),
+                        };
                         const packet = (0, subagents_1.subtaskResultToPacket)(result, request, {
                             projectPath,
                             sessionId,
                             ...(hasGoalBinding ? { goalId: goal.goalId, objectiveRevision } : {}),
+                        }, {
+                            externalSources: researchContext?.web?.sources,
+                            externalNotes: researchContext?.web?.notes,
+                            externalTimedOut: researchContext?.web?.timedOut,
+                            externalAborted: researchContext?.web?.aborted,
                         });
+                        // Citation resolution can downgrade claims and mark superseded
+                        // same-URL sources stale. Resolve before validation/persistence so
+                        // the CAS token, durable packet and renderer view describe the
+                        // exact same final state (#105).
+                        const resolution = (0, subagents_1.resolveCitations)(packet);
                         const validation = (0, subagents_1.validatePacket)(packet);
                         if (!validation.ok)
                             return;
@@ -1628,12 +799,11 @@ class AgentChatController {
                             packetId: packet.packetId,
                             ...(packet.goalId ? { goalId: packet.goalId } : {}),
                         });
-                        const resolution = (0, subagents_1.resolveCitations)(packet);
                         const view = (0, subagents_1.buildResearchView)(packet, resolution);
                         for (const event of (0, subagents_1.toLifecycleEvents)(view, resolution)) {
                             this.events.researchEvent?.(event);
                         }
-                        recordTraceEvent(this.events, sessionId, {
+                        (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                             turnId: String(turnId),
                             type: 'subtask_artifact_stored',
                             name: `research:${packet.packetId}`,
@@ -1690,8 +860,8 @@ class AgentChatController {
         let pendingCompact;
         const verificationResults = [];
         const sessionMessagesToRecord = [];
-        const assistantStream = createAssistantStreamPresenter(this.events, abortSignal);
-        const toolEvents = createToolEventPresenter(this.events, {
+        const assistantStream = (0, chat_presentation_1.createAssistantStreamPresenter)(this.events, abortSignal);
+        const toolEvents = (0, chat_presentation_1.createToolEventPresenter)(this.events, {
             projectPath: this.runtime.cwd,
             turnId,
         });
@@ -1731,6 +901,12 @@ class AgentChatController {
                 },
                 sessionId,
                 turnId,
+                // Tools that fan out to other tools (batch_read) have to re-run the
+                // permission gate per sub-step; they need the mode and the allowlist.
+                permissionMode: effectivePermissionMode,
+                toolAllowlist: this.resolveToolAllowlist(),
+                toolConfirmation: this.runtime.config.toolConfirmation,
+                confirmToolUse: this.controllerOptions.confirmToolUse,
             });
         };
         const loopBudget = (0, loop_budget_1.resolveRuntimeLoopBudget)(input, this.runtime.config, harness.toJSON());
@@ -1769,7 +945,7 @@ class AgentChatController {
                 llm: this.runtime.llm,
                 streamCallbacks,
                 costTracker: snapshot.costTracker,
-                permissionMode: snapshot.permissionMode,
+                permissionMode: effectivePermissionMode,
                 toolConfirmation: this.runtime.config.toolConfirmation,
                 toolAllowlist: this.resolveToolAllowlist(),
                 confirmToolUse: this.controllerOptions.confirmToolUse,
@@ -1781,6 +957,10 @@ class AgentChatController {
                     },
                     sessionId,
                     turnId,
+                    permissionMode: effectivePermissionMode,
+                    toolAllowlist: this.resolveToolAllowlist(),
+                    toolConfirmation: this.runtime.config.toolConfirmation,
+                    confirmToolUse: this.controllerOptions.confirmToolUse,
                 },
                 abortSignal,
                 harness,
@@ -1798,7 +978,7 @@ class AgentChatController {
                         assistantStream.discardSegment();
                         this.events.setStatus((0, agent_status_1.agentStepStatus)(event.turn));
                         if (sessionId) {
-                            recordTraceEvent(this.events, sessionId, {
+                            (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                                 turnId,
                                 type: 'request_start',
                                 model: event.model,
@@ -1808,7 +988,7 @@ class AgentChatController {
                         break;
                     case 'prompt_assembly':
                         if (sessionId) {
-                            recordTraceEvent(this.events, sessionId, {
+                            (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                                 turnId,
                                 type: 'prompt_assembly',
                                 promptModelId: event.modelId,
@@ -1832,7 +1012,7 @@ class AgentChatController {
                         {
                             const batchReadOnlyCount = event.toolCalls.filter(tc => {
                                 const def = skillResolution.tools.find(t => t.name === tc.function.name);
-                                const args = parseToolCallArgsForRuntime(tc);
+                                const args = (0, chat_checkpoint_1.parseToolCallArgsForRuntime)(tc);
                                 return args && def?.isReadOnly?.(args) === true;
                             }).length;
                             const suggestion = (0, agent_status_1.batchingSuggestion)(batchReadOnlyCount);
@@ -1840,8 +1020,8 @@ class AgentChatController {
                                 this.events.append({ role: 'status', content: suggestion });
                             }
                         }
-                        const checkpointId = checkpointSequence === 0 ? turnId : `${turnId}-checkpoint-${checkpointSequence + 1}`;
-                        const checkpointResult = createPreToolCheckpoint(this.events, sessionId, turnId, checkpointId, this.runtime.cwd, event.toolCalls);
+                        const checkpointId = `${turnId}-${checkpointSequence + 1}-${(0, crypto_1.randomUUID)()}`;
+                        const checkpointResult = (0, chat_checkpoint_1.createPreToolCheckpoint)(this.events, sessionId, turnId, checkpointId, this.runtime.cwd, event.toolCalls);
                         if (checkpointResult.created) {
                             checkpointIds.push(checkpointId);
                             checkpointSequence++;
@@ -1863,11 +1043,11 @@ class AgentChatController {
                             });
                         }
                         if (sessionId) {
-                            recordTraceEvent(this.events, sessionId, {
+                            (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                                 turnId,
                                 type: 'assistant_tool_calls',
                                 toolCallCount: event.toolCalls.length,
-                                contentBytes: byteLength(event.content || ''),
+                                contentBytes: (0, chat_trace_1.byteLength)(event.content || ''),
                             });
                         }
                         sessionMessagesToRecord.push({
@@ -1891,8 +1071,8 @@ class AgentChatController {
                         assistantStream.closeSegment();
                         toolEvents.start(event);
                         if (sessionId) {
-                            const traceArgs = buildTraceArgsDetails(this.runtime.cwd, event.name, event.args);
-                            recordTraceEvent(this.events, sessionId, {
+                            const traceArgs = (0, chat_trace_1.buildTraceArgsDetails)(this.runtime.cwd, event.name, event.args);
+                            (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                                 turnId,
                                 type: 'tool_call',
                                 name: event.name,
@@ -1905,17 +1085,17 @@ class AgentChatController {
                         break;
                     case 'permission_decision':
                         if (sessionId) {
-                            recordTraceEvent(this.events, sessionId, {
+                            (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                                 turnId,
                                 type: 'permission_decision',
                                 name: event.name,
                                 callId: event.callId,
-                                argsSummary: compactToolArgs(event.args),
+                                argsSummary: (0, chat_trace_1.compactToolArgs)(event.args),
                                 permissionBehavior: event.decision.behavior,
                                 permissionApproved: event.decision.approved,
                                 permissionSource: event.decision.source,
                                 permissionReason: event.decision.reason
-                                    ? compactMiddle(event.decision.reason, 240)
+                                    ? (0, chat_trace_1.compactMiddle)(event.decision.reason, 240)
                                     : undefined,
                                 permissionDuration: event.decision.duration,
                                 batchCount: event.batchCount,
@@ -1924,22 +1104,22 @@ class AgentChatController {
                         }
                         break;
                     case 'tool_result': {
-                        observedToolResultBytes += event.outputBytes ?? byteLength(event.result);
-                        observedModelVisibleToolBytes += byteLength(event.modelVisibleResult);
+                        observedToolResultBytes += event.outputBytes ?? (0, chat_trace_1.byteLength)(event.result);
+                        observedModelVisibleToolBytes += (0, chat_trace_1.byteLength)(event.modelVisibleResult);
                         toolEvents.finish(event);
                         if (sessionId) {
-                            recordTraceEvent(this.events, sessionId, {
+                            (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                                 turnId,
                                 type: 'tool_result',
                                 name: event.name,
                                 callId: event.callId,
-                                argsSummary: compactToolArgs(event.args),
+                                argsSummary: (0, chat_trace_1.compactToolArgs)(event.args),
                                 success: event.success,
                                 duration: event.duration,
                                 outputBytes: event.outputBytes,
-                                modelVisibleBytes: byteLength(event.modelVisibleResult),
+                                modelVisibleBytes: (0, chat_trace_1.byteLength)(event.modelVisibleResult),
                                 artifactId: event.artifactRef?.id,
-                                error: event.error ? compactMiddle(event.error, 240) : undefined,
+                                error: event.error ? (0, chat_trace_1.compactMiddle)(event.error, 240) : undefined,
                                 batchCount: event.batchCount,
                                 batchIndex: event.batchIndex,
                             });
@@ -1953,7 +1133,7 @@ class AgentChatController {
                         });
                         if (verificationResult) {
                             verificationResults.push(verificationResult);
-                            appendVerificationResultTrace(this.events, sessionId, turnId, verificationResult);
+                            (0, chat_workspace_1.appendVerificationResultTrace)(this.events, sessionId, turnId, verificationResult);
                         }
                         sessionMessagesToRecord.push({
                             role: 'tool',
@@ -1967,10 +1147,10 @@ class AgentChatController {
                     case 'strategy_exhausted':
                         this.events.append({ role: 'status', content: event.suggestion });
                         if (sessionId) {
-                            recordTraceEvent(this.events, sessionId, {
+                            (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                                 turnId,
                                 type: 'strategy_exhausted',
-                                note: compactMiddle(event.suggestion, 240),
+                                note: (0, chat_trace_1.compactMiddle)(event.suggestion, 240),
                             });
                         }
                         break;
@@ -1986,10 +1166,10 @@ class AgentChatController {
                         finalContent = event.content;
                         assistantStream.ensureMessage(event.content);
                         if (sessionId) {
-                            recordTraceEvent(this.events, sessionId, {
+                            (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                                 turnId,
                                 type: 'message',
-                                contentBytes: byteLength(event.content),
+                                contentBytes: (0, chat_trace_1.byteLength)(event.content),
                             });
                         }
                         if (event.content) {
@@ -2023,12 +1203,12 @@ class AgentChatController {
                         pendingCompact = event.compact;
                         if (event.stats) {
                             pendingCompleteStats = event.stats;
-                            recordProviderTraceEvents(this.events, sessionId, turnId, event.stats);
+                            (0, chat_trace_1.recordProviderTraceEvents)(this.events, sessionId, turnId, event.stats);
                             pendingCompleteTrace = {
                                 turnId,
                                 type: 'complete',
                                 model: event.model,
-                                contentBytes: byteLength(event.content || ''),
+                                contentBytes: (0, chat_trace_1.byteLength)(event.content || ''),
                                 finishReason: event.stats.finishReason,
                                 llmRequests: event.stats.llmRequests,
                                 toolCalls: event.stats.toolCalls,
@@ -2052,7 +1232,7 @@ class AgentChatController {
                                 turnId,
                                 type: 'complete',
                                 model: event.model,
-                                contentBytes: byteLength(event.content || ''),
+                                contentBytes: (0, chat_trace_1.byteLength)(event.content || ''),
                             };
                         }
                         break;
@@ -2063,7 +1243,7 @@ class AgentChatController {
                 const stats = pendingCompleteStats ??
                     (0, framework_1.createFailedLoopStats)({
                         loopBudget,
-                        diagnostics: observedLlmRequests > 0 ? getLastRequestDiagnostics(this.runtime.llm) : undefined,
+                        diagnostics: observedLlmRequests > 0 ? (0, chat_trace_1.getLastRequestDiagnostics)(this.runtime.llm) : undefined,
                         turnsStarted: observedTurnsStarted,
                         llmRequests: observedLlmRequests,
                         toolCalls: observedToolCalls,
@@ -2075,16 +1255,16 @@ class AgentChatController {
                 persistInterruptedAccounting(finalUsage, stats, finalUsage !== undefined || stats.llmRequests === 0);
                 assistantStream.discardSegment();
                 this.events.setStatus('Interrupted.');
-                removeTrailingUserMessage(this.runtime);
+                (0, chat_presentation_1.removeTrailingUserMessage)(this.runtime);
                 if (sessionId) {
-                    const { delta } = appendPostWorkspaceTrace(this.events, sessionId, turnId, this.runtime.cwd, preWorkspace, verificationResults);
-                    recordTraceEvent(this.events, sessionId, {
+                    const { delta } = (0, chat_workspace_1.appendPostWorkspaceTrace)(this.events, sessionId, turnId, this.runtime.cwd, preWorkspace, verificationResults);
+                    (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                         turnId,
                         type: 'aborted',
                         note: 'aborted_after_query',
                     });
-                    const recoveryNotice = workspaceDeltaHasTurnChanges(delta)
-                        ? formatFailureRecoveryNotice(turnId, delta, checkpointIds)
+                    const recoveryNotice = (0, chat_workspace_1.workspaceDeltaHasTurnChanges)(delta)
+                        ? (0, chat_workspace_1.formatFailureRecoveryNotice)(turnId, delta, checkpointIds)
                         : undefined;
                     if (recoveryNotice) {
                         this.events.append({
@@ -2105,15 +1285,15 @@ class AgentChatController {
             }
             assistantStream.closeSegment();
             if (sessionId) {
-                const { profile, summary } = appendPostWorkspaceTrace(this.events, sessionId, turnId, this.runtime.cwd, preWorkspace, verificationResults);
+                const { profile, summary } = (0, chat_workspace_1.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)) {
+                if ((0, chat_workspace_1.shouldRecordVerificationLoopStats)(profile, summary)) {
                     const stats = pendingCompleteStats ?? this.runtime.store.getSnapshot().lastLoopStats;
                     if (stats) {
-                        pendingCompleteStats = withVerificationLoopStats(stats, summary);
+                        pendingCompleteStats = (0, chat_workspace_1.withVerificationLoopStats)(stats, summary);
                     }
                 }
                 if ((0, verification_profile_1.shouldGateCompletion)(summary)) {
@@ -2127,16 +1307,16 @@ class AgentChatController {
                         content: notice,
                     });
                     finalContent = finalContent ? `${finalContent}\n\n${notice}` : notice;
-                    appendAssistantNotice(sessionMessagesToRecord, notice);
+                    (0, chat_trace_1.appendAssistantNotice)(sessionMessagesToRecord, notice);
                     if (pendingCompleteTrace) {
                         pendingCompleteTrace.finishReason = 'completion_gate';
-                        pendingCompleteTrace.contentBytes = byteLength(finalContent);
+                        pendingCompleteTrace.contentBytes = (0, chat_trace_1.byteLength)(finalContent);
                         pendingCompleteTrace.note = 'verification_incomplete';
                     }
                     const stats = pendingCompleteStats ?? this.runtime.store.getSnapshot().lastLoopStats;
                     if (stats) {
                         pendingCompleteStats = {
-                            ...withVerificationLoopStats(stats, summary),
+                            ...(0, chat_workspace_1.withVerificationLoopStats)(stats, summary),
                             finishReason: 'completion_gate',
                         };
                     }
@@ -2175,7 +1355,7 @@ class AgentChatController {
                     content: notice,
                 });
                 finalContent = finalContent ? `${finalContent}\n\n${notice}` : notice;
-                appendAssistantNotice(sessionMessagesToRecord, notice);
+                (0, chat_trace_1.appendAssistantNotice)(sessionMessagesToRecord, notice);
             }
             if (pendingCompleteStats) {
                 this.setLoopStats(this.foldSubagentUsage(pendingCompleteStats, subagentBundle));
@@ -2212,7 +1392,7 @@ class AgentChatController {
                     }
                     this.runtime.store.setContextUsage(pendingCompact.after);
                     if (sessionId) {
-                        recordTraceEvent(this.events, sessionId, {
+                        (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                             turnId,
                             type: 'compact_completed',
                             checkpointId: committedCheckpointId,
@@ -2229,11 +1409,11 @@ class AgentChatController {
                 }
                 catch (error) {
                     if (sessionId) {
-                        recordTraceEvent(this.events, sessionId, {
+                        (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                             turnId,
                             type: 'compact_failed',
                             model: finalModel || this.runtime.llm.getModel(),
-                            error: compactTraceError(error),
+                            error: (0, chat_trace_1.compactTraceError)(error),
                             note: pendingCompact.mode,
                         });
                     }
@@ -2264,10 +1444,10 @@ class AgentChatController {
             });
             const harnessState = harness.toJSON();
             this.runtime.store.setState({ harnessState });
-            emitHarnessDiagnostics(this.events, harnessState);
+            (0, chat_trace_1.emitHarnessDiagnostics)(this.events, harnessState);
             if (sessionId) {
                 if (pendingCompleteTrace) {
-                    recordTraceEvent(this.events, sessionId, pendingCompleteTrace);
+                    (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, pendingCompleteTrace);
                 }
                 (0, session_storage_1.updateSessionSkills)(sessionId, appliedSkillNames);
                 (0, session_storage_1.updateSessionHarnessState)(sessionId, harnessState);
@@ -2280,7 +1460,7 @@ class AgentChatController {
         }
         catch (error) {
             // v0.2.25: Provider retry exhausted is a recoverable turn failure.
-            if (error instanceof Error && error.name === 'ProviderRetryExhaustedError') {
+            if (error instanceof provider_resilience_1.ProviderRetryExhaustedError) {
                 const diag = error.diagnostics;
                 const attempts = diag?.attempts?.length ?? '?';
                 const kind = diag?.attempts?.[diag.attempts.length - 1]?.failureKind ?? 'unknown';
@@ -2304,12 +1484,12 @@ class AgentChatController {
                 }
                 return;
             }
-            if (isAbortError(error, abortSignal)) {
+            if ((0, chat_trace_1.isAbortError)(error, abortSignal)) {
                 const interruptedStats = error instanceof framework_1.QueryLoopError
                     ? error.stats
                     : (0, framework_1.createFailedLoopStats)({
                         loopBudget,
-                        diagnostics: observedLlmRequests > 0 ? getLastRequestDiagnostics(this.runtime.llm) : undefined,
+                        diagnostics: observedLlmRequests > 0 ? (0, chat_trace_1.getLastRequestDiagnostics)(this.runtime.llm) : undefined,
                         turnsStarted: observedTurnsStarted,
                         llmRequests: observedLlmRequests,
                         toolCalls: observedToolCalls,
@@ -2325,16 +1505,16 @@ class AgentChatController {
                 persistInterruptedAccounting(interruptedRootUsage, interruptedStats, interruptedStats.llmRequests === 0);
                 assistantStream.discardSegment();
                 this.events.setStatus('Interrupted.');
-                removeTrailingUserMessage(this.runtime);
+                (0, chat_presentation_1.removeTrailingUserMessage)(this.runtime);
                 if (sessionId) {
-                    const { delta } = appendPostWorkspaceTrace(this.events, sessionId, turnId, this.runtime.cwd, preWorkspace, verificationResults);
-                    recordTraceEvent(this.events, sessionId, {
+                    const { delta } = (0, chat_workspace_1.appendPostWorkspaceTrace)(this.events, sessionId, turnId, this.runtime.cwd, preWorkspace, verificationResults);
+                    (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                         turnId,
                         type: 'aborted',
                         note: 'abort_error',
                     });
-                    const recoveryNotice = workspaceDeltaHasTurnChanges(delta)
-                        ? formatFailureRecoveryNotice(turnId, delta, checkpointIds)
+                    const recoveryNotice = (0, chat_workspace_1.workspaceDeltaHasTurnChanges)(delta)
+                        ? (0, chat_workspace_1.formatFailureRecoveryNotice)(turnId, delta, checkpointIds)
                         : undefined;
                     if (recoveryNotice) {
                         this.events.append({
@@ -2351,15 +1531,15 @@ class AgentChatController {
             assistantStream.discardSegment();
             this.events.append({
                 role: 'error',
-                content: formatChatError(error),
-                errorLayer: errorLayerForChatError(error),
+                content: (0, chat_trace_1.formatChatError)(error),
+                errorLayer: (0, chat_trace_1.errorLayerForChatError)(error),
             });
             this.events.setStatus('Turn failed. Ready for the next input.');
             const failedStats = this.foldSubagentUsage(error instanceof framework_1.QueryLoopError
                 ? error.stats
                 : (0, framework_1.createFailedLoopStats)({
                     loopBudget,
-                    diagnostics: observedLlmRequests > 0 ? getLastRequestDiagnostics(this.runtime.llm) : undefined,
+                    diagnostics: observedLlmRequests > 0 ? (0, chat_trace_1.getLastRequestDiagnostics)(this.runtime.llm) : undefined,
                     turnsStarted: observedTurnsStarted,
                     llmRequests: observedLlmRequests,
                     toolCalls: observedToolCalls,
@@ -2379,10 +1559,10 @@ class AgentChatController {
             }
             this.setLoopStats(failedStats);
             if (sessionId) {
-                recordProviderTraceEvents(this.events, sessionId, turnId, failedStats);
-                const { delta } = appendPostWorkspaceTrace(this.events, sessionId, turnId, this.runtime.cwd, preWorkspace, verificationResults);
-                const recoveryNotice = workspaceDeltaHasTurnChanges(delta)
-                    ? formatFailureRecoveryNotice(turnId, delta, checkpointIds)
+                (0, chat_trace_1.recordProviderTraceEvents)(this.events, sessionId, turnId, failedStats);
+                const { delta } = (0, chat_workspace_1.appendPostWorkspaceTrace)(this.events, sessionId, turnId, this.runtime.cwd, preWorkspace, verificationResults);
+                const recoveryNotice = (0, chat_workspace_1.workspaceDeltaHasTurnChanges)(delta)
+                    ? (0, chat_workspace_1.formatFailureRecoveryNotice)(turnId, delta, checkpointIds)
                     : undefined;
                 if (recoveryNotice) {
                     this.events.append({
@@ -2392,13 +1572,13 @@ class AgentChatController {
                         content: recoveryNotice,
                     });
                 }
-                recordTraceEvent(this.events, sessionId, {
+                (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                     turnId,
                     type: 'error',
-                    error: compactTraceError(error),
+                    error: (0, chat_trace_1.compactTraceError)(error),
                     note: recoveryNotice,
                 });
-                recordTraceEvent(this.events, sessionId, {
+                (0, chat_trace_1.recordTraceEvent)(this.events, sessionId, {
                     turnId,
                     type: 'complete',
                     model: failedStats.providerFinalModel ?? this.runtime.llm.getModel(),
@@ -2418,6 +1598,12 @@ class AgentChatController {
                     localFastPathUsed: failedStats.localFastPathUsed,
                 });
                 (0, session_storage_1.removeLastIncompleteAssistantMessage)(sessionId);
+                // A failed turn must not leave the user's prompt dangling in the
+                // persisted session (it would replay on resume). The in-memory history
+                // is cleaned above (2969-2972); mirror that for the on-disk transcript.
+                if (options.persistAsUserMessage !== false) {
+                    (0, session_storage_1.removeTrailingSessionUserMessage)(sessionId);
+                }
             }
             const history = this.runtime.store.getSnapshot().conversationHistory;
             if (history.length > 0) {