@adhdev/daemon-core 0.9.82-rc.15 → 0.9.82-rc.152

package/src/commands/chat-commands.ts

@@ -12,11 +12,20 @@ import type { CliAdapter } from '../cli-adapter-types.js';
 import { flattenContent, normalizeInputEnvelope, type InputEnvelope, type ProviderModule, type ProviderScripts } from '../providers/contracts.js';
 import { assertProviderSupportsDeclaredInput, assertTextOnlyInput } from '../providers/provider-input-support.js';
 import { validateReadChatResultPayload } from '../providers/read-chat-contract.js';
+import { pickApprovalButton } from '../providers/approval-utils.js';
 import type { ProviderInstance } from '../providers/provider-instance.js';
-import { readProviderChatHistory } from '../config/chat-history.js';
+import { isNativeSourceCanonicalHistory, readChatHistory, readProviderChatHistory } from '../config/chat-history.js';
 import { LOG, getRecentLogs } from '../logging/logger.js';
 import { getRecentDebugTrace, recordDebugTrace } from '../logging/debug-trace.js';
 import { buildChatMessageSignature, hashSignatureParts } from '../chat/chat-signatures.js';
+import {
+    CHAT_SOURCE_REGISTRY,
+    buildV1NativePresentObservation,
+    chatSourceSessionKey,
+    type ChatSourceDecision,
+    type ChatSourceObservation,
+    type ChatSourceTransitionCause,
+} from '../chat/source-resolver.js';
 import type { ChatMessage } from '../types.js';
 import type { SessionTransport } from '../shared-types.js';
 import { filterUserFacingChatMessages, normalizeChatMessages } from '../providers/chat-message-normalization.js';
@@ -24,6 +33,25 @@ import { filterUserFacingChatMessages, normalizeChatMessages } from '../provider
 const RECENT_SEND_WINDOW_MS = 1200;
 export const READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS = 25_000;
 const HERMES_CLI_STARTING_SEND_SETTLE_MS = 2_000;
