nolo-cli 0.64.2 → 0.65.0

package/index.js

@@ -815,7 +815,7 @@ async function runScript(script, forwardedArgs, env) {
   return proc.exited;
 }
 async function launchTuiWorkspace(args2) {
-  const { startTuiWorkspace } = await import("./readlineWorkspace-PKOMYDRS.js");
+  const { startTuiWorkspace } = await import("./readlineWorkspace-7FNJDYLD.js");
   const { createTuiSummaryLlmCaller } = await import("./tuiSummaryLlmCaller-F3DPFFZM.js");
   return startTuiWorkspace({
     ...args2,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nolo-cli",
-  "version": "0.64.2",
+  "version": "0.65.0",
   "type": "module",
   "description": "Agent-first terminal workspace for Nolo",
   "bin": {

package/{readlineWorkspace-PKOMYDRS.js → readlineWorkspace-7FNJDYLD.js}

@@ -2215,7 +2215,7 @@ function createHistoryOutputStream(history, onUpdate) {
   };
   return stream;
 }
-function applyScrollAction(history, action, output, inputLines, reservedRows = 0) {
+function computeScrollMetrics(history, output, inputLines, reservedRows = 0) {
   const tty = output;
   const rows = tty.rows ?? 24;
   const columns = tty.columns ?? 80;
@@ -2230,6 +2230,15 @@ function applyScrollAction(history, action, output, inputLines, reservedRows = 0
     totalLines += currentTurnSeparator(history) + countTurnLines(history.currentRole, history.currentContent, contentWidth);
   }
   const maxScrollTop = Math.max(0, totalLines - visibleHeight);
+  return { visibleHeight, contentWidth, totalLines, maxScrollTop };
+}
+function applyScrollAction(history, action, output, inputLines, reservedRows = 0) {
+  const { visibleHeight, maxScrollTop } = computeScrollMetrics(
+    history,
+    output,
+    inputLines,
+    reservedRows
+  );
   history.followBottom = false;
   switch (action) {
     case "page-up":
@@ -8214,7 +8223,118 @@ function createTuiRender(host) {
     renderHistoryToOutput,
     renderHistoryUnderDialog,
     scheduleRender,
-    flushPendingRender
+    flushPendingRender,
+    // 立即绘制一帧同步帧（BSU/ESU + 光标隐藏）。流式路径走 33ms 节流的
+    // scheduleRender；平滑滚动推进器按 16ms 自己的节奏调用这里，避免被节流
+    // 抹平成"每 33ms 一跳"。
+    paintImmediate: paintSyncedFrame
+  };
+}
+
+// packages/cli/tui/tuiScrollAnimation.ts
+var SCROLL_ANIMATION_TICK_MS = 16;
+var DEFAULT_SCROLL_MAX_LINES_PER_TICK = 6;
+function readPositiveInt(raw, fallback, max) {
+  if (raw === void 0 || raw.trim() === "") return fallback;
+  const parsed = Number.parseInt(raw, 10);
+  if (!Number.isFinite(parsed) || parsed < 1) return fallback;
+  return Math.min(parsed, max);
+}
+function resolveScrollTuning(env = process.env) {
+  return {
+    wheelLines: readPositiveInt(env.NOLO_TUI_WHEEL_LINES, WHEEL_SCROLL_LINES, 50),
+    maxLinesPerTick: readPositiveInt(
+      env.NOLO_TUI_SCROLL_MAX_STEP,
+      DEFAULT_SCROLL_MAX_LINES_PER_TICK,
+      100
+    )
+  };
+}
+var defaultTickTimer = {
+  every(ms, fn) {
+    const handle = setInterval(fn, ms);
+    handle.unref?.();
+    return () => clearInterval(handle);
+  }
+};
+function createScrollAnimator(deps) {
+  const { wheelLines, maxLinesPerTick } = resolveScrollTuning(
+    deps.env ?? process.env
+  );
+  const timer = deps.tickTimer ?? defaultTickTimer;
+  const history = deps.history;
+  let goal = null;
+  let intent = null;
+  let stopTicker = null;
+  const metrics = () => computeScrollMetrics(
+    history,
+    deps.output,
+    deps.getInputLines(),
+    deps.getReservedRows?.() ?? 0
+  );
+  const stop = () => {
+    if (stopTicker) {
+      stopTicker();
+      stopTicker = null;
+    }
+    goal = null;
+    intent = null;
+  };
+  const settle = (maxScrollTop) => {
+    if (intent === "down" && history.scrollTop >= maxScrollTop) {
+      history.followBottom = true;
+    }
+    stop();
+  };
+  const tick = () => {
+    if (goal === null) {
+      stop();
+      return;
+    }
+    const { maxScrollTop } = metrics();
+    if (goal > maxScrollTop) goal = maxScrollTop;
+    const delta = goal - history.scrollTop;
+    if (delta === 0) {
+      settle(maxScrollTop);
+      return;
+    }
+    const step = Math.sign(delta) * Math.min(Math.abs(delta), maxLinesPerTick);
+    history.scrollTop += step;
+    deps.onPaint();
+    if (history.scrollTop === goal) {
+      settle(maxScrollTop);
+    }
+  };
+  const ensureTicker = () => {
+    if (!stopTicker) {
+      stopTicker = timer.every(SCROLL_ANIMATION_TICK_MS, tick);
+    }
+  };
+  return {
+    /**
+     * 一条滚轮报告：折算为目标位置并保证推进器在跑。
+     * followBottom 先退出（与 applyScrollAction 的 wheel 分支一致）。
+     */
+    wheel(direction) {
+      const isOpposing = intent !== null && intent !== direction;
+      const base = isOpposing ? history.scrollTop : goal ?? history.scrollTop;
+      const next = direction === "up" ? base - wheelLines : base + wheelLines;
+      goal = Math.max(0, next);
+      intent = direction;
+      if (goal === history.scrollTop) {
+        stop();
+        return;
+      }
+      history.followBottom = false;
+      ensureTicker();
+    },
+    /** 外部直接改了 scrollTop（键盘滚动、选区拖拽自动滚动）前调用，避免两套写入打架。 */
+    cancel() {
+      stop();
+    },
+    isAnimating() {
+      return goal !== null;
+    }
   };
 }
 
@@ -10053,6 +10173,15 @@ async function runTuiWorkspace(options) {
       onRecordsPolled: (records) => runCompletionWatcher.observe(records)
     });
     const history = createTurnHistory();
+    let handleTranscriptScroll = (action) => {
+      applyScrollAction(
+        history,
+        action,
+        output,
+        fixedInput.getInputLines(),
+        dialogHost.getReservedRows()
+      );
+    };
     const dialogHost = createDialogHost({
       composer: {
         pause: () => fixedInput.pause(),
@@ -10073,13 +10202,7 @@ async function runTuiWorkspace(options) {
         fixedInput.repaint(buffer, cursorPos);
       },
       onTranscriptScroll: (action) => {
-        applyScrollAction(
-          history,
-          action,
-          output,
-          fixedInput.getInputLines(),
-          dialogHost.getReservedRows()
-        );
+        handleTranscriptScroll(action);
       },
       output,
       // The decoder-drain hook is only bound once the interactive raw-mode
@@ -10096,7 +10219,8 @@ async function runTuiWorkspace(options) {
       renderHistoryToOutput,
       renderHistoryUnderDialog,
       scheduleRender,
-      flushPendingRender
+      flushPendingRender,
+      paintImmediate
     } = createTuiRender({
       output,
       history,
@@ -10112,6 +10236,28 @@ async function runTuiWorkspace(options) {
       },
       getReservedRows: () => dialogHost.getReservedRows()
     });
+    const scrollAnimator = createScrollAnimator({
+      history,
+      output,
+      getInputLines: () => fixedInput.getInputLines(),
+      getReservedRows: () => dialogHost.getReservedRows(),
+      onPaint: () => paintImmediate(),
+      env: effectiveEnv
+    });
+    handleTranscriptScroll = (action) => {
+      if (action === "wheel-up" || action === "wheel-down") {
+        scrollAnimator.wheel(action === "wheel-up" ? "up" : "down");
+        return;
+      }
+      scrollAnimator.cancel();
+      applyScrollAction(
+        history,
+        action,
+        output,
+        fixedInput.getInputLines(),
+        dialogHost.getReservedRows()
+      );
+    };
     const refreshGitStatus = () => {
       if ((options.env?.NOLO_CLI_GIT_STATUS ?? process.env.NOLO_CLI_GIT_STATUS) === "0") return;
       void detectGitStatusAsync(state.cwd).then((gitStatus) => {
@@ -10433,6 +10579,7 @@ async function runTuiWorkspace(options) {
         if (done) return;
         done = true;
         sessionEnded = true;
+        scrollAnimator.cancel();
         if (resizeTimer !== null) {
           clearTimeout(resizeTimer);
           resizeTimer = null;
@@ -10561,6 +10708,7 @@ ${err.message}` : ""}`
       const startAutoScroll = (direction, mouseX) => {
         autoScrollDirection = direction;
         lastDragMouseX = mouseX;
+        scrollAnimator.cancel();
         if (autoScrollTimer) return;
         autoScrollTimer = setInterval(() => {
           if (!selectionState.dragging || !selectionState.anchor || fixedInput.isPaused()) {
@@ -10771,9 +10919,9 @@ ${merged}` : merged;
         if (mouseEvent) {
           if (fixedInput.isPaused()) return;
           if (mouseEvent.kind === "wheel") {
-            const scrollAction2 = mouseEvent.wheelDirection === "down" ? "wheel-down" : "wheel-up";
-            applyScrollAction(history, scrollAction2, output, fixedInput.getInputLines());
-            scheduleRender();
+            scrollAnimator.wheel(
+              mouseEvent.wheelDirection === "down" ? "down" : "up"
+            );
             return;
           }
           const tty = output;
@@ -10793,6 +10941,7 @@ ${merged}` : merged;
           const screenCol = mouseEvent.x - 1;
           if (mouseEvent.kind === "press" && mouseEvent.button === "left") {
             stopAutoScroll();
+            scrollAnimator.cancel();
             if (screenRow < visibleHeight && screenCol < contentWidth) {
               const hit = hitTestHistory(
                 history,
@@ -10872,6 +11021,7 @@ ${merged}` : merged;
         const scrollAction = parseScrollAction(sequence);
         if (scrollAction) {
           if (fixedInput.isPaused()) return;
+          scrollAnimator.cancel();
           applyScrollAction(history, scrollAction, output, fixedInput.getInputLines());
           paintFrame(buffer);
           return;