@adhdev/daemon-core 0.9.76-rc.9 → 0.9.76

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

@@ -173,32 +173,218 @@ export interface CliProviderModule {
 function stripAnsi(str: string): string {
     // eslint-disable-next-line no-control-regex
     return str
-        .replace(/\x1B\][^\x07]*\x07/g, '')
-        .replace(/\x1B\][\s\S]*?\x1B\\/g, '')
+        .replace(/\x1B\][^\x07]*(?:\x07|\x1B\\)/g, '')
         .replace(/\x1B[P^_X][\s\S]*?(?:\x07|\x1B\\)/g, '')
-        .replace(/\x1B\[\d*[A-HJKSTfG]/g, ' ')
-        .replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, '')
-        .replace(/  +/g, ' ');
+        .replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, '');
+}
+
+type SavedCursor = { row: number; col: number };
+
+function parseCount(params: string, fallback = 1): number {
+    const first = Number(String(params || '').split(';')[0] || fallback);
+    return Math.max(1, Number.isFinite(first) ? first : fallback);
+}
+
+function isCombiningMark(ch: string): boolean {
+    return /[\u0300-\u036F\u1AB0-\u1AFF\u1DC0-\u1DFF\u20D0-\u20FF\uFE20-\uFE2F]/.test(ch);
+}
+
+function isWideCodePoint(ch: string): boolean {
+    const cp = ch.codePointAt(0) || 0;
+    return cp >= 0x1100 && (
+        cp <= 0x115F || cp === 0x2329 || cp === 0x232A ||
+        (cp >= 0x2E80 && cp <= 0xA4CF && cp !== 0x303F) ||
+        (cp >= 0xAC00 && cp <= 0xD7A3) ||
+        (cp >= 0xF900 && cp <= 0xFAFF) ||
+        (cp >= 0xFE10 && cp <= 0xFE19) ||
+        (cp >= 0xFE30 && cp <= 0xFE6F) ||
+        (cp >= 0xFF00 && cp <= 0xFF60) ||
+        (cp >= 0xFFE0 && cp <= 0xFFE6) ||
+        (cp >= 0x1F300 && cp <= 0x1FAFF)
+    );
+}
+
+/**
+ * Stateful, transcript-oriented terminal cell accumulator.
+ *
+ * CLI transcript parsing must not consume raw PTY append text for user-visible
+ * readback: CLIs rewrite prompts/status/tool lines with CR, BS, CSI cursor
+ * motion and erase-line. This accumulator preserves parser state across chunks
+ * and mutates rendered cells before exposing plain transcript text. It is a
+ * deliberately small terminal model for readback buffers; live UI rendering still
+ * uses TerminalScreen's ghostty/xterm backend.
+ */
+export class TerminalTranscriptAccumulator {
+    private lines: string[][] = [[]];
+    private row = 0;
+    private col = 0;
+    private savedCursor: SavedCursor | null = null;
+    private pendingEscape = '';
+
+    append(data: string): string {
+        const input = this.pendingEscape + String(data || '');
+        this.pendingEscape = '';
+        for (let i = 0; i < input.length; i += 1) {
+            let ch = input[i];
+            if (ch === '\x1B') {
+                const consumed = this.consumeEscape(input.slice(i));
+                if (consumed === 0) {
+                    this.pendingEscape = input.slice(i);
+                    break;
+                }
+                i += consumed - 1;
+                continue;
+            }
+            const cp = input.codePointAt(i);
+            if (cp && cp > 0xFFFF) {
+                ch = String.fromCodePoint(cp);
+                i += 1;
+            }
+            this.writeControlOrChar(ch);
+        }
+        return this.getText();
+    }
+
+    reset(): void {
+        this.lines = [[]];
+        this.row = 0;
+        this.col = 0;
+        this.savedCursor = null;
+        this.pendingEscape = '';
+    }
+
+    getText(): string {
+        return this.lines.map(line => line.join('').replace(/[ \t]+$/g, '')).join('\n');
+    }
+
+    private ensureRow(row = this.row): void {
+        while (this.lines.length <= row) this.lines.push([]);
+    }
+
+    private writeControlOrChar(ch: string): void {
+        if (ch === '\r') {
+            this.col = 0;
+            return;
+        }
+        if (ch === '\n') {
+            this.row += 1;
+            this.col = 0;
+            this.ensureRow();
+            return;
+        }
+        if (ch === '\b') {
+            this.col = Math.max(0, this.col - 1);
+            return;
+        }
+        if (ch < ' ' || ch === '\x7F') return;
+
+        this.ensureRow();
+        const line = this.lines[this.row];
+        if (isCombiningMark(ch) && this.col > 0) {
+            line[this.col - 1] = `${line[this.col - 1] || ''}${ch}`;
+            return;
+        }
+        while (line.length < this.col) line.push(' ');
+        const wide = isWideCodePoint(ch);
+        line[this.col] = ch;
+        if (wide) line[this.col + 1] = '';
+        this.col += wide ? 2 : 1;
+    }
+
+    private consumeEscape(seq: string): number {
+        if (seq.length < 2) return 0;
+        const next = seq[1];
+        if (next === '7') {
+            this.savedCursor = { row: this.row, col: this.col };
+            return 2;
+        }
+        if (next === '8') {
+            if (this.savedCursor) {
+                this.row = this.savedCursor.row;
+                this.col = this.savedCursor.col;
+                this.ensureRow();
+            }
+            return 2;
+        }
+        if (next === ']') {
+            const bel = seq.indexOf('\x07', 2);
+            const st = seq.indexOf('\x1B\\', 2);
+            const end = bel >= 0 && (st < 0 || bel < st) ? bel + 1 : st >= 0 ? st + 2 : 0;
+            return end;
+        }
+        if (next === '[') {
+            const match = seq.match(/^\x1B\[([0-?]*)([ -/]*)([@-~])/);
+            if (!match) return seq.length < 32 ? 0 : 1;
+            this.applyCsi(match[1] || '', match[3]);
+            return match[0].length;
+        }
+        if (/[P^_X]/.test(next)) {
+            const bel = seq.indexOf('\x07', 2);
+            const st = seq.indexOf('\x1B\\', 2);
+            const end = bel >= 0 && (st < 0 || bel < st) ? bel + 1 : st >= 0 ? st + 2 : 0;
+            return end;
+        }
+        return 2;
+    }
+
+    private applyCsi(params: string, final: string): void {
+        const count = parseCount(params);
+        this.ensureRow();
+        if (final === 'A') this.row = Math.max(0, this.row - count);
+        else if (final === 'B') this.row += count;
+        else if (final === 'C') this.col += count;
+        else if (final === 'D') this.col = Math.max(0, this.col - count);
+        else if (final === 'G') this.col = Math.max(0, count - 1);
+        else if (final === 'H' || final === 'f') {
+            const parts = String(params || '').split(';');
+            this.row = Math.max(0, (Number(parts[0] || 1) || 1) - 1);
+            this.col = Math.max(0, (Number(parts[1] || 1) || 1) - 1);
+        } else if (final === 'J') {
+            const mode = Number(params || 0) || 0;
+            if (mode === 2 || mode === 3) {
+                this.lines = [[]];
+                this.row = 0;
+                this.col = 0;
+            } else if (mode === 0) {
+                this.lines[this.row] = this.lines[this.row].slice(0, this.col);
+                this.lines.splice(this.row + 1);
+            } else if (mode === 1) {
+                for (let r = 0; r < this.row; r += 1) this.lines[r] = [];
+                const line = this.lines[this.row];
+                for (let c = 0; c <= Math.min(this.col, line.length - 1); c += 1) line[c] = ' ';
+            }
+        } else if (final === 'K') {
+            const mode = Number(params || 0) || 0;
+            const line = this.lines[this.row];
+            if (mode === 2) this.lines[this.row] = [];
+            else if (mode === 1) {
+                for (let c = 0; c <= Math.min(this.col, line.length - 1); c += 1) line[c] = ' ';
+            } else {
+                this.lines[this.row] = line.slice(0, this.col);
+            }
+        } else if (final === 's') {
+            this.savedCursor = { row: this.row, col: this.col };
+        } else if (final === 'u') {
+            if (this.savedCursor) {
+                this.row = this.savedCursor.row;
+                this.col = this.savedCursor.col;
+            }
+        }
+        this.ensureRow();
+    }
 }
 
 function stripTerminalNoise(str: string): string {
     return String(str || '')
         .replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x9F]/g, '')
