@adhdev/daemon-core 0.8.29 → 0.8.31

package/src/cli-adapters/provider-cli-adapter.ts

@@ -15,128 +15,74 @@
  */
 
 import * as os from 'os';
-import * as path from 'path';
-import { execSync } from 'child_process';
 import type { CliAdapter } from '../cli-adapter-types.js';
 import { LOG } from '../logging/logger.js';
 import { TerminalScreen } from './terminal-screen.js';
-import type { ProviderResumeCapability } from '../providers/contracts.js';
 import {
     NodePtyTransportFactory,
     type PtyRuntimeMetadata,
     type PtyRuntimeTransport,
     type PtyTransportFactory,
 } from './pty-transport.js';
-import { sanitizeSpawnEnv } from './spawn-env.js';
-
-// ─── Types ──────────────────────────────────────────
-
-export interface CliChatMessage {
-    role: 'user' | 'assistant';
-    content: string;
-    timestamp?: number;
-    receivedAt?: number;
-    kind?: string;
-    id?: string;
-    index?: number;
-    meta?: Record<string, any>;
-    senderName?: string;
-}
+import {
+    buildCliScreenSnapshot,
+    compactPromptText,
+    estimatePromptDisplayLines,
+    extractPromptRetrySnippet,
+    getLastUserPromptText,
+    listCliScriptNames,
+    looksLikeConfirmOnlyLabel,
+    normalizePromptText,
+    normalizeScreenSnapshot,
+    promptLikelyVisible,
+    sanitizeTerminalText,
+    trimPromptEchoPrefix,
+    type CliChatMessage,
+    type CliProviderModule,
+    type CliScriptInput,
+    type CliScripts,
+    type CliSessionStatus,
+    type CliTraceEntry,
+} from './provider-cli-shared.js';
+import {
+    buildCliParseInput,
+    buildCliTraceParseSnapshot,
+    hydrateCliParsedMessages,
+    normalizeCliParsedMessages,
+    summarizeCliTraceMessages,
+    summarizeCliTraceText,
+    type TurnParseScope,
+} from './provider-cli-parse.js';
+import {
+    resolveCliAdapterConfig,
+    type ProviderResolutionMeta,
+} from './provider-cli-config.js';
+import {
+    buildCliLoginShellRetry,
+    getCliSpawnErrorHint,
+    resolveCliSpawnPlan,
+    respondToCliTerminalQueries,
+} from './provider-cli-runtime.js';
+
+export {
+    normalizeCliProviderForRuntime,
+    type CliApprovalInput,
+    type CliChatMessage,
+    type CliProviderModule,
+    type CliScreenLine,
+    type CliScreenSnapshot,
+    type CliScriptInput,
+    type CliScripts,
+    type CliSessionStatus,
+    type CliStatusInput,
+    type CliTraceEntry,
+} from './provider-cli-shared.js';
 
 type SeedCliChatMessage = Omit<Partial<CliChatMessage>, 'role'> & {
     role?: string;
     content?: string;
 };
 
