@adhdev/daemon-core 0.9.76-rc.6 → 0.9.76-rc.60

package/dist/mesh/coordinator-prompt.d.ts

@@ -14,5 +14,6 @@ export interface CoordinatorPromptContext {
     mesh: LocalMeshEntry;
     status?: RepoMeshStatus;
     userInstruction?: string;
+    coordinatorCliType?: string;
 }
 export declare function buildCoordinatorSystemPrompt(ctx: CoordinatorPromptContext): string;

package/dist/mesh/mesh-events.d.ts

@@ -1,2 +1,11 @@
 import type { DaemonComponents } from '../boot/daemon-lifecycle.js';
+export declare function handleMeshForwardEvent(components: DaemonComponents, payload: Record<string, unknown>): {
+    success: boolean;
+    forwarded: number;
+    error?: undefined;
+} | {
+    success: boolean;
+    error: string;
+    forwarded?: undefined;
+};
 export declare function setupMeshEventForwarding(components: DaemonComponents): void;

package/dist/providers/chat-message-normalization.d.ts

@@ -63,3 +63,14 @@ export declare function buildUserChatMessage<T extends Omit<ChatMessage, 'role'
 });
 export declare function normalizeChatMessage<T extends ChatMessage>(message: T): T;
 export declare function normalizeChatMessages<T extends ChatMessage>(messages: T[] | null | undefined): T[];
+/**
+ * Product chat transcript visibility contract.
+ *
+ * read_chat/debug paths may preserve every normalized message, including tool,
+ * terminal, thought, status, and control rows. The default user-facing chat UX
+ * should only render meaningful conversation turns unless a producer explicitly
+ * marks a non-standard row as user-facing. This keeps internal tool/status/control
+ * plumbing out of the ordinary transcript without matching provider-specific text.
+ */
+export declare function isUserFacingChatMessage(message: ChatMessage | null | undefined): boolean;
+export declare function filterUserFacingChatMessages<T extends ChatMessage>(messages: T[] | null | undefined): T[];

package/dist/providers/cli-provider-instance.d.ts

@@ -8,6 +8,7 @@ import { type ProviderModule } from './contracts.js';
 import type { ProviderInstance, ProviderState, InstanceContext, HotChatSessionState, SessionModalState } from './provider-instance.js';
 import { ProviderCliAdapter } from '../cli-adapters/provider-cli-adapter.js';
 import type { PtyTransportFactory } from '../cli-adapters/pty-transport.js';
