march-cli 0.1.6 → 0.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "march-cli",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "March CLI — terminal-native coding agent with context reconstruction",
   "type": "module",
   "main": "./src/main.mjs",
@@ -32,6 +32,7 @@
     "node-notifier": "^10.0.1",
     "node-pty": "^1.1.0",
     "typebox": "^1.0.58",
+    "undici": "^7.25.0",
     "web-tree-sitter": "^0.26.8"
   },
   "optionalDependencies": {

package/src/cli/input/select-with-keyboard.mjs

@@ -12,9 +12,19 @@ export async function selectWithKeyboard({ input = process.stdin, output = proce
 
   let selected = 0;
   let renderedLines = 0;
+  const maxViewport = Math.max(4, (output.rows || 24) - 2);
+  let viewportStart = 0;
+
+  const viewportEnd = () => Math.min(viewportStart + maxViewport, items.length);
+
+  const adjustViewport = () => {
+    if (selected < viewportStart) viewportStart = selected;
+    else if (selected >= viewportStart + maxViewport) viewportStart = selected - maxViewport + 1;
+  };
+
   const render = () => {
     if (renderedLines > 0) output.write(`\x1b[${renderedLines}F`);
-    const lines = formatSelectionList({ message, items, selected });
+    const lines = formatSelectionList({ message, items, selected, viewportStart, viewportEnd: viewportEnd(), done: false });
     for (const line of lines) output.write(`\x1b[2K\r${line}\n`);
     renderedLines = lines.length;
   };
@@ -26,8 +36,8 @@ export async function selectWithKeyboard({ input = process.stdin, output = proce
         if (finished) return;
         if (key === "\u0003" || key === "\u001b") finish(null);
         else if (key === "\r" || key === "\n") finish(items[selected].value);
-        else if (key === "\u001b[A") { selected = (selected - 1 + items.length) % items.length; render(); }
-        else if (key === "\u001b[B") { selected = (selected + 1) % items.length; render(); }
+        else if (key === "\u001b[A") { selected = (selected - 1 + items.length) % items.length; adjustViewport(); render(); }
+        else if (key === "\u001b[B") { selected = (selected + 1) % items.length; adjustViewport(); render(); }
       }
     };
     const finish = (value) => {
@@ -35,26 +45,36 @@ export async function selectWithKeyboard({ input = process.stdin, output = proce
       input.off("data", onData);
       input.setRawMode(false);
       input.pause();
-      if (renderedLines > 0) output.write(`\x1b[${renderedLines}F`);
-      const lines = formatSelectionList({ message, items, selected, done: value != null });
-      for (const line of lines) output.write(`\x1b[2K\r${line}\n`);
+      if (renderedLines > 0) {
+        output.write(`\x1b[${renderedLines}F`);
+        // clear all previously rendered lines
+        for (let i = 0; i < renderedLines; i++) output.write("\x1b[2K\r\n");
+        output.write(`\x1b[${renderedLines}F`);
+      }
+      // final render shows just the selected item
+      const lines = formatSelectionList({ message, items, selected, viewportStart: 0, viewportEnd: items.length, done: value != null });
+      output.write(`\x1b[2K\r${lines[0]}\n`);
+      output.write(`\x1b[2K\r  ${items[selected].label}\n`);
       resolve(value);
     };
     input.setRawMode(true);
     input.resume();
     input.on("data", onData);
+    adjustViewport();
     render();
   });
 }
 
-export function formatSelectionList({ message, items, selected, done = false }) {
+export function formatSelectionList({ message, items, selected, viewportStart = 0, viewportEnd = items.length, done = false }) {
   const hint = done ? "selected" : "↑/↓, Enter";
   const lines = [`${message} (${hint})`];
-  for (let i = 0; i < items.length; i++) {
+  if (viewportStart > 0) lines.push("  …");
+  for (let i = viewportStart; i < viewportEnd; i++) {
     const marker = i === selected ? "›" : " ";
     const label = `${marker} ${items[i].label}`;
     lines.push(i === selected ? `\x1b[7m${label}\x1b[0m` : label);
   }
+  if (viewportEnd < items.length) lines.push("  …");
   return lines;
 }
 
@@ -64,4 +84,4 @@ function readLine({ input = process.stdin, output = process.stdout, prompt }) {
     rl.close();
     resolve(answer);
   }));
-}
+}