-export interface CliSessionStatus {
-    status: 'idle' | 'generating' | 'waiting_approval' | 'error' | 'stopped' | 'starting';
-    messages: CliChatMessage[];
-    workingDir: string;
-    activeModal: { message: string; buttons: string[] } | null;
-}
-
-/**
- * CLI Script Functions.
- * Unlike IDE scripts (which return JS code strings for CDP evaluate),
- * CLI scripts are Node.js functions that receive PTY buffer data and return structured results.
- */
-export interface CliScripts {
-    /** Full PTY buffer → ReadChatResult (messages, status, activeModal) */
-    parseOutput?: (input: CliScriptInput) => any;
-    /** Lightweight status detection (high-frequency polling) → AgentStatus string */
-    detectStatus?: (input: CliStatusInput) => string | null;
-    /** Parse approval modal from PTY output → ModalInfo | null */
-    parseApproval?: (input: CliApprovalInput) => { message: string; buttons: string[] } | null;
-    /** Produce a cli-specific prompt from a dashboard action payload */
-    resolveAction?: (data: any) => string;
-    /** Custom scripts */
-    [name: string]: ((input: any) => any) | undefined;
-}
-
-export interface CliScreenLine {
-    index: number;
-    fromTop: number;
-    fromBottom: number;
-    text: string;
-    trimmed: string;
-    isEmpty: boolean;
-}
-
-export interface CliScreenSnapshot {
-    text: string;
-    lineCount: number;
-    lines: CliScreenLine[];
-    nonEmptyLines: CliScreenLine[];
-    firstNonEmptyLineIndex: number;
-    lastNonEmptyLineIndex: number;
-    firstNonEmptyLine: CliScreenLine | null;
-    lastNonEmptyLine: CliScreenLine | null;
-    promptLineIndex: number;
-    promptLine: CliScreenLine | null;
-    linesAbovePrompt: CliScreenLine[];
-    linesBelowPrompt: CliScreenLine[];
-}
-
-export interface CliScriptInput {
-    buffer: string;          // Full ANSI-stripped accumulated PTY output
-    rawBuffer: string;       // Raw PTY output (with ANSI)
-    recentBuffer: string;    // Recent 1000 chars (ANSI-stripped)
-    screenText: string;      // Current visible screen snapshot
-    screen: CliScreenSnapshot;
-    bufferScreen: CliScreenSnapshot;
-    recentScreen: CliScreenSnapshot;
-    messages: CliChatMessage[];  // Previously parsed messages
-    partialResponse: string; // Current partial response being generated
-    promptText?: string;     // Current turn prompt when available
-    settings?: Record<string, any>;
-    args?: Record<string, any>;
-}
-
-export interface CliStatusInput {
-    tail: string;
-    screenText?: string;
-    rawBuffer?: string;
-    screen: CliScreenSnapshot;
-    tailScreen: CliScreenSnapshot;
-}
-
-export interface CliApprovalInput {
-    buffer: string;
-    screenText?: string;
-    rawBuffer?: string;
-    tail: string;
-    screen: CliScreenSnapshot;
-    bufferScreen: CliScreenSnapshot;
-    tailScreen: CliScreenSnapshot;
-}
-
-interface TurnParseScope {
-    prompt: string;
-    startedAt: number;
-    bufferStart: number;
-    rawBufferStart: number;
-}
-
 interface IdleFinishCandidate {
     armedAt: number;
     lastOutputAt: number;
@@ -145,369 +91,6 @@ interface IdleFinishCandidate {
     assistantLength: number;
 }
 
-export interface CliTraceEntry {
-    id: number;
-    at: number;
-    type: string;
-    status: CliSessionStatus['status'];
-    isWaitingForResponse: boolean;
-    activeModal: { message: string; buttons: string[] } | null;
-    payload: Record<string, any>;
-}
-
-export interface CliProviderModule {
-    type: string;
-    name: string;
-    category: 'cli';
-    binary: string;
-    sendDelayMs?: number;
-    sendKey?: string;
-    submitStrategy?: 'wait_for_echo' | 'immediate';
-    spawn: {
-        command: string;
-        args: string[];
-        shell: boolean;
-        env: Record<string, string>;
-    };
-    timeouts?: {
- /** PTY output batch transmit interval (default 50ms) */
-        ptyFlush?: number;
- /** Wait for startup dialog auto-proceed (default 300ms) */
-        dialogAccept?: number;
- /** Approval detect cooldown (default 2000ms) */
-        approvalCooldown?: number;
- /** Check for completion on no-response during generating (default 6000ms) */
-        generatingIdle?: number;
- /** Check for completion on no-response (default 5000ms) */
-        idleFinish?: number;
- /** Max response wait (default 300000ms = 5min) */
-        maxResponse?: number;
- /** shutdown after kill wait (default 1000ms) */
-        shutdownGrace?: number;
- /** Output settle debounce before evaluating status (default 300ms) */
-        outputSettle?: number;
-    };
-    resume?: ProviderResumeCapability;
-}
-
-// ─── Utility Functions ──────────────────────────────
-
-function stripAnsi(str: string): string {
- // eslint-disable-next-line no-control-regex
-    return str
-        // OSC sequences (title bar etc) — strip before generic ESC removal so payload cannot leak.
-        .replace(/\x1B\][^\x07]*\x07/g, '')
-        .replace(/\x1B\][\s\S]*?\x1B\\/g, '')
-        // DCS / APC / PM / SOS control strings terminated by ST or BEL.
-        .replace(/\x1B[P^_X][\s\S]*?(?:\x07|\x1B\\)/g, '')
-        // Cursor movement sequences → space (prevents word concatenation)
-        .replace(/\x1B\[\d*[A-HJKSTfG]/g, ' ')
-        // SGR and other CSI sequences → remove
-        .replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, '')
-        // Collapse multiple spaces
-        .replace(/  +/g, ' ');
-}
-
-function stripTerminalNoise(str: string): string {
-    return String(str || '')
-        // Remove remaining C0/C1 control chars except newlines/tabs.
-        // eslint-disable-next-line no-control-regex
-        .replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x9F]/g, '')
-        // Drop common terminal negotiation/report fragments that can remain after ANSI stripping.
-        .replace(/(^|[\s([])(?:\??\d{1,4}(?:;\d{1,4})*[A-Za-z])(?=$|[\s)\]])/g, '$1')
-        .replace(/(^|[\s([])(?:\[\??\d{1,4}(?:;\d{1,4})*[A-Za-z])(?=$|[\s)\]])/g, '$1')
-        .replace(/(^|[\s([])(?:\d{1,4};\?)(?=$|[\s)\]])/g, '$1')
-        // Drop common leftover DCS/OSC payload fragments when a control string was split across PTY chunks.
-        .replace(/(^|[\s([])(?:\d+\$r[0-9;\" ]*[A-Za-z]?)(?=$|[\s)\]])/g, '$1')
-        .replace(/(^|[\s([])(?:>\|[A-Za-z0-9_.:-]+(?:\([^)]*\))?)(?=$|[\s)\]])/g, '$1')
-        .replace(/(^|[\s([])(?:[A-Z]\d(?:\s+[A-Z]\d)+)(?=$|[\s)\]])/g, '$1')
-        .replace(/(^|[\s([])(?:\d+;[^\s)\]]+)(?=$|[\s)\]])/g, '$1')
-        .replace(/\r+/g, '\n')
-        .replace(/[ \t]+\n/g, '\n')
-        .replace(/\n{3,}/g, '\n\n')
-        .replace(/ {2,}/g, ' ');
-}
-
-function sanitizeTerminalText(str: string): string {
-    return stripTerminalNoise(stripAnsi(str));
-}
-
-function splitCliScreenLines(text: string): string[] {
-    return String(text || '')
-        .replace(/\u0007/g, '')
-        .replace(/\r\n/g, '\n')
-        .replace(/\r/g, '\n')
-        .split('\n')
-        .map((line) => line.replace(/\s+$/, ''));
-}
-
-function isPromptLikeCliLine(line: string): boolean {
-    const trimmed = String(line || '').trim();
-    if (!trimmed) return false;
-    return /^[❯›>]\s*(?:$|\S.*)$/.test(trimmed);
-}
-
-function buildCliScreenSnapshot(text: string): CliScreenSnapshot {
-    const normalizedText = String(text || '').replace(/\r\n/g, '\n').replace(/\r/g, '\n');
-    const rawLines = splitCliScreenLines(normalizedText);
-    const lines = rawLines.map((line, index, arr) => {
-        const trimmed = String(line || '').trim();
-        return {
-            index,
-            fromTop: index,
-            fromBottom: arr.length - index - 1,
-            text: line,
-            trimmed,
-            isEmpty: trimmed.length === 0,
-        };
-    });
-    const nonEmptyLines = lines.filter((line) => !line.isEmpty);
-    const firstNonEmptyLine = nonEmptyLines[0] ?? null;
-    const lastNonEmptyLine = nonEmptyLines[nonEmptyLines.length - 1] ?? null;
-    let promptLineIndex = -1;
-    for (let i = lines.length - 1; i >= 0; i -= 1) {
-        if (isPromptLikeCliLine(lines[i].text)) {
-            promptLineIndex = i;
-            break;
-        }
-    }
-    return {
-        text: normalizedText,
-        lineCount: lines.length,
-        lines,
-        nonEmptyLines,
-        firstNonEmptyLineIndex: firstNonEmptyLine?.index ?? -1,
-        lastNonEmptyLineIndex: lastNonEmptyLine?.index ?? -1,
-        firstNonEmptyLine,
-        lastNonEmptyLine,
-        promptLineIndex,
-        promptLine: promptLineIndex >= 0 ? lines[promptLineIndex] : null,
-        linesAbovePrompt: promptLineIndex >= 0 ? lines.slice(0, promptLineIndex) : [...lines],
-        linesBelowPrompt: promptLineIndex >= 0 ? lines.slice(promptLineIndex + 1) : [],
-    };
-}
-
-// Re-export sanitizeSpawnEnv under the local alias for backward compat within this file
-const buildCliSpawnEnv = sanitizeSpawnEnv;
-
-function computeTerminalQueryTail(buffer: string): string {
-    const prefixes = ['\x1b[6n', '\x1b[?6n'];
-    const maxLength = prefixes.reduce((n, value) => Math.max(n, value.length), 0) - 1;
-    const start = Math.max(0, buffer.length - maxLength);
-    for (let i = start; i < buffer.length; i++) {
-        const suffix = buffer.slice(i);
-        if (prefixes.some((pattern) => suffix.length < pattern.length && pattern.startsWith(suffix))) {
-            return suffix;
-        }
-    }
-    return '';
-}
-
-function findBinary(name: string): string {
-    const trimmed = String(name || '').trim();
-    if (!trimmed) return trimmed;
-    const expanded = trimmed.startsWith('~')
-        ? path.join(os.homedir(), trimmed.slice(1))
-        : trimmed;
-    if (path.isAbsolute(expanded) || expanded.includes('/') || expanded.includes('\\')) {
-        return path.isAbsolute(expanded) ? expanded : path.resolve(expanded);
-    }
-    const isWin = os.platform() === 'win32';
-    try {
-        const cmd = isWin ? `where ${trimmed}` : `which ${trimmed}`;
-        return execSync(cmd, { encoding: 'utf-8', timeout: 5000, stdio: ['pipe', 'pipe', 'pipe'] }).trim().split('\n')[0].trim();
-    } catch {
-        return isWin ? `${trimmed}.cmd` : trimmed;
-    }
-}
-
-/** True if file starts with a UTF-8 BOM then #!, or plain #!. */
-function isScriptBinary(binaryPath: string): boolean {
-    if (!path.isAbsolute(binaryPath)) return false;
-    try {
-        const fs = require('fs');
-        const resolved = fs.realpathSync(binaryPath);
-        const head = Buffer.alloc(8);
-        const fd = fs.openSync(resolved, 'r');
-        fs.readSync(fd, head, 0, 8, 0);
-        fs.closeSync(fd);
-        let i = 0;
-        if (head[0] === 0xef && head[1] === 0xbb && head[2] === 0xbf) i = 3;
-        return head[i] === 0x23 && head[i + 1] === 0x21; // '#!'
-    } catch {
-        return false;
-    }
-}
-
-/** True only for Mach-O / ELF — npm shims and shell scripts return false. */
-function looksLikeMachOOrElf(filePath: string): boolean {
-    if (!path.isAbsolute(filePath)) return false;
-    try {
-        const fs = require('fs');
-        const resolved = fs.realpathSync(filePath);
-        const buf = Buffer.alloc(8);
-        const fd = fs.openSync(resolved, 'r');
-        fs.readSync(fd, buf, 0, 8, 0);
-        fs.closeSync(fd);
-        let i = 0;
-        if (buf[0] === 0xef && buf[1] === 0xbb && buf[2] === 0xbf) i = 3;
-        const b = buf.subarray(i);
-        if (b.length < 4) return false;
-        // ELF
-        if (b[0] === 0x7f && b[1] === 0x45 && b[2] === 0x4c && b[3] === 0x46) return true;
-        const le = b.readUInt32LE(0);
-        const be = b.readUInt32BE(0);
-        const magics = [0xfeedface, 0xfeedfacf, 0xcafebabe, 0xbebafeca];
-        return magics.some(m => m === le || m === be);
-    } catch {
-        return false;
-    }
-}
-
-function shSingleQuote(arg: string): string {
-    if (/^[a-zA-Z0-9@%_+=:,./-]+$/.test(arg)) return arg;
-    if (os.platform() === 'win32') {
-        return `"${arg.replace(/"/g, '""')}"`;
-    }
-    return `'${arg.replace(/'/g, `'\\''`)}'`;
-}
-
-function estimatePromptDisplayLines(text: string, cols = 80): number {
-    const normalized = String(text || '').replace(/\r/g, '');
-    if (!normalized) return 1;
-    return normalized
-        .split('\n')
-        .reduce((sum, line) => sum + Math.max(1, Math.ceil(Math.max(1, line.length) / cols)), 0);
-}
-
-function extractPromptRetrySnippet(text: string): string {
-    const lines = String(text || '')
-        .replace(/\r/g, '')
-        .split('\n')
-        .map(line => line.trim())
-        .filter(Boolean);
-    const candidate = lines[lines.length - 1] || lines[0] || '';
-    return candidate.slice(-120);
-}
-
-function normalizePromptText(text: string): string {
-    return String(text || '').replace(/\s+/g, ' ').trim();
-}
-
-function compactPromptText(text: string): string {
-    return String(text || '').replace(/\s+/g, '').trim();
-}
-
-function promptLikelyVisible(screenText: string, promptSnippet: string): boolean {
-    const snippet = normalizePromptText(promptSnippet);
-    if (!snippet) return false;
-
-    const normalizedScreen = normalizePromptText(screenText);
-    if (normalizedScreen.includes(snippet)) return true;
-
-    const compactScreen = compactPromptText(screenText);
-    const compactSnippet = compactPromptText(promptSnippet);
-    if (compactSnippet && compactScreen.includes(compactSnippet)) return true;
-
-    const tokens = snippet
-        .split(/[^A-Za-z0-9_.:/-]+/)
-        .map(token => token.trim())
-        .filter(token => token.length >= 4);
-    if (tokens.length === 0) return false;
-
-    const required = Math.min(tokens.length, 3);
-    const matched = tokens.filter(token =>
-        normalizedScreen.includes(token) || compactScreen.includes(compactPromptText(token)),
-    ).length;
-    return matched >= required;
-}
-
-function normalizeScreenSnapshot(text: string): string {
-    return sanitizeTerminalText(String(text || ''))
-        .replace(/\s+/g, ' ')
-        .trim();
-}
-
-function normalizeComparableMessageContent(text: string): string {
-    return String(text || '')
-        .replace(/\s+/g, ' ')
-        .trim();
-}
-
-function trimPromptEchoPrefix(text: string, promptText?: string | null): string {
-    const prompt = normalizeComparableMessageContent(String(promptText || ''));
-    if (!prompt) return String(text || '');
-
-    const lines = String(text || '').split(/\r\n|\n|\r/g);
-    let dropCount = 0;
-    for (let index = 0; index < Math.min(lines.length, 6); index += 1) {
-        const fragment = normalizeComparableMessageContent(lines[index].replace(/^[.…]+\s*/, ''));
-        if (!fragment) {
-            if (dropCount === index) dropCount = index + 1;
-            continue;
-        }
-        const fragmentWordCount = fragment ? fragment.split(/\s+/).filter(Boolean).length : 0;
-        const canBePromptEcho = fragment.length >= 16 || fragmentWordCount >= 4;
-        if (canBePromptEcho && prompt.includes(fragment)) {
-            dropCount = index + 1;
-            continue;
-        }
-        break;
-    }
-
-    return lines.slice(dropCount).join('\n').trim();
-}
-
-function getLastUserPromptText(messages: Array<{ role?: string; content?: string }> | null | undefined): string {
-    const items = Array.isArray(messages) ? messages : [];
-    for (let index = items.length - 1; index >= 0; index -= 1) {
-        const message = items[index];
-        if (message?.role === 'user' && typeof message.content === 'string' && message.content.trim()) {
-            return message.content;
-        }
-    }
-    return '';
-}
-
-function looksLikeConfirmOnlyLabel(label: string): boolean {
-    return /^(?:continue|confirm|ok|yes|trust|proceed|enter)$/i.test(String(label || '').trim());
-}
-
-/**
- * Normalize provider.json for auto-implement approval detection.
- * Kept for backward compat with dev-server auto-impl pipeline only.
- */
-function parsePatternEntry(x: unknown): RegExp | null {
-    if (x instanceof RegExp) return x;
-    if (x && typeof x === 'object' && typeof (x as { source?: string }).source === 'string') {
-        try {
-            const s = x as { source: string; flags?: string };
-            return new RegExp(s.source, s.flags || '');
-        } catch {
-            return null;
-        }
-    }
-    return null;
-}
-
-function coercePatternArray(raw: unknown): RegExp[] {
-    if (!Array.isArray(raw)) return [];
-    return raw.map(parsePatternEntry).filter((r): r is RegExp => r != null);
-}
-
-/**
- * Normalize raw provider JSON for auto-implement approval patterns.
- * Used by dev-server only — ProviderCliAdapter itself uses scripts.
- */
-export function normalizeCliProviderForRuntime(raw: any): { patterns: { approval: RegExp[] } } {
-    const patterns = raw?.patterns || {};
-    return {
-        patterns: {
-            approval: coercePatternArray(patterns.approval),
-        },
-    };
-}
-
 // ─── Adapter ────────────────────────────────────────
 
 export class ProviderCliAdapter implements CliAdapter {
@@ -598,7 +181,7 @@ export class ProviderCliAdapter implements CliAdapter {
     private traceSeq = 0;
     private traceSessionId = `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
     private static readonly MAX_TRACE_ENTRIES = 250;
-    private readonly providerResolutionMeta: Record<string, any>;
+    private readonly providerResolutionMeta: ProviderResolutionMeta;
     private static readonly IDLE_FINISH_CONFIRM_MS = 2000;
     private static readonly STATUS_ACTIVITY_HOLD_MS = 2000;
     private static readonly FINISH_RETRY_DELAY_MS = 300;
@@ -609,117 +192,6 @@ export class ProviderCliAdapter implements CliAdapter {
         this.structuredMessages = [...this.committedMessages];
     }
 
-    private hydrateParsedMessages(parsedMessages: any[], scope?: TurnParseScope | null): any[] {
-        const referenceMessages = [...this.committedMessages];
-        const usedReferenceIndexes = new Set<number>();
-        const now = Date.now();
-
-        const findReferenceTimestamp = (role: 'user' | 'assistant', content: string, parsedIndex: number): number | undefined => {
-            const normalizedContent = normalizeComparableMessageContent(content);
-            if (!normalizedContent) return undefined;
-
-            const sameIndex = referenceMessages[parsedIndex];
-            if (
-                sameIndex
-                && !usedReferenceIndexes.has(parsedIndex)
-                && sameIndex.role === role
-                && normalizeComparableMessageContent(sameIndex.content) === normalizedContent
-                && typeof sameIndex.timestamp === 'number'
-                && Number.isFinite(sameIndex.timestamp)
-            ) {
-                usedReferenceIndexes.add(parsedIndex);
-                return sameIndex.timestamp;
-            }
-
-            for (let i = 0; i < referenceMessages.length; i++) {
-                if (usedReferenceIndexes.has(i)) continue;
-                const candidate = referenceMessages[i];
-                if (!candidate || candidate.role !== role) continue;
-                const candidateContent = normalizeComparableMessageContent(candidate.content);
-                if (!candidateContent) continue;
-                const exactMatch = candidateContent === normalizedContent;
-                const fuzzyMatch = candidateContent.includes(normalizedContent) || normalizedContent.includes(candidateContent);
-                if (!exactMatch && !fuzzyMatch) continue;
-                if (typeof candidate.timestamp === 'number' && Number.isFinite(candidate.timestamp)) {
-                    usedReferenceIndexes.add(i);
-                    return candidate.timestamp;
-                }
-            }
-
-            return undefined;
-        };
-
-        return parsedMessages
-            .filter((message) => message && (message.role === 'user' || message.role === 'assistant'))
-            .map((message, index) => {
-                const role = message.role as 'user' | 'assistant';
-                const content = typeof message.content === 'string' ? message.content : String(message.content || '');
-                const parsedTimestamp = typeof message.timestamp === 'number' && Number.isFinite(message.timestamp)
-                    ? message.timestamp
-                    : undefined;
-                const referenceTimestamp = parsedTimestamp ?? findReferenceTimestamp(role, content, index);
-                const fallbackTimestamp = role === 'user'
-                    ? (scope?.startedAt || now)
-                    : (this.lastOutputAt || scope?.startedAt || now);
-                const timestamp = referenceTimestamp ?? fallbackTimestamp;
-                return {
-                    ...message,
-                    role,
-                    content,
-                    timestamp,
-                    receivedAt: typeof message.receivedAt === 'number' && Number.isFinite(message.receivedAt)
-                        ? message.receivedAt
-                        : timestamp,
-                };
-            });
-    }
-
-    private normalizeParsedMessages(parsedMessages: any[], scope?: TurnParseScope | null): CliChatMessage[] {
-        return this.hydrateParsedMessages(parsedMessages, scope).map((message) => ({
-            role: message.role,
-            content: message.content,
-            timestamp: message.timestamp,
-            receivedAt: message.receivedAt,
-            kind: message.kind,
-            id: message.id,
-            index: message.index,
-            meta: message.meta,
-            senderName: message.senderName,
-        }));
-    }
-
-    private sliceFromOffset(text: string, start: number): string {
-        if (!text) return '';
-        if (!Number.isFinite(start) || start <= 0) return text;
-        if (start >= text.length) return '';
-        return text.slice(start);
-    }
-
-    private buildParseInput(baseMessages: CliChatMessage[], partialResponse: string, scope?: TurnParseScope | null): CliScriptInput {
-        const buffer = scope
-            ? (this.sliceFromOffset(this.accumulatedBuffer, scope.bufferStart) || this.accumulatedBuffer)
-            : this.accumulatedBuffer;
-        const rawBuffer = scope
-            ? (this.sliceFromOffset(this.accumulatedRawBuffer, scope.rawBufferStart) || this.accumulatedRawBuffer)
-            : this.accumulatedRawBuffer;
-        const screenText = this.terminalScreen.getText();
-        const recentBuffer = buffer.slice(-1000) || this.recentOutputBuffer;
-
-        return {
-            buffer,
-            rawBuffer,
-            recentBuffer,
-            screenText,
-            screen: buildCliScreenSnapshot(screenText),
-            bufferScreen: buildCliScreenSnapshot(buffer),
-            recentScreen: buildCliScreenSnapshot(recentBuffer),
-            messages: [...baseMessages],
-            partialResponse,
-            promptText: scope?.prompt || '',
-            settings: { ...this.runtimeSettings },
-        };
-    }
-
     private setStatus(status: CliSessionStatus['status'], trigger?: string): void {
         const prev = this.currentStatus;
         if (prev === status) return;
@@ -754,7 +226,13 @@ export class ProviderCliAdapter implements CliAdapter {
         this.recordTrace('idle_candidate_armed', {
             confirmMs: ProviderCliAdapter.IDLE_FINISH_CONFIRM_MS,
             candidate: this.idleFinishCandidate,
-            ...this.buildTraceParseSnapshot(this.currentTurnScope, this.responseBuffer),
+            ...buildCliTraceParseSnapshot({
+                accumulatedBuffer: this.accumulatedBuffer,
+                accumulatedRawBuffer: this.accumulatedRawBuffer,
+                responseBuffer: this.responseBuffer,
+                partialResponse: this.responseBuffer,
+                scope: this.currentTurnScope,
+            }),
         });
         if (this.settleTimer) clearTimeout(this.settleTimer);
         this.settleTimer = setTimeout(() => {
@@ -764,36 +242,6 @@ export class ProviderCliAdapter implements CliAdapter {
         }, ProviderCliAdapter.IDLE_FINISH_CONFIRM_MS);
     }
 
-    private summarizeTraceText(text: string, max = 800): string {
-        const value = sanitizeTerminalText(String(text || ''));
-        if (value.length <= max) return value;
-        return `…${value.slice(-max)}`;
-    }
-
-    private summarizeTraceMessages(messages: CliChatMessage[], limit = 3): { role: string; content: string; timestamp?: number }[] {
-        return messages.slice(-limit).map((message) => ({
-            role: message.role,
-            content: this.summarizeTraceText(message.content, 240),
-            timestamp: message.timestamp,
-        }));
-    }
-
-    private buildTraceParseSnapshot(scope?: TurnParseScope | null, partialResponse = ''): Record<string, any> {
-        const scopedBuffer = scope
-            ? (this.sliceFromOffset(this.accumulatedBuffer, scope.bufferStart) || this.accumulatedBuffer)
-            : this.accumulatedBuffer;
-        const scopedRawBuffer = scope
-            ? (this.sliceFromOffset(this.accumulatedRawBuffer, scope.rawBufferStart) || this.accumulatedRawBuffer)
-            : this.accumulatedRawBuffer;
-        return {
-            currentTurnScope: scope || null,
-            responseBuffer: this.summarizeTraceText(this.responseBuffer, 1200),
-            partialResponse: this.summarizeTraceText(partialResponse || this.responseBuffer, 1200),
-            turnBuffer: this.summarizeTraceText(scopedBuffer, 1600),
-            turnRawPreview: this.summarizeTraceText(scopedRawBuffer, 1600),
-            turnSanitizedRawPreview: this.summarizeTraceText(sanitizeTerminalText(scopedRawBuffer), 1600),
-        };
-    }
 
     private recordTrace(type: string, payload: Record<string, any> = {}): void {
         const entry: CliTraceEntry = {
@@ -847,40 +295,17 @@ export class ProviderCliAdapter implements CliAdapter {
             ? workingDir.replace(/^~/, os.homedir())
             : workingDir;
 
-        const t = provider.timeouts || {};
-        this.timeouts = {
-            ptyFlush: t.ptyFlush ?? 50,
-            dialogAccept: t.dialogAccept ?? 300,
-            approvalCooldown: t.approvalCooldown ?? 3000,
-            generatingIdle: t.generatingIdle ?? 6000,
-            idleFinish: t.idleFinish ?? 5000,
-            maxResponse: t.maxResponse ?? 300000,
-            shutdownGrace: t.shutdownGrace ?? 1000,
-            outputSettle: t.outputSettle ?? 300,
-        };
-
-        const rawKeys = (provider as any).approvalKeys;
-        this.approvalKeys = (rawKeys && typeof rawKeys === 'object') ? rawKeys : {};
-        this.sendDelayMs = typeof (provider as any).sendDelayMs === 'number' ? Math.max(0, (provider as any).sendDelayMs) : 0;
-        this.sendKey = typeof (provider as any).sendKey === 'string' && (provider as any).sendKey.length > 0
-            ? (provider as any).sendKey
-            : '\r';
-        this.submitStrategy = (provider as any).submitStrategy === 'immediate' ? 'immediate' : 'wait_for_echo';
-        this.providerResolutionMeta = {
-            type: provider.type,
-            name: provider.name,
-            resolvedVersion: (provider as any)._resolvedVersion || null,
-            resolvedOs: (provider as any)._resolvedOs || null,
-            providerDir: (provider as any)._resolvedProviderDir || null,
-            scriptDir: (provider as any)._resolvedScriptDir || null,
-            scriptsPath: (provider as any)._resolvedScriptsPath || null,
-            scriptsSource: (provider as any)._resolvedScriptsSource || null,
-            versionWarning: (provider as any)._versionWarning || null,
-        };
+        const resolvedConfig = resolveCliAdapterConfig(provider);
+        this.timeouts = resolvedConfig.timeouts;
+        this.approvalKeys = resolvedConfig.approvalKeys;
+        this.sendDelayMs = resolvedConfig.sendDelayMs;
+        this.sendKey = resolvedConfig.sendKey;
+        this.submitStrategy = resolvedConfig.submitStrategy;
+        this.providerResolutionMeta = resolvedConfig.providerResolutionMeta;
 
         // Scripts are required — loaded by ProviderLoader via compatibility array
-        this.cliScripts = (provider as any).scripts || {};
-        const scriptNames = Object.keys(this.cliScripts).filter(k => typeof (this.cliScripts as any)[k] === 'function');
+        this.cliScripts = provider.scripts || {};
+        const scriptNames = listCliScriptNames(this.cliScripts);
         if (scriptNames.length > 0) {
             LOG.info('CLI', `[${this.cliType}] CLI scripts: [${scriptNames.join(', ')}]`);
             LOG.info(
@@ -895,7 +320,7 @@ export class ProviderCliAdapter implements CliAdapter {
     /** Inject CLI scripts after construction (e.g. when resolved by ProviderLoader) */
     setCliScripts(scripts: CliScripts): void {
         this.cliScripts = scripts;
-        const scriptNames = Object.keys(scripts).filter(k => typeof (scripts as any)[k] === 'function');
+        const scriptNames = listCliScriptNames(scripts);
         LOG.info('CLI', `[${this.cliType}] CLI scripts injected: [${scriptNames.join(', ')}]`);
     }
 
@@ -935,99 +360,44 @@ export class ProviderCliAdapter implements CliAdapter {
     async spawn(): Promise<void> {
         if (this.ptyProcess) return;
 
-        const { spawn: spawnConfig } = this.provider;
-        const configuredCommand = typeof this.runtimeSettings.executablePath === 'string' && this.runtimeSettings.executablePath.trim()
-            ? this.runtimeSettings.executablePath.trim()
-            : spawnConfig.command;
-        const binaryPath = findBinary(configuredCommand);
-        const isWin = os.platform() === 'win32';
-        const allArgs = [...spawnConfig.args, ...this.extraArgs];
+        const spawnPlan = resolveCliSpawnPlan({
+            provider: this.provider,
+            runtimeSettings: this.runtimeSettings,
+            workingDir: this.workingDir,
+            extraArgs: this.extraArgs,
+        });
 
         LOG.info('CLI', `[${this.cliType}] Spawning in ${this.workingDir}`);
         this.resetTraceSession();
-
-        let shellCmd: string;
-        let shellArgs: string[];
-        const useShellUnix = !isWin && (
-            !!spawnConfig.shell
-            || !path.isAbsolute(binaryPath)
-            || isScriptBinary(binaryPath)
-            || !looksLikeMachOOrElf(binaryPath)
-        );
-        // On Windows, .cmd/.bat shims cannot be spawned directly — must go through cmd.exe
-        const isCmdShim = isWin && /\.(cmd|bat)$/i.test(binaryPath);
-        const useShellWin = !!spawnConfig.shell
-            || isCmdShim
-            || !path.isAbsolute(binaryPath)
-            || isScriptBinary(binaryPath);
-        const useShell = isWin ? useShellWin : useShellUnix;
-
-        if (useShell) {
-            if (!spawnConfig.shell && !isWin) {
-                LOG.info('CLI', `[${this.cliType}] Using login shell (script shim or non-native binary)`);
-            }
-            if (isCmdShim) {
-                LOG.info('CLI', `[${this.cliType}] Using cmd.exe shell for .cmd/.bat shim: ${binaryPath}`);
-            } else if (isWin) {
-                LOG.info('CLI', `[${this.cliType}] Using cmd.exe shell on Windows: ${binaryPath}`);
-            }
-            shellCmd = isWin ? 'cmd.exe' : (process.env.SHELL || '/bin/zsh');
-            if (isWin) {
-                // On Windows, pass binaryPath and args as separate items so node-pty's
-                // argvToCommandLine quotes each one individually. Joining them into a
-                // single pre-quoted string causes cmd.exe to receive \"path\" (backslash-
-                // escaped quotes) which it does not recognise as a valid executable name.
-                shellArgs = ['/c', binaryPath, ...allArgs];
-            } else {
-                const fullCmd = [binaryPath, ...allArgs].map(shSingleQuote).join(' ');
-                shellArgs = ['-l', '-c', fullCmd];
-            }
-        } else {
-            if (isWin && spawnConfig.shell) {
-                LOG.info('CLI', `[${this.cliType}] Spawning Windows binary directly without cmd.exe: ${binaryPath}`);
-            }
-            shellCmd = binaryPath;
-            shellArgs = allArgs;
-        }
-
-        const ptyOpts = {
-            cols: 80,
-            rows: 24,
-            cwd: this.workingDir,
-            env: buildCliSpawnEnv(process.env, spawnConfig.env),
-        };
         this.recordTrace('spawn', {
-            shellCommand: shellCmd,
-            shellArgs,
-            cwd: ptyOpts.cwd,
-            cols: ptyOpts.cols,
-            rows: ptyOpts.rows,
+            shellCommand: spawnPlan.shellCmd,
+            shellArgs: spawnPlan.shellArgs,
+            cwd: spawnPlan.ptyOptions.cwd,
+            cols: spawnPlan.ptyOptions.cols,
+            rows: spawnPlan.ptyOptions.rows,
             providerResolution: this.providerResolutionMeta,
         });
 
         try {
-            this.ptyProcess = this.transportFactory.spawn(shellCmd, shellArgs, ptyOpts);
+            this.ptyProcess = this.transportFactory.spawn(
+                spawnPlan.shellCmd,
+                spawnPlan.shellArgs,
+                spawnPlan.ptyOptions,
+            );
         } catch (err: any) {
             const msg = err?.message || String(err);
-            if (!isWin && !useShell && /posix_spawn|spawn/i.test(msg)) {
+            if (!spawnPlan.isWin && !spawnPlan.useShell && /posix_spawn|spawn/i.test(msg)) {
                 LOG.warn('CLI', `[${this.cliType}] Direct spawn failed (${msg}), retrying via login shell`);
-                shellCmd = process.env.SHELL || '/bin/zsh';
-                const fullCmd = [binaryPath, ...allArgs].map(shSingleQuote).join(' ');
-                shellArgs = ['-l', '-c', fullCmd];
-                this.ptyProcess = this.transportFactory.spawn(shellCmd, shellArgs, ptyOpts);
+                const retryPlan = buildCliLoginShellRetry(spawnPlan);
+                this.ptyProcess = this.transportFactory.spawn(
+                    retryPlan.shellCmd,
+                    retryPlan.shellArgs,
+                    spawnPlan.ptyOptions,
+                );
             } else {
-                // Windows native error codes are often cryptic — provide helpful hints
-                if (isWin) {
-                    const hint = /error code 267|ERROR_DIRECTORY/i.test(msg)
-                        ? ' (working directory does not exist or is not a directory)'
-                        : /error code 740|elevation/i.test(msg)
-                        ? ' (requires administrator privileges)'
-                        : /error code 2|ENOENT|not found/i.test(msg)
-                        ? ` (executable not found: ${shellCmd})`
-                        : '';
-                    if (hint) {
-                        throw new Error(`Failed to spawn CLI${hint}: ${msg}`);
-                    }
+                const hint = getCliSpawnErrorHint(msg, spawnPlan.shellCmd, spawnPlan.isWin);
+                if (hint) {
+                    throw new Error(`Failed to spawn CLI${hint}: ${msg}`);
                 }
                 throw err;
             }
@@ -1037,7 +407,12 @@ export class ProviderCliAdapter implements CliAdapter {
             if (Date.now() < this.resizeSuppressUntil) return;
 
             if (!this.ptyProcess?.terminalQueriesHandled) {
-                this.respondToTerminalQueries(data);
+                this.pendingTerminalQueryTail = respondToCliTerminalQueries({
+                    ptyProcess: this.ptyProcess,
+                    pendingTail: this.pendingTerminalQueryTail,
+                    data,
+                    terminalScreen: this.terminalScreen,
+                });
             }
 
             this.pendingOutputParseBuffer += data;
@@ -1116,9 +491,9 @@ export class ProviderCliAdapter implements CliAdapter {
         this.recordTrace('output', {
             rawLength: rawData.length,
             cleanLength: cleanData.length,
-            rawPreview: this.summarizeTraceText(rawData, 300),
-            cleanPreview: this.summarizeTraceText(cleanData, 300),
-            screenText: this.summarizeTraceText(this.terminalScreen.getText(), 1200),
+            rawPreview: summarizeCliTraceText(rawData, 300),
+            cleanPreview: summarizeCliTraceText(cleanData, 300),
+            screenText: summarizeCliTraceText(this.terminalScreen.getText(), 1200),
         });
 
         if (this.startupParseGate) {
@@ -1411,7 +786,7 @@ export class ProviderCliAdapter implements CliAdapter {
                 loggedWait = true;
                 LOG.info(
                     'CLI',
-                    `[${this.cliType}] Waiting for interactive prompt: hasPrompt=${hasPrompt} stableMs=${stableMs} recentOutputMs=${recentlyOutput} status=${status} startup=${startupLikelyActive} screen=${JSON.stringify(this.summarizeTraceText(screenText, 220)).slice(0, 260)}`
+                    `[${this.cliType}] Waiting for interactive prompt: hasPrompt=${hasPrompt} stableMs=${stableMs} recentOutputMs=${recentlyOutput} status=${status} startup=${startupLikelyActive} screen=${JSON.stringify(summarizeCliTraceText(screenText, 220)).slice(0, 260)}`
                 );
             }
             await new Promise(resolve => setTimeout(resolve, 50));
@@ -1420,7 +795,7 @@ export class ProviderCliAdapter implements CliAdapter {
         const finalScreenText = this.terminalScreen.getText() || '';
         LOG.warn(
             'CLI',
-            `[${this.cliType}] Interactive prompt wait timed out after ${maxWaitMs}ms; proceeding with screen=${JSON.stringify(this.summarizeTraceText(finalScreenText, 240)).slice(0, 280)}`
+            `[${this.cliType}] Interactive prompt wait timed out after ${maxWaitMs}ms; proceeding with screen=${JSON.stringify(summarizeCliTraceText(finalScreenText, 240)).slice(0, 280)}`
         );
     }
 
@@ -1453,24 +828,34 @@ export class ProviderCliAdapter implements CliAdapter {
             this.currentTurnScope,
         );
         const parsedMessages = Array.isArray(parsedTranscript?.messages)
-            ? this.normalizeParsedMessages(parsedTranscript.messages)
+            ? normalizeCliParsedMessages(parsedTranscript.messages, {
+                committedMessages: this.committedMessages,
+                scope: this.currentTurnScope,
+                lastOutputAt: this.lastOutputAt,
+            })
             : [];
         const lastParsedAssistant = [...parsedMessages].reverse().find((message) => message.role === 'assistant');
         this.recordTrace('settled', {
-            tail: this.summarizeTraceText(tail, 500),
-            screenText: this.summarizeTraceText(screenText, 1200),
+            tail: summarizeCliTraceText(tail, 500),
+            screenText: summarizeCliTraceText(screenText, 1200),
             detectStatus: scriptStatus,
             parsedStatus: parsedTranscript?.status || null,
             parsedMessageCount: parsedMessages.length,
-            parsedLastAssistant: lastParsedAssistant ? this.summarizeTraceText(lastParsedAssistant.content, 280) : '',
+            parsedLastAssistant: lastParsedAssistant ? summarizeCliTraceText(lastParsedAssistant.content, 280) : '',
             parsedActiveModal: parsedTranscript?.activeModal ?? null,
             approval: modal,
-            ...this.buildTraceParseSnapshot(this.currentTurnScope, this.responseBuffer),
+            ...buildCliTraceParseSnapshot({
+                accumulatedBuffer: this.accumulatedBuffer,
+                accumulatedRawBuffer: this.accumulatedRawBuffer,
+                responseBuffer: this.responseBuffer,
+                partialResponse: this.responseBuffer,
+                scope: this.currentTurnScope,
+            }),
         });
         if (this.currentTurnScope && !lastParsedAssistant) {
             LOG.info(
                 'CLI',
-                `[${this.cliType}] Settled without assistant: prompt=${JSON.stringify(this.currentTurnScope.prompt).slice(0, 140)} responseBuffer=${JSON.stringify(this.summarizeTraceText(this.responseBuffer, 220)).slice(0, 260)} screen=${JSON.stringify(this.summarizeTraceText(screenText, 220)).slice(0, 260)} providerDir=${this.providerResolutionMeta.providerDir || '-'} scriptDir=${this.providerResolutionMeta.scriptDir || '-'}`
+                `[${this.cliType}] Settled without assistant: prompt=${JSON.stringify(this.currentTurnScope.prompt).slice(0, 140)} responseBuffer=${JSON.stringify(summarizeCliTraceText(this.responseBuffer, 220)).slice(0, 260)} screen=${JSON.stringify(summarizeCliTraceText(screenText, 220)).slice(0, 260)} providerDir=${this.providerResolutionMeta.providerDir || '-'} scriptDir=${this.providerResolutionMeta.scriptDir || '-'}`
             );
         }
         if (!scriptStatus) return;
@@ -1537,7 +922,13 @@ export class ProviderCliAdapter implements CliAdapter {
                 lastNonEmptyOutputAt: this.lastNonEmptyOutputAt,
                 lastScreenChangeAt: this.lastScreenChangeAt,
                 holdMs: ProviderCliAdapter.STATUS_ACTIVITY_HOLD_MS,
-                ...this.buildTraceParseSnapshot(this.currentTurnScope, this.responseBuffer),
+                ...buildCliTraceParseSnapshot({
+                    accumulatedBuffer: this.accumulatedBuffer,
+                    accumulatedRawBuffer: this.accumulatedRawBuffer,
+                    responseBuffer: this.responseBuffer,
+                    partialResponse: this.responseBuffer,
+                    scope: this.currentTurnScope,
+                }),
             });
             this.onStatusChange?.();
             return;
@@ -1654,7 +1045,13 @@ export class ProviderCliAdapter implements CliAdapter {
                     canFinishImmediately,
                     submitPendingUntil: this.submitPendingUntil,
                     responseSettleIgnoreUntil: this.responseSettleIgnoreUntil,
-                    ...this.buildTraceParseSnapshot(this.currentTurnScope, this.responseBuffer),
+                    ...buildCliTraceParseSnapshot({
+                        accumulatedBuffer: this.accumulatedBuffer,
+                        accumulatedRawBuffer: this.accumulatedRawBuffer,
+                        responseBuffer: this.responseBuffer,
+                        partialResponse: this.responseBuffer,
+                        scope: this.currentTurnScope,
+                    }),
                 });
 
                 if (canFinishImmediately) {
@@ -1693,7 +1090,13 @@ export class ProviderCliAdapter implements CliAdapter {
         if (this.responseSettleIgnoreUntil > Date.now()) return;
         this.clearIdleFinishCandidate('finish_response_enter');
         this.recordTrace('finish_response', {
-            ...this.buildTraceParseSnapshot(this.currentTurnScope, this.responseBuffer),
+            ...buildCliTraceParseSnapshot({
+                accumulatedBuffer: this.accumulatedBuffer,
+                accumulatedRawBuffer: this.accumulatedRawBuffer,
+                responseBuffer: this.responseBuffer,
+                partialResponse: this.responseBuffer,
+                scope: this.currentTurnScope,
+            }),
         });
         const commitResult = this.commitCurrentTranscript();
         if (this.shouldRetryFinishResponse(commitResult)) {
@@ -1701,8 +1104,14 @@ export class ProviderCliAdapter implements CliAdapter {
             this.recordTrace('finish_response_retry', {
                 retryCount: this.finishRetryCount,
                 retryDelayMs: ProviderCliAdapter.FINISH_RETRY_DELAY_MS,
-                assistantContent: this.summarizeTraceText(commitResult.assistantContent, 220),
-                ...this.buildTraceParseSnapshot(this.currentTurnScope, this.responseBuffer),
+                assistantContent: summarizeCliTraceText(commitResult.assistantContent, 220),
+                ...buildCliTraceParseSnapshot({
+                    accumulatedBuffer: this.accumulatedBuffer,
+                    accumulatedRawBuffer: this.accumulatedRawBuffer,
+                    responseBuffer: this.responseBuffer,
+                    partialResponse: this.responseBuffer,
+                    scope: this.currentTurnScope,
+                }),
             });
             if (this.finishRetryTimer) clearTimeout(this.finishRetryTimer);
             this.finishRetryTimer = setTimeout(() => {
@@ -1738,7 +1147,11 @@ export class ProviderCliAdapter implements CliAdapter {
             this.currentTurnScope,
         );
         if (parsed && Array.isArray(parsed.messages)) {
-            this.committedMessages = this.normalizeParsedMessages(parsed.messages, this.currentTurnScope);
+            this.committedMessages = normalizeCliParsedMessages(parsed.messages, {
+                committedMessages: this.committedMessages,
+                scope: this.currentTurnScope,
+                lastOutputAt: this.lastOutputAt,
+            });
             const promptForTrim = this.currentTurnScope?.prompt || getLastUserPromptText(this.committedMessages);
             if (promptForTrim) {
                 const lastAssistantForTrim = [...this.committedMessages].reverse().find((message) => message.role === 'assistant');
@@ -1751,14 +1164,20 @@ export class ProviderCliAdapter implements CliAdapter {
             this.recordTrace('commit_transcript', {
                 parsedStatus: parsed.status || null,
                 messageCount: this.committedMessages.length,
-                lastAssistant: lastAssistant ? this.summarizeTraceText(lastAssistant.content, 320) : '',
-                messages: this.summarizeTraceMessages(this.committedMessages),
-                ...this.buildTraceParseSnapshot(this.currentTurnScope, this.responseBuffer),
+                lastAssistant: lastAssistant ? summarizeCliTraceText(lastAssistant.content, 320) : '',
+                messages: summarizeCliTraceMessages(this.committedMessages),
+                ...buildCliTraceParseSnapshot({
+                    accumulatedBuffer: this.accumulatedBuffer,
+                    accumulatedRawBuffer: this.accumulatedRawBuffer,
+                    responseBuffer: this.responseBuffer,
+                    partialResponse: this.responseBuffer,
+                    scope: this.currentTurnScope,
+                }),
             });
             if (!lastAssistant && this.currentTurnScope) {
                 LOG.warn(
                     'CLI',
-                    `[${this.cliType}] Commit without assistant turn: prompt=${JSON.stringify(this.currentTurnScope.prompt).slice(0, 140)} responseBuffer=${JSON.stringify(this.summarizeTraceText(this.responseBuffer, 220)).slice(0, 260)} providerDir=${this.providerResolutionMeta.providerDir || '-'} scriptDir=${this.providerResolutionMeta.scriptDir || '-'} scriptsPath=${this.providerResolutionMeta.scriptsPath || '-'}`
+                    `[${this.cliType}] Commit without assistant turn: prompt=${JSON.stringify(this.currentTurnScope.prompt).slice(0, 140)} responseBuffer=${JSON.stringify(summarizeCliTraceText(this.responseBuffer, 220)).slice(0, 260)} providerDir=${this.providerResolutionMeta.providerDir || '-'} scriptDir=${this.providerResolutionMeta.scriptDir || '-'} scriptsPath=${this.providerResolutionMeta.scriptsPath || '-'}`
                 );
             }
             return {
@@ -1863,14 +1282,18 @@ export class ProviderCliAdapter implements CliAdapter {
             const hydratedMessages = shouldPreferCommittedMessages
                 ? this.committedMessages.map((message, index) => ({
                     ...message,
-                    id: (message as any).id || `msg_${index}`,
-                    index: typeof (message as any).index === 'number' ? (message as any).index : index,
-                    kind: (message as any).kind || 'standard',
-                    receivedAt: typeof (message as any).receivedAt === 'number'
-                        ? (message as any).receivedAt
+                    id: message.id || `msg_${index}`,
+                    index: typeof message.index === 'number' ? message.index : index,
+                    kind: message.kind || 'standard',
+                    receivedAt: typeof message.receivedAt === 'number'
+                        ? message.receivedAt
                         : message.timestamp,
                 }))
-                : this.hydrateParsedMessages(parsed.messages, this.currentTurnScope);
+                : hydrateCliParsedMessages(parsed.messages, {
+                    committedMessages: this.committedMessages,
+                    scope: this.currentTurnScope,
+                    lastOutputAt: this.lastOutputAt,
+                });
             return {
                 id: parsed.id || 'cli_session',
                 status: parsed.status || this.currentStatus,
@@ -1903,11 +1326,16 @@ export class ProviderCliAdapter implements CliAdapter {
         if (typeof fn !== 'function') {
             throw new Error(`CLI script '${scriptName}' not available`);
         }
-        const input = this.buildParseInput(
-            this.committedMessages,
-            this.responseBuffer,
-            this.currentTurnScope,
-        );
+        const input = buildCliParseInput({
+            accumulatedBuffer: this.accumulatedBuffer,
+            accumulatedRawBuffer: this.accumulatedRawBuffer,
+            recentOutputBuffer: this.recentOutputBuffer,
+            terminalScreenText: this.terminalScreen.getText(),
+            baseMessages: this.committedMessages,
+            partialResponse: this.responseBuffer,
+            scope: this.currentTurnScope,
+            runtimeSettings: this.runtimeSettings,
+        });
         return await Promise.resolve(fn({
             ...input,
             args: args && typeof args === 'object' ? { ...args } : {},
@@ -1917,7 +1345,16 @@ export class ProviderCliAdapter implements CliAdapter {
     private parseCurrentTranscript(baseMessages: CliChatMessage[], partialResponse: string, scope?: TurnParseScope | null): any {
         if (!this.cliScripts?.parseOutput) return null;
         try {
-            const input = this.buildParseInput(baseMessages, partialResponse, scope);
+            const input = buildCliParseInput({
+                accumulatedBuffer: this.accumulatedBuffer,
+                accumulatedRawBuffer: this.accumulatedRawBuffer,
+                recentOutputBuffer: this.recentOutputBuffer,
+                terminalScreenText: this.terminalScreen.getText(),
+                baseMessages,
+                partialResponse,
+                scope,
+                runtimeSettings: this.runtimeSettings,
+            });
             const parsed = this.cliScripts.parseOutput(input);
             const refinedStatus = this.refineDetectedStatus(typeof parsed?.status === 'string' ? parsed.status : null, input.recentBuffer, input.screenText);
             if (parsed && refinedStatus && parsed.status !== refinedStatus) {
@@ -2005,7 +1442,7 @@ export class ProviderCliAdapter implements CliAdapter {
             rawBufferStart: this.accumulatedRawBuffer.length,
         };
         this.recordTrace('send_message', {
-            text: this.summarizeTraceText(text, 500),
+            text: summarizeCliTraceText(text, 500),
             estimatedLines: estimatePromptDisplayLines(text),
             turnScope: this.currentTurnScope,
         });
@@ -2040,7 +1477,7 @@ export class ProviderCliAdapter implements CliAdapter {
             this.recordTrace('submit_write', {
                 mode: 'submit_key',
                 sendKey: this.sendKey,
-                screenText: this.summarizeTraceText(this.terminalScreen.getText(), 500),
+                screenText: summarizeCliTraceText(this.terminalScreen.getText(), 500),
             });
             this.ptyProcess.write(this.sendKey);
             const retrySubmitIfStuck = (attempt: number) => {
@@ -2057,7 +1494,7 @@ export class ProviderCliAdapter implements CliAdapter {
                     mode: 'submit_retry',
                     attempt,
                     sendKey: this.sendKey,
-                    screenText: this.summarizeTraceText(screenText, 500),
+                    screenText: summarizeCliTraceText(screenText, 500),
                 });
                 this.ptyProcess.write(this.sendKey);
                 if (attempt >= 3) {
@@ -2074,9 +1511,9 @@ export class ProviderCliAdapter implements CliAdapter {
             this.submitPendingUntil = 0;
             this.recordTrace('submit_write', {
                 mode: 'immediate',
-                text: this.summarizeTraceText(text, 500),
+                text: summarizeCliTraceText(text, 500),
                 sendKey: this.sendKey,
-                screenText: this.summarizeTraceText(this.terminalScreen.getText(), 500),
+                screenText: summarizeCliTraceText(this.terminalScreen.getText(), 500),
             });
             this.ptyProcess.write(text + this.sendKey);
             this.submitRetryTimer = setTimeout(() => {
@@ -2092,7 +1529,7 @@ export class ProviderCliAdapter implements CliAdapter {
                     mode: 'immediate_retry',
                     attempt: 1,
                     sendKey: this.sendKey,
-                    screenText: this.summarizeTraceText(screenText, 500),
+                    screenText: summarizeCliTraceText(screenText, 500),
                 });
                 this.ptyProcess.write(this.sendKey);
                 this.submitRetryUsed = true;
@@ -2107,9 +1544,9 @@ export class ProviderCliAdapter implements CliAdapter {
         this.ptyProcess.write(text);
         this.recordTrace('submit_write', {
             mode: 'type_then_submit',
-            text: this.summarizeTraceText(text, 500),
+            text: summarizeCliTraceText(text, 500),
             sendKey: this.sendKey,
-            screenText: this.summarizeTraceText(this.terminalScreen.getText(), 500),
+            screenText: summarizeCliTraceText(this.terminalScreen.getText(), 500),
         });
         const submitStartedAt = Date.now();
         let lastNormalizedScreen = '';
@@ -2394,7 +1831,7 @@ export class ProviderCliAdapter implements CliAdapter {
             responseSettleIgnoreUntil: this.responseSettleIgnoreUntil,
             resizeSuppressUntil: this.resizeSuppressUntil,
             hasCliScripts: this.hasCliScripts(),
-            scriptNames: Object.keys(this.cliScripts).filter(k => typeof (this.cliScripts as any)[k] === 'function'),
+            scriptNames: listCliScriptNames(this.cliScripts),
             traceSessionId: this.traceSessionId,
             traceEntryCount: this.traceEntries.length,
             statusHistory: this.statusHistory.slice(-30),
@@ -2412,37 +1849,17 @@ export class ProviderCliAdapter implements CliAdapter {
             providerResolution: this.providerResolutionMeta,
             entryCount: this.traceEntries.length,
             entries: this.traceEntries.slice(-cappedLimit),
-            screenText: this.summarizeTraceText(this.terminalScreen.getText(), 4000),
-            recentOutputBuffer: this.summarizeTraceText(this.recentOutputBuffer, 1000),
-            responseBuffer: this.summarizeTraceText(this.responseBuffer, 1200),
+            screenText: summarizeCliTraceText(this.terminalScreen.getText(), 4000),
+            recentOutputBuffer: summarizeCliTraceText(this.recentOutputBuffer, 1000),
+            responseBuffer: summarizeCliTraceText(this.responseBuffer, 1200),
             status: this.currentStatus,
             activeModal: this.activeModal,
             currentTurnScope: this.currentTurnScope,
-            messages: this.summarizeTraceMessages(this.committedMessages, 5),
+            messages: summarizeCliTraceMessages(this.committedMessages, 5),
         };
     }
 
-    getProviderResolutionMeta(): Record<string, any> {
+    getProviderResolutionMeta(): ProviderResolutionMeta {
         return { ...this.providerResolutionMeta };
     }
-
-    private respondToTerminalQueries(data: string): void {
-        if (!this.ptyProcess || !data) return;
-
-        const combined = this.pendingTerminalQueryTail + data;
-        const regex = /\x1b\[(\?)?6n/g;
-        let match: RegExpExecArray | null;
-
-        while ((match = regex.exec(combined)) !== null) {
-            const cursor = this.terminalScreen.getCursorPosition();
-            const row = Math.max(1, (cursor.row | 0) + 1);
-            const col = Math.max(1, (cursor.col | 0) + 1);
-            const response = match[1]
-                ? `\x1b[?${row};${col}R`
-                : `\x1b[${row};${col}R`;
-            this.ptyProcess.write(response);
-        }
-
-        this.pendingTerminalQueryTail = computeTerminalQueryTail(combined);
-    }
 }