@livx.cc/agentx 0.99.5 → 0.99.6

package/dist/cli.js

@@ -1959,7 +1959,7 @@ var init_tools_shell = __esm({
 // cli/cli.ts
 import { createInterface } from "readline/promises";
 import { existsSync as existsSync9, readFileSync as readFileSync8, appendFileSync, mkdirSync as mkdirSync11, writeFileSync as writeFileSync9, readdirSync as readdirSync4, statSync as statSync4, unlinkSync as unlinkSync5 } from "fs";
-import { homedir as homedir9, tmpdir as tmpdir3 } from "os";
+import { homedir as homedir10, tmpdir as tmpdir3 } from "os";
 import { spawnSync as spawnSync6 } from "child_process";
 
 // cli/clipboard.ts
@@ -8433,22 +8433,29 @@ ${formatDiff(ops)}`);
 import { execFile as execFile3 } from "child_process";
 import { promisify } from "util";
 import { writeFileSync as writeFileSync5, mkdirSync as mkdirSync7 } from "fs";
-import { join as join9, resolve as resolve2, sep as sep2 } from "path";
+import { homedir as homedir6 } from "os";
+import { join as join9, resolve as resolve2, sep as sep2, parse as parsePath } from "path";
 var log20 = 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 = resolve2(p);
+  return abs === resolve2(homedir6()) || abs === parsePath(abs).root;
+}
 var ShadowRepo = class {
   // undefined = unprobed; false = git/this root unusable
-  constructor(workTree, gitDir, exclude, git2) {
+  constructor(workTree, gitDir, exclude, git2, timeoutMs) {
     this.workTree = workTree;
     this.gitDir = gitDir;
     this.exclude = exclude;
     this.git = git2;
+    this.timeoutMs = timeoutMs;
   }
   workTree;
   gitDir;
   exclude;
   git;
+  timeoutMs;
   ready;
   /** Absolute work-tree root — used to route force-tracked paths to the repo that contains them. */
   get root() {
@@ -8457,7 +8464,9 @@ var ShadowRepo = class {
   async run(...args) {
     const { stdout } = await exec(this.git, ["-c", "core.hooksPath=/dev/null", ...args], {
       env: { ...process.env, GIT_DIR: this.gitDir, GIT_WORK_TREE: this.workTree },
-      maxBuffer: 64 * 1024 * 1024
+      maxBuffer: 64 * 1024 * 1024,
+      timeout: this.timeoutMs,
+      killSignal: "SIGKILL"
     });
     return stdout;
   }
@@ -8570,7 +8579,7 @@ var GitCheckpoints = class {
   constructor(options) {
     this.options = { ...new GitCheckpointsOptions(), ...options };
     this.session = this.options.sessionId;
-    this.repos = this.roots().map((r) => new ShadowRepo(r.workTree, r.gitDir, this.options.exclude, this.options.git));
+    this.repos = this.roots().map((r) => new ShadowRepo(r.workTree, r.gitDir, this.options.exclude, this.options.git, this.options.opTimeoutMs));
     this.caches = this.repos.map(() => []);
   }
   ref() {
@@ -8595,14 +8604,23 @@ var GitCheckpoints = class {
     const usable = [];
     const caches = [];
     const cutoff = Math.floor(Date.now() / 1e3) - this.options.retainDays * 86400;
+    let gitFailed = false;
     for (const r of this.repos) {
-      if (!await r.init()) continue;
+      if (isBroadRoot(r.root)) {
+        process.stderr.write(`\x1B[2m  checkpoints: '${r.root}' is too broad (home/root) \u2014 file rewind disabled here\x1B[0m
+`);
+        continue;
+      }
+      if (!await r.init()) {
+        gitFailed = true;
+        continue;
+      }
       await r.point(this.ref());
       await r.prune(cutoff, this.ref());
       usable.push(r);
       caches.push([]);
     }
-    if (!usable.length && this.repos.length)
+    if (!usable.length && gitFailed)
       process.stderr.write("\x1B[2m  checkpoints: git unavailable \u2014 file rewind disabled (conversation rewind still works)\x1B[0m\n");
     this.repos = usable;
     this.caches = caches;
@@ -8618,15 +8636,28 @@ var GitCheckpoints = class {
     const msg = sanitizeLabel(label, 72) || "(turn)";
     let slow;
     if (!this.snapshotted) slow = setTimeout(() => process.stderr.write("\x1B[2m  checkpointing initial workspace snapshot\u2026\x1B[0m\n"), 1500);
+    const survivors = [], survivorCaches = [];
     for (let i = 0; i < this.repos.length; i++) {
       const forced = [...this.forced].filter((p) => this.repoIndexFor(p) === i);
       try {
         await this.repos[i].commit(msg, forced);
+        survivors.push(this.repos[i]);
+        survivorCaches.push(this.caches[i] ?? []);
       } catch (e) {
-        log20.debug("checkpoint commit failed", e);
+        const timedOut = e?.killed;
+        if (!this.snapshotted && timedOut) {
+          process.stderr.write(`\x1B[2m  checkpoints: '${this.repos[i].root}' too large to snapshot in ${Math.round(this.options.opTimeoutMs / 1e3)}s \u2014 file rewind disabled here\x1B[0m
+`);
+        } else {
+          log20.debug("checkpoint commit failed", e);
+          survivors.push(this.repos[i]);
+          survivorCaches.push(this.caches[i] ?? []);
+        }
       }
     }
     if (slow) clearTimeout(slow);
+    this.repos = survivors;
+    this.caches = survivorCaches;
     this.snapshotted = true;
   }
   /** Index of the repo whose work-tree contains `abs` (longest-prefix wins for nested roots); -1 if none. */
@@ -8714,13 +8745,15 @@ var GitCheckpointsOptions = class {
   retainDays = 30;
   /** Paths the shadow repos always ignore (heavy/derived/VCS), beyond the user's own .gitignore. */
   exclude = [...DEFAULT_EXCLUDE];
+  /** Per-git-op wall-clock cap (ms). A root that can't snapshot within this is dropped, not left to hang. */
+  opTimeoutMs = 3e4;
   /** git executable. */
   git = "git";
 };
 
 // cli/permissions.ts
 import { writeFileSync as writeFileSync6, mkdirSync as mkdirSync8 } from "fs";
-import { homedir as homedir6 } from "os";
+import { homedir as homedir7 } from "os";
 import { join as join10 } from "path";
 var RULE_RE = /^(\w+)(?:\((.+)\))?$/;
 function parseOne(raw, decision) {
@@ -8748,7 +8781,7 @@ 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 = homedir6()) {
+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) {
@@ -8776,7 +8809,7 @@ function mergePerms(a, b) {
   }
   return Object.keys(out).length ? out : void 0;
 }
-var TRUST_FILE = join10(homedir6(), ".agent", "trusted.json");
+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);
@@ -10368,7 +10401,7 @@ function readPlainLine() {
 // cli/osScheduler.ts
 import { spawnSync as spawnSync5 } from "child_process";
 import { writeFileSync as writeFileSync8, mkdirSync as mkdirSync9, readdirSync as readdirSync2, unlinkSync as unlinkSync3, chmodSync, existsSync as existsSync7 } from "fs";
-import { homedir as homedir7 } from "os";
+import { homedir as homedir8 } from "os";
 import { join as join12 } from "path";
 var log21 = forComponent("os-sched");
 var OsScheduler = class {
@@ -10525,7 +10558,7 @@ ${expr} /bin/sh ${script} # agentx-sched-${spec.id}
 };
 var OsSchedulerOptions = class {
   platform = process.platform;
-  home = homedir7();
+  home = homedir8();
   /** How the fired job invokes the CLI — a RAW shell snippet (may be `bun /path/cli.ts`). Default: `agentx` on PATH. */
   agentx = "agentx";
   /** Injectable executor for tests. Returns stdout+stderr merged — `at` reports "job N" on STDERR,
@@ -10547,10 +10580,10 @@ function routeTrigger(trigger, backendHint, now5 = Date.now()) {
 import { createServer as createServer2, createConnection } from "net";
 import { spawn as spawn3 } from "child_process";
 import { existsSync as existsSync8, mkdirSync as mkdirSync10, unlinkSync as unlinkSync4, readdirSync as readdirSync3 } from "fs";
-import { homedir as homedir8 } from "os";
+import { homedir as homedir9 } from "os";
 import { join as join13 } from "path";
 var log22 = forComponent("remote-trigger");
-var TRIGGER_DIR = () => join13(homedir8(), ".agent", "triggers");
+var TRIGGER_DIR = () => join13(homedir9(), ".agent", "triggers");
 var sockPath = (sessionId, dir = TRIGGER_DIR()) => join13(dir, `${sessionId}.sock`);
 var TriggerServer = class {
   constructor(onTrigger) {
@@ -10980,7 +11013,7 @@ function loadInstallEnv() {
   for (let i = 0; i < 5 && !existsSync9(join14(dir, "package.json")); i++) dir = dirname4(dir);
   for (const name of [".env", ".env.local"]) {
     loadEnvFile(join14(dir, name));
-    loadEnvFile(join14(homedir9(), ".agent", name));
+    loadEnvFile(join14(homedir10(), ".agent", name));
   }
 }
 async function loadBodifySecrets() {
@@ -11636,7 +11669,7 @@ var IMG_EXT = { ".png": "image/png", ".jpg": "image/jpeg", ".jpeg": "image/jpeg"
 function mentionRefs(line) {
   return [...line.matchAll(/(?:^|\s)@(?:"([^"]+)"|(\S+))/g)].map((m) => m[1] ?? m[2].replace(/[?!.,;:)\]}'">]+$/, "")).filter(Boolean);
 }
-var untilde = (p) => p.startsWith("~/") ? join14(homedir9(), p.slice(2)) : p;
+var untilde = (p) => p.startsWith("~/") ? join14(homedir10(), p.slice(2)) : p;
 function readImageParts(cwd, line) {
   const refs = mentionRefs(line);
   const parts = [];
@@ -12735,7 +12768,7 @@ ${task}`;
         }
         const info = getModelInfo(work.model);
         info?.pricing ? ok(`model ${work.model} \u2014 priced (${info.pricing.inputCostPer1K}/${info.pricing.outputCostPer1K} per 1k in/out)`) : warn(`model ${work.model} \u2014 no pricing in the catalog (costs will show ~$0; verify the id)`);
-        const cfgFiles = ["ts", "js", "json"].flatMap((e) => [`${cwd}/.agent/config.${e}`, `${homedir9()}/.agent/config.${e}`]).filter((p) => existsSync9(p));
+        const cfgFiles = ["ts", "js", "json"].flatMap((e) => [`${cwd}/.agent/config.${e}`, `${homedir10()}/.agent/config.${e}`]).filter((p) => existsSync9(p));
         cfgFiles.length ? ok(`config: ${cfgFiles.join(", ")}`) : warn("no .agent/config.* found (project or ~) \u2014 running on defaults");
         try {
           const probe = `${cwd}/.agent/sessions/.doctor-probe`;