nolo-cli 0.8.0-alpha.2 → 0.8.0-alpha.5

package/index.js

@@ -93814,7 +93814,7 @@ function formatCompactToolLine(event, pending, colorEnabled) {
   const label = rawArgs ? `${rawLabel} ${rawArgs}` : rawLabel;
   if (event.type === "tool-error") {
     const message = clip5(event.message ?? t("toolFailed"), 96);
-    return formatToolTraceLine(`  \u25B8 ${label}  \u2717 ${message}`, colorEnabled, "error");
+    return formatToolTraceLine(`\u25B8 ${label}  \u2717 ${message}`, colorEnabled, "error");
   }
   if (event.type === "tool-result" && (event.toolName === "ui_ask_choice" || event.metadata?.uiAskChoice)) {
     const block = formatUiAskChoiceBlock(event, colorEnabled);
@@ -93826,7 +93826,7 @@ function formatCompactToolLine(event, pending, colorEnabled) {
   const marker = failed ? "\u2717" : isNeedsActionToolResult(event) ? "!" : "\u2713";
   let mainLine;
   if (!colorEnabled) {
-    mainLine = `  \u25B8 ${label}  ${marker}${suffix}
+    mainLine = `\u25B8 ${label}  ${marker}${suffix}
 `;
   } else {
     const chromePointer = themeText("\u25B8", "chrome", true);
@@ -93834,7 +93834,7 @@ function formatCompactToolLine(event, pending, colorEnabled) {
     const argsPart = rawArgs ? ` ${dimCliText(rawArgs, true)}` : "";
     const statusToken = failed ? themeText("\u2717", "danger", true) : isNeedsActionToolResult(event) ? themeText("!", "warning", true) : themeText("\u2713", "success", true);
     const suffixPart = hint.inline ? ` ${dimCliText(hint.inline, true)}` : "";
-    mainLine = `  ${chromePointer} ${mutedLabel}${argsPart}  ${statusToken}${suffixPart}
+    mainLine = `${chromePointer} ${mutedLabel}${argsPart}  ${statusToken}${suffixPart}
 `;
   }
   if (!hint.detail) return mainLine;
@@ -93844,28 +93844,28 @@ function formatCompactToolLine(event, pending, colorEnabled) {
 function formatEditDetailLine(line, colorEnabled) {
   const marker = line.slice(0, 2);
   const rest = line.slice(2);
-  if (!colorEnabled) return `    ${line}
+  if (!colorEnabled) return `  ${line}
 `;
   const diff = diffLineSequences();
   if (!diff) {
     const color = marker === "- " ? "red" : marker === "+ " ? "green" : void 0;
     if (color) {
-      return `    ${styleCliText(marker, color, true)}${dimCliText(rest, true)}
+      return `  ${styleCliText(marker, color, true)}${dimCliText(rest, true)}
 `;
     }
-    return `    ${dimCliText(line, true)}
+    return `  ${dimCliText(line, true)}
 `;
   }
   const RESET2 = "\x1B[0m";
   if (marker === "- ") {
-    return `    ${diff.removed.bg}${diff.removed.fg}- ${rest}${RESET2}
+    return `  ${diff.removed.bg}${diff.removed.fg}- ${rest}${RESET2}
 `;
   }
   if (marker === "+ ") {
-    return `    ${diff.added.bg}${diff.added.fg}+ ${rest}${RESET2}
+    return `  ${diff.added.bg}${diff.added.fg}+ ${rest}${RESET2}
 `;
   }
-  return `    ${dimCliText(line, true)}
+  return `  ${dimCliText(line, true)}
 `;
 }
 function createToolEventFormatter(mode, colorEnabled = resolveCliColorEnabled()) {
@@ -107039,6 +107039,64 @@ var init_dialogFrame = __esm({
   }
 });
 
+// packages/cli/tui/tuiScrollbar.ts
+function parseScrollAction(sequence) {
+  const mouse = SGR_MOUSE_REGEX.exec(sequence);
+  if (mouse) {
+    const button = Number(mouse[1]);
+    if ((button & 64) === 0) return null;
+    if ((button & 2) !== 0) return null;
+    return (button & 1) !== 0 ? "wheel-down" : "wheel-up";
+  }
+  switch (sequence) {
+    case "\x1B[5~":
+      return "page-up";
+    case "\x1B[6~":
+      return "page-down";
+    case "\x1B[5;2~":
+    case "\x1B[5;5~":
+      return "half-page-up";
+    case "\x1B[6;2~":
+    case "\x1B[6;5~":
+      return "half-page-down";
+    case "\x1B[H":
+    case "\x1B[1~":
+    case "\x1B[7~":
+      return "top";
+    case "\x1B[F":
+    case "\x1B[4~":
+    case "\x1B[8~":
+      return "bottom";
+    default:
+      return null;
+  }
+}
+function renderScrollbarRow(rowIndex, visibleHeight, totalLines, scrollTop) {
+  if (totalLines <= visibleHeight) return " ";
+  const trackHeight = visibleHeight;
+  const thumbSize = Math.max(
+    1,
+    Math.floor(visibleHeight * visibleHeight / totalLines)
+  );
+  const maxScrollTop = totalLines - visibleHeight;
+  const thumbTop = Math.floor(
+    scrollTop / maxScrollTop * (trackHeight - thumbSize)
+  );
+  const thumbBottom = thumbTop + thumbSize;
+  if (rowIndex >= thumbTop && rowIndex < thumbBottom) {
+    return "\u2588";
+  }
+  return "\u2502";
+}
+var SGR_MOUSE_REGEX, WHEEL_SCROLL_LINES;
+var init_tuiScrollbar = __esm({
+  "packages/cli/tui/tuiScrollbar.ts"() {
+    "use strict";
+    SGR_MOUSE_REGEX = /^\x1b\[<(\d+);\d+;\d+[Mm]$/;
+    WHEEL_SCROLL_LINES = 3;
+  }
+});
+
 // packages/cli/tui/selectDialog.ts
 function computeVisibleWindow(args2) {
   const maxVisible = Math.max(1, args2.maxVisible ?? DEFAULT_MAX_VISIBLE);
@@ -107184,6 +107242,7 @@ async function runSelectDialog(args2) {
   const output2 = args2.output ?? process.stdout;
   const input2 = args2.input ?? process.stdin;
   const readKey = args2.readKey ?? createRawKeyReader(input2);
+  output2.write("\x1B[?1006h\x1B[?1000h");
   const wasRaw = Boolean(input2.isTTY && input2.isRaw);
   let renderedLineCount = 0;
   const bottomAnchored = Boolean(args2.bottomAnchored && args2.bottomRow);
@@ -107247,6 +107306,18 @@ async function runSelectDialog(args2) {
       if (sequence == null) {
         return { kind: "cancelled" };
       }
+      const scrollAction = parseScrollAction(sequence);
+      if (scrollAction === "wheel-up" || scrollAction === "wheel-down") {
+        selectedIndex = Math.min(
+          Math.max(
+            selectedIndex + (scrollAction === "wheel-up" ? -1 : 1),
+            0
+          ),
+          items.length - 1
+        );
+        paint();
+        continue;
+      }
       if (isCancel(sequence)) {
         return { kind: "cancelled" };
       }
@@ -107265,6 +107336,7 @@ async function runSelectDialog(args2) {
       }
     }
   } finally {
+    output2.write("\x1B[?1000l\x1B[?1006l");
     resizeTarget.off?.("resize", onOutputResize);
     readKey.dispose?.();
     if (input2.isTTY) {
@@ -107289,6 +107361,7 @@ var init_selectDialog = __esm({
     "use strict";
     init_dialogFrame();
     init_i18n2();
+    init_tuiScrollbar();
     CSI_ARROW_UP = "\x1B[A";
     CSI_ARROW_DOWN = "\x1B[B";
     CSI_ARROW_UP_APP = "\x1BOA";
@@ -107513,15 +107586,16 @@ function askChoiceReducer(state4, action3) {
           phase: "submitted"
         };
       }
+      const nextState = { ...state4, questionStates: newQs };
+      const isLastTab = state4.activeIndex >= state4.questions.length - 1;
+      if (isLastTab && canSubmit(nextState)) {
+        return { ...nextState, phase: "submitted" };
+      }
       const nextTab = Math.min(
         state4.activeIndex + 1,
         state4.questions.length - 1
       );
-      return {
-        ...state4,
-        questionStates: newQs,
-        activeIndex: nextTab
-      };
+      return { ...nextState, activeIndex: nextTab };
     }
     case "FOCUS_OTHER": {
       const qs = state4.questionStates[state4.activeIndex];
@@ -107604,7 +107678,7 @@ function renderTabBar(questions, activeIndex, colorEnabled) {
   return tabs.join("  ") + "  " + (colorEnabled ? themeText(submitLabel, "chrome", colorEnabled) : submitLabel);
 }
 function renderFooter(colorEnabled) {
-  const hints = "type answer  \u21B5save  tab switch  s submit  esc cancel";
+  const hints = "\u21B5 pick/submit \xB7 space toggle \xB7 tab switch \xB7 esc cancel";
   return colorEnabled ? themeText(`  ${hints}`, "chrome", colorEnabled) : `  ${hints}`;
 }
 function renderAskChoiceFrame(state4) {
@@ -107695,6 +107769,7 @@ async function runAskChoiceDialog(args2) {
   const output2 = args2.output ?? process.stdout;
   const input2 = args2.input ?? process.stdin;
   const readKey = args2.readKey ?? createRawKeyReader(input2);
+  output2.write("\x1B[?1006h\x1B[?1000h");
   const wasRaw = Boolean(input2.isTTY && input2.isRaw);
   let renderedLineCount = 0;
   const bottomAnchored = Boolean(args2.bottomAnchored && args2.bottomRow);
@@ -107755,6 +107830,15 @@ async function runAskChoiceDialog(args2) {
         state4 = askChoiceReducer(state4, { type: "CANCEL" });
         break;
       }
+      const scrollAction = parseScrollAction(sequence);
+      if (scrollAction === "wheel-up" || scrollAction === "wheel-down") {
+        state4 = askChoiceReducer(state4, {
+          type: "MOVE_CURSOR",
+          delta: scrollAction === "wheel-up" ? -1 : 1
+        });
+        paint();
+        continue;
+      }
       let action3 = null;
       if (isCancel(sequence)) {
         action3 = { type: "CANCEL" };
@@ -107768,8 +107852,6 @@ async function runAskChoiceDialog(args2) {
         action3 = { type: "MOVE_CURSOR", delta: 1 };
       } else if (sequence === CSI_SPACE) {
         action3 = { type: "TOGGLE_AT_CURSOR" };
-      } else if (sequence === "s" && !state4.questionStates[state4.activeIndex].otherFocused && canSubmit(state4)) {
-        action3 = { type: "SUBMIT" };
       } else if (isSubmit(sequence)) {
         const qs = state4.questionStates[state4.activeIndex];
         const q = state4.questions[state4.activeIndex];
@@ -107778,6 +107860,8 @@ async function runAskChoiceDialog(args2) {
           action3 = { type: "BLUR_OTHER" };
         } else if (isOtherRow && !qs.otherFocused) {
           action3 = { type: "FOCUS_OTHER" };
+        } else if (q.multiSelect) {
+          action3 = { type: "SUBMIT" };
         } else {
           action3 = { type: "SELECT_AT_CURSOR" };
         }
@@ -107802,7 +107886,7 @@ async function runAskChoiceDialog(args2) {
         const prev = state4;
         state4 = askChoiceReducer(state4, action3);
         if (state4.phase !== "active") break;
-        if (action3.type === "BLUR_OTHER" && state4.questions.length === 1 && canSubmit(state4)) {
+        if (action3.type === "BLUR_OTHER" && state4.activeIndex >= state4.questions.length - 1 && canSubmit(state4)) {
           state4 = askChoiceReducer(state4, { type: "SUBMIT" });
           break;
         }
@@ -107810,6 +107894,7 @@ async function runAskChoiceDialog(args2) {
       }
     }
   } finally {
+    output2.write("\x1B[?1000l\x1B[?1006l");
     resizeTarget.off?.("resize", onOutputResize);
     readKey.dispose?.();
     if (input2.isTTY) {
@@ -107859,6 +107944,7 @@ var init_askChoiceDialog = __esm({
     init_selectDialog();
     init_terminalStyles();
     init_theme();
+    init_tuiScrollbar();
     CSI_TAB = "	";
     CSI_SHIFT_TAB = "\x1B[Z";
     CSI_BACKSPACE = "\x7F";
@@ -109048,7 +109134,7 @@ function renderStatusLine(state4) {
   const sep3 = themeText(" \xB7 ", "chrome", colorEnabled);
   const autoRouteActive = state4.agentKey === DEFAULT_TUI_AGENT_KEY && (typeof process === "undefined" || process.env?.NOLO_AUTO_ROUTE !== "0");
   const agentDisplayName = autoRouteActive ? "auto" : state4.agentName;
-  const modeSuffix = state4.modeLabel && !(autoRouteActive && state4.modeLabel === "auto") ? ` \xB7 ${state4.modeLabel}` : "";
+  const modeSuffix = state4.modeLabel && state4.modeLabel !== "auto" ? ` \xB7 ${state4.modeLabel}` : "";
   const agentLabel = `\u{1F3D4} ${agentDisplayName}${modeSuffix}`;
   const agentSegment = themeText(agentLabel, "accent", colorEnabled);
   const cwdSegment = themeText(`\u{1F4C1} ${formatCwd(state4.cwd)}`, "info", colorEnabled);
@@ -110391,64 +110477,6 @@ var init_chatQueueTuiBinding = __esm({
   }
 });
 
-// packages/cli/tui/tuiScrollbar.ts
-function parseScrollAction(sequence) {
-  const mouse = SGR_MOUSE_REGEX.exec(sequence);
-  if (mouse) {
-    const button = Number(mouse[1]);
-    if ((button & 64) === 0) return null;
-    if ((button & 2) !== 0) return null;
-    return (button & 1) !== 0 ? "wheel-down" : "wheel-up";
-  }
-  switch (sequence) {
-    case "\x1B[5~":
-      return "page-up";
-    case "\x1B[6~":
-      return "page-down";
-    case "\x1B[5;2~":
-    case "\x1B[5;5~":
-      return "half-page-up";
-    case "\x1B[6;2~":
-    case "\x1B[6;5~":
-      return "half-page-down";
-    case "\x1B[H":
-    case "\x1B[1~":
-    case "\x1B[7~":
-      return "top";
-    case "\x1B[F":
-    case "\x1B[4~":
-    case "\x1B[8~":
-      return "bottom";
-    default:
-      return null;
-  }
-}
-function renderScrollbarRow(rowIndex, visibleHeight, totalLines, scrollTop) {
-  if (totalLines <= visibleHeight) return " ";
-  const trackHeight = visibleHeight;
-  const thumbSize = Math.max(
-    1,
-    Math.floor(visibleHeight * visibleHeight / totalLines)
-  );
-  const maxScrollTop = totalLines - visibleHeight;
-  const thumbTop = Math.floor(
-    scrollTop / maxScrollTop * (trackHeight - thumbSize)
-  );
-  const thumbBottom = thumbTop + thumbSize;
-  if (rowIndex >= thumbTop && rowIndex < thumbBottom) {
-    return "\u2588";
-  }
-  return "\u2502";
-}
-var SGR_MOUSE_REGEX, WHEEL_SCROLL_LINES;
-var init_tuiScrollbar = __esm({
-  "packages/cli/tui/tuiScrollbar.ts"() {
-    "use strict";
-    SGR_MOUSE_REGEX = /^\x1b\[<(\d+);\d+;\d+[Mm]$/;
-    WHEEL_SCROLL_LINES = 3;
-  }
-});
-
 // packages/cli/tui/tuiHistory.ts
 function createTurnHistory() {
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nolo-cli",
-  "version": "0.8.0-alpha.2",
+  "version": "0.8.0-alpha.5",
   "type": "module",
   "description": "Agent-first terminal workspace for Nolo",
   "bin": {