openhorse 0.2.12 → 0.2.15

package/dist/commands/index.js

@@ -17,7 +17,7 @@ exports.getCommandNames = getCommandNames;
 exports.executeChat = handleChat;
 const chalk_1 = __importDefault(require("chalk"));
 const types_1 = require("./types");
-const ui_events_1 = require("../runtime/ui-events");
+const ui_view_model_1 = require("../runtime/ui-view-model");
 const task_manager_1 = require("../services/task-manager");
 const agent_runner_1 = require("../services/agent-runner");
 const config_1 = require("../services/config");
@@ -38,10 +38,14 @@ const project_instructions_1 = require("../services/project-instructions");
 const prompt_context_1 = require("../services/prompt-context");
 const doctor_1 = require("../services/doctor");
 const model_context_1 = require("../services/model-context");
+const model_catalog_1 = require("../services/model-catalog");
 const workspace_diff_1 = require("../services/workspace-diff");
 const commit_plan_1 = require("../services/commit-plan");
+const tool_artifacts_1 = require("../core/tool-artifacts");
+const checkpoint_1 = require("../core/checkpoint");
 const storage_maintenance_1 = require("../services/storage-maintenance");
 const agent_status_1 = require("../runtime/agent-status");
+const loop_budget_1 = require("../runtime/loop-budget");
 // ============================================================================
 // 颜色常量
 // ============================================================================
