@adhdev/daemon-core 0.9.76-rc.66 → 0.9.76-rc.67

package/dist/cli-adapters/provider-cli-adapter.d.ts

@@ -78,8 +78,10 @@ export declare class ProviderCliAdapter implements CliAdapter {
     private statusHistory;
     private cliScripts;
     private runtimeSettings;
-    /** Full accumulated ANSI-stripped PTY output */
+    /** Full accumulated rendered PTY transcript for parser/readback use */
     private accumulatedBuffer;
+    /** Stateful rendered transcript accumulator; raw debug remains in accumulatedRawBuffer. */
+    private transcriptAccumulator;
     /** Full accumulated raw PTY output (with ANSI) */
     private accumulatedRawBuffer;
     /** Current visible terminal screen snapshot */

package/dist/cli-adapters/provider-cli-shared.d.ts

@@ -186,6 +186,30 @@ export interface CliProviderModule {
     _resolvedScriptsSource?: string | null;
     _versionWarning?: string | null;
 }
+/**
+ * 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 declare class TerminalTranscriptAccumulator {
+    private lines;
+    private row;
+    private col;
+    private savedCursor;
+    private pendingEscape;
+    append(data: string): string;
+    reset(): void;
+    getText(): string;
+    private ensureRow;
+    private writeControlOrChar;
+    private consumeEscape;
+    private applyCsi;
+}
 export declare function sanitizeTerminalText(str: string): string;
 export declare function listCliScriptNames(scripts: CliScripts | undefined): string[];
 export declare function buildCliScreenSnapshot(text: string): CliScreenSnapshot;

package/dist/index.js

@@ -1340,13 +1340,25 @@ var init_pty_transport = __esm({
 
 // src/cli-adapters/provider-cli-shared.ts
 function stripAnsi(str) {
-  return str.replace(/\x1B\][^\x07]*\x07/g, "").replace(/\x1B\][\s\S]*?\x1B\\/g, "").replace(/\x1B[P^_X][\s\S]*?(?:\x07|\x1B\\)/g, "").replace(/\x1B\[\d*[A-HJKSTfG]/g, " ").replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "").replace(/  +/g, " ");
+  return str.replace(/\x1B\][^\x07]*(?:\x07|\x1B\\)/g, "").replace(/\x1B[P^_X][\s\S]*?(?:\x07|\x1B\\)/g, "").replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "");
+}
+function parseCount(params, fallback = 1) {
+  const first = Number(String(params || "").split(";")[0] || fallback);
+  return Math.max(1, Number.isFinite(first) ? first : fallback);
+}
+function isCombiningMark(ch) {
+  return /[\u0300-\u036F\u1AB0-\u1AFF\u1DC0-\u1DFF\u20D0-\u20FF\uFE20-\uFE2F]/.test(ch);
+}
+function isWideCodePoint(ch) {
+  const cp = ch.codePointAt(0) || 0;
+  return cp >= 4352 && (cp <= 4447 || cp === 9001 || cp === 9002 || cp >= 11904 && cp <= 42191 && cp !== 12351 || cp >= 44032 && cp <= 55203 || cp >= 63744 && cp <= 64255 || cp >= 65040 && cp <= 65049 || cp >= 65072 && cp <= 65135 || cp >= 65280 && cp <= 65376 || cp >= 65504 && cp <= 65510 || cp >= 127744 && cp <= 129791);
 }
 function stripTerminalNoise(str) {
-  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, " ");
+  return String(str || "").replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x9F]/g, "").replace(/\r+/g, "\n").replace(/[ \t]+\n/g, "\n").replace(/\n{4,}/g, "\n\n\n");
 }
 function sanitizeTerminalText(str) {
-  return stripTerminalNoise(stripAnsi(str));
+  const accumulator = new TerminalTranscriptAccumulator();
+  return stripTerminalNoise(stripAnsi(accumulator.append(str)));
 }
 function listCliScriptNames(scripts) {
   if (!scripts) return [];
@@ -1525,7 +1537,7 @@ function normalizeCliProviderForRuntime(raw) {
     }
   };
 }
-var os9, path14, import_child_process4, buildCliSpawnEnv;
+var os9, path14, import_child_process4, TerminalTranscriptAccumulator, buildCliSpawnEnv;
 var init_provider_cli_shared = __esm({
   "src/cli-adapters/provider-cli-shared.ts"() {
     "use strict";
@@ -1533,6 +1545,155 @@ var init_provider_cli_shared = __esm({
     path14 = __toESM(require("path"));
     import_child_process4 = require("child_process");
     init_spawn_env();
+    TerminalTranscriptAccumulator = class {
+      lines = [[]];
+      row = 0;
+      col = 0;
+      savedCursor = null;
+      pendingEscape = "";
+      append(data) {
+        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 > 65535) {
+            ch = String.fromCodePoint(cp);
+            i += 1;
+          }
+          this.writeControlOrChar(ch);
+        }
+        return this.getText();
+      }
+      reset() {
+        this.lines = [[]];
+        this.row = 0;
+        this.col = 0;
+        this.savedCursor = null;
+        this.pendingEscape = "";
+      }
+      getText() {
+        return this.lines.map((line) => line.join("").replace(/[ \t]+$/g, "")).join("\n");
+      }
+      ensureRow(row = this.row) {
+        while (this.lines.length <= row) this.lines.push([]);
+      }
+      writeControlOrChar(ch) {
+        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(" ");
+        line[this.col] = ch;
+        this.col += isWideCodePoint(ch) ? 2 : 1;
+      }
+      consumeEscape(seq) {
+        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;
+      }
+      applyCsi(params, final) {
+        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();
+      }
+    };
     buildCliSpawnEnv = import_session_host_core.sanitizeSpawnEnv;
   }
 });
@@ -1880,8 +2041,10 @@ var init_provider_cli_adapter = __esm({
       // ─── CLI Scripts (script-based parsing) ───
       cliScripts;
       runtimeSettings = {};
-      /** Full accumulated ANSI-stripped PTY output */
+      /** Full accumulated rendered PTY transcript for parser/readback use */
       accumulatedBuffer = "";
+      /** Stateful rendered transcript accumulator; raw debug remains in accumulatedRawBuffer. */
+      transcriptAccumulator = new TerminalTranscriptAccumulator();
       /** Full accumulated raw PTY output (with ANSI) */
       accumulatedRawBuffer = "";
       /** Current visible terminal screen snapshot */
@@ -1947,6 +2110,7 @@ ${lastSnapshot}`;
       }
       resetTerminalScreen(rows, cols) {
         this.terminalScreen.reset(rows, cols);
+        this.transcriptAccumulator.reset();
         this.lastScreenText = "";
         this.lastScreenSnapshot = "";
         this.lastScreenChangeAt = 0;
@@ -2205,6 +2369,7 @@ ${lastSnapshot}`;
       handleOutput(rawData) {
         this.terminalScreen.write(rawData);
         const cleanData = sanitizeTerminalText(rawData);
+        const renderedTranscript = this.transcriptAccumulator.append(rawData);
         const now = Date.now();
         const shouldReadScreen = this.shouldReadTerminalScreenSnapshot(now);
         const screenText = shouldReadScreen ? this.readTerminalScreenText(now) : this.lastScreenText;
@@ -2245,13 +2410,14 @@ ${lastSnapshot}`;
           }
         }
         const prevRecentLen = this.recentOutputBuffer.length;
-        const prevAccumulatedLen = this.accumulatedBuffer.length;
         const prevAccumulatedRawLen = this.accumulatedRawBuffer.length;
-        this.recentOutputBuffer = appendBoundedText(this.recentOutputBuffer, cleanData, _ProviderCliAdapter.MAX_RECENT_OUTPUT_BUFFER);
-        this.accumulatedBuffer = appendBoundedText(this.accumulatedBuffer, cleanData, _ProviderCliAdapter.MAX_ACCUMULATED_BUFFER);
+        const nextAccumulatedBuffer = renderedTranscript.length <= _ProviderCliAdapter.MAX_ACCUMULATED_BUFFER ? renderedTranscript : renderedTranscript.slice(-_ProviderCliAdapter.MAX_ACCUMULATED_BUFFER);
+        const nextRecentOutputBuffer = nextAccumulatedBuffer.slice(-_ProviderCliAdapter.MAX_RECENT_OUTPUT_BUFFER);
+        this.recentOutputBuffer = nextRecentOutputBuffer;
+        this.accumulatedBuffer = nextAccumulatedBuffer;
         this.accumulatedRawBuffer = appendBoundedText(this.accumulatedRawBuffer, rawData, _ProviderCliAdapter.MAX_ACCUMULATED_BUFFER);
-        const droppedRecent = this.recordBoundedAppendDrop(prevRecentLen, cleanData.length, this.recentOutputBuffer.length);
-        const droppedClean = this.recordBoundedAppendDrop(prevAccumulatedLen, cleanData.length, this.accumulatedBuffer.length);
+        const droppedRecent = Math.max(0, prevRecentLen - this.recentOutputBuffer.length);
+        const droppedClean = Math.max(0, renderedTranscript.length - this.accumulatedBuffer.length);
         const droppedRaw = this.recordBoundedAppendDrop(prevAccumulatedRawLen, rawData.length, this.accumulatedRawBuffer.length);
         this.recentOutputDroppedChars += droppedRecent;
         this.accumulatedBufferDroppedChars += droppedClean;
@@ -21201,6 +21367,15 @@ init_logger();
 function readNonEmptyString(value) {
   return typeof value === "string" && value.trim() ? value.trim() : "";
 }
+var MESH_COORDINATOR_EVENTS = /* @__PURE__ */ new Set([
+  "agent:generating_completed",
+  "agent:waiting_approval",
+  "agent:stopped",
+  "monitor:long_generating"
+]);
+function isMeshCoordinatorEvent(eventName) {
+  return typeof eventName === "string" && MESH_COORDINATOR_EVENTS.has(eventName);
+}
 function formatCompletionMetadata(event) {
   const parts = [
     readNonEmptyString(event.targetSessionId) ? `session_id=${readNonEmptyString(event.targetSessionId)}` : "",
@@ -21217,6 +21392,12 @@ function buildMeshSystemMessage(args) {
   if (args.event === "agent:waiting_approval") {
     return `[System] ${args.nodeLabel} is waiting for approval to proceed${metadata}. You may use mesh_read_chat and mesh_approve to handle it.`;
   }
+  if (args.event === "agent:stopped") {
+    return `[System] ${args.nodeLabel} has stopped${metadata}. Use mesh_read_chat once if you need to inspect its last output.`;
+  }
+  if (args.event === "monitor:long_generating") {
+    return `[System] ${args.nodeLabel} has been generating for a long time${metadata}. Use mesh_read_chat once for a status check, but do not poll repeatedly.`;
+  }
   return "";
 }
 function injectMeshSystemMessage(components, args) {
@@ -21242,7 +21423,7 @@ function injectMeshSystemMessage(components, args) {
 }
 function handleMeshForwardEvent(components, payload) {
   const eventName = readNonEmptyString(payload.event);
-  if (eventName !== "agent:generating_completed" && eventName !== "agent:waiting_approval") {
+  if (!isMeshCoordinatorEvent(eventName)) {
     return { success: false, error: "unsupported mesh event" };
   }
   const meshId = readNonEmptyString(payload.meshId);
@@ -21263,7 +21444,7 @@ function handleMeshForwardEvent(components, payload) {
 }
 function setupMeshEventForwarding(components) {
   components.instanceManager.onEvent((event) => {
-    if (event.event !== "agent:generating_completed" && event.event !== "agent:waiting_approval") return;
+    if (!isMeshCoordinatorEvent(event.event)) return;
     const instanceId = readNonEmptyString(event.instanceId);
     if (!instanceId) return;
     const sourceInstance = components.instanceManager.getInstance(instanceId);