+// (A2.2) CLI_NATIVE_HISTORY_FRESH_MS removed with isNativeHistoryFreshEnough.
+// Hardcoded native-transcript provider allow-list. Deprecated. Kept only as a
+// last-resort fallback when ProviderModule is not yet loaded; on every hit we
+// warn so the dependency on this set is visible. A2 deletes the set entirely
+// and routes solely through canonicalHistory.contractVersion +
+// isNativeSourceCanonicalHistory().
+const CLI_NATIVE_TRANSCRIPT_PROVIDERS = new Set(['codex-cli', 'claude-cli', 'hermes-cli', 'antigravity-cli']);
+const warnedLegacyNativeAllowlistHits = new Set<string>();
+function warnLegacyNativeAllowlistHit(providerType: string): void {
+    if (warnedLegacyNativeAllowlistHits.has(providerType)) return;
+    warnedLegacyNativeAllowlistHits.add(providerType);
+    // eslint-disable-next-line no-console
+    console.warn(
+        `[chat-commands] supportsCliNativeTranscript fell back to the hardcoded `
+        + `CLI_NATIVE_TRANSCRIPT_PROVIDERS set for "${providerType}". `
+        + `The provider module was unavailable or did not declare canonicalHistory. `
+        + `Set canonicalHistory.contractVersion in the provider.json to remove this dependency.`,
+    );
+}
 const recentSendByTarget = new Map<string, number>();
 
 interface ApprovalSelectableInstance extends ProviderInstance {
@@ -32,6 +60,7 @@ interface ApprovalSelectableInstance extends ProviderInstance {
 
 interface RuntimeChatMessageMerger extends ProviderInstance {
     mergeRuntimeChatMessages?(messages: ChatMessage[]): ChatMessage[];
+    recordAcknowledgedUserInput?(input: InputEnvelope | string): void;
 }
 
 type LegacyStringScript = (params?: Record<string, unknown> | string) => string;
@@ -48,6 +77,16 @@ function getTargetedCliAdapter(h: CommandHelpers, args: any, providerType?: stri
     return h.getCliAdapter(args?.targetSessionId || providerType || h.currentSession?.providerType || h.currentManagerKey);
 }
 
+function getExplicitHistorySessionId(args: any): string | undefined {
+    const explicit = typeof args?.historySessionId === 'string' ? args.historySessionId.trim() : '';
+    if (explicit) return explicit;
+
+    const explicitProviderSessionId = typeof args?.providerSessionId === 'string' ? args.providerSessionId.trim() : '';
+    if (explicitProviderSessionId) return explicitProviderSessionId;
+
+    return undefined;
+}
+
 function getTargetInstance(h: CommandHelpers, args: any): ApprovalSelectableInstance | null {
     const targetSessionId = typeof args?.targetSessionId === 'string' ? args.targetSessionId.trim() : '';
     const sessionId = targetSessionId || h.currentSession?.sessionId || '';
@@ -139,19 +178,47 @@ async function waitOnceForFreshHermesCliStart(adapter: CliAdapter, log: (msg: st
 }
 
 function getHistorySessionId(h: CommandHelpers, args: any): string | undefined {
-    const explicit = typeof args?.historySessionId === 'string' ? args.historySessionId.trim() : '';
+    const explicit = getExplicitHistorySessionId(args);
     if (explicit) return explicit;
 
-    const explicitProviderSessionId = typeof args?.providerSessionId === 'string' ? args.providerSessionId.trim() : '';
-    if (explicitProviderSessionId) return explicitProviderSessionId;
-
     const targetSessionId = typeof args?.targetSessionId === 'string' ? args.targetSessionId.trim() : '';
     if (!targetSessionId) return undefined;
 
-    const instance = h.ctx.instanceManager?.getInstance(targetSessionId);
+    const session = h.ctx.sessionRegistry?.get(targetSessionId) as any;
+    const registeredProviderSessionId = typeof session?.providerSessionId === 'string' ? session.providerSessionId.trim() : '';
+    if (registeredProviderSessionId) return registeredProviderSessionId;
+
+    const instance = getTargetInstance(h, args);
     const state = instance?.getState?.();
     const providerSessionId = typeof state?.providerSessionId === 'string' ? state.providerSessionId.trim() : '';
-    return providerSessionId || targetSessionId;
+    if (providerSessionId) return providerSessionId;
+
+    const currentSession = h.currentSession as any;
+    if (currentSession?.sessionId === targetSessionId) {
+        const currentProviderSessionId = typeof currentSession.providerSessionId === 'string'
+            ? currentSession.providerSessionId.trim()
+            : '';
+        if (currentProviderSessionId) return currentProviderSessionId;
+    }
+
+    return targetSessionId;
+}
+
+function resolveCliNativeHistorySessionId(args: any, currentHistorySessionId: string | undefined, parsedProviderSessionId: string | undefined): string | undefined {
+    const explicit = getExplicitHistorySessionId(args);
+    if (explicit) return explicit;
+
+    const parsed = typeof parsedProviderSessionId === 'string' ? parsedProviderSessionId.trim() : '';
+    const current = typeof currentHistorySessionId === 'string' ? currentHistorySessionId.trim() : '';
+    const targetSessionId = typeof args?.targetSessionId === 'string' ? args.targetSessionId.trim() : '';
+
+    // getHistorySessionId falls back to the runtime session id when no native
+    // handle has been registered yet. For live CLI adapters the parser may
+    // already know the provider-native handle; prefer it over the runtime id so
+    // exact native reads do not miss the worker transcript and fall back to PTY
+    // or same-workspace history.
+    if (parsed && (!current || current === targetSessionId)) return parsed;
+    return current || parsed || undefined;
 }
 
 function getInteractionId(args: any): string | undefined {
@@ -221,6 +288,808 @@ function normalizeReadChatMessages(payload: Record<string, any>): ChatMessage[]
     return normalizeChatMessages(messages);
 }
 
+function getMessageNewestReceivedAt(messages: Array<{ receivedAt?: unknown; timestamp?: unknown }>): number {
+    let newest = 0;
+    for (const message of messages) {
+        const receivedAt = Number(message?.receivedAt ?? message?.timestamp ?? 0);
+        if (Number.isFinite(receivedAt) && receivedAt > newest) newest = receivedAt;
+    }
+    return newest;
+}
+
+function readHistorySessionIdFromMessages(messages: ChatMessage[]): string | undefined {
+    for (const message of messages as Array<ChatMessage & { historySessionId?: unknown }>) {
+        const historySessionId = typeof message?.historySessionId === 'string' ? message.historySessionId.trim() : '';
+        if (historySessionId) return historySessionId;
+    }
+    return undefined;
+}
+
+function shouldPreserveNativeIdentity(providerType: string, sessionId: string, message: ChatMessage): boolean {
+    const providerUnitKey = typeof message.providerUnitKey === 'string' ? message.providerUnitKey.trim() : '';
+    const turnKey = typeof message._turnKey === 'string' ? message._turnKey.trim() : '';
+    if (!providerUnitKey) return false;
+    // (A2.3) v2 stamped identity is producer-owned and globally stable; trust it
+    // unconditionally. Producers may omit _turnKey (the daemon recomputes it
+    // from the current ordering), so do not require turnKey for v2 messages.
+    if (providerUnitKey.startsWith('v2:') || providerUnitKey.startsWith('v2-pty:')) {
+        return true;
+    }
+    // v1 identity always required both keys to be present.
+    if (!turnKey) return false;
+    if (providerType === 'hermes-cli' && sessionId) {
+        return providerUnitKey.startsWith(`${providerType}:native:${sessionId}:`)
+            && turnKey.startsWith(`${providerType}:native-turn:${sessionId}:`);
+    }
+    return true;
+}
+
+function normalizeNativeHistoryMessages(providerType: string, messages: ChatMessage[], nativeSessionId?: string): ChatMessage[] {
+    let turnIndex = 0;
+    return normalizeChatMessages(messages).map((message, index) => {
+        const role = typeof message.role === 'string' ? message.role.trim().toLowerCase() : '';
+        const kind = typeof message.kind === 'string' && message.kind.trim() ? message.kind.trim() : (role === 'system' ? 'system' : 'standard');
+        if ((role === 'user' || role === 'human') && index > 0) turnIndex += 1;
+        const historySessionId = typeof (message as any).historySessionId === 'string'
+            ? (message as any).historySessionId.trim()
+            : '';
+        const contentHash = hashSignatureParts([
+            providerType,
+            historySessionId,
+            String(message.receivedAt || message.timestamp || index),
+            role,
+            kind,
+            flattenContent(message.content),
+        ]).slice(0, 12);
+        const nativeIdentitySessionId = historySessionId || (typeof nativeSessionId === 'string' ? nativeSessionId.trim() : '');
+        const preserveNativeIdentity = shouldPreserveNativeIdentity(providerType, nativeIdentitySessionId, message);
+        const existingProviderUnitKey = typeof message.providerUnitKey === 'string' ? message.providerUnitKey.trim() : '';
+        const existingTurnKey = typeof message._turnKey === 'string' ? message._turnKey.trim() : '';
+        const providerUnitKey = preserveNativeIdentity
+            ? existingProviderUnitKey
+            : `${providerType}:native:${nativeIdentitySessionId || 'workspace'}:${index}:${role || 'message'}:${kind}:${contentHash}`;
+        const meta = message.meta && typeof message.meta === 'object' ? message.meta as Record<string, unknown> : undefined;
+        const isSystemSessionStart = role === 'system' || kind === 'system' || kind === 'session_start';
+        const isActivity = role === 'assistant' && (kind === 'tool' || kind === 'terminal' || kind === 'thought');
+        // (A2.3) sequence emit. Producer-supplied wins (v2-stamped messages
+        // bring their own monotonic sequence); otherwise derive from
+        // receivedAt/timestamp; otherwise positional. Always present on the
+        // output so consumers (ChatSourceMachine) have a stable ordering key.
+        const existingSequence = typeof (message as any).sequence === 'number'
+            && Number.isFinite((message as any).sequence)
+                ? (message as any).sequence
+                : null;
+        const tsCandidate = Number(message.receivedAt || message.timestamp || 0);
+        const sequence = existingSequence !== null
+            ? existingSequence
+            : (tsCandidate > 0 ? tsCandidate : index);
+        return {
+            ...message,
+            role: role === 'human' ? 'user' : (role || 'assistant'),
+            kind: isSystemSessionStart ? 'system' : kind,
+            providerUnitKey,
+            bubbleId: typeof message.bubbleId === 'string' && message.bubbleId.trim()
+                && preserveNativeIdentity
+                ? message.bubbleId.trim()
+                : `bubble:${providerUnitKey}`,
+            sequence,
+            _turnKey: preserveNativeIdentity
+                ? existingTurnKey
+                : `${providerType}:native-turn:${nativeIdentitySessionId || 'workspace'}:${turnIndex}`,
+            bubbleState: message.bubbleState || 'final',
+            ...(isSystemSessionStart ? {
+                visibility: message.visibility || 'hidden',
+                transcriptVisibility: message.transcriptVisibility || 'hidden',
+                audience: message.audience || 'internal',
+                source: message.source || 'runtime_status',
+            } : isActivity ? {
+                source: message.source || (kind === 'terminal' ? 'terminal_command' : 'tool_call'),
+                meta: { ...meta, label: message.senderName || meta?.label || (kind === 'terminal' ? 'Terminal' : 'Tool') },
+            } : {
+                source: message.source || (role === 'assistant' ? 'assistant_text' : undefined),
+            }),
+        } as ChatMessage;
+    });
+}
+
+function buildCliMessageSourceProvenance(args: {
+    selected: 'native-history' | 'pty-parser';
+    provider: string;
+    nativeHandle?: string;
+    sessionWorkspace?: string;
+    intendedWorkspace?: string;
+    transcriptWorkspace?: string;
+    fallbackReason?: string;
+    nativeSource?: string;
+    sourcePath?: string;
+    sourceMtimeMs?: number;
+    nativeHistoryCoverage?: string;
+    partialReason?: string;
+    unavailableReason?: string;
+    nativeMessages?: ChatMessage[];
+    ptyMessages?: ChatMessage[];
+    returnedMessages?: ChatMessage[];
+    safeMapping?: boolean;
+    freshEnough?: boolean;
+    ptyStatusApprovalOnly?: boolean;
+}): Record<string, unknown> {
+    const sourceMtimeMs = Number(args.sourceMtimeMs || 0);
+    const sourceMtimeAgeMs = sourceMtimeMs > 0 ? Math.max(0, Date.now() - sourceMtimeMs) : undefined;
+    const nativeMessages = args.nativeMessages || [];
+    const ptyMessages = args.ptyMessages || [];
+    const returnedMessages = args.returnedMessages || [];
+    const identityStatus = args.selected === 'native-history'
+        ? 'safe'
+        : args.fallbackReason === 'native_history_not_safely_mapped'
+            ? 'ambiguous_session_identity'
+            : args.fallbackReason?.startsWith('native_history_unavailable')
+                ? 'transcript_unmapped'
+                : undefined;
+    return {
+        selected: args.selected,
+        provider: args.provider,
+        providerType: args.provider,
+        ...(identityStatus ? { identityStatus } : {}),
+        ...(args.nativeHandle ? { nativeHandle: args.nativeHandle } : {}),
+        ...(args.nativeHandle ? { nativeSessionId: args.nativeHandle } : {}),
+        ...(args.sessionWorkspace ? { sessionWorkspace: args.sessionWorkspace } : {}),
+        ...(args.intendedWorkspace ? { intendedWorkspace: args.intendedWorkspace } : {}),
+        ...(args.transcriptWorkspace ? { transcriptWorkspace: args.transcriptWorkspace } : {}),
+        ...(args.fallbackReason ? { fallbackReason: args.fallbackReason } : {}),
+        ...(args.nativeSource ? { nativeSource: args.nativeSource } : {}),
+        ...(args.sourcePath ? { sourcePath: args.sourcePath } : {}),
+        ...(args.nativeHistoryCoverage ? { nativeHistoryCoverage: args.nativeHistoryCoverage } : {}),
+        ...(args.partialReason ? { partialReason: args.partialReason } : {}),
+        ...(args.unavailableReason ? { unavailableReason: args.unavailableReason } : {}),
+        ptyStatusApprovalOnly: args.ptyStatusApprovalOnly === true,
+        staleness: {
+            sourceMtimeMs: sourceMtimeMs || undefined,
+            sourceMtimeAgeMs,
+            nativeNewestMessageAt: getMessageNewestReceivedAt(nativeMessages),
+            ptyNewestMessageAt: getMessageNewestReceivedAt(ptyMessages),
+            freshEnough: args.freshEnough === true,
+        },
+        coverage: {
+            nativeMessageCount: nativeMessages.length,
+            ptyMessageCount: ptyMessages.length,
+            returnedMessageCount: returnedMessages.length,
+            safeMapping: args.safeMapping === true,
+            // true when PTY message bodies are suppressed and must not be treated as
+            // chat content. PTY may still contribute status/approval/screen evidence.
+            ptyMessagesSuppressed: args.selected === 'native-history' || args.ptyStatusApprovalOnly === true,
+        },
+    };
+}
+
+/**
+ * Map a ChatSourceMachine transition cause back to the v1 messageSource
+ * `fallbackReason` vocabulary so legacy consumers (web-cloud, tests, mesh
+ * debug bundles) keep parsing strings they already know. A3 replaces the
+ * caller surface with stateTransition/lockState, after which this map can be
+ * deleted.
+ *
+ * Returns undefined when the cause does not correspond to a fallback (i.e.
+ * the source is native-history and there is nothing to explain).
+ */
+function causeToLegacyFallbackReason(
+    cause: ChatSourceTransitionCause,
+    selected: 'native-history' | 'pty-parser',
+    extraDetail?: { unavailableReason?: string; nativeSource?: string },
+): string | undefined {
+    if (selected === 'native-history') return undefined;
+    switch (cause) {
+        case 'initial':
+            return 'native_history_not_checked';
+        case 'native_progressed':
+            // Selected pty-parser despite a progressed observation — that
+            // means we held PtyOnly stickily (peak unmet or non-superset).
+            return 'native_history_not_selected';
+        case 'native_regressed_shrunk':
+            return 'native_history_empty';
+        case 'native_regressed_unsafe_mapping':
+            return 'native_history_not_safely_mapped';
+        case 'native_regressed_coverage_partial':
+            return 'native_history_partial';
+        case 'native_regressed_coverage_unavailable':
+            return 'native_history_unavailable';
+        case 'native_unavailable_read_error':
+            return extraDetail?.unavailableReason
+                ? `native_history_unavailable:${extraDetail.unavailableReason}`
+                : 'native_history_unavailable';
+        case 'native_unavailable_provider_unsupported':
+            return 'provider_native_transcript_not_supported';
+        case 'native_unavailable_empty':
+            return 'native_history_empty';
+        case 'native_unavailable_not_native_source':
+            return extraDetail?.nativeSource
+                ? `native_history_source_${extraDetail.nativeSource}`
+                : 'native_history_unavailable';
+    }
+}
+
+/**
+ * Translate a native-history fetch result + provider/adapter context into a
+ * ChatSourceObservation and drive ChatSourceRegistry. Returns the decision
+ * together with the legacy messageSource payload so call sites can produce
+ * a v1-compatible response without duplicating the registry plumbing.
+ *
+ * This is the replacement for the 300-line if-ladder that previously lived
+ * inline in handleReadChat. It is intentionally split out for two reasons:
+ * (1) we will call it from two places (CLI adapter branch + history-only
+ * branch) instead of duplicating the ladder, (2) tests can drive it with
+ * synthetic native-history results to verify the cause→fallbackReason
+ * mapping without booting the whole readChat pipeline.
+ */
+function decideCliReadChatSource(args: {
+    providerType: string;
+    provider?: ProviderModule;
+    sessionId: string;
+    nativeHistoryResult: any | null;
+    nativeHistoryError?: unknown;
+    safeMapping: boolean;
+    sessionWorkspace?: string;
+    intendedWorkspace?: string;
+    ptyMessages: ChatMessage[];
+    ptyStatusApprovalOnly: boolean;
+}): {
+    decision: ChatSourceDecision;
+    messageSource: Record<string, unknown>;
+    nativeMessages: ChatMessage[];
+    nativeSelected: boolean;
+} {
+    const supportsNative = supportsCliNativeTranscript(args.providerType, args.provider);
+    const observation = buildObservationForCli(args, supportsNative);
+    const sessionKey = chatSourceSessionKey(args.providerType, args.sessionId);
+    const decision = CHAT_SOURCE_REGISTRY.observe(sessionKey, observation);
+
+    const nativeMessages: ChatMessage[] = observation.kind === 'native_present'
+        ? extractNativeMessagesFromResult(args.providerType, args.nativeHistoryResult)
+        : [];
+
+    const nativeSource = typeof args.nativeHistoryResult?.source === 'string'
+        ? args.nativeHistoryResult.source
+        : undefined;
+    const sourcePath = typeof args.nativeHistoryResult?.sourcePath === 'string'
+        ? args.nativeHistoryResult.sourcePath
+        : undefined;
+    const sourceMtimeMs = typeof args.nativeHistoryResult?.sourceMtimeMs === 'number'
+        ? args.nativeHistoryResult.sourceMtimeMs
+        : undefined;
+    const coverageHint = typeof args.nativeHistoryResult?.nativeHistoryCoverage === 'string'
+        ? args.nativeHistoryResult.nativeHistoryCoverage
+        : undefined;
+    const partialReason = typeof args.nativeHistoryResult?.partialReason === 'string'
+        ? args.nativeHistoryResult.partialReason
+        : undefined;
+    const unavailableReason = typeof args.nativeHistoryResult?.unavailableReason === 'string'
+        ? args.nativeHistoryResult.unavailableReason
+        : args.nativeHistoryError
+            ? `error:${(args.nativeHistoryError as any)?.message || String(args.nativeHistoryError)}`
+            : undefined;
+    const nativeHandle = typeof args.nativeHistoryResult?.providerSessionId === 'string'
+        ? args.nativeHistoryResult.providerSessionId
+        : undefined;
+    const transcriptWorkspace = typeof args.nativeHistoryResult?.workspace === 'string'
+        ? args.nativeHistoryResult.workspace
+        : nativeMessages.map((m: any) => typeof m?.workspace === 'string' ? m.workspace.trim() : '').find(Boolean);
+
+    const fallbackReason = causeToLegacyFallbackReason(decision.transition.cause, decision.selected, {
+        unavailableReason,
+        nativeSource: nativeSource && nativeSource !== 'provider-native' ? nativeSource : undefined,
+    });
+
+    // ptyStatusApprovalOnly: when the machine selected native-history we
+    // suppress PTY content so the dashboard does not double-show messages
+    // already in the native transcript. When the machine selected
+    // pty-parser, PTY is the authoritative source — do NOT suppress it.
+    // Callers used to hard-code this to `nativeSelected first = true` which
+    // suppressed PTY content even when native was empty/unavailable, leaving
+    // the dashboard with zero visible messages (the codex generating/waiting
+    // approval stuck state). Trust the machine here, not the caller hint.
+    const ptyStatusApprovalOnly = decision.selected === 'native-history'
+        ? true
+        : args.ptyStatusApprovalOnly;
+
+    const messageSource = buildCliMessageSourceProvenance({
+        selected: decision.selected,
+        provider: args.providerType,
+        nativeHandle,
+        sessionWorkspace: args.sessionWorkspace,
+        intendedWorkspace: args.intendedWorkspace,
+        transcriptWorkspace,
+        fallbackReason,
+        nativeSource,
+        sourcePath,
+        sourceMtimeMs,
+        nativeHistoryCoverage: coverageHint,
+        partialReason,
+        unavailableReason,
+        nativeMessages,
+        ptyMessages: args.ptyMessages,
+        returnedMessages: decision.selected === 'native-history' ? nativeMessages : args.ptyMessages,
+        safeMapping: args.safeMapping,
+        // freshEnough is a v1 concept the machine does not model directly.
+        // We surface lockState.locked here so v1 consumers reading
+        // staleness.freshEnough still get a meaningful boolean.
+        freshEnough: decision.lockState.locked,
+        ptyStatusApprovalOnly,
+    });
+
+    return {
+        decision,
+        messageSource,
+        nativeMessages,
+        nativeSelected: decision.selected === 'native-history',
+    };
+}
+
+function buildObservationForCli(
+    args: {
+        providerType: string;
+        sessionId: string;
+        nativeHistoryResult: any | null;
+        nativeHistoryError?: unknown;
+        safeMapping: boolean;
+    },
+    supportsNative: boolean,
+): ChatSourceObservation {
+    if (!supportsNative) {
+        return { kind: 'native_unavailable', reason: 'provider_not_supported' };
+    }
+    if (args.nativeHistoryError) {
+        return { kind: 'native_unavailable', reason: 'read_error' };
+    }
+    const result = args.nativeHistoryResult;
+    if (!result || typeof result !== 'object') {
+        return { kind: 'native_unavailable', reason: 'read_error' };
+    }
+    const source = typeof result.source === 'string' ? result.source : '';
+    if (source && source !== 'provider-native') {
+        // 'native-unavailable' or other producer-side declined source.
+        return { kind: 'native_unavailable', reason: source === 'native-unavailable' ? 'empty' : 'not_native_source' };
+    }
+    const messages = Array.isArray(result.messages) ? result.messages : [];
+    if (messages.length === 0) {
+        return { kind: 'native_unavailable', reason: 'empty' };
+    }
+    const coverage = typeof result.nativeHistoryCoverage === 'string'
+        ? result.nativeHistoryCoverage
+        : 'tail';
+    if (coverage === 'unavailable') {
+        return { kind: 'native_unavailable', reason: 'coverage_unavailable' };
+    }
+    return buildV1NativePresentObservation({
+        providerType: args.providerType,
+        sessionId: args.sessionId,
+        messages,
+        coverage: coverage === 'full' || coverage === 'tail' || coverage === 'current-turn' || coverage === 'partial'
+            ? coverage
+            : 'tail',
+        safeMapping: args.safeMapping,
+    });
+}
+
+function extractNativeMessagesFromResult(providerType: string, result: any): ChatMessage[] {
+    if (!result || !Array.isArray(result.messages)) return [];
+    return normalizeNativeHistoryMessages(
+        providerType,
+        result.messages as ChatMessage[],
+        typeof result.providerSessionId === 'string' ? result.providerSessionId : undefined,
+    );
+}
+
+/**
+ * ptyStatusApprovalOnly is true when the daemon should treat PTY content as
+ * status/approval signal only (not as chat messages). v1 set this to `true`
+ * whenever native-history was selected as the source, and `false` otherwise.
+ * The machine equivalent: when native is the source we want PTY suppressed.
+ */
+function primaryPtyApprovalOnlyFor(_cliType: string, nativeSelected: boolean): boolean {
+    return nativeSelected;
+}
+
+/**
+ * Codex-only unsafe-native fallback: when the primary native fetch produced
+ * unsafe-mapping data, v1 attempted to recover by reading exact runtime
+ * mirror messages, runtime input ACK messages, or by trusting the current-
+ * runtime PTY when safely attributed. None of this is the machine's
+ * responsibility — the machine already decided pty-parser. This helper
+ * preserves the daemon-side message selection and annotates messageSource.
+ */
+function applyUnsafeNativeDaemonFallback(args: {
+    providerType: string;
+    adapter: CliAdapter;
+    helpers: CommandHelpers;
+    readChatArgs: any;
+    sessionWorkspace?: string;
+    intendedWorkspace?: string;
+    ptyMessages: ChatMessage[];
+    nativeHistoryLimit: number;
+    provider?: ProviderModule;
+    messageSourceRef: { set(value: Record<string, unknown>): void; get(): Record<string, unknown> };
+    apply(selection: {
+        messages: ChatMessage[];
+        transcriptAuthority?: 'provider' | 'daemon';
+        coverage?: 'full' | 'tail' | 'current-turn';
+        status?: string;
+    }): void;
+    activeModal: unknown;
+    returnedStatus: string;
+    coverage?: 'full' | 'tail' | 'current-turn';
+}): void {
+    if (args.adapter.cliType !== 'codex-cli') {
+        // Only codex-cli had v1 daemon mirror recovery. Other providers skip.
+        return;
+    }
+    const ms = args.messageSourceRef.get();
+    const fallbackReason = typeof ms.fallbackReason === 'string' ? ms.fallbackReason : '';
+    if (!isUnsafeNativeTranscriptFallback(fallbackReason)) {
+        return;
+    }
+    const safeCurrentRuntimePtyMessages = isCurrentRuntimePtySafelyAttributed({
+        adapter: args.adapter,
+        helpers: args.helpers,
+        readChatArgs: args.readChatArgs,
+        sessionWorkspace: args.sessionWorkspace,
+        intendedWorkspace: args.intendedWorkspace,
+        ptyMessages: args.ptyMessages,
+    });
+    if (safeCurrentRuntimePtyMessages) {
+        args.apply({
+            messages: args.ptyMessages,
+            transcriptAuthority: 'daemon',
+            coverage: args.coverage || 'current-turn',
+            status: args.returnedStatus,
+        });
+        const next = { ...ms, selectedDaemonSource: 'current-runtime-pty', transcriptAuthority: 'daemon', runtimeMappingSafe: true };
+        args.messageSourceRef.set(next);
+        return;
+    }
+    const safeRuntimeAckMessages = selectRuntimeInputAckMessages(args.ptyMessages);
+    if (safeRuntimeAckMessages.length > 0) {
+        args.apply({
+            messages: safeRuntimeAckMessages,
+            transcriptAuthority: 'daemon',
+            coverage: 'tail',
+            status: coerceUnsafeNativeFallbackStatus(args.returnedStatus, args.activeModal),
+        });
+        const next = { ...ms, ptyStatusApprovalOnly: true };
+        args.messageSourceRef.set(next);
+        return;
+    }
+    const exactRuntimeMirrorMessages = readExactRuntimeMirrorMessages({
+        providerType: args.providerType,
+        targetSessionId: typeof args.readChatArgs?.targetSessionId === 'string' ? args.readChatArgs.targetSessionId : undefined,
+        currentSessionId: typeof (args.helpers.currentSession as any)?.sessionId === 'string' ? (args.helpers.currentSession as any).sessionId : undefined,
+        tailLimit: args.nativeHistoryLimit,
+        historyBehavior: args.provider?.historyBehavior,
+    });
+    if (exactRuntimeMirrorMessages.length > 0) {
+        args.apply({
+            messages: exactRuntimeMirrorMessages,
+            transcriptAuthority: 'daemon',
+            coverage: 'tail',
+            status: coerceUnsafeNativeFallbackStatus(args.returnedStatus, args.activeModal),
+        });
+        const next = { ...ms, selectedDaemonSource: 'exact-runtime-mirror', transcriptAuthority: 'daemon', ptyStatusApprovalOnly: true };
+        args.messageSourceRef.set(next);
+        return;
+    }
+    // No daemon mirror available — keep PTY messages as-is (still pty-parser
+    // selection); just coerce status for waiting_approval consistency.
+    args.apply({
+        messages: args.ptyMessages,
+        coverage: args.coverage,
+        status: coerceUnsafeNativeFallbackStatus(args.returnedStatus, args.activeModal),
+    });
+    const next = { ...ms, ptyStatusApprovalOnly: true };
+    args.messageSourceRef.set(next);
+}
+
+// (A2.2) buildNativeHistoryFallbackReason removed. ChatSourceMachine emits a
+// ChatSourceTransitionCause; causeToLegacyFallbackReason maps it back to the
+// v1 vocabulary for response compatibility. A3 deletes the v1 vocabulary
+// entirely and surfaces stateTransition/lockState directly.
+
+function isUnsafeNativeTranscriptFallback(reason?: string): boolean {
+    const value = String(reason || '').trim();
+    return value.startsWith('native_history_unavailable')
+        || value === 'native_history_not_safely_mapped'
+        || value === 'native_history_stale'
+        || value === 'native_history_partial';
+}
+
+function coerceUnsafeNativeFallbackStatus(status: string, activeModal: unknown): string {
+    if (status === 'waiting_approval' && activeModal) return status;
+    return 'idle';
+}
+
+function isRuntimeInputAckMessage(message: ChatMessage | undefined): boolean {
+    if (!message || typeof message !== 'object') return false;
+    const role = String((message as any).role || '').trim().toLowerCase();
+    if (role !== 'user' && role !== 'human') return false;
+    const meta = (message as any).meta;
+    return !!meta && typeof meta === 'object' && !Array.isArray(meta) && meta.runtimeInputAck === true;
+}
+
+function selectRuntimeInputAckMessages(messages: ChatMessage[]): ChatMessage[] {
+    return messages.filter((message) => isRuntimeInputAckMessage(message));
+}
+
+function readExactRuntimeMirrorMessages(args: {
+    providerType: string;
+    targetSessionId?: string;
+    currentSessionId?: string;
+    tailLimit: number;
+    historyBehavior?: ProviderModule['historyBehavior'];
+}): ChatMessage[] {
+    const targetSessionId = String(args.targetSessionId || '').trim();
+    const currentSessionId = String(args.currentSessionId || '').trim();
+    if (!targetSessionId || targetSessionId !== currentSessionId) return [];
+
+    const history = readChatHistory(
+        args.providerType,
+        0,
+        Math.max(args.tailLimit || 0, 200),
+        targetSessionId,
+        0,
+        args.historyBehavior,
+    );
+    return normalizeChatMessages((history.messages || []) as ChatMessage[])
+        .filter((message) => {
+            const historySessionId = String((message as any).historySessionId || '').trim();
+            const instanceId = String((message as any).instanceId || '').trim();
+            return historySessionId === targetSessionId || instanceId === targetSessionId;
+        });
+}
+
+function normalizeComparableWorkspace(value: unknown): string {
+    const text = typeof value === 'string' ? value.trim() : '';
+    if (!text) return '';
+    return path.resolve(text);
+}
+
+function isCurrentRuntimePtySafelyAttributed(args: {
+    adapter: CliAdapter;
+    helpers: CommandHelpers;
+    readChatArgs: any;
+    sessionWorkspace?: string;
+    intendedWorkspace?: string;
+    ptyMessages: ChatMessage[];
+}): boolean {
+    if (args.adapter.cliType !== 'codex-cli') return false;
+    if (!Array.isArray(args.ptyMessages) || args.ptyMessages.length === 0) return false;
+    const targetSessionId = typeof args.readChatArgs?.targetSessionId === 'string'
+        ? args.readChatArgs.targetSessionId.trim()
+        : '';
+    const currentSession = args.helpers.currentSession as any;
+    const currentSessionId = typeof currentSession?.sessionId === 'string'
+        ? currentSession.sessionId.trim()
+        : '';
+    if (!targetSessionId || !currentSessionId || targetSessionId !== currentSessionId) return false;
+
+    const runtimeMeta = typeof (args.adapter as any).getRuntimeMetadata === 'function'
+        ? (args.adapter as any).getRuntimeMetadata()
+        : null;
+    const runtimeId = typeof runtimeMeta?.runtimeId === 'string' ? runtimeMeta.runtimeId.trim() : '';
+    if (!runtimeId || runtimeId !== targetSessionId) return false;
+    const surfaceKind = typeof runtimeMeta?.surfaceKind === 'string' ? runtimeMeta.surfaceKind : '';
+    if (surfaceKind === 'inactive_record' || surfaceKind === 'recovery_snapshot') return false;
+
+    const sessionWorkspace = normalizeComparableWorkspace(args.sessionWorkspace);
+    const adapterWorkspace = normalizeComparableWorkspace(args.adapter.workingDir);
+    if (!sessionWorkspace || !adapterWorkspace || sessionWorkspace !== adapterWorkspace) return false;
+    const intendedWorkspace = normalizeComparableWorkspace(args.intendedWorkspace);
+    if (intendedWorkspace && intendedWorkspace !== sessionWorkspace) return false;
+
+    const registryEntry = args.helpers.ctx?.sessionRegistry?.get?.(targetSessionId) as any;
+    const registryInstanceKey = typeof registryEntry?.adapterKey === 'string' && registryEntry.adapterKey.trim()
+        ? registryEntry.adapterKey.trim()
+        : typeof registryEntry?.instanceKey === 'string' && registryEntry.instanceKey.trim()
+            ? registryEntry.instanceKey.trim()
+            : '';
+    if (registryInstanceKey) {
+        const targetInstance = args.helpers.ctx?.instanceManager?.getInstance?.(registryInstanceKey);
+        if (targetInstance) {
+            const instanceType = typeof (targetInstance as any).type === 'string' ? (targetInstance as any).type : '';
+            if (instanceType && instanceType !== args.adapter.cliType) return false;
+        }
+    }
+
+    return true;
+}
+
+function supportsCliNativeTranscript(providerType: string, provider?: ProviderModule): boolean {
+    // Preferred path: the provider module declares canonicalHistory in its
+    // provider.json. We trust that declaration regardless of the legacy
+    // allow-list. A2 will additionally require canonicalHistory.contractVersion
+    // to be a supported value (transcript-v2.ts).
+    if (provider?.category === 'cli' && isNativeSourceCanonicalHistory(provider?.nativeHistory)) {
+        return true;
+    }
+    // Last-resort fallback for early call sites where the provider module is
+    // not yet loaded. Warn once per provider type so this dependency is visible
+    // and can be removed in A2.
+    if (CLI_NATIVE_TRANSCRIPT_PROVIDERS.has(providerType)) {
+        warnLegacyNativeAllowlistHit(providerType);
+        return true;
+    }
+    return false;
+}
+
+function getComparableVisibleText(message: ChatMessage | undefined): string {
+    if (!message) return '';
+    const role = String((message as any).role || '').trim().toLowerCase();
+    if (role !== 'user' && role !== 'assistant') return '';
+    const kind = String((message as any).kind || 'standard').trim().toLowerCase();
+    if (kind && kind !== 'standard') return '';
+    const content = flattenContent((message as any).content).replace(/\s+/g, ' ').trim();
+    return content;
+}
+
+function hasOverlappingVisibleConversationText(nativeMessages: ChatMessage[], ptyMessages: ChatMessage[]): boolean {
+    const nativeTexts = nativeMessages.map(getComparableVisibleText).filter(Boolean);
+    const ptyTexts = ptyMessages.map(getComparableVisibleText).filter(Boolean);
+    if (nativeTexts.length === 0 || ptyTexts.length === 0) return false;
+    for (const nativeText of nativeTexts) {
+        for (const ptyText of ptyTexts) {
+            if (nativeText === ptyText) return true;
+            const shorter = nativeText.length <= ptyText.length ? nativeText : ptyText;
+            const longer = nativeText.length <= ptyText.length ? ptyText : nativeText;
+            if (shorter.length >= 32 && longer.includes(shorter)) return true;
+        }
+    }
+    return false;
+}
+
+function hasSafeNativeHistoryMapping(args: {
+    historySessionId?: string;
+    providerSessionId?: string;
+    workspace?: string;
+    nativeMessages: ChatMessage[];
+    ptyMessages?: ChatMessage[];
+    requireWorkspaceContentOverlap?: boolean;
+}): boolean {
+    const isCoordinatorTranscript = args.nativeMessages.some((m: any) => {
+        const text = typeof m?.content === 'string' ? m.content : JSON.stringify(m?.content || '');
+        return text.includes('mesh_send_task') || text.includes('mesh_status') || text.includes('mesh_read_chat') || text.includes('mesh_launch_session');
+    });
+
+    const explicitSessionId = String(args.historySessionId || args.providerSessionId || '').trim();
+    if (explicitSessionId) {
+        const messageSessionIds = args.nativeMessages
+            .map((message: any) => typeof message?.historySessionId === 'string' ? message.historySessionId.trim() : '')
+            .filter(Boolean);
+        if (messageSessionIds.length > 0) {
+            return messageSessionIds.some((id) => id === explicitSessionId);
+        }
+
+        // Messages carry no historySessionId — cannot confirm they belong to the requested session.
+        // Only allow a coordinator transcript that is also confirmed by the PTY side; otherwise
+        // fail closed so a same-workspace session's history is never silently accepted.
+        if (isCoordinatorTranscript && args.ptyMessages && args.ptyMessages.length > 0) {
+            const ptyHasCoordinator = args.ptyMessages.some((m: any) => {
+                const text = typeof m?.content === 'string' ? m.content : JSON.stringify(m?.content || '');
+                return text.includes('mesh_send_task') || text.includes('mesh_status') || text.includes('mesh_read_chat');
+            });
+            return ptyHasCoordinator;
+        }
+
+        // No historySessionId in messages and no coordinator cross-check: fail closed.
+        // Workspace-only matching must not override an explicit session identity.
+        return false;
+    }
+    const workspace = String(args.workspace || '').trim();
+    if (!workspace) return false;
+    const workspaceMatches = args.nativeMessages.some((message: any) => String(message?.workspace || '').trim() === workspace);
+    if (!workspaceMatches) return false;
+
+    if (isCoordinatorTranscript && args.ptyMessages && args.ptyMessages.length > 0) {
+        const ptyHasCoordinator = args.ptyMessages.some((m: any) => {
+            const text = typeof m?.content === 'string' ? m.content : JSON.stringify(m?.content || '');
+            return text.includes('mesh_send_task') || text.includes('mesh_status') || text.includes('mesh_read_chat');
+        });
+        if (!ptyHasCoordinator) {
+            return false;
+        }
+    }
+
+    if (!args.requireWorkspaceContentOverlap) return true;
+    return hasOverlappingVisibleConversationText(args.nativeMessages, args.ptyMessages || []);
+}
+
+// Provenance boundary: workspace-only native history lookup is never safe
+// because multiple concurrent sessions sharing the same cwd would alias each
+// other. historySessionId (the provider-native session key) is required to
+// establish ownership. hasSafeNativeHistoryMapping() enforces the same
+// invariant after the read; both guards must hold for native history to be used.
+function readCliProviderNativeHistory(agentStr: string, args: {
+    canonicalHistory?: ProviderModule['canonicalHistory'];
+    historySessionId?: string;
+    workspace?: string;
+    offset: number;
+    limit: number;
+    excludeRecentCount: number;
+    historyBehavior?: ProviderModule['historyBehavior'];
+    scripts?: ProviderScripts;
+    excludeInProgressTurn?: boolean;
+}): ReturnType<typeof readProviderChatHistory> & { lookup: 'session' | 'workspace' } {
+    if (!args.historySessionId) {
+        return {
+            messages: [],
+            hasMore: false,
+            source: 'native-unavailable',
+            unavailableReason: 'native_history_workspace_only_lookup_unsafe',
+            lookup: 'session',
+        } as ReturnType<typeof readProviderChatHistory> & { lookup: 'session' | 'workspace' };
+    }
+    const sessionHistory = readProviderChatHistory(agentStr, {
+        canonicalHistory: args.canonicalHistory,
+        historySessionId: args.historySessionId,
+        workspace: args.workspace,
+        offset: args.offset,
+        limit: args.limit,
+        excludeRecentCount: args.excludeRecentCount,
+        historyBehavior: args.historyBehavior,
+        scripts: args.scripts as any,
+        excludeInProgressTurn: args.excludeInProgressTurn,
+    });
+    // Native transcripts are keyed by provider/runtime session identity. Falling
+    // back to workspace makes concurrent local Codex/Hermes sessions alias each
+    // other when they share the same cwd.
+    return { ...(sessionHistory as any), lookup: 'session' };
+}
+
+function readLiveCodexWorkspaceNativeHistory(agentStr: string, args: {
+    canonicalHistory?: ProviderModule['canonicalHistory'];
+    workspace?: string;
+    offset: number;
+    limit: number;
+    excludeRecentCount: number;
+    historyBehavior?: ProviderModule['historyBehavior'];
+    scripts?: ProviderScripts;
+}): (ReturnType<typeof readProviderChatHistory> & { lookup: 'workspace' }) | null {
+    if (agentStr !== 'codex-cli') return null;
+    const workspace = typeof args.workspace === 'string' ? args.workspace.trim() : '';
+    if (!workspace) return null;
+    const history = readProviderChatHistory(agentStr, {
+        canonicalHistory: args.canonicalHistory,
+        workspace,
+        offset: args.offset,
+        limit: args.limit,
+        excludeRecentCount: args.excludeRecentCount,
+        historyBehavior: args.historyBehavior,
+        scripts: args.scripts as any,
+    });
+    return { ...(history as any), lookup: 'workspace' };
+}
+
+// (A2.2) isNativeHistoryFreshEnough removed. The v1 freshness comparison
+// (native_newest vs pty_newest with a 5-minute mtime grace window) was the
+// direct cause of the plipping behaviour: PTY arrived every turn so native
+// looked stale by default. ChatSourceMachine never compares native vs PTY
+// freshness — the lock holds across arbitrary PTY arrival. See
+// chat/source-machine.ts for the new semantics.
+
+function shouldPreserveReadChatPayloadField(key: string): boolean {
+    return key === 'messageSource' || key === 'transcriptProvenance';
+}
+
+function updateMessageSourceReturnedCount(value: unknown, returnedMessageCount: number): unknown {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) return value;
+    const record = value as Record<string, unknown>;
+    const coverage = record.coverage && typeof record.coverage === 'object' && !Array.isArray(record.coverage)
+        ? record.coverage as Record<string, unknown>
+        : undefined;
+    if (!coverage) return value;
+    return {
+        ...record,
+        coverage: {
+            ...coverage,
+            returnedMessageCount,
+        },
+    };
+}
 
 function deriveHistoryDedupKey(message: ChatMessage & { _unitKey?: string; _turnKey?: string }): string | undefined {
     const unitKey = typeof message._unitKey === 'string' ? message._unitKey.trim() : '';
@@ -281,11 +1150,20 @@ function normalizeReadChatCommandStatus(status: unknown, activeModal: unknown):
     }
     switch (raw) {
         case 'starting':
-            return hasNonEmptyModalButtons(activeModal) ? 'waiting_approval' : 'generating';
+            return hasNonEmptyModalButtons(activeModal) ? 'waiting_approval' : 'starting';
         case 'stopped':
         case 'disconnected':
         case 'not_monitored':
             return 'error';
+        case 'waiting_approval':
+            // The contract validator requires activeModal+buttons whenever
+            // status is waiting_approval. If a producer/coercer set this
+            // status without staging the modal yet (a race we hit with
+            // codex-cli during tool approval setup), downgrade to a
+            // generating-like status so readChat still returns successfully.
+            // The next poll will pick up the modal once the provider has
+            // emitted it.
+            return hasNonEmptyModalButtons(activeModal) ? 'waiting_approval' : 'generating';
         default:
             return raw;
     }
@@ -295,6 +1173,16 @@ function isGeneratingLikeStatus(status: unknown): boolean {
     return status === 'generating' || status === 'streaming' || status === 'long_generating' || status === 'starting';
 }
 
+function hasVisibleAssistantMessage(messages: unknown[] | undefined): boolean {
+    if (!Array.isArray(messages)) return false;
+    return messages.some((message: any) => {
+        if (!message || message.role !== 'assistant') return false;
+        const kind = typeof message.kind === 'string' ? message.kind : 'standard';
+        if (kind !== 'standard') return false;
+        return String(message.content || '').trim().length > 0;
+    });
+}
+
 function shouldTrustCliAdapterTerminalStatus(parsedStatus: unknown, activeModal: unknown, adapter: CliAdapter, adapterStatus: any): boolean {
     if (!isGeneratingLikeStatus(parsedStatus)) return false;
     if (hasNonEmptyModalButtons(activeModal)) return false;
@@ -304,7 +1192,26 @@ function shouldTrustCliAdapterTerminalStatus(parsedStatus: unknown, activeModal:
     return true;
 }
 
-function normalizeCliReadChatStatus(parsedStatus: unknown, activeModal: unknown, adapter: CliAdapter, adapterStatus: any): string {
+function normalizeCliReadChatStatus(parsedStatus: unknown, activeModal: unknown, adapter: CliAdapter, adapterStatus: any, parsedMessages?: unknown[]): string {
+    const adapterRawStatus = typeof adapterStatus?.status === 'string' ? adapterStatus.status.trim() : '';
+    if (adapterRawStatus === 'starting'
+        && isGeneratingLikeStatus(parsedStatus)
+        && !hasNonEmptyModalButtons(activeModal)
+        && Array.isArray(parsedMessages)
+        && parsedMessages.length === 0
+        && Array.isArray(adapterStatus?.messages)
+        && adapterStatus.messages.length === 0
+        && !(typeof adapter.isProcessing === 'function' && adapter.isProcessing())) {
+        return 'starting';
+    }
+    if (
+        isGeneratingLikeStatus(adapterRawStatus)
+        && parsedStatus === 'idle'
+        && !hasNonEmptyModalButtons(activeModal)
+        && !hasVisibleAssistantMessage(parsedMessages)
+    ) {
+        return adapterRawStatus;
+    }
     if (shouldTrustCliAdapterTerminalStatus(parsedStatus, activeModal, adapter, adapterStatus)) return 'idle';
     return typeof parsedStatus === 'string' && parsedStatus.trim() ? parsedStatus : 'idle';
 }
@@ -325,6 +1232,64 @@ function finalizeStreamingMessagesWhenIdle(messages: ChatMessage[], status: stri
     });
 }
 
+/**
+ * Collapse adjacent PTY messages whose canonical (whitespace-stripped)
+ * content is identical, OR whose turn key + role/kind match.
+ *
+ * The PTY parser of some providers (hermes-cli observed in the wild)
+ * emits the same logical assistant turn twice when the terminal re-wraps
+ * the text at a different column. The two emissions differ in newline
+ * position — and sometimes in a single inserted space next to punctuation
+ * (e.g. `(수정 2개), upstream` vs `(수정 2개 ), upstream`), so a simple
+ * `\s+ -> ' '` normalize cannot collapse them.
+ *
+ * Strategy:
+ *   1. If both messages carry the same _turnKey + role + kind, they are
+ *      the same logical turn by construction. Collapse.
+ *   2. Otherwise compare with all whitespace stripped — wrap variants
+ *      collapse to identical strings.
+ *
+ * Native-history paths run through pageHistoryRecords and already
+ * collapse on a normalized signature; this helper is the PTY equivalent
+ * the readChat sync path was missing.
+ */
+function collapseAdjacentDuplicateChatMessages(messages: ChatMessage[]): ChatMessage[] {
+    if (!Array.isArray(messages) || messages.length <= 1) return messages;
+    const result: ChatMessage[] = [];
+    let prevRoleKind = '';
+    let prevStripped = '';
+    for (const message of messages) {
+        const role = typeof message.role === 'string' ? message.role : '';
+        const kind = typeof message.kind === 'string' ? message.kind : 'standard';
+        const content = typeof message.content === 'string'
+            ? message.content
+            : (Array.isArray(message.content) ? message.content.map((p: any) => typeof p?.text === 'string' ? p.text : '').join('') : '');
+        const strippedContent = content.replace(/\s+/g, '');
+        // Empty content or system messages are passed through untouched.
+        if (!strippedContent || role === 'system') {
+            result.push(message);
+            prevRoleKind = '';
+            prevStripped = '';
+            continue;
+        }
+        const roleKind = `${role}:${kind}`;
+        const sameStripped = strippedContent === prevStripped && roleKind === prevRoleKind;
+        if (result.length > 0 && sameStripped) {
+            // Adjacent duplicate after stripping all whitespace. Keep the
+            // *later* copy because PTY's last emission usually has the most
+            // complete formatting.
+            result[result.length - 1] = message;
+            prevRoleKind = roleKind;
+            prevStripped = strippedContent;
+            continue;
+        }
+        result.push(message);
+        prevRoleKind = roleKind;
+        prevStripped = strippedContent;
+    }
+    return result;
+}
+
 function buildReadChatCommandResult(payload: Record<string, any>, args: any): CommandResult {
     let validatedPayload: Record<string, any>;
     const debugReadChat = payload?.debugReadChat && typeof payload.debugReadChat === 'object'
@@ -342,6 +1307,13 @@ function buildReadChatCommandResult(payload: Record<string, any>, args: any): Co
     const visibleMessages = filterUserFacingChatMessages(messages);
     const sync = buildFullTail(visibleMessages, normalizeReadChatTailLimit(args));
     const hiddenMsgCount = Math.max(0, messages.length - visibleMessages.length);
+    const preservedPayloadFields = Object.fromEntries(Object.entries(payload).filter(([key]) => shouldPreserveReadChatPayloadField(key)));
+    if (preservedPayloadFields.messageSource) {
+        preservedPayloadFields.messageSource = updateMessageSourceReturnedCount(preservedPayloadFields.messageSource, sync.messages.length);
+    }
+    if (preservedPayloadFields.transcriptProvenance) {
+        preservedPayloadFields.transcriptProvenance = updateMessageSourceReturnedCount(preservedPayloadFields.transcriptProvenance, sync.messages.length);
+    }
     const returnedDebugReadChat = debugReadChat
         ? {
             ...debugReadChat,
@@ -356,6 +1328,7 @@ function buildReadChatCommandResult(payload: Record<string, any>, args: any): Co
     return {
         success: true,
         ...validatedPayload,
+        ...preservedPayloadFields,
         messages: sync.messages,
         totalMessages: sync.totalMessages,
         ...(returnedDebugReadChat ? { debugReadChat: returnedDebugReadChat } : {}),
@@ -456,7 +1429,7 @@ function summarizeProviderForDebug(provider: ProviderModule | undefined): Record
         name: provider.name,
         category: provider.category,
         version: (provider as any).version,
-        canonicalHistory: provider.canonicalHistory,
+        canonicalHistory: provider.nativeHistory,
         historyBehavior: provider.historyBehavior,
         webviewMatchText: provider.webviewMatchText,
         scriptNames: scripts,
@@ -584,6 +1557,8 @@ function buildChatDebugBundleSummary(bundle: Record<string, unknown>): Record<st
             adapterStatus: debugReadChat.adapterStatus,
             parsedStatus: debugReadChat.parsedStatus,
             returnedStatus: debugReadChat.returnedStatus,
+            selectedMessageSource: debugReadChat.selectedMessageSource,
+            messageSource: debugReadChat.messageSource,
             parsedMsgCount: debugReadChat.parsedMsgCount,
             returnedMsgCount: debugReadChat.returnedMsgCount,
             shouldPreferAdapterMessages: debugReadChat.shouldPreferAdapterMessages,
@@ -646,11 +1621,20 @@ export async function handleGetChatDebugBundle(h: CommandHelpers, args: any): Pr
                 providerSessionId: readResult.providerSessionId,
                 transcriptAuthority: readResult.transcriptAuthority,
                 coverage: readResult.coverage,
+                messageSource: readResult.messageSource,
+                transcriptProvenance: readResult.transcriptProvenance,
                 activeModal: readResult.activeModal,
                 messagesTail: Array.isArray(readResult.messages) ? readResult.messages.slice(-20) : [],
                 debugReadChat: readResult.debugReadChat,
             }
-            : { success: false, error: readResult.error };
+            : {
+                success: false,
+                error: readResult.error,
+                code: readResult.code,
+                messageSource: readResult.messageSource,
+                transcriptProvenance: readResult.transcriptProvenance,
+                debugReadChat: readResult.debugReadChat,
+            };
     } catch (error: any) {
         readChat = { success: false, error: error?.message || String(error) };
     }
@@ -693,6 +1677,9 @@ export async function handleGetChatDebugBundle(h: CommandHelpers, args: any): Pr
             ready: typeof adapter.isReady === 'function' ? adapter.isReady() : undefined,
             processing: typeof adapter.isProcessing === 'function' ? adapter.isProcessing() : undefined,
             debugSnapshot: adapterDebugSnapshot,
+            scriptInvocationTrace: typeof (adapter as any).getScriptInvocationTrace === 'function'
+                ? (adapter as any).getScriptInvocationTrace()
+                : undefined,
         } : null,
         readChat,
         frontend: args?.frontendSnapshot && typeof args.frontendSnapshot === 'object' ? args.frontendSnapshot : null,
@@ -817,16 +1804,56 @@ export async function handleChatHistory(h: CommandHelpers, args: any): Promise<C
             : typeof (h.currentSession as any)?.workspace === 'string'
                 ? (h.currentSession as any).workspace
                 : undefined;
-        const result = readProviderChatHistory(agentStr, {
-            canonicalHistory: provider?.canonicalHistory,
-            historySessionId,
-            workspace,
-            offset: offset || 0,
-            limit: limit || 30,
-            excludeRecentCount,
-            historyBehavior: provider?.historyBehavior,
-            scripts: provider?.scripts as any,
-        });
+        const exactNativeHistoryScope = Boolean(
+            (typeof args?.targetSessionId === 'string' && args.targetSessionId.trim())
+            || (typeof args?.historySessionId === 'string' && args.historySessionId.trim())
+            || (typeof args?.providerSessionId === 'string' && args.providerSessionId.trim())
+        );
+        const result = supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.nativeHistory)
+            ? readCliProviderNativeHistory(agentStr, {
+                canonicalHistory: provider?.nativeHistory,
+                historySessionId,
+                workspace,
+                offset: offset || 0,
+                limit: limit || 30,
+                excludeRecentCount,
+                historyBehavior: provider?.historyBehavior,
+                scripts: provider?.scripts as any,
+            })
+            : readProviderChatHistory(agentStr, {
+                canonicalHistory: provider?.nativeHistory,
+                historySessionId,
+                workspace,
+                offset: offset || 0,
+                limit: limit || 30,
+                excludeRecentCount,
+                historyBehavior: provider?.historyBehavior,
+                scripts: provider?.scripts as any,
+            });
+        if (supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.nativeHistory)) {
+            const lookup = (result as any).lookup === 'workspace' ? 'workspace' : 'session';
+            const messages = Array.isArray((result as any).messages)
+                ? normalizeNativeHistoryMessages(agentStr, (result as any).messages as ChatMessage[], (result as any)?.providerSessionId)
+                : [];
+            const historyProviderSessionId = typeof (result as any)?.providerSessionId === 'string'
+                ? (result as any).providerSessionId
+                : readHistorySessionIdFromMessages(messages) || historySessionId;
+            const safeMapping = hasSafeNativeHistoryMapping({
+                historySessionId: lookup === 'workspace' ? undefined : historySessionId,
+                providerSessionId: lookup === 'workspace' ? undefined : historyProviderSessionId,
+                workspace,
+                nativeMessages: messages,
+            });
+            if ((result as any).source === 'provider-native' && messages.length > 0 && !safeMapping) {
+                return {
+                    success: true,
+                    messages: [],
+                    hasMore: false,
+                    source: 'native-unavailable',
+                    agent: agentStr,
+                };
+            }
+        }
         return { success: true, ...result, agent: agentStr };
     } catch (e: any) {
         return { success: false, error: e.message };
@@ -834,7 +1861,25 @@ export async function handleChatHistory(h: CommandHelpers, args: any): Promise<C
 }
 
 export async function handleReadChat(h: CommandHelpers, args: any): Promise<CommandResult> {
-    const provider = h.getProvider(args?.agentType || args?.providerType);
+    // Resolve provider in order: explicit agentType/providerType > registered session.
+    // Without this fallback, callers that only have a sessionId (e.g. a chat tail
+    // controller that just got handed a session ID over WS) get an empty result
+    // because getProvider(undefined) returns undefined and the rest of the pipeline
+    // bails. This makes the UI look like the session "disappeared".
+    let providerHint: string | undefined = args?.agentType || args?.providerType;
+    if (!providerHint) {
+        const targetSessionId = typeof args?.targetSessionId === 'string' ? args.targetSessionId.trim() : '';
+        if (targetSessionId) {
+            const session = (h.ctx as any)?.sessionRegistry?.get?.(targetSessionId);
+            if (session && typeof session.providerType === 'string') {
+                providerHint = session.providerType;
+            }
+        }
+        if (!providerHint && h.currentSession?.providerType) {
+            providerHint = h.currentSession.providerType;
+        }
+    }
+    const provider = h.getProvider(providerHint);
     const transport = getTargetTransport(h, provider);
     const historySessionId = getHistorySessionId(h, args);
 
@@ -874,59 +1919,388 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                 ? parsedRecord.coverage
                 : undefined;
             const activeModal = parsedRecord.activeModal ?? parsedRecord.modal ?? null;
-            const returnedStatus = normalizeCliReadChatStatus(parsedRecord.status, activeModal, adapter, adapterStatus);
+            const returnedStatus = normalizeCliReadChatStatus(parsedRecord.status, activeModal, adapter, adapterStatus, parsedRecord.messages);
             const runtimeMessageMerger = getTargetInstance(h, args) as RuntimeChatMessageMerger | null;
-            const parsedMessages = finalizeStreamingMessagesWhenIdle(parsedRecord.messages as ChatMessage[], returnedStatus);
+            const parsedMessages = collapseAdjacentDuplicateChatMessages(
+                finalizeStreamingMessagesWhenIdle(parsedRecord.messages as ChatMessage[], returnedStatus),
+            );
             const returnedMessages = runtimeMessageMerger?.category === 'cli'
                 && runtimeMessageMerger.type === adapter.cliType
                 && typeof runtimeMessageMerger.mergeRuntimeChatMessages === 'function'
                 ? runtimeMessageMerger.mergeRuntimeChatMessages(parsedMessages)
                 : parsedMessages;
+            const providerType = provider?.type || adapter.cliType;
+            let selectedMessages = returnedMessages;
+            let selectedTitle = title;
+            let selectedProviderSessionId = providerSessionId;
+            let selectedTranscriptAuthority = transcriptAuthority;
+            let selectedCoverage = coverage;
+            let selectedStatus = returnedStatus;
+            const sessionWorkspace = typeof (h.currentSession as any)?.workspace === 'string'
+                ? (h.currentSession as any).workspace
+                : typeof adapter.workingDir === 'string'
+                    ? adapter.workingDir
+                    : undefined;
+            const intendedWorkspace = typeof args?.workspace === 'string' ? args.workspace : undefined;
+            // ───────────────────────────────────────────────────────────
+            //  Chat source decision via ChatSourceMachine (A2 big-bang).
+            //  Replaces the ~300-line if-ladder that mixed source decision
+            //  with native fetch, anchor mutation, and runtime mirror
+            //  selection. The machine decides only between native-history
+            //  and pty-parser; downstream selection of which message array
+            //  to surface stays here.
+            //
+            //  Behavioural changes vs v1:
+            //    - No more nativeHistoryAnchoredAt mutation on the adapter.
+            //      Lock state lives in CHAT_SOURCE_REGISTRY keyed by
+            //      (providerType, sessionId).
+            //    - No PTY-vs-native freshness comparison. The lock holds
+            //      across arbitrary PTY arrival; only native regression /
+            //      unavailability unlocks. This is the plipping fix.
+            //    - 6 trigger strings (native_history_partial / _stale /
+            //      _not_safely_mapped / _empty / _error / _unavailable)
+            //      collapse to 3 events with diagnostic causes preserved
+            //      and mapped back to legacy fallbackReason strings for
+            //      response compatibility.
+            //    - Codex live-workspace native probe and unsafe-native
+            //      daemon mirror fallbacks are preserved as additional
+            //      input rounds to the machine; they were never the source
+            //      decision itself, they were retries.
+            // ───────────────────────────────────────────────────────────
+
+            const supportsNative = supportsCliNativeTranscript(providerType, provider)
+                && isNativeSourceCanonicalHistory(provider?.nativeHistory);
+            const agentStr = provider?.type || args?.agentType || getCurrentProviderType(h, adapter.cliType);
+            const workspace = sessionWorkspace;
+            const nativeHistoryLimit = Math.max(
+                normalizeReadChatTailLimit(args) || 0,
+                returnedMessages.length,
+                200,
+            );
+            const nativeHistorySessionId = supportsNative
+                ? resolveCliNativeHistorySessionId(args, historySessionId, providerSessionId)
+                : undefined;
+            const targetSessionId = typeof args?.targetSessionId === 'string' ? args.targetSessionId.trim() : '';
+            const exactNativeHistoryScope = Boolean(
+                (typeof args?.historySessionId === 'string' && args.historySessionId.trim())
+                || (typeof args?.providerSessionId === 'string' && args.providerSessionId.trim())
+                || providerSessionId
+                || (nativeHistorySessionId && nativeHistorySessionId !== targetSessionId)
+                || ((h.currentSession as any)?.sessionId === args?.targetSessionId && typeof (h.currentSession as any)?.providerSessionId === 'string' && (h.currentSession as any).providerSessionId.trim())
+            );
+
+            // 1. Fetch native history (or skip if provider does not support it).
+            let nativeHistory: any | null = null;
+            let nativeHistoryError: unknown | undefined;
+            if (supportsNative) {
+                try {
+                    nativeHistory = readCliProviderNativeHistory(agentStr, {
+                        canonicalHistory: provider?.nativeHistory,
+                        historySessionId: nativeHistorySessionId,
+                        workspace,
+                        offset: 0,
+                        limit: nativeHistoryLimit,
+                        excludeRecentCount: 0,
+                        historyBehavior: provider?.historyBehavior,
+                        scripts: provider?.scripts as any,
+                        excludeInProgressTurn: returnedStatus === 'waiting_approval',
+                    });
+                } catch (error: any) {
+                    nativeHistoryError = error;
+                    nativeHistory = null;
+                }
+            }
+
+            // 2. Compute safeMapping with the same rules the v1 code used so the
+            //    machine sees the same observation it always would have.
+            const nativeMessages: ChatMessage[] = nativeHistory && Array.isArray(nativeHistory.messages)
+                ? normalizeNativeHistoryMessages(agentStr, nativeHistory.messages as ChatMessage[], nativeHistory.providerSessionId)
+                : [];
+            const historyProviderSessionId = typeof nativeHistory?.providerSessionId === 'string'
+                ? nativeHistory.providerSessionId
+                : readHistorySessionIdFromMessages(nativeMessages) || nativeHistorySessionId || historySessionId;
+            const lookup = nativeHistory?.lookup === 'workspace' ? 'workspace' : 'session';
+            const nativeHistorySessionForMapping = adapter.cliType === 'antigravity-cli'
+                && historyProviderSessionId
+                && nativeHistorySessionId
+                && historyProviderSessionId !== nativeHistorySessionId
+                ? undefined
+                : nativeHistorySessionId;
+            const safeMapping = supportsNative && nativeHistory
+                ? hasSafeNativeHistoryMapping({
+                    historySessionId: lookup === 'workspace' ? undefined : nativeHistorySessionForMapping,
+                    providerSessionId: lookup === 'workspace' ? undefined : historyProviderSessionId || providerSessionId,
+                    workspace,
+                    nativeMessages,
+                    ptyMessages: returnedMessages,
+                    requireWorkspaceContentOverlap: lookup === 'workspace' && !exactNativeHistoryScope,
+                })
+                : false;
+
+            // 3. Drive ChatSourceMachine — one observation per readChat call,
+            //    keyed by (providerType, sessionKey-for-this-call). targetSessionId
+            //    is the most specific session anchor we have; fall back to
+            //    historySessionId so we never leak state across distinct sessions.
+            const machineSessionKey = String(
+                args?.targetSessionId
+                || providerSessionId
+                || historySessionId
+                || (h.currentSession as any)?.sessionId
+                || ''
+            );
+            const primary = decideCliReadChatSource({
+                providerType,
+                provider,
+                sessionId: machineSessionKey,
+                nativeHistoryResult: nativeHistory,
+                nativeHistoryError,
+                safeMapping,
+                sessionWorkspace,
+                intendedWorkspace,
+                ptyMessages: returnedMessages,
+                // Start with PTY visible; decideCliReadChatSource flips this
+                // to true when the machine actually selects native-history.
+                ptyStatusApprovalOnly: false,
+            });
+            let messageSource: Record<string, unknown> = primary.messageSource;
+
+            if (primary.nativeSelected) {
+                selectedMessages = finalizeStreamingMessagesWhenIdle(primary.nativeMessages, returnedStatus);
+                selectedProviderSessionId = historyProviderSessionId || providerSessionId;
+                selectedTranscriptAuthority = 'provider';
+                selectedCoverage = nativeHistory?.hasMore ? 'tail' : 'full';
+            } else if (supportsNative) {
+                // Native not selected. Two preserved v1 fallbacks before settling
+                // on PTY: (a) Codex-only live workspace native probe; (b) unsafe-
+                // native daemon mirror selection. The machine sees each retry as
+                // an additional observation.
+                const liveCurrentRuntimePtySafe = isCurrentRuntimePtySafelyAttributed({
+                    adapter,
+                    helpers: h,
+                    readChatArgs: args,
+                    sessionWorkspace,
+                    intendedWorkspace,
+                    ptyMessages: returnedMessages,
+                });
+                const mayProbeLiveCodexWorkspaceNative = adapter.cliType === 'codex-cli'
+                    && liveCurrentRuntimePtySafe
+                    && !(typeof args?.providerSessionId === 'string' && args.providerSessionId.trim())
+                    && !(providerSessionId && providerSessionId.trim())
+                    && (!historyProviderSessionId || historyProviderSessionId === nativeHistorySessionId || historyProviderSessionId === historySessionId);
+                const liveWorkspaceNativeHistory = mayProbeLiveCodexWorkspaceNative
+                    ? readLiveCodexWorkspaceNativeHistory(agentStr, {
+                        canonicalHistory: provider?.nativeHistory,
+                        workspace,
+                        offset: 0,
+                        limit: nativeHistoryLimit,
+                        excludeRecentCount: 0,
+                        historyBehavior: provider?.historyBehavior,
+                        scripts: provider?.scripts as any,
+                    })
+                    : null;
+                const liveWorkspaceNativeMessages = Array.isArray((liveWorkspaceNativeHistory as any)?.messages)
+                    ? normalizeNativeHistoryMessages(agentStr, (liveWorkspaceNativeHistory as any).messages as ChatMessage[], (liveWorkspaceNativeHistory as any)?.providerSessionId)
+                    : [];
+                const liveWorkspaceNativeProviderSessionId = typeof (liveWorkspaceNativeHistory as any)?.providerSessionId === 'string'
+                    ? (liveWorkspaceNativeHistory as any).providerSessionId
+                    : readHistorySessionIdFromMessages(liveWorkspaceNativeMessages);
+                const liveWorkspaceNativeSafeMapping = liveWorkspaceNativeMessages.length > 0
+                    && hasSafeNativeHistoryMapping({
+                        workspace,
+                        nativeMessages: liveWorkspaceNativeMessages,
+                        ptyMessages: returnedMessages,
+                        requireWorkspaceContentOverlap: true,
+                    });
+                if (liveWorkspaceNativeHistory) {
+                    const liveDecision = decideCliReadChatSource({
+                        providerType,
+                        provider,
+                        // Distinct session key so a transient codex live-probe does not
+                        // clobber the primary session's lock. The machine treats this
+                        // as its own session; the primary session's state is untouched.
+                        sessionId: `${machineSessionKey}::live-workspace`,
+                        nativeHistoryResult: liveWorkspaceNativeHistory,
+                        safeMapping: liveWorkspaceNativeSafeMapping,
+                        sessionWorkspace,
+                        intendedWorkspace,
+                        ptyMessages: returnedMessages,
+                        ptyStatusApprovalOnly: true,
+                    });
+                    if (liveDecision.nativeSelected) {
+                        selectedMessages = finalizeStreamingMessagesWhenIdle(liveDecision.nativeMessages, returnedStatus);
+                        selectedProviderSessionId = liveWorkspaceNativeProviderSessionId || providerSessionId;
+                        selectedTranscriptAuthority = 'provider';
+                        selectedCoverage = (liveWorkspaceNativeHistory as any).hasMore ? 'tail' : 'full';
+                        messageSource = liveDecision.messageSource;
+                        (messageSource as any).selectedDaemonSource = 'live-workspace-native-history';
+                        (messageSource as any).runtimeMappingSafe = true;
+                    } else {
+                        // Live probe also rejected: apply unsafe-native daemon mirror
+                        // selection (codex-only) using the primary decision's
+                        // fallbackReason.
+                        applyUnsafeNativeDaemonFallback({
+                            providerType,
+                            adapter,
+                            helpers: h,
+                            readChatArgs: args,
+                            sessionWorkspace,
+                            intendedWorkspace,
+                            ptyMessages: returnedMessages,
+                            nativeHistoryLimit,
+                            provider,
+                            messageSourceRef: { set(value) { messageSource = value; }, get() { return messageSource; } },
+                            apply(selection) {
+                                selectedMessages = selection.messages;
+                                selectedTranscriptAuthority = selection.transcriptAuthority;
+                                selectedCoverage = selection.coverage ?? coverage;
+                                selectedStatus = selection.status ?? returnedStatus;
+                            },
+                            activeModal,
+                            returnedStatus,
+                            coverage,
+                        });
+                    }
+                } else {
+                    applyUnsafeNativeDaemonFallback({
+                        providerType,
+                        adapter,
+                        helpers: h,
+                        readChatArgs: args,
+                        sessionWorkspace,
+                        intendedWorkspace,
+                        ptyMessages: returnedMessages,
+                        nativeHistoryLimit,
+                        provider,
+                        messageSourceRef: { set(value) { messageSource = value; }, get() { return messageSource; } },
+                        apply(selection) {
+                            selectedMessages = selection.messages;
+                            selectedTranscriptAuthority = selection.transcriptAuthority;
+                            selectedCoverage = selection.coverage ?? coverage;
+                            selectedStatus = selection.status ?? returnedStatus;
+                        },
+                        activeModal,
+                        returnedStatus,
+                        coverage,
+                    });
+                }
+            }
             LOG.debug('Command', `[read_chat] cli-like parsed provider=${adapter.cliType} target=${String(args?.targetSessionId || '')} adapterStatus=${String(adapterStatus.status || '')} parsedStatus=${String(parsedRecord.status || '')} parsedMsgCount=${parsedRecord.messages.length} returnedMsgCount=${returnedMessages.length}`);
             return buildReadChatCommandResult({
-                messages: returnedMessages,
-                status: returnedStatus,
+                messages: selectedMessages,
+                status: selectedStatus,
                 activeModal,
+                messageSource,
+                transcriptProvenance: messageSource,
                 debugReadChat: {
                     provider: adapter.cliType,
                     targetSessionId: String(args?.targetSessionId || ''),
                     adapterStatus: String(adapterStatus.status || ''),
                     parsedStatus: String(parsedRecord.status || ''),
-                    returnedStatus: String(returnedStatus || ''),
-                    shouldPreferAdapterMessages: false,
+                    returnedStatus: String(selectedStatus || ''),
+                    selectedMessageSource: (messageSource as any).selected,
+                    messageSource,
+                    shouldPreferAdapterMessages: supportsCliNativeTranscript(providerType, provider)
+                        && isNativeSourceCanonicalHistory(provider?.nativeHistory)
+                        && (messageSource as any).selected !== 'native-history'
+                        && typeof (messageSource as any).fallbackReason === 'string'
+                        && (messageSource as any).fallbackReason.startsWith('native_history_')
+                        && (messageSource as any).fallbackReason !== 'native_history_not_checked'
+                        && !isUnsafeNativeTranscriptFallback((messageSource as any).fallbackReason)
+                        && !(selectedTranscriptAuthority === 'provider' && selectedCoverage === 'full'),
                     parsedMsgCount: parsedRecord.messages.length,
-                    returnedMsgCount: returnedMessages.length,
+                    returnedMsgCount: selectedMessages.length,
                 },
-                ...(title ? { title } : {}),
-                ...(providerSessionId ? { providerSessionId } : {}),
-                ...(transcriptAuthority ? { transcriptAuthority } : {}),
-                ...(coverage ? { coverage } : {}),
+                ...(selectedTitle ? { title: selectedTitle } : {}),
+                ...(selectedProviderSessionId ? { providerSessionId: selectedProviderSessionId } : {}),
+                ...(selectedTranscriptAuthority ? { transcriptAuthority: selectedTranscriptAuthority } : {}),
+                ...(selectedCoverage ? { coverage: selectedCoverage } : {}),
             }, args);
         }
