@livx.cc/agentx 0.99.18 → 0.99.20

package/dist/cli.d.ts

@@ -150,6 +150,7 @@ declare function makeHost(format?: 'text' | 'json' | 'stream-json', opts?: {
     stream?: boolean;
 }): HostBridge & {
     flushText: () => void;
+    takeToolCount: () => number;
 };
 /** Hooks that render tool activity to stderr: a preToolUse header, and for edits a colorized diff.
  *  `opts.background` marks the agent as a BACKGROUND one (duplex workers): its chrome lands async on

package/dist/cli.js

@@ -9894,11 +9894,15 @@ function lastToken(line) {
   const m = line.match(/(\S*)$/);
   return m ? m[1] : "";
 }
+function atLineStart(line, token) {
+  return line.slice(0, line.length - token.length).trim() === "";
+}
 function completeLine(line, ctx) {
   const token = lastToken(line);
-  if (token.startsWith("/") && line.trimStart() === token) {
+  if (token.startsWith("/")) {
+    const pool = atLineStart(line, token) ? ctx.commands : ctx.agentCommands ?? ctx.commands;
     const want = token.slice(1);
-    const hits = rank(ctx.commands.filter((c) => fuzzy(want, c)), want).map((c) => "/" + c);
+    const hits = rank(pool.filter((c) => fuzzy(want, c)), want).map((c) => "/" + c);
     return [hits, token];
   }
   if (line.startsWith("!") && line.length > 1 && ctx.bangHistory?.length) {
@@ -10156,19 +10160,112 @@ function renderMdLine(line, inFence, p, cols = 80, fenceLang) {
 function renderMdBlock(text, p, cols = 80) {
   let inFence = false, fenceLang;
   const out = [];
+  let table = [];
+  const flush = () => {
+    if (table.length) {
+      out.push(...renderTableLines(table, p, cols));
+      table = [];
+    }
+  };
   for (const line of text.split("\n")) {
+    if (!inFence && isTableRow(line)) {
+      table.push(line);
+      continue;
+    }
+    flush();
     const r = renderMdLine(line, inFence, p, cols, fenceLang);
     inFence = r.inFence;
     fenceLang = r.fenceLang;
     out.push(r.inFence || /^\s*```/.test(line) ? r.out : wrapAnsi(r.out, cols, hangIndent(line)));
   }
+  flush();
   return out.join("\n");
 }
+var T_PAD = "  ";
+var T_GAP = 3;
+var SGR_CLOSES = {
+  "0": /./,
+  "22": /^[12]$/,
+  "23": /^3$/,
+  "24": /^4$/,
+  "27": /^7$/,
+  "29": /^9$/,
+  "39": /^(3[0-7]|9[0-7])$/,
+  "49": /^(4[0-7]|10[0-7])$/
+};
+function wrapCell(styled, w) {
+  const segs = wrapAnsi(styled, w).split("\r\n");
+  if (segs.length < 2 || !styled.includes("\x1B")) return segs;
+  const tok = new RegExp(ANSI_TOKEN.source, "g");
+  let open = [];
+  return segs.map((seg) => {
+    const prefix = open.join("");
+    for (const m of seg.match(tok) ?? []) {
+      const code = /^\x1b\[([0-9;]*)m$/.exec(m)?.[1];
+      if (code === void 0) continue;
+      const closes = SGR_CLOSES[code || "0"];
+      if (closes) open = open.filter((o) => !closes.test(/^\x1b\[([0-9;]*)m$/.exec(o)[1]));
+      else open.push(m);
+    }
+    return prefix + seg + (open.length ? "\x1B[0m" : "");
+  });
+}
+var T_MINCOL = 2;
+function fitWidths(natural, avail) {
+  const total = natural.reduce((a, b) => a + b, 0);
+  if (total <= avail || !natural.length) return natural;
+  const room = Math.max(T_MINCOL * natural.length, avail);
+  let cap = 1;
+  for (let c = 1; c <= Math.max(...natural); c++) {
+    if (natural.reduce((a, w2) => a + Math.min(w2, c), 0) <= room) cap = c;
+    else break;
+  }
+  const w = natural.map((n) => Math.min(n, cap));
+  let left = room - w.reduce((a, b) => a + b, 0);
+  for (let i = 0; i < w.length && left > 0; i++) {
+    const take = Math.min(left, natural[i] - w[i]);
+    w[i] += take;
+    left -= take;
+  }
+  return w;
+}
+function renderTableLines(rows, p, cols = 80) {
+  const sepIdx = rows.findIndex((r, i) => i > 0 && r.includes("-") && /^\s*\|[\s:|-]+\|\s*$/.test(r));
+  if (sepIdx < 0) return rows.map((r) => renderMdLine(r, false, p, cols).out);
+  const cells = (r) => r.trim().replace(/^\||\|$/g, "").split("|").map((c) => c.trim());
+  const data = rows.filter((_, i) => i !== sepIdx).map(cells);
+  const ncol = Math.max(...data.map((r) => r.length));
+  const natural = Array.from({ length: ncol }, (_, i) => Math.max(...data.map((r) => displayText(r[i] ?? "").length)));
+  const widths = fitWidths(natural, cols - T_PAD.length - T_GAP * (ncol - 1));
+  const grid = data.map((row, ri) => widths.map((w, ci) => {
+    const c = row[ci] ?? "";
+    const styled = ri === 0 ? p.bold(displayText(vis(c))) : mdInline(vis(c), p);
+    return wrapCell(styled, w);
+  }));
+  const airy = grid.slice(1).some((row) => row.some((c) => c.length > 1));
+  const out = [];
+  grid.forEach((col, ri) => {
+    const header = ri === 0;
+    if (airy && ri > 1) out.push("");
+    const height = Math.max(...col.map((c) => c.length));
+    for (let li = 0; li < height; li++) {
+      out.push((T_PAD + widths.map((w, ci) => {
+        const seg = col[ci][li] ?? "";
+        return seg + " ".repeat(Math.max(0, w - visWidth(seg)));
+      }).join(" ".repeat(T_GAP))).replace(/\s+$/, ""));
+    }
+    if (header) out.push(T_PAD + p.dim("\u2500".repeat(widths.reduce((a, b) => a + b, 0) + T_GAP * (ncol - 1))));
+  });
+  return out;
+}
 function isTableRow(line) {
   return /^\s*\|.*\|\s*$/.test(line);
 }
 var ANSI_TOKEN = /\x1b\[[0-9;]*m|\x1b\]8;;[^\x07\x1b]*(?:\x07|\x1b\\)/;
 var WRAP_TOKENS = new RegExp(`${ANSI_TOKEN.source}|[ \\t]+|[^\\s\\x1b]+`, "g");
+function visWidth(s) {
+  return s.replace(new RegExp(ANSI_TOKEN.source, "g"), "").length;
+}
 function wrapAnsi(s, cols, indent = "") {
   if (cols <= 1 || s.replace(new RegExp(ANSI_TOKEN.source, "g"), "").length <= cols) return s;
   if (indent.length >= cols) indent = "";
@@ -10235,29 +10332,11 @@ var MarkdownStream = class {
     this.cols = Math.max(1, cols);
     if (this.buf) this.lineRows = Math.max(1, Math.ceil(this.buf.length / this.cols));
   }
-  /** Render the held table block as aligned columns and reset the buffer. If the block lacks a `|---|`
-   *  separator row it isn't a real table — emit the rows verbatim (rendered as normal lines) instead. */
+  /** Render the held table block as aligned columns (shared with renderMdBlock) and reset the buffer. */
   flushTable() {
     const rows = this.tableBuf;
     this.tableBuf = [];
-    const sepIdx = rows.findIndex((r, i) => i > 0 && r.includes("-") && /^\s*\|[\s:|-]+\|\s*$/.test(r));
-    if (sepIdx < 0) return rows.map((r) => renderMdLine(r, false, this.p, this.cols).out + "\r\n").join("");
-    const cells = (r) => r.trim().replace(/^\||\|$/g, "").split("|").map((c) => c.trim());
-    const data = rows.filter((_, i) => i !== sepIdx).map(cells);
-    const ncol = Math.max(...data.map((r) => r.length));
-    const widths = Array.from({ length: ncol }, (_, i) => Math.max(...data.map((r) => displayText(r[i] ?? "").length)));
-    const out = [];
-    data.forEach((row, ri) => {
-      const header = ri === 0;
-      const line = "  " + widths.map((w, ci) => {
-        const c = row[ci] ?? "";
-        const styled = header ? this.p.bold(displayText(vis(c))) : mdInline(vis(c), this.p);
-        return styled + " ".repeat(Math.max(0, w - displayText(c).length));
-      }).join("   ").replace(/\s+$/, "");
-      out.push(line);
-      if (header) out.push("  " + this.p.dim("\u2500".repeat(widths.reduce((a, b) => a + b, 0) + 3 * (ncol - 1))));
-    });
-    return out.map((l) => l + "\r\n").join("");
+    return renderTableLines(rows, this.p, this.cols).map((l) => l + "\r\n").join("");
   }
   feed(text) {
     this.buf += text;
@@ -10484,6 +10563,14 @@ var EditorState = class _EditorState {
     for (const [ph, full] of this.pastes) if (out.includes(ph)) out = out.split(ph).join(full);
     return out;
   }
+  /**
+   * A `/cmd` the REPL will DISPATCH — i.e. the line's first word. A slash token elsewhere in the
+   * prompt is prose the model reads, so it completes like an `@path`: no accept-and-run, no
+   * exact-match row. Kept in sync with the REPL's whole-line `/` dispatch via `atLineStart`.
+   */
+  get runnable() {
+    return this.token.startsWith("/") && atLineStart(this.buf.slice(0, this.cursor), this.token);
+  }
   /** Recompute suggestions from the line up to the cursor. */
   refresh() {
     const r = this.suggest(this.buf.slice(0, this.cursor));
@@ -10491,7 +10578,7 @@ var EditorState = class _EditorState {
     this.token = r.token;
     this.describe = r.describe;
     const exact = r.hits.length === 1 && r.hits[0] === r.token;
-    this.menuOpen = r.hits.length > 0 && (!exact || r.token.startsWith("/"));
+    this.menuOpen = r.hits.length > 0 && (!exact || this.runnable);
     if (this.sel >= r.hits.length) this.sel = 0;
   }
   // ── Editor undo (Ctrl-_): snapshot before every mutation, pop to restore ──
@@ -10687,13 +10774,22 @@ var EditorState = class _EditorState {
     this.hits = [];
     this.sel = 0;
   }
-  /** Replace the trailing token with the highlighted hit; re-suggest (e.g. `@src/` opens its children). */
+  /**
+   * Replace the trailing token with the highlighted hit; re-suggest (e.g. `@src/` opens its children).
+   * A finished hit gets a trailing space so the next word is typed straight away (CC/shell parity).
+   * Two exceptions: a DIRECTORY hit (`@src/`) is a waypoint, not a word — a space there would end the
+   * mention mid-path; and an existing following space isn't doubled. A spaced dir rides the quoted
+   * form (`@"my dir/"`), so the `/` test must look past a trailing quote.
+   */
   accept() {
     if (!this.menuOpen || !this.hits.length) return false;
     const hit = this.hits[this.sel] ?? this.hits[0];
     const start = this.cursor - this.token.length;
-    this.buf = this.buf.slice(0, start) + hit + this.buf.slice(this.cursor);
-    this.cursor = start + hit.length;
+    const rest = this.buf.slice(this.cursor);
+    const isDir = hit.replace(/"$/, "").endsWith("/");
+    const pad = isDir || rest.startsWith(" ") ? "" : " ";
+    this.buf = this.buf.slice(0, start) + hit + pad + rest;
+    this.cursor = start + hit.length + pad.length;
     this.refresh();
     return true;
   }
@@ -10907,9 +11003,9 @@ function applyKey(s, key, str) {
     case "return":
     case "enter":
       if (s.menuOpen) {
-        const isCmd = s.token.startsWith("/");
+        const run = s.runnable;
         s.accept();
-        return isCmd ? "submit" : "none";
+        return run ? "submit" : "none";
       }
       if (s.buf.slice(0, s.cursor).endsWith("\\")) {
         s.backspace();
@@ -12137,8 +12233,17 @@ function makeHost(format = "text", opts) {
     }
   };
   const activitySeen = /* @__PURE__ */ new Set();
+  const turnActivityIds = /* @__PURE__ */ new Set();
+  let anonActivityCount = 0;
   return {
     flushText,
+    /** Read + reset this turn's self-executing-backend tool tally (see turnActivityIds). */
+    takeToolCount: () => {
+      const n = turnActivityIds.size + anonActivityCount;
+      turnActivityIds.clear();
+      anonActivityCount = 0;
+      return n;
+    },
     notify(e) {
       if (e.kind === "turn_start") {
         activitySeen.clear();
@@ -12171,6 +12276,8 @@ function makeHost(format = "text", opts) {
       }
       if (e.kind === "tool_activity") {
         const a = e;
+        if (a.id) turnActivityIds.add(a.id);
+        else if (a.status === "running") anonActivityCount++;
         flushLookupGroup();
         closeReasonLine();
         flushText();
@@ -12869,6 +12976,7 @@ async function runTurn(agent, store, session, task, cp, cwd = process.cwd(), sen
   spinner.turnStart = t0;
   spinner.start(sendFn ? "voice\u2026" : void 0);
   const msgsBefore = agent.transcript.length;
+  agent.options.host?.takeToolCount?.();
   const host = agent.options.host;
   const origNotify = host?.notify?.bind(host);
   if (host && origNotify) host.notify = (e) => {
@@ -12910,7 +13018,7 @@ async function runTurn(agent, store, session, task, cp, cwd = process.cwd(), sen
   const m = res.usageEstimated ? "~" : "";
   const tok = res.usage?.totalTokens ? `${m}${(res.usage.totalTokens / 1e3).toFixed(1)}k tok \xB7 ${cost > 0 ? m + fmtUsd(cost) + " \xB7 " : ""}` : "";
   const lastUser = res.messages.map((m2) => m2.role).lastIndexOf("user");
-  const tools = res.messages.slice(lastUser).filter((m2) => m2.role === "tool").length;
+  const tools = res.messages.slice(lastUser).filter((m2) => m2.role === "tool").length + (agent.options.host?.takeToolCount?.() ?? 0);
   const ok = res.finishReason === "stop";
   const shortId = session.meta.id.replace(/^\d{8}-/, "");
   const didWork = agent.transcript.slice(msgsBefore).some((m2) => m2.role === "assistant" || m2.role === "tool");
@@ -14751,10 +14859,11 @@ ${task}`;
       return null;
     }
   };
-  const commandNames = () => [...Object.keys(builtins).filter((k) => k !== "quit"), ...cmds.map((c) => c.name), ...skills.map((s) => s.name)];
+  const agentCommandNames = () => [...cmds.map((c) => c.name), ...skills.map((s) => s.name)];
+  const commandNames = () => [...Object.keys(builtins).filter((k) => k !== "quit"), ...agentCommandNames()];
   const describe = (hit) => hit.startsWith("/") ? builtins[hit.slice(1)]?.desc ?? cmds.find((c) => c.name === hit.slice(1))?.description ?? skills.find((s) => s.name === hit.slice(1))?.description : void 0;
   const suggest = (lineToCursor) => {
-    const [hits, token] = completeLine(lineToCursor, { commands: commandNames(), listDir, bangHistory: history });
+    const [hits, token] = completeLine(lineToCursor, { commands: commandNames(), agentCommands: agentCommandNames(), listDir, bangHistory: history });
     return { hits, token, describe };
   };
   const editor = createLineEditor(process.stderr);