march-cli 0.1.21 → 0.1.22

package/src/cli/commands/status-command.mjs

@@ -1,194 +1,194 @@
-import { spawnSync } from "node:child_process";
-import { MODES, formatModeLabel } from "../input/mode-state.mjs";
-import { modeLabel, PREFIX, R } from "../tui/ui-theme.mjs";
-
-export function statusCommand({
-  runner,
-  sessionState,
-  sessionSource = "pi",
-  extensionDiagnostics = [],
-  lifecycleState = null,
-  gitBranch = getGitBranch(runner.engine.cwd),
-}) {
-  return [formatStatusLine({
-    engine: runner.engine,
-    sessionState,
-    sessionStats: runner.getSessionStats?.() ?? null,
-    sessionSource,
-    extensionDiagnostics,
-    lifecycleState,
-    gitBranch,
-  })];
-}
-
-export function statusBarLine({
-  runner,
-  mode = MODES.DO,
-  contextTokens = null,
-  activity = null,
-  lspStatus = null,
-}) {
-  return formatStatusBarLine({
-    engine: runner.engine,
-    mode,
-    contextTokens,
-    activity,
-    lspStatus,
-  });
-}
-
-export function formatStatusLine({
-  engine,
-  sessionState,
-  sessionStats = null,
-  sessionSource = "pi",
-  extensionDiagnostics = [],
-  lifecycleState = null,
-  gitBranch = null,
-}) {
-  const statsSessionId = sessionStats?.sessionId ?? sessionState?.sessionId ?? "unknown";
-  const tokens = sessionStats?.tokens
-    ? `${sessionStats.tokens.input ?? 0}in/${sessionStats.tokens.output ?? 0}out`
-    : "n/a";
-  const parts = [
-    `git:${gitBranch || "none"}`,
-    `session:${statsSessionId}`,
-    `source:${sessionSource}`,
-  ];
-  if (engine.sessionName) parts.push(`name:${engine.sessionName}`);
-  parts.push(
-    `model:${engine.modelId}`,
-    `provider:${engine.provider}`,
-    `thinking:${engine.thinkingLevel ?? "unknown"}`,
-    `tokens:${tokens}`,
-    `ext:${formatExtensionDiagnosticSummary(extensionDiagnostics, lifecycleState)}`,
-  );
-  return parts.join("  ");
-}
-
-export function formatStatusBarLine({
-  engine,
-  mode = MODES.DO,
-  contextTokens = null,
-  activity = null,
-  lspStatus = null,
-}) {
-  const model = engine.modelId || "model?";
-  const thinking = engine.thinkingLevel || "thinking?";
-
-  const C = PREFIX; // foreground-only color prefixes (no reset)
-  const DIM = C.brightBlack;
-  const modeSegment = formatModeSegment(mode);
-  const runtime = `${C.cyan}${model}${DIM}·${thinking}`;
-  const segments = [modeSegment, runtime];
-  const lspText = formatLspSegment(lspStatus);
-  if (lspText) segments.push(`${C.fg250}${lspText}`);
-  const activityText = formatActivitySegment(activity);
-  if (activityText) segments.push(`${C.fg250}${activityText}`);
-  const compactTokens = formatCompactTokenCount(contextTokens);
-  if (compactTokens) segments.push(`${C.fg250}${compactTokens}`);
-
-  const inner = segments.join(` ${DIM}|${C.fg250} `);
-  return `${inner}${R}`;
-}
-
-function formatModeSegment(mode) {
-  const label = formatModeLabel(mode);
-  return (modeLabel[mode] ?? modeLabel.fallback)(label);
-}
-
-export function formatLspSegment(lspStatus) {
-  if (!lspStatus) return "";
-  const servers = lspStatus.servers ?? [];
-  const visible = servers.filter((server) => server.id);
-  if (visible.length === 0) return "lsp:off";
-  const parts = buildLspStatusParts(visible);
-  if (parts.length === 0) return "lsp:off";
-  return `lsp:${parts.join(",")}`;
-}
-
-function buildLspStatusParts(servers) {
-  const byId = new Map();
-  for (const server of servers) {
-    const id = shortLspId(server.id);
-    byId.set(id, mergeLspStatus(byId.get(id), server.status));
-  }
-  return [...byId.entries()]
-    .map(([id, status]) => `${id}${formatLspStatusMark(status)}`);
-}
-
-function mergeLspStatus(current, next) {
-  const rank = { failed: 5, installing: 4, starting: 3, busy: 2, ready: 1, idle: 1, unavailable: 0 };
-  if (!current) return next ?? "unavailable";
-  const currentRank = rank[current] ?? 0;
-  const nextRank = rank[next] ?? 0;
-  return nextRank > currentRank ? next : current;
-}
-
-function formatLspStatusMark(status) {
-  if (status === "failed") return "!";
-  if (status === "starting" || status === "installing") return "…";
-  if (status === "unavailable") return "?";
-  return "✓";
-}
-
-function formatActivitySegment(activity) {
-  if (!activity) return "";
-  const label = String(activity.label ?? "").trim();
-  const frame = String(activity.frame ?? "").trim();
-  return [frame, label].filter(Boolean).join(" ");
-}
-
-function shortLspId(id) {
-  if (id === "typescript") return "ts";
-  return String(id ?? "?");
-}
-
-export function formatCompactTokenCount(tokens) {
-  const value = Number(tokens);
-  if (!Number.isFinite(value) || value <= 0) return "";
-  if (value < 1000) return String(Math.ceil(value));
-  if (value < 1000000) return `${formatOneDecimal(value / 1000)}K`;
-  return `${formatOneDecimal(value / 1000000)}M`;
-}
-
-export function formatExtensionDiagnosticSummary(extensionDiagnostics = [], lifecycleState = null) {
-  const diagnostics = [...extensionDiagnostics, ...(lifecycleState?.diagnostics ?? [])];
-  if (diagnostics.length === 0) return "ok";
-  const counts = new Map();
-  for (const diagnostic of diagnostics) {
-    const type = diagnostic?.type ?? "info";
-    counts.set(type, (counts.get(type) ?? 0) + 1);
-  }
-  return [...counts.entries()]
-    .sort(([a], [b]) => a.localeCompare(b))
-    .map(([type, count]) => `${count}${type}`)
-    .join(",");
-}
-
-export function getGitBranch(cwd) {
-  const branch = runGit(cwd, ["branch", "--show-current"]);
-  if (branch) return branch;
-  return runGit(cwd, ["rev-parse", "--short", "HEAD"]);
-}
-
-export function shortSessionId(sessionId) {
-  const value = String(sessionId || "unknown");
-  if (value === "unknown" || value.length <= 8) return value;
-  return value.slice(0, 8);
-}
-
-function runGit(cwd, args) {
-  const result = spawnSync("git", args, {
-    cwd,
-    encoding: "utf8",
-    windowsHide: true,
-  });
-  if (result.status !== 0) return null;
-  return result.stdout.trim() || null;
-}
-
-function formatOneDecimal(value) {
-  const rounded = Math.round(value * 10) / 10;
-  return Number.isInteger(rounded) ? String(rounded) : rounded.toFixed(1);
-}
+import { spawnSync } from "node:child_process";
+import { MODES, formatModeLabel } from "../input/mode-state.mjs";
+import { modeLabel, PREFIX, R } from "../tui/ui-theme.mjs";
+
+export function statusCommand({
+  runner,
+  sessionState,
+  sessionSource = "pi",
+  extensionDiagnostics = [],
+  lifecycleState = null,
+  gitBranch = getGitBranch(runner.engine.cwd),
+}) {
+  return [formatStatusLine({
+    engine: runner.engine,
+    sessionState,
+    sessionStats: runner.getSessionStats?.() ?? null,
+    sessionSource,
+    extensionDiagnostics,
+    lifecycleState,
+    gitBranch,
+  })];
+}
+
+export function statusBarLine({
+  runner,
+  mode = MODES.DO,
+  contextTokens = null,
+  activity = null,
+  lspStatus = null,
+}) {
+  return formatStatusBarLine({
+    engine: runner.engine,
+    mode,
+    contextTokens,
+    activity,
+    lspStatus,
+  });
+}
+
+export function formatStatusLine({
+  engine,
+  sessionState,
+  sessionStats = null,
+  sessionSource = "pi",
+  extensionDiagnostics = [],
+  lifecycleState = null,
+  gitBranch = null,
+}) {
+  const statsSessionId = sessionStats?.sessionId ?? sessionState?.sessionId ?? "unknown";
+  const tokens = sessionStats?.tokens
+    ? `${sessionStats.tokens.input ?? 0}in/${sessionStats.tokens.output ?? 0}out`
+    : "n/a";
+  const parts = [
+    `git:${gitBranch || "none"}`,
+    `session:${statsSessionId}`,
+    `source:${sessionSource}`,
+  ];
+  if (engine.sessionName) parts.push(`name:${engine.sessionName}`);
+  parts.push(
+    `model:${engine.modelId}`,
+    `provider:${engine.provider}`,
+    `thinking:${engine.thinkingLevel ?? "unknown"}`,
+    `tokens:${tokens}`,
+    `ext:${formatExtensionDiagnosticSummary(extensionDiagnostics, lifecycleState)}`,
+  );
+  return parts.join("  ");
+}
+
+export function formatStatusBarLine({
+  engine,
+  mode = MODES.DO,
+  contextTokens = null,
+  activity = null,
+  lspStatus = null,
+}) {
+  const model = engine.modelId || "model?";
+  const thinking = engine.thinkingLevel || "thinking?";
+
+  const C = PREFIX; // foreground-only color prefixes (no reset)
+  const DIM = C.brightBlack;
+  const modeSegment = formatModeSegment(mode);
+  const runtime = `${C.cyan}${model}${DIM}·${thinking}`;
+  const segments = [modeSegment, runtime];
+  const lspText = formatLspSegment(lspStatus);
+  if (lspText) segments.push(`${C.fg250}${lspText}`);
+  const activityText = formatActivitySegment(activity);
+  if (activityText) segments.push(`${C.fg250}${activityText}`);
+  const compactTokens = formatCompactTokenCount(contextTokens);
+  if (compactTokens) segments.push(`${C.fg250}${compactTokens}`);
+
+  const inner = segments.join(` ${DIM}|${C.fg250} `);
+  return `${inner}${R}`;
+}
+
+function formatModeSegment(mode) {
+  const label = formatModeLabel(mode);
+  return (modeLabel[mode] ?? modeLabel.fallback)(label);
+}
+
+export function formatLspSegment(lspStatus) {
+  if (!lspStatus) return "";
+  const servers = lspStatus.servers ?? [];
+  const visible = servers.filter((server) => server.id);
+  if (visible.length === 0) return "lsp:off";
+  const parts = buildLspStatusParts(visible);
+  if (parts.length === 0) return "lsp:off";
+  return `lsp:${parts.join(",")}`;
+}
+
+function buildLspStatusParts(servers) {
+  const byId = new Map();
+  for (const server of servers) {
+    const id = shortLspId(server.id);
+    byId.set(id, mergeLspStatus(byId.get(id), server.status));
+  }
+  return [...byId.entries()]
+    .map(([id, status]) => `${id}${formatLspStatusMark(status)}`);
+}
+
+function mergeLspStatus(current, next) {
+  const rank = { failed: 5, installing: 4, starting: 3, busy: 2, ready: 1, idle: 1, unavailable: 0 };
+  if (!current) return next ?? "unavailable";
+  const currentRank = rank[current] ?? 0;
+  const nextRank = rank[next] ?? 0;
+  return nextRank > currentRank ? next : current;
+}
+
+function formatLspStatusMark(status) {
+  if (status === "failed") return "!";
+  if (status === "starting" || status === "installing") return "…";
+  if (status === "unavailable") return "?";
+  return "✓";
+}
+
+function formatActivitySegment(activity) {
+  if (!activity) return "";
+  const label = String(activity.label ?? "").trim();
+  const frame = String(activity.frame ?? "").trim();
+  return [frame, label].filter(Boolean).join(" ");
+}
+
+function shortLspId(id) {
+  if (id === "typescript") return "ts";
+  return String(id ?? "?");
+}
+
+export function formatCompactTokenCount(tokens) {
+  const value = Number(tokens);
+  if (!Number.isFinite(value) || value <= 0) return "";
+  if (value < 1000) return String(Math.ceil(value));
+  if (value < 1000000) return `${formatOneDecimal(value / 1000)}K`;
+  return `${formatOneDecimal(value / 1000000)}M`;
+}
+
+export function formatExtensionDiagnosticSummary(extensionDiagnostics = [], lifecycleState = null) {
+  const diagnostics = [...extensionDiagnostics, ...(lifecycleState?.diagnostics ?? [])];
+  if (diagnostics.length === 0) return "ok";
+  const counts = new Map();
+  for (const diagnostic of diagnostics) {
+    const type = diagnostic?.type ?? "info";
+    counts.set(type, (counts.get(type) ?? 0) + 1);
+  }
+  return [...counts.entries()]
+    .sort(([a], [b]) => a.localeCompare(b))
+    .map(([type, count]) => `${count}${type}`)
+    .join(",");
+}
+
+export function getGitBranch(cwd) {
+  const branch = runGit(cwd, ["branch", "--show-current"]);
+  if (branch) return branch;
+  return runGit(cwd, ["rev-parse", "--short", "HEAD"]);
+}
+
+export function shortSessionId(sessionId) {
+  const value = String(sessionId || "unknown");
+  if (value === "unknown" || value.length <= 8) return value;
+  return value.slice(0, 8);
+}
+
+function runGit(cwd, args) {
+  const result = spawnSync("git", args, {
+    cwd,
+    encoding: "utf8",
+    windowsHide: true,
+  });
+  if (result.status !== 0) return null;
+  return result.stdout.trim() || null;
+}
+
+function formatOneDecimal(value) {
+  const rounded = Math.round(value * 10) / 10;
+  return Number.isInteger(rounded) ? String(rounded) : rounded.toFixed(1);
+}

