mixdog 0.9.44 → 0.9.46

package/src/tui/components/ContextPanel.jsx

@@ -63,7 +63,8 @@ function usageColor(pct) {
 
 function ProgressBar({ value = 0, total = 0, width = 24 }) {
   const pct = percent(value, total) ?? 0;
-  const safeWidth = Math.max(8, Math.floor(width));
+  const safeWidth = Math.max(0, Math.floor(width));
+  if (safeWidth === 0) return null;
   const filled = Math.max(0, Math.min(safeWidth, Math.round((pct / 100) * safeWidth)));
   const empty = safeWidth - filled;
   return (
@@ -95,28 +96,27 @@ function bucketTokens(map, names) {
   return names.reduce((sum, name) => sum + finiteNumber(map?.[name]?.tokens), 0);
 }
 
-function bucketCount(map, names) {
-  return names.reduce((sum, name) => sum + finiteNumber(map?.[name]?.count), 0);
-}
-
 function semanticTokens(semantic, names) {
   return names.reduce((sum, name) => sum + finiteNumber(semantic?.[name]?.tokens), 0);
 }
 
 function CategoryItem({ label, tokens, total, width }) {
-  const labelWidth = Math.min(11, Math.max(7, Math.floor(width * 0.22)));
+  const rowWidth = Math.max(0, Math.floor(width));
+  const labelWidth = Math.min(11, Math.max(7, Math.floor(rowWidth * 0.22)));
   const pctWidth = 6;
-  const tokenWidth = 7;
-  const barWidth = Math.max(6, Math.min(20, width - labelWidth - pctWidth - tokenWidth - 4));
+  const structuralWidth = labelWidth + 1 + pctWidth + 1;
+  const flexibleWidth = Math.max(0, rowWidth - structuralWidth);
+  const tokenWidth = Math.min(7, flexibleWidth);
+  const barWidth = Math.max(0, flexibleWidth - tokenWidth);
   const pct = percent(tokens, total);
   return (
-    <Box flexDirection="row" width={width}>
+    <Box flexDirection="row" width={rowWidth}>
       <Text color={theme.subtle}>{padCells(truncateText(label, labelWidth), labelWidth)}</Text>
       <Text color={theme.inactive}> </Text>
       <Text color={usageColor(pct)}>{padCells(percentLabel(tokens, total), pctWidth)}</Text>
       <ProgressBar value={tokens} total={total} width={barWidth} />
       <Text color={theme.inactive}> </Text>
-      <Text color={theme.text}>{padCells(formatTokens(tokens), tokenWidth)}</Text>
+      <Text color={theme.text}>{padCells(truncateText(formatTokens(tokens), tokenWidth), tokenWidth)}</Text>
     </Box>
   );
 }
@@ -156,13 +156,9 @@ function ContextUsageView({ detail, columns }) {
   const usage = detail?.usage || {};
   const compaction = detail?.compaction || {};
   const messages = detail?.messages || {};
-  const tools = detail?.tools || {};
-  const toolIo = detail?.toolIo || {};
   const request = detail?.request || {};
   const lastApi = detail?.lastApi || {};
   const cache = detail?.cache || {};
-  const extensions = detail?.extensions || {};
-  const mcp = detail?.mcp || {};
   const semantic = messages.semantic || {};
   const schema = request.toolSchemaBreakdown || {};
   const usedTokens = finiteNumber(usage.usedTokens);
@@ -173,7 +169,6 @@ function ContextUsageView({ detail, columns }) {
   const pctText = `${percentLabel(usedTokens, windowTokens)} used`;
   const barWidth = Math.max(12, Math.min(34, innerWidth - stringWidth(summaryText) - stringWidth(pctText) - 5));
   const builtInToolTokens = bucketTokens(schema, ['code', 'web', 'mutation', 'channels', 'setup', 'other']);
-  const builtInToolCount = bucketCount(schema, ['code', 'web', 'mutation', 'channels', 'setup', 'other']);
   const sessionTokens = semanticTokens(semantic, ['workspace', 'environment', 'other']);
   const compactionLine = metricValue([
     compaction.stage && compaction.stage !== 'pending' ? compaction.stage : '',
@@ -194,16 +189,15 @@ function ContextUsageView({ detail, columns }) {
     `cache ${cache.hitRate || 'N/A'}`,
   ]);
   const categories = [
-    { label: 'Messages', tokens: semanticTokens(semantic, ['chat', 'assistant']), meta: '' },
-    { label: 'Tools', tokens: builtInToolTokens, meta: `${tools.active || 0}/${tools.count || 0} active${builtInToolCount ? ` · ${builtInToolCount} defs` : ''}` },
-    { label: 'MCP', tokens: bucketTokens(schema, ['mcp']), meta: `${mcp.connected || 0}/${mcp.configured || 0} servers` },
-    { label: 'Skills', tokens: bucketTokens(schema, ['skills']), meta: `${extensions.skills || 0} skills` },
-    { label: 'Memory', tokens: semanticTokens(semantic, ['memory']) + bucketTokens(schema, ['memory']), meta: 'core + recall tools' },
-    { label: 'Session', tokens: sessionTokens, meta: 'workspace · environment' },
-    { label: 'Workflow', tokens: semanticTokens(semantic, ['workflow']) + bucketTokens(schema, ['agents']), meta: 'workflow · agents' },
-    { label: 'System', tokens: semanticTokens(semantic, ['system']), meta: 'rules · role catalog' },
-    { label: 'Overhead', tokens: finiteNumber(request.overheadTokens), meta: 'request frame' },
-    { label: 'Tool I/O', tokens: semanticTokens(semantic, ['toolResults']), meta: `${toolIo.calls || 0} calls · ${toolIo.results || 0} results` },
+    { label: 'Messages', tokens: semanticTokens(semantic, ['chat', 'assistant']) },
+    { label: 'Tools', tokens: builtInToolTokens },
+    { label: 'MCP', tokens: bucketTokens(schema, ['mcp']) },
+    { label: 'Skills', tokens: bucketTokens(schema, ['skills']) },
+    { label: 'Memory', tokens: semanticTokens(semantic, ['memory']) + bucketTokens(schema, ['memory']) },
+    { label: 'Session', tokens: sessionTokens },
+    { label: 'Workflow', tokens: semanticTokens(semantic, ['workflow']) + bucketTokens(schema, ['agents']) },
+    { label: 'System', tokens: semanticTokens(semantic, ['system']) },
+    { label: 'Tool I/O', tokens: semanticTokens(semantic, ['toolResults']) },
   ];
 
   return (

package/src/tui/dist/index.mjs

@@ -3140,8 +3140,8 @@ function formatAggregateDetail(summaries) {
 }
 
 // src/runtime/shared/update-checker.mjs
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { dirname as dirname2, join as join2 } from "node:path";
+import { existsSync, mkdirSync, readFileSync, realpathSync, writeFileSync } from "node:fs";
+import { basename, delimiter, dirname as dirname2, join as join2 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // src/runtime/shared/plugin-paths.mjs
@@ -6120,7 +6120,8 @@ function usageColor(pct) {
 }
 function ProgressBar({ value = 0, total = 0, width = 24 }) {
   const pct = percent(value, total) ?? 0;
-  const safeWidth2 = Math.max(8, Math.floor(width));
+  const safeWidth2 = Math.max(0, Math.floor(width));
+  if (safeWidth2 === 0) return null;
   const filled = Math.max(0, Math.min(safeWidth2, Math.round(pct / 100 * safeWidth2)));
   const empty = safeWidth2 - filled;
   return /* @__PURE__ */ jsxs6(Box8, { flexDirection: "row", width: safeWidth2, children: [
@@ -6144,25 +6145,25 @@ function DetailLine({ label, value, columns }) {
 function bucketTokens(map, names) {
   return names.reduce((sum, name) => sum + finiteNumber(map?.[name]?.tokens), 0);
 }
-function bucketCount(map, names) {
-  return names.reduce((sum, name) => sum + finiteNumber(map?.[name]?.count), 0);
-}
 function semanticTokens(semantic, names) {
   return names.reduce((sum, name) => sum + finiteNumber(semantic?.[name]?.tokens), 0);
 }
 function CategoryItem({ label, tokens, total, width }) {
-  const labelWidth = Math.min(11, Math.max(7, Math.floor(width * 0.22)));
+  const rowWidth = Math.max(0, Math.floor(width));
+  const labelWidth = Math.min(11, Math.max(7, Math.floor(rowWidth * 0.22)));
   const pctWidth = 6;
-  const tokenWidth = 7;
-  const barWidth = Math.max(6, Math.min(20, width - labelWidth - pctWidth - tokenWidth - 4));
+  const structuralWidth = labelWidth + 1 + pctWidth + 1;
+  const flexibleWidth = Math.max(0, rowWidth - structuralWidth);
+  const tokenWidth = Math.min(7, flexibleWidth);
+  const barWidth = Math.max(0, flexibleWidth - tokenWidth);
   const pct = percent(tokens, total);
-  return /* @__PURE__ */ jsxs6(Box8, { flexDirection: "row", width, children: [
+  return /* @__PURE__ */ jsxs6(Box8, { flexDirection: "row", width: rowWidth, children: [
     /* @__PURE__ */ jsx8(Text8, { color: theme.subtle, children: padCells3(truncateText3(label, labelWidth), labelWidth) }),
     /* @__PURE__ */ jsx8(Text8, { color: theme.inactive, children: " " }),
     /* @__PURE__ */ jsx8(Text8, { color: usageColor(pct), children: padCells3(percentLabel(tokens, total), pctWidth) }),
     /* @__PURE__ */ jsx8(ProgressBar, { value: tokens, total, width: barWidth }),
     /* @__PURE__ */ jsx8(Text8, { color: theme.inactive, children: " " }),
-    /* @__PURE__ */ jsx8(Text8, { color: theme.text, children: padCells3(formatTokens(tokens), tokenWidth) })
+    /* @__PURE__ */ jsx8(Text8, { color: theme.text, children: padCells3(truncateText3(formatTokens(tokens), tokenWidth), tokenWidth) })
   ] });
 }
 function CategoryGrid({ categories, columns, total }) {
@@ -6187,13 +6188,9 @@ function ContextUsageView({ detail, columns }) {
   const usage = detail?.usage || {};
   const compaction = detail?.compaction || {};
   const messages = detail?.messages || {};
-  const tools = detail?.tools || {};
-  const toolIo = detail?.toolIo || {};
   const request = detail?.request || {};
   const lastApi = detail?.lastApi || {};
   const cache = detail?.cache || {};
-  const extensions = detail?.extensions || {};
-  const mcp = detail?.mcp || {};
   const semantic = messages.semantic || {};
   const schema = request.toolSchemaBreakdown || {};
   const usedTokens = finiteNumber(usage.usedTokens);
@@ -6204,7 +6201,6 @@ function ContextUsageView({ detail, columns }) {
   const pctText = `${percentLabel(usedTokens, windowTokens)} used`;
   const barWidth = Math.max(12, Math.min(34, innerWidth - stringWidth4(summaryText) - stringWidth4(pctText) - 5));
   const builtInToolTokens = bucketTokens(schema, ["code", "web", "mutation", "channels", "setup", "other"]);
-  const builtInToolCount = bucketCount(schema, ["code", "web", "mutation", "channels", "setup", "other"]);
   const sessionTokens = semanticTokens(semantic, ["workspace", "environment", "other"]);
   const compactionLine = metricValue([
     compaction.stage && compaction.stage !== "pending" ? compaction.stage : "",
@@ -6225,16 +6221,15 @@ function ContextUsageView({ detail, columns }) {
     `cache ${cache.hitRate || "N/A"}`
   ]);
   const categories = [
-    { label: "Messages", tokens: semanticTokens(semantic, ["chat", "assistant"]), meta: "" },
-    { label: "Tools", tokens: builtInToolTokens, meta: `${tools.active || 0}/${tools.count || 0} active${builtInToolCount ? ` \xB7 ${builtInToolCount} defs` : ""}` },
-    { label: "MCP", tokens: bucketTokens(schema, ["mcp"]), meta: `${mcp.connected || 0}/${mcp.configured || 0} servers` },
-    { label: "Skills", tokens: bucketTokens(schema, ["skills"]), meta: `${extensions.skills || 0} skills` },
-    { label: "Memory", tokens: semanticTokens(semantic, ["memory"]) + bucketTokens(schema, ["memory"]), meta: "core + recall tools" },
-    { label: "Session", tokens: sessionTokens, meta: "workspace \xB7 environment" },
-    { label: "Workflow", tokens: semanticTokens(semantic, ["workflow"]) + bucketTokens(schema, ["agents"]), meta: "workflow \xB7 agents" },
-    { label: "System", tokens: semanticTokens(semantic, ["system"]), meta: "rules \xB7 role catalog" },
-    { label: "Overhead", tokens: finiteNumber(request.overheadTokens), meta: "request frame" },
-    { label: "Tool I/O", tokens: semanticTokens(semantic, ["toolResults"]), meta: `${toolIo.calls || 0} calls \xB7 ${toolIo.results || 0} results` }
+    { label: "Messages", tokens: semanticTokens(semantic, ["chat", "assistant"]) },
+    { label: "Tools", tokens: builtInToolTokens },
+    { label: "MCP", tokens: bucketTokens(schema, ["mcp"]) },
+    { label: "Skills", tokens: bucketTokens(schema, ["skills"]) },
+    { label: "Memory", tokens: semanticTokens(semantic, ["memory"]) + bucketTokens(schema, ["memory"]) },
+    { label: "Session", tokens: sessionTokens },
+    { label: "Workflow", tokens: semanticTokens(semantic, ["workflow"]) + bucketTokens(schema, ["agents"]) },
+    { label: "System", tokens: semanticTokens(semantic, ["system"]) },
+    { label: "Tool I/O", tokens: semanticTokens(semantic, ["toolResults"]) }
   ];
   return /* @__PURE__ */ jsxs6(Box8, { flexDirection: "column", width: "100%", children: [
     /* @__PURE__ */ jsxs6(Box8, { flexDirection: "row", width: "100%", children: [
@@ -7128,7 +7123,7 @@ import { randomBytes } from "node:crypto";
 import { existsSync as existsSync2, unlinkSync } from "node:fs";
 import { readFile as readFileAsync, stat as statAsync } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { basename, extname, isAbsolute, resolve } from "node:path";
+import { basename as basename2, extname, isAbsolute, resolve } from "node:path";
 
 // src/runtime/agent/orchestrator/tools/builtin/read-image-resize.mjs
 var API_IMAGE_MAX_BASE64_SIZE = 5 * 1024 * 1024;
@@ -7396,7 +7391,7 @@ async function readImageAttachmentFromPath(rawPath, cwd = process.cwd()) {
   if (!st.isFile()) return null;
   const buffer = await readFileAsync(fullPath);
   return imageAttachmentFromBuffer(buffer, mimeType, {
-    filename: basename(fullPath),
+    filename: basename2(fullPath),
     sourcePath: fullPath
   });
 }
@@ -7467,7 +7462,7 @@ async function readClipboardText() {
 // src/standalone/projects.mjs
 import { homedir as homedir2 } from "node:os";
 import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync2, renameSync, statSync, writeFileSync as writeFileSync2 } from "node:fs";
-import { basename as basename2, dirname as dirname3, isAbsolute as isAbsolute2, join as join3, resolve as resolve2 } from "node:path";
+import { basename as basename3, dirname as dirname3, isAbsolute as isAbsolute2, join as join3, resolve as resolve2 } from "node:path";
 var MIXDOG_HOME = process.env.MIXDOG_HOME || join3(homedir2(), ".mixdog");
 var PROJECTS_FILE = join3(MIXDOG_HOME, "projects.json");
 function toAbsolute(rawPath) {
@@ -7487,7 +7482,7 @@ function readStore() {
     const projects = Array.isArray(parsed?.projects) ? parsed.projects : [];
     return {
       projects: projects.filter((entry) => entry && typeof entry.path === "string" && entry.path.trim()).map((entry) => ({
-        name: String(entry.name || basename2(entry.path) || entry.path),
+        name: String(entry.name || basename3(entry.path) || entry.path),
         path: String(entry.path),
         addedAt: Number(entry.addedAt) || 0,
         ...Number(entry.lastSelectedAt) > 0 ? { lastSelectedAt: Number(entry.lastSelectedAt) } : {}
@@ -7517,7 +7512,7 @@ function ensureProjectIdMarker(absPath, name) {
     }
     const markerPath = join3(absPath, ".mixdog", "project.id");
     if (existsSync3(markerPath)) return;
-    const value = String(name || basename2(absPath) || "").trim();
+    const value = String(name || basename3(absPath) || "").trim();
     if (!value || value.toLowerCase() === "common") return;
     const markerDir = join3(absPath, ".mixdog");
     mkdirSync2(markerDir, { recursive: true });
@@ -7555,7 +7550,7 @@ function addProject(rawPath) {
     return existing;
   }
   const entry = {
-    name: basename2(absPath) || absPath,
+    name: basename3(absPath) || absPath,
     path: absPath,
     addedAt: Date.now()
   };
@@ -7584,7 +7579,7 @@ function renameProject(rawPath, nextName) {
   const entry = store.projects.find((item) => normalizeKey(item.path) === key);
   if (!entry) return null;
   const trimmed = String(nextName || "").trim();
-  entry.name = trimmed || basename2(absPath) || absPath;
+  entry.name = trimmed || basename3(absPath) || absPath;
   writeStore(store);
   return entry;
 }
@@ -11588,7 +11583,7 @@ function useTranscriptScroll({
     if (appliedDelta !== 0) cancelTranscriptFollow();
     scrollTargetRef.current = target;
     if (appliedDelta !== 0) {
-      if (target <= Math.max(0, Number(transcriptBottomSlackRowsRef.current) || 0)) {
+      if (target === 0) {
         transcriptAnchorRef.current = null;
         transcriptAnchorDirtyRef.current = false;
       } else {
@@ -11799,7 +11794,6 @@ function useTranscriptWindow({
   setMeasuredRowsVersion
 }) {
   const transcriptTotalRowsRef = useRef9(0);
-  const preservedScrollDeltaRef = useRef9(0);
   const committedMaxScrollRowsRef = useRef9(0);
   const incrementalRowIndexCacheRef = useRef9(null);
   const prevViewportGeomRef = useRef9({ contentHeight: 0, floatingPanelRows: 0 });
@@ -11831,7 +11825,7 @@ function useTranscriptWindow({
   }, []);
   const streamingTailItem = streamingTail?.kind === "assistant" && streamingTail.streaming ? streamingTail : null;
   const scrolledUpRowsForPin = Math.max(0, Number(scrollTargetRef.current) || 0);
-  const transcriptPinnedForStreaming = followingRef.current || scrolledUpRowsForPin <= transcriptBottomSlackRows;
+  const transcriptPinnedForStreaming = followingRef.current || scrolledUpRowsForPin === 0;
   setStreamingBottomPinned(transcriptPinnedForStreaming);
   const tailRows = streamingTailItem ? estimateTranscriptItemRowsCached(streamingTailItem, frameColumns, toolOutputExpanded) : 0;
   const tailSig = streamingTailItem ? `${streamingTailItem.id}:${tailRows}` : "_";
@@ -11843,7 +11837,7 @@ function useTranscriptWindow({
   );
   const transcriptStructureSig = `${revision}#${tailSig}`;
   const transcriptStreamingActive = !!streamingTailItem;
-  const scrolledUpForStreamingMeasure = scrolledUpRowsForPin > transcriptBottomSlackRows;
+  const scrolledUpForStreamingMeasure = scrolledUpRowsForPin > 0;
   const prevEstimateGeometry = transcriptGeomRef.current?.suppressMeasuredRowHeights === true;
   const hasStreamingReadingAnchor = !!transcriptAnchorRef.current || transcriptAnchorDirtyRef.current;
   const bottomPinnedForMeasure = transcriptPinnedForStreaming;
@@ -11859,7 +11853,7 @@ function useTranscriptWindow({
   }), [revision, tailSig, frameColumns, toolOutputExpanded, measuredRowsVersion, suppressMeasuredRowHeights]);
   const hasReadingAnchor = !!transcriptAnchorRef.current && !transcriptAnchorDirtyRef.current;
   const scrolledUpRows = Math.max(0, Number(scrollTargetRef.current) || 0);
-  const scrolledUp = scrolledUpRows > transcriptBottomSlackRows;
+  const scrolledUp = scrolledUpRows > 0;
   const anchorLockActive = hasReadingAnchor && !followingRef.current && scrolledUp;
   const targetNearBottom = followingRef.current || !scrolledUp;
   const nearBottomWithoutAnchor = !transcriptAnchorRef.current && !transcriptAnchorDirtyRef.current && targetNearBottom;
@@ -12026,7 +12020,7 @@ function useTranscriptWindow({
     overlayHintAttachItemIndex = i;
     break;
   }
-  const transcriptTailPinned = Math.max(0, Number(transcriptWindow.effectiveScrollOffset) || 0) <= transcriptBottomSlackRows;
+  const transcriptTailPinned = Math.max(0, Number(transcriptWindow.effectiveScrollOffset) || 0) === 0;
   const overlayHintOnLastItem = overlayHintRequested && floatingPanelRows <= 0 && transcriptWindow.bottomSpacerRows === 0 && transcriptTailPinned && overlayHintAttachItemIndex >= 0;
   const overlayHintFallbackRow = overlayHintRequested && floatingPanelRows <= 0 && transcriptGuardRows > 0 && !overlayHintOnLastItem;
   useLayoutEffect3(() => {
@@ -12113,7 +12107,7 @@ function useTranscriptWindow({
     const currentPosition = Math.max(0, Number(scrollPositionRef.current) || 0);
     const currentOffset = Math.max(0, Number(scrollOffset) || 0);
     const maxRows = Math.max(0, Number(transcriptWindow.maxScrollRows) || 0);
-    const nearBottom = followingRef.current || currentTarget <= transcriptBottomSlackRows;
+    const nearBottom = followingRef.current || currentTarget === 0;
     const pinnedToBottom = nearBottom;
     const activeReadingAnchor = !!transcriptAnchorRef.current && !transcriptAnchorDirtyRef.current && !followingRef.current && !nearBottom;
     const followOnGrowth = followingRef.current && rowDelta > 0 && !activeReadingAnchor;
@@ -12171,22 +12165,20 @@ function useTranscriptWindow({
     stopSmoothScroll();
     scrollTargetRef.current = desired;
     scrollPositionRef.current = Math.max(0, Math.min(maxRows, currentPosition + appliedDelta));
-    preservedScrollDeltaRef.current += appliedDelta;
     setScrollOffset(Math.max(0, Math.round(desired)));
-  }, [transcriptWindow.totalRows, transcriptWindow.maxScrollRows, transcriptRowIndex, transcriptContentHeight, transcriptBottomSlackRows, scrollOffset, stopSmoothScroll]);
+  }, [transcriptWindow.totalRows, transcriptWindow.maxScrollRows, transcriptRowIndex, transcriptContentHeight, scrollOffset, stopSmoothScroll]);
   useLayoutEffect3(() => {
-    if (transcriptBottomSlackRows <= 0) return;
     if (transcriptAnchorRef.current || transcriptAnchorDirtyRef.current || followingRef.current) return;
     const currentTarget = Math.max(0, Number(scrollTargetRef.current) || 0);
     const currentPosition = Math.max(0, Number(scrollPositionRef.current) || 0);
     const currentOffset = Math.max(0, Number(scrollOffset) || 0);
+    if (currentTarget !== 0) return;
     if (Math.max(currentTarget, currentPosition, currentOffset) === 0) return;
-    if (Math.max(currentTarget, currentPosition, currentOffset) > transcriptBottomSlackRows) return;
     stopSmoothScroll();
     scrollTargetRef.current = 0;
     scrollPositionRef.current = 0;
     setScrollOffset(0);
-  }, [transcriptBottomSlackRows, scrollOffset, stopSmoothScroll]);
+  }, [scrollOffset, stopSmoothScroll]);
   useLayoutEffect3(() => {
     const top = Math.max(0, Number(transcriptViewportRef.current?.top) || 0);
     const next = {
@@ -12195,11 +12187,6 @@ function useTranscriptWindow({
       totalRows: Math.max(0, Number(transcriptWindow.totalRows) || 0),
       scrollOffset: Math.max(0, Number(transcriptWindow.effectiveScrollOffset) || 0)
     };
-    const preservedDelta = Number(preservedScrollDeltaRef.current) || 0;
-    if (preservedDelta !== 0) {
-      next.scrollOffset = Math.max(0, next.scrollOffset + preservedDelta);
-      preservedScrollDeltaRef.current = 0;
-    }
     const previous = selectionLayoutRef.current;
     selectionLayoutRef.current = next;
     if (!previous || !dragRef.current.rect || dragRef.current.active) return;
@@ -14371,7 +14358,7 @@ function createOnboardingSteps({
 // src/runtime/shared/config.mjs
 import { readFileSync as readFileSync5, statSync as statSync4, mkdirSync as mkdirSync5, existsSync as existsSync6 } from "fs";
 import { join as join6, dirname as dirname6 } from "path";
-import { createRequire as createRequire2 } from "module";
+import { createRequire as createRequire3 } from "module";
 
 // src/runtime/shared/atomic-file.mjs
 import {
@@ -14387,7 +14374,7 @@ import {
   unlinkSync as unlinkSync2,
   writeFileSync as writeFileSync3
 } from "fs";
-import { dirname as dirname4, basename as basename3, join as join4 } from "path";
+import { dirname as dirname4, basename as basename4, join as join4 } from "path";
 import { randomBytes as randomBytes2 } from "crypto";
 import { execFile as execFile2, execFileSync } from "child_process";
 import { promisify } from "util";
@@ -14843,7 +14830,7 @@ function writeFileAtomicSync(filePath, data, opts = {}) {
   const run = () => {
     const dir = dirname4(filePath);
     mkdirSync3(dir, { recursive: true });
-    const tmp = join4(dir, `.${basename3(filePath)}.${randomBytes2(12).toString("hex")}.tmp`);
+    const tmp = join4(dir, `.${basename4(filePath)}.${randomBytes2(12).toString("hex")}.tmp`);
     try {
       const writeOpts = { encoding: opts.encoding || "utf8", flag: "wx", mode: opts.mode !== void 0 ? opts.mode : 384 };
       writeFileSync3(tmp, data, writeOpts);
@@ -15080,8 +15067,24 @@ function backupUserData(dataDir, reason = "snapshot") {
 }
 var CASE_INSENSITIVE = process.platform === "win32";
 
+// src/runtime/shared/provider-api-key.mjs
+import { createRequire as createRequire2 } from "node:module";
+var require2 = createRequire2(import.meta.url);
+var { getSecret } = require2("../../lib/keychain-cjs.cjs");
+var AGENT_PROVIDER_ENV = Object.freeze({
+  openai: "OPENAI_API_KEY",
+  anthropic: "ANTHROPIC_API_KEY",
+  gemini: "GEMINI_API_KEY",
+  deepseek: "DEEPSEEK_API_KEY",
+  xai: "XAI_API_KEY",
+  "opencode-go": "OPENCODE_API_KEY"
+});
+var AGENT_PROVIDER_ENV_ALIASES = Object.freeze({
+  xai: ["GROK_API_KEY"]
+});
+
 // src/runtime/shared/config.mjs
-var _require = createRequire2(import.meta.url);
+var _require = createRequire3(import.meta.url);
 var { getSecret: _getSecret, setSecret: _setSecret, deleteSecret: _deleteSecret, hasSecret: _hasSecret } = _require("../../lib/keychain-cjs.cjs");
 var DATA_DIR = resolvePluginData();
 var CONFIG_PATH = join6(DATA_DIR, "mixdog-config.json");
@@ -15280,17 +15283,6 @@ var SECRET_ACCOUNTS = Object.freeze({
   openaiUsageSessionKey: "agent.openai.usageSessionKey",
   opencodeGoAuthCookie: "agent.opencode-go.authCookie"
 });
-var AGENT_PROVIDER_ENV = Object.freeze({
-  openai: "OPENAI_API_KEY",
-  anthropic: "ANTHROPIC_API_KEY",
-  gemini: "GEMINI_API_KEY",
-  deepseek: "DEEPSEEK_API_KEY",
-  xai: "XAI_API_KEY",
-  "opencode-go": "OPENCODE_API_KEY"
-});
-var AGENT_PROVIDER_ENV_ALIASES = Object.freeze({
-  xai: ["GROK_API_KEY"]
-});
 
 // src/tui/lib/voice-setup.mjs
 var _voiceRuntimeFetcherPromise = null;
@@ -19528,8 +19520,7 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
   const [resizeState, setResizeState] = useState8(() => ({ ...terminalSize(stdout2), epoch: 0 }));
   const [panelTransitionEpoch, setPanelTransitionEpoch] = useState8(0);
   const [panelInkMaskEpoch, setPanelInkMaskEpoch] = useState8(0);
-  const windowsLikeTerminal = process.platform === "win32" || Boolean(process.env.WT_SESSION);
-  const rightSafetyColumns = windowsLikeTerminal ? 1 : 0;
+  const rightSafetyColumns = 1;
   const frameColumns = Math.max(1, resizeState.columns - rightSafetyColumns);
   const [scrollOffset, setScrollOffset] = useState8(0);
   const scrollPositionRef = useRef10(0);
@@ -20275,7 +20266,7 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
       return;
     }
     if (count === previousCount || dragRef.current.active) return;
-    if (scrollTargetRef.current <= transcriptBottomSlackRows || followingRef.current) followingRef.current = true;
+    if (scrollTargetRef.current === 0 || followingRef.current) followingRef.current = true;
   }, [state.items.length, resetTranscriptScroll]);
   const requestExit = useCallback6(() => {
     if (exitRequestedRef.current) return;
@@ -20512,7 +20503,13 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
     }, 0);
   };
   const openContextPicker = () => {
-    const tools = store.toolsStatus?.() || { activeCount: 0, count: 0, activeTools: [] };
+    const tools = store.toolsStatus?.() || {
+      activeCount: 0,
+      count: 0,
+      mcpToolCount: 0,
+      activeMcpToolCount: 0,
+      activeTools: []
+    };
     const mcp = store.mcpStatus?.() || { connectedCount: 0, configuredCount: 0, failedCount: 0 };
     const skills = store.skillsStatus?.() || { count: 0 };
     const plugins = store.pluginsStatus?.() || { count: 0 };
@@ -20520,6 +20517,13 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
     const usage = context.usage || {};
     const messages = context.messages || {};
     const request = context.request || {};
+    const schemaBreakdown = request.toolSchemaBreakdown || {};
+    const schemaTokensFor = (buckets) => buckets.reduce(
+      (sum, bucket) => sum + Number(schemaBreakdown?.[bucket]?.tokens || 0),
+      0
+    );
+    const builtInToolSchemaTokens = schemaTokensFor(["code", "web", "mutation", "channels", "setup", "other"]);
+    const mcpToolSchemaTokens = schemaTokensFor(["mcp"]);
     const compaction = context.compaction || {};
     const windowTokens = Number(context.contextWindow || state.contextWindow || context.rawContextWindow || state.rawContextWindow || 0);
     const rawWindowTokens = Number(context.rawContextWindow || state.rawContextWindow || windowTokens || 0);
@@ -20587,7 +20591,7 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
       {
         value: "tools",
         label: "Tools",
-        description: `${fmt(request.toolSchemaTokens)} schema tokens (${pct(request.toolSchemaTokens)}) \xB7 ${tools.activeCount || 0}/${tools.count || 0} active`,
+        description: `${fmt(builtInToolSchemaTokens)} schema tokens (${pct(builtInToolSchemaTokens)}) \xB7 ${tools.activeCount || 0}/${tools.count || 0} active`,
         _action: "tools"
       },
       {
@@ -20661,7 +20665,7 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
           semantic: messages.semantic
         },
         tools: {
-          schemaTokens: request.toolSchemaTokens,
+          schemaTokens: builtInToolSchemaTokens,
           active: tools.activeCount,
           count: tools.count
         },
@@ -20692,7 +20696,10 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
         mcp: {
           connected: mcp.connectedCount,
           configured: mcp.configuredCount,
-          failed: mcp.failedCount
+          failed: mcp.failedCount,
+          tools: tools.mcpToolCount,
+          activeTools: tools.activeMcpToolCount,
+          schemaTokens: mcpToolSchemaTokens
         }
       },
       rows: contextRows
@@ -22226,7 +22233,7 @@ function compactEventDetail(event = {}) {
   const trigger = String(event.trigger || "").toLowerCase();
   if (trigger === "reactive") parts.push("reactive");
   else if (trigger === "manual") parts.push("manual");
-  const before = Number(event.beforeTokens ?? event.pressureTokens ?? 0);
+  const before = Number(event.pressureTokens ?? event.beforeTokens ?? 0);
   const after = Number(event.afterTokens ?? 0);
   const fmtTok = (n) => {
     const v = Number(n) || 0;
@@ -22684,7 +22691,10 @@ function parseAgentJob(text) {
   const targetMatch = /^target:\s*(.+)$/m.exec(value);
   const agentMatch = /^agent:\s*(.+)$/m.exec(value);
   const presetMatch = /^preset:\s*(.+)$/m.exec(value);
-  const modelMatch = /^model:\s*([^/\s]+)\/(.+)$/m.exec(value);
+  const isAgentEnvelope = /^agent task:\s*/mi.test(value) || /^agent result\b/mi.test(value) || /^surface:\s*agent\s*$/mi.test(value);
+  const providerMatch = isAgentEnvelope ? /^provider:\s*(.+)$/m.exec(value) : null;
+  const modelLineMatch = isAgentEnvelope ? /^model:\s*(.+)$/m.exec(value) : null;
+  const providerModelMatch = /^([^/\s]+)\/(.+)$/.exec(modelLineMatch?.[1]?.trim() || "");
   const effortMatch = /^effort:\s*(.+)$/m.exec(value);
   const fastMatch = /^fast:\s*(on|off|true|false)$/m.exec(value);
   return {
@@ -22694,8 +22704,8 @@ function parseAgentJob(text) {
     target: (targetMatch?.[1] || "").trim(),
     agent: (agentMatch?.[1] || "").trim(),
     preset: (presetMatch?.[1] || "").trim(),
-    provider: (modelMatch?.[1] || "").trim(),
-    model: (modelMatch?.[2] || "").trim(),
+    provider: (providerMatch?.[1] || providerModelMatch?.[1] || "").trim(),
+    model: (providerModelMatch?.[2] || modelLineMatch?.[1] || "").trim(),
     effort: (effortMatch?.[1] || "").trim(),
     fast: fastMatch ? /^(on|true)$/i.test(fastMatch[1]) : void 0
   };
@@ -22712,8 +22722,9 @@ function agentArgsWithResultMetadata(args, parsed) {
   if (parsed.taskId) next.task_id = parsed.taskId;
   if (parsed.agent) next.agent = parsed.agent;
   if (parsed.preset) next.preset = parsed.preset;
-  if (parsed.provider) next.provider = parsed.provider;
-  if (parsed.model) next.model = parsed.model;
+  const hasExplicitProvider = [next.provider, next.providerId, next.provider_id].some((value) => String(value || "").trim());
+  if (parsed.provider && !hasExplicitProvider) next.provider = parsed.provider;
+  if (parsed.model && !String(next.model || "").trim()) next.model = parsed.model;
   if (parsed.effort) next.effort = parsed.effort;
   if (parsed.fast !== void 0) next.fast = parsed.fast;
   if (!next.tag && parsed.target) {

package/src/tui/engine/agent-envelope.mjs

@@ -251,7 +251,16 @@ export function parseAgentJob(text) {
   const targetMatch = /^target:\s*(.+)$/m.exec(value);
   const agentMatch = /^agent:\s*(.+)$/m.exec(value);
   const presetMatch = /^preset:\s*(.+)$/m.exec(value);
-  const modelMatch = /^model:\s*([^/\s]+)\/(.+)$/m.exec(value);
+  // Spawn acknowledgements normally use `model: provider/model`, but agent
+  // completion envelopes carry the resolved route as separate provider/model
+  // fields. A generic tool result can also contain task_id/provider/model
+  // diagnostics, so only recognize either route shape on an agent envelope.
+  const isAgentEnvelope = /^agent task:\s*/mi.test(value)
+    || /^agent result\b/mi.test(value)
+    || /^surface:\s*agent\s*$/mi.test(value);
+  const providerMatch = isAgentEnvelope ? /^provider:\s*(.+)$/m.exec(value) : null;
+  const modelLineMatch = isAgentEnvelope ? /^model:\s*(.+)$/m.exec(value) : null;
+  const providerModelMatch = /^([^/\s]+)\/(.+)$/.exec(modelLineMatch?.[1]?.trim() || '');
   const effortMatch = /^effort:\s*(.+)$/m.exec(value);
   const fastMatch = /^fast:\s*(on|off|true|false)$/m.exec(value);
   return {
@@ -261,8 +270,8 @@ export function parseAgentJob(text) {
     target: (targetMatch?.[1] || '').trim(),
     agent: (agentMatch?.[1] || '').trim(),
     preset: (presetMatch?.[1] || '').trim(),
-    provider: (modelMatch?.[1] || '').trim(),
-    model: (modelMatch?.[2] || '').trim(),
+    provider: (providerMatch?.[1] || providerModelMatch?.[1] || '').trim(),
+    model: (providerModelMatch?.[2] || modelLineMatch?.[1] || '').trim(),
     effort: (effortMatch?.[1] || '').trim(),
     fast: fastMatch ? /^(on|true)$/i.test(fastMatch[1]) : undefined,
   };
@@ -284,8 +293,10 @@ export function agentArgsWithResultMetadata(args, parsed) {
   if (parsed.taskId) next.task_id = parsed.taskId;
   if (parsed.agent) next.agent = parsed.agent;
   if (parsed.preset) next.preset = parsed.preset;
-  if (parsed.provider) next.provider = parsed.provider;
-  if (parsed.model) next.model = parsed.model;
+  const hasExplicitProvider = [next.provider, next.providerId, next.provider_id]
+    .some((value) => String(value || '').trim());
+  if (parsed.provider && !hasExplicitProvider) next.provider = parsed.provider;
+  if (parsed.model && !String(next.model || '').trim()) next.model = parsed.model;
   if (parsed.effort) next.effort = parsed.effort;
   if (parsed.fast !== undefined) next.fast = parsed.fast;
   if (!next.tag && parsed.target) {

package/src/tui/engine/labels.mjs

@@ -50,7 +50,7 @@ export function compactEventDetail(event = {}) {
   const trigger = String(event.trigger || '').toLowerCase();
   if (trigger === 'reactive') parts.push('reactive');
   else if (trigger === 'manual') parts.push('manual');
-  const before = Number(event.beforeTokens ?? event.pressureTokens ?? 0);
+  const before = Number(event.pressureTokens ?? event.beforeTokens ?? 0);
   const after = Number(event.afterTokens ?? 0);
   const fmtTok = (n) => {
     const v = Number(n) || 0;