+        // History-only path (no adapter). Same source-decision contract as
+        // the adapter path above, but with no PTY messages — the machine
+        // simply decides whether native is usable; if not we return the
+        // history we have plus a `native_history_not_safely_available`
+        // error response when the provider requires native source.
         const historyLimit = normalizeReadChatTailLimit(args);
         try {
             const agentStr = provider?.type || args?.agentType || getCurrentProviderType(h);
-            const workspace = typeof args?.workspace === 'string'
-                ? args.workspace
-                : typeof (h.currentSession as any)?.workspace === 'string'
-                    ? (h.currentSession as any).workspace
-                    : undefined;
-            const history = readProviderChatHistory(agentStr, {
-                canonicalHistory: provider?.canonicalHistory,
-                historySessionId,
-                workspace,
-                offset: 0,
-                limit: historyLimit,
-                excludeRecentCount: 0,
-                historyBehavior: provider?.historyBehavior,
-                scripts: provider?.scripts as any,
-            });
+            const workspace = typeof (h.currentSession as any)?.workspace === 'string'
+                ? (h.currentSession as any).workspace
+                : undefined;
+            const intendedWorkspace = typeof args?.workspace === 'string' ? args.workspace : undefined;
+            const supportsNative = supportsCliNativeTranscript(agentStr, provider)
+                && isNativeSourceCanonicalHistory(provider?.nativeHistory);
+            const history = supportsNative
+                ? readCliProviderNativeHistory(agentStr, {
+                    canonicalHistory: provider?.nativeHistory,
+                    historySessionId,
+                    workspace,
+                    offset: 0,
+                    limit: historyLimit,
+                    excludeRecentCount: 0,
+                    historyBehavior: provider?.historyBehavior,
+                    scripts: provider?.scripts as any,
+                })
+                : readProviderChatHistory(agentStr, {
+                    canonicalHistory: provider?.nativeHistory,
+                    historySessionId,
+                    workspace,
+                    offset: 0,
+                    limit: historyLimit,
+                    excludeRecentCount: 0,
+                    historyBehavior: provider?.historyBehavior,
+                    scripts: provider?.scripts as any,
+                });
+            const lookup = (history as any)?.lookup === 'workspace' ? 'workspace' : 'session';
+            const historyMessages = Array.isArray((history as any)?.messages)
+                ? normalizeNativeHistoryMessages(agentStr, (history as any).messages as ChatMessage[], (history as any)?.providerSessionId)
+                : [];
             const historyProviderSessionId = typeof (history as any)?.providerSessionId === 'string'
                 ? (history as any).providerSessionId
-                : historySessionId;
+                : readHistorySessionIdFromMessages(historyMessages) || historySessionId;
+            const safeMapping = supportsNative
+                ? hasSafeNativeHistoryMapping({
+                    historySessionId: lookup === 'workspace' ? undefined : historySessionId,
+                    providerSessionId: lookup === 'workspace' ? undefined : historyProviderSessionId,
+                    workspace,
+                    nativeMessages: historyMessages,
+                })
+                : false;
+
+            const machineSessionKey = String(
+                args?.targetSessionId
+                || historyProviderSessionId
+                || historySessionId
+                || (h.currentSession as any)?.sessionId
+                || ''
+            );
+            const decision = decideCliReadChatSource({
+                providerType: agentStr,
+                provider,
+                sessionId: machineSessionKey,
+                nativeHistoryResult: history,
+                safeMapping,
+                sessionWorkspace: workspace,
+                intendedWorkspace,
+                ptyMessages: [],
+                ptyStatusApprovalOnly: false,
+            });
+
+            if (supportsNative && !decision.nativeSelected) {
+                return {
+                    success: false,
+                    code: 'native_history_not_safely_available',
+                    error: 'Provider-native history was not safely available for the requested CLI session.',
+                    providerSessionId: historyProviderSessionId,
+                    messageSource: decision.messageSource,
+                    transcriptProvenance: decision.messageSource,
+                };
+            }
             return buildReadChatCommandResult({
-                messages: Array.isArray((history as any)?.messages) ? (history as any).messages : [],
+                messages: historyMessages,
                 status: 'idle',
+                messageSource: decision.messageSource,
+                transcriptProvenance: decision.messageSource,
                 ...(typeof (history as any)?.title === 'string' ? { title: (history as any).title } : {}),
                 ...(historyProviderSessionId ? { providerSessionId: historyProviderSessionId } : {}),
                 ...(((provider?.historyBehavior as any)?.transcriptAuthority === 'provider' || (provider?.historyBehavior as any)?.transcriptAuthority === 'daemon')
@@ -1184,8 +2558,24 @@ export async function handleSendChat(h: CommandHelpers, args: any): Promise<Comm
                 assertTextOnlyInput(provider, input);
                 if (!text) return { success: false, error: 'text required for PTY send' };
                 await waitOnceForFreshHermesCliStart(adapter, _log);
-                await adapter.sendMessage(text);
-                return _logSendSuccess(`${transport}-adapter`, adapter.cliType);
+                const forceSend = args?.force === true || args?.forceSend === true;
+                if (forceSend && typeof adapter.forceSendMessage === 'function') {
+                    await adapter.forceSendMessage(text);
+                } else if (forceSend) {
+                    await adapter.sendMessage(text, { force: true });
+                } else {
+                    await adapter.sendMessage(text);
+                }
+                const target = getTargetInstance(h, args) as RuntimeChatMessageMerger | null;
+                if (target?.category === 'cli'
+                    && target.type === adapter.cliType
+                    && typeof target.recordAcknowledgedUserInput === 'function') {
+                    target.recordAcknowledgedUserInput(input);
+                }
+                return {
+                    ..._logSendSuccess(`${transport}-adapter`, adapter.cliType),
+                    ...(forceSend ? { forceSent: true } : {}),
+                };
             } catch (e: any) {
                 return { success: false, error: `${transport} send failed: ${e.message}` };
             }
@@ -1742,9 +3132,18 @@ export async function handleResolveAction(h: CommandHelpers, args: any): Promise
         if (buttonIndex < 0 && (action === 'always' || /always/i.test(button))) {
             buttonIndex = buttons.findIndex(b => /always/i.test(b));
         }
+        if (buttonIndex < 0 && (action === 'approve' || action === 'accept')) {
+            buttonIndex = pickApprovalButton(buttons, provider).index;
+        }
         if (buttonIndex < 0) {
             return { success: false, error: 'Approval action did not match any visible button' };
         }
+        // Idempotency: if the adapter already resolved this approval within cooldown, report
+        // stale_prompt rather than writing a second key to the PTY.
+        if (typeof adapter.isApprovalRecentlyResolved === 'function' && adapter.isApprovalRecentlyResolved()) {
+            LOG.info('Command', `[resolveAction] CLI PTY → stale_prompt (already resolved within cooldown)`);
+            return { success: true, stalePrompt: true, buttonIndex, button: buttons[buttonIndex] ?? button };
+        }
         if (typeof adapter.resolveModal === 'function') {
             adapter.resolveModal(buttonIndex);
         } else {