mixdog 0.9.24 → 0.9.26

package/src/tui/app/maintenance-pickers.mjs

@@ -31,6 +31,10 @@ export function createMaintenancePickers({
       const upd = readSettings();
       const status = readStatus();
       const current = upd.currentVersion || 'unknown';
+      // After a successful in-place install the running process is still the
+      // old version; surface the pending version so "Current" doesn't look
+      // stale/broken until restart.
+      const installedVersion = status.phase === 'installed' ? (status.version || upd.latestVersion || null) : null;
       const latestMeta = checking || status.phase === 'checking'
         ? 'checking…'
         : (upd.latestVersion || 'unknown');
@@ -38,8 +42,10 @@ export function createMaintenancePickers({
         {
           value: 'current',
           label: 'Current version',
-          meta: current,
-          description: 'Installed mixdog version.',
+          meta: installedVersion ? `${current} → ${installedVersion}` : current,
+          description: installedVersion
+            ? `v${installedVersion} installed — restart mixdog to apply.`
+            : 'Installed mixdog version.',
           _action: 'current',
         },
         {
@@ -73,13 +79,17 @@ export function createMaintenancePickers({
           buttons: [
             {
               value: 'update-now',
-              label: upd.updateAvailable
-                ? `Update to v${upd.latestVersion || 'latest'}`
-                : 'Update now',
+              label: installedVersion
+                ? `v${installedVersion} installed — restart to apply`
+                : (status.phase === 'installing'
+                  ? 'Installing…'
+                  : (upd.updateAvailable
+                    ? `Update to v${upd.latestVersion || 'latest'}`
+                    : 'Update now')),
             },
           ],
           onConfirm: (button) => {
-            if (button?.value === 'update-now') runUpdate();
+            if (button?.value === 'update-now' && !installedVersion && status.phase !== 'installing') runUpdate();
           },
         },
         onSelect: (_value, item) => {
@@ -118,7 +128,7 @@ export function createMaintenancePickers({
       void Promise.resolve(store.runUpdateNow?.())
         .then((result) => {
           if (result?.ok) {
-            store.pushNotice(`v${result.version} installed — restart to apply`, 'info');
+            store.pushNotice(`v${result.version} installed — restart to apply`, 'warn');
           } else {
             store.pushNotice(`Update failed: ${result?.error || 'unknown error'}`, 'error');
           }

package/src/tui/app/settings-picker.mjs

@@ -43,7 +43,7 @@ export function createSettingsPicker({
   openUpdatePicker,
   openChannelSettingTypePicker,
 }) {
-  const openSettingsPicker = (opts = {}) => {
+  const openSettingsPicker = async (opts = {}) => {
     const light = opts.light === true;
     const overrides = opts.overrides || null;
     const heavyCache = light ? settingsHeavyCacheRef.current : null;
@@ -63,7 +63,7 @@ export function createSettingsPicker({
       channelBackend = heavyCache.channelBackend || 'discord';
     } else {
       try {
-        channelBackend = store.getChannelSetup?.()?.backend || 'discord';
+        channelBackend = (await store.getChannelSetup?.())?.backend || 'discord';
       } catch {
         channelBackend = 'discord';
       }

package/src/tui/app/transcript-window.mjs

@@ -272,6 +272,33 @@ function toolArgPathForRows(item) {
   return a?.path ?? a?.file_path ?? a?.file ?? '';
 }
 
+// Mirror ToolExecution's collapsed agent-card rule: an agent surface collapses
+// to a SINGLE header row unless the detail row carries failure info (the call
+// errored, or the brief/status reads as a failure/cancel). Pending agent cards
+// never carry failure info yet, so they collapse to one row. A header-failure-
+// only card is handled earlier by toolHeaderFailureOnlyForRows (also one row).
+function agentCardKeepsCollapsedDetailForRows(item, normalizedName) {
+  if (normalizedName !== 'agent') return false;
+  if (toolItemPendingForRows(item)) return false;
+  const bgArgs = backgroundArgsForRows(item.args);
+  const isError = Boolean(item.isError);
+  const hasDisplayResult = toolHasDisplayResultForRows(item);
+  const displayedResultText = toolDisplayedResultTextForRows(item);
+  const rt = item.result == null ? '' : String(item.result).replace(/\s+$/, '');
+  const isAgentResponse = hasDisplayResult && isAgentResponseResultText(rt);
+  const briefRaw = summarizeAgentSurfaceBrief(item.name, bgArgs, displayedResultText, {
+    isError,
+    isResponse: isAgentResponse,
+  });
+  const brief = String(briefRaw || '').trim();
+  const status = String(bgArgs.status || '').toLowerCase();
+  const failureText = /\b(cancelled|canceled|failed)\b/i.test(brief)
+    || /^(failed|error|timeout|cancelled|canceled|killed)$/i.test(status);
+  const agentHeaderFailure = isError && String(bgArgs.error || '').trim() && !hasDisplayResult;
+  if (agentHeaderFailure && !brief) return false;
+  return isError || failureText;
+}
+
 function isShellSurfaceForRows(normalizedName, label = '') {
   const n = String(normalizedName || '').toLowerCase();
   const l = String(label || '').toLowerCase();
@@ -332,6 +359,11 @@ function estimateTranscriptItemRows(item, columns, toolOutputExpanded) {
         if (toolHeaderFailureOnlyForRows(item, normalizedName, hasDisplayResult)) {
           return TOOL_MARGIN_TOP + 1;
         }
+        if (isAgentSurface) {
+          return agentCardKeepsCollapsedDetailForRows(item, normalizedName)
+            ? TOOL_MARGIN_TOP + 1 + 1
+            : TOOL_MARGIN_TOP + 1;
+        }
         return TOOL_MARGIN_TOP + 1 + 1;
       }
       if (hasRawResult) {
@@ -341,7 +373,11 @@ function estimateTranscriptItemRows(item, columns, toolOutputExpanded) {
           : { pathArg: toolArgPathForRows(item), isShell: isShellSurfaceForToolItem(item, normalizedName) };
         return TOOL_MARGIN_TOP + 1 + estimateToolRenderedResultRows(estimateText, { ...rawOpts, columns });
       }
-      if (isAgentSurface && !hasResult) return TOOL_MARGIN_TOP + 1 + 1;
+      if (isAgentSurface && !hasResult) {
+        return agentCardKeepsCollapsedDetailForRows(item, normalizedName)
+          ? TOOL_MARGIN_TOP + 1 + 1
+          : TOOL_MARGIN_TOP + 1;
+      }
       if (isSkillSurface && !hasResult) return TOOL_MARGIN_TOP + 1;
       if (item.aggregate) {
         if (hasRawResult) {

package/src/tui/app/use-mouse-input.mjs

@@ -18,8 +18,11 @@ const MOUSE_TRACKING_OFF = '\x1b[?1006l\x1b[?1002l\x1b[?1000l';
 // conversion WINS over WT's native ctrl+wheel font zoom. During the zoom
 // passthrough window we must turn BOTH mouse tracking and alternate scroll
 // off, or ctrl+wheel lands as Up/Down (prompt history) instead of zooming.
+// 1007 is kept OFF for the entire session (index.jsx boots with ?1007l and
+// the restore below re-asserts it): if mouse tracking ever drops while 1007
+// is on, every wheel notch turns into prompt-history Up/Down. Off means a
+// degraded wheel is a no-op, never history navigation.
 const ALT_SCROLL_OFF = '\x1b[?1007l';
-const ALT_SCROLL_ON = '\x1b[?1007h';
 const MOUSE_MODIFIER_MASK = 4 | 8 | 16;
 const MOUSE_CTRL_MASK = 16;
 // Bit 2 (4) of the SGR button byte = shift held during the click. Wheel/ctrl
@@ -76,15 +79,25 @@ export function useMouseInput({
     } catch {
       return;
     }
-    if (zoomTimerRef.current) clearTimeout(zoomTimerRef.current);
-    zoomTimerRef.current = setTimeout(() => {
+    // Re-enable with RETRIES: a single swallowed write failure (EAGAIN
+    // backpressure is real on Windows console streams) used to leave mouse
+    // tracking off for the rest of the session — wheel scroll dead, and with
+    // alternate scroll enabled the wheel then typed into prompt history.
+    const restore = (attempt) => {
       zoomTimerRef.current = null;
       try {
-        stdout.write(ALT_SCROLL_ON + MOUSE_TRACKING_ON);
+        stdout.write(MOUSE_TRACKING_ON + ALT_SCROLL_OFF);
       } catch {
-        // The terminal may already be closing.
+        // The terminal may be closing — but it may also be transient
+        // backpressure; retry a few times before giving up.
+        if (attempt < 5) {
+          zoomTimerRef.current = setTimeout(() => restore(attempt + 1), 200);
+          zoomTimerRef.current.unref?.();
+        }
       }
-    }, 700);
+    };
+    if (zoomTimerRef.current) clearTimeout(zoomTimerRef.current);
+    zoomTimerRef.current = setTimeout(() => restore(0), 700);
     zoomTimerRef.current.unref?.();
   }, [stdout, zoomTimerRef]);
 

package/src/tui/components/ToolExecution.jsx

@@ -198,9 +198,10 @@ export function ToolExecution({ name, args, result, rawResult, isError, errorCou
     // Mirror estimateTranscriptItemRows: a non-aggregate skill surface collapses
     // to a single header row; everything else reserves header + one detail row.
     const placeholderNormalizedName = String(formatToolSurface(name, args)?.normalizedName || '').toLowerCase();
-    // Skill surfaces collapse to a single header row; agent surfaces reserve
-    // header + one brief detail row (see estimateTranscriptItemRows).
-    const placeholderSingleRow = !aggregate && SKILL_SURFACE_NAMES.has(placeholderNormalizedName);
+    // Skill AND agent surfaces collapse to a single header row when collapsed
+    // (see estimateTranscriptItemRows); reserve one row for both.
+    const placeholderSingleRow = !aggregate
+      && (SKILL_SURFACE_NAMES.has(placeholderNormalizedName) || isAgentTool(placeholderNormalizedName));
     return (
       <Box flexDirection="column" marginTop={attached ? 0 : 1} width={rowWidth} overflow="hidden">
         <Text> </Text>
@@ -443,11 +444,18 @@ export function ToolExecution({ name, args, result, rawResult, isError, errorCou
   } else if (isBackgroundMetadataResult && backgroundMetadataHeaderFailure && !showRawResult) {
     visibleDetailLines = [];
   } else if (isAgentSurfaceCard && !showRawResult) {
+    // Agent cards collapse to a SINGLE header row like skill surfaces. Keep the
+    // ⎿ detail row ONLY when it carries failure info: the call errored, or the
+    // brief/summary reads as a failure/cancel. A header-failure-only card (no
+    // brief) shows the cause in the header, so it stays a single row too.
+    // Expanded (ctrl+o raw) still flows through the showRawResult path above.
     const agentDetailFallback = collapsedDetail
       || (pending ? (pendingDetailPlaceholder || 'Running') : 'Finished');
     const agentDetailLine = agentSurfaceBrief
       || truncateToWidth(String(agentDetailFallback), Math.min(AGENT_SURFACE_BRIEF_MAX, maxResultChars));
-    visibleDetailLines = agentHeaderFailure && !agentSurfaceBrief ? [] : [agentDetailLine];
+    const agentFailureText = /\b(Cancelled|Canceled|Failed)\b/i.test(agentSurfaceBrief || collapsedDetail || '');
+    const keepAgentDetail = (isError || agentFailureText) && !(agentHeaderFailure && !agentSurfaceBrief);
+    visibleDetailLines = keepAgentDetail ? [agentDetailLine] : [];
   }
   const finalStatusColor = toolStatusColor({ pending, groupCount, failedCount, terminalStatus });
   const dotColor = finalStatusColor;

package/src/tui/display-width.mjs

@@ -12,7 +12,9 @@
  *   - Widen ONLY the two problem ranges below. NEVER widen box-drawing
  *     (U+2500–U+257F └ │ ⎿ ─), block elements, or the figures.mjs glyphs —
  *     those are also EAW-ambiguous but must stay 1 cell.
- *   - Enabled by default ONLY under Windows Terminal (WT_SESSION set).
+ *   - Enabled by default on Windows (process.platform === 'win32') or under
+ *     Windows Terminal (WT_SESSION set — covers WT reached via e.g. SSH from
+ *     a non-Windows host).
  *   - MIXDOG_TUI_AMBIGUOUS_WIDE overrides the default: '1' forces on, '0'
  *     forces off; the override always wins.
  *   - When OFF, behaviour is byte-for-byte identical to plain string-width.
@@ -43,12 +45,16 @@ export function isProblemCodePoint(cp) {
 // vendor/ink/build/display-width.js.
 const PROBLEM_RE = /[\u2190-\u21ff\u2460-\u24ff]/;
 
-/** Resolve the wide policy from env. Override wins over the WT_SESSION default. */
-export function resolveAmbiguousWidePolicy(env = process.env) {
+/**
+ * Resolve the wide policy from env. Override wins over the default; the
+ * default is ON on Windows (WT_SESSION does not reliably propagate to child
+ * processes, so gate on the OS itself) or when WT_SESSION is present.
+ */
+export function resolveAmbiguousWidePolicy(env = process.env, platform = process.platform) {
   const override = env?.MIXDOG_TUI_AMBIGUOUS_WIDE;
   if (override === '1') return true;
   if (override === '0') return false;
-  return Boolean(env?.WT_SESSION);
+  return platform === 'win32' || Boolean(env?.WT_SESSION);
 }
 
 /** Resolved once at module load (matches the "computed once" requirement). */