-        .replace(/(^|[\s([])(?:\??\d{1,4}(?:;\d{1,4})*[A-Za-z])(?=$|[\s)\]])/g, '$1')
-        .replace(/(^|[\s([])(?:\[\??\d{1,4}(?:;\d{1,4})*[A-Za-z])(?=$|[\s)\]])/g, '$1')
-        .replace(/(^|[\s([])(?:\d{1,4};\?)(?=$|[\s)\]])/g, '$1')
-        .replace(/(^|[\s([])(?:\d+\$r[0-9;\" ]*[A-Za-z]?)(?=$|[\s)\]])/g, '$1')
-        .replace(/(^|[\s([])(?:>\|[A-Za-z0-9_.:-]+(?:\([^)]*\))?)(?=$|[\s)\]])/g, '$1')
-        .replace(/(^|[\s([])(?:[A-Z]\d(?:\s+[A-Z]\d)+)(?=$|[\s)\]])/g, '$1')
-        .replace(/(^|[\s([])(?:\d+;[^\s)\]]+)(?=$|[\s)\]])/g, '$1')
         .replace(/\r+/g, '\n')
         .replace(/[ \t]+\n/g, '\n')
-        .replace(/\n{3,}/g, '\n\n')
-        .replace(/ {2,}/g, ' ');
+        .replace(/\n{4,}/g, '\n\n\n');
 }
 
 export function sanitizeTerminalText(str: string): string {
-    return stripTerminalNoise(stripAnsi(str));
+    const accumulator = new TerminalTranscriptAccumulator();
+    return stripTerminalNoise(stripAnsi(accumulator.append(str)));
 }
 
 export function listCliScriptNames(scripts: CliScripts | undefined): string[] {

package/src/commands/chat-commands.ts

@@ -16,18 +16,24 @@ import type { ProviderInstance } from '../providers/provider-instance.js';
 import { readProviderChatHistory } from '../config/chat-history.js';
 import { LOG, getRecentLogs } from '../logging/logger.js';
 import { getRecentDebugTrace, recordDebugTrace } from '../logging/debug-trace.js';
-import { buildChatMessageSignature } from '../chat/chat-signatures.js';
+import { buildChatMessageSignature, hashSignatureParts } 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 {
@@ -87,16 +93,51 @@ function buildRecentSendKey(h: CommandHelpers, args: any, provider: ProviderModu
     return `${transport}:${target}:${signature.trim()}`;
 }
 
-function buildSendInputSignature(input: InputEnvelope): string {
+function summarizeSendInputPart(part: any): string {
+    if (!part || typeof part !== 'object') return String(part ?? '');
+    if (part.type === 'text') return `text:${String(part.text || '').trim()}`;
+    const fields = [
+        `type=${String(part.type || '')}`,
+        `mime=${String(part.mimeType || '')}`,
+        `uri=${String(part.uri || '')}`,
+        `name=${String(part.name || '')}`,
+    ];
+    const data = typeof part.data === 'string'
+        ? part.data
+        : typeof part.resource?.blob === 'string'
+            ? part.resource.blob
+            : '';
+    if (data) fields.push(`dataLen=${data.length}`, `dataHash=${hashSignatureParts([data]).slice(0, 12)}`);
+    const textish = [part.alt, part.transcript, part.description, part.title, part.resource?.uri]
+        .filter((value) => typeof value === 'string' && value.trim())
+        .join('\u001f');
+    if (textish) fields.push(`meta=${hashSignatureParts([textish]).slice(0, 12)}`);
+    return fields.join(';');
+}
+
+export function buildSendInputSignature(input: InputEnvelope): string {
     const text = typeof input.textFallback === 'string' ? input.textFallback.trim() : '';
-    if (text) return text;
-    return JSON.stringify(input.parts || []);
+    const partSummaries = (input.parts || []).map(summarizeSendInputPart);
+    return hashSignatureParts([text, ...partSummaries]);
 }
 
 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 +218,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 +291,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 +339,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 +552,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 +572,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 +834,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 +874,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 +895,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 } : {}),
@@ -1041,14 +1162,28 @@ export async function handleSendChat(h: CommandHelpers, args: any): Promise<Comm
         }
     }
 
-    // PTY transport: text-only send via adapter
+    // PTY transport: route structured input through the provider instance so
+    // provider-specific CLI attachment strategies (for example Hermes file-path
+    // image prompts) are applied instead of collapsing everything to text.
     if (transport === 'pty') {
         const adapter = getTargetedCliAdapter(h, args, provider?.type);
         if (adapter) {
             _log(`${transport} adapter: ${adapter.cliType}`);
             try {
+                const hasStructuredParts = input.parts.some((part) => part.type !== 'text');
+                if (hasStructuredParts) {
+                    const target = getTargetInstance(h, args);
+                    if (!target || target.category !== 'cli') {
+                        return { success: false, error: `CLI instance not found for ${provider?.type || args?.agentType || 'unknown'}` };
+                    }
+                    assertProviderSupportsDeclaredInput(provider, input);
+                    await waitOnceForFreshHermesCliStart(adapter, _log);
+                    target.onEvent('send_message', { input });
+                    return _logSendSuccess(`${transport}-instance`, target.type);
+                }
                 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 +1706,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' };
         }