march-cli 0.1.12 → 0.1.13

package/src/cli/tui/selection-screen.mjs

@@ -9,30 +9,37 @@ export class ScreenSelection {
     this.active = false;
     this.anchor = null;
     this.focus = null;
-    this.lines = [];
-    this._plainLines = [];
+    this.regions = [];
+    this._plainLines = new Map();
     this.viewport = { topRow: 0, leftCol: 0, width: Infinity, height: 0 };
   }
 
   setLines(lines) {
-    this.lines = [...lines];
-    this._plainLines = [];
-    this.viewport = { topRow: 0, leftCol: 0, width: Infinity, height: this.lines.length };
+    this.setViewport({ topRow: 0, leftCol: 0, width: Infinity, lines });
   }
 
   setViewport({ topRow = 0, leftCol = 0, width = Infinity, lines = [] } = {}) {
-    this.lines = lines;
-    this._plainLines = [];
-    this.viewport = {
-      topRow: Math.max(0, Math.trunc(topRow)),
-      leftCol: Math.max(0, Math.trunc(leftCol)),
-      width: Number.isFinite(width) ? Math.max(1, Math.trunc(width)) : Infinity,
-      height: this.lines.length,
-    };
+    this.setRegions([{ id: "default", topRow, leftCol, width, lines }]);
+  }
+
+  setRegions(regions = []) {
+    let docRow = 0;
+    this.regions = regions
+      .map((region, index) => normalizeRegion(region, index))
+      .filter((region) => region.lines.length > 0)
+      .sort((a, b) => a.topRow - b.topRow || a.leftCol - b.leftCol)
+      .map((region) => {
+        const normalized = { ...region, docStart: docRow };
+        docRow += region.lines.length;
+        return normalized;
+      });
+    this.lines = this.regions.flatMap((region) => region.lines);
+    this._plainLines = new Map();
+    this.viewport = { topRow: 0, leftCol: 0, width: Infinity, height: this.lines.length };
   }
 
   start(point) {
-    const normalized = normalizePoint(point, this.viewport, true);
+    const normalized = normalizePoint(point, this.regions, true);
     if (!normalized) {
       this.clear();
       return false;
@@ -45,13 +52,13 @@ export class ScreenSelection {
 
   update(point) {
     if (!this.active || !this.anchor) return false;
-    this.focus = normalizePoint(point, this.viewport, true) ?? this.focus;
+    this.focus = normalizePoint(point, this.regions, true) ?? this.focus;
     return true;
   }
 
   finish(point, { clear = true } = {}) {
     if (!this.active || !this.anchor) return "";
-    this.focus = normalizePoint(point, this.viewport, true) ?? this.focus;
+    this.focus = normalizePoint(point, this.regions, true) ?? this.focus;
     const text = this.text();
     if (clear) this.clear();
     else this.active = false;
@@ -80,21 +87,27 @@ export class ScreenSelection {
   }
 
   apply(lines) {
+    return this.applyRegion("default", lines);
+  }
+
+  applyRegion(id, lines) {
     const range = this.range();
-    if (!range) return lines;
+    const region = this.regions.find((candidate) => candidate.id === id);
+    if (!range || !region) return lines;
     return lines.map((line, row) => {
-      if (row < range.start.row || row > range.end.row) return line;
-      const plain = this._plainLine(row);
-      const startCol = row === range.start.row ? range.start.col : 0;
-      const endCol = row === range.end.row ? range.end.col : visibleWidth(plain);
+      const docRow = region.docStart + row;
+      if (docRow < range.start.row || docRow > range.end.row) return line;
+      const plain = this._plainLine(docRow);
+      const startCol = docRow === range.start.row ? range.start.col : 0;
+      const endCol = docRow === range.end.row ? range.end.col : visibleWidth(plain);
       if (endCol <= startCol) return line;
       return highlightAnsiLine(line, startCol, endCol);
     });
   }
 
   _plainLine(row) {
-    if (this._plainLines[row] == null) this._plainLines[row] = stripAnsi(this.lines[row] ?? "");
-    return this._plainLines[row];
+    if (!this._plainLines.has(row)) this._plainLines.set(row, stripAnsi(this.lines[row] ?? ""));
+    return this._plainLines.get(row);
   }
 
   range() {
@@ -111,19 +124,55 @@ export function stripAnsi(text) {
   return String(text ?? "").replace(CONTROL_RE, "");
 }
 
-function normalizePoint({ row, col }, viewport, clamp) {
+function normalizeRegion(region, index) {
+  const lines = [...(region.lines ?? [])];
+  const width = Number.isFinite(region.width) ? Math.max(1, Math.trunc(region.width)) : Infinity;
+  return {
+    id: region.id ?? `region-${index}`,
+    lines,
+    topRow: Math.max(0, Math.trunc(region.topRow ?? 0)),
+    leftCol: Math.max(0, Math.trunc(region.leftCol ?? 0)),
+    width,
+  };
+}
+
+function normalizePoint({ row, col }, regions, clamp) {
   const screenRow = Math.trunc(row) - 1;
   const screenCol = Math.trunc(col) - 1;
-  const height = viewport?.height ?? 0;
-  if (height <= 0) return null;
-
-  let localRow = screenRow - (viewport?.topRow ?? 0);
-  let localCol = screenCol - (viewport?.leftCol ?? 0);
-  const maxCol = Number.isFinite(viewport?.width) ? viewport.width : Infinity;
-  if (!clamp && (localRow < 0 || localRow >= height || localCol < 0 || localCol > maxCol)) return null;
-  localRow = clampNumber(localRow, 0, height - 1);
-  localCol = clampNumber(localCol, 0, maxCol);
-  return { row: localRow, col: localCol };
+  if (regions.length === 0) return null;
+
+  for (const region of regions) {
+    const localRow = screenRow - region.topRow;
+    const localCol = screenCol - region.leftCol;
+    const maxCol = Number.isFinite(region.width) ? region.width : Infinity;
+    if (localRow >= 0 && localRow < region.lines.length) {
+      if (!clamp && (localCol < 0 || localCol > maxCol)) return null;
+      return {
+        row: region.docStart + localRow,
+        col: clampNumber(localCol, 0, maxCol),
+      };
+    }
+  }
+
+  if (!clamp) return null;
+  const first = regions[0];
+  const last = regions.at(-1);
+  if (screenRow < first.topRow) return { row: first.docStart, col: 0 };
+  if (screenRow > last.topRow + last.lines.length - 1) {
+    return { row: last.docStart + last.lines.length - 1, col: last.width };
+  }
+
+  let nearest = null;
+  for (const region of regions) {
+    const beforeDistance = Math.abs(screenRow - region.topRow);
+    const afterDistance = Math.abs(screenRow - (region.topRow + region.lines.length - 1));
+    const before = { row: region.docStart, col: 0, distance: beforeDistance };
+    const after = { row: region.docStart + region.lines.length - 1, col: region.width, distance: afterDistance };
+    for (const candidate of [before, after]) {
+      if (!nearest || candidate.distance < nearest.distance) nearest = candidate;
+    }
+  }
+  return nearest ? { row: nearest.row, col: nearest.col } : null;
 }
 
 function comparePoints(a, b) {

package/src/cli/tui/status/status-bar.mjs

@@ -1,12 +1,17 @@
 import { visibleWidth } from "@earendil-works/pi-tui";
-import { statusBar, R } from "../ui-theme.mjs";
+import { modeLabel, statusBar, R } from "../ui-theme.mjs";
 
 const ANSI_RE = /\x1b\[[0-?]*[ -/]*[@-~]/g;
 const DEFAULT_STATUS_TEXT = "March";
+const DEFAULT_HELP_TEXT = "/ commands · ? help";
+const INPUT_BG = "\x1b[48;2;32;34;38m";
+const INPUT_PROMPT = "▌";
 
 export class StatusBar {
-  constructor(text = DEFAULT_STATUS_TEXT) {
+  constructor(text = DEFAULT_STATUS_TEXT, { cwd = process.cwd(), helpText = DEFAULT_HELP_TEXT } = {}) {
     this.text = normalizeStatusText(text);
+    this.cwd = normalizeStatusText(cwd);
+    this.helpText = normalizeStatusText(helpText);
   }
 
   setText(text) {
@@ -16,22 +21,135 @@ export class StatusBar {
     return true;
   }
 
+  setCwd(cwd) {
+    const next = normalizeStatusText(cwd);
+    if (next === this.cwd) return false;
+    this.cwd = next;
+    return true;
+  }
+
   invalidate() {}
 
   render(width) {
+    return this.renderTop(width);
+  }
+
+  renderTop(width) {
     if (width <= 0) return [""];
-    const text = fitStatusText(this.text, width);
-    const padded = padToWidth(text, width);
-    // If text already has ANSI coloring, only apply background
-    if (hasAnsi(padded)) {
-      return [statusBar.background(`${padded}${R}`)];
-    }
-    return [statusBar.background(statusBar.text(padded))];
+    const { left, innerWidth, right } = insetForWidth(width);
+    const parts = statusParts(this.text);
+    const cwdName = currentDirectoryName(this.cwd);
+    const lsp = formatLspStatus(parts.lsp);
+    const leftText = [cwdName, lsp, parts.context].filter(Boolean).join(" • ");
+    const line = composeMetaLine({ left: leftText, right: "", width: innerWidth });
+    return [`${left}${line}${right}`, ""];
+  }
+
+  renderInputLines(lines, width) {
+    if (width <= 0) return [""];
+    const { left, innerWidth, right } = insetForWidth(width);
+    const contentLines = lines.filter((line) => !isEditorChromeLine(line));
+    const visibleLines = contentLines.length > 0 ? contentLines : [""];
+    const paintWidth = inputPaintWidth(innerWidth);
+    const inputPadding = `${left}${renderInputPaddingLine(paintWidth)}${right}`;
+    const inputContent = visibleLines.map((line, index) =>
+      `${left}${this.renderInputLine(line, innerWidth, { isFirst: index === 0 })}${right}`,
+    );
+    return [inputPadding, ...inputContent, inputPadding];
+  }
+
+  renderInputLine(line, width, { isFirst = true } = {}) {
+    if (width <= 0) return "";
+    const paintWidth = inputPaintWidth(width);
+    const prompt = isFirst ? statusBar.prompt(INPUT_PROMPT) : "  ";
+    const promptWidth = visibleWidth(stripAnsi(INPUT_PROMPT));
+    const maxContentWidth = Math.max(0, paintWidth - promptWidth - 2);
+    const content = clipToWidth(line, maxContentWidth);
+    return applyInputBackground(padToWidth(`${prompt}${content}`, paintWidth));
   }
+
+  renderBottom(width) {
+    if (width <= 0) return [""];
+    const { left: insetLeft, innerWidth, right: insetRight } = insetForWidth(width);
+    const parts = statusParts(this.text);
+    const mode = formatModeLabel(parts.mode || DEFAULT_STATUS_TEXT);
+    const activity = parts.activity ? statusBar.muted(`${parts.activity} · `) : "";
+    const right = [parts.model, parts.thinking].filter(Boolean).join(" • ");
+    const line = composeMetaLine({ left: `${activity}${mode}`, right, width: innerWidth, muteLeft: false });
+    return ["", `${insetLeft}${line}${insetRight}`];
+  }
+}
+
+function insetForWidth(width) {
+  const safeWidth = Math.max(1, Math.trunc(width));
+  return { left: "", innerWidth: safeWidth, right: "" };
 }
 
-function hasAnsi(text) {
-  return ANSI_RE.test(text);
+function composeMetaLine({ left, right, width, muteLeft = true }) {
+  const safeWidth = Math.max(1, Math.trunc(width));
+  const rightWidth = visibleWidth(stripAnsi(right));
+  const colorLeft = (text) => (muteLeft ? statusBar.muted(text) : text);
+  if (!right) return colorLeft(padToWidth(clipToWidth(left, safeWidth), safeWidth));
+  if (rightWidth >= safeWidth) return statusBar.muted(padToWidth(clipToWidth(right, safeWidth), safeWidth));
+
+  const maxLeftWidth = Math.max(0, safeWidth - rightWidth - 1);
+  const fittedLeft = maxLeftWidth > 0 ? clipToWidth(left, maxLeftWidth) : "";
+  const gap = Math.max(1, safeWidth - visibleWidth(stripAnsi(fittedLeft)) - rightWidth);
+  return `${colorLeft(fittedLeft)}${" ".repeat(gap)}${statusBar.muted(right)}${R}`;
+}
+
+function renderInputPaddingLine(width) {
+  return applyInputBackground(" ".repeat(Math.max(1, Math.trunc(width))));
+}
+
+function inputPaintWidth(width) {
+  const safeWidth = Math.max(1, Math.trunc(width));
+  return safeWidth > 1 ? safeWidth - 1 : safeWidth;
+}
+
+function applyInputBackground(line) {
+  return `${INPUT_BG}${String(line).replaceAll(R, `${R}${INPUT_BG}`)}${R}`;
+}
+
+function isEditorChromeLine(line) {
+  const plain = stripAnsi(line).trim();
+  return plain.length > 0 && (/^─+$/.test(plain) || /^─+\s[↑↓].*more\s─*$/.test(plain));
+}
+
+function currentDirectoryName(path) {
+  const normalized = normalizeStatusText(path);
+  const parts = normalized.split(/[\\/]+/).filter(Boolean);
+  return parts.at(-1) || normalized || DEFAULT_STATUS_TEXT;
+}
+
+function formatLspStatus(lsp) {
+  if (!lsp) return "LSP off";
+  const server = lsp.replace(/^lsp:/, "").replace(/[✓✗]$/u, "").trim();
+  return server ? `LSP [${server}]` : "LSP off";
+}
+
+function formatModeLabel(mode) {
+  const label = normalizeStatusText(mode);
+  const color = modeLabel[label.toLowerCase()] || modeLabel.fallback;
+  return color(label);
+}
+
+function statusParts(text) {
+  const segments = plainSegments(text);
+  const runtime = segments.find((segment) => segment.includes("·")) || "";
+  const [model = "", thinking = ""] = runtime.split("·").map((part) => part.trim());
+  const lsp = segments.find((segment) => segment.startsWith("lsp:")) || "";
+  const context = [...segments].reverse().find((segment) => /^\d+(?:\.\d+)?[KM]?$/.test(segment)) || "";
+  const activity = segments.find((segment) => /(?:Working|Aborted)$/.test(segment)) || "";
+  const mode = segments.find((segment) => segment && segment !== runtime && segment !== lsp && segment !== activity && segment !== context) || segments[0] || "";
+  return { mode, model, thinking, lsp, activity, context };
+}
+
+function plainSegments(text) {
+  return stripAnsi(normalizeStatusText(text))
+    .split(" | ")
+    .map((segment) => segment.trim())
+    .filter(Boolean);
 }
 
 export function normalizeStatusText(text) {
@@ -64,15 +182,15 @@ export function fitStatusText(text, width) {
 }
 
 export function clipToWidth(text, width) {
-  // For ANSI-containing text, build output character by character and measure plain width
   let output = "";
   let plainWidth = 0;
-  let inAnsi = false;
-  for (const ch of Array.from(String(text || ""))) {
-    if (ch === "\x1b") inAnsi = true;
-    if (inAnsi) {
-      output += ch;
-      if (/[@-~]/.test(ch)) inAnsi = false;
+  const chars = Array.from(String(text || ""));
+  for (let index = 0; index < chars.length; index += 1) {
+    const ch = chars[index];
+    if (ch === "\x1b") {
+      const { sequence, nextIndex } = readAnsiSequence(chars, index);
+      output += sequence;
+      index = nextIndex;
       continue;
     }
     const charWidth = visibleWidth(ch);
@@ -83,6 +201,24 @@ export function clipToWidth(text, width) {
   return output;
 }
 
+function readAnsiSequence(chars, startIndex) {
+  let sequence = chars[startIndex];
+  let index = startIndex;
+  const intro = chars[startIndex + 1];
+  if (!intro) return { sequence, nextIndex: index };
+  sequence += intro;
+  index += 1;
+  if (intro !== "[") return { sequence, nextIndex: index };
+
+  while (index + 1 < chars.length) {
+    index += 1;
+    const ch = chars[index];
+    sequence += ch;
+    if (/[\x40-\x7e]/.test(ch)) break;
+  }
+  return { sequence, nextIndex: index };
+}
+
 function stripAnsi(text) {
   return String(text ?? "").replace(ANSI_RE, "");
 }

package/src/cli/tui/tool-rendering.mjs

@@ -1,6 +1,9 @@
 import { extractToolOutput } from "../tool-output.mjs";
+import { formatToolStartLine, formatToolSuccessSummary } from "../../agent/tool-summary.mjs";
 import { dim, red } from "./ui-theme.mjs";
 
+export { formatToolStartLine, formatToolSuccessSummary } from "../../agent/tool-summary.mjs";
+
 const TOOL_BODY_LIMIT = 40;
 const TOOL_ERROR_LIMIT = 6;
 
@@ -44,58 +47,6 @@ export function writeToolEnd({
   return true;
 }
 
-export function formatToolStartLine(name, args = {}) {
-  if (name === "edit_file") {
-    const path = compactPath(args?.path ?? "");
-    const editCount = Array.isArray(args?.edits) ? args.edits.length : 0;
-    const mode = args?.mode ?? "patch";
-    const summary = mode === "patch" ? `${editCount} edit${editCount === 1 ? "" : "s"}` : mode;
-    return joinToolParts("◆", name, [path, summary]);
-  }
-  if (name === "command_exec") return joinToolParts("◆", name, [compactText(args?.command ?? "")]);
-  if (name === "terminal_send") return joinToolParts("◆", name, [args?.shell_id, formatTerminalSendAction(args)]);
-  if (name?.startsWith?.("terminal_")) return joinToolParts("◆", name, [args?.shell_id, formatTerminalDetails(args)]);
-  if (name === "external_web_search") return joinToolParts("◆", name, [quoteCompact(args?.query ?? "")]);
-  if (name === "web_fetch") return joinToolParts("◆", name, [compactText(args?.url ?? "")]);
-  if (name === "context_stats") return joinToolParts("◆", name, []);
-  if (name === "read") {
-    const path = compactPath(args?.path ?? args?.filePath ?? "");
-    return joinToolParts("→", name, [path, formatReadRange(args)]);
-  }
-  if (name === "grep") {
-    const path = compactPath(args?.path ?? "");
-    return joinToolParts("✱", name, [quoteCompact(args?.pattern ?? ""), path]);
-  }
-  if (name === "glob") {
-    const path = compactPath(args?.path ?? "");
-    return joinToolParts("✱", name, [quoteCompact(args?.pattern ?? ""), path]);
-  }
-  if (name === "find") {
-    const path = compactPath(args?.path ?? "");
-    return joinToolParts("✱", name, [quoteCompact(args?.pattern ?? ""), path]);
-  }
-  return joinToolParts("◆", name, [formatSmallOptions(args)]);
-}
-
-export function formatToolSuccessSummary(name, result, out = "") {
-  if (name === "grep") {
-    const matches = result?.details?.results?.length ?? countMatchLines(out);
-    return `${matches} match${matches === 1 ? "" : "es"}`;
-  }
-  if (name === "glob") {
-    const matches = Array.isArray(result?.details?.matches) ? result.details.matches.length : countNonEmptyLines(out);
-    return `${matches} file${matches === 1 ? "" : "s"}`;
-  }
-  if (name === "find") {
-    const matches = result?.details?.count ?? countNonEmptyLines(out);
-    return `${matches} file${matches === 1 ? "" : "s"}`;
-  }
-  if (name === "memory_open") {
-    return compactText(result?.details?.entry?.name ?? compactPath(result?.details?.path ?? ""));
-  }
-  return "";
-}
-
 function formatToolEndCard({ name, isError, result, extractToolOutputImpl }) {
   const out = extractToolOutputImpl(result);
   if (isError) {
@@ -134,64 +85,3 @@ function writeStructuredLines(output, block) {
     for (const line of lines) output.writeln(line);
   }
 }
-
-function joinToolParts(icon, name, parts) {
-  const clean = parts.map((part) => String(part ?? "").trim()).filter(Boolean);
-  return `${icon} ${name}${clean.length ? ` · ${clean.join(" · ")}` : ""}`;
-}
-
-function formatReadRange(args = {}) {
-  if (args.offset == null && args.limit == null) return "";
-  if (args.offset != null && args.limit != null) return `lines ${args.offset}-${Number(args.offset) + Number(args.limit) - 1}`;
-  if (args.offset != null) return `from line ${args.offset}`;
-  return `limit ${args.limit}`;
-}
-
-function formatTerminalSendAction(args = {}) {
-  const hasText = typeof args.text === "string" && args.text.length > 0;
-  const key = args.key ? String(args.key) : "";
-  if (hasText && key) return `text+${key}`;
-  if (hasText) return args.text.includes("\n") || args.text.includes("\r") ? "text+enter" : "text";
-  return key || "send";
-}
-
-function formatTerminalDetails(args = {}) {
-  const details = [];
-  if (args.pattern) details.push(quoteCompact(args.pattern));
-  if (args.cols && args.rows) details.push(`${args.cols}x${args.rows}`);
-  if (args.command) details.push(compactText(args.command));
-  return details.join(" · ");
-}
-
-function formatSmallOptions(args = {}) {
-  const parts = [];
-  for (const [key, value] of Object.entries(args ?? {})) {
-    if (value == null || typeof value === "object") continue;
-    parts.push(`${key}=${compactText(value)}`);
-    if (parts.length >= 2) break;
-  }
-  return parts.join(", ");
-}
-
-function compactPath(path) {
-  return String(path ?? "").split(/[/\\]/).filter(Boolean).slice(-4).join("\\");
-}
-
-function quoteCompact(value) {
-  return JSON.stringify(compactText(value));
-}
-
-function compactText(value, limit = 80) {
-  const text = String(value ?? "").replace(/\s+/g, " ").trim();
-  return text.length > limit ? `${text.slice(0, limit - 1)}…` : text;
-}
-
-function countMatchLines(text) {
-  const match = String(text ?? "").match(/(\d+)\s+matches?\b/i);
-  if (match) return Number(match[1]);
-  return countNonEmptyLines(text);
-}
-
-function countNonEmptyLines(text) {
-  return String(text ?? "").split("\n").filter(Boolean).length;
-}

package/src/cli/tui/tui-handlers.mjs

@@ -56,7 +56,7 @@ export function wireTuiHandlers({
         ui.writeln(brightBlack(`● thinking: unchanged`));
         return;
       }
-      ui.writeln(brightBlack(`● thinking: ${runner.setThinkingLevel(item.level)}`));
+      ui.writeln(brightBlack(`● thinking: ${await runner.setThinkingLevel(item.level)}`));
       refreshStatusBar();
     } catch (err) {
       ui.writeln(`Error: ${err.message}`);

package/src/cli/tui/ui-theme.mjs

@@ -17,6 +17,7 @@ const brightRed = (s) => `\x1b[91m${s}${R}`;
 const brightGreen = (s) => `\x1b[92m${s}${R}`;
 const orange = (s) => `\x1b[38;2;245;167;66m${s}${R}`;
 const softGreen = (s) => `\x1b[38;2;127;216;143m${s}${R}`;
+const violet = (s) => `\x1b[38;2;232;91;226m${s}${R}`;
 
 // ── Formatters ───────────────────────────────────────────────────────
 const bold = (s) => `${B}${s}${R}`;
@@ -79,9 +80,16 @@ const message = {
 };
 
 const statusBar = {
-  background: bg256(236),
-  text: fg256(250),
-  accent: cyan,
+  muted: brightBlack,
+  cwd: (s) => `${D}\x1b[38;5;244m${s}${R}`,
+  prompt: fg256(250),
+  accent: violet,
+};
+
+const modeLabel = {
+  do: orange,
+  discuss: green,
+  fallback: orange,
 };
 
 const shell = {
@@ -105,7 +113,7 @@ const selectList = {
 
 // ── Editor theme (consumed by pi-tui Editor component) ──────────────
 const EDITOR_THEME = {
-  borderColor: border.default,
+  borderColor: fg256(238),
   selectList,
 };
 
@@ -127,7 +135,7 @@ export {
   R, B, D,
   black, red, green, yellow, blue, magenta, cyan, white,
   brightBlack, brightRed, brightGreen,
-  orange, softGreen,
+  orange, softGreen, violet,
   bold, dim, inverse,
   fg256, bg256,
   // Semantic
@@ -140,6 +148,7 @@ export {
   tool,
   message,
   statusBar,
+  modeLabel,
   shell,
   spinner,
   selectList,

package/src/cli/ui.mjs

@@ -41,7 +41,7 @@ export function createTuiUI({
   const tui = new TUI(terminal);
   const output = new OutputBuffer();
   const shellDrawer = new ShellDrawer({ shellRuntime });
-  const statusBar = new StatusBar();
+  const statusBar = new StatusBar(undefined, { cwd });
   const editor = new Editor(tui, EDITOR_THEME, { paddingX: 1 });
   const selection = new ScreenSelection();
   const mainPane = new MainPaneLayout({ output, statusBar, editor, terminal, selection });

package/src/context/engine.mjs

@@ -3,14 +3,14 @@ import { buildSessionIdentity } from "./session-status.mjs";
 import { buildSystemCore, resolveSystemCorePromptKey } from "./system-core.mjs";
 import { buildInjectionsLayer } from "./injections.mjs";
 import { buildProjectContext } from "./project-context.mjs";
-import { buildCenterMemory } from "./center-memory.mjs";
+import { buildProfileLayers } from "./profiles.mjs";
 import { formatRecallHints } from "../memory/markdown-store.mjs";
 
 export class ContextEngine {
-  constructor({ cwd, modelId, provider = "deepseek", thinkingLevel = "medium", namespace = "", memoryRoot = null, centerMemoryPath = null, shellRuntime = null, lspService = null, injections = [], maxTurns, trimBatch }) {
+  constructor({ cwd, modelId, provider = "deepseek", thinkingLevel = "medium", namespace = "", memoryRoot = null, profilePaths = null, shellRuntime = null, lspService = null, injections = [], maxTurns, trimBatch }) {
     this.cwd = cwd;
     this.memoryRoot = memoryRoot;
-    this.centerMemoryPath = centerMemoryPath;
+    this.profilePaths = profilePaths;
     this.modelId = modelId;
     this.provider = provider;
     this.thinkingLevel = thinkingLevel;
@@ -62,19 +62,19 @@ export class ContextEngine {
     const projectCtx = buildProjectContext(this.cwd);
     if (projectCtx) layers.push({ name: "project_context", text: projectCtx });
 
-    const centerMemory = buildCenterMemory(this.centerMemoryPath);
-    if (centerMemory) layers.push({ name: "center_memory", text: centerMemory });
+    layers.push(...buildProfileLayers(this.profilePaths));
 
     layers.push({ name: "recent_chat", text: this.#buildRecentChat() });
 
     return layers;
   }
 
-  recordTurn({ userMessage, assistantMessage, userRecallHints = [], assistantRecallHints = [] }) {
+  recordTurn({ userMessage, assistantMessage, assistantContext = "", userRecallHints = [], assistantRecallHints = [] }) {
     this.turns.push({
       index: this.turns.length + 1,
       userMessage,
       assistantMessage: assistantMessage ?? "",
+      assistantContext: assistantContext ?? "",
       userRecallHints,
       assistantRecallHints,
     });
@@ -167,9 +167,10 @@ export class ContextEngine {
         `[user]\n${String(turn.userMessage ?? "")}\n`;
       const userRecall = formatRecallHints("user", turn.userRecallHints ?? []);
       if (userRecall) block += `\n${userRecall}\n`;
-      block += `\n[March]\n`;
-      if (turn.assistantMessage) {
-        block += `\n${String(turn.assistantMessage ?? "")}\n`;
+      block += `\n[assistant]\n`;
+      const assistantText = turn.assistantContext || turn.assistantMessage;
+      if (assistantText) {
+        block += `\n${String(assistantText ?? "")}\n`;
       }
       const assistantRecall = formatRecallHints("assistant", turn.assistantRecallHints ?? []);
       if (assistantRecall) block += `\n${assistantRecall}\n`;