@@ -63,7 +67,10 @@ const CATEGORY_ORDER = [
     'legacy',
 ];
 function commandUICapabilities(ctx) {
-    return (0, ui_events_1.resolveUiRendererCapabilities)(ctx.uiCapabilities);
+    return (0, ui_view_model_1.createStatusSnapshot)({
+        renderer: ctx.uiRenderer ?? ctx.config.ui?.renderer ?? 'terminal',
+        capabilities: ctx.uiCapabilities,
+    }).renderer.capabilities;
 }
 function formatTokenCount(tokens) {
     if (tokens >= 1000000)
@@ -75,6 +82,129 @@ function formatTokenCount(tokens) {
 function formatThreshold(value) {
     return `${Math.round(value * 100)}%`;
 }
+function formatDurationMs(ms) {
+    if (ms >= 1000)
+        return `${(ms / 1000).toFixed(1)}s`;
+    return `${Math.round(ms)}ms`;
+}
+function formatRendererStatus(ctx) {
+    const snapshot = (0, ui_view_model_1.createStatusSnapshot)({
+        renderer: ctx.uiRenderer ?? ctx.config.ui?.renderer ?? 'terminal',
+        capabilities: ctx.uiCapabilities,
+    });
+    const status = snapshot.renderer.status === 'beta' || (0, config_1.isBetaUIRenderer)(snapshot.renderer.name)
+        ? WARN('beta')
+        : snapshot.renderer.status === 'stable'
+            ? SUCCESS('stable')
+            : snapshot.renderer.status === 'non-interactive'
+                ? DIM('non-interactive')
+                : DIM('custom');
+    return `${BRAND(snapshot.renderer.name)} ${status} ${DIM(snapshot.renderer.capabilityLabels.join(', '))}`;
+}
+function formatModelAliasHelp() {
+    return Object.keys((0, model_catalog_1.getModelCatalogAliases)()).sort().join(', ');
+}
+function formatLoopBudgetSource(stats) {
+    const source = stats.loopBudgetSource ?? 'unknown';
+    if (source === 'config' && stats.loopBudgetBaseProfile) {
+        return `config over ${stats.loopBudgetBaseProfile}`;
+    }
+    return source;
+}
+function formatLoopStatsLines(stats, detail = false) {
+    const lines = [
+        `Finish     ${stats.finishReason}`,
+        `Requests   ${stats.llmRequests} LLM / ${stats.turnsStarted} turns`,
+        `Tools      ${stats.toolCalls} total (${stats.readOnlyToolCalls} read-only, ${stats.unsafeToolCalls} unsafe)`,
+        `Tool bytes ${(0, format_1.formatBytes)(stats.modelVisibleToolBytes)} model-visible / ${(0, format_1.formatBytes)(stats.toolResultBytes)} total`,
+    ];
+    if (stats.summarizedBytes > 0) {
+        lines.push(`Saved      ${(0, format_1.formatBytes)(stats.summarizedBytes)} from model context`);
+    }
+    if (stats.compactTrigger) {
+        lines.push(`Compact    ${stats.compactTrigger}`);
+    }
+    if (stats.localFastPathUsed) {
+        lines.push('Fast path  yes');
+    }
+    if (stats.budgetExceededReason) {
+        lines.push(`Budget     ${stats.budgetExceededReason}`);
+    }
+    if (stats.continuationActions && stats.continuationActions.length > 0) {
+        lines.push(`Next       ${stats.continuationActions.join(', ')}`);
+    }
+    if ((stats.providerRetryCount ?? 0) > 0) {
+        const retryParts = [
+            `${stats.providerRetryCount} retries`,
+            `delay ${formatDurationMs(stats.providerRetryDelayMs ?? 0)}`,
+            stats.providerLastRetryErrorType
+                ? `last ${stats.providerLastRetryErrorType}${stats.providerLastRetryStatus ? `/${stats.providerLastRetryStatus}` : ''}`
+                : undefined,
+        ].filter(Boolean);
+        lines.push(`Provider   ${retryParts.join(', ')}`);
+    }
+    if ((stats.providerFallbackCount ?? 0) > 0 || stats.providerUsingFallback) {
+        const fallbackPath = stats.providerFallbackFromModel && stats.providerFallbackToModel
+            ? `${stats.providerFallbackFromModel} -> ${stats.providerFallbackToModel}`
+            : stats.providerFinalModel
+                ? `final ${stats.providerFinalModel}`
+                : 'active';
+        lines.push(`Fallback   ${fallbackPath}`);
+    }
+    if (typeof stats.verificationClaimAllowed === 'boolean') {
+        const verificationParts = [
+            stats.verificationProfile ?? 'unknown',
+            `required=${stats.verificationRequired ? 'yes' : 'no'}`,
+            `passed=${stats.verificationPassedCommands?.length ?? 0}`,
+            `failed=${stats.verificationFailedCommands?.length ?? 0}`,
+            `missing=${stats.verificationMissingCommands?.length ?? 0}`,
+            `claim=${stats.verificationClaimAllowed ? 'yes' : 'no'}`,
+        ];
+        lines.push(`Verify     ${verificationParts.join(' ')}`);
+    }
+    if (typeof stats.loopBudgetMaxLlmRequests === 'number'
+        || typeof stats.loopBudgetMaxToolCalls === 'number'
+        || typeof stats.loopBudgetMaxModelVisibleBytes === 'number') {
+        const caps = [
+            typeof stats.loopBudgetMaxLlmRequests === 'number'
+                ? `${stats.llmRequests}/${stats.loopBudgetMaxLlmRequests} LLM`
+                : undefined,
+            typeof stats.loopBudgetMaxToolCalls === 'number'
+                ? `${stats.toolCalls}/${stats.loopBudgetMaxToolCalls} tools`
+                : undefined,
+            typeof stats.loopBudgetMaxModelVisibleBytes === 'number'
+                ? `${(0, format_1.formatBytes)(stats.modelVisibleToolBytes)}/${(0, format_1.formatBytes)(stats.loopBudgetMaxModelVisibleBytes)} visible`
+                : undefined,
+            typeof stats.loopBudgetMaxReadOnlyFragmentation === 'number'
+                ? `fragment ${stats.singleReadOnlyStreak}/${stats.loopBudgetMaxReadOnlyFragmentation}`
+                : undefined,
+        ].filter(Boolean);
+        lines.push(`Budget cap ${caps.join(', ')} (${formatLoopBudgetSource(stats)})`);
+    }
+    if (stats.singleReadOnlyStreak > 0 || stats.batchReadSuggestionCount > 0) {
+        lines.push(`Read-only  streak ${stats.singleReadOnlyStreak}, batch_read hints ${stats.batchReadSuggestionCount}`);
+    }
+    if (detail) {
+        lines.push(`Unsafe     ${stats.unsafeToolCalls}`);
+        if (stats.providerRetryErrorTypes && stats.providerRetryErrorTypes.length > 0) {
+            lines.push(`Retry type ${stats.providerRetryErrorTypes.join(', ')}`);
+        }
+        if (stats.verificationFailedCommands && stats.verificationFailedCommands.length > 0) {
+            lines.push(`Failed     ${stats.verificationFailedCommands.join(' && ')}`);
+        }
+        if (stats.verificationMissingCommands && stats.verificationMissingCommands.length > 0) {
+            lines.push(`Missing    ${stats.verificationMissingCommands.join(' && ')}`);
+        }
+        if (stats.verificationSkippedReason) {
+            lines.push(`Verify why ${stats.verificationSkippedReason}`);
+        }
+        if (stats.continuationHint) {
+            lines.push(`Next why   ${stats.continuationHint}`);
+        }
+        lines.push(`Budget hit ${stats.finishReason === 'budget_exceeded' ? 'yes' : 'no'}`);
+    }
+    return lines;
+}
 const CATEGORY_LABELS = {
     workflow: 'Workflow',
     session: 'Session',
@@ -171,6 +301,7 @@ function showStatus(ctx) {
     console.log(`  Model      ${BRAND(modelId)}`);
     console.log(`  Context    ${DIM(`${formatTokenCount(modelContext.contextWindow)} tokens (${modelContext.source}${modelContext.source === 'fuzzy' ? `:${modelContext.matchedId}` : ''})`)}`);
     console.log(`  Compact    ${compactStats.enabled ? SUCCESS('auto') : WARN('off')} ${DIM(`predict ${formatThreshold(compactStats.predictiveCompactThreshold)}, hard ${formatThreshold(compactStats.threshold)}, used ${compactStats.ctxPercent}%`)}`);
+    console.log(`  Renderer   ${formatRendererStatus(ctx)}`);
     console.log();
     console.log(`  Agents     ${SUCCESS(brainStatus.agents.length)} registered`);
     console.log(`  Tasks      ${brainStatus.pendingTasks} pending (${brainStatus.strategy} strategy)`);
@@ -203,15 +334,8 @@ function showStatus(ctx) {
         const stats = snapshot.lastLoopStats;
         console.log();
         console.log(`  Last loop:`);
-        console.log(`    Finish     ${stats.finishReason}`);
-        console.log(`    Requests   ${stats.llmRequests} LLM / ${stats.turnsStarted} turns`);
-        console.log(`    Tools      ${stats.toolCalls} total (${stats.readOnlyToolCalls} read-only, ${stats.unsafeToolCalls} unsafe)`);
-        console.log(`    Tool bytes ${(0, format_1.formatBytes)(stats.modelVisibleToolBytes)} model-visible / ${(0, format_1.formatBytes)(stats.toolResultBytes)} total`);
-        if (stats.summarizedBytes > 0) {
-            console.log(`    Saved      ${(0, format_1.formatBytes)(stats.summarizedBytes)} from model context`);
-        }
-        if (stats.compactTrigger) {
-            console.log(`    Compact    ${stats.compactTrigger}`);
+        for (const line of formatLoopStatsLines(stats)) {
+            console.log(`    ${line}`);
         }
     }
     const harnessState = snapshot.harnessState;
@@ -232,6 +356,533 @@ function showStatus(ctx) {
     console.log();
     return { success: true };
 }
+function handleLoopStats(ctx) {
+    const stats = ctx.store.getSnapshot().lastLoopStats;
+    if (!stats) {
+        console.log('No agent-loop stats recorded yet.');
+        return { success: true };
+    }
+    console.log(HEADER('Agent Loop Stats'));
+    console.log();
+    for (const line of formatLoopStatsLines(stats, true)) {
+        console.log(`  ${line}`);
+    }
+    console.log();
+    console.log(DIM('Use this to spot excessive LLM requests, fragmented read-only tool calls, and local fast-path hits.'));
+    return { success: true };
+}
+function formatTraceEventLine(event) {
+    const time = new Date(event.timestamp).toLocaleTimeString();
+    const prefix = `${DIM(time)} ${ACCENT(event.type)}`;
+    switch (event.type) {
+        case 'turn_start':
+            return `${prefix} input=${(0, format_1.formatBytes)(event.inputBytes ?? 0)}${event.localFastPathUsed ? ' fast-path' : ''}${event.note ? ` ${DIM(event.note)}` : ''}`;
+        case 'request_start':
+            return `${prefix} model=${event.model ?? 'unknown'} iteration=${event.turn ?? '?'}`;
+        case 'provider_retry': {
+            const parts = [
+                `count=${event.providerRetryCount ?? 0}`,
+                `delay=${formatDurationMs(event.providerRetryDelayMs ?? 0)}`,
+                event.providerLastRetryErrorType
+                    ? `last=${event.providerLastRetryErrorType}${event.providerLastRetryStatus ? `/${event.providerLastRetryStatus}` : ''}`
+                    : '',
+                event.providerRetryErrorTypes?.length ? `types=${event.providerRetryErrorTypes.join(',')}` : '',
+                event.providerFinalModel ? `final=${event.providerFinalModel}` : '',
+            ].filter(Boolean);
+            return `${prefix} ${parts.join(' ')}`;
+        }
+        case 'provider_fallback': {
+            const path = event.providerFallbackFromModel && event.providerFallbackToModel
+                ? `${event.providerFallbackFromModel}->${event.providerFallbackToModel}`
+                : event.providerFinalModel ?? 'active';
+            const parts = [
+                `count=${event.providerFallbackCount ?? 0}`,
+                `path=${path}`,
+                `using=${event.providerUsingFallback ? 'yes' : 'no'}`,
+            ];
+            return `${prefix} ${parts.join(' ')}`;
+        }
+        case 'prompt_assembly': {
+            const parts = [
+                `model=${event.promptModelId ?? 'unknown'}`,
+                `tokens=${event.promptEstimatedTokens ?? 0}/${event.promptBudgetTokens ?? 0}`,
+                `core=${event.promptCoreTokens ?? 0}`,
+                `evidenceBudget=${event.promptEvidenceBudgetTokens ?? 0}`,
+                `recentBudget=${event.promptRecentTurnBudgetTokens ?? 0}`,
+                `included=${event.promptIncludedEvidenceCount ?? 0}`,
+                `omitted=${event.promptOmittedEvidenceCount ?? 0}`,
+            ];
+            const sections = event.promptSections?.length
+                ? ` sections=${event.promptSections.join(',')}`
+                : '';
+            const evidence = event.promptIncludedEvidence?.length
+                ? ` evidence=${event.promptIncludedEvidence.slice(0, 6).join(', ')}${event.promptIncludedEvidence.length > 6 ? ', ...' : ''}`
+                : '';
+            return `${prefix} ${parts.join(' ')}${sections ? DIM(sections) : ''}${evidence ? ` ${DIM(evidence)}` : ''}`;
+        }
+        case 'assistant_tool_calls':
+            return `${prefix} calls=${event.toolCallCount ?? 0} assistant=${(0, format_1.formatBytes)(event.contentBytes ?? 0)}`;
+        case 'checkpoint': {
+            const files = event.checkpointFiles?.length
+                ? ` files=${event.checkpointFiles.slice(0, 6).join(', ')}${event.checkpointFiles.length > 6 ? ', ...' : ''}`
+                : '';
+            const targets = event.workspaceFiles?.length && !files
+                ? ` targets=${event.workspaceFiles.slice(0, 6).join(', ')}${event.workspaceFiles.length > 6 ? ', ...' : ''}`
+                : '';
+            return `${prefix} id=${event.checkpointId ?? 'unknown'} saved=${event.checkpointFileCount ?? 0}${files}${targets}${event.note ? ` ${DIM(event.note)}` : ''}`;
+        }
+        case 'tool_call':
+            return `${prefix} ${event.name ?? 'tool'}${event.argsSummary ? ` ${DIM(event.argsSummary)}` : ''}${event.argsArtifactId ? ` ${DIM(`args=/artifacts show ${event.argsArtifactId} --full${event.argsBytes ? ` (${(0, format_1.formatBytes)(event.argsBytes)})` : ''}`)}` : ''}${event.callId ? ` ${DIM(event.callId)}` : ''}`;
+        case 'permission_decision': {
+            const status = event.permissionApproved ? SUCCESS('approved') : ERROR('denied');
+            const parts = [
+                `source=${event.permissionSource ?? 'unknown'}`,
+                `behavior=${event.permissionBehavior ?? 'unknown'}`,
+            ];
+            if (typeof event.permissionDuration === 'number') {
+                parts.push(`${event.permissionDuration}ms`);
+            }
+            return `${prefix} ${status} ${event.name ?? 'tool'} ${DIM(parts.join(' '))}${event.permissionReason ? ` ${DIM(event.permissionReason)}` : ''}`;
+        }
+        case 'tool_result': {
+            const status = event.success === false ? ERROR('error') : SUCCESS('ok');
+            const bytes = [
+                `output=${(0, format_1.formatBytes)(event.outputBytes ?? 0)}`,
+                `model=${(0, format_1.formatBytes)(event.modelVisibleBytes ?? 0)}`,
+            ];
+            if (event.artifactId)
+                bytes.push(`artifact=${event.artifactId}`);
+            return `${prefix} ${status} ${event.name ?? 'tool'} ${DIM(`${event.duration ?? 0}ms`)} ${DIM(bytes.join(' '))}${event.error ? ` ${ERROR(event.error)}` : ''}`;
+        }
+        case 'message':
+            return `${prefix} assistant=${(0, format_1.formatBytes)(event.contentBytes ?? 0)}`;
+        case 'strategy_exhausted':
+            return `${prefix}${event.note ? ` ${WARN(event.note)}` : ''}`;
+        case 'complete': {
+            const stats = [
+                `finish=${event.finishReason ?? 'unknown'}`,
+                `llm=${typeof event.llmRequests === 'number' ? event.llmRequests : 'unknown'}`,
+                `tools=${typeof event.toolCalls === 'number' ? event.toolCalls : 'unknown'}`,
+            ];
+            if (event.loopBudgetSource
+                || typeof event.loopBudgetMaxLlmRequests === 'number'
+                || typeof event.loopBudgetMaxToolCalls === 'number'
+                || typeof event.loopBudgetMaxModelVisibleBytes === 'number') {
+                const source = event.loopBudgetSource === 'config' && event.loopBudgetBaseProfile
+                    ? `config/${event.loopBudgetBaseProfile}`
+                    : event.loopBudgetSource ?? 'unknown';
+                const caps = [
+                    typeof event.loopBudgetMaxLlmRequests === 'number'
+                        ? `${typeof event.llmRequests === 'number' ? event.llmRequests : '?'}/${event.loopBudgetMaxLlmRequests}llm`
+                        : undefined,
+                    typeof event.loopBudgetMaxToolCalls === 'number'
+                        ? `${typeof event.toolCalls === 'number' ? event.toolCalls : '?'}/${event.loopBudgetMaxToolCalls}tools`
+                        : undefined,
+                    typeof event.loopBudgetMaxModelVisibleBytes === 'number'
+                        ? `${(0, format_1.formatBytes)(event.loopBudgetMaxModelVisibleBytes)}visible`
+                        : undefined,
+                    typeof event.loopBudgetMaxReadOnlyFragmentation === 'number'
+                        ? `frag=${event.loopBudgetMaxReadOnlyFragmentation}`
+                        : undefined,
+                    event.loopBudgetConfigOverride ? 'override=yes' : undefined,
+                ].filter(Boolean);
+                stats.push(`budgetProfile=${source}${caps.length ? `(${caps.join(',')})` : ''}`);
+            }
+            if (event.budgetExceededReason)
+                stats.push(`budget=${event.budgetExceededReason}`);
+            if (event.continuationActions?.length)
+                stats.push(`next=${event.continuationActions.join(',')}`);
+            if (event.continuationHint)
+                stats.push(`hint=${event.continuationHint}`);
+            if (event.localFastPathUsed)
+                stats.push('fast-path=yes');
+            return `${prefix} ${stats.join(' ')}`;
+        }
+        case 'local_fast_path':
+            return `${prefix} ${event.name ?? 'tool'}${event.argsSummary ? ` ${DIM(event.argsSummary)}` : ''}${event.argsArtifactId ? ` ${DIM(`args=/artifacts show ${event.argsArtifactId} --full${event.argsBytes ? ` (${(0, format_1.formatBytes)(event.argsBytes)})` : ''}`)}` : ''}${event.note ? ` ${DIM(event.note)}` : ''}`;
+        case 'workspace_snapshot': {
+            const state = event.workspaceGitAvailable === false
+                ? WARN('not-git')
+                : event.workspaceDirty ? WARN('dirty') : SUCCESS('clean');
+            const files = event.workspaceFiles?.length
+                ? ` files=${event.workspaceFiles.slice(0, 6).join(', ')}${event.workspaceFiles.length > 6 ? ', ...' : ''}`
+                : '';
+            return `${prefix} ${event.workspacePhase ?? 'unknown'} ${state} count=${event.workspaceFileCount ?? 0}${event.workspaceBranch ? ` branch=${event.workspaceBranch}` : ''}${files}${event.error ? ` ${ERROR(event.error)}` : ''}`;
+        }
+        case 'workspace_delta': {
+            const added = event.workspaceNewByTurn ?? [];
+            const changed = event.workspaceChangedByTurn ?? [];
+            const modifiedPreExisting = event.workspaceModifiedPreExistingByTurn ?? [];
+            const resolved = event.workspaceResolvedByTurn ?? [];
+            const parts = [
+                `after=${event.workspaceFileCount ?? 0}`,
+                `new=${added.length}`,
+                `changed=${changed.length}`,
+                `pre-existing-modified=${modifiedPreExisting.length}`,
+                `resolved=${resolved.length}`,
+            ];
+            const details = [
+                added.length ? `new: ${added.slice(0, 6).join(', ')}${added.length > 6 ? ', ...' : ''}` : '',
+                changed.length ? `changed: ${changed.slice(0, 6).join(', ')}${changed.length > 6 ? ', ...' : ''}` : '',
+                modifiedPreExisting.length ? `pre-existing modified: ${modifiedPreExisting.slice(0, 6).join(', ')}${modifiedPreExisting.length > 6 ? ', ...' : ''}` : '',
+                resolved.length ? `resolved: ${resolved.slice(0, 6).join(', ')}${resolved.length > 6 ? ', ...' : ''}` : '',
+            ].filter(Boolean).join(' | ');
+            return `${prefix} ${parts.join(' ')}${details ? ` ${DIM(details)}` : ''}${event.note ? ` ${DIM(event.note)}` : ''}`;
+        }
+        case 'verification_profile': {
+            const commands = event.verificationCommands ?? [];
+            const files = event.verificationChangedFiles ?? [];
+            const details = [
+                `profile=${event.verificationProfile ?? 'unknown'}`,
+                `required=${event.verificationRequired === false ? 'no' : 'yes'}`,
+                `commands=${commands.length}`,
+                `files=${files.length}`,
+            ];
+            if (event.verificationRisky) {
+                details.push(`risk=${WARN('high')}(${files.length} files)`);
+            }
+            const commandPreview = commands.length
+                ? ` cmds: ${commands.slice(0, 4).join(' && ')}${commands.length > 4 ? ' && ...' : ''}`
+                : '';
+            return `${prefix} ${details.join(' ')}${commandPreview ? ` ${DIM(commandPreview)}` : ''}${event.note ? ` ${DIM(event.note)}` : ''}`;
+        }
+        case 'verification_result': {
+            const status = event.verificationPassed === true ? SUCCESS('passed') : ERROR('failed');
+            const command = event.verificationCommand ?? 'unknown';
+            return `${prefix} ${status} ${command}${typeof event.outputBytes === 'number' ? ` ${DIM((0, format_1.formatBytes)(event.outputBytes))}` : ''}${event.error ? ` ${ERROR(event.error)}` : ''}`;
+        }
+        case 'verification_summary': {
+            const passed = event.verificationPassedCommands?.length ?? 0;
+            const failed = event.verificationFailedCommands?.length ?? 0;
+            const missing = event.verificationMissingCommands?.length ?? 0;
+            const parts = [
+                `profile=${event.verificationProfile ?? 'unknown'}`,
+                `required=${event.verificationRequired === false ? 'no' : 'yes'}`,
+                `passed=${passed}`,
+                `failed=${failed}`,
+                `missing=${missing}`,
+                `claimAllowed=${event.verificationClaimAllowed ? 'yes' : 'no'}`,
+            ];
+            const missingPreview = missing > 0
+                ? ` missing: ${(event.verificationMissingCommands ?? []).slice(0, 4).join(' && ')}${missing > 4 ? ' && ...' : ''}`
+                : '';
+            return `${prefix} ${parts.join(' ')}${missingPreview ? ` ${DIM(missingPreview)}` : ''}${event.note ? ` ${DIM(event.note)}` : ''}`;
+        }
+        case 'aborted':
+            return `${prefix}${event.note ? ` ${WARN(event.note)}` : ''}`;
+        case 'error':
+            return `${prefix} ${ERROR(event.error ?? 'unknown error')}`;
+        default:
+            return prefix;
+    }
+}
+function handleTrace(ctx, args = '') {
+    const session = ctx.getSession?.() ?? (ctx.sessionId ? (0, session_storage_1.loadSessionMeta)(ctx.sessionId) : null);
+    if (!session) {
+        console.log(ERROR('No active session.'));
+        console.log(DIM('Use /resume <session-id> first, or start a chat turn to create a session.'));
+        return { success: false };
+    }
+    const events = (0, session_storage_1.readSessionTraceEvents)(session.id);
+    if (events.length === 0) {
+        console.log(DIM(`No trace events recorded for session ${session.id.slice(0, 8)} yet.`));
+        return { success: true };
+    }
+    const ref = args.trim();
+    const requestedTurnId = ref && ref !== 'latest' ? ref : events[events.length - 1].turnId;
+    const turnEvents = events.filter(event => event.turnId === requestedTurnId);
+    if (turnEvents.length === 0) {
+        const recentTurnIds = [...new Set(events.map(event => event.turnId))].slice(-8).reverse();
+        console.log(ERROR(`Trace turn not found: ${requestedTurnId}`));
+        console.log(DIM(`Recent turns: ${recentTurnIds.join(', ')}`));
+        return { success: false };
+    }
+    console.log(HEADER(`Trace ${requestedTurnId}`));
+    console.log(DIM(`Session ${session.id}  Events ${turnEvents.length}`));
+    console.log(DIM('─'.repeat(40)));
+    for (const event of turnEvents) {
+        console.log(`  ${formatTraceEventLine(event)}`);
+    }
+    console.log();
+    console.log(DIM('Trace stores metadata only; full transcript and tool output stay in session/artifacts.'));
+    return { success: true };
+}
+function latestToolTrace(events) {
+    for (let index = events.length - 1; index >= 0; index--) {
+        const event = events[index];
+        if (event.type !== 'tool_result' && event.type !== 'tool_call')
+            continue;
+        const callId = event.callId;
+        const result = event.type === 'tool_result' ? event : undefined;
+        const call = event.type === 'tool_call'
+            ? event
+            : callId
+                ? events.slice(0, index).reverse().find(candidate => candidate.type === 'tool_call' && candidate.callId === callId)
+                : undefined;
+        return { call, result };
+    }
+    return null;
+}
+function parseLastToolArgs(args = '') {
+    const parts = args.trim().split(/\s+/).filter(Boolean);
+    return {
+        full: parts.includes('--full'),
+        preview: !parts.includes('--no-preview'),
+    };
+}
+function printLastToolArtifactPreview(projectPath, label, artifactId, full) {
+    if (!artifactId)
+        return;
+    const artifact = (0, tool_artifacts_1.findArtifact)(projectPath, artifactId);
+    if (!artifact) {
+        console.log(`  ${label} preview ${DIM(`artifact not found or ambiguous: ${artifactId}`)}`);
+        return;
+    }
+    const content = (0, tool_artifacts_1.retrieveArtifact)(artifact.path);
+    if (content == null) {
+        console.log(`  ${label} preview ${DIM(`artifact cannot be read: ${artifact.id}`)}`);
+        return;
+    }
+    const redacted = (0, session_storage_1.redactTraceText)(content);
+    const maxPreviewBytes = 4 * 1024;
+    const shouldTruncate = !full && Buffer.byteLength(redacted, 'utf8') > maxPreviewBytes;
+    const preview = shouldTruncate
+        ? Buffer.from(redacted, 'utf8').subarray(0, maxPreviewBytes).toString('utf8')
+        : redacted;
+    console.log(`  ${label} preview`);
+    console.log(`  ${DIM('─'.repeat(40))}`);
+    for (const line of preview.split('\n')) {
+        console.log(`  ${line}`);
+    }
+    if (shouldTruncate) {
+        console.log(`  ${DIM(`... preview truncated at ${(0, format_1.formatBytes)(maxPreviewBytes)}. Use /last-tool --full or /artifacts show ${artifact.id} --full.`)}`);
+    }
+}
+function lastToolInputLabel(toolName) {
+    return toolName === 'exec_command' ? 'Command' : 'Args';
+}
+function lastToolField(label) {
+    return label.padEnd(13, ' ');
+}
+function handleLastTool(ctx, args = '') {
+    const options = parseLastToolArgs(args);
+    const session = ctx.getSession?.() ?? (ctx.sessionId ? (0, session_storage_1.loadSessionMeta)(ctx.sessionId) : null);
+    if (!session) {
+        console.log(ERROR('No active session.'));
+        console.log(DIM('Use /resume <session-id> first, or start a chat turn to create a session.'));
+        return { success: false };
+    }
+    const events = (0, session_storage_1.readSessionTraceEvents)(session.id);
+    const latest = latestToolTrace(events);
+    if (!latest) {
+        console.log(DIM(`No tool trace events recorded for session ${session.id.slice(0, 8)} yet.`));
+        return { success: true };
+    }
+    const call = latest.call;
+    const result = latest.result;
+    const source = result ?? call;
+    const argsSource = call ?? result;
+    const name = source?.name ?? 'tool';
+    const inputLabel = lastToolInputLabel(name);
+    const callId = source?.callId ?? call?.callId;
+    const status = result ? (result.success === false ? ERROR('error') : SUCCESS('ok')) : WARN('running');
+    console.log(HEADER('Last Tool'));
+    console.log(DIM('─'.repeat(40)));
+    console.log(`  Tool        ${ACCENT(name)}`);
+    console.log(`  Turn        ${DIM(source?.turnId ?? 'unknown')}`);
+    if (callId)
+        console.log(`  Call        ${DIM(callId)}`);
+    console.log(`  Status      ${status}`);
+    if (typeof result?.duration === 'number') {
+        console.log(`  Time        ${DIM(formatDurationMs(result.duration))}`);
+    }
+    if (argsSource?.argsSummary) {
+        console.log(`  ${lastToolField(inputLabel)}${DIM((0, session_storage_1.redactTraceText)(argsSource.argsSummary))}`);
+    }
+    if (argsSource?.argsArtifactId) {
+        const size = typeof argsSource.argsBytes === 'number' ? ` (${(0, format_1.formatBytes)(argsSource.argsBytes)})` : '';
+        console.log(`  ${lastToolField(`${inputLabel} full`)}${DIM(`/artifacts show ${argsSource.argsArtifactId} --full${size}`)}`);
+    }
+    if (typeof result?.outputBytes === 'number') {
+        const modelVisible = typeof result.modelVisibleBytes === 'number'
+            ? `, model-visible ${(0, format_1.formatBytes)(result.modelVisibleBytes)}`
+            : '';
+        console.log(`  Output      ${DIM(`${(0, format_1.formatBytes)(result.outputBytes)}${modelVisible}`)}`);
+    }
+    if (result?.artifactId) {
+        console.log(`  Output full ${DIM(`/artifacts show ${result.artifactId} --full`)}`);
+    }
+    if (result?.error) {
+        console.log(`  Error       ${ERROR((0, session_storage_1.redactTraceText)(result.error))}`);
+    }
+    if (options.preview) {
+        const projectPath = session.projectPath || ctx.cwd;
+        printLastToolArtifactPreview(projectPath, inputLabel, argsSource?.argsArtifactId, options.full);
+        printLastToolArtifactPreview(projectPath, 'Output', result?.artifactId, options.full);
+    }
+    console.log();
+    console.log(DIM('Use /last-tool --full for redacted full previews, --no-preview for metadata only, or /trace latest for the ordered turn timeline.'));
+    return { success: true };
+}
+function formatDateTime(timestamp) {
+    return new Date(timestamp).toLocaleString();
+}
+function parseArtifactArgs(args) {
+    const parts = args.trim().split(/\s+/).filter(Boolean);
+    let full = false;
+    let limit = 20;
+    const positional = [];
+    for (let i = 0; i < parts.length; i++) {
+        const part = parts[i];
+        if (part === '--full') {
+            full = true;
+            continue;
+        }
+        if ((part === '--limit' || part === '-n') && parts[i + 1]) {
+            const parsed = Number(parts[i + 1]);
+            if (Number.isInteger(parsed) && parsed > 0) {
+                limit = Math.min(parsed, 200);
+            }
+            i++;
+            continue;
+        }
+        positional.push(part);
+    }
+    if (positional[0] === 'show' || positional[0] === 'cat') {
+        return { action: 'show', ref: positional[1], full, limit };
+    }
+    if (positional[0]) {
+        return { action: 'show', ref: positional[0], full, limit };
+    }
+    return { action: 'list', full, limit };
+}
+function printArtifactPreview(content, full) {
+    const maxPreviewBytes = 16 * 1024;
+    if (full || Buffer.byteLength(content, 'utf8') <= maxPreviewBytes) {
+        console.log(content);
+        return;
+    }
+    const preview = Buffer.from(content, 'utf8').subarray(0, maxPreviewBytes).toString('utf8');
+    console.log(preview);
+    console.log();
+    console.log(DIM(`... preview truncated at ${(0, format_1.formatBytes)(maxPreviewBytes)}. Use /artifacts show <id> --full for full output.`));
+}
+function formatArtifactPathForDisplay(artifactPath) {
+    return (0, session_storage_1.redactTraceText)(artifactPath);
+}
+function handleArtifacts(ctx, args = '') {
+    const parsed = parseArtifactArgs(args);
+    if (parsed.action === 'list') {
+        const artifacts = (0, tool_artifacts_1.listArtifacts)(ctx.cwd, parsed.limit);
+        console.log(HEADER('Artifacts'));
+        console.log(DIM('─'.repeat(40)));
+        if (artifacts.length === 0) {
+            console.log(DIM('No artifacts found for this project.'));
+            return { success: true };
+        }
+        for (const artifact of artifacts) {
+            console.log(`${ACCENT(artifact.id)} ${DIM(artifact.toolName)} ${(0, format_1.formatBytes)(artifact.outputBytes)}`);
+            console.log(`  ${DIM(formatDateTime(artifact.modifiedAt))}`);
+            console.log(`  ${DIM(formatArtifactPathForDisplay(artifact.path))}`);
+        }
+        console.log();
+        console.log(DIM('Use /artifacts show <id|prefix> to preview, or add --full for full output.'));
+        return { success: true };
+    }
+    if (!parsed.ref) {
+        console.log(ERROR('Usage: /artifacts show <id|prefix> [--full]'));
+        return { success: false };
+    }
+    const artifact = (0, tool_artifacts_1.findArtifact)(ctx.cwd, parsed.ref);
+    if (!artifact) {
+        console.log(ERROR(`Artifact not found or ambiguous: ${parsed.ref}`));
+        console.log(DIM('Run /artifacts to list available artifact ids.'));
+        return { success: false };
+    }
+    const content = (0, tool_artifacts_1.retrieveArtifact)(artifact.path);
+    if (content == null) {
+        console.log(ERROR(`Artifact exists but cannot be read: ${artifact.id}`));
+        console.log(DIM(formatArtifactPathForDisplay(artifact.path)));
+        return { success: false };
+    }
+    console.log(HEADER(`Artifact ${artifact.id}`));
+    console.log(DIM(`Tool ${artifact.toolName}  Size ${(0, format_1.formatBytes)(artifact.outputBytes)}  Modified ${formatDateTime(artifact.modifiedAt)}`));
+    console.log(DIM(formatArtifactPathForDisplay(artifact.path)));
+    console.log(DIM('─'.repeat(40)));
+    printArtifactPreview(content, parsed.full);
+    return { success: true };
+}
+function findCheckpointByRef(ctx, ref) {
+    const checkpoints = (0, checkpoint_1.listCheckpoints)(ctx.cwd);
+    const exact = checkpoints.find(checkpoint => checkpoint.turnId === ref);
+    if (exact)
+        return { checkpoint: exact, ambiguous: false };
+    const matches = checkpoints.filter(checkpoint => checkpoint.turnId.startsWith(ref));
+    return {
+        checkpoint: matches.length === 1 ? matches[0] : undefined,
+        ambiguous: matches.length > 1,
+    };
+}
+function handleCheckpoint(ctx, args = '') {
+    const tokens = args.trim().split(/\s+/).filter(Boolean);
+    const action = tokens[0] ?? 'list';
+    if (action === 'list') {
+        const checkpoints = (0, checkpoint_1.listCheckpoints)(ctx.cwd);
+        console.log(HEADER('Checkpoints'));
+        console.log(DIM('─'.repeat(40)));
+        if (checkpoints.length === 0) {
+            console.log(DIM('No checkpoints found for this project.'));
+            return { success: true };
+        }
+        for (const checkpoint of checkpoints.slice(0, 20)) {
+            console.log(`${ACCENT(checkpoint.turnId)} ${DIM(formatDateTime(checkpoint.createdAt))}`);
+            const files = checkpoint.files.map(file => file.path).slice(0, 8).join(', ');
+            console.log(`  ${DIM(`${checkpoint.files.length} file(s)${files ? `: ${files}` : ''}`)}`);
+        }
+        console.log();
+        console.log(DIM('Use /checkpoint restore <turn-id|prefix> to preview, then add --yes to restore.'));
+        return { success: true };
+    }
+    if (action !== 'restore') {
+        console.log(ERROR('Usage: /checkpoint [list|restore <turn-id|prefix> [--yes]]'));
+        return { success: false };
+    }
+    const ref = tokens.find(token => token !== 'restore' && token !== '--yes');
+    const confirmed = tokens.includes('--yes');
+    if (!ref) {
+        console.log(ERROR('Usage: /checkpoint restore <turn-id|prefix> [--yes]'));
+        return { success: false };
+    }
+    const { checkpoint, ambiguous } = findCheckpointByRef(ctx, ref);
+    if (!checkpoint) {
+        console.log(ERROR(ambiguous
+            ? `Checkpoint prefix is ambiguous: ${ref}`
+            : `Checkpoint not found: ${ref}`));
+        console.log(DIM('Run /checkpoint to list available checkpoint ids.'));
+        return { success: false };
+    }
+    if (!confirmed) {
+        console.log(HEADER(`Checkpoint ${checkpoint.turnId}`));
+        console.log(DIM(`${formatDateTime(checkpoint.createdAt)}  ${checkpoint.files.length} file(s)`));
+        for (const file of checkpoint.files.slice(0, 20)) {
+            console.log(`  ${file.path} ${DIM((0, format_1.formatBytes)(file.sizeBytes))}`);
+        }
+        console.log();
+        console.log(WARN(`This will overwrite current files from checkpoint ${checkpoint.turnId}.`));
+        console.log(DIM(`Run /checkpoint restore ${checkpoint.turnId} --yes to restore.`));
+        return { success: true };
+    }
+    const result = (0, checkpoint_1.restoreCheckpoint)(ctx.cwd, checkpoint.turnId);
+    if (result.error) {
+        console.log(ERROR(result.error));
+        return { success: false, error: result.error };
+    }
+    console.log(SUCCESS(`Restored ${result.restored.length} file(s) from checkpoint ${checkpoint.turnId}.`));
+    for (const file of result.restored.slice(0, 20)) {
+        console.log(`  ${file}`);
+    }
+    return { success: true, output: result.restored.join('\n') };
+}
 function snapshotCurrentModel(ctx) {
     return ctx.store.getSnapshot().currentModel || ctx.config.model;
 }
@@ -367,6 +1018,47 @@ function showHarness(ctx, args = '') {
             console.log(DIM('    (no contract established)'));
         }
         console.log();
+        // Context source
+        console.log(HEADER('  Context Source'));
+        const session = ctx.getSession?.() ?? (ctx.sessionId ? (0, session_storage_1.loadSessionMeta)(ctx.sessionId) : null);
+        const isRestored = session?.transcriptDisplayStartTime != null;
+        const isCompactActive = Boolean(state.promptAssemblyStats);
+        console.log(`    Root       ${ACCENT(state.rootObjective || contract?.objective || '(none)')}`);
+        console.log(`    Active     ${DIM(state.activeInstruction || contract?.userIntent || '(none)')}`);
+        console.log(`    Source     ${isRestored ? WARN('restored session') : DIM('live turn')}`);
+        if (isRestored && session) {
+            const restoredTime = session.transcriptDisplayStartTime
+                ? new Date(session.transcriptDisplayStartTime).toLocaleString()
+                : 'unknown';
+            console.log(`    Restored   ${DIM(restoredTime)}`);
+        }
+        if (isCompactActive) {
+            console.log(`    Compact    ${SUCCESS('active')}`);
+        }
+        console.log();
+        // Evidence index summary
+        console.log(HEADER('  Evidence Index'));
+        const evidenceItems = state.evidenceIndex?.length ?? 0;
+        const evidenceKinds = new Map();
+        if (state.evidenceIndex) {
+            for (const item of state.evidenceIndex) {
+                const kind = item.kind || 'unknown';
+                evidenceKinds.set(kind, (evidenceKinds.get(kind) || 0) + 1);
+            }
+        }
+        console.log(`    Total      ${ACCENT(String(evidenceItems))} items`);
+        if (evidenceKinds.size > 0) {
+            const kinds = Array.from(evidenceKinds.entries())
+                .sort((a, b) => b[1] - a[1])
+                .slice(0, 10);
+            for (const [kind, count] of kinds) {
+                console.log(`      ${DIM(kind.padEnd(16))} ${count}`);
+            }
+        }
+        else {
+            console.log(DIM('      (no evidence records yet)'));
+        }
+        console.log();
         // Intent history
         console.log(HEADER('  Recent Intents'));
         const intents = state.intentHistory?.slice(-5) ?? [];
@@ -498,51 +1190,13 @@ function showConfig(ctx) {
     return { success: true };
 }
 function handleModel(ctx, args) {
-    // 模型别名映射
-    const MODEL_ALIASES = {
-        'opus': 'claude-opus-4-7',
-        'sonnet': 'claude-sonnet-4-6',
-        'haiku': 'claude-haiku-4-5-20251001',
-        'claude': 'claude-sonnet-4-6',
-        'gpt4': 'gpt-4o',
-        'gpt4o': 'gpt-4o',
-        'gpt35': 'gpt-3.5-turbo',
-        // Bailian (coding.dashscope.aliyuncs.com) — OpenAI-compatible
-        'qwen': 'qwen3.5-plus',
-        'qwenplus': 'qwen3.5-plus',
-        'qwen36': 'qwen3.6-plus',
-        'qwenmax': 'qwen3-max-2026-01-23',
-        'coder': 'qwen3-coder-plus',
-        'codernext': 'qwen3-coder-next',
-        'glm': 'glm-5',
-        'glm47': 'glm-4.7',
-        'kimi': 'kimi-k2.5',
-        'minimax': 'MiniMax-M2.5',
-    };
-    // 可用模型列表
-    const AVAILABLE_MODELS = [
-        { name: 'claude-opus-4-7', alias: 'opus', provider: 'Anthropic' },
-        { name: 'claude-sonnet-4-6', alias: 'sonnet', provider: 'Anthropic' },
-        { name: 'claude-haiku-4-5-20251001', alias: 'haiku', provider: 'Anthropic' },
-        { name: 'gpt-4o', alias: 'gpt4o', provider: 'OpenAI' },
-        { name: 'gpt-3.5-turbo', alias: 'gpt35', provider: 'OpenAI' },
-        { name: 'glm-5', alias: 'glm', provider: 'Bailian (Zhipu)' },
-        { name: 'glm-4.7', alias: 'glm47', provider: 'Bailian (Zhipu)' },
-        { name: 'qwen3.5-plus', alias: 'qwen', provider: 'Bailian (Alibaba)' },
-        { name: 'qwen3.6-plus', alias: 'qwen36', provider: 'Bailian (Alibaba)' },
-        { name: 'qwen3-max-2026-01-23', alias: 'qwenmax', provider: 'Bailian (Alibaba)' },
-        { name: 'qwen3-coder-plus', alias: 'coder', provider: 'Bailian (Alibaba)' },
-        { name: 'qwen3-coder-next', alias: 'codernext', provider: 'Bailian (Alibaba)' },
-        { name: 'kimi-k2.5', alias: 'kimi', provider: 'Bailian (Moonshot)' },
-        { name: 'MiniMax-M2.5', alias: 'minimax', provider: 'Bailian (MiniMax)' },
-    ];
     const trimmedArgs = args.trim().toLowerCase();
     // 显示当前模型
     if (!args || trimmedArgs === '?' || trimmedArgs === 'info') {
         console.log();
         if (ctx.llm) {
             const currentModel = ctx.llm.getModel();
-            const aliasEntry = AVAILABLE_MODELS.find(m => m.name === currentModel || m.alias === currentModel);
+            const aliasEntry = (0, model_catalog_1.getModelCatalogEntry)(currentModel);
             const contextInfo = (0, model_context_1.resolveModelContext)(currentModel);
             const compactStats = (0, auto_compact_1.getAutoCompact)({ modelId: currentModel }).getStats();
             console.log(HEADER('Current Model'));
@@ -571,12 +1225,25 @@ function handleModel(ctx, args) {
         console.log(HEADER('Available Models'));
         console.log(DIM('─'.repeat(40)));
         const currentModel = ctx.llm?.getModel() || '';
-        for (const m of AVAILABLE_MODELS) {
-            const isCurrent = m.name === currentModel || m.alias === currentModel;
-            const marker = isCurrent ? SUCCESS('●') : DIM('○');
-            const contextInfo = (0, model_context_1.resolveModelContext)(m.name);
-            console.log(`  ${marker} ${ACCENT(m.name)} ${DIM(`(${m.alias})`)} ${DIM(`${formatTokenCount(contextInfo.contextWindow)} ctx`)} ${isCurrent ? BRAND('(current)') : ''}`);
-            console.log(`      ${DIM(m.provider)}`);
+        const modelPicker = (0, ui_view_model_1.createModelPickerState)({
+            currentModel,
+            models: (0, model_catalog_1.listModelCatalogEntries)().map(model => {
+                const contextInfo = (0, model_context_1.resolveModelContext)(model.name);
+                return {
+                    ...model,
+                    contextWindow: contextInfo.contextWindow,
+                    maxOutputTokens: contextInfo.maxOutputTokens,
+                    source: contextInfo.source,
+                };
+            }),
+        });
+        for (const item of modelPicker.visibleItems) {
+            const marker = item.isCurrent ? SUCCESS('●') : DIM('○');
+            const alias = item.alias ? `(${item.alias})` : '';
+            const context = `${formatTokenCount(item.contextWindow ?? 0)} ctx`;
+            const current = item.isCurrent ? BRAND('(current)') : '';
+            console.log(`  ${marker} ${ACCENT(item.name)} ${DIM(alias)} ${DIM(context)} ${current}`);
+            console.log(`      ${DIM(item.provider ?? 'unknown')}`);
         }
         console.log();
         console.log(DIM('Use /model <name|alias> to switch, e.g. /model sonnet'));
@@ -594,7 +1261,7 @@ function handleModel(ctx, args) {
         console.log(`  ${ACCENT('/model <name>')}    Switch to specific model`);
         console.log(`  ${ACCENT('/model <alias>')}   Switch using alias (opus, sonnet, haiku)`);
         console.log();
-        console.log(DIM('Aliases: opus, sonnet, haiku, gpt4o, qwen, glm'));
+        console.log(DIM(`Aliases: ${formatModelAliasHelp()}`));
         console.log();
         return { success: true };
     }
@@ -605,7 +1272,7 @@ function handleModel(ctx, args) {
         return { success: false };
     }
     // 解析别名
-    const resolvedModel = MODEL_ALIASES[trimmedArgs] || args.trim();
+    const resolvedModel = (0, model_catalog_1.resolveModelAlias)(args);
     ctx.llm.setModel(resolvedModel);
     (0, auto_compact_1.getAutoCompact)({ modelId: resolvedModel });
     ctx.store.setState({ currentModel: resolvedModel });
@@ -917,6 +1584,7 @@ async function handleChat(ctx, input) {
             abortSignal: ctx.abortSignal,
             harness,
             input,
+            loopBudget: (0, loop_budget_1.resolveRuntimeLoopBudget)(input, ctx.config, harness.toJSON()),
         })) {
             switch (event.type) {
                 case 'request_start':
@@ -1383,6 +2051,7 @@ async function handleCompact(ctx, args) {
         console.log();
         return { success: true };
     }
+    console.log(DIM((0, agent_status_1.compactStatus)()));
     try {
         const autoCompact = (0, auto_compact_1.getAutoCompact)();
         autoCompact.configure({
@@ -1398,7 +2067,7 @@ async function handleCompact(ctx, args) {
         const percent = Math.round((reduction / history.length) * 100);
         const sessionId = ctx.getSession?.()?.id ?? ctx.sessionId;
         if (sessionId) {
-            (0, session_storage_1.markSessionTranscriptDisplayStart)(sessionId);
+            (0, session_storage_1.persistSessionCompactHistory)(sessionId, compacted);
         }
         console.log(SUCCESS(`✔ Compacted ${history.length} → ${compacted.length} messages`));
         console.log(DIM(`  Reduced by ${reduction} messages (${percent}%)`));
@@ -1676,16 +2345,32 @@ function restoreSession(ctx, session, isLast) {
     const history = (0, session_storage_1.loadSessionHistory)(resumed.id);
     if (history.length > 0) {
         const summary = generateHistorySummary(history);
+        const eventSummary = generateRestoredSessionEventSummary(history);
         console.log(DIM(`  Summary: ${summary}`));
         console.log();
         ctx.store.setState({ conversationHistory: history });
         ctx.store.setState({ harnessState: (0, session_storage_1.loadSessionHarnessState)(resumed.id) ?? resumed.harnessState });
         (0, framework_1.resetToolState)();
+        ctx.sessionRestored?.({
+            sessionId: resumed.id,
+            projectPath: resumed.projectPath,
+            model: resumed.model,
+            restoredMessages: history.length,
+            messageCount: resumed.messageCount,
+            summary: eventSummary,
+        });
         console.log(SUCCESS(`✔ Restored ${history.length} messages`));
     }
     else {
         console.log();
         console.log(DIM('  No messages in session'));
+        ctx.sessionRestored?.({
+            sessionId: resumed.id,
+            projectPath: resumed.projectPath,
+            model: resumed.model,
+            restoredMessages: 0,
+            messageCount: resumed.messageCount,
+        });
     }
     console.log();
     return { success: true };
@@ -1809,13 +2494,26 @@ async function handleEditPreview(ctx) {
     return { success: parsed.success === true };
 }
 /** Generate a brief summary of conversation history */
+function truncateRedactedSummary(text, maxLength) {
+    const redacted = (0, session_storage_1.redactTraceText)(text);
+    if (redacted.length <= maxLength)
+        return redacted;
+    let truncated = redacted.slice(0, maxLength);
+    for (const marker of ['[REDACTED_SECRET]']) {
+        const markerStart = truncated.indexOf(marker.slice(0, 6));
+        if (markerStart >= 0 && !truncated.includes(marker)) {
+            truncated = `${truncated.slice(0, markerStart)}${marker}`;
+            break;
+        }
+    }
+    return `${truncated}...`;
+}
 function generateHistorySummary(messages) {
     const userMsgs = messages.filter(m => m.role === 'user' && m.content);
     const assistantMsgsWithTools = messages.filter(m => m.role === 'assistant' && m.tool_calls && m.tool_calls.length > 0);
     // Extract topics from first few user messages
     const topics = userMsgs.slice(0, 3).map(m => {
-        const content = m.content || '';
-        return content.length > 40 ? content.slice(0, 40) + '...' : content;
+        return truncateRedactedSummary(m.content || '', 40);
     });
     // Extract tools used
     const toolsUsed = assistantMsgsWithTools.flatMap(m => m.tool_calls?.map(tc => tc.function.name) || []);
@@ -1833,6 +2531,14 @@ function generateHistorySummary(messages) {
     }
     return parts.join('. ');
 }
+function generateRestoredSessionEventSummary(messages) {
+    const assistantMsgsWithTools = messages.filter(m => m.role === 'assistant' && m.tool_calls && m.tool_calls.length > 0);
+    const toolsUsed = assistantMsgsWithTools.flatMap(m => m.tool_calls?.map(tc => tc.function.name) || []);
+    const uniqueTools = [...new Set(toolsUsed)].slice(0, 8);
+    if (uniqueTools.length === 0)
+        return undefined;
+    return `Tools: ${uniqueTools.join(', ')}`;
+}
 function continueAsSlashChat(name, args) {
     const trimmed = args.trim();
     return {
@@ -2115,6 +2821,53 @@ const COMMANDS = [
         type: 'builtin',
         execute: (ctx) => handleUsage(ctx),
     },
+    {
+        name: 'loop-stats',
+        aliases: ['loop'],
+        description: 'Show detailed agent-loop budget and efficiency diagnostics',
+        category: 'diagnostics',
+        priority: 12,
+        type: 'builtin',
+        execute: (ctx) => handleLoopStats(ctx),
+    },
+    {
+        name: 'trace',
+        description: 'Show structured event timeline for the latest or selected turn',
+        argumentHint: '[latest|turn-id]',
+        category: 'diagnostics',
+        priority: 14,
+        type: 'builtin',
+        execute: (ctx, args) => handleTrace(ctx, args),
+    },
+    {
+        name: 'last-tool',
+        aliases: ['tool-last'],
+        description: 'Show the latest tool call/result with full inspection hints',
+        category: 'diagnostics',
+        priority: 15,
+        type: 'builtin',
+        execute: (ctx, args) => handleLastTool(ctx, args),
+    },
+    {
+        name: 'artifacts',
+        aliases: ['artifact'],
+        description: 'List or inspect saved full tool outputs for this project',
+        argumentHint: '[show <id|prefix> --full]',
+        category: 'diagnostics',
+        priority: 16,
+        type: 'builtin',
+        execute: (ctx, args) => handleArtifacts(ctx, args),
+    },
+    {
+        name: 'checkpoint',
+        aliases: ['checkpoints'],
+        description: 'List or restore file checkpoints created before agent edits',
+        argumentHint: '[list|restore <turn-id|prefix> --yes]',
+        category: 'diagnostics',
+        priority: 18,
+        type: 'builtin',
+        execute: (ctx, args) => handleCheckpoint(ctx, args),
+    },
     {
         name: 'cost',
         description: 'Show session token usage',