mixdog 0.9.4 → 0.9.5

package/src/tui/components/Picker.jsx

@@ -13,7 +13,7 @@
  *   Escape      — back/cancel
  *   Ctrl+C      — handled globally for selection copy
  */
-import React, { useState, useCallback, useEffect } from 'react';
+import React, { useState, useCallback, useEffect, useRef } from 'react';
 import { Box, Text, useInput } from 'ink';
 import stringWidth from 'string-width';
 import { theme } from '../theme.mjs';
@@ -109,6 +109,7 @@ export function Picker({
   const hasConfirm = confirmButtons.length > 0;
   // -1 = list focus; 0..n-1 = confirm-bar button focus.
   const [confirmFocus, setConfirmFocus] = useState(-1);
+  const lastTabAtRef = useRef(0);
   useEffect(() => {
     // Reset to list focus whenever the bar identity/shape changes (step switch).
     setConfirmFocus(-1);
@@ -161,10 +162,13 @@ export function Picker({
   }, [onHighlight, items, selectedIndex]);
 
   const activeFooter = typeof footer === 'function' ? footer(items[selectedIndex], selectedIndex) : footer;
-  const footerLines = normalizeFooterLines(activeFooter, columns);
+  const confirmInlineWidth = hasConfirm
+    ? confirmButtons.reduce((sum, button, index) => sum + (index > 0 ? 1 : 0) + stringWidth(`[ ${button?.label || ''} ]`) + 2, 0)
+    : 0;
+  const footerLines = normalizeFooterLines(activeFooter, Math.max(0, columns - (hasConfirm ? confirmInlineWidth + 1 : 0)));
   const footerGap = footerLines.length > 0 ? Math.max(0, Math.floor(Number(footerGapRows) || 0)) : 0;
   const footerReserveRows = footerLines.length > 0 ? footerLines.length + footerGap : 0;
-  const confirmReserveRows = hasConfirm ? 2 : 0;
+  const confirmReserveRows = hasConfirm && footerLines.length === 0 ? 2 : 0;
   const effectiveVisibleLimit = Math.max(1, visibleLimit - footerReserveRows - confirmReserveRows);
   const helpText = help || (hasConfirm ? CONFIRM_HELP : (onLeft || onRight || onTab ? ADJUST_HELP : SELECT_HELP));
 
@@ -241,6 +245,9 @@ export function Picker({
           return;
         }
         if (key.tab || input === '\t') {
+          const now = Date.now();
+          if (now - lastTabAtRef.current < 120) return;
+          lastTabAtRef.current = now;
           if (hasConfirm) {
             setConfirmFocus((f) => (f < 0 ? 0 : (f + 1 > confirmButtons.length - 1 ? -1 : f + 1)));
             return;
@@ -387,17 +394,31 @@ export function Picker({
         {footerLines.length > 0 ? (
           <>
             <Box flexGrow={1} />
-            {footerLines.map((line, index) => (
-              <Text key={`footer-${index}`}>
-                {line.glyph ? <Text color={line.color}>{line.glyph} </Text> : null}
-                <Text color={theme.text}>{line.text}</Text>
-              </Text>
-            ))}
+            {footerLines.map((line, index) => {
+              const attachConfirm = hasConfirm && index === footerLines.length - 1;
+              return (
+                <Box
+                  key={`footer-${index}`}
+                  flexDirection="row"
+                  width="100%"
+                  justifyContent={attachConfirm ? 'space-between' : 'flex-start'}
+                  alignItems="center"
+                >
+                  <Text>
+                    {line.glyph ? <Text color={line.color}>{line.glyph} </Text> : null}
+                    <Text color={theme.text}>{line.text}</Text>
+                  </Text>
+                  {attachConfirm ? (
+                    <ConfirmBar buttons={confirmButtons} focusedIndex={clampConfirmFocus(confirmFocus, confirmButtons.length)} />
+                  ) : null}
+                </Box>
+              );
+            })}
           </>
         ) : null}
-        {hasConfirm ? (
+        {hasConfirm && footerLines.length === 0 ? (
           <>
-            {footerLines.length > 0 ? null : <Box flexGrow={1} />}
+            <Box flexGrow={1} />
             <Text> </Text>
             <ConfirmBar buttons={confirmButtons} focusedIndex={clampConfirmFocus(confirmFocus, confirmButtons.length)} />
           </>

package/src/tui/components/PromptInput.jsx

@@ -524,6 +524,15 @@ export function PromptInput({
 
     const rawInput = String(input ?? '');
     const inputKey = rawInput.toLowerCase();
+    const rawShiftArrowForGrid =
+      rawInput === '\x1b[1;2A' || rawInput === '\x1b[a' || rawInput === '[1;2A'
+      || rawInput === '\x1b[1;2B' || rawInput === '\x1b[b' || rawInput === '[1;2B'
+      || rawInput === '\x1b[1;2C' || rawInput === '\x1b[c' || rawInput === '[1;2C'
+      || rawInput === '\x1b[1;2D' || rawInput === '\x1b[d' || rawInput === '[1;2D'
+      || rawInput === '\x1b[1;6A' || rawInput === '[1;6A'
+      || rawInput === '\x1b[1;6B' || rawInput === '[1;6B'
+      || rawInput === '\x1b[1;6C' || rawInput === '[1;6C'
+      || rawInput === '\x1b[1;6D' || rawInput === '[1;6D';
 
     // App owns Shift+Arrow when a transcript/status ink-grid selection is live.
     // Because the parent (App) useInput handler fires AFTER this child handler
@@ -537,7 +546,7 @@ export function PromptInput({
     if (gridSelectionActive) {
       const isShiftArrow = key.shift
         && (key.leftArrow || key.rightArrow || key.upArrow || key.downArrow || key.home || key.end);
-      if (isShiftArrow) return;
+      if (isShiftArrow || rawShiftArrowForGrid) return;
     }
 
     // Drop SGR mouse-tracking sequences (wheel/click). When app mouse tracking

package/src/tui/components/StatusLine.jsx

@@ -52,7 +52,7 @@ const STATUSLINE_BOOT_FULL_DELAY_ACTIVE_MS = 2200;
 const STATUSLINE_BOOT_FULL_RETRY_MS = 2000;
 const STATUSLINE_BOOT_FULL_RETRY_MAX_MS = 30000;
 const STATUSLINE_REFRESH_MS = 2000;
-const STATUSLINE_ACTIVE_REFRESH_MS = 250;
+const STATUSLINE_ACTIVE_REFRESH_MS = 500;
 
 function isTerminalStatus(statusText) {
   return /idle|done|complete|success|closed|error|fail|cancel|killed|timeout/.test(String(statusText || '').toLowerCase());
@@ -157,8 +157,11 @@ function localContextPct({
       : (localNum(contextWindow) > 0
         ? localNum(contextWindow)
         : (localNum(rawContextWindow) > 0 ? localNum(rawContextWindow) : 200_000)));
-  // autoCompactTokenLimit is the compaction trigger only; pct uses the boundary window.
-  const window = baseWindow;
+  // Trigger-as-denominator (mirrors ui/statusline.mjs resolveContextUsedPct):
+  // a sub-boundary compaction trigger is the display denominator so the gauge
+  // reads 100% exactly when auto-compact fires, instead of stalling at ~90%.
+  const trigger = localNum(autoCompactTokenLimit);
+  const window = trigger > 0 && trigger < baseWindow ? trigger : baseWindow;
   const s = stats && typeof stats === 'object' ? stats : {};
   const source = String(s.currentContextSource || '').toLowerCase();
   const estimated = localNum(s.currentEstimatedContextTokens);