@livx.cc/agentx 0.99.75 → 0.99.76

package/dist/cli.d.ts

@@ -147,6 +147,7 @@ interface Args {
     appendSystemPrompt?: string;
     voiceSystemPrompt?: string;
     addDirs?: string[];
+    mcpConfig?: string;
     print?: boolean;
     debug?: boolean;
     scratch?: boolean;

package/dist/cli.js

@@ -12889,14 +12889,90 @@ var JsonlDiagSink = class {
 };
 
 // cli/config.ts
-import { homedir as homedir4 } from "os";
+import { homedir as homedir5 } from "os";
 import { existsSync as existsSync5, readFileSync as readFileSync7 } from "fs";
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 import { pathToFileURL } from "url";
+
+// cli/permissions.ts
+import { writeFileSync as writeFileSync4, mkdirSync as mkdirSync7 } from "fs";
+import { homedir as homedir4 } from "os";
+import { join as join7 } from "path";
+var RULE_RE = /^(\w[\w*-]*)(?:\((.+)\))?$/;
+function parseOne(raw, decision) {
+  const m = RULE_RE.exec(raw.trim());
+  if (!m) return null;
+  const [, tool, pathGlob] = m;
+  return pathGlob ? { tool, pathGlob, decision } : { tool, decision };
+}
+function parsePermRules(perms, explicit = false) {
+  if (!perms) return [];
+  const out = [];
+  for (const [decision, list] of [["deny", perms.deny], ["allow", perms.allow], ["ask", perms.ask]]) {
+    for (const raw of list ?? []) {
+      const r = parseOne(raw, decision);
+      if (r) out.push(explicit ? { ...r, explicit } : r);
+    }
+  }
+  return out;
+}
+function describeRule(r) {
+  return `${r.decision.padEnd(5)} ${r.tool ?? "*"}${r.pathGlob ? `(${r.pathGlob})` : ""}`;
+}
+var PERM_FILE = (cwd) => join7(cwd, ".agent", "permissions.json");
+function loadPersistedRules(cwd) {
+  const j = readJsonFile(PERM_FILE(cwd), null);
+  return j ? { allow: j.allow ?? [], ask: j.ask ?? [], deny: j.deny ?? [] } : {};
+}
+function loadClaudeSettings(cwd, home = homedir4()) {
+  const files = [join7(home, ".claude", "settings.json"), join7(cwd, ".claude", "settings.json"), join7(cwd, ".claude", "settings.local.json")];
+  let out = {};
+  for (const p of files) {
+    const perms = readJsonFile(p, null)?.permissions;
+    if (perms) out = mergePerms(out, { allow: perms.allow, ask: perms.ask, deny: perms.deny }) ?? out;
+  }
+  return out;
+}
+function persistRule(cwd, decision, ruleStr) {
+  const cur = loadPersistedRules(cwd);
+  const list = cur[decision] ??= [];
+  if (!list.includes(ruleStr)) list.push(ruleStr);
+  try {
+    mkdirSync7(join7(cwd, ".agent"), { recursive: true });
+    writeFileSync4(PERM_FILE(cwd), JSON.stringify(cur, null, 2) + "\n");
+  } catch {
+  }
+}
+function mergePerms(a, b) {
+  if (!a && !b) return void 0;
+  const out = {};
+  for (const k of ["allow", "ask", "deny"]) {
+    const merged = [...a?.[k] ?? [], ...b?.[k] ?? []];
+    if (merged.length) out[k] = [...new Set(merged)];
+  }
+  return Object.keys(out).length ? out : void 0;
+}
+var TRUST_FILE = join7(homedir4(), ".agent", "trusted.json");
+function isTrusted(cwd, file = TRUST_FILE) {
+  const list = readJsonFile(file, []);
+  return Array.isArray(list) && list.includes(cwd);
+}
+function trustDir(cwd, file = TRUST_FILE) {
+  let list = readJsonFile(file, []);
+  if (!Array.isArray(list)) list = [];
+  if (!list.includes(cwd)) list.push(cwd);
+  try {
+    mkdirSync7(join7(file, ".."), { recursive: true });
+    writeFileSync4(file, JSON.stringify(list, null, 2) + "\n");
+  } catch {
+  }
+}
+
+// cli/config.ts
 var FILES = ["config.ts", "config.js", "config.mjs", "config.json"];
 async function loadFrom(dir) {
   for (const f of FILES) {
-    const p = join7(dir, ".agent", f);
+    const p = join8(dir, ".agent", f);
     if (!existsSync5(p)) continue;
     try {
       const mod = await import(pathToFileURL(p).href, f.endsWith(".json") ? { with: { type: "json" } } : void 0);
@@ -12909,7 +12985,7 @@ async function loadFrom(dir) {
   return {};
 }
 function loadSettings(dir) {
-  const p = join7(dir, ".agent", "settings.json");
+  const p = join8(dir, ".agent", "settings.json");
   if (!existsSync5(p)) return {};
   try {
     const raw = JSON.parse(readFileSync7(p, "utf8"));
@@ -12932,17 +13008,28 @@ function loadSettings(dir) {
     return {};
   }
 }
-async function loadConfig(cwd) {
-  const userSettings = loadSettings(homedir4());
-  const user = await loadFrom(homedir4());
+async function loadConfig(cwd, overlayFile) {
+  const userSettings = loadSettings(homedir5());
+  const user = await loadFrom(homedir5());
   const projectSettings = loadSettings(cwd);
   const project = await loadFrom(cwd);
   const merged = { ...userSettings, ...user, ...projectSettings, ...project };
   if (userSettings.mcpServers || user.mcpServers || projectSettings.mcpServers || project.mcpServers) {
     merged.mcpServers = { ...userSettings.mcpServers, ...user.mcpServers, ...projectSettings.mcpServers, ...project.mcpServers };
   }
+  if (overlayFile) applyOverlay(merged, overlayFile);
   return merged;
 }
+function applyOverlay(cfg, file) {
+  let raw;
+  try {
+    raw = JSON.parse(readFileSync7(file, "utf8"));
+  } catch (e) {
+    throw new Error(`--mcp-config ${file}: ${e?.message ?? e}`);
+  }
+  if (raw?.mcpServers && typeof raw.mcpServers === "object") cfg.mcpServers = { ...cfg.mcpServers, ...raw.mcpServers };
+  if (raw?.permissions && typeof raw.permissions === "object") cfg.permissions = mergePerms(cfg.permissions, raw.permissions);
+}
 
 // cli/hooks-config.ts
 import { spawnSync as spawnSync3 } from "child_process";
@@ -13067,15 +13154,15 @@ function formatDiff(ops, opts = {}) {
 }
 
 // cli/session.ts
-import { existsSync as existsSync6, mkdirSync as mkdirSync7, readFileSync as readFileSync8, writeFileSync as writeFileSync4, readdirSync, renameSync, symlinkSync as symlinkSync2, unlinkSync, readlinkSync, statSync as statSync6 } from "fs";
-import { homedir as homedir5 } from "os";
-import { join as join8 } from "path";
+import { existsSync as existsSync6, mkdirSync as mkdirSync8, readFileSync as readFileSync8, writeFileSync as writeFileSync5, readdirSync, renameSync, symlinkSync as symlinkSync2, unlinkSync, readlinkSync, statSync as statSync6 } from "fs";
+import { homedir as homedir6 } from "os";
+import { join as join9 } from "path";
 var log30 = forComponent("session");
-var globalDir = () => join8(homedir5(), ".agent", "sessions");
+var globalDir = () => join9(homedir6(), ".agent", "sessions");
 var SessionStore = class {
   dir;
   constructor(cwd) {
-    this.dir = join8(cwd, ".agent", "sessions");
+    this.dir = join9(cwd, ".agent", "sessions");
   }
   /** Sortable, human-readable id: `YYYYMMDD-HHMMSS-<folder>`. */
   newId(now4 = Date.now(), cwd) {
@@ -13083,10 +13170,10 @@ var SessionStore = class {
     const p = (n, w = 2) => String(n).padStart(w, "0");
     const slug2 = (cwd ?? process.cwd()).split("/").pop()?.replace(/[^A-Za-z0-9_-]/g, "") || "session";
     let id = `${d.getFullYear()}${p(d.getMonth() + 1)}${p(d.getDate())}-${p(d.getHours())}${p(d.getMinutes())}${p(d.getSeconds())}-${slug2}`;
-    if (existsSync6(this.dir) && existsSync6(join8(this.dir, `${id}.json`))) {
+    if (existsSync6(this.dir) && existsSync6(join9(this.dir, `${id}.json`))) {
       for (let i = 2; i <= 99; i++) {
         const c = `${id}-${i}`;
-        if (!existsSync6(join8(this.dir, `${c}.json`))) {
+        if (!existsSync6(join9(this.dir, `${c}.json`))) {
           id = c;
           break;
         }
@@ -13100,15 +13187,15 @@ var SessionStore = class {
   }
   save(data) {
     if (!this.safeId(data.meta.id)) throw new Error(`unsafe session id: ${data.meta.id}`);
-    if (!existsSync6(this.dir)) mkdirSync7(this.dir, { recursive: true });
-    const path = join8(this.dir, `${data.meta.id}.json`);
+    if (!existsSync6(this.dir)) mkdirSync8(this.dir, { recursive: true });
+    const path = join9(this.dir, `${data.meta.id}.json`);
     const tmp = `${path}.${process.pid}.tmp`;
-    writeFileSync4(tmp, JSON.stringify(data));
+    writeFileSync5(tmp, JSON.stringify(data));
     renameSync(tmp, path);
     try {
       const gd = globalDir();
-      if (!existsSync6(gd)) mkdirSync7(gd, { recursive: true });
-      const link2 = join8(gd, `${data.meta.id}.json`);
+      if (!existsSync6(gd)) mkdirSync8(gd, { recursive: true });
+      const link2 = join9(gd, `${data.meta.id}.json`);
       if (!existsSync6(link2)) symlinkSync2(path, link2);
     } catch {
     }
@@ -13118,7 +13205,7 @@ var SessionStore = class {
       log30.debug(`rejecting unsafe session id: ${id}`);
       return void 0;
     }
-    const path = join8(this.dir, `${id}.json`);
+    const path = join9(this.dir, `${id}.json`);
     if (!existsSync6(path)) return void 0;
     try {
       return JSON.parse(readFileSync8(path, "utf8"));
@@ -13134,7 +13221,7 @@ var SessionStore = class {
     for (const f of readdirSync(this.dir)) {
       if (!f.endsWith(".json")) continue;
       try {
-        metas.push(JSON.parse(readFileSync8(join8(this.dir, f), "utf8")).meta);
+        metas.push(JSON.parse(readFileSync8(join9(this.dir, f), "utf8")).meta);
       } catch (e) {
         log30.debug(`skipping unreadable session file ${f}`, e);
       }
@@ -13149,7 +13236,7 @@ var SessionStore = class {
     for (const f of readdirSync(this.dir)) {
       if (!f.endsWith(".json")) continue;
       try {
-        const st = statSync6(join8(this.dir, f));
+        const st = statSync6(join9(this.dir, f));
         out.push({ id: f.slice(0, -5), mtime: st.mtimeMs, size: st.size });
       } catch {
       }
@@ -13168,7 +13255,7 @@ var SessionStore = class {
 function globalSessionLoad(idOrPrefix) {
   const gd = globalDir();
   if (!existsSync6(gd)) return void 0;
-  const exact = join8(gd, `${idOrPrefix}.json`);
+  const exact = join9(gd, `${idOrPrefix}.json`);
   if (existsSync6(exact)) {
     try {
       const target = readlinkSync(exact);
@@ -13182,7 +13269,7 @@ function globalSessionLoad(idOrPrefix) {
       if (!f.endsWith(".json")) continue;
       const base = f.slice(0, -5);
       if (base.includes(idOrPrefix) || base.endsWith(idOrPrefix)) {
-        const target = readlinkSync(join8(gd, f));
+        const target = readlinkSync(join9(gd, f));
         return JSON.parse(readFileSync8(target, "utf8"));
       }
     }
@@ -13197,10 +13284,10 @@ function globalSessionList() {
   for (const f of readdirSync(gd)) {
     if (!f.endsWith(".json")) continue;
     try {
-      const target = readlinkSync(join8(gd, f));
+      const target = readlinkSync(join9(gd, f));
       if (!existsSync6(target)) {
         try {
-          unlinkSync(join8(gd, f));
+          unlinkSync(join9(gd, f));
         } catch {
         }
         continue;
@@ -13372,15 +13459,15 @@ ${formatDiff(ops)}`);
 // cli/gitCheckpoints.ts
 import { execFile as execFile3 } from "child_process";
 import { promisify } from "util";
-import { writeFileSync as writeFileSync5, mkdirSync as mkdirSync8 } from "fs";
-import { homedir as homedir6 } from "os";
-import { join as join9, resolve as resolve3, sep as sep3, parse as parsePath } from "path";
+import { writeFileSync as writeFileSync6, mkdirSync as mkdirSync9 } from "fs";
+import { homedir as homedir7 } from "os";
+import { join as join10, resolve as resolve3, sep as sep3, parse as parsePath } from "path";
 var log31 = forComponent("checkpoints");
 var exec = promisify(execFile3);
 var DEFAULT_EXCLUDE = [".agent/", ".git/", "node_modules/", "dist/", "build/", ".next/", "target/", ".venv/", "__pycache__/", "*.log"];
 function isBroadRoot(p) {
   const abs = resolve3(p);
-  return abs === resolve3(homedir6()) || abs === parsePath(abs).root;
+  return abs === resolve3(homedir7()) || abs === parsePath(abs).root;
 }
 var ShadowRepo = class {
   // undefined = unprobed; false = git/this root unusable
@@ -13414,11 +13501,11 @@ var ShadowRepo = class {
     if (this.ready !== void 0) return this.ready;
     try {
       await exec(this.git, ["--version"]);
-      mkdirSync8(this.gitDir, { recursive: true });
+      mkdirSync9(this.gitDir, { recursive: true });
       const valid = await this.run("rev-parse", "--git-dir").then(() => true, () => false);
       if (!valid) await this.run("init", "-q");
-      mkdirSync8(join9(this.gitDir, "info"), { recursive: true });
-      writeFileSync5(join9(this.gitDir, "info", "exclude"), this.exclude.join("\n") + "\n");
+      mkdirSync9(join10(this.gitDir, "info"), { recursive: true });
+      writeFileSync6(join10(this.gitDir, "info", "exclude"), this.exclude.join("\n") + "\n");
       this.ready = true;
     } catch (e) {
       log31.debug(`git checkpoints unavailable for ${this.workTree}`, e);
@@ -13533,7 +13620,7 @@ var GitCheckpoints = class {
       const abs = resolve3(d);
       if (abs === cwd || abs.startsWith(cwd + sep3)) continue;
       if (cwd.startsWith(abs + sep3)) continue;
-      out.push({ workTree: abs, gitDir: join9(abs, ".agent", "checkpoints.git") });
+      out.push({ workTree: abs, gitDir: join10(abs, ".agent", "checkpoints.git") });
     }
     return out;
   }
@@ -13676,7 +13763,7 @@ var GitCheckpointsOptions = class {
   /** Real working tree to snapshot (the launch cwd). */
   workTree = process.cwd();
   /** Isolated git dir for the cwd shadow repo (kept out of the user's real .git). */
-  gitDir = join9(process.cwd(), ".agent", "checkpoints.git");
+  gitDir = join10(process.cwd(), ".agent", "checkpoints.git");
   /** Extra mounted dirs (`--add-dir`); those outside cwd each get their own shadow repo. */
   addDirs = [];
   /** Conversation id → per-session restore-point ref. */
@@ -13691,80 +13778,6 @@ var GitCheckpointsOptions = class {
   git = "git";
 };
 
-// cli/permissions.ts
-import { writeFileSync as writeFileSync6, mkdirSync as mkdirSync9 } from "fs";
-import { homedir as homedir7 } from "os";
-import { join as join10 } from "path";
-var RULE_RE = /^(\w[\w*-]*)(?:\((.+)\))?$/;
-function parseOne(raw, decision) {
-  const m = RULE_RE.exec(raw.trim());
-  if (!m) return null;
-  const [, tool, pathGlob] = m;
-  return pathGlob ? { tool, pathGlob, decision } : { tool, decision };
-}
-function parsePermRules(perms, explicit = false) {
-  if (!perms) return [];
-  const out = [];
-  for (const [decision, list] of [["deny", perms.deny], ["allow", perms.allow], ["ask", perms.ask]]) {
-    for (const raw of list ?? []) {
-      const r = parseOne(raw, decision);
-      if (r) out.push(explicit ? { ...r, explicit } : r);
-    }
-  }
-  return out;
-}
-function describeRule(r) {
-  return `${r.decision.padEnd(5)} ${r.tool ?? "*"}${r.pathGlob ? `(${r.pathGlob})` : ""}`;
-}
-var PERM_FILE = (cwd) => join10(cwd, ".agent", "permissions.json");
-function loadPersistedRules(cwd) {
-  const j = readJsonFile(PERM_FILE(cwd), null);
-  return j ? { allow: j.allow ?? [], ask: j.ask ?? [], deny: j.deny ?? [] } : {};
-}
-function loadClaudeSettings(cwd, home = homedir7()) {
-  const files = [join10(home, ".claude", "settings.json"), join10(cwd, ".claude", "settings.json"), join10(cwd, ".claude", "settings.local.json")];
-  let out = {};
-  for (const p of files) {
-    const perms = readJsonFile(p, null)?.permissions;
-    if (perms) out = mergePerms(out, { allow: perms.allow, ask: perms.ask, deny: perms.deny }) ?? out;
-  }
-  return out;
-}
-function persistRule(cwd, decision, ruleStr) {
-  const cur = loadPersistedRules(cwd);
-  const list = cur[decision] ??= [];
-  if (!list.includes(ruleStr)) list.push(ruleStr);
-  try {
-    mkdirSync9(join10(cwd, ".agent"), { recursive: true });
-    writeFileSync6(PERM_FILE(cwd), JSON.stringify(cur, null, 2) + "\n");
-  } catch {
-  }
-}
-function mergePerms(a, b) {
-  if (!a && !b) return void 0;
-  const out = {};
-  for (const k of ["allow", "ask", "deny"]) {
-    const merged = [...a?.[k] ?? [], ...b?.[k] ?? []];
-    if (merged.length) out[k] = [...new Set(merged)];
-  }
-  return Object.keys(out).length ? out : void 0;
-}
-var TRUST_FILE = join10(homedir7(), ".agent", "trusted.json");
-function isTrusted(cwd, file = TRUST_FILE) {
-  const list = readJsonFile(file, []);
-  return Array.isArray(list) && list.includes(cwd);
-}
-function trustDir(cwd, file = TRUST_FILE) {
-  let list = readJsonFile(file, []);
-  if (!Array.isArray(list)) list = [];
-  if (!list.includes(cwd)) list.push(cwd);
-  try {
-    mkdirSync9(join10(file, ".."), { recursive: true });
-    writeFileSync6(file, JSON.stringify(list, null, 2) + "\n");
-  } catch {
-  }
-}
-
 // cli/complete.ts
 function lastToken(line) {
   const m = line.match(/(\S*)$/);
@@ -15973,6 +15986,7 @@ function parseArgs(argv) {
     else if (x === "--append-system-prompt") a.appendSystemPrompt = val(++i, x);
     else if (x === "--voice-system-prompt") a.voiceSystemPrompt = val(++i, x);
     else if (x === "--add-dir") (a.addDirs ??= []).push(val(++i, x));
+    else if (x === "--mcp-config") a.mcpConfig = val(++i, x);
     else if (x === "--reasoning") a.reasoning = parseReasoning(val(++i, x));
     else if (x === "--session-id") a.sessionId = val(++i, x);
     else if (x === "--fork-session") a.fork = true;
@@ -16054,6 +16068,7 @@ Flags:
   --no-think           with --duplex: disable the Think tier (Act handles everything)
   --voice-system-prompt <text>  with --duplex: appended to the voice (reflex) prompt only (--append-system-prompt \u2192 workers)
   --add-dir <path>     mount another directory into the workspace (repeatable; disk mode only)
+  --mcp-config <file>  JSON { mcpServers?, permissions? } merged over .agent config for this run only
   --subagents          allow the Task tool (spawn child agents)
   --reasoning <e>      extended thinking: off|low|medium|high or a token budget (anthropic/openai)
   --session-id <id>    use this id for the session (instead of an auto-generated one)
@@ -19610,7 +19625,7 @@ async function main() {
     };
   }
   const cwd = resolve4(args.cwd ?? process.cwd());
-  const cfg = await loadConfig(cwd);
+  const cfg = await loadConfig(cwd, args.mcpConfig && resolve4(args.mcpConfig));
   if (!args.autoRoute && !args.model && (cfg.model === "auto" || !cfg.model && await jevAvailable())) {
     args.autoRoute = true;
     args.model = autoModels().standard;