march-cli 0.1.11 → 0.1.13

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`;

package/src/context/profiles.mjs

@@ -0,0 +1,39 @@
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
+
+export function defaultProfilePaths() {
+  const root = join(homedir(), ".march", "memory", "profiles");
+  return {
+    agent: join(root, "agent.md"),
+    user: join(root, "user.md"),
+  };
+}
+
+export function ensureProfileFiles(paths = defaultProfilePaths()) {
+  for (const [kind, path] of Object.entries(paths)) {
+    if (!path || existsSync(path)) continue;
+    mkdirSync(dirname(path), { recursive: true });
+    writeFileSync(path, defaultProfileContent(kind), "utf8");
+  }
+}
+
+export function buildProfileLayers(paths) {
+  if (!paths) return [];
+  return [
+    buildProfileLayer("agent_profile", paths.agent),
+    buildProfileLayer("user_profile", paths.user),
+  ].filter(Boolean);
+}
+
+function buildProfileLayer(name, path) {
+  if (!path || !existsSync(path)) return null;
+  const content = readFileSync(path, "utf8").trimEnd();
+  if (!content.trim()) return null;
+  return { name, text: `[${name}]\n--- ${path} ---\n${content}` };
+}
+
+function defaultProfileContent(kind) {
+  const title = kind === "agent" ? "Agent Profile" : "User Profile";
+  return `# ${title}\n\n`;
+}

package/src/main.mjs

@@ -15,7 +15,7 @@ import { createStatusLineUpdater } from "./cli/status-line-updater.mjs";
 import { wireTuiHandlers } from "./cli/tui/tui-handlers.mjs";
 import { createMarchAuthStorage } from "./auth/storage.mjs";
 import { runLoginCommand } from "./auth/login-command.mjs";
-import { createRunner } from "./agent/runner.mjs";
+import { createRuntimeRunner } from "./cli/startup/create-runtime-runner.mjs";
 import { createCliShellRuntime } from "./shell/cli-runtime.mjs";
 import { MarkdownMemoryStore } from "./memory/markdown-store.mjs";
 import { createMarkdownMemoryTools } from "./memory/markdown-tools.mjs";
@@ -23,14 +23,13 @@ import { loadDotEnv } from "./config/dotenv.mjs";
 import { loadConfig } from "./config/loader.mjs";
 import { discoverProjectExtensionPaths } from "./extensions/discovery.mjs";
 import { loadProjectLifecycleHookManifests } from "./extensions/lifecycle-manifest.mjs";
-import { resolvePiSessionManager } from "./session/pi-manager.mjs";
 import { loadOrCreateProjectId, resumeStartupSession } from "./cli/startup/startup-session.mjs";
 import { formatStartupBanner } from "./cli/startup/startup-banner.mjs";
 import { initializeMcp } from "./mcp/index.mjs";
 import { createWebToolsFromConfig } from "./web/tools.mjs";
 import { createModelContextDumper } from "./debug/model-context-dumper.mjs";
 import { createLogger, installProcessLogHandlers } from "./debug/logger.mjs";
-import { defaultCenterMemoryPath } from "./context/center-memory.mjs";
+import { defaultProfilePaths, ensureProfileFiles } from "./context/profiles.mjs";
 import { runProviderConfigCommand } from "./provider/config-command.mjs";
 import { runWebSearchConfigCommand } from "./web/config-command.mjs";
 import { createDesktopTurnNotifier } from "./notification/desktop-notifier.mjs";
@@ -49,6 +48,7 @@ export async function run(argv) {
   }
 
   const config = loadConfig(cwd);
