march-cli 0.1.21 → 0.1.22

package/src/config/config-json.mjs

@@ -1,84 +1,84 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { dirname, join } from "node:path";
-
-export function globalConfigJsonPath(homeDir = homedir()) {
-  return join(homeDir, ".march", "config.json");
-}
-
-export function readConfigJson(path) {
-  if (!existsSync(path)) return {};
-  try {
-    const parsed = JSON.parse(readFileSync(path, "utf8"));
-    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
-  } catch {
-    return {};
-  }
-}
-
-export function writeConfigJson(path, data) {
-  mkdirSync(dirname(path), { recursive: true });
-  writeFileSync(path, `${JSON.stringify(data, null, 2)}\n`, "utf8");
-}
-
-export function upsertProviderProfile({ path = globalConfigJsonPath(), id, type, auth }) {
-  const config = readConfigJson(path);
-  const providers = config.providers && typeof config.providers === "object" && !Array.isArray(config.providers)
-    ? config.providers
-    : {};
-  providers[id] = {
-    ...(providers[id] ?? {}),
-    type,
-    auth,
-  };
-  config.providers = providers;
-  delete config.provider;
-  delete config.model;
-  writeConfigJson(path, config);
-  return config;
-}
-
-export function upsertSharedProviderProfile({ path = globalConfigJsonPath(), id, provider }) {
-  const config = readConfigJson(path);
-  const providers = config.providers && typeof config.providers === "object" && !Array.isArray(config.providers)
-    ? config.providers
-    : {};
-  providers[id] = provider;
-  config.providers = providers;
-  writeConfigJson(path, config);
-  return config;
-}
-
-export function upsertModelSelection({ path = globalConfigJsonPath(), provider, model, serviceTier }) {
-  const config = readConfigJson(path);
-  config.provider = provider;
-  config.model = model;
-  if (serviceTier) {
-    config.serviceTier = serviceTier;
-  } else {
-    delete config.serviceTier;
-  }
-  writeConfigJson(path, config);
-  return config;
-}
-
-export function upsertWebSearchProvider({ path = globalConfigJsonPath(), id, apiKey }) {
-  const config = readConfigJson(path);
-  const webSearch = config.webSearch && typeof config.webSearch === "object" && !Array.isArray(config.webSearch)
-    ? config.webSearch
-    : {};
-  const providers = webSearch.providers && typeof webSearch.providers === "object" && !Array.isArray(webSearch.providers)
-    ? webSearch.providers
-    : {};
-  providers[id] = {
-    ...(providers[id] ?? {}),
-    apiKey,
-  };
-  config.webSearch = {
-    ...webSearch,
-    provider: id,
-    providers,
-  };
-  writeConfigJson(path, config);
-  return config;
-}
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
+
+export function globalConfigJsonPath(homeDir = homedir()) {
+  return join(homeDir, ".march", "config.json");
+}
+
+export function readConfigJson(path) {
+  if (!existsSync(path)) return {};
+  try {
+    const parsed = JSON.parse(readFileSync(path, "utf8"));
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+
+export function writeConfigJson(path, data) {
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(path, `${JSON.stringify(data, null, 2)}\n`, "utf8");
+}
+
+export function upsertProviderProfile({ path = globalConfigJsonPath(), id, type, auth }) {
+  const config = readConfigJson(path);
+  const providers = config.providers && typeof config.providers === "object" && !Array.isArray(config.providers)
+    ? config.providers
+    : {};
+  providers[id] = {
+    ...(providers[id] ?? {}),
+    type,
+    auth,
+  };
+  config.providers = providers;
+  delete config.provider;
+  delete config.model;
+  writeConfigJson(path, config);
+  return config;
+}
+
+export function upsertSharedProviderProfile({ path = globalConfigJsonPath(), id, provider }) {
+  const config = readConfigJson(path);
+  const providers = config.providers && typeof config.providers === "object" && !Array.isArray(config.providers)
+    ? config.providers
+    : {};
+  providers[id] = provider;
+  config.providers = providers;
+  writeConfigJson(path, config);
+  return config;
+}
+
+export function upsertModelSelection({ path = globalConfigJsonPath(), provider, model, serviceTier }) {
+  const config = readConfigJson(path);
+  config.provider = provider;
+  config.model = model;
+  if (serviceTier) {
+    config.serviceTier = serviceTier;
+  } else {
+    delete config.serviceTier;
+  }
+  writeConfigJson(path, config);
+  return config;
+}
+
+export function upsertWebSearchProvider({ path = globalConfigJsonPath(), id, apiKey }) {
+  const config = readConfigJson(path);
+  const webSearch = config.webSearch && typeof config.webSearch === "object" && !Array.isArray(config.webSearch)
+    ? config.webSearch
+    : {};
+  const providers = webSearch.providers && typeof webSearch.providers === "object" && !Array.isArray(webSearch.providers)
+    ? webSearch.providers
+    : {};
+  providers[id] = {
+    ...(providers[id] ?? {}),
+    apiKey,
+  };
+  config.webSearch = {
+    ...webSearch,
+    provider: id,
+    providers,
+  };
+  writeConfigJson(path, config);
+  return config;
+}

package/src/config/dotenv.mjs

@@ -1,20 +1,20 @@
-import { existsSync, readFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
-
-export function loadDotEnv(cwd, { homeDir = homedir(), sourceDir = dirname(dirname(fileURLToPath(import.meta.url))) } = {}) {
-  for (const dir of [cwd, join(homeDir, ".march"), sourceDir]) {
-    const path = join(dir, ".env");
-    if (!existsSync(path)) continue;
-    for (const line of readFileSync(path, "utf-8").split(/\r?\n/)) {
-      const trimmed = line.trim();
-      if (!trimmed || trimmed.startsWith("#")) continue;
-      const eq = trimmed.indexOf("=");
-      if (eq < 1) continue;
-      const key = trimmed.slice(0, eq).trim();
-      const val = trimmed.slice(eq + 1).trim();
-      if (!process.env[key]) process.env[key] = val;
-    }
-  }
-}
+import { existsSync, readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+
+export function loadDotEnv(cwd, { homeDir = homedir(), sourceDir = dirname(dirname(fileURLToPath(import.meta.url))) } = {}) {
+  for (const dir of [cwd, join(homeDir, ".march"), sourceDir]) {
+    const path = join(dir, ".env");
+    if (!existsSync(path)) continue;
+    for (const line of readFileSync(path, "utf-8").split(/\r?\n/)) {
+      const trimmed = line.trim();
+      if (!trimmed || trimmed.startsWith("#")) continue;
+      const eq = trimmed.indexOf("=");
+      if (eq < 1) continue;
+      const key = trimmed.slice(0, eq).trim();
+      const val = trimmed.slice(eq + 1).trim();
+      if (!process.env[key]) process.env[key] = val;
+    }
+  }
+}

package/src/config/features.mjs

@@ -1,75 +1,75 @@
-import { readFileSync, existsSync } from "node:fs";
-import { join } from "node:path";
-import { homedir } from "node:os";
-
-const DEFAULTS = Object.freeze({
-  "experimental.mcp": true,
-  "experimental.web_search": true,
-  "experimental.web_fetch": true,
-  "experimental.shell": true,
-  "experimental.permissions": true,
-  "ui.markdown_rendering": false,
-  "ui.tool_expand_per_card": false,
-  "agent.plan_mode": false,
-  "agent.sub_agents": false,
-  "agent.background_tasks": false,
-  "agent.auto_retry": true,
-});
-
-/**
- * Load feature flags from ~/.march/features.toml.
- * Returns a frozen object with all known flags resolved to booleans.
- * Unknown keys in the file are ignored.
- *
- * TOML format (subset):
- *   # comment
- *   [section]
- *   key = true
- *   key = false
- */
-export function loadFeatureFlags({
-  homeDir = homedir(),
-  readFileSyncImpl = readFileSync,
-  existsSyncImpl = existsSync,
-} = {}) {
-  const path = join(homeDir, ".march", "features.toml");
-  const overrides = loadToml(path, { readFileSyncImpl, existsSyncImpl });
-  const resolved = { ...DEFAULTS };
-  for (const [key, value] of Object.entries(overrides)) {
-    if (key in resolved) resolved[key] = Boolean(value);
-  }
-  return Object.freeze(resolved);
-}
-
-export function isEnabled(flags, flag) {
-  return Boolean(flags?.[flag]);
-}
-
-// ── Minimal TOML subset parser (sections, booleans, comments) ──
-function loadToml(path, { readFileSyncImpl, existsSyncImpl }) {
-  if (!existsSyncImpl(path)) return {};
-  const src = readFileSyncImpl(path, "utf8");
-  const result = {};
-  let section = "";
-  for (const raw of src.split(/\r?\n/)) {
-    const line = raw.trim();
-    if (!line || line.startsWith("#")) continue;
-
-    // [section]
-    const sectionMatch = line.match(/^\[([^\]]+)\]$/);
-    if (sectionMatch) {
-      section = sectionMatch[1].trim() + ".";
-      continue;
-    }
-
-    // key = value
-    const eq = line.indexOf("=");
-    if (eq < 1) continue;
-    const key = (section + line.slice(0, eq).trim());
-    const value = line.slice(eq + 1).trim();
-    if (value === "true") result[key] = true;
-    else if (value === "false") result[key] = false;
-    // ignore non-boolean values
-  }
-  return result;
-}
+import { readFileSync, existsSync } from "node:fs";
+import { join } from "node:path";
+import { homedir } from "node:os";
+
+const DEFAULTS = Object.freeze({
+  "experimental.mcp": true,
+  "experimental.web_search": true,
+  "experimental.web_fetch": true,
+  "experimental.shell": true,
+  "experimental.permissions": true,
+  "ui.markdown_rendering": false,
+  "ui.tool_expand_per_card": false,
+  "agent.plan_mode": false,
+  "agent.sub_agents": false,
+  "agent.background_tasks": false,
+  "agent.auto_retry": true,
+});
+
+/**
+ * Load feature flags from ~/.march/features.toml.
+ * Returns a frozen object with all known flags resolved to booleans.
+ * Unknown keys in the file are ignored.
+ *
+ * TOML format (subset):
+ *   # comment
+ *   [section]
+ *   key = true
+ *   key = false
+ */
+export function loadFeatureFlags({
+  homeDir = homedir(),
+  readFileSyncImpl = readFileSync,
+  existsSyncImpl = existsSync,
+} = {}) {
+  const path = join(homeDir, ".march", "features.toml");
+  const overrides = loadToml(path, { readFileSyncImpl, existsSyncImpl });
+  const resolved = { ...DEFAULTS };
+  for (const [key, value] of Object.entries(overrides)) {
+    if (key in resolved) resolved[key] = Boolean(value);
+  }
+  return Object.freeze(resolved);
+}
+
+export function isEnabled(flags, flag) {
+  return Boolean(flags?.[flag]);
+}
+
+// ── Minimal TOML subset parser (sections, booleans, comments) ──
+function loadToml(path, { readFileSyncImpl, existsSyncImpl }) {
+  if (!existsSyncImpl(path)) return {};
+  const src = readFileSyncImpl(path, "utf8");
+  const result = {};
+  let section = "";
+  for (const raw of src.split(/\r?\n/)) {
+    const line = raw.trim();
+    if (!line || line.startsWith("#")) continue;
+
+    // [section]
+    const sectionMatch = line.match(/^\[([^\]]+)\]$/);
+    if (sectionMatch) {
+      section = sectionMatch[1].trim() + ".";
+      continue;
+    }
+
+    // key = value
+    const eq = line.indexOf("=");
+    if (eq < 1) continue;
+    const key = (section + line.slice(0, eq).trim());
+    const value = line.slice(eq + 1).trim();
+    if (value === "true") result[key] = true;
+    else if (value === "false") result[key] = false;
+    // ignore non-boolean values
+  }
+  return result;
+}

package/src/config/loader.mjs

@@ -1,143 +1,143 @@
-import { readFileSync, existsSync } from "node:fs";
-import { join } from "node:path";
-import { homedir } from "node:os";
-
-/**
- * Priority (last wins):
- *   1. ~/.march/config — legacy global defaults
- *   2. ~/.march/config.json — global config
- *   3. <cwd>/.marchrc — legacy project overrides
- *   4. <cwd>/.march/config — legacy project dir overrides
- *   5. <cwd>/.march/config.json — project config
- * Scalar values override.
- */
-export function loadConfig(cwd, { homeDir = homedir() } = {}) {
-  const layers = [];
-
-  // 1. Global config: ~/.march/config
-  const globalPath = join(homeDir, ".march", "config");
-  layers.push(loadJson(globalPath));
-
-  layers.push(loadJson(join(homeDir, ".march", "config.json")));
-
-  // 2. Project config: <cwd>/.marchrc
-  layers.push(loadJson(join(cwd, ".marchrc")));
-
-  // 3. Project dir config: <cwd>/.march/config
-  layers.push(loadJson(join(cwd, ".march", "config")));
-  layers.push(loadJson(join(cwd, ".march", "config.json")));
-
-  return mergeLayers(layers);
-}
-
-function loadJson(path) {
-  if (!existsSync(path)) return null;
-  try {
-    return JSON.parse(readFileSync(path, "utf8"));
-  } catch {
-    return null;
-  }
-}
-
-function mergeLayers(layers) {
-  const result = {
-    model: null,
-    provider: null,
-    serviceTier: null,
-    providers: {},
-    webSearch: { provider: null, providers: {} },
-    hostedTools: {
-      openai: { webSearch: "auto" },
-      openaiCodex: { webSearch: "auto" },
-      azureOpenai: { webSearch: "auto" },
-      anthropic: { webSearch: "auto" },
-      google: { webSearch: "auto" },
-      xai: { webSearch: "auto", xSearch: "auto" },
-    },
-    network: { proxy: "system", ca: "system" },
-    maxTurns: null,
-    trimBatch: null,
-    memoryRoot: null,
-    notifications: { turnEnd: true, desktop: true, bell: false, command: null, minDurationMs: 0, sound: true },
-  };
-  for (const layer of layers) {
-    if (!layer) continue;
-    if (layer.model != null) result.model = layer.model;
-    if (layer.provider) result.provider = layer.provider;
-    if (layer.serviceTier) result.serviceTier = layer.serviceTier;
-    if (layer.providers && typeof layer.providers === "object" && !Array.isArray(layer.providers)) {
-      result.providers = mergeProviders(result.providers, layer.providers);
-    }
-    if (layer.webSearch && typeof layer.webSearch === "object" && !Array.isArray(layer.webSearch)) {
-      result.webSearch = mergeWebSearch(result.webSearch, layer.webSearch);
-    }
-    if (layer.hostedTools && typeof layer.hostedTools === "object" && !Array.isArray(layer.hostedTools)) {
-      result.hostedTools = mergeHostedTools(result.hostedTools, layer.hostedTools);
-    }
-    if (layer.notifications && typeof layer.notifications === "object" && !Array.isArray(layer.notifications)) {
-      result.notifications = {
-        ...result.notifications,
-        ...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;
-  }
-
-  return result;
-}
-
-function mergeWebSearch(current, next) {
-  const merged = {
-    provider: next.provider ?? current.provider ?? null,
-    providers: { ...(current.providers ?? {}) },
-  };
-  if (next.providers && typeof next.providers === "object" && !Array.isArray(next.providers)) {
-    for (const [id, profile] of Object.entries(next.providers)) {
-      if (!profile || typeof profile !== "object" || Array.isArray(profile)) continue;
-      merged.providers[id] = {
-        ...(merged.providers[id] ?? {}),
-        ...profile,
-      };
-    }
-  }
-  return merged;
-}
-
-function mergeHostedTools(current, next) {
-  const merged = {
-    openai: { ...(current.openai ?? {}) },
-    openaiCodex: { ...(current.openaiCodex ?? {}) },
-    azureOpenai: { ...(current.azureOpenai ?? {}) },
-    anthropic: { ...(current.anthropic ?? {}) },
-    google: { ...(current.google ?? {}) },
-    xai: { ...(current.xai ?? {}) },
-  };
-  for (const provider of ["openai", "openaiCodex", "azureOpenai", "anthropic", "google", "xai"]) {
-    if (next[provider] && typeof next[provider] === "object" && !Array.isArray(next[provider])) {
-      merged[provider] = { ...merged[provider], ...next[provider] };
-    }
-  }
-  return merged;
-}
-
-function mergeProviders(current, next) {
-  const merged = { ...current };
-  for (const [id, profile] of Object.entries(next)) {
-    if (!profile || typeof profile !== "object" || Array.isArray(profile)) continue;
-    merged[id] = {
-      ...(merged[id] ?? {}),
-      ...profile,
-      auth: {
-        ...(merged[id]?.auth ?? {}),
-        ...(profile.auth ?? {}),
-      },
-    };
-  }
-  return merged;
-}
+import { readFileSync, existsSync } from "node:fs";
+import { join } from "node:path";
+import { homedir } from "node:os";
+
+/**
+ * Priority (last wins):
+ *   1. ~/.march/config — legacy global defaults
+ *   2. ~/.march/config.json — global config
+ *   3. <cwd>/.marchrc — legacy project overrides
+ *   4. <cwd>/.march/config — legacy project dir overrides
+ *   5. <cwd>/.march/config.json — project config
+ * Scalar values override.
+ */
+export function loadConfig(cwd, { homeDir = homedir() } = {}) {
+  const layers = [];
+
+  // 1. Global config: ~/.march/config
+  const globalPath = join(homeDir, ".march", "config");
+  layers.push(loadJson(globalPath));
+
+  layers.push(loadJson(join(homeDir, ".march", "config.json")));
+
+  // 2. Project config: <cwd>/.marchrc
+  layers.push(loadJson(join(cwd, ".marchrc")));
+
+  // 3. Project dir config: <cwd>/.march/config
+  layers.push(loadJson(join(cwd, ".march", "config")));
+  layers.push(loadJson(join(cwd, ".march", "config.json")));
+
+  return mergeLayers(layers);
+}
+
+function loadJson(path) {
+  if (!existsSync(path)) return null;
+  try {
+    return JSON.parse(readFileSync(path, "utf8"));
+  } catch {
+    return null;
+  }
+}
+
+function mergeLayers(layers) {
+  const result = {
+    model: null,
+    provider: null,
+    serviceTier: null,
+    providers: {},
+    webSearch: { provider: null, providers: {} },
+    hostedTools: {
+      openai: { webSearch: "auto" },
+      openaiCodex: { webSearch: "auto" },
+      azureOpenai: { webSearch: "auto" },
+      anthropic: { webSearch: "auto" },
+      google: { webSearch: "auto" },
+      xai: { webSearch: "auto", xSearch: "auto" },
+    },
+    network: { proxy: "system", ca: "system" },
+    maxTurns: null,
+    trimBatch: null,
+    memoryRoot: null,
+    notifications: { turnEnd: true, desktop: true, bell: false, command: null, minDurationMs: 0, sound: true },
+  };
+  for (const layer of layers) {
+    if (!layer) continue;
+    if (layer.model != null) result.model = layer.model;
+    if (layer.provider) result.provider = layer.provider;
+    if (layer.serviceTier) result.serviceTier = layer.serviceTier;
+    if (layer.providers && typeof layer.providers === "object" && !Array.isArray(layer.providers)) {
+      result.providers = mergeProviders(result.providers, layer.providers);
+    }
+    if (layer.webSearch && typeof layer.webSearch === "object" && !Array.isArray(layer.webSearch)) {
+      result.webSearch = mergeWebSearch(result.webSearch, layer.webSearch);
+    }
+    if (layer.hostedTools && typeof layer.hostedTools === "object" && !Array.isArray(layer.hostedTools)) {
+      result.hostedTools = mergeHostedTools(result.hostedTools, layer.hostedTools);
+    }
+    if (layer.notifications && typeof layer.notifications === "object" && !Array.isArray(layer.notifications)) {
+      result.notifications = {
+        ...result.notifications,
+        ...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;
+  }
+
+  return result;
+}
+
+function mergeWebSearch(current, next) {
+  const merged = {
+    provider: next.provider ?? current.provider ?? null,
+    providers: { ...(current.providers ?? {}) },
+  };
+  if (next.providers && typeof next.providers === "object" && !Array.isArray(next.providers)) {
+    for (const [id, profile] of Object.entries(next.providers)) {
+      if (!profile || typeof profile !== "object" || Array.isArray(profile)) continue;
+      merged.providers[id] = {
+        ...(merged.providers[id] ?? {}),
+        ...profile,
+      };
+    }
+  }
+  return merged;
+}
+
+function mergeHostedTools(current, next) {
+  const merged = {
+    openai: { ...(current.openai ?? {}) },
+    openaiCodex: { ...(current.openaiCodex ?? {}) },
+    azureOpenai: { ...(current.azureOpenai ?? {}) },
+    anthropic: { ...(current.anthropic ?? {}) },
+    google: { ...(current.google ?? {}) },
+    xai: { ...(current.xai ?? {}) },
+  };
+  for (const provider of ["openai", "openaiCodex", "azureOpenai", "anthropic", "google", "xai"]) {
+    if (next[provider] && typeof next[provider] === "object" && !Array.isArray(next[provider])) {
+      merged[provider] = { ...merged[provider], ...next[provider] };
+    }
+  }
+  return merged;
+}
+
+function mergeProviders(current, next) {
+  const merged = { ...current };
+  for (const [id, profile] of Object.entries(next)) {
+    if (!profile || typeof profile !== "object" || Array.isArray(profile)) continue;
+    merged[id] = {
+      ...(merged[id] ?? {}),
+      ...profile,
+      auth: {
+        ...(merged[id]?.auth ?? {}),
+        ...(profile.auth ?? {}),
+      },
+    };
+  }
+  return merged;
+}