@leroylabs/cli 0.1.2 → 0.1.4

package/src/format.mjs

@@ -1,14 +1,24 @@
+import { ansiForeground, LEROY_COLORS } from "./colors.mjs";
+
 const ANSI = {
   reset: "\u001b[0m",
   bold: "\u001b[1m",
   dim: "\u001b[2m",
-  green: "\u001b[32m",
-  orange: "\u001b[38;5;208m",
+  white: "\u001b[37m",
+  green: ansiForeground(LEROY_COLORS.green),
+  gray: "\u001b[90m",
+  neutral: ansiForeground(LEROY_COLORS.neutral),
+  inactive: ansiForeground(LEROY_COLORS.inactive),
+  red: ansiForeground(LEROY_COLORS.red),
   yellow: "\u001b[33m",
 };
 
 function color(value, tone, enabled) {
-  return enabled ? `${ANSI[tone]}${value}${ANSI.reset}` : value;
+  return style(value, [tone], enabled);
+}
+
+function style(value, tones, enabled) {
+  return enabled ? `${tones.map((tone) => ANSI[tone]).join("")}${value}${ANSI.reset}` : value;
 }
 
 function record(value) {
@@ -23,7 +33,7 @@ function pct(value, digits = 2, enabled = true) {
   const number = finite(value);
   if (number === null) return "—";
   const text = `${number > 0 ? "+" : number < 0 ? "−" : ""}${Math.abs(number).toFixed(digits)}%`;
-  return number >= 0 ? color(text, "green", enabled) : color(text, "orange", enabled);
+  return number >= 0 ? color(text, "green", enabled) : color(text, "red", enabled);
 }
 
 function dateLabel(value) {
@@ -62,17 +72,20 @@ function bestMemoryMatch(response) {
 function strategyCounts(response, requestedSide) {
   const counts = { buy: 0, neutral: 0, sell: 0, warming: 0 };
   const states = Array.isArray(response.strategy_states) ? response.strategy_states : [];
+  const observedStates = [];
   let observed = false;
   for (const entry of states) {
     const value = record(entry);
     const state = value.state;
     if (state === "warming" || state === "warming-up" || value.monitor_state === "warming-up") {
       counts.warming += 1;
+      observedStates.push("warming");
       observed = true;
       continue;
     }
     if (state in counts) {
       counts[state] += 1;
+      observedStates.push(state);
       observed = true;
     }
   }
@@ -80,36 +93,43 @@ function strategyCounts(response, requestedSide) {
     const activeCount = finite(record(response.active_confluence).active_signal_count);
     if (activeCount !== null && (requestedSide === "buy" || requestedSide === "sell")) {
       counts[requestedSide] = activeCount;
-      return { counts, observed: true };
+      return { counts, observed: true, states: Array.from({ length: activeCount }, () => requestedSide) };
     }
   }
-  return { counts, observed };
+  return { counts, observed, states: observedStates };
 }
 
 function memoryMatchCounts(response) {
-  const entries = Array.isArray(record(response.market_memory).matches) ? record(response.market_memory).matches : [];
-  const side = entries.find((entry) => record(entry).side === response.request?.side) ?? entries[0];
-  const matches = Array.isArray(record(side).matches) ? record(side).matches : [];
-  const countRows = (kinds) => matches
-    .filter((match) => kinds.includes(record(match).match_kind))
-    .reduce((total, match) => total + (finite(record(match).row_count) ?? 0), 0);
+  const selected = bestMemoryMatch(response);
+  const tier = matchTier(selected);
+  const rowCount = finite(record(selected).row_count) ?? 0;
   return {
-    exact: countRows(["context"]),
-    comparable: countRows(["cross_ticker_context", "strategy", "forward_overlay_context"]),
-    baseline: countRows(["side"]),
+    exact: tier.score === 5 ? rowCount : 0,
+    comparable: tier.score > 0 && tier.score < 5 ? rowCount : 0,
+    tier,
   };
 }
 
-function historicalEvaluations(response) {
-  const memory = record(response.market_memory);
-  const coverage = record(memory.coverage);
-  return finite(memory.strategy_evaluations)
-    ?? finite(coverage.strategy_evaluations)
-    ?? finite(coverage.historical_evaluations)
-    ?? finite(memory.scans_completed)
-    ?? finite(memory.scan_count)
-    ?? finite(coverage.indexed_rows)
-    ?? null;
+function matchTier(match) {
+  const value = record(match);
+  const kind = value.match_kind;
+  const scope = typeof value.scope === "string" ? value.scope : null;
+  if (scope === "same_ticker_exact" || (kind === "context" && !scope)) {
+    return { score: 5, basis: "Exact ticker setup" };
+  }
+  if (scope === "cross_ticker_exact_state" || kind === "cross_ticker_context") {
+    return { score: 4, basis: "Same setup on other tickers" };
+  }
+  if (scope === "exact_41_sensor_state" || kind === "strategy") {
+    return { score: 3, basis: "Same 41-sensor state" };
+  }
+  if (scope?.startsWith("forward_overlay_") || kind === "forward_overlay_context") {
+    return { score: 2, basis: "Same side with strategy and market context" };
+  }
+  if (scope === "all_market_memory_observations" || kind === "side") {
+    return { score: 1, basis: "Same side baseline" };
+  }
+  return { score: 0, basis: null };
 }
 
 function memoryStatus(response) {
@@ -120,20 +140,9 @@ function memoryStatus(response) {
   };
 }
 
-function evidenceScope(response) {
-  const match = record(bestMemoryMatch(response));
-  const scope = match.scope;
-  if (scope === "same_ticker_exact") return "exact ticker setup";
-  if (scope === "cross_ticker_exact_state") return "cross-ticker exact state";
-  if (scope === "exact_41_sensor_state") return "41-sensor state";
-  if (scope?.startsWith("forward_overlay_")) return "forward overlay context";
-  if (scope === "all_market_memory_observations") return "directional baseline";
-  return null;
-}
-
 function unavailableReason(response) {
   const { status, reason } = memoryStatus(response);
-  if (reason) return `${status ?? "Market Memory"} · ${reason}`;
+  if (reason) return `${humanizeStatus(status)} · ${reason}`;
   if (status === "artifact_unavailable") return "reader unavailable";
   if (status === "insufficient_context") return "not available in current evidence";
   return "not available in current evidence";
@@ -157,17 +166,18 @@ function lookupMilliseconds(response) {
 
 function humanizeStatus(value) {
   const labels = {
-    historical_match: "Historical match",
-    insufficient_context: "Limited match",
-    artifact_unavailable: "Reader unavailable",
+    historical_match: "Historical Match",
+    insufficient_context: "Limited Match",
+    artifact_unavailable: "Reader Unavailable",
   };
   if (typeof value !== "string" || !value) return "Unavailable";
   return labels[value] ?? value.replace(/[_-]+/g, " ").replace(/\b\w/g, (letter) => letter.toUpperCase());
 }
 
-function memorySummary(status, scope, exactMatches) {
-  if (status === "historical_match" && (scope === "exact ticker setup" || exactMatches > 0)) return "Exact matches found.";
-  return [humanizeStatus(status), scope].filter(Boolean).join(" · ");
+function memorySummary(status, tier) {
+  if (status === "historical_match" && tier.score === 5) return "Match Found";
+  if (tier.score > 0) return "Limited Match";
+  return humanizeStatus(status);
 }
 
 function sideLabel(value) {
@@ -175,17 +185,38 @@ function sideLabel(value) {
   return value.charAt(0).toUpperCase() + value.slice(1).toLowerCase();
 }
 
-function sectionRule(title, enabled, width = 58) {
+const BOX_WIDTH = 65;
+
+function sideTone(value) {
+  if (value === "buy") return "green";
+  if (value === "sell") return "red";
+  if (value === "both") return "yellow";
+  return "dim";
+}
+
+function sectionRule(title, enabled, width = BOX_WIDTH) {
   const dashCount = Math.max(4, width - title.length - 5);
   return color(`┌─ ${title} ${"─".repeat(dashCount)}┐`, "dim", enabled);
 }
 
-function sectionBottom(enabled, width = 58) {
+function tickerRule(side, symbol, last, enabled) {
+  const sideText = sideLabel(side).toUpperCase();
+  const title = `${sideText} · ${symbol} @ ${last}`;
+  const dashCount = Math.max(4, BOX_WIDTH - title.length - 5);
+  return [
+    color("┌─ ", "dim", enabled),
+    style(sideText, ["bold", sideTone(side)], enabled),
+    style(` · ${symbol} @ ${last}`, ["bold", "white"], enabled),
+    color(` ${"─".repeat(dashCount)}┐`, "dim", enabled),
+  ].join("");
+}
+
+function sectionBottom(enabled, width = BOX_WIDTH) {
   return color(`└${"─".repeat(width - 2)}┘`, "dim", enabled);
 }
 
-function metricLine(label, value, tone, enabled) {
-  return `  ${label.padEnd(26)}${color(value, tone, enabled)}`;
+function metricLine(label, value, tone, enabled, labelWidth = 26) {
+  return `  ${label.padEnd(labelWidth)}${color(value, tone, enabled)}`;
 }
 
 function normalizedRate(value) {
@@ -201,7 +232,7 @@ function rateLabel(value) {
 
 function rateTone(value) {
   const rate = normalizedRate(value);
-  return rate === null ? "dim" : rate >= 0.5 ? "green" : "orange";
+  return rate === null ? "dim" : rate >= 0.5 ? "green" : "red";
 }
 
 function bps(value) {
@@ -212,7 +243,7 @@ function bps(value) {
 
 function outcomeTone(value) {
   const number = finite(value);
-  return number === null || number === 0 ? "dim" : number > 0 ? "green" : "orange";
+  return number === null || number === 0 ? "dim" : number > 0 ? "green" : "red";
 }
 
 function coverageWindow(response, match) {
@@ -275,28 +306,292 @@ function ratioLabel(value) {
   return number === null ? null : `${number.toFixed(2)}x`;
 }
 
+function horizonLabel(horizon) {
+  return `${horizon} Minutes`;
+}
+
 function setupLine(label, value, tone, enabled) {
-  const innerWidth = 54;
+  const innerWidth = BOX_WIDTH - 4;
   const labelWidth = 21;
   const valueText = String(value ?? "—").slice(0, innerWidth - labelWidth);
   return `  ${label.padEnd(labelWidth)}${color(valueText, tone, enabled)}`;
 }
 
-function outcomeRow(label, values, enabled, align = "right") {
+function outcomeRow(label, values, enabled) {
   const labelWidth = 19;
-  const cellWidth = 13;
+  const cellWidth = 14;
   const cells = values.map(({ value, tone }) => {
     const text = String(value);
-    const contentWidth = cellWidth - 1;
-    const padding = Math.max(0, contentWidth - text.length);
-    const left = align === "center" ? Math.floor(padding / 2) : align === "left" ? 0 : padding;
-    const right = padding - left + 1;
-    return `│${" ".repeat(left)}${color(text, tone, enabled)}${" ".repeat(right)}`;
+    const padding = Math.max(0, cellWidth - text.length);
+    return `${" ".repeat(padding)}${color(text, tone, enabled)}`;
   }).join("");
-  return `  ${label.padEnd(labelWidth)}${cells}│`;
+  return `  ${label.padEnd(labelWidth)}${cells}  `;
+}
+
+function compactMetricLine(label, value, tone, enabled) {
+  return `  ${label}: ${color(String(value ?? "—"), tone, enabled)}`;
+}
+
+function compactOutcomeLine(row, enabled) {
+  const returnValue = row.mean === null ? "—" : pct(row.mean, 2, false);
+  const winValue = rateLabel(row.winRate);
+  const liftValue = bps(row.liftBps).replace(/ bps$/, "");
+  return `  ${horizonLabel(row.horizon)}  ${color(`${returnValue} return · ${winValue} win · ${liftValue} bps`, outcomeTone(row.mean), enabled)}`;
+}
+
+const STRATEGY_MIX_SLOTS = 20;
+
+function strategyMixWidths(counts, total, slots = STRATEGY_MIX_SLOTS) {
+  if (total <= 0) return [0, 0, 0, 0];
+  const segments = [
+    counts.buy,
+    counts.neutral,
+    counts.sell,
+    counts.warming,
+  ];
+  const widths = segments.map((count) => count > 0 ? Math.max(1, Math.round((count / total) * slots)) : 0);
+  let occupied = widths.reduce((sum, value) => sum + value, 0);
+  while (occupied > slots) {
+    const index = widths.reduce((best, value, position) => {
+      if (value <= 1) return best;
+      return best === -1 || value > widths[best] || (value === widths[best] && segments[position] > segments[best]) ? position : best;
+    }, -1);
+    if (index < 0) break;
+    widths[index] -= 1;
+    occupied -= 1;
+  }
+  while (occupied < slots) {
+    const index = segments.reduce((best, count, position) => count > segments[best] ? position : best, 0);
+    widths[index] += 1;
+    occupied += 1;
+  }
+  return widths;
+}
+
+function strategyMixLines(counts, total, enabled) {
+  if (total <= 0) return [color("—", "dim", enabled)];
+  const widths = strategyMixWidths(counts, total);
+  const slots = [
+    { count: counts.buy, label: `Buy ${countLabel(counts.buy)}`, tone: "green" },
+    { count: counts.neutral, label: `Neutral ${countLabel(counts.neutral)}`, tone: "neutral" },
+    { count: counts.sell, label: `Sell ${countLabel(counts.sell)}`, tone: "red" },
+    { count: counts.warming, label: `Warming ${countLabel(counts.warming)}`, tone: "yellow" },
+  ];
+  const cells = slots.flatMap((segment, index) => Array.from({ length: widths[index] }, () => color("■", segment.tone, enabled)));
+  const labelWidth = slots.length === 4 && counts.warming > 0 ? 52 : 39;
+  const columnWidth = labelWidth / (counts.warming > 0 ? 4 : 3);
+  const visibleSlots = counts.warming > 0 ? slots : slots.slice(0, 3);
+  const buyLabel = visibleSlots[0].label.padEnd(columnWidth);
+  const neutralLabel = visibleSlots[1].label.padStart(Math.floor((columnWidth + visibleSlots[1].label.length) / 2)).padEnd(columnWidth);
+  const sellLabel = visibleSlots[2].label.padStart(columnWidth);
+  const labels = [buyLabel, neutralLabel, sellLabel];
+  if (counts.warming > 0) labels.push(visibleSlots[3].label.padStart(columnWidth));
+  return [cells.join(" "), labels.map((label, index) => color(label, visibleSlots[index].tone, enabled)).join("")];
+}
+
+const GRID_LEFT_WIDTH = 32;
+const GRID_TOTAL_WIDTH = 58;
+
+function gridColumns(left, right, colorEnabled) {
+  const leftText = left?.text ?? "";
+  const rightText = right?.text ?? "";
+  const leftCell = leftText
+    ? color(leftText.padEnd(GRID_LEFT_WIDTH), left.tone ?? "white", colorEnabled)
+    : " ".repeat(GRID_LEFT_WIDTH);
+  const rightCell = rightText
+    ? right.tone
+      ? color(rightText, right.tone, colorEnabled)
+      : rightText
+    : "";
+  return `${leftCell}${rightCell}`;
+}
+
+function gridFrameParts(value) {
+  if (typeof value !== "string") return { date: "—", time: "" };
+  const date = new Date(value);
+  if (Number.isNaN(date.valueOf())) return { date: value, time: "" };
+  return {
+    date: new Intl.DateTimeFormat("en-US", {
+      month: "short",
+      day: "numeric",
+      year: "numeric",
+      timeZone: "America/New_York",
+    }).format(date),
+    time: `${new Intl.DateTimeFormat("en-US", {
+      hour: "numeric",
+      minute: "2-digit",
+      timeZone: "America/New_York",
+    }).format(date)} ET`,
+  };
+}
+
+function gridMatchColumns(match, colorEnabled) {
+  const tier = matchTier(match);
+  const label = tier.score === 5 ? "Exact" : tier.score > 0 ? "Limited" : "No match";
+  const rowCount = countLabel(record(match).row_count);
+  const countLabelText = tier.score === 5 ? "exact observations" : "comparable observations";
+  const cells = Array.from({ length: 5 }, (_, index) => color(
+    index < tier.score ? "■" : "□",
+    index < tier.score ? "green" : "neutral",
+    colorEnabled,
+  )).join("");
+  return {
+    label: `${cells} ${label}`,
+    comparable: `${rowCount} ${countLabelText}`,
+  };
+}
+
+function gridHeading(label, value, enabled) {
+  const gap = Math.max(1, GRID_TOTAL_WIDTH - label.length - value.length);
+  return color(`${label}${" ".repeat(gap)}${value}`, "white", enabled);
+}
+
+function gridOutcomeLines(outcomeRows, colorEnabled) {
+  const cellWidth = 12;
+  const row = (label, values, tones) => [
+    `  ${label.padEnd(16)}`,
+    ...values.map((value, index) => color(String(value).padStart(cellWidth), tones[index], colorEnabled)),
+  ].join(" ");
+  return [
+    color("OUTCOME LADDER", "white", colorEnabled),
+    row("Timeframe", outcomeRows.map((outcome) => horizonLabel(outcome.horizon)), ["white", "white", "white"]),
+    row("Avg. Return", outcomeRows.map((outcome) => outcome.mean === null ? "—" : pct(outcome.mean, 2, false)), outcomeRows.map((outcome) => outcomeTone(outcome.mean))),
+    row("Win Rate", outcomeRows.map((outcome) => rateLabel(outcome.winRate)), outcomeRows.map((outcome) => rateTone(outcome.winRate))),
+    row("Lift (BPS)", outcomeRows.map((outcome) => outcome.liftBps === null ? "—" : bps(outcome.liftBps).replace(/ bps$/, "")), outcomeRows.map((outcome) => outcomeTone(outcome.liftBps))),
+  ];
+}
+
+export function buildEvaluationViewModel(response) {
+  const request = record(response.request);
+  const frame = record(response.current_market_frame);
+  const symbol = typeof request.symbol === "string" ? request.symbol : typeof frame.symbol === "string" ? frame.symbol : "—";
+  const requestedSide = typeof request.side === "string" ? request.side : null;
+  const strategy = strategyCounts(response, requestedSide);
+  const strategyTotal = Object.values(strategy.counts).reduce((total, value) => total + value, 0);
+  const match = record(bestMemoryMatch(response));
+  const tier = matchTier(match);
+  const frameParts = gridFrameParts(frame.source_time);
+  const outcomes = [15, 30, 60].map((horizon) => {
+    const outcome = record(outcomeFor(response, horizon));
+    return {
+      horizon,
+      mean: finite(outcome.mean_return_pct ?? outcome.average_return_pct),
+      winRate: finite(outcome.win_rate),
+      liftBps: finite(outcome.lift_vs_baseline_bps),
+      };
+  });
+  const frameContext = record(frame.market_context);
+  const benchmark = record(frame.benchmark);
+  const benchmarkContext = record(benchmark.market_context);
+  const setupContext = activeContext(response, requestedSide);
+  const marketSources = [frameContext, setupContext, frame];
+  const benchmarkSources = [benchmarkContext, benchmark];
+  const marketSetup = {
+    sessionReturnPct: finite(firstValue(marketSources, ["session_return_pct", "sessionReturnPct"])),
+    volumeRatio: finite(firstValue(marketSources, ["volume_ratio", "volumeRatio"])),
+    vwapDistancePct: finite(firstValue(marketSources, ["vwap_distance_pct", "vwapDistancePct"])),
+    atrPct: finite(firstValue(marketSources, ["atr_pct", "atrPct"])),
+  };
+  const marketOverview = {
+    symbol: typeof benchmark.symbol === "string" ? benchmark.symbol : "SPY",
+    sessionReturnPct: finite(firstValue(benchmarkSources, ["session_return_pct", "sessionReturnPct"])),
+    volumeRatio: finite(firstValue(benchmarkSources, ["volume_ratio", "volumeRatio"])),
+    vwapDistancePct: finite(firstValue(benchmarkSources, ["vwap_distance_pct", "vwapDistancePct"])),
+    atrPct: finite(firstValue(benchmarkSources, ["atr_pct", "atrPct"])),
+  };
+  const memory = memoryStatus(response);
+  return {
+    side: requestedSide,
+    symbol,
+    last: frame.quote?.last == null ? "—" : `$${Number(frame.quote.last).toFixed(2)}`,
+    frameDate: frameParts.date,
+    frameTime: frameParts.time,
+    frameSourceTime: typeof frame.source_time === "string" ? frame.source_time : null,
+    marketSessionStatus: frame.market_session_status === "open" || frame.market_session_status === "closed"
+      ? frame.market_session_status
+      : null,
+    status: memory.status,
+    statusReason: memory.reason,
+    match: {
+      score: tier.score,
+      label: tier.score === 5 ? "Exact" : tier.score > 0 ? "Limited" : "No match",
+      rowCount: countLabel(record(match).row_count),
+      basis: tier.basis,
+    },
+    strategy: {
+      counts: strategy.counts,
+      total: strategyTotal,
+      widths: strategyMixWidths(strategy.counts, strategyTotal),
+      states: strategy.states,
+    },
+    outcomes,
+    marketSetup,
+    marketOverview,
+    archiveWindow: coverageWindow(response, match),
+  };
+}
+
+function formatGridEvaluation(response, { colorEnabled = true } = {}) {
+  const request = record(response.request);
+  const frame = record(response.current_market_frame);
+  const symbol = typeof request.symbol === "string" ? request.symbol : typeof frame.symbol === "string" ? frame.symbol : "—";
+  const requestedSide = typeof request.side === "string" ? request.side : null;
+  const counts = strategyCounts(response, requestedSide).counts;
+  const strategyTotal = Object.values(counts).reduce((total, value) => total + value, 0);
+  const match = record(bestMemoryMatch(response));
+  const last = frame.quote?.last == null ? "—" : `$${Number(frame.quote.last).toFixed(2)}`;
+  const outcomes = [15, 30, 60].map((horizon) => {
+    const outcome = record(outcomeFor(response, horizon));
+    return {
+      horizon,
+      mean: finite(outcome.mean_return_pct ?? outcome.average_return_pct),
+      winRate: finite(outcome.win_rate),
+      liftBps: finite(outcome.lift_vs_baseline_bps),
+    };
+  });
+  const frameParts = gridFrameParts(frame.source_time);
+  const sideText = sideLabel(requestedSide).toUpperCase();
+  const matchColumns = gridMatchColumns(match, colorEnabled);
+  const topLines = [
+    gridColumns(
+      { text: `${sideText} EVIDENCE`, tone: sideTone(requestedSide) },
+      { text: "MATCH STRENGTH", tone: "white" },
+      colorEnabled,
+    ),
+    gridColumns(
+      { text: `${symbol} @ ${last}`, tone: "bold" },
+      { text: matchColumns.label, tone: "white" },
+      colorEnabled,
+    ),
+    gridColumns(
+      { text: `${frameParts.date} ${frameParts.time}`.trim(), tone: "gray" },
+      { text: matchColumns.comparable, tone: "gray" },
+      colorEnabled,
+    ),
+  ];
+  const strategyLines = [
+    gridHeading("STRATEGY MIX", `${countLabel(strategyTotal)} EVALUATED`, colorEnabled),
+    ...strategyMixLines(counts, strategyTotal, colorEnabled),
+  ];
+  return [
+    ...topLines,
+    "",
+    ...strategyLines,
+    "",
+    ...gridOutcomeLines(outcomes, colorEnabled),
+    color(`  Archive Window ${coverageWindow(response, match)}`, "gray", colorEnabled),
+    "",
+    color("Leroy returns evidence; it does not make or submit trades.", "dim", colorEnabled),
+  ].join("\n");
 }
 
-export function formatEvaluation(response, { colorEnabled = true } = {}) {
+export function formatEvaluation(response, { colorEnabled = true, setup = false, verbose = false, compact = false, layout = "ledger" } = {}) {
+  if (layout === "grid") {
+    const { status } = memoryStatus(response);
+    return status === "artifact_unavailable"
+      ? color("Market Memory is temporarily unavailable. Try again shortly.", "dim", colorEnabled)
+      : formatGridEvaluation(response, { colorEnabled });
+  }
   const request = record(response.request);
   const frame = record(response.current_market_frame);
   const symbol = typeof request.symbol === "string" ? request.symbol : typeof frame.symbol === "string" ? frame.symbol : "—";
@@ -305,13 +600,14 @@ export function formatEvaluation(response, { colorEnabled = true } = {}) {
   const strategyTotal = Object.values(counts.counts).reduce((total, value) => total + value, 0);
   const match = record(bestMemoryMatch(response));
   const matchCounts = memoryMatchCounts(response);
-  const evaluations = historicalEvaluations(response);
   const { status } = memoryStatus(response);
-  const scope = evidenceScope(response);
+  if (status === "artifact_unavailable") {
+    return color("Market Memory is temporarily unavailable. Try again shortly.", "dim", colorEnabled);
+  }
   const resultHorizons = [15, 30, 60];
   const last = frame.quote?.last == null ? "—" : `$${Number(frame.quote.last).toFixed(2)}`;
   const timestamp = frameLabel(frame.source_time);
-  const statusTone = status === "historical_match" ? "green" : status === "artifact_unavailable" ? "orange" : "dim";
+  const statusTone = status === "historical_match" ? "green" : status === "artifact_unavailable" ? "red" : "dim";
   const outcomeRows = resultHorizons.map((resultHorizon) => {
     const outcome = record(outcomeFor(response, resultHorizon));
     const available = finite(outcome.sample_size) !== null && finite(outcome.sample_size) > 0;
@@ -326,6 +622,7 @@ export function formatEvaluation(response, { colorEnabled = true } = {}) {
   const marketContext = record(frame.market_context);
   const setupContext = activeContext(response, requestedSide);
   const marketSources = [marketContext, setupContext, frame];
+  const lookupMs = lookupMilliseconds(response);
   const marketRows = [
     {
       label: "Benchmark",
@@ -365,41 +662,76 @@ export function formatEvaluation(response, { colorEnabled = true } = {}) {
     },
   ].filter((row) => row.raw !== null && row.display !== null);
   const tickerSetup = [
-    sectionRule(`${symbol} Setup`, colorEnabled),
-    setupLine("Price", last, "bold", colorEnabled),
+    tickerRule(requestedSide, symbol, last, colorEnabled),
     setupLine("Frame", timestamp, "dim", colorEnabled),
-    setupLine("Side", requestedSide ? sideLabel(requestedSide) : "—", "bold", colorEnabled),
-    setupLine("Buy Signals", countLabel(counts.counts.buy), counts.counts.buy ? "green" : "dim", colorEnabled),
-    setupLine("Neutral Signals", countLabel(counts.counts.neutral), "dim", colorEnabled),
-    setupLine("Sell Signals", countLabel(counts.counts.sell), counts.counts.sell ? "orange" : "dim", colorEnabled),
-    ...(counts.counts.warming ? [setupLine("Warming Signals", countLabel(counts.counts.warming), "yellow", colorEnabled)] : []),
-    setupLine("Strategies Evaluated", countLabel(strategyTotal), "bold", colorEnabled),
+    setupLine("Lookup Time", lookupMs === null ? "—" : `${Math.round(lookupMs)}ms`, "dim", colorEnabled),
+    sectionBottom(colorEnabled),
+  ];
+  const strategyScorecard = [
+    sectionRule(`Strategy Mix · ${countLabel(strategyTotal)} Evaluated`, colorEnabled),
+    ...strategyMixLines(counts.counts, strategyTotal, colorEnabled),
     sectionBottom(colorEnabled),
   ];
   const outcomeGrid = [
-    sectionRule("Outcome Field", colorEnabled, 64),
-    outcomeRow("Metric", outcomeRows.map((row) => ({ value: `${row.horizon}m`, tone: "dim" })), colorEnabled, "center"),
+    sectionRule("Outcome", colorEnabled),
+    outcomeRow("Timeframe", outcomeRows.map((row) => ({ value: horizonLabel(row.horizon), tone: "white" })), colorEnabled),
     outcomeRow("Avg. Return", outcomeRows.map((row) => ({ value: row.mean === null ? "—" : pct(row.mean, 2, false), tone: outcomeTone(row.mean) })), colorEnabled),
     outcomeRow("Win Rate", outcomeRows.map((row) => ({ value: rateLabel(row.winRate), tone: rateTone(row.winRate) })), colorEnabled),
-    outcomeRow("Lift vs. Baseline", outcomeRows.map((row) => ({ value: bps(row.liftBps), tone: outcomeTone(row.liftBps) })), colorEnabled),
-    sectionBottom(colorEnabled, 64),
+    outcomeRow("Lift (bps)", outcomeRows.map((row) => ({ value: bps(row.liftBps).replace(/ bps$/, ""), tone: outcomeTone(row.liftBps) })), colorEnabled),
+    sectionBottom(colorEnabled),
   ];
   const unavailableLines = outcomeRows
     .filter((row) => !row.available)
-    .map((row) => `  ${row.horizon}m unavailable · ${unavailableReason(response)}`);
-  const lookupMs = lookupMilliseconds(response);
-  const evaluationLabel = `${countLabel(evaluations)}${lookupMs === null ? "" : ` · ${Math.round(lookupMs)}ms`}`;
+    .map((row) => `  ${horizonLabel(row.horizon)} unavailable · ${unavailableReason(response)}`);
+
+  if (compact) {
+    const sideText = sideLabel(requestedSide).toUpperCase();
+    const compactLines = [
+      [
+        color(sideText, ["bold", sideTone(requestedSide)], colorEnabled),
+        style(` · ${symbol} @ ${last}`, ["bold", "white"], colorEnabled),
+      ].join(""),
+      compactMetricLine("Frame", timestamp, "dim", colorEnabled),
+      compactMetricLine("Lookup Time", lookupMs === null ? "—" : `${Math.round(lookupMs)}ms`, "dim", colorEnabled),
+    ];
+
+    if (verbose) {
+      compactLines.push("", `Strategy Mix · ${countLabel(strategyTotal)} Evaluated`, ...strategyMixLines(counts.counts, strategyTotal, colorEnabled));
+    }
+    if (setup && marketRows.length) {
+      compactLines.push("", "Market Setup", ...marketRows.map((row) => compactMetricLine(row.label, row.display, row.tone, colorEnabled)));
+    }
+    compactLines.push(
+      "",
+      "Market Memory",
+      compactMetricLine("Status", memorySummary(status, matchCounts.tier), statusTone, colorEnabled),
+      compactMetricLine("Match Strength", `${matchCounts.tier.score}/5`, matchCounts.tier.score === 5 ? "green" : matchCounts.tier.score > 0 ? "yellow" : "dim", colorEnabled),
+      ...(matchCounts.tier.score === 5 ? [compactMetricLine("Exact Matches", countLabel(matchCounts.exact), "bold", colorEnabled)] : []),
+      ...(matchCounts.tier.score > 0 && matchCounts.tier.score < 5 ? [compactMetricLine("Comparable Matches", countLabel(matchCounts.comparable), "bold", colorEnabled)] : []),
+      ...(verbose && matchCounts.tier.basis ? [compactMetricLine("Match Basis", matchCounts.tier.basis, "dim", colorEnabled)] : []),
+      compactMetricLine("Window", coverageWindow(response, match), "dim", colorEnabled),
+      "",
+      "Outcome",
+      ...outcomeRows.map((row) => compactOutcomeLine(row, colorEnabled)),
+      ...unavailableLines,
+      "",
+      color("Leroy returns evidence; it does not make or submit trades.", "dim", colorEnabled),
+    );
+    return compactLines.join("\n");
+  }
+
   const lines = [
     ...tickerSetup,
-    ...(marketRows.length ? ["", sectionRule("Market Setup", colorEnabled), ...marketRows.map((row) => setupLine(row.label, row.display, row.tone, colorEnabled)), sectionBottom(colorEnabled)] : []),
+    ...(verbose ? ["", ...strategyScorecard] : []),
+    ...(setup && marketRows.length ? ["", sectionRule("Market Setup", colorEnabled), ...marketRows.map((row) => setupLine(row.label, row.display, row.tone, colorEnabled)), sectionBottom(colorEnabled)] : []),
     "",
     sectionRule("Market Memory", colorEnabled),
-    metricLine("Status", memorySummary(status, scope, matchCounts.exact), statusTone, colorEnabled),
-    metricLine("Exact Matches", countLabel(matchCounts.exact), "bold", colorEnabled),
-    metricLine("Comparable Matches", countLabel(matchCounts.comparable), "bold", colorEnabled),
-    metricLine("Baseline Observations", countLabel(matchCounts.baseline), "bold", colorEnabled),
-    metricLine("Historical Evaluations", evaluationLabel, "bold", colorEnabled),
-    metricLine("Window", coverageWindow(response, match), "dim", colorEnabled),
+    metricLine("Status", memorySummary(status, matchCounts.tier), statusTone, colorEnabled, 24),
+    metricLine("Match Strength", `${matchCounts.tier.score}/5`, matchCounts.tier.score === 5 ? "green" : matchCounts.tier.score > 0 ? "yellow" : "dim", colorEnabled, 24),
+    ...(matchCounts.tier.score === 5 ? [metricLine("Exact Matches", countLabel(matchCounts.exact), "bold", colorEnabled, 24)] : []),
+    ...(matchCounts.tier.score > 0 && matchCounts.tier.score < 5 ? [metricLine("Comparable Matches", countLabel(matchCounts.comparable), "bold", colorEnabled, 24)] : []),
+    ...(verbose && matchCounts.tier.basis ? [metricLine("Match Basis", matchCounts.tier.basis, "dim", colorEnabled, 24)] : []),
+    metricLine("Window", coverageWindow(response, match), "dim", colorEnabled, 24),
     sectionBottom(colorEnabled),
     "",
     ...outcomeGrid,
@@ -415,11 +747,18 @@ export function formatHelp() {
     "",
     "Usage:",
     "  leroy connect [--api-key lr_live_...]",
-    "  leroy ask buy|sell|both SYMBOL [--horizon 5|15|30|60]",
+    "  leroy evaluate SYMBOL [--side buy|sell|both] [--setup] [--verbose] [--demo] [--horizon 5|15|30|60]",
+    "  leroy watch SYMBOL [--side buy|sell|both] [--interval SECONDS] [--demo] [--horizon 5|15|30|60]",
+    "  Buy is the default side; use --side sell or --side both to override it.",
     "",
     "Examples:",
-    "  leroy ask buy ABNB",
-    "  leroy ask sell AAPL --horizon 30",
-    "  leroy ask buy ABNB --json",
+    "  leroy evaluate ABNB",
+    "  leroy evaluate ABNB --setup --verbose",
+    "  leroy evaluate AAPL --side sell --horizon 30",
+    "  leroy evaluate ABNB --json",
+    "  leroy evaluate ABNB --demo",
+    "  leroy watch ABNB",
+    "",
+    "Read the full CLI reference: https://getleroy.com/cli",
   ].join("\n");
 }