micro-models-agent 0.51.1 → 0.52.0

package/dist/config/config.js

@@ -1,5 +1,6 @@
 import { existsSync, readFileSync, unlinkSync, writeFileSync, mkdirSync } from "fs";
 import { join, dirname } from "path";
+import { homedir } from "os";
 import { DEFAULTS } from "./defaults";
 import { DEFAULT_SECURITY_CONFIG } from "./security";
 import { DEFAULT_LSP_CONFIG } from "../modules/lsp/config";
@@ -8,6 +9,12 @@ import { MigrationDetector } from "../migration/detect";
 import { BackupManager } from "../migration/backup";
 import { validateExpertConfig } from "./experts";
 import { ConfigEncryptor } from "../modules/security/encryption";
+import { loadDomainFiles, saveDomainFiles } from "./domains";
+// ── Centralized path constants ──────────────────────────────────────────
+export const CONFIG_DIR = join(homedir(), ".mma");
+export const CONFIG_FILE = join(CONFIG_DIR, "config.json");
+export const CONFIG_DOMAIN_DIR = join(CONFIG_DIR, "config");
+// ── Internal helpers ────────────────────────────────────────────────────
 /**
  * Restore RegExp instances in dangerousPatterns that were serialized as {}
  * (pre-0.8.0 configs) or as {__regex, source, flags} (new format).
@@ -21,7 +28,6 @@ function restoreDangerousPatterns(patterns, defaults) {
     return patterns.map((p, i) => {
         if (p instanceof RegExp)
             return p;
-        // If the pattern was serialized as {__regex, source, flags}, revive it
         if (p && typeof p === "object") {
             const { source, flags } = p;
             if (source && typeof source === "string") {
@@ -33,7 +39,6 @@ function restoreDangerousPatterns(patterns, defaults) {
                 }
             }
         }
-        // Corrupted entry (e.g. serialized as {} pre-0.8.0): use default by index
         return fallback[i] || fallback[0] || p;
     });
 }
@@ -82,13 +87,7 @@ function regexReviver(_key, value) {
     return value;
 }
 /**
- * Legacy npx `args` for LSP servers that predate the fixed invocation
- * (`--yes --package <server> --package typescript@5 …`). These exact arrays
- * are unsafe: without `--yes`/`--package` the servers fail to bootstrap
- * (`Could not find a valid TypeScript installation`) or the package name is
- * wrong, so the server hangs until the initialize timeout. When a stored
- * server's `args` matches one of these (or is missing) it is replaced with the
- * current default args — user-customized arrays that differ are left alone.
+ * Legacy npx `args` for LSP servers that predate the fixed invocation.
  */
 const LEGACY_LSP_SERVER_ARGS = {
     typescript: { args: ["typescript-language-server", "--stdio"], timeout: 30000 },
@@ -98,11 +97,7 @@ const LEGACY_LSP_SERVER_ARGS = {
     css: { args: ["vscode-css-languageserver", "--stdio"], timeout: 60000 },
 };
 /**
- * Replace stale pre-0.41.1 LSP server invocations (npx bootstrap args) with
- * the current defaults, so an old `~/.mma/config.json` that overrides the
- * fixed server args can't silently re-break every LSP server. In-memory only —
- * mirrors the `restoreDangerousPatterns` precedent; the file keeps the old
- * args and is normalized again on every load.
+ * Replace stale pre-0.41.1 LSP server invocations with current defaults.
  */
 function normalizeLspServerArgs(config) {
     const servers = config.lsp?.servers;
@@ -168,9 +163,24 @@ function applyEnvVars(config) {
         result.moe = { ...result.moe, enabled: env.MMA_MOE_ENABLED === "true" };
     return result;
 }
+/**
+ * Load config from domain files (preferred) or legacy config.json (fallback).
+ *
+ * Pipeline:
+ *   1. DEFAULTS
+ *   2. deepMerge(legacy config.json)  — if exists
+ *   3. deepMerge(domain files)        — if exist, override legacy
+ *   4. deepMerge(project .mmrc)       — overrides everything
+ *   5. Post-load fixups (RegExp, LSP args)
+ *   6. Env vars
+ *   7. Decrypt
+ *
+ * On first run (no config.json, no domain files), auto-creates domain files.
+ */
 export function loadConfig(options) {
     const globalPath = join(options.configDir, "config.json");
     mkdirSync(options.configDir, { recursive: true });
+    // v1 → v2 migration check (reads config.json directly, before domain logic)
     const detector = new MigrationDetector(options.configDir);
     if (detector.needsMigration()) {
         const backup = new BackupManager(options.configDir);
@@ -183,40 +193,47 @@ export function loadConfig(options) {
         catch { }
     }
     let config = { ...DEFAULTS };
+    let legacyDetected = false;
+    // Step 1: legacy config.json (fallback)
     const globalData = loadJSON(globalPath);
     if (globalData) {
         config = deepMerge(config, globalData);
+        legacyDetected = true;
     }
-    if (!existsSync(globalPath)) {
-        saveConfig(config, globalPath);
+    // Step 2: domain files (override legacy)
+    const domainConfig = loadDomainFiles(options.configDir);
+    if (domainConfig) {
+        config = deepMerge(config, domainConfig);
+        legacyDetected = false;
     }
+    // Step 3: first run — auto-create domain files instead of config.json
+    if (!globalData && !domainConfig) {
+        saveDomainFiles(config, options.configDir);
+    }
+    // Step 4: project .mmrc (overrides everything)
     const projectData = loadJSON(options.projectConfigPath);
     if (projectData) {
         config = deepMerge(config, projectData);
     }
-    // Restore RegExp patterns in contentScan that may have been serialized
-    // as {} in pre-0.8.0 config files, or merged from user config.
+    // Step 5: post-load fixups — AFTER all merges
     if (config.security?.contentScan?.dangerousPatterns) {
         config.security.contentScan.dangerousPatterns = restoreDangerousPatterns(config.security.contentScan.dangerousPatterns, DEFAULT_SECURITY_CONFIG.contentScan.dangerousPatterns);
     }
-    // Replace stale pre-0.41.1 LSP server args with the current defaults.
     normalizeLspServerArgs(config);
+    // Step 6: env vars
     config = applyEnvVars(config);
-    // Decrypt sensitive fields in the loaded config
+    // Step 7: decrypt
     try {
         const encryptor = new ConfigEncryptor();
         const decrypted = encryptor.decrypt(config);
-        // Merge decrypted sensitive fields back into config
         for (const key of Object.keys(decrypted)) {
             config[key] = decrypted[key];
         }
     }
     catch (e) {
-        // If decryption fails, log a warning but continue with the config
         console.warn(t("config.decryption_warning", { error: e.message }));
     }
-    // Update global audit notifier with config (done in bootstrap.ts)
-    return config;
+    return { config, legacyDetected };
 }
 export function validateConfig(config, allToolTags) {
     const errors = validateExpertConfig(config, allToolTags);
@@ -230,10 +247,21 @@ export function validateConfig(config, allToolTags) {
         throw new Error(`Config validation failed:\n${errors.join("\n")}`);
     }
 }
-export function saveConfig(config, configPath) {
+/**
+ * Save config to domain files (preferred) or legacy single file (fallback).
+ *
+ * @param config   Full AppConfig to save
+ * @param configPath  Legacy path (e.g. ~/.mma/config.json) — used when configDir is absent
+ * @param configDir  Optional config directory (e.g. ~/.mma). When provided, writes domain files.
+ */
+export function saveConfig(config, configPath, configDir) {
+    if (configDir) {
+        saveDomainFiles(config, configDir);
+        return;
+    }
+    // Legacy single-file write (backward compat for tests / edge cases)
     const dir = dirname(configPath);
     mkdirSync(dir, { recursive: true });
-    // Encrypt sensitive fields before saving
     try {
         const encryptor = new ConfigEncryptor();
         const encryptedConfig = encryptor.encrypt({
@@ -242,7 +270,6 @@ export function saveConfig(config, configPath) {
         writeFileSync(configPath, JSON.stringify(encryptedConfig, regexReplacer, 2), "utf-8");
     }
     catch (e) {
-        // If encryption fails, save without encryption
         console.warn(t("config.encryption_warning", { error: e.message }));
         writeFileSync(configPath, JSON.stringify(config, regexReplacer, 2), "utf-8");
     }

package/dist/config/defaults.js

@@ -56,6 +56,8 @@ export const DEFAULTS = {
         maxRetries: 3,
         baseDelay: 1000,
         maxDelay: 30000,
+        maxStreamRetries: 2,
+        noDataTimeoutMs: 180000,
     },
     maxToolIterations: 1000,
     stuckThreshold: 6,
@@ -79,6 +81,21 @@ export const DEFAULTS = {
         viewportHeight: 720,
         navigationTimeout: 15000,
     },
+    webSearch: {
+        enabled: true,
+    },
+    errorWebSearch: {
+        enabled: true,
+        threshold: 5,
+        maxResults: 5,
+        maxQueryChars: 200,
+        maxSearchesPerSession: 3,
+        requestTimeoutMs: 10000,
+    },
+    pricing: {
+        enabled: true,
+        overrides: {},
+    },
     ui: {
         spinner: true,
         toolStyle: "inline",

package/dist/config/domains.js

@@ -0,0 +1,179 @@
+import { existsSync, readFileSync, writeFileSync, mkdirSync, readdirSync } from "fs";
+import { join } from "path";
+/**
+ * Mapping: domain name → AppConfig keys that belong to it.
+ * Each domain becomes one JSON file in ~/.mma/config/<domain>.json.
+ */
+export const CONFIG_DOMAINS = {
+    core: [
+        "version",
+        "model",
+        "contextWindow",
+        "contextBudget",
+        "modelLoad",
+        "maxToolIterations",
+        "stuckThreshold",
+        "autoPlan",
+        "showReasoning",
+        "logLevel",
+        "locale",
+    ],
+    provider: ["provider", "orchestrator", "retry", "pricing"],
+    moe: ["moe", "experts"],
+    security: ["security"],
+    browser: ["browser"],
+    search: ["webSearch", "errorWebSearch"],
+    tools: ["tools", "subagent"],
+    session: ["session", "sessionIsolation"],
+    ui: ["ui"],
+    mcp: ["mcpServers"],
+    lsp: ["lsp"],
+    skills: ["skills"],
+    updater: ["updater"],
+};
+/**
+ * JSON replacer that serializes RegExp objects as {__regex, source, flags}
+ * so they survive JSON.stringify/parse round-trips.
+ */
+function regexReplacer(_key, value) {
+    if (value instanceof RegExp) {
+        return { __regex: true, source: value.source, flags: value.flags };
+    }
+    return value;
+}
+/**
+ * JSON reviver that restores RegExp objects serialized by regexReplacer.
+ */
+function regexReviver(_key, value) {
+    if (value &&
+        typeof value === "object" &&
+        value.__regex === true) {
+        const { source, flags } = value;
+        try {
+            return new RegExp(source, flags);
+        }
+        catch {
+            return value;
+        }
+    }
+    return value;
+}
+/**
+ * Deep merge two objects. Arrays and scalars in source replace target.
+ */
+function deepMerge(target, source) {
+    const result = { ...target };
+    for (const key of Object.keys(source)) {
+        const srcVal = source[key];
+        const tgtVal = target[key];
+        if (srcVal !== null &&
+            srcVal !== undefined &&
+            typeof srcVal === "object" &&
+            !Array.isArray(srcVal) &&
+            typeof tgtVal === "object" &&
+            !Array.isArray(tgtVal)) {
+            result[key] = deepMerge(tgtVal, srcVal);
+        }
+        else if (srcVal !== undefined) {
+            result[key] = srcVal;
+        }
+    }
+    return result;
+}
+/**
+ * Extract a domain subset from a full AppConfig.
+ */
+export function extractDomain(config, domain) {
+    const keys = CONFIG_DOMAINS[domain];
+    if (!keys)
+        return {};
+    const subset = {};
+    for (const key of keys) {
+        if (config[key] !== undefined) {
+            subset[key] = config[key];
+        }
+    }
+    return subset;
+}
+/**
+ * Get the file path for a domain config file.
+ */
+export function getDomainFilePath(configDir, domain) {
+    return join(configDir, "config", `${domain}.json`);
+}
+/**
+ * Check if domain files exist in config/ directory.
+ */
+export function hasDomainFiles(configDir) {
+    const configDirPath = join(configDir, "config");
+    if (!existsSync(configDirPath))
+        return false;
+    try {
+        const files = readdirSync(configDirPath);
+        return files.some((f) => f.endsWith(".json"));
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Load all domain files from ~/.mma/config/ and merge into a partial AppConfig.
+ * Each file is parsed with regexReviver to restore RegExp objects.
+ * Returns null if no domain files exist.
+ */
+export function loadDomainFiles(configDir) {
+    const configDirPath = join(configDir, "config");
+    if (!existsSync(configDirPath))
+        return null;
+    let result = {};
+    let anyLoaded = false;
+    for (const domain of Object.keys(CONFIG_DOMAINS)) {
+        const filePath = getDomainFilePath(configDir, domain);
+        if (!existsSync(filePath))
+            continue;
+        try {
+            const raw = readFileSync(filePath, "utf-8");
+            const data = JSON.parse(raw, regexReviver);
+            result = deepMerge(result, data);
+            anyLoaded = true;
+        }
+        catch {
+            // Skip malformed domain files
+        }
+    }
+    return anyLoaded ? result : null;
+}
+/**
+ * Save a full AppConfig to domain files in ~/.mma/config/.
+ * Each domain's keys are extracted and written to config/<domain>.json.
+ * RegExp objects are serialized via regexReplacer.
+ */
+export function saveDomainFiles(config, configDir) {
+    const configDirPath = join(configDir, "config");
+    mkdirSync(configDirPath, { recursive: true });
+    for (const [domain, keys] of Object.entries(CONFIG_DOMAINS)) {
+        const subset = {};
+        let hasContent = false;
+        for (const key of keys) {
+            if (config[key] !== undefined) {
+                subset[key] = config[key];
+                hasContent = true;
+            }
+        }
+        if (!hasContent)
+            continue;
+        const filePath = getDomainFilePath(configDir, domain);
+        writeFileSync(filePath, JSON.stringify(subset, regexReplacer, 2), "utf-8");
+    }
+}
+/**
+ * Determine which domain a config key belongs to.
+ * Returns the domain name or null if not found.
+ */
+export function domainForKey(key) {
+    for (const [domain, keys] of Object.entries(CONFIG_DOMAINS)) {
+        if (keys.includes(key))
+            return domain;
+    }
+    return null;
+}

package/dist/config/index.js

@@ -1,3 +1,4 @@
 export { DEFAULTS } from "./defaults";
-export { loadConfig, saveConfig, validateConfig } from "./config";
+export { loadConfig, saveConfig, validateConfig, CONFIG_DIR, CONFIG_FILE, CONFIG_DOMAIN_DIR } from "./config";
 export { getExpertConfig, validateExpertConfig } from "./experts";
+export { CONFIG_DOMAINS, extractDomain, hasDomainFiles, loadDomainFiles, saveDomainFiles, getDomainFilePath, domainForKey, } from "./domains";

package/dist/config/security.js

@@ -3,9 +3,9 @@
  * These settings provide a balance between security and usability.
  */
 export const DEFAULT_SECURITY_CONFIG = {
-    enabled: false,
+    enabled: true,
     bash: {
-        enabled: false,
+        enabled: true,
         // Commands that are always blocked (dangerous)
         blacklist: [
             "rm",
@@ -46,15 +46,34 @@ export const DEFAULT_SECURITY_CONFIG = {
             "powershell",
             "pwsh",
             "cmd",
+            "bash",
+            "sh",
+            "zsh",
+            "dash",
+            "python",
+            "python3",
+            "node",
+            // "bun" intentionally NOT blacklisted: the system prompt tells the model
+            // to run TypeScript with `bun <file.ts>` — banning it here contradicts
+            // that and burned a whole session on blocked `bun run build` calls.
+            // Arbitrary-code execution via flags is still caught by INTERPRETER_FLAGS.
+            "perl",
+            "ruby",
+            "del",
+            "rd",
+            "erase",
+            "taskkill",
         ],
         // If whitelist is non-empty, only these commands are allowed
         whitelist: [],
         // Block dangerous flags like --force, -rf, etc.
-        // Disabled by default — enable in config if needed.
-        blockDangerousFlags: false,
+        blockDangerousFlags: true,
         // Log all executed commands to audit log
         logCommands: true,
         // Dangerous flags that are always blocked
+        // Note: -y/--yes are intentionally absent — they are routine, harmless
+        // confirmation flags (npm init -y, apt-get -y) and blocking them breaks
+        // project scaffolding.
         dangerousFlags: [
             "--force",
             "-rf",
@@ -66,14 +85,12 @@ export const DEFAULT_SECURITY_CONFIG = {
             "--delete",
             "--remove",
             "--dangerous",
-            "--yes",
-            "-y",
             "--no-confirm",
         ],
         // Dangerous operators that are always blocked
         // Note: "&" (background) is not blocked — "&&" (AND) is a legitimate shell operator.
         // Single "&" for backgrounding is harmless and blocking it breaks "cd dir && npm install".
-        dangerousOperators: [">", ">>", "2>", "2>>", "`"],
+        dangerousOperators: [">", ">>", "2>", "2>>", ";", "&&", "||", "|", "`", "$("],
     },
     paths: {
         enabled: false,
@@ -98,7 +115,10 @@ export const DEFAULT_SECURITY_CONFIG = {
         allowed: [],
     },
     network: {
-        enabled: false,
+        // SSRF protection (private/link-local IPs, non-http schemes) is part of
+        // the balanced default policy — without this flag the checks in
+        // isUrlAllowed never fire and web tools can reach internal networks.
+        enabled: true,
         // Domains that are always denied
         deniedDomains: ["localhost", "127.0.0.1", "::1"],
         // If allowedDomains is non-empty, only these domains are allowed