march-cli 0.1.21 → 0.1.22

package/src/cli/permissions.mjs

@@ -1,103 +1,103 @@
-// ── Permission categories ──────────────────────────────────────────────
-export const PERM = Object.freeze({
-  READ_ONLY: "read_only",
-  FILE_WRITE: "file_write",
-  COMMAND_EXEC: "command_exec",
-  NETWORK_EXTERNAL: "network_external",
-});
-
-const CATEGORY_LABEL = {
-  [PERM.READ_ONLY]: "read-only",
-  [PERM.FILE_WRITE]: "file write",
-  [PERM.COMMAND_EXEC]: "command exec",
-  [PERM.NETWORK_EXTERNAL]: "network",
-};
-
-export function permissionLabel(cat) {
-  return CATEGORY_LABEL[cat] ?? cat;
-}
-
-// ── Permitted modes ────────────────────────────────────────────────────
-export const MODE = Object.freeze({
-  DEFAULT: "default",
-  DONT_ASK: "dontAsk",
-  BYPASS: "bypassPermissions",
-  ACCEPT_EDITS: "acceptEdits",
-});
-
-// ── Default tool → category mapping ────────────────────────────────────
-const DEFAULT_CATEGORIES = {
-  context_stats: PERM.READ_ONLY,
-  find: PERM.READ_ONLY,
-  edit_file: PERM.FILE_WRITE,
-  command_exec: PERM.COMMAND_EXEC,
-  terminal_spawn: PERM.COMMAND_EXEC,
-  terminal_send: PERM.COMMAND_EXEC,
-  terminal_list: PERM.COMMAND_EXEC,
-  terminal_kill: PERM.COMMAND_EXEC,
-  terminal_resize: PERM.COMMAND_EXEC,
-  terminal_clear: PERM.COMMAND_EXEC,
-  terminal_search: PERM.COMMAND_EXEC,
-  terminal_read: PERM.COMMAND_EXEC,
-  terminal_snapshot: PERM.COMMAND_EXEC,
-  external_web_search: PERM.NETWORK_EXTERNAL,
-  web_fetch: PERM.NETWORK_EXTERNAL,
-};
-
-export function createPermissionController({
-  mode = MODE.DEFAULT,
-  toolCategories = {},
-  onRequestApproval = null,
-} = {}) {
-  const sessionApprovals = new Map();
-  const categories = { ...DEFAULT_CATEGORIES, ...toolCategories };
-
-  function getCategory(toolName) {
-    if (categories[toolName] !== undefined) return categories[toolName];
-    // MCP and unknown tools: default to most restrictive
-    if (toolName.startsWith("mcp__")) return PERM.NETWORK_EXTERNAL;
-    return PERM.COMMAND_EXEC;
-  }
-
-  function setCategory(toolName, category) {
-    categories[toolName] = category;
-  }
-
-  function check(toolName) {
-    const category = getCategory(toolName);
-
-    if (category === PERM.READ_ONLY) return { behavior: "allow" };
-    if (mode === MODE.BYPASS) return { behavior: "allow" };
-    if (mode === MODE.DONT_ASK) {
-      return { behavior: "deny", message: `Tool '${toolName}' requires ${permissionLabel(category)} permission, but permission mode is 'dontAsk'.` };
-    }
-    if (sessionApprovals.has(toolName)) return { behavior: "allow" };
-
-    return { behavior: "ask", category, toolName };
-  }
-
-  function approve(toolName) {
-    sessionApprovals.set(toolName, true);
-  }
-
-  function isApproved(toolName) {
-    return sessionApprovals.has(toolName);
-  }
-
-  async function requestApproval(toolName, params, requestFn) {
-    const decision = check(toolName);
-    if (decision.behavior !== "ask") return decision;
-    if (!requestFn) return decision;
-    const ok = await requestFn({ toolName, params, category: decision.category });
-    if (ok) {
-      approve(toolName);
-      return { behavior: "allow" };
-    }
-    return {
-      behavior: "deny",
-      message: `User denied ${toolName} (requires ${permissionLabel(decision.category)} permission).`,
-    };
-  }
-
-  return { check, approve, isApproved, getCategory, setCategory, requestApproval, get mode() { return mode; } };
-}
+// ── Permission categories ──────────────────────────────────────────────
+export const PERM = Object.freeze({
+  READ_ONLY: "read_only",
+  FILE_WRITE: "file_write",
+  COMMAND_EXEC: "command_exec",
+  NETWORK_EXTERNAL: "network_external",
+});
+
+const CATEGORY_LABEL = {
+  [PERM.READ_ONLY]: "read-only",
+  [PERM.FILE_WRITE]: "file write",
+  [PERM.COMMAND_EXEC]: "command exec",
+  [PERM.NETWORK_EXTERNAL]: "network",
+};
+
+export function permissionLabel(cat) {
+  return CATEGORY_LABEL[cat] ?? cat;
+}
+
+// ── Permitted modes ────────────────────────────────────────────────────
+export const MODE = Object.freeze({
+  DEFAULT: "default",
+  DONT_ASK: "dontAsk",
+  BYPASS: "bypassPermissions",
+  ACCEPT_EDITS: "acceptEdits",
+});
+
+// ── Default tool → category mapping ────────────────────────────────────
+const DEFAULT_CATEGORIES = {
+  context_stats: PERM.READ_ONLY,
+  find: PERM.READ_ONLY,
+  edit_file: PERM.FILE_WRITE,
+  command_exec: PERM.COMMAND_EXEC,
+  terminal_spawn: PERM.COMMAND_EXEC,
+  terminal_send: PERM.COMMAND_EXEC,
+  terminal_list: PERM.COMMAND_EXEC,
+  terminal_kill: PERM.COMMAND_EXEC,
+  terminal_resize: PERM.COMMAND_EXEC,
+  terminal_clear: PERM.COMMAND_EXEC,
+  terminal_search: PERM.COMMAND_EXEC,
+  terminal_read: PERM.COMMAND_EXEC,
+  terminal_snapshot: PERM.COMMAND_EXEC,
+  external_web_search: PERM.NETWORK_EXTERNAL,
+  web_fetch: PERM.NETWORK_EXTERNAL,
+};
+
+export function createPermissionController({
+  mode = MODE.DEFAULT,
+  toolCategories = {},
+  onRequestApproval = null,
+} = {}) {
+  const sessionApprovals = new Map();
+  const categories = { ...DEFAULT_CATEGORIES, ...toolCategories };
+
+  function getCategory(toolName) {
+    if (categories[toolName] !== undefined) return categories[toolName];
+    // MCP and unknown tools: default to most restrictive
+    if (toolName.startsWith("mcp__")) return PERM.NETWORK_EXTERNAL;
+    return PERM.COMMAND_EXEC;
+  }
+
+  function setCategory(toolName, category) {
+    categories[toolName] = category;
+  }
+
+  function check(toolName) {
+    const category = getCategory(toolName);
+
+    if (category === PERM.READ_ONLY) return { behavior: "allow" };
+    if (mode === MODE.BYPASS) return { behavior: "allow" };
+    if (mode === MODE.DONT_ASK) {
+      return { behavior: "deny", message: `Tool '${toolName}' requires ${permissionLabel(category)} permission, but permission mode is 'dontAsk'.` };
+    }
+    if (sessionApprovals.has(toolName)) return { behavior: "allow" };
+
+    return { behavior: "ask", category, toolName };
+  }
+
+  function approve(toolName) {
+    sessionApprovals.set(toolName, true);
+  }
+
+  function isApproved(toolName) {
+    return sessionApprovals.has(toolName);
+  }
+
+  async function requestApproval(toolName, params, requestFn) {
+    const decision = check(toolName);
+    if (decision.behavior !== "ask") return decision;
+    if (!requestFn) return decision;
+    const ok = await requestFn({ toolName, params, category: decision.category });
+    if (ok) {
+      approve(toolName);
+      return { behavior: "allow" };
+    }
+    return {
+      behavior: "deny",
+      message: `User denied ${toolName} (requires ${permissionLabel(decision.category)} permission).`,
+    };
+  }
+
+  return { check, approve, isApproved, getCategory, setCategory, requestApproval, get mode() { return mode; } };
+}

