@adhdev/daemon-core 0.9.82-rc.136 → 0.9.82-rc.138

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

@@ -43,6 +43,7 @@ export function buildCliParseInput(options: {
     isWaitingForResponse?: boolean;
     scope?: TurnParseScope | null;
     runtimeSettings: Record<string, any>;
+    spawnAt?: number;
 }): CliScriptInput {
     const {
         accumulatedBuffer,
@@ -57,6 +58,7 @@ export function buildCliParseInput(options: {
         isWaitingForResponse,
         scope,
         runtimeSettings,
+        spawnAt,
     } = options;
     const buffer = scope
         ? sliceFromOffset(accumulatedBuffer, scope.bufferStart)
@@ -84,6 +86,7 @@ export function buildCliParseInput(options: {
         isWaitingForResponse,
         promptText: scope?.prompt || '',
         settings: { ...runtimeSettings },
+        ...(typeof spawnAt === 'number' && spawnAt > 0 ? { spawnAt } : {}),
     };
 }
 

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

@@ -119,6 +119,7 @@ export interface CliScriptInput {
     promptText?: string;
     settings?: Record<string, any>;
     args?: Record<string, any>;
+    spawnAt?: number;
 }
 
 export interface CliStatusInput {
@@ -163,6 +164,10 @@ export interface CliProviderModule {
     requirePromptEchoBeforeSubmit?: boolean;
     /** Allow sending another prompt while the CLI is still generating so users can intervene mid-turn. */
     allowInputDuringGeneration?: boolean;
+    /** When true, only transition to idle after the parsed transcript includes a final standard assistant message. */
+    requiresFinalAssistantBeforeIdle?: boolean;
+    /** When true, allow providers to augment stale snapshot data before parse. Reserved for future use. */
+    augmentStaleSnapshot?: boolean;
     /** When provider-owned, daemon treats provider parser output as canonical transcript authority. */
     transcriptAuthority?: 'provider' | 'daemon';
     /** Full context lets provider-owned parsers canonicalize retained history instead of daemon prefix stitching. */
@@ -358,7 +363,18 @@ export class TerminalTranscriptAccumulator {
         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 === 'C') {
+            // (fix) Cursor-forward must materialize spaces in the cells it
+            // skips, otherwise rendered transcripts collapse "Do you" written
+            // as "Do\x1b[1Cyou" into "Doyou". That mis-rendering broke
+            // Claude Code's approval-prompt and prompt-line detection
+            // (parseApproval saw "Doyouwanttoproceed?" and returned null).
+            const line = this.lines[this.row];
+            for (let c = this.col; c < this.col + count; c += 1) {
+                if (line[c] === undefined) line[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') {

package/src/cli-adapters/terminal-backends/ghostty-vt-backend.ts

@@ -121,7 +121,23 @@ export class GhosttyVtTerminalBackend implements TerminalViewportBackend {
     }
 
     getText(): string {
-        return this.terminal.formatPlainText({ trim: true }) || '';
+        // (fix) ghostty's `trim:true` mode strips trailing whitespace per row
+        // AND collapses cells that were touched only by cursor-forward (ESC[<n>C)
+        // without a printable glyph. Many TUIs (Claude Code most prominently)
+        // render inter-word spaces via CUF rather than literal spaces, so
+        // trim:true would smash "Do you want to proceed?" into
+        // "Doyouwanttoproceed?" and break every downstream regex
+        // (approval detection, prompt-line discovery, etc.). Keep the per-row
+        // padding, then trim each row's trailing whitespace ourselves so the
+        // serialized text matches what the user sees in the terminal.
+        const raw = this.terminal.formatPlainText({ trim: false }) || '';
+        if (!raw) return '';
+        const lines = raw.split('\n').map((row) => row.replace(/\s+$/, ''));
+        let first = 0;
+        let last = lines.length;
+        while (first < last && !lines[first]) first += 1;
+        while (last > first && !lines[last - 1]) last -= 1;
+        return lines.slice(first, last).join('\n');
     }
 
     getCursorPosition(): { col: number; row: number } {

package/src/cli-adapters/terminal-backends/xterm-backend.ts

@@ -64,7 +64,14 @@ export class XtermTerminalBackend implements TerminalViewportBackend {
 
         for (let i = start; i < end; i++) {
             const line = buffer.getLine(i);
-            lines.push(line ? line.translateToString(true) : '');
+            // (fix) translateToString(true) strips trailing whitespace per row
+            // AND collapses cells touched only by cursor-forward (ESC[<n>C),
+            // so Claude Code's "Do you want to proceed?" arrives as
+            // "Doyouwanttoproceed?" — every downstream approval/prompt regex
+            // misses. Use false to preserve inter-word padding; we trim each
+            // row's trailing whitespace ourselves below.
+            const raw = line ? line.translateToString(false) : '';
+            lines.push(raw.replace(/\s+$/, ''));
         }
 
         let first = 0;