nolo-cli 0.63.1 → 0.64.0-alpha.1

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

@@ -72,7 +72,7 @@ import {
   wrapTextToLines,
   wrapTranscriptLine,
   wrapTranscriptLineWithLayout
-} from "./chunk-JNDDM6BU.js";
+} from "./chunk-BWIPK2PD.js";
 import "./chunk-S7Z2HMCN.js";
 import {
   listFavoriteAgentIdsAcrossServers,
@@ -89,6 +89,7 @@ import {
 import "./chunk-JYYZCK2Z.js";
 import {
   RUN_WAKE_CHANNEL_ENV,
+  appendTurnBillingAudit,
   createCliLocalRuntimeAdapter,
   dailyWelcomeTip,
   initCliLocale,
@@ -96,7 +97,7 @@ import {
   readTimestamp,
   setCliLocale,
   t
-} from "./chunk-Y4AIZ4N2.js";
+} from "./chunk-LJ6OKZ6D.js";
 import "./chunk-MXUDQZXQ.js";
 import "./chunk-EADNWBAZ.js";
 import {
@@ -170,8 +171,7 @@ import "./chunk-DWYSDNOH.js";
 import "./chunk-N6HLMLKE.js";
 import "./chunk-ZJ7UHBJS.js";
 import {
-  extractReferenceKeysFromMessage,
-  normalizeUsage
+  extractReferenceKeysFromMessage
 } from "./chunk-TBHAHL33.js";
 import "./chunk-EVBFYPDC.js";
 import "./chunk-HQUORJTM.js";
@@ -202,7 +202,7 @@ import {
   buildLocalWorkspaceToolset,
   getProcessRegistry,
   readCommandActionGatePayload
-} from "./chunk-ECSQC7UV.js";
+} from "./chunk-3ROJR3TG.js";
 import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-XOKOSO35.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":
@@ -6241,7 +6250,7 @@ ${t("autoUsage")}`
       }
       return {
         nextState: state,
-        output: "Compacting current dialog...",
+        output: t("compactingDialog"),
         action: { type: "compact", dialogId: state.dialogId }
       };
     case "/agent":
@@ -6689,66 +6698,6 @@ function normalizeStatus(raw) {
   return "failed";
 }
 
-// packages/cli/client/turnBillingAudit.ts
-import { appendFileSync, mkdirSync as mkdirSync2 } from "node:fs";
-import { homedir as homedir4 } from "node:os";
-import { join as join3 } from "node:path";
-function projectUsageForAudit(usage) {
-  if (!usage || typeof usage !== "object") return null;
-  const normalized = normalizeUsage(usage);
-  const projected = {
-    input_tokens: normalized.input_tokens,
-    output_tokens: normalized.output_tokens,
-    cache_read_input_tokens: normalized.cache_read_input_tokens,
-    cache_creation_input_tokens: normalized.cache_creation_input_tokens
-  };
-  if (typeof usage.cost === "number" && Number.isFinite(usage.cost)) {
-    projected.cost = usage.cost;
-  }
-  if (typeof usage.billing_unit === "string" && usage.billing_unit.trim()) {
-    projected.billing_unit = usage.billing_unit;
-  }
-  if (typeof usage.provider_call_id === "string" && usage.provider_call_id.trim()) {
-    projected.provider_call_id = usage.provider_call_id.trim();
-  }
-  return projected;
-}
-function resolveTurnBillingAuditLogPath(env = process.env) {
-  const noloHome = env.NOLO_HOME?.trim() || join3(homedir4(), ".nolo");
-  return join3(noloHome, "logs", "turn-billing.jsonl");
-}
-function appendTurnBillingAudit(input) {
-  try {
-    if (process.env.NOLO_TURN_BILLING_AUDIT === "0") return;
-    const calls = (input.usageRecords ?? []).map((record) => {
-      const usage = projectUsageForAudit(record?.usage);
-      if (!usage) return null;
-      return {
-        ...record?.callId ? { callId: record.callId } : {},
-        ...record?.model ? { model: record.model } : {},
-        ...record?.provider ? { provider: record.provider } : {},
-        ...usage
-      };
-    }).filter((call) => call !== null);
-    if (calls.length === 0 && (input.turnCredits === void 0 || input.turnCredits === null)) {
-      return;
-    }
-    const row = {
-      ts: Date.now(),
-      ...input.dialogId ? { dialogId: input.dialogId } : {},
-      ...input.agentKey ? { agentKey: input.agentKey } : {},
-      ...input.turnCredits !== void 0 && input.turnCredits !== null ? { turnCredits: input.turnCredits } : {},
-      ...input.aborted ? { aborted: true } : {},
-      calls
-    };
-    const logPath = resolveTurnBillingAuditLogPath();
-    mkdirSync2(join3(logPath, ".."), { recursive: true });
-    appendFileSync(logPath, `${JSON.stringify(row)}
-`);
-  } catch {
-  }
-}
-
 // packages/ai/tools/askChoiceState.ts
 function normalizeAskChoiceArgs(args) {
   const blocking = args.blocking !== false;
@@ -8274,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;
+    }
   };
 }
 
@@ -8282,17 +8342,8 @@ function createTuiRender(host) {
 import { ulid } from "ulid";
 var DB_PATH = "/api/v1/db";
 function parseTokenUserId(token) {
-  try {
-    const parts = token.split(".");
-    if (parts.length < 2) return null;
-    const payloadBase64 = parts[1];
-    const payload = JSON.parse(
-      Buffer.from(payloadBase64, "base64").toString("utf8")
-    );
-    return typeof payload?.userId === "string" ? payload.userId : null;
-  } catch {
-    return null;
-  }
+  const userId = parseUserIdFromAuthToken(token);
+  return userId || null;
 }
 async function readDialogRecord(fetchImpl, serverUrl, authToken, dialogKey) {
   const res = await fetchImpl(`${serverUrl}${DB_PATH}/read/${dialogKey}`, {
@@ -8327,7 +8378,7 @@ async function patchDialog(fetchImpl, serverUrl, authToken, dialogKey, changes)
       "Content-Type": "application/json",
       Authorization: `Bearer ${authToken}`
     },
-    body: JSON.stringify({ data: changes })
+    body: JSON.stringify(changes)
   });
   if (!res.ok) {
     throw new Error(`Failed to patch dialog "${dialogKey}": HTTP ${res.status}`);
@@ -8433,12 +8484,13 @@ async function resolveContextWindow(fetchImpl, serverUrl, authToken, agentKey) {
 }
 async function compactDialog(options) {
   const fetchImpl = options.fetchImpl ?? fetch;
-  const userId = parseTokenUserId(options.authToken);
+  const userId = options.userId || parseTokenUserId(options.authToken);
   if (!userId) {
     throw new Error(
       "[nolo] compact: cannot compact \u2014 invalid or missing auth token"
     );
   }
+  options.onProgress?.("reading");
   const dialogKey = `dialog-${userId}-${options.dialogId}`;
   const current = await readDialogRecord(
     fetchImpl,
@@ -8472,6 +8524,7 @@ async function compactDialog(options) {
         reason: "manual"
       });
       if (plan.shouldCompress && plan.msgsToCompress.length > 0) {
+        options.onProgress?.("summarizing");
         const previousSummary = current.summary || "";
         const messagesText = formatMessagesForSummaryWithTruncation(plan.msgsToCompress);
         const fileOpsText = formatFileOperationsFromMessages(
@@ -8520,6 +8573,7 @@ async function compactDialog(options) {
       }
     }
   }
+  options.onProgress?.("forking");
   const next = buildForkedDialogRecord(current, userId);
   await writeDialogRecord(fetchImpl, options.serverUrl, options.authToken, next);
   await addDialogToSpaceIfNeeded(
@@ -9483,7 +9537,13 @@ async function runSubmittedSlashLine(line, host, actionGateHandler, confirmDestr
         serverUrl: host.state.serverUrl,
         authToken,
         dialogId: result.action.dialogId,
-        summaryLlmCaller: options.summaryLlmCaller
+        summaryLlmCaller: options.summaryLlmCaller,
+        onProgress: (phase) => {
+          const phaseText = phase === "reading" ? t("compactPhaseReading") : phase === "summarizing" ? t("compactPhaseSummarizing") : phase === "forking" ? t("compactPhaseForking") : void 0;
+          if (phaseText) {
+            emitCommandOutput(phaseText);
+          }
+        }
       });
       const elapsedSec = ((Date.now() - compactStart) / 1e3).toFixed(1);
       host.state = {
@@ -9532,13 +9592,9 @@ async function runSubmittedSlashLine(line, host, actionGateHandler, confirmDestr
         compactResult.dialogId,
         elapsed
       );
-      output.write(`${message}
-`);
+      emitCommandOutput(message);
     } catch (error) {
-      output.write(
-        `[nolo] Compact failed: ${toErrorMessage(error)}
-`
-      );
+      emitCommandOutput(t("compactFailed", toErrorMessage(error)));
     }
   }
   if (result.action?.type === "self-update") {
@@ -10117,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(),
@@ -10137,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
@@ -10160,7 +10219,8 @@ async function runTuiWorkspace(options) {
       renderHistoryToOutput,
       renderHistoryUnderDialog,
       scheduleRender,
-      flushPendingRender
+      flushPendingRender,
+      paintImmediate
     } = createTuiRender({
       output,
       history,
@@ -10176,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) => {
@@ -10497,6 +10579,7 @@ async function runTuiWorkspace(options) {
         if (done) return;
         done = true;
         sessionEnded = true;
+        scrollAnimator.cancel();
         if (resizeTimer !== null) {
           clearTimeout(resizeTimer);
           resizeTimer = null;
@@ -10625,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()) {
@@ -10835,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;
@@ -10857,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,
@@ -10936,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;

package/{spaceCommands-OAKDKTZV.js → spaceCommands-76ECKNFH.js}

@@ -11,7 +11,7 @@ import {
 import "./chunk-CTCW7U7N.js";
 import "./chunk-SPAQ4PVV.js";
 import "./chunk-KQHGZWSV.js";
-import "./chunk-ECSQC7UV.js";
+import "./chunk-3ROJR3TG.js";
 import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-XOKOSO35.js";