package/src/cli/repl-commands.mjs

@@ -1,86 +1,86 @@
-import { spawnSync } from "node:child_process";
-import { DEFAULT_KEYBINDINGS, KEYBINDING_ACTIONS } from "./input/keybindings.mjs";
-import { dim, red } from "./tui/ui-theme.mjs";
-
-const HOTKEY_GROUPS = Object.freeze([
-  ["Turn control", ["abort", "interrupt"]],
-  ["Model and thinking", ["cycleThinking", "thinkingSelector", "modelSelector"]],
-  ["Editor and output", ["externalEditor", "toggleToolOutput", "pasteImage"]],
-  ["Shell pane", ["toggleShellDrawer", "nextShell", "shellScrollUp", "shellScrollDown"]],
-  ["Output scroll", ["outputScrollUp", "outputScrollDown"]],
-]);
-
-export function parseInlineShellInput(input, lastCommand = "") {
-  if (input === "!!") {
-    if (!lastCommand) return { type: "error", message: "No previous inline shell command." };
-    return { type: "command", command: lastCommand, repeated: true };
-  }
-  if (!input.startsWith("!")) return { type: "none" };
-  const command = input.slice(1).trim();
-  if (!command) return { type: "error", message: "Usage: ! <command>" };
-  return { type: "command", command, repeated: false };
-}
-
-export function runInlineShellCommand(command, { cwd = process.cwd(), ui } = {}) {
-  const shell = process.platform === "win32"
-    ? { bin: "powershell.exe", args: ["-NoProfile", "-Command", command] }
-    : { bin: "bash", args: ["-lc", command] };
-  ui?.writeln(dim(`$ ${command}`));
-  const result = spawnSync(shell.bin, shell.args, {
-    cwd,
-    encoding: "utf8",
-    windowsHide: true,
-    maxBuffer: 1024 * 1024,
-  });
-  if (result.stdout) {
-    for (const line of result.stdout.replace(/\s+$/, "").split("\n")) {
-      if (line) ui?.writeln(line);
-    }
-  }
-  if (result.stderr) {
-    for (const line of result.stderr.replace(/\s+$/, "").split("\n")) {
-      if (line) ui?.writeln(red(line));
-    }
-  }
-  if (result.error) {
-    ui?.writeln(red(`Error: ${result.error.message}`));
-  } else if (result.status !== 0) {
-    ui?.writeln(red(`exit ${result.status}`));
-  }
-  return result;
-}
-
-export function formatHotkeysPanel(keybindings = DEFAULT_KEYBINDINGS, diagnostics = []) {
-  return [
-    "Keyboard shortcuts:",
-    ...formatGroupedKeybindingLines(keybindings),
-    ...formatKeybindingDiagnostics(diagnostics),
-    "Input prefixes:",
-    "  /          Slash command autocomplete",
-    "  /session   Restore a previous session",
-    "  /thinking  Choose or list/set thinking level",
-    "  @          File path autocomplete",
-    "  ! cmd      Run local shell command without sending to the model",
-    "  !!         Repeat previous local shell command",
-  ];
-}
-
-export function formatGroupedKeybindingLines(keybindings = DEFAULT_KEYBINDINGS) {
-  return HOTKEY_GROUPS.flatMap(([label, actions]) => [
-    `  ${label}:`,
-    ...actions.map((action) => formatKeybindingLine(action, keybindings)),
-  ]);
-}
-
-function formatKeybindingLine(action, keybindings) {
-  const key = keybindings[action] ?? DEFAULT_KEYBINDINGS[action];
-  return `    ${key.padEnd(10, " ")} ${KEYBINDING_ACTIONS[action]}`;
-}
-
-function formatKeybindingDiagnostics(diagnostics) {
-  if (!diagnostics || diagnostics.length === 0) return [];
-  return [
-    "Keybinding diagnostics:",
-    ...diagnostics.map((diagnostic) => `  - ${diagnostic.type ?? "warning"}: ${diagnostic.message}`),
-  ];
-}
+import { spawnSync } from "node:child_process";
+import { DEFAULT_KEYBINDINGS, KEYBINDING_ACTIONS } from "./input/keybindings.mjs";
+import { dim, red } from "./tui/ui-theme.mjs";
+
+const HOTKEY_GROUPS = Object.freeze([
+  ["Turn control", ["abort", "interrupt"]],
+  ["Model and thinking", ["cycleThinking", "thinkingSelector", "modelSelector"]],
+  ["Editor and output", ["externalEditor", "toggleToolOutput", "pasteImage"]],
+  ["Shell pane", ["toggleShellDrawer", "nextShell", "shellScrollUp", "shellScrollDown"]],
+  ["Output scroll", ["outputScrollUp", "outputScrollDown"]],
+]);
+
+export function parseInlineShellInput(input, lastCommand = "") {
+  if (input === "!!") {
+    if (!lastCommand) return { type: "error", message: "No previous inline shell command." };
+    return { type: "command", command: lastCommand, repeated: true };
+  }
+  if (!input.startsWith("!")) return { type: "none" };
+  const command = input.slice(1).trim();
+  if (!command) return { type: "error", message: "Usage: ! <command>" };
+  return { type: "command", command, repeated: false };
+}
+
+export function runInlineShellCommand(command, { cwd = process.cwd(), ui } = {}) {
+  const shell = process.platform === "win32"
+    ? { bin: "powershell.exe", args: ["-NoProfile", "-Command", command] }
+    : { bin: "bash", args: ["-lc", command] };
+  ui?.writeln(dim(`$ ${command}`));
+  const result = spawnSync(shell.bin, shell.args, {
+    cwd,
+    encoding: "utf8",
+    windowsHide: true,
+    maxBuffer: 1024 * 1024,
+  });
+  if (result.stdout) {
+    for (const line of result.stdout.replace(/\s+$/, "").split("\n")) {
+      if (line) ui?.writeln(line);
+    }
+  }
+  if (result.stderr) {
+    for (const line of result.stderr.replace(/\s+$/, "").split("\n")) {
+      if (line) ui?.writeln(red(line));
+    }
+  }
+  if (result.error) {
+    ui?.writeln(red(`Error: ${result.error.message}`));
+  } else if (result.status !== 0) {
+    ui?.writeln(red(`exit ${result.status}`));
+  }
+  return result;
+}
+
+export function formatHotkeysPanel(keybindings = DEFAULT_KEYBINDINGS, diagnostics = []) {
+  return [
+    "Keyboard shortcuts:",
+    ...formatGroupedKeybindingLines(keybindings),
+    ...formatKeybindingDiagnostics(diagnostics),
+    "Input prefixes:",
+    "  /          Slash command autocomplete",
+    "  /session   Restore a previous session",
+    "  /thinking  Choose or list/set thinking level",
+    "  @          File path autocomplete",
+    "  ! cmd      Run local shell command without sending to the model",
+    "  !!         Repeat previous local shell command",
+  ];
+}
+
+export function formatGroupedKeybindingLines(keybindings = DEFAULT_KEYBINDINGS) {
+  return HOTKEY_GROUPS.flatMap(([label, actions]) => [
+    `  ${label}:`,
+    ...actions.map((action) => formatKeybindingLine(action, keybindings)),
+  ]);
+}
+
+function formatKeybindingLine(action, keybindings) {
+  const key = keybindings[action] ?? DEFAULT_KEYBINDINGS[action];
+  return `    ${key.padEnd(10, " ")} ${KEYBINDING_ACTIONS[action]}`;
+}
+
+function formatKeybindingDiagnostics(diagnostics) {
+  if (!diagnostics || diagnostics.length === 0) return [];
+  return [
+    "Keybinding diagnostics:",
+    ...diagnostics.map((diagnostic) => `  - ${diagnostic.type ?? "warning"}: ${diagnostic.message}`),
+  ];
+}