package/src/cli/commands/thinking-command.mjs

@@ -1,87 +1,87 @@
-import { formatSelectorList } from "../selector-list.mjs";
-
-const THINKING_LEVELS = ["off", "minimal", "low", "medium", "high", "xhigh"];
-
-export function parseThinkingCommand(input) {
-  if (input !== "/thinking" && !input.startsWith("/thinking ")) {
-    return { type: "none" };
-  }
-  const arg = input.slice("/thinking".length).trim();
-  if (!arg) return { type: "select-interactive" };
-  if (arg === "list") return { type: "list" };
-  const index = Number(arg);
-  if (Number.isInteger(index) && index > 0) return { type: "select", index };
-  if (THINKING_LEVELS.includes(arg)) return { type: "set", level: arg };
-  return {
-    type: "error",
-    message: `Usage: /thinking [list|index|${THINKING_LEVELS.join("|")}]`,
-  };
-}
-
-export function formatThinkingLevels(levels, current) {
-  const available = Array.isArray(levels) && levels.length > 0 ? levels : THINKING_LEVELS;
-  return formatSelectorList({
-    items: available,
-    currentIndex: available.indexOf(current),
-    instruction: "Use /thinking <index> to select.",
-  });
-}
-
-export function buildThinkingSelectItems(levels, current) {
-  const available = Array.isArray(levels) && levels.length > 0 ? levels : THINKING_LEVELS;
-  return available.map((level, index) => ({
-    value: String(index),
-    label: level,
-    description: level === current ? "current" : "",
-    level,
-  }));
-}
-
-export function selectThinkingByIndex(index, { runner }) {
-  const levels = runner.getAvailableThinkingLevels?.() || THINKING_LEVELS;
-  const level = levels[index - 1];
-  if (!level) return `Error: thinking index out of range: ${index}`;
-  return `thinking: ${runner.setThinkingLevel(level)}`;
-}
-
-export async function handleThinkingCommand(parsed, { runner, ui = null } = {}) {
-  if (parsed.type === "select-interactive") {
-    if (ui?.selectList) return [await selectThinkingInteractively({ runner, ui })];
-    return ["Use /thinking list or run in TUI to choose a thinking level."];
-  }
-  if (parsed.type === "list") {
-    return formatThinkingLevels(
-      runner.getAvailableThinkingLevels?.(),
-      runner.getThinkingLevel?.(),
-    );
-  }
-  if (parsed.type === "select") return [await selectThinkingByIndexAsync(parsed.index, { runner })];
-  if (parsed.type === "set") {
-    const level = await runner.setThinkingLevel(parsed.level);
-    return [`thinking: ${level}`];
-  }
-  if (parsed.type === "error") return [`Error: ${parsed.message}`];
-  return [];
-}
-
-async function selectThinkingInteractively({ runner, ui }) {
-  const levels = runner.getAvailableThinkingLevels?.() || THINKING_LEVELS;
-  if (levels.length === 0) return "thinking: no available levels";
-  const current = runner.getThinkingLevel?.();
-  const selectedIndex = Math.max(0, levels.indexOf(current));
-  const item = await ui.selectList({
-    items: buildThinkingSelectItems(levels, current),
-    selectedIndex,
-    width: 48,
-    suppressInitialConfirm: true,
-  });
-  if (!item) return "thinking: unchanged";
-  return `thinking: ${await runner.setThinkingLevel(item.level)}`;
-}
-
-async function selectThinkingByIndexAsync(index, { runner }) {
-  const levels = runner.getAvailableThinkingLevels?.() || THINKING_LEVELS;
-  const level = levels[index - 1];
-  if (!level) return `Error: thinking index out of range: ${index}`;
-  return `thinking: ${await runner.setThinkingLevel(level)}`;
-}
+import { formatSelectorList } from "../selector-list.mjs";
+
+const THINKING_LEVELS = ["off", "minimal", "low", "medium", "high", "xhigh"];
+
+export function parseThinkingCommand(input) {
+  if (input !== "/thinking" && !input.startsWith("/thinking ")) {
+    return { type: "none" };
+  }
+  const arg = input.slice("/thinking".length).trim();
+  if (!arg) return { type: "select-interactive" };
+  if (arg === "list") return { type: "list" };
+  const index = Number(arg);
+  if (Number.isInteger(index) && index > 0) return { type: "select", index };
+  if (THINKING_LEVELS.includes(arg)) return { type: "set", level: arg };
+  return {
+    type: "error",
+    message: `Usage: /thinking [list|index|${THINKING_LEVELS.join("|")}]`,
+  };
+}
+
+export function formatThinkingLevels(levels, current) {
+  const available = Array.isArray(levels) && levels.length > 0 ? levels : THINKING_LEVELS;
+  return formatSelectorList({
+    items: available,
+    currentIndex: available.indexOf(current),
+    instruction: "Use /thinking <index> to select.",
+  });
+}
+
+export function buildThinkingSelectItems(levels, current) {
+  const available = Array.isArray(levels) && levels.length > 0 ? levels : THINKING_LEVELS;
+  return available.map((level, index) => ({
+    value: String(index),
+    label: level,
+    description: level === current ? "current" : "",
+    level,
+  }));
+}
+
+export function selectThinkingByIndex(index, { runner }) {
+  const levels = runner.getAvailableThinkingLevels?.() || THINKING_LEVELS;
+  const level = levels[index - 1];
+  if (!level) return `Error: thinking index out of range: ${index}`;
+  return `thinking: ${runner.setThinkingLevel(level)}`;
+}
+
+export async function handleThinkingCommand(parsed, { runner, ui = null } = {}) {
+  if (parsed.type === "select-interactive") {
+    if (ui?.selectList) return [await selectThinkingInteractively({ runner, ui })];
+    return ["Use /thinking list or run in TUI to choose a thinking level."];
+  }
+  if (parsed.type === "list") {
+    return formatThinkingLevels(
+      runner.getAvailableThinkingLevels?.(),
+      runner.getThinkingLevel?.(),
+    );
+  }
+  if (parsed.type === "select") return [await selectThinkingByIndexAsync(parsed.index, { runner })];
+  if (parsed.type === "set") {
+    const level = await runner.setThinkingLevel(parsed.level);
+    return [`thinking: ${level}`];
+  }
+  if (parsed.type === "error") return [`Error: ${parsed.message}`];
+  return [];
+}
+
+async function selectThinkingInteractively({ runner, ui }) {
+  const levels = runner.getAvailableThinkingLevels?.() || THINKING_LEVELS;
+  if (levels.length === 0) return "thinking: no available levels";
+  const current = runner.getThinkingLevel?.();
+  const selectedIndex = Math.max(0, levels.indexOf(current));
+  const item = await ui.selectList({
+    items: buildThinkingSelectItems(levels, current),
+    selectedIndex,
+    width: 48,
+    suppressInitialConfirm: true,
+  });
+  if (!item) return "thinking: unchanged";
+  return `thinking: ${await runner.setThinkingLevel(item.level)}`;
+}
+
+async function selectThinkingByIndexAsync(index, { runner }) {
+  const levels = runner.getAvailableThinkingLevels?.() || THINKING_LEVELS;
+  const level = levels[index - 1];
+  if (!level) return `Error: thinking index out of range: ${index}`;
+  return `thinking: ${await runner.setThinkingLevel(level)}`;
+}