+  const useRuntimeProcess = process.env.MARCH_RUNTIME_PROCESS !== "0";
   installNetworkEnvironment(config.network);
   if (args.command?.name === "login") {
     try {
@@ -103,14 +103,16 @@ export async function run(argv) {
   const modeState = createModeState();
   const namespace = loadOrCreateProjectId(projectMarchDir);
   const memoryRoot = resolveMemoryRoot(config.memoryRoot, stateRoot);
-  const centerMemoryPath = defaultCenterMemoryPath();
+  const profilePaths = defaultProfilePaths();
+  ensureProfileFiles(profilePaths);
   const memoryStore = new MarkdownMemoryStore({ root: memoryRoot });
   const memoryTools = createMarkdownMemoryTools(memoryStore);
   const currentProject = basename(cwd);
   const shellRuntime = args.shellRuntime ? createCliShellRuntime({ cwd }) : null;
 
-  // MCP: connect to configured MCP servers
-  const mcpInit = await initializeMcp({ projectDir: cwd });
+  const mcpInit = useRuntimeProcess
+    ? { clientManager: null, mcpTools: [], mcpInjections: [], errors: [] }
+    : await initializeMcp({ projectDir: cwd });
   const { clientManager: mcpClientManager, mcpTools, mcpInjections } = mcpInit;
   for (const { server, error } of mcpInit.errors) {
     if (args.json) {
@@ -159,17 +161,33 @@ export async function run(argv) {
   let turnRunning = false;
   let refreshStatusBar = null;
 
-  const runner = await createRunner({
+  const runnerOptions = {
     cwd,
     modelId: model,
     provider,
     serviceTier,
-
     providers: config.providers,
+    config,
     stateRoot,
-    ui,
     memoryRoot,
-    centerMemoryPath,
+    profilePaths,
+    namespace,
+    projectMarchDir,
+    extensionPaths,
+    permissionMode,
+    shellRuntime: Boolean(shellRuntime),
+    lifecycleHooks: lifecycleManifests.hooks,
+    lifecycleDiagnostics: lifecycleManifests.diagnostics,
+    modelContextDumper: {
+      enabled: args.dumpContext,
+      rootDir: contextDumpRoot,
+    },
+  };
+
+  const runner = await createRuntimeRunner({
+    useRuntimeProcess,
+    runnerOptions,
+    ui,
     memoryStore,
     memoryTools,
     shellRuntime,
@@ -177,29 +195,14 @@ export async function run(argv) {
     mcpInjections,
     mcpClientManager,
     webTools,
-    namespace,
-    projectMarchDir,
-    extensionPaths,
-    sessionManager: resolvePiSessionManager({
-      cwd,
-      projectMarchDir,
-      enabled: usePiSessions,
-    }),
-    useRuntimeHost: usePiRuntimeHost,
-    syncPiSidecar: usePiSessions || usePiRuntimeHost,
-    lifecycleHooks: lifecycleManifests.hooks,
-    lifecycleDiagnostics: lifecycleManifests.diagnostics,
+    usePiSessions,
+    usePiRuntimeHost,
     authStorage: authConfig.authStorage,
-    maxTurns: config.maxTurns ?? undefined,
-    trimBatch: config.trimBatch ?? undefined,
-    hostedTools: config.hostedTools,
     permissionController,
     modelContextDumper,
     turnNotifier,
     logger,
-    onModelPayload: ({ estimatedTokens }) => {
-      refreshStatusBar?.({ contextTokens: estimatedTokens });
-    },
+    refreshStatusBar: (...args) => refreshStatusBar?.(...args),
   });
 
   refreshStatusBar = createStatusLineUpdater({
@@ -209,7 +212,10 @@ export async function run(argv) {
     sessionSource,
     getMode: () => modeState.get(),
   });
-  refreshStatusBar();
+  const initialContextTokens = typeof runner.estimateContextTokens === "function"
+    ? await runner.estimateContextTokens("")
+    : null;
+  refreshStatusBar(initialContextTokens ? { contextTokens: initialContextTokens } : undefined);
 
   wireTuiHandlers({
     ui,

package/src/agent/find-tool.mjs

@@ -1,112 +0,0 @@
-import { readdirSync, statSync } from "node:fs";
-import { isAbsolute, relative, resolve } from "node:path";
-import { defineTool } from "@earendil-works/pi-coding-agent";
-import { Type } from "typebox";
-import { toolText } from "./tool-result.mjs";
-
-const DEFAULT_LIMIT = 1000;
-const DEFAULT_IGNORES = new Set([".git", "node_modules"]);
-
-export function createFindTool({ cwd }) {
-  return defineTool({
-    name: "find",
-    label: "Find Files",
-    description: "Find files by glob pattern. Pattern is matched relative to the search directory. Basename-only patterns like '*.mjs' search recursively, so find('*.mjs', path:'src') and find('src/**/*.mjs') both work.",
-    parameters: Type.Object({
-      pattern: Type.String({ description: "Glob pattern to match files, e.g. '*.mjs', '**/*.json', or 'src/**/*.test.mjs'" }),
-      path: Type.Optional(Type.String({ description: "Directory to search in (default: current directory)" })),
-      limit: Type.Optional(Type.Number({ description: "Maximum number of results (default 1000)" })),
-    }),
-    execute: async (_toolCallId, params) => executeFind({ cwd, ...params }),
-  });
-}
-
-export function executeFind({ cwd, pattern, path = ".", limit = DEFAULT_LIMIT }) {
-  const searchRoot = resolveSearchRoot(cwd, path);
-  const trimmedPattern = String(pattern ?? "").trim().replaceAll("\\", "/");
-  if (!trimmedPattern) return toolText("Error: pattern is required", { error: true });
-  const effectivePattern = normalizePattern(trimmedPattern);
-
-  const max = Math.max(1, Number(limit) || DEFAULT_LIMIT);
-  let files;
-  try {
-    files = listFiles(searchRoot);
-  } catch (err) {
-    return toolText(`Error: ${err.message}`, { error: true });
-  }
-
-  const matches = [];
-  for (const file of files) {
-    const rel = toPosix(relative(searchRoot, file));
-    if (!matchesGlob(effectivePattern, rel)) continue;
-    matches.push(rel);
-    if (matches.length >= max) break;
-  }
-
-  if (matches.length === 0) return toolText("No files found matching pattern", { pattern: trimmedPattern, effectivePattern, path: searchRoot, count: 0 });
-  const limitHint = matches.length >= max ? `\n\n[Results truncated to ${max}. Increase limit or refine pattern.]` : "";
-  return toolText(`${matches.join("\n")}${limitHint}`, {
-    pattern: trimmedPattern,
-    effectivePattern: effectivePattern === trimmedPattern ? undefined : effectivePattern,
-    path: searchRoot,
-    count: matches.length,
-    resultLimitReached: matches.length >= max ? max : undefined,
-  });
-}
-
-function normalizePattern(pattern) {
-  if (pattern.includes("/") || pattern.includes("**")) return pattern;
-  return `**/${pattern}`;
-}
-
-function resolveSearchRoot(cwd, path) {
-  const raw = String(path || ".");
-  return isAbsolute(raw) ? raw : resolve(cwd, raw);
-}
-
-function listFiles(root) {
-  const out = [];
-  walk(root, out);
-  return out.sort((a, b) => toPosix(a).localeCompare(toPosix(b)));
-}
-
-function walk(dir, out) {
-  for (const entry of readdirSync(dir, { withFileTypes: true })) {
-    if (entry.isDirectory() && DEFAULT_IGNORES.has(entry.name)) continue;
-    const path = resolve(dir, entry.name);
-    if (entry.isDirectory()) walk(path, out);
-    else if (entry.isFile()) out.push(path);
-  }
-}
-
-function matchesGlob(pattern, candidate) {
-  return matchSegments(splitGlob(pattern), splitGlob(candidate));
-}
-
-function matchSegments(patternSegments, candidateSegments) {
-  if (patternSegments.length === 0) return candidateSegments.length === 0;
-  const [head, ...tail] = patternSegments;
-  if (head === "**") {
-    if (matchSegments(tail, candidateSegments)) return true;
-    return candidateSegments.length > 0 && matchSegments(patternSegments, candidateSegments.slice(1));
-  }
-  if (candidateSegments.length === 0) return false;
-  return matchSegment(head, candidateSegments[0]) && matchSegments(tail, candidateSegments.slice(1));
-}
-
-function matchSegment(pattern, candidate) {
-  const regex = new RegExp(`^${escapeRegex(pattern).replaceAll("\\*", "[^/]*").replaceAll("\\?", "[^/]")}$`);
-  return regex.test(candidate);
-}
-
-function splitGlob(value) {
-  return String(value).split("/").filter(Boolean);
-}
-
-function toPosix(value) {
-  return String(value).replaceAll("\\", "/");
-}
-
-function escapeRegex(value) {
-  return String(value).replace(/[|\\{}()[\]^$+*?.]/g, "\\$&");
-}

package/src/context/center-memory.mjs

@@ -1,14 +0,0 @@
-import { existsSync, readFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
-
-export function defaultCenterMemoryPath() {
-  return join(homedir(), ".march", "memory", "center.md");
-}
-
-export function buildCenterMemory(path = defaultCenterMemoryPath()) {
-  if (!path || !existsSync(path)) return null;
-  const content = readFileSync(path, "utf8").trimEnd();
-  if (!content.trim()) return null;
-  return `[center_memory]\n--- ${path} ---\n${content}`;
-}