+import type { ChatMessage } from '../types.js';
 type PersistableCliHistoryMessage = {
     role: string;
     content: string;
@@ -67,6 +68,7 @@ export declare class CliProviderInstance implements ProviderInstance {
     constructor(provider: ProviderModule, workingDir: string, cliArgs?: string[], instanceId?: string, transportFactory?: PtyTransportFactory, options?: {
         providerSessionId?: string;
         launchMode?: 'new' | 'resume' | 'manual';
+        extraEnv?: Record<string, string>;
         onProviderSessionResolved?: (info: {
             instanceId: string;
             providerType: string;
@@ -112,6 +114,7 @@ export declare class CliProviderInstance implements ProviderInstance {
     private maybeAppendRuntimeRecoveryMessage;
     private appendRuntimeSystemMessage;
     private appendRuntimeMessage;
+    mergeRuntimeChatMessages(parsedMessages: ChatMessage[]): ChatMessage[];
     private mergeConversationMessages;
     private formatApprovalRequestMessage;
     private promoteProviderSessionId;

package/dist/providers/provider-instance-manager.d.ts

@@ -67,6 +67,7 @@ export declare class ProviderInstanceManager {
     onEvent(listener: (event: ProviderEvent & {
         providerType: string;
     }) => void): void;
+    emitProviderEvent(providerType: string, instanceId: string, event: ProviderEvent): void;
     private emitPendingEvents;
     /**
     * Forward event to specific Instance

package/dist/providers/provider-instance.d.ts

@@ -147,6 +147,8 @@ export interface InstanceContext {
     onPtyData?: (data: string) => void;
     /** Provider configvalue (resolved) */
     settings: Record<string, any>;
+    /** Immediate provider-originated status/event emission. Used to avoid waiting for status polling. */
+    emitProviderEvent?: (event: ProviderEvent) => void;
 }
 export interface ProviderInstance {
     /** Provider type */

package/dist/repo-mesh-types.d.ts

@@ -40,6 +40,7 @@ export interface RepoMeshNode {
     status: 'enabled' | 'disabled' | 'removed';
 }
 export type RepoMeshNodeHealth = 'online' | 'offline' | 'degraded' | 'dirty' | 'wrong_branch' | 'unknown';
+export type RepoMeshSessionCleanupMode = 'preserve' | 'stop' | 'delete_stopped' | 'stop_and_delete';
 export interface RepoMeshPolicy {
     requirePreTaskCheckpoint: boolean;
     requirePostTaskCheckpoint: boolean;
@@ -48,11 +49,31 @@ export interface RepoMeshPolicy {
     dirtyWorkspaceBehavior: 'block' | 'warn' | 'checkpoint_then_continue';
     maxParallelTasks: number;
     allowedProviders?: string[];
+    /**
+     * What to do with delegated session-host records for a node when it is removed.
+     * Defaults to 'preserve' so completed work can be reviewed later and live
+     * runtimes are never stopped/deleted unless the mesh owner opts in.
+     */
+    sessionCleanupOnNodeRemove?: RepoMeshSessionCleanupMode;
+}
+export interface RepoMeshRelatedRepo {
+    /** Stable display label for an explicitly configured associated checkout. */
+    label: string;
+    /** Absolute checkout/workspace path for git freshness probes. */
+    workspace: string;
 }
 export interface RepoMeshNodePolicy {
     readOnly?: boolean;
     canPush?: boolean;
     maxConcurrentSessions?: number;
+    /** Ordered provider preference used when mesh_launch_session omits an explicit type. */
+    providerPriority?: string[];
+    /**
+     * Optional associated/external repos that must be checked alongside this node.
+     * These are explicit policy/config entries only; Repo Mesh does not auto-discover
+     * sibling paths so freshness checks stay fail-closed and non-surprising.
+     */
+    relatedRepos?: RepoMeshRelatedRepo[];
 }
 export declare const DEFAULT_MESH_POLICY: RepoMeshPolicy;
 export interface RepoMeshNodeCapabilities {
@@ -149,6 +170,12 @@ export interface LocalMeshNodeEntry {
     policy: RepoMeshNodePolicy;
     /** For single-machine mesh: same daemon, different worktree */
     isLocalWorktree?: boolean;
+    /** Branch this worktree tracks (set when created via clone_mesh_node) */
+    worktreeBranch?: string;
+    /** Node ID this worktree was cloned from */
+    clonedFromNodeId?: string;
+    /** Optional associated/external repos configured as node metadata. */
+    relatedRepos?: RepoMeshRelatedRepo[];
 }
 export interface RepoMeshStatus {
     meshId: string;

package/dist/session-host/runtime-support.d.ts

@@ -1,8 +1,9 @@
-import { type SessionHostEndpoint } from '@adhdev/session-host-core';
+import { type SessionHostEndpoint, type SessionHostRequestType } from '@adhdev/session-host-core';
 import type { HostedCliRuntimeDescriptor } from '../commands/cli-manager.js';
 export declare function ensureSessionHostReady(options: {
     appName?: string;
     spawnHost: () => void;
     timeoutMs?: number;
+    requiredRequestTypes?: readonly SessionHostRequestType[];
 }): Promise<SessionHostEndpoint>;
 export declare function listHostedCliRuntimes(endpoint: SessionHostEndpoint): Promise<HostedCliRuntimeDescriptor[]>;

package/dist/shared-types.d.ts

@@ -522,6 +522,8 @@ export interface DaemonStatusEventPayload {
     timestamp: number;
     targetSessionId?: string;
     providerType?: string;
+    providerSessionId?: string;
+    workspaceName?: string;
     duration?: number;
     elapsedSec?: number;
     modalMessage?: string;
@@ -535,6 +537,8 @@ export interface DashboardStatusEventPayload {
     daemonId?: string;
     providerType?: string;
     targetSessionId?: string;
+    providerSessionId?: string;
+    workspaceName?: string;
     duration?: number;
     elapsedSec?: number;
     modalMessage?: string;

package/dist/types.d.ts

@@ -42,6 +42,15 @@ export interface ChatMessage {
     /** Optional: fiber metadata */
     _type?: string;
     _sub?: string;
+    /** Transcript visibility/audience contract for separating chat-visible content from internal/debug runtime rows. */
+    visibility?: 'visible' | 'user' | 'chat' | 'hidden' | 'debug' | 'internal' | (string & {});
+    transcriptVisibility?: 'visible' | 'user' | 'chat' | 'hidden' | 'debug' | 'internal' | (string & {});
+    audience?: 'chat' | 'debug' | 'trace' | 'internal' | (string & {});
+    source?: 'assistant_text' | 'tool_call' | 'terminal_command' | 'runtime_activity' | 'runtime_status' | 'provider_chrome' | 'control' | (string & {});
+    userFacing?: boolean;
+    internal?: boolean;
+    isInternal?: boolean;
+    debug?: boolean;
     /** Meta information for thought/terminal logs etc */
     meta?: {
         label?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.76-rc.6",
+  "version": "0.9.76-rc.60",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -50,18 +50,17 @@
     "@agentclientprotocol/sdk": "^0.16.1",
     "@xterm/xterm": "^6.0.0",
     "chalk": "^5.3.0",
-    "chokidar": "^5.0.0",
+    "chokidar": "^4.0.3",
     "conf": "^13.0.0",
+    "js-yaml": "^4.1.1",
     "node-pty": "^1.2.0-beta.12",
     "ws": "^8.19.0"
   },
-  "bundleDependencies": [
-    "@adhdev/session-host-core"
-  ],
   "optionalDependencies": {
     "@adhdev/ghostty-vt-node": "*"
   },
   "devDependencies": {
+    "@types/js-yaml": "^4.0.9",
     "@types/node": "^22.0.0",
     "@types/ws": "^8.18.1",
     "tsup": "^8.2.0",

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

@@ -266,9 +266,10 @@ export class ProviderCliAdapter implements CliAdapter {
         const currentSnapshot = normalizeScreenSnapshot(screenText);
         const lastSnapshot = this.lastScreenSnapshot;
         if (!lastSnapshot || lastSnapshot === currentSnapshot) return screenText;
-        const staleSnapshotLooksActive = /\besc to (?:interrupt|stop)\b|Enter to interrupt, Ctrl\+C to cancel/i.test(lastSnapshot);
-        const currentScreenLooksIdle = /(?:^|\n|\r)\s*[❯›>]\s*(?:\n|\r|$)/.test(screenText)
-            && !/\besc to (?:interrupt|stop)\b|Enter to interrupt, Ctrl\+C to cancel/i.test(screenText);
+        const activeScreenPattern = /\besc to (?:interrupt|stop)\b|Enter to interrupt, Ctrl\+C to cancel|Enter to confirm\s*[·•-]\s*Esc to cancel|\b(?:MCP servers?|tool calls?)\b[^\n\r]{0,160}\brequire approval\b/i;
+        const staleSnapshotLooksActive = activeScreenPattern.test(lastSnapshot);
+        const currentScreenLooksIdle = /(?:^|\n|\r)\s*[❯›>]\s*(?:Try\s+["“][^\n\r"”]+["”])?\s*(?:\n|\r|$)/.test(screenText)
+            && !activeScreenPattern.test(screenText);
         if (staleSnapshotLooksActive && currentScreenLooksIdle) return screenText;
         if (currentSnapshot.length >= lastSnapshot.length) return screenText;
         // Terminal screen reads can miss a just-rendered completed Hermes box while
@@ -421,6 +422,7 @@ export class ProviderCliAdapter implements CliAdapter {
         provider: CliProviderModule,
         workingDir: string,
         private extraArgs: string[] = [],
+        private extraEnv: Record<string, string> = {},
         transportFactory: PtyTransportFactory = new NodePtyTransportFactory(),
     ) {
         this.provider = provider;
@@ -522,6 +524,7 @@ export class ProviderCliAdapter implements CliAdapter {
             runtimeSettings: this.runtimeSettings,
             workingDir: this.workingDir,
             extraArgs: this.extraArgs,
+            extraEnv: this.extraEnv,
         });
 
         LOG.info('CLI', `[${this.cliType}] Spawning in ${this.workingDir}`);
@@ -1854,9 +1857,13 @@ export class ProviderCliAdapter implements CliAdapter {
             };
             this.recordTrace('submit_echo_missing', diagnostic);
             if (this.requirePromptEchoBeforeSubmit) {
-                const message = `${this.cliName} prompt echo was not observed on the PTY screen before submit`;
-                LOG.warn('CLI', `[${this.cliType}] ${message} elapsed=${elapsed}ms maxEchoWaitMs=${state.maxEchoWaitMs} screen=${JSON.stringify(diagnostic.screenText).slice(0, 240)}`);
-                completion.rejectOnce(new Error(message));
+                // At this point the prompt text write already completed. Rejecting without
+                // a submit key can leave the delegated CLI with an unsent prompt sitting at
+                // the input line, which makes later coordinator sends appear stuck. Prefer a
+                // guarded submit after the full echo wait; the existing stuck-submit retry
+                // will send a delayed follow-up Enter if the prompt remains visible.
+                LOG.warn('CLI', `[${this.cliType}] prompt echo was not observed before submit; sending guarded submit key anyway elapsed=${elapsed}ms maxEchoWaitMs=${state.maxEchoWaitMs} screen=${JSON.stringify(diagnostic.screenText).slice(0, 240)}`);
+                this.submitSendKey(state, completion);
                 return;
             }
             LOG.warn('CLI', `[${this.cliType}] prompt echo was not observed before submit; sending submit key anyway elapsed=${elapsed}ms maxEchoWaitMs=${state.maxEchoWaitMs}`);
@@ -1911,7 +1918,21 @@ export class ProviderCliAdapter implements CliAdapter {
             ? String(parsedStatusBeforeSend.status)
             : '';
         if (!allowInputDuringGeneration && (parsedSessionStatus === 'generating' || parsedSessionStatus === 'long_generating')) {
-            throw new Error(`${this.cliName} is still processing the previous prompt`);
+            const parsedModal = parsedStatusBeforeSend?.activeModal ?? parsedStatusBeforeSend?.modal ?? null;
+            const parsedHasActionableModal = Boolean(
+                parsedModal
+                && Array.isArray(parsedModal.buttons)
+                && parsedModal.buttons.some((candidate: unknown) => typeof candidate === 'string' && candidate.trim()),
+            );
+            const terminalLooksIdle = this.currentStatus === 'idle'
+                && this.runDetectStatus(this.recentOutputBuffer) === 'idle'
+                && !this.isWaitingForResponse
+                && !this.currentTurnScope
+                && !this.hasActionableApproval()
+                && !parsedHasActionableModal;
+            if (!terminalLooksIdle) {
+                throw new Error(`${this.cliName} is still processing the previous prompt`);
+            }
         }
         if (this.isWaitingForResponse && !allowInputDuringGeneration) {
             if (!this.clearStaleIdleResponseGuard('send_message_guard')) {

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

@@ -27,8 +27,9 @@ export function resolveCliSpawnPlan(options: {
     runtimeSettings: Record<string, any>;
     workingDir: string;
     extraArgs: string[];
+    extraEnv?: Record<string, string>;
 }): CliSpawnPlan {
-    const { provider, runtimeSettings, workingDir, extraArgs } = options;
+    const { provider, runtimeSettings, workingDir, extraArgs, extraEnv } = options;
     const { spawn: spawnConfig } = provider;
     const configuredCommand = typeof runtimeSettings.executablePath === 'string' && runtimeSettings.executablePath.trim()
         ? runtimeSettings.executablePath.trim()
@@ -65,7 +66,7 @@ export function resolveCliSpawnPlan(options: {
         shellArgs = allArgs;
     }
 
-    const env = buildCliSpawnEnv(process.env, spawnConfig.env);
+    const env = buildCliSpawnEnv(process.env, { ...(spawnConfig.env || {}), ...(extraEnv || {}) });
     // Some CLI agents, notably Hermes, route their tools through TERMINAL_CWD
     // rather than process.cwd(). Keep the generic ADHDev launch workspace as
     // the single source of truth so PTY cwd and tool cwd cannot diverge.

package/src/commands/chat-commands.ts

@@ -19,15 +19,21 @@ import { getRecentDebugTrace, recordDebugTrace } from '../logging/debug-trace.js
 import { buildChatMessageSignature } from '../chat/chat-signatures.js';
 import type { ChatMessage } from '../types.js';
 import type { SessionTransport } from '../shared-types.js';
+import { filterUserFacingChatMessages, normalizeChatMessages } from '../providers/chat-message-normalization.js';
 
 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;
 const recentSendByTarget = new Map<string, number>();
 
 interface ApprovalSelectableInstance extends ProviderInstance {
     recordApprovalSelection?(buttonText: string): void;
 }
 
+interface RuntimeChatMessageMerger extends ProviderInstance {
+    mergeRuntimeChatMessages?(messages: ChatMessage[]): ChatMessage[];
+}
+
 type LegacyStringScript = (params?: Record<string, unknown> | string) => string;
 
 function getCurrentProviderType(h: CommandHelpers, fallback = ''): string {
@@ -97,6 +103,19 @@ function getSendChatInputEnvelope(args: any): InputEnvelope {
     return normalizeInputEnvelope(args?.input ? { input: args.input } : args);
 }
 
+function sleep(ms: number): Promise<void> {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function waitOnceForFreshHermesCliStart(adapter: CliAdapter, log: (msg: string) => void): Promise<void> {
+    if (adapter.cliType !== 'hermes-cli') return;
+    const status = typeof adapter.getStatus === 'function' ? adapter.getStatus()?.status : undefined;
+    if (status !== 'starting') return;
+
+    log(`Hermes CLI is still starting; waiting ${HERMES_CLI_STARTING_SEND_SETTLE_MS}ms before first send`);
+    await sleep(HERMES_CLI_STARTING_SEND_SETTLE_MS);
+}
+
 function getHistorySessionId(h: CommandHelpers, args: any): string | undefined {
     const explicit = typeof args?.historySessionId === 'string' ? args.historySessionId.trim() : '';
     if (explicit) return explicit;
@@ -177,7 +196,7 @@ function normalizeReadChatTailLimit(args: any): number {
 
 function normalizeReadChatMessages(payload: Record<string, any>): ChatMessage[] {
     const messages = Array.isArray(payload.messages) ? payload.messages as ChatMessage[] : [];
-    return messages;
+    return normalizeChatMessages(messages);
 }
 
 
@@ -250,6 +269,40 @@ function normalizeReadChatCommandStatus(status: unknown, activeModal: unknown):
     }
 }
 
+function isGeneratingLikeStatus(status: unknown): boolean {
+    return status === 'generating' || status === 'streaming' || status === 'long_generating' || status === 'starting';
+}
+
+function shouldTrustCliAdapterTerminalStatus(parsedStatus: unknown, activeModal: unknown, adapter: CliAdapter, adapterStatus: any): boolean {
+    if (!isGeneratingLikeStatus(parsedStatus)) return false;
+    if (hasNonEmptyModalButtons(activeModal)) return false;
+    const adapterRawStatus = typeof adapterStatus?.status === 'string' ? adapterStatus.status.trim() : '';
+    if (adapterRawStatus !== 'idle') return false;
+    if (typeof adapter.isProcessing === 'function' && adapter.isProcessing()) return false;
+    return true;
+}
+
+function normalizeCliReadChatStatus(parsedStatus: unknown, activeModal: unknown, adapter: CliAdapter, adapterStatus: any): string {
+    if (shouldTrustCliAdapterTerminalStatus(parsedStatus, activeModal, adapter, adapterStatus)) return 'idle';
+    return typeof parsedStatus === 'string' && parsedStatus.trim() ? parsedStatus : 'idle';
+}
+
+function finalizeStreamingMessagesWhenIdle(messages: ChatMessage[], status: string): ChatMessage[] {
+    if (status !== 'idle') return messages;
+    return messages.map((message) => {
+        const meta = message.meta && typeof message.meta === 'object'
+            ? message.meta as Record<string, unknown>
+            : undefined;
+        const hasStreamingMeta = meta?.streaming === true;
+        if (message.bubbleState !== 'streaming' && !hasStreamingMeta) return message;
+        return {
+            ...message,
+            ...(message.bubbleState === 'streaming' ? { bubbleState: 'final' as const } : {}),
+            ...(hasStreamingMeta ? { meta: { ...meta, streaming: false } } : {}),
+        };
+    });
+}
+
 function buildReadChatCommandResult(payload: Record<string, any>, args: any): CommandResult {
     let validatedPayload: Record<string, any>;
     const debugReadChat = payload?.debugReadChat && typeof payload.debugReadChat === 'object'
@@ -264,13 +317,26 @@ function buildReadChatCommandResult(payload: Record<string, any>, args: any): Co
         return { success: false, error: error?.message || String(error) };
     }
     const messages = normalizeReadChatMessages(validatedPayload);
-    const sync = buildFullTail(messages, normalizeReadChatTailLimit(args));
+    const visibleMessages = filterUserFacingChatMessages(messages);
+    const sync = buildFullTail(visibleMessages, normalizeReadChatTailLimit(args));
+    const hiddenMsgCount = Math.max(0, messages.length - visibleMessages.length);
+    const returnedDebugReadChat = debugReadChat
+        ? {
+            ...debugReadChat,
+            fullMsgCount: typeof debugReadChat.fullMsgCount === 'number'
+                ? debugReadChat.fullMsgCount
+                : messages.length,
+            visibleMsgCount: visibleMessages.length,
+            hiddenMsgCount,
+            returnedMsgCount: sync.messages.length,
+        }
+        : undefined;
     return {
         success: true,
         ...validatedPayload,
         messages: sync.messages,
         totalMessages: sync.totalMessages,
-        ...(debugReadChat ? { debugReadChat } : {}),
+        ...(returnedDebugReadChat ? { debugReadChat: returnedDebugReadChat } : {}),
     };
 }
 
@@ -464,6 +530,18 @@ function buildChatDebugBundleSummary(bundle: Record<string, unknown>): Record<st
     const readChat = bundle.readChat && typeof bundle.readChat === 'object' ? bundle.readChat as Record<string, unknown> : {};
     const cli = bundle.cli && typeof bundle.cli === 'object' ? bundle.cli as Record<string, unknown> : null;
     const frontend = bundle.frontend && typeof bundle.frontend === 'object' ? bundle.frontend as Record<string, unknown> : null;
+    const debugReadChat = readChat.debugReadChat && typeof readChat.debugReadChat === 'object'
+        ? readChat.debugReadChat as Record<string, unknown>
+        : {};
+    const parsedStatus = cli?.parsedStatus && typeof cli.parsedStatus === 'object'
+        ? cli.parsedStatus as Record<string, unknown>
+        : null;
+    const cliParsedMessageCount = Array.isArray(parsedStatus?.messages) ? parsedStatus.messages.length : undefined;
+    const readChatReturnedMessages = Array.isArray(readChat.messagesTail) ? readChat.messagesTail.length : undefined;
+    const cliPartialResponse = typeof cli?.partialResponse === 'string' ? cli.partialResponse : '';
+    const readChatStatus = typeof readChat.status === 'string' ? readChat.status : '';
+    const cliStatus = typeof cli?.status === 'string' ? cli.status : '';
+    const cliParsedStatus = typeof parsedStatus?.status === 'string' ? parsedStatus.status : '';
     return {
         createdAt: bundle.createdAt,
         targetSessionId: target.targetSessionId,
@@ -472,8 +550,22 @@ function buildChatDebugBundleSummary(bundle: Record<string, unknown>): Record<st
         readChatSuccess: readChat.success,
         readChatStatus: readChat.status,
         readChatTotalMessages: readChat.totalMessages,
+        readChatReturnedMessages,
         cliStatus: cli?.status,
+        cliParsedStatus: cliParsedStatus || undefined,
         cliMessageCount: cli?.messageCount,
+        cliParsedMessageCount,
+        cliPartialResponseChars: cliPartialResponse.length,
+        parserAdapterStatusMismatch: Boolean(cliStatus && cliParsedStatus && cliStatus !== cliParsedStatus),
+        parserReadChatStatusMismatch: Boolean(readChatStatus && cliParsedStatus && readChatStatus !== cliParsedStatus),
+        readChatDebug: Object.keys(debugReadChat).length ? {
+            adapterStatus: debugReadChat.adapterStatus,
+            parsedStatus: debugReadChat.parsedStatus,
+            returnedStatus: debugReadChat.returnedStatus,
+            parsedMsgCount: debugReadChat.parsedMsgCount,
+            returnedMsgCount: debugReadChat.returnedMsgCount,
+            shouldPreferAdapterMessages: debugReadChat.shouldPreferAdapterMessages,
+        } : undefined,
         hasFrontendSnapshot: !!frontend,
     };
 }
@@ -720,7 +812,7 @@ 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);
+    const provider = h.getProvider(args?.agentType || args?.providerType);
     const transport = getTargetTransport(h, provider);
     const historySessionId = getHistorySessionId(h, args);
 
@@ -760,10 +852,17 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                 ? parsedRecord.coverage
                 : undefined;
             const activeModal = parsedRecord.activeModal ?? parsedRecord.modal ?? null;
-            const returnedStatus = parsedRecord.status || 'idle';
-            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}`);
+            const returnedStatus = normalizeCliReadChatStatus(parsedRecord.status, activeModal, adapter, adapterStatus);
+            const runtimeMessageMerger = getTargetInstance(h, args) as RuntimeChatMessageMerger | null;
+            const parsedMessages = finalizeStreamingMessagesWhenIdle(parsedRecord.messages as ChatMessage[], returnedStatus);
+            const returnedMessages = runtimeMessageMerger?.category === 'cli'
+                && runtimeMessageMerger.type === adapter.cliType
+                && typeof runtimeMessageMerger.mergeRuntimeChatMessages === 'function'
+                ? runtimeMessageMerger.mergeRuntimeChatMessages(parsedMessages)
+                : parsedMessages;
+            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: parsedRecord.messages,
+                messages: returnedMessages,
                 status: returnedStatus,
                 activeModal,
                 debugReadChat: {
@@ -774,7 +873,7 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                     returnedStatus: String(returnedStatus || ''),
                     shouldPreferAdapterMessages: false,
                     parsedMsgCount: parsedRecord.messages.length,
-                    returnedMsgCount: parsedRecord.messages.length,
+                    returnedMsgCount: returnedMessages.length,
                 },
                 ...(title ? { title } : {}),
                 ...(providerSessionId ? { providerSessionId } : {}),
@@ -1049,6 +1148,7 @@ export async function handleSendChat(h: CommandHelpers, args: any): Promise<Comm
             try {
                 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);
             } catch (e: any) {
@@ -1571,11 +1671,26 @@ export async function handleResolveAction(h: CommandHelpers, args: any): Promise
             && status.activeModal.buttons.some((candidate) => typeof candidate === 'string' && candidate.trim())
             ? status.activeModal
             : null;
-        const effectiveModal = statusModal || surfacedModal;
-        const effectiveStatus = status?.status === 'waiting_approval' || targetState?.activeChat?.status === 'waiting_approval'
+        const parsedStatus = !statusModal && !surfacedModal && typeof adapter.getScriptParsedStatus === 'function'
+            ? (() => {
+                try {
+                    return parseMaybeJson(adapter.getScriptParsedStatus());
+                } catch {
+                    return null;
+                }
+            })()
+            : null;
+        const parsedModal = parsedStatus?.status === 'waiting_approval'
+            && parsedStatus?.activeModal
+            && Array.isArray(parsedStatus.activeModal.buttons)
+            && parsedStatus.activeModal.buttons.some((candidate: unknown) => typeof candidate === 'string' && candidate.trim())
+            ? parsedStatus.activeModal
+            : null;
+        const effectiveModal = statusModal || surfacedModal || parsedModal;
+        const effectiveStatus = status?.status === 'waiting_approval' || targetState?.activeChat?.status === 'waiting_approval' || parsedStatus?.status === 'waiting_approval'
             ? 'waiting_approval'
             : status?.status;
-        LOG.info('Command', `[resolveAction] CLI PTY gate target=${String(args?.targetSessionId || '')} rawStatus=${String(status?.status || '')} effectiveStatus=${String(effectiveStatus || '')} statusModal=${statusModal ? 'yes' : 'no'} surfacedModal=${surfacedModal ? 'yes' : 'no'} instance=${targetInstance ? 'yes' : 'no'}`);
+        LOG.info('Command', `[resolveAction] CLI PTY gate target=${String(args?.targetSessionId || '')} rawStatus=${String(status?.status || '')} effectiveStatus=${String(effectiveStatus || '')} statusModal=${statusModal ? 'yes' : 'no'} surfacedModal=${surfacedModal ? 'yes' : 'no'} parsedModal=${parsedModal ? 'yes' : 'no'} instance=${targetInstance ? 'yes' : 'no'}`);
         if (!effectiveModal) {
             return { success: false, error: 'Not in approval state' };
         }