mixdog 0.9.175 → 1.0.0

package/src/runtime/shared/tool-card-model/git-result.mjs

@@ -1,3 +1,5 @@
+import { hasBenignExitOutcome } from '../tool-status.mjs';
+
 // Only command result headers, not arbitrary lines in a patch, carry exits.
 export function gitResultExitCode(text) {
   const match = /(?:^(?:## [^\n]+\n)?|\n## [^\n]+\n)exit ([1-9]\d*)\r?(?:\n|$)/.exec(String(text ?? ''));
@@ -7,3 +9,11 @@ export function gitResultExitCode(text) {
 export function gitResultError(text) {
   return /(?:^|\n)error: command failed: [^\n]+|^error: [^\n]+/.exec(String(text ?? ''))?.[0].trim() || '';
 }
+
+// A tool error fails the call; a git process that ran and exited non-zero is
+// a command exit, like the shell's, unless the tool marked the exit a signal.
+export function gitTerminalStatus(text) {
+  if (gitResultError(text)) return 'failed';
+  if (gitResultExitCode(text) !== null && !hasBenignExitOutcome(text)) return 'exit';
+  return '';
+}

package/src/runtime/shared/tool-card-model/terminal-status.mjs

@@ -2,11 +2,11 @@
  * terminal-status.mjs — terminal status words, their outcome tone, status
  * marker stripping and the ` · <time>` detail conventions.
  */
-import { normalizeToolTerminalStatus, toolResultTerminalStatus } from '../tool-status.mjs';
+import { leadingResultBlock, normalizeToolTerminalStatus, toolResultTerminalStatus } from '../tool-status.mjs';
 import { formatElapsed } from '../time-format.mjs';
 
 export function shellResultStatus(value) {
-  const match = String(value || '').match(
+  const match = leadingResultBlock(value).match(
     /(?:^|\b)status:\s*(running|pending|queued|completed|failed|cancelled|canceled)\b/im
   );
   return match ? String(match[1] || '').toLowerCase() : '';
@@ -48,6 +48,7 @@ const TERMINAL_STATUS_LABELS = new Map([
   ['cancelled', 'Cancelled'],
   ['denied', 'Denied'],
 ]);
+const BARE_STATUS_WORDS = new Set([...TERMINAL_STATUS_LABELS.values()].map((label) => label.toLowerCase()));
 
 export function displayTerminalStatus(value) {
   // 'exit' is a shell-only pseudo-status (command RAN but exited non-zero); it
@@ -107,5 +108,8 @@ export function mergeTerminalDetail(status, detail = '') {
   if (label === 'Finished' && text) return text;
   if (!text) return label;
   if (text.toLowerCase().startsWith(label.toLowerCase())) return text;
+  // A bare status word (the generic "Failed" of an error without a body) is
+  // superseded by the resolved status, e.g. a user-takeover "Cancelled".
+  if (BARE_STATUS_WORDS.has(text.toLowerCase())) return label;
   return `${label} · ${text}`;
 }

package/src/runtime/shared/tool-card-model.golden-cases.mjs

@@ -16,7 +16,8 @@ export const GIT_GOLDEN_CASES = [
     summary: 'diff --git a/a.txt b/a.txt',
     status: 'completed',
   },
-  { result: 'exit 128\nfatal: missing ref\n', summary: 'Exit 128', status: 'failed' },
+  { result: 'exit 128\nfatal: missing ref\n', summary: 'Exit 128', status: 'exit' },
+  { result: 'exit 1\n[outcome: no-match]\ndiff --git a/a.txt b/a.txt\n', summary: 'Exit 1', status: 'completed' },
   {
     result: '## git show missing\nexit 128\nfatal: missing\nerror: command failed: git show missing',
     summary: 'Exit 128',

package/src/runtime/shared/tool-result-summary.mjs

@@ -312,6 +312,7 @@ function summarizeLineCount({ text, trimmed }, { zero, singular, plural }) {
 function summarizeReadResult({ text, trimmed }) {
   if (/^\[image:/i.test(trimmed)) return 'Image';
   if (!trimmed) return null;
+  if (trimmed.startsWith('(no lines in range')) return '0 lines';
   const n = text.split('\n').length;
   return `${n} ${pluralize(n, 'line')}`;
 }

package/src/runtime/shared/tool-status.mjs

@@ -23,15 +23,48 @@ export function normalizeToolTerminalStatus(value) {
   return '';
 }
 
+// Status markers live in the result's leading block: the cancel marker, the
+// shell exit header, a background-task header, a task/agent status line.
+// Command output and fetched documents follow a blank line and can carry
+// `status:` text of their own, which says nothing about the tool call.
+export function leadingResultBlock(text) {
+  const lines = String(text || '').split('\n');
+  let index = 0;
+  if (/^\[tool output offloaded:/i.test(String(lines[0] || '').trim())) {
+    index = 1;
+    while (index < lines.length && !lines[index].trim()) index += 1;
+  }
+  const block = [];
+  for (; index < lines.length && lines[index].trim(); index += 1) block.push(lines[index]);
+  return block.join('\n');
+}
+
+// The user taking over the browser/desktop, or the session cancelling a
+// computer command, stops the call on purpose; it is not a failed invocation.
+const USER_CONTROL_CANCELLATION_RE =
+  /^(?:Error:\s*)?(?:Browser command interrupted by local user input\.|computer_session_aborted:|computer_user_control_active:)/i;
+
+export function isUserControlCancellation(text) {
+  return USER_CONTROL_CANCELLATION_RE.test(String(text || '').trimStart());
+}
+
+// A non-zero exit the tool itself marked as a signal (search no-match, a
+// `git diff --exit-code` difference) rather than a command failure.
+export function hasBenignExitOutcome(text) {
+  return /^\[outcome:\s*(?:no-match|no-change)\]\s*$/im.test(String(text || ''));
+}
+
 export function toolResultTerminalStatus(text) {
   const body = String(text || '');
   const tagged = body.match(/<status[^>]*>([\s\S]*?)<\/status>/i)?.[1]?.trim();
   if (tagged) return normalizeToolTerminalStatus(tagged);
-  const bracketed = body.match(/^\[status:\s*([^\]]*)\]/im)?.[1]?.trim();
+  const head = leadingResultBlock(body);
+  const bracketed = head.match(/^\[status:\s*([^\]]*)\]/im)?.[1]?.trim();
   if (bracketed) return normalizeToolTerminalStatus(bracketed);
-  const inline = body.match(/^(?:status|state):\s*([^\s·,;]+)/im)?.[1]?.trim();
+  const inline = head.match(/^(?:status|state):\s*([^\s·,;]+)/im)?.[1]?.trim();
   const fromInline = normalizeToolTerminalStatus(inline);
   if (fromInline) return fromInline;
+  if (isUserControlCancellation(body)) return 'cancelled';
   // Bare control bodies written on cancel/crash (current + legacy).
   const trimmed = body.trim();
   if (/^(?:cancelled|canceled)$/i.test(trimmed)) return 'cancelled';

package/src/runtime/tidy/report.mjs

@@ -11,10 +11,10 @@ const FILE_LIST_CAP = 25;
 export const RESULTS_PAGE_MAX = 100;
 const TRIM_STEPS = [8, 3, 0];
 
-export function tidyToolResult(value, isError = false) {
+export function tidyToolResult(value, isError = value?.ok === false) {
   return {
     content: [{ type: 'text', text: JSON.stringify(value) }],
-    ...(isError || value?.ok === false ? { isError: true } : {}),
+    ...(isError ? { isError: true } : {}),
   };
 }
 

package/src/runtime/tidy/tool.mjs

@@ -571,7 +571,12 @@ export async function executeTidyTool(args = {}, { cwd = process.cwd(), signal =
       return tidyToolResult(await rulesAction({ cwd, signal, startedAt }));
     }
     if (action === 'results') {
-      return tidyToolResult(await resultsAction({ args, cwd, sessionId, engineFilter, pathFilter: scope, startedAt }));
+      // Paging a stored run succeeds even when that run was incomplete; the
+      // report's ok/status still describe the run itself.
+      return tidyToolResult(
+        await resultsAction({ args, cwd, sessionId, engineFilter, pathFilter: scope, startedAt }),
+        false
+      );
     }
     return tidyToolResult(
       await runAction({

package/src/tui/dist/index.mjs

@@ -37476,6 +37476,58 @@ function parseTaskNotification(text) {
   };
 }
 
+// src/runtime/shared/tool-status.mjs
+function normalizeToolTerminalStatus(value) {
+  const raw = String(value || "").trim().toLowerCase();
+  if (!raw) return "";
+  if (/^(running|pending|queued|in_progress|in-progress)$/.test(raw)) return "running";
+  if (/^(completed|complete|done|success|succeeded|ok)$/.test(raw)) return "completed";
+  if (/^(failed|fail|error|errored|timeout|timed_out|killed)$/.test(raw)) return "failed";
+  if (/^(cancelled|canceled|cancel|cancel[-_ ]unconfirmed|cancel[-_ ]pending|cancelling|canceling)$/.test(raw))
+    return "cancelled";
+  if (/^(denied|deny|refused|rejected)$/.test(raw)) return "denied";
+  return "";
+}
+function leadingResultBlock(text) {
+  const lines = String(text || "").split("\n");
+  let index = 0;
+  if (/^\[tool output offloaded:/i.test(String(lines[0] || "").trim())) {
+    index = 1;
+    while (index < lines.length && !lines[index].trim()) index += 1;
+  }
+  const block = [];
+  for (; index < lines.length && lines[index].trim(); index += 1) block.push(lines[index]);
+  return block.join("\n");
+}
+var USER_CONTROL_CANCELLATION_RE = /^(?:Error:\s*)?(?:Browser command interrupted by local user input\.|computer_session_aborted:|computer_user_control_active:)/i;
+function isUserControlCancellation(text) {
+  return USER_CONTROL_CANCELLATION_RE.test(String(text || "").trimStart());
+}
+function hasBenignExitOutcome(text) {
+  return /^\[outcome:\s*(?:no-match|no-change)\]\s*$/im.test(String(text || ""));
+}
+function toolResultTerminalStatus(text) {
+  const body = String(text || "");
+  const tagged = body.match(/<status[^>]*>([\s\S]*?)<\/status>/i)?.[1]?.trim();
+  if (tagged) return normalizeToolTerminalStatus(tagged);
+  const head = leadingResultBlock(body);
+  const bracketed = head.match(/^\[status:\s*([^\]]*)\]/im)?.[1]?.trim();
+  if (bracketed) return normalizeToolTerminalStatus(bracketed);
+  const inline = head.match(/^(?:status|state):\s*([^\s·,;]+)/im)?.[1]?.trim();
+  const fromInline = normalizeToolTerminalStatus(inline);
+  if (fromInline) return fromInline;
+  if (isUserControlCancellation(body)) return "cancelled";
+  const trimmed = body.trim();
+  if (/^(?:cancelled|canceled)$/i.test(trimmed)) return "cancelled";
+  if (/^(?:interrupted by (?:user|process restart)|tool execution aborted|\[tool execution was interrupted\])$/i.test(
+    trimmed
+  )) {
+    return "cancelled";
+  }
+  if (/^the user doesn't want to proceed with this tool use\b/i.test(trimmed)) return "cancelled";
+  return "";
+}
+
 // src/runtime/shared/tool-card-model/git-result.mjs
 function gitResultExitCode(text) {
   const match = /(?:^(?:## [^\n]+\n)?|\n## [^\n]+\n)exit ([1-9]\d*)\r?(?:\n|$)/.exec(String(text ?? ""));
@@ -37484,6 +37536,11 @@ function gitResultExitCode(text) {
 function gitResultError(text) {
   return /(?:^|\n)error: command failed: [^\n]+|^error: [^\n]+/.exec(String(text ?? ""))?.[0].trim() || "";
 }
+function gitTerminalStatus(text) {
+  if (gitResultError(text)) return "failed";
+  if (gitResultExitCode(text) !== null && !hasBenignExitOutcome(text)) return "exit";
+  return "";
+}
 
 // src/runtime/shared/tool-result-summary.mjs
 function countNonEmptyLines(text) {
@@ -37686,6 +37743,7 @@ function summarizeLineCount({ text, trimmed }, { zero, singular, plural }) {
 function summarizeReadResult({ text, trimmed }) {
   if (/^\[image:/i.test(trimmed)) return "Image";
   if (!trimmed) return null;
+  if (trimmed.startsWith("(no lines in range")) return "0 lines";
   const n = text.split("\n").length;
   return `${n} ${pluralize(n, "line")}`;
 }
@@ -39661,41 +39719,9 @@ function normalizeCountMap(value = {}) {
   return out;
 }
 
-// src/runtime/shared/tool-status.mjs
-function normalizeToolTerminalStatus(value) {
-  const raw = String(value || "").trim().toLowerCase();
-  if (!raw) return "";
-  if (/^(running|pending|queued|in_progress|in-progress)$/.test(raw)) return "running";
-  if (/^(completed|complete|done|success|succeeded|ok)$/.test(raw)) return "completed";
-  if (/^(failed|fail|error|errored|timeout|timed_out|killed)$/.test(raw)) return "failed";
-  if (/^(cancelled|canceled|cancel|cancel[-_ ]unconfirmed|cancel[-_ ]pending|cancelling|canceling)$/.test(raw))
-    return "cancelled";
-  if (/^(denied|deny|refused|rejected)$/.test(raw)) return "denied";
-  return "";
-}
-function toolResultTerminalStatus(text) {
-  const body = String(text || "");
-  const tagged = body.match(/<status[^>]*>([\s\S]*?)<\/status>/i)?.[1]?.trim();
-  if (tagged) return normalizeToolTerminalStatus(tagged);
-  const bracketed = body.match(/^\[status:\s*([^\]]*)\]/im)?.[1]?.trim();
-  if (bracketed) return normalizeToolTerminalStatus(bracketed);
-  const inline = body.match(/^(?:status|state):\s*([^\s·,;]+)/im)?.[1]?.trim();
-  const fromInline = normalizeToolTerminalStatus(inline);
-  if (fromInline) return fromInline;
-  const trimmed = body.trim();
-  if (/^(?:cancelled|canceled)$/i.test(trimmed)) return "cancelled";
-  if (/^(?:interrupted by (?:user|process restart)|tool execution aborted|\[tool execution was interrupted\])$/i.test(
-    trimmed
-  )) {
-    return "cancelled";
-  }
-  if (/^the user doesn't want to proceed with this tool use\b/i.test(trimmed)) return "cancelled";
-  return "";
-}
-
 // src/runtime/shared/tool-card-model/terminal-status.mjs
 function shellResultStatus(value) {
-  const match = String(value || "").match(
+  const match = leadingResultBlock(value).match(
     /(?:^|\b)status:\s*(running|pending|queued|completed|failed|cancelled|canceled)\b/im
   );
   return match ? String(match[1] || "").toLowerCase() : "";
@@ -39730,6 +39756,7 @@ var TERMINAL_STATUS_LABELS = /* @__PURE__ */ new Map([
   ["cancelled", "Cancelled"],
   ["denied", "Denied"]
 ]);
+var BARE_STATUS_WORDS = new Set([...TERMINAL_STATUS_LABELS.values()].map((label) => label.toLowerCase()));
 function displayTerminalStatus(value) {
   if (String(value || "").trim().toLowerCase() === "exit")
     return "Exited";
@@ -39772,6 +39799,7 @@ function mergeTerminalDetail(status, detail = "") {
   if (label === "Finished" && text) return text;
   if (!text) return label;
   if (text.toLowerCase().startsWith(label.toLowerCase())) return text;
+  if (BARE_STATUS_WORDS.has(text.toLowerCase())) return label;
   return `${label} \xB7 ${text}`;
 }
 
@@ -40275,9 +40303,10 @@ function deriveCardStatus(base, { normalizedName, parsedArgs, isShellSurface },
     parsedArgs
   );
   const agentCompletionDetail = !pending && isAgentTool(normalizedName) && !agentHeaderFailure ? agentTerminalDetail(parsedArgs?.status, isError, elapsed, parsedArgs?.error) : "";
-  const gitFailed = normalizedName === "git" && (gitResultExitCode(display.displayedResultText) !== null || Boolean(gitResultError(display.displayedResultText)));
-  const failedOrCompleted = isError || failedCount > 0 || gitFailed ? "failed" : "completed";
-  const terminalStatus = pending ? "running" : shellStatus || normalizeTerminalStatus(display.backgroundMeta?.status) || normalizeTerminalStatus(parsedArgs?.status) || resultTerminalStatus(display.displayedResultText) || failedOrCompleted;
+  const gitStatus = normalizedName === "git" ? gitTerminalStatus(display.displayedResultText) : "";
+  const failedOrCompleted = isError || failedCount > 0 ? "failed" : "completed";
+  const terminalStatus = pending ? "running" : shellStatus || gitStatus || normalizeTerminalStatus(display.backgroundMeta?.status) || normalizeTerminalStatus(parsedArgs?.status) || resultTerminalStatus(display.displayedResultText) || // A one-line error body is hidden from display, so read the raw result.
+  (isUserControlCancellation(base.rt) ? "cancelled" : "") || failedOrCompleted;
   return {
     shellStatus,
     shellElapsed,
@@ -47659,7 +47688,7 @@ function projectLitellmRow(row) {
     if (typeof value === "number" && Number.isFinite(value)) out[field] = value;
   }
   for (const [field, value] of Object.entries(row)) {
-    if (/^(?:input_cost_per_token|output_cost_per_token|cache_read_input_token_cost|cache_creation_input_token_cost)_above_\d+k_tokens$/.test(
+    if (/^(?:input_cost_per_token|output_cost_per_token|cache_read_input_token_cost|cache_creation_input_token_cost)(?:_above_\d+k_tokens)?(?:_priority)?$/.test(
       field
     ) && typeof value === "number" && Number.isFinite(value))
       out[field] = value;
@@ -47803,6 +47832,28 @@ var PRICED_VARIANTS = Object.freeze({
     "grok-4.7-build-fast": Object.freeze({ base: "grok-4.7", rateMultiplier: 2 })
   })
 });
+var CURSOR_PRICING = Object.freeze({
+  "composer-2.5": {
+    inputCostPerM: 0.5,
+    cacheReadCostPerM: 0.2,
+    outputCostPerM: 2.5,
+    fast: { inputCostPerM: 3, cacheReadCostPerM: 0.5, outputCostPerM: 15 }
+  },
+  "grok-4.7": {
+    fast: {
+      inputCostPerM: 4,
+      cacheReadCostPerM: 1,
+      outputCostPerM: 12,
+      // Fast long context (>256k input) bills at 3x the standard rates.
+      pricingTiers: [{ aboveInputTokens: 256e3, inputCostPerM: 6, cacheReadCostPerM: 1.5, outputCostPerM: 18 }]
+    }
+  },
+  "grok-4.6": { fast: { inputCostPerM: 4, cacheReadCostPerM: 1, outputCostPerM: 12 } },
+  "grok-4.5": { fast: { inputCostPerM: 4, cacheReadCostPerM: 1, outputCostPerM: 18 } },
+  "claude-opus-4-7": {
+    fast: { inputCostPerM: 30, cacheWriteCostPerM: 37.5, cacheReadCostPerM: 3, outputCostPerM: 150 }
+  }
+});
 
 // src/runtime/shared/statusline/statusline-format.mjs
 var statusText = rgb(198, 198, 198);

package/src/tui/session/session-api/settings.mjs

@@ -49,16 +49,22 @@ export function createSessionSettingsApi(bag) {
       },
       { busyResult: false, onRelease: flushEmitImmediate }
     ),
-    setFast: withCommandLock(async (value) => {
-      const enabled = await runtime.setFast(value);
-      set({ ...routeState() });
-      return enabled;
-    }),
-    toggleFast: withCommandLock(async () => {
-      const enabled = await runtime.toggleFast();
-      set({ ...routeState() });
-      return enabled;
-    }),
+    setFast: withCommandLock(
+      async (value) => {
+        const enabled = await runtime.setFast(value);
+        set({ ...routeState() });
+        return enabled;
+      },
+      { onRelease: flushEmitImmediate }
+    ),
+    toggleFast: withCommandLock(
+      async () => {
+        const enabled = await runtime.toggleFast();
+        set({ ...routeState() });
+        return enabled;
+      },
+      { onRelease: flushEmitImmediate }
+    ),
     setToolMode: (m) => {
       void runtime
         .setToolMode(m)

package/src/vendor/statusline/src/gateway/route-meta.mjs

@@ -478,11 +478,16 @@ function promptFootprintTokens(provider, usage) {
   return isInclusiveProvider(provider) ? input : input + cacheRead + cacheWrite;
 }
 
-function usageCostUsd(routeInfo, usage) {
+function usageCostUsd(routeInfo, providerOut) {
+  const usage = providerOut?.usage || {};
   if (Number.isFinite(Number(usage?.costUsd))) return round(Number(usage.costUsd), 6);
   return computeCostUsd({
     provider: routeInfo?.provider,
     model: routeInfo?.model,
+    pricingModel: providerOut?.pricingModel,
+    kind: routeInfo?.providerKind || providerKind(routeInfo?.provider),
+    requestServiceTier: providerOut?.requestServiceTier,
+    serviceTier: cleanString(providerOut?.serviceTier) || cleanString(usage?.raw?.service_tier) || undefined,
     inputTokens: num(usage?.inputTokens, 0),
     outputTokens: num(usage?.outputTokens, 0),
     cacheReadTokens: num(usage?.cachedTokens ?? usage?.cacheReadTokens, 0),
@@ -516,7 +521,7 @@ export function summarizeGatewayUsage(routeInfo, providerOut, compact = null, du
       contextUsedPct = Math.min(100, round(promptTokens * 100 / boundaryTokens, 2));
     }
   }
-  const costUsd = usageCostUsd(routeInfo, u);
+  const costUsd = usageCostUsd(routeInfo, providerOut);
   const usageCompact = compact && typeof compact === 'object' ? { ...compact } : compact;
   return {
     at: Date.now(),