march-cli 0.1.34 → 0.1.35

package/src/cli/startup/app-runtime.mjs

@@ -0,0 +1,201 @@
+import { basename, join, resolve } from "node:path";
+import { existsSync, mkdirSync } from "node:fs";
+import { createUI } from "../ui.mjs";
+import { createPermissionController, MODE } from "../permissions.mjs";
+import { loadKeybindings } from "../input/keybindings.mjs";
+import { createInputHistoryStore } from "../input/history-store.mjs";
+import { createModeState } from "../input/mode-state.mjs";
+import { loadPromptTemplates } from "../input/prompt-templates.mjs";
+import { createStatusLineUpdater } from "../status-line-updater.mjs";
+import { wireTuiHandlers } from "../tui/tui-handlers.mjs";
+import { createMarchAuthStorage } from "../../auth/storage.mjs";
+import { createRuntimeRunner } from "./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";
+import { discoverProjectExtensionPaths } from "../../extensions/discovery.mjs";
+import { loadProjectLifecycleHookManifests } from "../../extensions/lifecycle-manifest.mjs";
+import { loadOrCreateProjectId, resumeStartupSession } from "./startup-session.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 { defaultProfilePaths, ensureProfileFiles } from "../../context/profiles.mjs";
+import { createDesktopTurnNotifier } from "../../notification/desktop-notifier.mjs";
+import { normalizeRemoteMemorySources } from "../../memory/remote/config.mjs";
+import { resolveMemoryRoot } from "../../memory/root.mjs";
+import { ensureBrowserDaemon } from "../../browser/client/lifecycle.mjs";
+
+export async function createCliAppRuntime({ args, config, cwd, argv, stateRoot, useRuntimeProcess } = {}) {
+  if (!existsSync(stateRoot)) mkdirSync(stateRoot, { recursive: true });
+  await ensureBrowserDaemon({ stateRoot }).catch(() => {});
+
+  const logger = createLogger({ logDir: join(stateRoot, "logs") });
+  installProcessLogHandlers(logger);
+  logger.event("process.start", {
+    cwd,
+    argv,
+    version: process.version,
+    platform: process.platform,
+    logPath: logger.path,
+  });
+
+  const provider = args.provider ?? config.provider ?? null;
+  const serviceTier = config.serviceTier ?? null;
+  const model = args.model ?? config.model ?? null;
+  const extensionPaths = [
+    ...discoverProjectExtensionPaths(cwd),
+    ...args.extensions.map((extensionPath) => resolve(cwd, extensionPath)),
+  ];
+  const lifecycleManifests = loadProjectLifecycleHookManifests(cwd);
+  const keybindingConfig = loadKeybindings(cwd);
+  const promptTemplateConfig = loadPromptTemplates(cwd);
+  const authConfig = createMarchAuthStorage({ provider: provider ?? "deepseek", providers: config.providers, cwd });
+
+  if (!authConfig.hasAuth) {
+    process.stderr.write("Error: no providers configured. Run: march provider --config\n");
+    return { ok: false, code: 1, logger };
+  }
+
+  const projectMarchDir = resolve(cwd, ".march");
+  if (!existsSync(projectMarchDir)) mkdirSync(projectMarchDir, { recursive: true });
+  const inputHistoryStore = createInputHistoryStore({ path: join(projectMarchDir, "input-history.json") });
+  const modeState = createModeState();
+  const namespace = loadOrCreateProjectId(projectMarchDir);
+  const memoryRoot = resolveMemoryRoot(config.memoryRoot, stateRoot);
+  const profilePaths = defaultProfilePaths();
+  ensureProfileFiles(profilePaths);
+  const memoryStore = new MarkdownMemoryStore({ root: memoryRoot });
+  const remoteMemorySources = normalizeRemoteMemorySources(config);
+  const memoryTools = createMarkdownMemoryTools(memoryStore, { remoteSources: remoteMemorySources });
+  const currentProject = basename(cwd);
+  const shellRuntime = args.shellRuntime ? createCliShellRuntime({ cwd }) : null;
+
+  const mcpInit = useRuntimeProcess
+    ? { clientManager: null, mcpTools: [], mcpInjections: [], errors: [] }
+    : await initializeMcp({ projectDir: cwd });
+  for (const { server, error } of mcpInit.errors) {
+    if (!args.json) process.stderr.write(`[mcp] ${server}: ${error}\n`);
+  }
+
+  const webTools = createWebToolsFromConfig(config);
+  const turnNotifier = createDesktopTurnNotifier({ enabled: Boolean(config.notifications?.turnEnd), config: config.notifications });
+  const permissionMode = args.permissionMode ?? MODE.BYPASS;
+  const permissionController = createPermissionController({ mode: permissionMode });
+  const usePiSessions = true;
+  const usePiRuntimeHost = true;
+  const sessionSource = "pi";
+  const sessionsRoot = join(projectMarchDir, "sessions");
+  const sessionState = {
+    sessionId: args.resume ?? Date.now().toString(36),
+    sessionDir: null,
+  };
+  sessionState.sessionDir = join(sessionsRoot, sessionState.sessionId);
+  const contextDumpRoot = resolve(projectMarchDir, "context-dumps", sessionState.sessionId);
+  const modelContextDumper = createModelContextDumper({
+    enabled: args.dumpContext,
+    rootDir: contextDumpRoot,
+  });
+
+  const ui = createUI({
+    json: args.json,
+    cwd,
+    keybindings: keybindingConfig.keybindings,
+    promptTemplates: promptTemplateConfig.templates,
+    shellRuntime,
+    historyStore: inputHistoryStore,
+  });
+
+  let turnRunning = false;
+  let refreshStatusBar = null;
+  const runnerOptions = {
+    cwd,
+    modelId: model,
+    provider,
+    serviceTier,
+    providers: config.providers,
+    config,
+    stateRoot,
+    memoryRoot,
+    profilePaths,
+    namespace,
+    projectMarchDir,
+    extensionPaths,
+    permissionMode,
+    shellRuntime: Boolean(shellRuntime),
+    lifecycleHooks: lifecycleManifests.hooks,
+    lifecycleDiagnostics: lifecycleManifests.diagnostics,
+    modelContextDumper: { enabled: args.dumpContext, rootDir: contextDumpRoot },
+    remoteMemorySources,
+  };
+
+  let runner;
+  try {
+    runner = await createRuntimeRunner({
+      useRuntimeProcess, runnerOptions, ui, memoryStore, memoryTools, shellRuntime,
+      mcpTools: mcpInit.mcpTools, mcpInjections: mcpInit.mcpInjections, mcpClientManager: mcpInit.clientManager, webTools,
+      usePiSessions, usePiRuntimeHost, authStorage: authConfig.authStorage,
+      permissionController, modelContextDumper, turnNotifier, logger,
+      refreshStatusBar: (...args) => refreshStatusBar?.(...args),
+    });
+  } catch (err) {
+    process.stderr.write(`Error: ${err.message}\n`);
+    logger.error("runtime.start_failed", { error: err });
+    memoryStore.close?.();
+    return { ok: false, code: 1, logger };
+  }
+
+  refreshStatusBar = createStatusLineUpdater({
+    ui,
+    runner,
+    sessionState,
+    sessionSource,
+    getMode: () => modeState.get(),
+  });
+  const initialContextTokens = typeof runner.estimateContextTokens === "function"
+    ? await runner.estimateContextTokens("")
+    : null;
+  refreshStatusBar(initialContextTokens ? { contextTokens: initialContextTokens } : undefined);
+
+  wireTuiHandlers({
+    ui,
+    runner,
+    sessionState,
+    projectMarchDir,
+    refreshStatusBar,
+    isTurnRunning: () => turnRunning,
+    modeState,
+  });
+
+  const startupResume = await resumeStartupSession({
+    resumeId: args.resume,
+    runner,
+    sessionState,
+    projectMarchDir,
+    ui,
+  });
+  refreshStatusBar();
+
+  return {
+    ok: true,
+    args,
+    cwd,
+    ui,
+    runner,
+    memoryStore,
+    currentProject,
+    sessionState,
+    sessionsRoot,
+    projectMarchDir,
+    sessionSource,
+    extensionPaths,
+    keybindingConfig,
+    promptTemplateConfig,
+    startupResume,
+    contextDumpRoot,
+    logger,
+    modeState,
+    refreshStatusBar,
+    setTurnRunning(value) { turnRunning = value; },
+  };
+}

