mixdog 0.8.0 → 0.8.1

package/src/tui/dist/index.mjs

@@ -1451,7 +1451,6 @@ var CATEGORY_ORDER = [
   "Memory",
   "Explore",
   "Patch",
-  "Edit",
   "Shell",
   "Agent",
   "Channel",
@@ -1485,8 +1484,6 @@ var TOOL_CATEGORY = /* @__PURE__ */ new Map([
   ["memory", "Memory"],
   ["explore", "Explore"],
   ["apply_patch", "Patch"],
-  ["write", "Edit"],
-  ["edit", "Edit"],
   ["bash", "Shell"],
   ["shell", "Shell"],
   ["shell_command", "Shell"],
@@ -1535,7 +1532,6 @@ var CATEGORY_COPY = /* @__PURE__ */ new Map([
   ["Memory", { active: "Checking", done: "Checked", noun: "memory item" }],
   ["Explore", { active: "Exploring", done: "Explored", noun: "item" }],
   ["Patch", { active: "Editing", done: "Edited", noun: "item" }],
-  ["Edit", { active: "Editing", done: "Edited", noun: "item" }],
   ["Shell", { active: "Running", done: "Ran", noun: "command" }],
   ["Agent", { active: "Calling", done: "Called", noun: "agent" }],
   ["Channel", { active: "Sending", done: "Sent", noun: "message" }],
@@ -1655,6 +1651,7 @@ import { jsx as jsx5, jsxs as jsxs3 } from "react/jsx-runtime";
 var MIN_RESULT_LINE_CHARS = 24;
 var SUMMARY_MAX_CHARS = 48;
 var TOOL_BLINK_MS = 500;
+var TOOL_BLINK_LIMIT_MS = 3e3;
 var TOOL_PENDING_SHOW_DELAY_MS = 1e3;
 var TOOL_HINT_DONE_COLOR = theme.subtle;
 var COUNT_TWEEN_MS = 700;
@@ -1840,8 +1837,6 @@ function statusCopy(normalizedName, label, count, doneCount, pending, isError) {
     case "view_image":
     case "read_mcp_resource":
       return copy("Reading", "Read", "file");
-    case "write":
-    case "edit":
     case "apply_patch":
       return copy("Editing", "Edited", "file");
     case "grep":
@@ -2082,7 +2077,7 @@ function progressDetail({ normalizedName, label, elapsed }) {
   if (n === "explore" || l === "explore") return `Exploring${suffix}`;
   if (n === "grep" || n === "glob" || n === "list" || n === "ls" || l === "search") return `Searching${suffix}`;
   if (n === "read" || n === "view_image" || n === "read_mcp_resource" || l === "read") return `Reading${suffix}`;
-  if (n === "write" || n === "edit" || n === "apply_patch" || l === "update") return `Editing${suffix}`;
+  if (n === "apply_patch" || l === "update") return `Editing${suffix}`;
   if (n === "recall" || n === "recall_memory" || n === "search_memories" || l === "memory") return `Checking Memory${suffix}`;
   if (l === "setup") return `Setting Up${suffix}`;
   return `Working${suffix}`;
@@ -2117,6 +2112,7 @@ function toolStatusColor({ pending, groupCount, failedCount }) {
 }
 function ToolExecution({ name, args, result, rawResult, isError, errorCount, expanded, globalExpanded = false, columns = 80, attached = false, count = 1, completedCount = 0, startedAt = 0, completedAt = 0, aggregate = false, categories = {}, headerFinalized = true }) {
   const [blinkOn, setBlinkOn] = useState(true);
+  const [blinkExpired, setBlinkExpired] = useState(false);
   const [pendingDelayElapsed, setPendingDelayElapsed] = useState(false);
   const groupCount = Math.max(1, Number(count || 1));
   const doneCount = Math.max(0, Math.min(groupCount, Number(completedCount || (result == null ? 0 : groupCount))));
@@ -2158,10 +2154,28 @@ function ToolExecution({ name, args, result, rawResult, isError, errorCount, exp
     return () => clearTimeout(timer);
   }, [pending, startedAt]);
   useEffect(() => {
-    if (!pending || !pendingDisplayReady) return void 0;
+    if (!pending || !pendingDisplayReady || blinkExpired) {
+      setBlinkOn(true);
+      return void 0;
+    }
     const timer = setInterval(() => setBlinkOn((on) => !on), TOOL_BLINK_MS);
     return () => clearInterval(timer);
-  }, [pending, pendingDisplayReady]);
+  }, [pending, pendingDisplayReady, blinkExpired]);
+  useEffect(() => {
+    if (!pending || !pendingDisplayReady) {
+      setBlinkExpired(false);
+      return void 0;
+    }
+    const started = Number(startedAt || 0);
+    const remaining = TOOL_BLINK_LIMIT_MS - (started ? Math.max(0, Date.now() - started) : 0);
+    if (remaining <= 0) {
+      setBlinkExpired(true);
+      return void 0;
+    }
+    setBlinkExpired(false);
+    const timer = setTimeout(() => setBlinkExpired(true), remaining);
+    return () => clearTimeout(timer);
+  }, [pending, pendingDisplayReady, startedAt]);
   if (pending && !pendingDisplayReady) return null;
   if (aggregate) {
     const headerOrder = Array.isArray(args?.categoryOrder) ? args.categoryOrder : null;
@@ -2175,7 +2189,7 @@ function ToolExecution({ name, args, result, rawResult, isError, errorCount, exp
       detailText = "";
     }
     const dotColor2 = statusColor;
-    const dotText2 = pending && !blinkOn ? " " : TURN_MARKER;
+    const dotText2 = pending && !blinkExpired && !blinkOn ? " " : TURN_MARKER;
     const gutter2 = 2;
     const showHeaderExpandHint2 = hasRawResult;
     const hintLabel2 = showHeaderExpandHint2 ? `ctrl+o ${expanded ? "collapse" : "expand"}` : "";
@@ -2229,7 +2243,7 @@ function ToolExecution({ name, args, result, rawResult, isError, errorCount, exp
   const isAgentResponse = isAgentResult && hasAgentResponseResult(rt);
   const isAgentMetadataResult = isAgentResult && !isAgentResponse;
   const dotColor = statusColor;
-  const dotText = pending && !blinkOn ? " " : TURN_MARKER;
+  const dotText = pending && !blinkExpired && !blinkOn ? " " : TURN_MARKER;
   let labelText;
   if (isAgentResponse) labelText = agentResponseTitle(parsedArgs);
   else if (isBackgroundResponse) labelText = backgroundTaskResultTitle(normalizedName, backgroundMeta || parsedArgs);
@@ -3845,32 +3859,55 @@ function ProgressBar({ value = 0, total = 0, width = 24 }) {
 function metricValue(parts) {
   return parts.filter(Boolean).join(" \xB7 ");
 }
-function MetricCell({ label, value, width, tone }) {
-  const labelWidth = Math.min(12, Math.max(8, Math.floor(width * 0.34)));
-  const valueWidth = Math.max(0, width - labelWidth - 1);
+function DetailLine({ label, value, columns }) {
+  const innerWidth = Math.max(24, Math.floor(columns || 80) - 4);
+  const labelWidth = 10;
+  const valueWidth = Math.max(0, innerWidth - labelWidth - 2);
+  return /* @__PURE__ */ jsxs9(Box11, { flexDirection: "row", width: "100%", children: [
+    /* @__PURE__ */ jsx13(Text13, { color: theme.subtle, children: padCells3(truncateText3(label, labelWidth), labelWidth) }),
+    /* @__PURE__ */ jsx13(Text13, { color: theme.inactive, children: "  " }),
+    /* @__PURE__ */ jsx13(Text13, { color: theme.text, children: truncateText3(value, valueWidth) })
+  ] });
+}
+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 pctWidth = 6;
+  const tokenWidth = 7;
+  const barWidth = Math.max(6, Math.min(20, width - labelWidth - pctWidth - tokenWidth - 4));
+  const pct = percent(tokens, total);
   return /* @__PURE__ */ jsxs9(Box11, { flexDirection: "row", width, children: [
-    /* @__PURE__ */ jsxs9(Text13, { color: theme.subtle, children: [
-      padCells3(truncateText3(label, labelWidth), labelWidth),
-      " "
-    ] }),
-    /* @__PURE__ */ jsx13(Text13, { color: tone || theme.text, children: truncateText3(value, valueWidth) })
+    /* @__PURE__ */ jsx13(Text13, { color: theme.subtle, children: padCells3(truncateText3(label, labelWidth), labelWidth) }),
+    /* @__PURE__ */ jsx13(Text13, { color: theme.inactive, children: " " }),
+    /* @__PURE__ */ jsx13(Text13, { color: usageColor(pct), children: padCells3(percentLabel(tokens, total), pctWidth) }),
+    /* @__PURE__ */ jsx13(ProgressBar, { value: tokens, total, width: barWidth }),
+    /* @__PURE__ */ jsx13(Text13, { color: theme.inactive, children: " " }),
+    /* @__PURE__ */ jsx13(Text13, { color: theme.text, children: padCells3(formatTokens(tokens), tokenWidth) })
   ] });
 }
-function MetricGrid({ cells, columns }) {
+function CategoryGrid({ categories, columns, total }) {
   const innerWidth = Math.max(24, Math.floor(columns || 80) - 4);
-  const twoColumns = innerWidth >= 76;
+  const twoColumns = innerWidth >= 84;
   if (!twoColumns) {
-    return /* @__PURE__ */ jsx13(Box11, { flexDirection: "column", width: "100%", children: cells.map((cell) => /* @__PURE__ */ jsx13(MetricCell, { ...cell, width: innerWidth }, cell.label)) });
+    return /* @__PURE__ */ jsx13(Box11, { flexDirection: "column", width: "100%", children: categories.map((category) => /* @__PURE__ */ jsx13(CategoryItem, { ...category, total, width: innerWidth }, category.label)) });
   }
   const gap = 4;
   const leftWidth = Math.floor((innerWidth - gap) / 2);
   const rightWidth = innerWidth - gap - leftWidth;
   const pairs = [];
-  for (let i = 0; i < cells.length; i += 2) pairs.push(cells.slice(i, i + 2));
+  for (let i = 0; i < categories.length; i += 2) pairs.push(categories.slice(i, i + 2));
   return /* @__PURE__ */ jsx13(Box11, { flexDirection: "column", width: "100%", children: pairs.map((pair, index) => /* @__PURE__ */ jsxs9(Box11, { flexDirection: "row", width: "100%", children: [
-    /* @__PURE__ */ jsx13(MetricCell, { ...pair[0], width: leftWidth }),
+    /* @__PURE__ */ jsx13(CategoryItem, { ...pair[0], total, width: leftWidth }),
     /* @__PURE__ */ jsx13(Text13, { children: " ".repeat(gap) }),
-    pair[1] ? /* @__PURE__ */ jsx13(MetricCell, { ...pair[1], width: rightWidth }) : null
+    pair[1] ? /* @__PURE__ */ jsx13(CategoryItem, { ...pair[1], total, width: rightWidth }) : null
   ] }, index)) });
 }
 function ContextUsageView({ detail, columns }) {
@@ -3884,6 +3921,9 @@ function ContextUsageView({ detail, columns }) {
   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);
   const windowTokens = finiteNumber(usage.windowTokens);
   const freeTokens = windowTokens ? Math.max(0, windowTokens - usedTokens) : finiteNumber(usage.freeTokens);
@@ -3891,25 +3931,34 @@ function ContextUsageView({ detail, columns }) {
   const summaryText = `${formatTokens(usedTokens)} / ${formatTokens(windowTokens)} \xB7 ${formatTokens(freeTokens)} free`;
   const pctText = `${percentLabel(usedTokens, windowTokens)} used`;
   const barWidth = Math.max(12, Math.min(34, innerWidth - stringWidth7(summaryText) - stringWidth7(pctText) - 5));
+  const builtInToolTokens = bucketTokens(schema, ["code", "web", "mutation", "channels", "setup", "other"]);
+  const builtInToolCount = bucketCount(schema, ["code", "web", "mutation", "channels", "setup", "other"]);
+  const projectTokens = semanticTokens(semantic, ["project", "workspace", "environment", "other"]);
   const compactionLine = metricValue([
-    compaction.stage || "pending",
+    compaction.stage && compaction.stage !== "pending" ? compaction.stage : "",
     compaction.state,
-    compaction.triggerTokens ? `trigger ${formatTokens(compaction.triggerTokens)}` : "",
-    compaction.boundaryTokens ? `boundary ${formatTokens(compaction.boundaryTokens)}` : ""
+    compaction.triggerTokens ? `trigger ${formatTokens(compaction.triggerTokens)}` : ""
   ]);
-  const metaLine = metricValue([
-    usage.source || "estimated",
-    usage.effective ? "effective window" : "",
+  const sourceLine = metricValue([
+    usage.effective ? `effective ${formatTokens(windowTokens)}` : `window ${formatTokens(windowTokens)}`,
     usage.rawWindowTokens && usage.rawWindowTokens !== usage.windowTokens ? `raw ${formatTokens(usage.rawWindowTokens)}` : ""
   ]);
-  const cells = [
-    { label: "Messages", value: metricValue([`${formatTokens(messages.tokens)} tokens`, `${messages.count || 0} msgs`]) },
-    { label: "Tools", value: metricValue([`${formatTokens(tools.schemaTokens)} schema`, `${tools.active || 0}/${tools.count || 0} active`]) },
-    { label: "Tool I/O", value: metricValue([`${toolIo.calls || 0} calls`, `${toolIo.results || 0} results`]) },
-    { label: "Overhead", value: metricValue([`${formatTokens(request.overheadTokens)} frame`, `${formatTokens(request.reserveTokens)} reserve`]) },
-    { label: "Last API", value: metricValue([`${formatTokens(lastApi.contextTokens)} ctx`, `${formatTokens(lastApi.inputTokens)} in`, `${formatTokens(lastApi.outputTokens)} out`]) },
-    { label: "Cache", value: metricValue([`${cache.hitRate || "n/a"} hit`, `${formatTokens(cache.readTokens)} read`]) },
-    { label: "Extensions", value: metricValue([`${extensions.skills || 0} skills`, `${extensions.plugins || 0} plugins`]) }
+  const apiLine = metricValue([
+    `last ctx ${formatTokens(lastApi.contextTokens)}`,
+    `in/out ${formatTokens(lastApi.inputTokens)}/${formatTokens(lastApi.outputTokens)}`,
+    `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: "Project", tokens: projectTokens, meta: "mixdog.md \xB7 workspace" },
+    { 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` }
   ];
   return /* @__PURE__ */ jsxs9(Box11, { flexDirection: "column", width: "100%", children: [
     /* @__PURE__ */ jsxs9(Box11, { flexDirection: "row", width: "100%", children: [
@@ -3920,10 +3969,14 @@ function ContextUsageView({ detail, columns }) {
       /* @__PURE__ */ jsx13(Text13, { color: theme.text, children: truncateText3(summaryText, Math.max(0, innerWidth - Math.min(10, innerWidth) - barWidth - 3)) })
     ] }),
     /* @__PURE__ */ jsxs9(Box11, { marginTop: 1, flexDirection: "column", width: "100%", children: [
-      /* @__PURE__ */ jsx13(Text13, { color: theme.subtle, children: truncateText3(metaLine, innerWidth) }),
-      /* @__PURE__ */ jsx13(Text13, { color: theme.text, children: truncateText3(`Compaction  ${compactionLine}`, innerWidth) })
+      /* @__PURE__ */ jsx13(DetailLine, { label: "Source", value: sourceLine, columns }),
+      /* @__PURE__ */ jsx13(DetailLine, { label: "Compaction", value: compactionLine, columns }),
+      /* @__PURE__ */ jsx13(DetailLine, { label: "API/cache", value: apiLine, columns })
     ] }),
-    /* @__PURE__ */ jsx13(Box11, { marginTop: 1, flexDirection: "column", width: "100%", children: /* @__PURE__ */ jsx13(MetricGrid, { cells, columns }) })
+    /* @__PURE__ */ jsxs9(Box11, { marginTop: 1, flexDirection: "column", width: "100%", children: [
+      /* @__PURE__ */ jsx13(Text13, { color: theme.subtle, children: "Context mix" }),
+      /* @__PURE__ */ jsx13(Box11, { marginTop: 1, flexDirection: "column", width: "100%", children: /* @__PURE__ */ jsx13(CategoryGrid, { categories, columns, total: windowTokens }) })
+    ] })
   ] });
 }
 function ContextPanel({ rows, title = "Context Usage", columns = 80, fillHeight = false, detail = null }) {
@@ -6896,6 +6949,7 @@ ${model?.id || ""}`;
   };
   const openContextPicker = () => {
     const tools = store.toolsStatus?.() || { activeCount: 0, count: 0, activeTools: [] };
+    const mcp = store.mcpStatus?.() || { connectedCount: 0, configuredCount: 0, failedCount: 0 };
     const skills = store.skillsStatus?.() || { count: 0 };
     const plugins = store.pluginsStatus?.() || { count: 0 };
     const context = store.contextStatus?.() || {};
@@ -7020,7 +7074,8 @@ ${model?.id || ""}`;
         },
         messages: {
           tokens: messages.estimatedTokens,
-          count: messages.count
+          count: messages.count,
+          semantic: messages.semantic
         },
         tools: {
           schemaTokens: request.toolSchemaTokens,
@@ -7032,6 +7087,7 @@ ${model?.id || ""}`;
           results: messages.toolResultCount
         },
         request: {
+          toolSchemaBreakdown: request.toolSchemaBreakdown,
           overheadTokens: request.requestOverheadTokens,
           reserveTokens: request.reserveTokens
         },
@@ -7047,6 +7103,11 @@ ${model?.id || ""}`;
         extensions: {
           skills: skills.count,
           plugins: plugins.count
+        },
+        mcp: {
+          connected: mcp.connectedCount,
+          configured: mcp.configuredCount,
+          failed: mcp.failedCount
         }
       },
       rows: contextRows
@@ -8912,7 +8973,7 @@ ${p.description}` : ""
             return;
           }
           if (r.changed === false) {
-            store.pushNotice("No changes.", "warn");
+            store.pushNotice("nothing to compact", "warn");
             return;
           }
           store.pushNotice("Compact done.", "info");
@@ -9309,7 +9370,7 @@ ${p.description}` : ""
   const queuedRows = queuedVisible ? state.queued.length + 1 : 0;
   const baseReserve = WELCOME_ROWS + SCROLL_HINT_ROWS + LIVE_STATUS_ROWS + INPUT_BOX_ROWS + STATUSLINE_ROWS + queuedRows;
   const maxFloatingPanelRows = Math.max(0, resizeState.rows - baseReserve - 1);
-  const desiredFloatingPanelRows = picker ? picker.fillAvailable ? maxFloatingPanelRows : PANEL_BASE_ROWS + OPTION_PANEL_EXTRA_ROWS : contextPanel ? PANEL_BASE_ROWS + OPTION_PANEL_EXTRA_ROWS : usagePanel ? PANEL_BASE_ROWS + OPTION_PANEL_EXTRA_ROWS : slashPaletteOpen ? PANEL_MAX_VISIBLE + 4 : hasTextEntryPrompt ? TEXT_ENTRY_ROWS + OPTION_PANEL_EXTRA_ROWS : 0;
+  const desiredFloatingPanelRows = picker ? picker.fillAvailable ? maxFloatingPanelRows : PANEL_BASE_ROWS + OPTION_PANEL_EXTRA_ROWS : contextPanel ? PANEL_BASE_ROWS + OPTION_PANEL_EXTRA_ROWS + 3 : usagePanel ? PANEL_BASE_ROWS + OPTION_PANEL_EXTRA_ROWS : slashPaletteOpen ? PANEL_MAX_VISIBLE + 4 : hasTextEntryPrompt ? TEXT_ENTRY_ROWS + OPTION_PANEL_EXTRA_ROWS : 0;
   const floatingPanelRows = desiredFloatingPanelRows > 0 ? Math.min(desiredFloatingPanelRows, maxFloatingPanelRows) : 0;
   const pickerVisibleRows = picker ? Math.max(1, floatingPanelRows - PICKER_CHROME_ROWS - (picker.fillAvailable ? 0 : OPTION_PANEL_EXTRA_ROWS)) : PANEL_MAX_VISIBLE;
   const bottomReserve = baseReserve + floatingPanelRows;

package/src/ui/tool-card.mjs

@@ -3,7 +3,7 @@
  *
  * Replaces the raw `[tool: name]` line with a styled card that shows the tool
  * name plus a short, human-readable summary of its most relevant argument
- * (path for read/write/edit, command for shell, pattern for grep, etc.).
+ * (path for read/apply_patch, command for shell, pattern for grep, etc.).
  *
  * Pure formatting: returns a string, never touches stdout. Robust to missing or
  * malformed argument objects (the engine hands us `{ name, arguments, id }`).
@@ -15,9 +15,7 @@ const MAX_SUMMARY = 72;
 /** Map of tool name -> function deriving its one-line summary from args. */
 const SUMMARIZERS = {
   read: (a) => a.path ?? a.file,
-  write: (a) => a.path,
   apply_patch: (a) => a.path ?? a.base_path ?? firstPatchPath(a.patch),
-  edit: (a) => a.path ?? (Array.isArray(a.edits) ? a.edits[0]?.path : undefined),
   list: (a) => a.path ?? a.pattern,
   glob: (a) => joinMaybe(a.pattern) ?? a.path,
   grep: (a) => joinMaybe(a.pattern),