package/src/config/loader.mjs

@@ -46,6 +46,7 @@ function mergeLayers(layers) {
     serviceTier: null,
     providers: {},
     webSearch: { provider: null, providers: {} },
+    network: { proxy: "system", ca: "system" },
     maxTurns: null,
     trimBatch: null,
     memoryRoot: null,
@@ -69,6 +70,12 @@ function mergeLayers(layers) {
         ...layer.notifications,
       };
     }
+    if (layer.network && typeof layer.network === "object" && !Array.isArray(layer.network)) {
+      result.network = {
+        ...result.network,
+        ...layer.network,
+      };
+    }
     if (layer.memoryRoot) result.memoryRoot = layer.memoryRoot;
   }
 

package/src/main.mjs

@@ -33,6 +33,7 @@ import { runProviderConfigCommand } from "./provider/config-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";
 
 export async function run(argv) {
   const cwd = process.cwd();
@@ -40,12 +41,13 @@ export async function run(argv) {
   registerSuperGrokOAuthProvider();
 
   const args = parseCliArgs(argv);
-
   if (args.help) {
     showHelp();
     return 0;
   }
 
+  const config = loadConfig(cwd);
+  installNetworkEnvironment(config.network);
   if (args.command?.name === "login") {
     try {
       return await runLoginCommand({
@@ -67,8 +69,6 @@ export async function run(argv) {
   const stateRoot = join(homedir(), ".march");
   if (!existsSync(stateRoot)) mkdirSync(stateRoot, { recursive: true });
 
-  // Load config (CLI args override config file values)
-  const config = loadConfig(cwd);
   const provider = args.provider ?? config.provider ?? null;
   const serviceTier = config.serviceTier ?? null;
   const model = args.model ?? config.model ?? null;

package/src/network/environment.mjs

@@ -0,0 +1,131 @@
+import { readFileSync } from "node:fs";
+import { execFileSync } from "node:child_process";
+import tls from "node:tls";
+import { EnvHttpProxyAgent, setGlobalDispatcher } from "undici";
+
+export function installNetworkEnvironment(network = {}) {
+  const proxy = resolveProxySettings(network);
+  installProxyDispatcher(proxy);
+  const ca = installDefaultCertificates(network.ca ?? "system");
+  return { proxy, ca };
+}
+
+export function resolveProxySettings(network = {}, { env = process.env, platform = process.platform } = {}) {
+  const proxyMode = network.proxy ?? "system";
+  const explicitNoProxy = formatNoProxy(network.noProxy);
+
+  if (proxyMode === false || proxyMode === "none" || proxyMode === "direct") {
+    return { mode: "direct", httpProxy: null, httpsProxy: null, noProxy: explicitNoProxy ?? env.NO_PROXY ?? env.no_proxy ?? null };
+  }
+
+  if (typeof proxyMode === "string" && proxyMode.trim() && proxyMode !== "system") {
+    const proxy = normalizeProxyUrl(proxyMode.trim());
+    return { mode: "config", httpProxy: proxy, httpsProxy: proxy, noProxy: explicitNoProxy ?? env.NO_PROXY ?? env.no_proxy ?? null };
+  }
+
+  const envProxy = proxyFromEnv(env, explicitNoProxy);
+  if (envProxy.httpProxy || envProxy.httpsProxy) return { mode: "env", ...envProxy };
+
+  const systemProxy = platform === "win32" ? detectWindowsProxy() : null;
+  if (systemProxy?.httpProxy || systemProxy?.httpsProxy) {
+    return {
+      mode: "system",
+      httpProxy: systemProxy.httpProxy,
+      httpsProxy: systemProxy.httpsProxy,
+      noProxy: explicitNoProxy ?? systemProxy.noProxy ?? null,
+    };
+  }
+
+  return { mode: "direct", httpProxy: null, httpsProxy: null, noProxy: explicitNoProxy ?? null };
+}
+
+function installProxyDispatcher(proxy) {
+  setGlobalDispatcher(new EnvHttpProxyAgent({
+    httpProxy: proxy.httpProxy ?? "",
+    httpsProxy: proxy.httpsProxy ?? "",
+    noProxy: proxy.noProxy ?? "",
+    bodyTimeout: 0,
+    headersTimeout: 0,
+  }));
+}
+
+export function installDefaultCertificates(caConfig = "system") {
+  const entries = Array.isArray(caConfig) ? caConfig : [caConfig];
+  const wantsSystem = entries.includes("system");
+  const pemPaths = entries.filter((entry) => typeof entry === "string" && entry && entry !== "system");
+
+  if (!wantsSystem && pemPaths.length === 0) return { mode: "default", system: false, extraFiles: [] };
+  if (typeof tls.setDefaultCACertificates !== "function" || typeof tls.getCACertificates !== "function") {
+    return { mode: "unsupported", system: false, extraFiles: [] };
+  }
+
+  const certificates = [
+    ...tls.getCACertificates("default"),
+    ...(wantsSystem ? tls.getCACertificates("system") : []),
+    ...pemPaths.map((path) => readFileSync(path, "utf8")),
+  ];
+  tls.setDefaultCACertificates([...new Set(certificates)]);
+  return { mode: "installed", system: wantsSystem, extraFiles: pemPaths };
+}
+
+function proxyFromEnv(env, explicitNoProxy) {
+  const httpsProxy = env.HTTPS_PROXY ?? env.https_proxy ?? env.ALL_PROXY ?? env.all_proxy ?? null;
+  const httpProxy = env.HTTP_PROXY ?? env.http_proxy ?? env.ALL_PROXY ?? env.all_proxy ?? null;
+  const normalizedHttp = httpProxy ? normalizeProxyUrl(httpProxy) : null;
+  return {
+    httpProxy: normalizedHttp,
+    httpsProxy: httpsProxy ? normalizeProxyUrl(httpsProxy) : normalizedHttp,
+    noProxy: explicitNoProxy ?? env.NO_PROXY ?? env.no_proxy ?? null,
+  };
+}
+
+function detectWindowsProxy() {
+  try {
+    const output = execFileSync("reg", ["query", "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"], { encoding: "utf8", windowsHide: true });
+    const values = parseRegQuery(output);
+    if (values.ProxyEnable !== "0x1") return null;
+    return parseWindowsProxyServer(values.ProxyServer, values.ProxyOverride);
+  } catch {
+    return null;
+  }
+}
+
+function parseRegQuery(output) {
+  const values = {};
+  for (const line of output.split(/\r?\n/)) {
+    const match = line.trim().match(/^(\S+)\s+REG_\S+\s+(.+)$/);
+    if (match) values[match[1]] = match[2].trim();
+  }
+  return values;
+}
+
+function parseWindowsProxyServer(proxyServer, proxyOverride) {
+  if (!proxyServer) return null;
+  const entries = Object.fromEntries(proxyServer.split(";").map((part) => part.split("=")).filter((part) => part.length === 2));
+  const fallback = proxyServer.includes("=") ? null : proxyServer;
+  return {
+    httpProxy: normalizeProxyUrl(entries.http ?? fallback),
+    httpsProxy: normalizeProxyUrl(entries.https ?? entries.http ?? fallback),
+    noProxy: formatWindowsProxyOverride(proxyOverride),
+  };
+}
+
+function normalizeProxyUrl(value) {
+  if (!value) return null;
+  return /^[a-z][a-z0-9+.-]*:\/\//i.test(value) ? value : `http://${value}`;
+}
+
+function formatNoProxy(value) {
+  if (Array.isArray(value)) return value.join(",");
+  if (typeof value === "string") return value;
+  return null;
+}
+
+function formatWindowsProxyOverride(value) {
+  if (!value) return null;
+  return value
+    .split(";")
+    .map((entry) => entry.trim())
+    .filter((entry) => entry && entry !== "<local>")
+    .join(",") || null;
+}