package/src/cli/startup/configured-command.mjs

@@ -1,5 +1,6 @@
 import { runBrowserCommand } from "../../browser/cli/command.mjs";
 import { runGatewayCommand } from "../../gateway/command.mjs";
+import { runWebUiCommand } from "../../web-ui/command.mjs";
 
 export async function runConfiguredCliCommand(args, { config, cwd, stateRoot }) {
   if (args.command?.name === "browser") {
@@ -13,5 +14,13 @@ export async function runConfiguredCliCommand(args, { config, cwd, stateRoot })
   if (args.command?.name === "gateway" && args.command.args?.[0] !== "run") {
     return { handled: true, code: await runGatewayCommand(args, { config, cwd }) };
   }
+  if (args.command?.name === "web") {
+    try {
+      return { handled: true, code: await runWebUiCommand(args, { config, cwd, stateRoot }) };
+    } catch (err) {
+      process.stderr.write(`Error: ${err.message}\n`);
+      return { handled: true, code: 1 };
+    }
+  }
   return { handled: false, code: null };
 }

package/src/cli/startup/early-command.mjs

@@ -0,0 +1,29 @@
+import { homedir } from "node:os";
+import { runLoginCommand } from "../../auth/login-command.mjs";
+import { runProviderCommand } from "../../provider/command.mjs";
+import { runWebSearchConfigCommand } from "../../web/config-command.mjs";
+import { runMemoryCommand } from "../../memory/command.mjs";
+import { resolveMemoryRoot } from "../../memory/root.mjs";
+import { runConfiguredCliCommand } from "./configured-command.mjs";
+
+export async function runEarlyCliCommand(args, { config, cwd, stateRoot }) {
+  if (args.command?.name === "login") {
+    try {
+      return { handled: true, code: await runLoginCommand({ providerId: args.command.args[0] ?? args.provider }) };
+    } catch (err) {
+      process.stderr.write(`Error: ${err.message}\n`);
+      return { handled: true, code: 1 };
+    }
+  }
+  if (args.command?.name === "provider") return { handled: true, code: await runProviderCommand(args) };
+  if (args.command?.name === "websearch") {
+    if (args.providerConfig) return { handled: true, code: await runWebSearchConfigCommand({ homeDir: homedir() }) };
+    process.stderr.write("Usage: march websearch --config\n");
+    return { handled: true, code: 1 };
+  }
+  if (args.command?.name === "memory") {
+    args.memoryRoot = resolveMemoryRoot(config.memoryRoot, stateRoot);
+    return { handled: true, code: await runMemoryCommand(args, { homeDir: homedir() }) };
+  }
+  return await runConfiguredCliCommand(args, { config, cwd, stateRoot });
+}

package/src/cli/turn/turn-input-preparer.mjs

@@ -0,0 +1,41 @@
+import { appendModeReminder } from "../input/mode-state.mjs";
+import { inverse } from "../tui/ui-theme.mjs";
+import { formatRecallHints } from "../../memory/markdown-store.mjs";
+import { formatMessageAttachmentsForDisplay } from "../../session/attachment-display.mjs";
+import { formatShellHints } from "../../shell/hints.mjs";
+
+export function prepareTurnInput({ prompt, runner, memoryStore, currentProject, modeState = null }) {
+  memoryStore.beginTurn();
+  const engine = runner.engine ?? {};
+  const carryoverAlreadyRendered = engine.hasRenderedPendingAssistantRecallHints?.() ?? false;
+  const carryoverRecallHints = engine.takePendingAssistantRecallHints?.() ?? [];
+  const userRecallHints = memoryStore.recallForUser(prompt, {
+    currentProject,
+    excludedIds: engine.getRecentRecallMemoryIds?.() ?? [],
+  });
+  const modePrompt = appendModeReminder(prompt, modeState?.get?.());
+  const fullPrompt = appendPromptBlocks(
+    modePrompt,
+    formatRecallHints("user", userRecallHints),
+    formatRecallHints("assistant", carryoverRecallHints),
+    formatShellHints(runner.shellRuntime),
+  );
+
+  return {
+    fullPrompt,
+    userMessage: prompt,
+    runOptions: { userRecallHints, currentProject },
+    displayMessage: formatUserDisplayMessage(prompt),
+    userRecallHints,
+    carryoverRecallHints,
+    shouldRenderCarryoverRecall: carryoverRecallHints.length > 0 && !carryoverAlreadyRendered,
+  };
+}
+
+export function formatUserDisplayMessage(prompt) {
+  return `${inverse(" USER ")} ${formatMessageAttachmentsForDisplay(prompt)}`;
+}
+
+function appendPromptBlocks(prompt, ...blocks) {
+  return [prompt, ...blocks.filter(Boolean)].join("\n\n");
+}

package/src/main.mjs

@@ -1,46 +1,18 @@
 import { homedir } from "node:os";
-import { join, resolve, basename, relative } from "node:path";
-import { existsSync, mkdirSync } from "node:fs";
+import { join, relative } from "node:path";
 import { fileURLToPath } from "node:url";
 import { parseCliArgs, showHelp } from "./cli/args.mjs";
-import { createUI } from "./cli/ui.mjs";
-import { createPermissionController, MODE } from "./cli/permissions.mjs";
-import { loadKeybindings } from "./cli/input/keybindings.mjs";
-import { createInputHistoryStore } from "./cli/input/history-store.mjs";
-import { createModeState } from "./cli/input/mode-state.mjs";
-import { loadPromptTemplates } from "./cli/input/prompt-templates.mjs";
 import { runInteractiveRepl, runSingleShotPrompt } from "./cli/repl-loop.mjs";
 import { closeMarchRuntime } from "./cli/startup/runtime-close.mjs";
-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 { 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";
+import { createCliAppRuntime } from "./cli/startup/app-runtime.mjs";
+import { formatStartupBanner } from "./cli/startup/startup-banner.mjs";
 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 { 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 { defaultProfilePaths, ensureProfileFiles } from "./context/profiles.mjs";
-import { runProviderCommand } from "./provider/command.mjs";
-import { runWebSearchConfigCommand } from "./web/config-command.mjs";
-import { createDesktopTurnNotifier } from "./notification/desktop-notifier.mjs";
 import { registerSuperGrokOAuthProvider } from "./supergrok/oauth-provider.mjs";
 import { installNetworkEnvironment } from "./network/environment.mjs";
-import { runMemoryCommand } from "./memory/command.mjs";
-import { normalizeRemoteMemorySources } from "./memory/remote/config.mjs";
-import { resolveMemoryRoot } from "./memory/root.mjs";
-import { runConfiguredCliCommand } from "./cli/startup/configured-command.mjs";
+import { runEarlyCliCommand } from "./cli/startup/early-command.mjs";
 import { maybeRunGatewayDaemonCommand } from "./cli/startup/gateway-daemon-command.mjs";
-import { ensureBrowserDaemon } from "./browser/client/lifecycle.mjs";
+
 export async function run(argv) {
   const cwd = process.cwd();
   loadDotEnv(cwd);
@@ -56,239 +28,72 @@ export async function run(argv) {
   const stateRoot = join(homedir(), ".march");
   const useRuntimeProcess = process.env.MARCH_RUNTIME_PROCESS !== "0";
   installNetworkEnvironment(config.network);
-  if (args.command?.name === "login") {
-    try {
-      return await runLoginCommand({
-        providerId: args.command.args[0] ?? args.provider,
-      });
-    } catch (err) {
-      process.stderr.write(`Error: ${err.message}\n`);
-      return 1;
-    }
-  }
-  if (args.command?.name === "provider") {
-    return await runProviderCommand(args);
-  }
-  if (args.command?.name === "websearch") {
-    if (args.providerConfig) return await runWebSearchConfigCommand({ homeDir: homedir() });
-    process.stderr.write("Usage: march websearch --config\n");
-    return 1;
-  }
-  if (args.command?.name === "memory") {
-    args.memoryRoot = resolveMemoryRoot(config.memoryRoot, stateRoot);
-    return await runMemoryCommand(args, { homeDir: homedir() });
-  }
-  const configuredCommand = await runConfiguredCliCommand(args, { config, cwd, stateRoot });
-  if (configuredCommand.handled) return configuredCommand.code;
-  if (!existsSync(stateRoot)) mkdirSync(stateRoot, { recursive: true });
-  await ensureBrowserDaemon({ stateRoot }).catch(() => {});
-  const logger = createLogger({ logDir: join(stateRoot, "logs") });
-  installProcessLogHandlers(logger);
-  logger.event("process.start", {
-    cwd,
-    argv,
-    version: process.version,
-    platform: process.platform,
-    logPath: logger.path,
-  });
 
-  const provider = args.provider ?? config.provider ?? null;
-  const serviceTier = config.serviceTier ?? null;
-  const model = args.model ?? config.model ?? null;
-  const extensionPaths = [
-    ...discoverProjectExtensionPaths(cwd),
-    ...args.extensions.map((extensionPath) => resolve(cwd, extensionPath)),
-  ];
-  const lifecycleManifests = loadProjectLifecycleHookManifests(cwd);
-  const keybindingConfig = loadKeybindings(cwd);
-  const promptTemplateConfig = loadPromptTemplates(cwd);
-  const authConfig = createMarchAuthStorage({ provider: provider ?? "deepseek", providers: config.providers, cwd });
+  const earlyCommand = await runEarlyCliCommand(args, { config, cwd, stateRoot });
+  if (earlyCommand.handled) return earlyCommand.code;
 
-  if (!authConfig.hasAuth) {
-    process.stderr.write("Error: no providers configured. Run: march provider --config\n");
-    return 1;
-  }
-
-  const projectMarchDir = resolve(cwd, ".march");
-  if (!existsSync(projectMarchDir)) mkdirSync(projectMarchDir, { recursive: true });
-  const inputHistoryStore = createInputHistoryStore({ path: join(projectMarchDir, "input-history.json") });
-  const modeState = createModeState();
-  const namespace = loadOrCreateProjectId(projectMarchDir);
-  const memoryRoot = resolveMemoryRoot(config.memoryRoot, stateRoot);
-  const profilePaths = defaultProfilePaths();
-  ensureProfileFiles(profilePaths);
-  const memoryStore = new MarkdownMemoryStore({ root: memoryRoot });
-  const remoteMemorySources = normalizeRemoteMemorySources(config);
-  const memoryTools = createMarkdownMemoryTools(memoryStore, { remoteSources: remoteMemorySources });
-  const currentProject = basename(cwd);
-  const shellRuntime = args.shellRuntime ? createCliShellRuntime({ cwd }) : null;
+  const app = await createCliAppRuntime({ args, config, cwd, argv, stateRoot, useRuntimeProcess });
+  if (!app.ok) return app.code;
 
-  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) {
-      // errors will be surfaced in diagnostics via runner status
-    } else {
-      process.stderr.write(`[mcp] ${server}: ${error}\n`);
-    }
-  }
-
-  const webTools = createWebToolsFromConfig(config);
-  const turnNotifier = createDesktopTurnNotifier({ enabled: Boolean(config.notifications?.turnEnd), config: config.notifications });
-  const permissionMode = args.permissionMode ?? MODE.BYPASS;
-  const permissionController = createPermissionController({ mode: permissionMode });
-  const usePiSessions = true;
-  const usePiRuntimeHost = true;
-  const sessionSource = "pi";
-  const sessionsRoot = join(projectMarchDir, "sessions");
-  const sessionState = {
-    sessionId: args.resume ?? Date.now().toString(36),
-    sessionDir: null,
-  };
-  sessionState.sessionDir = join(sessionsRoot, sessionState.sessionId);
-  const contextDumpRoot = resolve(projectMarchDir, "context-dumps", sessionState.sessionId);
-  const modelContextDumper = createModelContextDumper({
-    enabled: args.dumpContext,
-    rootDir: contextDumpRoot,
-  });
-
-  const ui = createUI({
-    json: args.json,
-    cwd,
-    keybindings: keybindingConfig.keybindings,
-    promptTemplates: promptTemplateConfig.templates,
-    shellRuntime,
-    historyStore: inputHistoryStore,
-  });
-
-  // Esc to abort current turn
-  let turnRunning = false;
-  let refreshStatusBar = null;
-
-  const runnerOptions = {
-    cwd,
-    modelId: model,
-    provider,
-    serviceTier,
-    providers: config.providers,
+  const gatewayDaemonCommand = await maybeRunGatewayDaemonCommand(args, {
     config,
-    stateRoot,
-    memoryRoot,
-    profilePaths,
-    namespace,
-    projectMarchDir,
-    extensionPaths,
-    permissionMode,
-    shellRuntime: Boolean(shellRuntime),
-    lifecycleHooks: lifecycleManifests.hooks,
-    lifecycleDiagnostics: lifecycleManifests.diagnostics,
-    modelContextDumper: { enabled: args.dumpContext, rootDir: contextDumpRoot },
-    remoteMemorySources,
-  };
-  const runner = await createRuntimeRunner({
-    useRuntimeProcess,
-    runnerOptions,
-    ui,
-    memoryStore,
-    memoryTools,
-    shellRuntime,
-    mcpTools,
-    mcpInjections,
-    mcpClientManager,
-    webTools,
-    usePiSessions,
-    usePiRuntimeHost,
-    authStorage: authConfig.authStorage,
-    permissionController,
-    modelContextDumper,
-    turnNotifier,
-    logger,
-    refreshStatusBar: (...args) => refreshStatusBar?.(...args),
-  });
-
-  refreshStatusBar = createStatusLineUpdater({
-    ui,
-    runner,
-    sessionState,
-    sessionSource,
-    getMode: () => modeState.get(),
-  });
-  const initialContextTokens = typeof runner.estimateContextTokens === "function"
-    ? await runner.estimateContextTokens("")
-    : null;
-  refreshStatusBar(initialContextTokens ? { contextTokens: initialContextTokens } : undefined);
-
-  wireTuiHandlers({
-    ui,
-    runner,
-    sessionState,
-    projectMarchDir,
-    refreshStatusBar,
-    isTurnRunning: () => turnRunning,
-    modeState,
-  });
-
-  const startupResume = await resumeStartupSession({
-    resumeId: args.resume,
-    runner,
-    sessionState,
-    projectMarchDir,
-    ui,
+    cwd,
+    runner: app.runner,
+    currentProject: app.currentProject,
+    memoryStore: app.memoryStore,
+    ui: app.ui,
+    logger: app.logger,
   });
-  refreshStatusBar();
-  const gatewayDaemonCommand = await maybeRunGatewayDaemonCommand(args, { config, cwd, runner, currentProject, memoryStore, ui, logger });
   if (gatewayDaemonCommand.handled) return gatewayDaemonCommand.code;
 
   if (args.prompt) {
-    turnRunning = true;
+    app.setTurnRunning(true);
     try {
       await runSingleShotPrompt({
         prompt: args.prompt,
-        runner,
-        memoryStore,
-        currentProject,
-        ui,
-        sessionState,
-        refreshStatusBar,
-        modeState,
+        runner: app.runner,
+        memoryStore: app.memoryStore,
+        currentProject: app.currentProject,
+        ui: app.ui,
+        sessionState: app.sessionState,
+        refreshStatusBar: app.refreshStatusBar,
+        modeState: app.modeState,
       });
     } finally {
-      turnRunning = false;
-      await closeMarchRuntime({ runner, memoryStore, ui, logger, blankLine: true });
+      app.setTurnRunning(false);
+      await closeMarchRuntime({ runner: app.runner, memoryStore: app.memoryStore, ui: app.ui, logger: app.logger, blankLine: true });
     }
-    logger.event("process.exit", { code: 0 });
+    app.logger.event("process.exit", { code: 0 });
     return 0;
   }
 
-  const dumpContextPath = args.dumpContext ? relative(cwd, contextDumpRoot) : null;
-  if (startupResume.transcriptTurns?.length > 0) ui.restoreTranscript?.(startupResume.transcriptTurns);
-  for (const line of formatStartupBanner({ cwd, modelId: runner.engine.modelId, thinkingLevel: runner.engine.thinkingLevel, mode: modeState.get(), dumpContextPath })) ui.writeln(line);
+  const dumpContextPath = args.dumpContext ? relative(cwd, app.contextDumpRoot) : null;
+  if (app.startupResume.transcriptTurns?.length > 0) app.ui.restoreTranscript?.(app.startupResume.transcriptTurns);
+  for (const line of formatStartupBanner({ cwd, modelId: app.runner.engine.modelId, thinkingLevel: app.runner.engine.thinkingLevel, mode: app.modeState.get(), dumpContextPath })) app.ui.writeln(line);
   try {
     await runInteractiveRepl({
       cwd,
       args,
-      ui,
-      runner,
-      memoryStore,
-      currentProject,
-      sessionState,
-      sessionsRoot,
-      projectMarchDir,
-      sessionSource,
-      extensionPaths,
-      keybindingConfig,
-      promptTemplateConfig,
-      renderStartupBanner: () => formatStartupBanner({ cwd, modelId: runner.engine.modelId, thinkingLevel: runner.engine.thinkingLevel, mode: modeState.get(), dumpContextPath }),
-      refreshStatusBar,
-      setTurnRunning: (value) => { turnRunning = value; },
-      modeState,
+      ui: app.ui,
+      runner: app.runner,
+      memoryStore: app.memoryStore,
+      currentProject: app.currentProject,
+      sessionState: app.sessionState,
+      sessionsRoot: app.sessionsRoot,
+      projectMarchDir: app.projectMarchDir,
+      sessionSource: app.sessionSource,
+      extensionPaths: app.extensionPaths,
+      keybindingConfig: app.keybindingConfig,
+      promptTemplateConfig: app.promptTemplateConfig,
+      renderStartupBanner: () => formatStartupBanner({ cwd, modelId: app.runner.engine.modelId, thinkingLevel: app.runner.engine.thinkingLevel, mode: app.modeState.get(), dumpContextPath }),
+      refreshStatusBar: app.refreshStatusBar,
+      setTurnRunning: app.setTurnRunning,
+      modeState: app.modeState,
     });
   } finally {
-    await closeMarchRuntime({ runner, memoryStore, ui, logger });
+    await closeMarchRuntime({ runner: app.runner, memoryStore: app.memoryStore, ui: app.ui, logger: app.logger });
   }
-  logger.event("process.exit", { code: 0 });
+  app.logger.event("process.exit", { code: 0 });
   return 0;
 }