march-cli 0.1.24 → 0.1.26

package/src/config/loader.mjs

@@ -1,143 +1,156 @@
-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 },
+    remoteMemories: [],
+  };
+  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;
+    if (Array.isArray(layer.remoteMemories)) result.remoteMemories = mergeRemoteMemories(result.remoteMemories, layer.remoteMemories);
+  }
+  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;
+}
+
+
+function mergeRemoteMemories(current, next) {
+  const merged = [...(current ?? [])];
+  for (const source of next) {
+    if (!source || typeof source !== "object" || Array.isArray(source) || !source.name) continue;
+    const index = merged.findIndex((item) => item?.name === source.name);
+    if (index >= 0) merged[index] = { ...merged[index], ...source };
+    else merged.push({ ...source });
+  }
+  return merged;
+}

package/src/config/settings-command.mjs

@@ -1,97 +1,97 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { dirname, join } from "node:path";
-import { loadConfig } from "./loader.mjs";
-
-const WRITABLE_KEYS = new Set(["memoryRoot"]);
-const SCOPES = new Set(["global", "project"]);
-
-export function parseSettingsCommand(input) {
-  if (input !== "/settings" && !input.startsWith("/settings ")) return { type: "none" };
-  const arg = input.slice("/settings".length).trim();
-  if (!arg) return { type: "view" };
-
-  const setMatch = arg.match(/^set\s+(global|project)\s+(memoryRoot)\s+(.+)$/);
-  if (setMatch) {
-    return { type: "set", scope: setMatch[1], key: setMatch[2], value: setMatch[3].trim() };
-  }
-
-  const unsetMatch = arg.match(/^unset\s+(global|project)\s+(memoryRoot)$/);
-  if (unsetMatch) {
-    return { type: "unset", scope: unsetMatch[1], key: unsetMatch[2] };
-  }
-
-  return { type: "error", message: "Usage: /settings [set <global|project> memoryRoot <value> | unset <global|project> memoryRoot]" };
-}
-
-export function handleSettingsCommand(command, { cwd = process.cwd(), homeDir = homedir() } = {}) {
-  if (command.type === "view") return formatSettingsView({ cwd, homeDir });
-  if (command.type === "error") return [`Error: ${command.message}`];
-  if (!SCOPES.has(command.scope) || !WRITABLE_KEYS.has(command.key)) {
-    return ["Error: unsupported settings scope or key"];
-  }
-
-  const path = settingsPathForScope(command.scope, { cwd, homeDir });
-  const data = readSettingsFile(path);
-  if (command.type === "set") {
-    data[command.key] = command.value;
-  } else if (command.type === "unset") {
-    delete data[command.key];
-  }
-  writeSettingsFile(path, data);
-  return [
-    `Settings ${command.type === "set" ? "updated" : "unset"}: ${command.scope}.${command.key}`,
-    "Changes apply on next March startup; current session runtime is unchanged.",
-    ...formatSettingsView({ cwd, homeDir }),
-  ];
-}
-
-export function formatSettingsView({ cwd = process.cwd(), homeDir = homedir() } = {}) {
-  const globalPath = settingsPathForScope("global", { cwd, homeDir });
-  const projectPath = settingsPathForScope("project", { cwd, homeDir });
-  const globalSettings = readSettingsFile(globalPath);
-  const projectSettings = readSettingsFile(projectPath);
-  const merged = loadConfig(cwd, { homeDir });
-  return [
-    "Settings:",
-    `  configured.providers: ${Object.keys(merged.providers ?? {}).join(", ") || "(none)"}`,
-    `  global: ${globalPath}`,
-    ...formatScopeLines(globalSettings),
-    `  project: ${projectPath}`,
-    ...formatScopeLines(projectSettings),
-    "Commands:",
-    "  /settings set project memoryRoot <path>",
-    "  /settings unset project memoryRoot",
-  ];
-}
-
-function settingsPathForScope(scope, { cwd, homeDir }) {
-  return scope === "global"
-    ? join(homeDir, ".march", "config")
-    : join(cwd, ".march", "config");
-}
-
-function readSettingsFile(path) {
-  if (!existsSync(path)) return {};
-  try {
-    const parsed = JSON.parse(readFileSync(path, "utf8"));
-    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
-  } catch {
-    return {};
-  }
-}
-
-function writeSettingsFile(path, data) {
-  mkdirSync(dirname(path), { recursive: true });
-  writeFileSync(path, `${JSON.stringify(data, null, 2)}\n`, "utf8");
-}
-
-function formatScopeLines(settings) {
-  const keys = Object.keys(settings).sort();
-  if (keys.length === 0) return ["    (empty)"];
-  return keys.map((key) => `    ${key}: ${formatSettingValue(settings[key])}`);
-}
-
-function formatSettingValue(value) {
-  return Array.isArray(value) ? value.join(", ") : String(value);
-}
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
+import { loadConfig } from "./loader.mjs";
+
+const WRITABLE_KEYS = new Set(["memoryRoot"]);
+const SCOPES = new Set(["global", "project"]);
+
+export function parseSettingsCommand(input) {
+  if (input !== "/settings" && !input.startsWith("/settings ")) return { type: "none" };
+  const arg = input.slice("/settings".length).trim();
+  if (!arg) return { type: "view" };
+
+  const setMatch = arg.match(/^set\s+(global|project)\s+(memoryRoot)\s+(.+)$/);
+  if (setMatch) {
+    return { type: "set", scope: setMatch[1], key: setMatch[2], value: setMatch[3].trim() };
+  }
+
+  const unsetMatch = arg.match(/^unset\s+(global|project)\s+(memoryRoot)$/);
+  if (unsetMatch) {
+    return { type: "unset", scope: unsetMatch[1], key: unsetMatch[2] };
+  }
+
+  return { type: "error", message: "Usage: /settings [set <global|project> memoryRoot <value> | unset <global|project> memoryRoot]" };
+}
+
+export function handleSettingsCommand(command, { cwd = process.cwd(), homeDir = homedir() } = {}) {
+  if (command.type === "view") return formatSettingsView({ cwd, homeDir });
+  if (command.type === "error") return [`Error: ${command.message}`];
+  if (!SCOPES.has(command.scope) || !WRITABLE_KEYS.has(command.key)) {
+    return ["Error: unsupported settings scope or key"];
+  }
+
+  const path = settingsPathForScope(command.scope, { cwd, homeDir });
+  const data = readSettingsFile(path);
+  if (command.type === "set") {
+    data[command.key] = command.value;
+  } else if (command.type === "unset") {
+    delete data[command.key];
+  }
+  writeSettingsFile(path, data);
+  return [
+    `Settings ${command.type === "set" ? "updated" : "unset"}: ${command.scope}.${command.key}`,
+    "Changes apply on next March startup; current session runtime is unchanged.",
+    ...formatSettingsView({ cwd, homeDir }),
+  ];
+}
+
+export function formatSettingsView({ cwd = process.cwd(), homeDir = homedir() } = {}) {
+  const globalPath = settingsPathForScope("global", { cwd, homeDir });
+  const projectPath = settingsPathForScope("project", { cwd, homeDir });
+  const globalSettings = readSettingsFile(globalPath);
+  const projectSettings = readSettingsFile(projectPath);
+  const merged = loadConfig(cwd, { homeDir });
+  return [
+    "Settings:",
+    `  configured.providers: ${Object.keys(merged.providers ?? {}).join(", ") || "(none)"}`,
+    `  global: ${globalPath}`,
+    ...formatScopeLines(globalSettings),
+    `  project: ${projectPath}`,
+    ...formatScopeLines(projectSettings),
+    "Commands:",
+    "  /settings set project memoryRoot <path>",
+    "  /settings unset project memoryRoot",
+  ];
+}
+
+function settingsPathForScope(scope, { cwd, homeDir }) {
+  return scope === "global"
+    ? join(homeDir, ".march", "config")
+    : join(cwd, ".march", "config");
+}
+
+function readSettingsFile(path) {
+  if (!existsSync(path)) return {};
+  try {
+    const parsed = JSON.parse(readFileSync(path, "utf8"));
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+
+function writeSettingsFile(path, data) {
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(path, `${JSON.stringify(data, null, 2)}\n`, "utf8");
+}
+
+function formatScopeLines(settings) {
+  const keys = Object.keys(settings).sort();
+  if (keys.length === 0) return ["    (empty)"];
+  return keys.map((key) => `    ${key}: ${formatSettingValue(settings[key])}`);
+}
+
+function formatSettingValue(value) {
+  return Array.isArray(value) ? value.join(", ") : String(value);
+}