From 4c00ec42f9ce4e36bdf7ae2c9f71c19b19362229 Mon Sep 17 00:00:00 2001
From: bincxz <16399091+binaricat@users.noreply.github.com>
Date: Mon, 29 Jun 2026 11:30:43 +0800
Subject: [PATCH] fix terminal input echo desync

---
 .../runtime/terminalOutputPipeline.test.ts    | 76 +++++++++++++++++++
 .../runtime/terminalOutputPipeline.ts         | 22 +++++-
 2 files changed, 97 insertions(+), 1 deletion(-)

diff --git a/components/terminal/runtime/terminalOutputPipeline.test.ts b/components/terminal/runtime/terminalOutputPipeline.test.ts
index e93430f74..d745dd9b9 100644
--- a/components/terminal/runtime/terminalOutputPipeline.test.ts
+++ b/components/terminal/runtime/terminalOutputPipeline.test.ts
@@ -11,6 +11,12 @@ import {
   teardownTerminalOutputPipeline,
 } from "./terminalOutputPipeline.ts";
 import { FLOW_LOW_WATER_MARK } from "./terminalFlowConstants.ts";
+import {
+  enqueueCoalescedTerminalWrite,
+  flushTerminalWriteCoalescer,
+  getTerminalWriteCoalescerPendingBytes,
+  resetTerminalWriteCoalescer,
+} from "./terminalWriteCoalescer.ts";
 import { enqueueTerminalWrite } from "./terminalWriteQueue.ts";
 import { accumulateDeferredTerminalWriteAck } from "./terminalWriteAckDeferral.ts";
 import { clearTerminalSessionFlowAck } from "./terminalFlowAckBuffer.ts";
@@ -238,6 +244,76 @@ test("prioritizeTerminalInput defers source resume until after input is forwarde
   clearTerminalSessionFlowAck("sess-1");
 });
 
+test("ordinary input priority preserves pending line-edit echo when flushing deferred acks", () => {
+  clearTerminalSessionFlowAck("sess-edit");
+  const scheduler = globalThis as typeof globalThis & {
+    requestAnimationFrame?: (callback: FrameRequestCallback) => number;
+    cancelAnimationFrame?: (handle: number) => void;
+  };
+  const originalRequestAnimationFrame = scheduler.requestAnimationFrame;
+  const originalCancelAnimationFrame = scheduler.cancelAnimationFrame;
+  scheduler.requestAnimationFrame = () => 1;
+  scheduler.cancelAnimationFrame = () => {};
+
+  const term = createFakeTerm();
+  const echoedHistoryCommand = "systemctl dddd";
+  const written: string[] = [];
+  const acked: number[] = [];
+  const deferred: Array<() => void> = [];
+  const flow = createOutputFlowController({
+    highWaterMark: 100,
+    lowWaterMark: 20,
+    onPause: () => {},
+    onResume: () => {},
+  });
+  const backend = {
+    ackSessionFlow: (_sessionId: string, bytes: number) => {
+      acked.push(bytes);
+    },
+    setSessionFlowPaused: () => {},
+  };
+
+  try {
+    accumulateDeferredTerminalWriteAck(term, 2);
+    flow.received(echoedHistoryCommand.length);
+    enqueueCoalescedTerminalWrite(
+      term,
+      echoedHistoryCommand,
+      (data, ingressBytes) => {
+        written.push(data);
+        flow.written(ingressBytes);
+      },
+      echoedHistoryCommand.length,
+    );
+    assert.equal(getTerminalWriteCoalescerPendingBytes(term), echoedHistoryCommand.length);
+
+    const priority = prioritizeTerminalInput(
+      term,
+      "sess-edit",
+      flow,
+      backend,
+      (callback: () => void) => deferred.push(callback),
+      { reason: "input" },
+    );
+
+    assert.equal(priority.ackAfterInputBytes, 2);
+    assert.equal(flow.pendingBytes(), echoedHistoryCommand.length);
+    assert.equal(getTerminalWriteCoalescerPendingBytes(term), echoedHistoryCommand.length);
+
+    deferred[0]!();
+    assert.deepEqual(acked, [2]);
+
+    flushTerminalWriteCoalescer(term);
+    assert.deepEqual(written, [echoedHistoryCommand]);
+    assert.equal(flow.pendingBytes(), 0);
+  } finally {
+    resetTerminalWriteCoalescer(term);
+    scheduler.requestAnimationFrame = originalRequestAnimationFrame;
+    scheduler.cancelAnimationFrame = originalCancelAnimationFrame;
+    clearTerminalSessionFlowAck("sess-edit");
+  }
+});
+
 test("interrupt priority drains queued display output for ssh-like interrupts", () => {
   const term = createFakeTerm();
   const events: string[] = [];
diff --git a/components/terminal/runtime/terminalOutputPipeline.ts b/components/terminal/runtime/terminalOutputPipeline.ts
index 13db96f58..767bcbed2 100644
--- a/components/terminal/runtime/terminalOutputPipeline.ts
+++ b/components/terminal/runtime/terminalOutputPipeline.ts
@@ -570,7 +570,27 @@ export const prioritizeTerminalInput = (
   }
 
   const hasVisibleBacklog = backlog > FLOW_LOW_WATER_MARK || queueDepth > 0;
-  if (isInterrupt && hasVisibleBacklog && options.drainStaleOutput !== false) {
+  if (!hasVisibleBacklog && deferredAck > 0) {
+    const ackAfterInput = clearDeferredTerminalWriteAck(term);
+    scheduleResume(() => {
+      if (ackAfterInput > 0) {
+        ackTerminalSessionFlow(backend, sessionId, ackAfterInput);
+      }
+      flushTerminalSessionFlowAck(sessionId);
+      backend.setSessionFlowPaused?.(sessionId, false);
+    });
+
+    return {
+      sessionId,
+      backlogBytes: backlog,
+      writeQueueDepth: queueDepth,
+      deferredAckBytes: deferredAck,
+      ackAfterInputBytes: ackAfterInput,
+      scheduledBackendResume: true,
+    };
+  }
+
+  if (isInterrupt && hasVisibleBacklog && options.drainStaleOutput === true) {
     armTerminalInterruptDisplayGate(term, options);
   }