agent.libx.js 0.94.10 → 0.94.11

package/README.md

@@ -109,6 +109,8 @@ agentx --resume <id> "…"    # resume a specific session
 - **Slash commands** — `/help /tools /model /compact /memory /clear /sessions /resume /commands /init`; `/compact <focus>` preserves matching lines from the folded span; `/memory` opens the memory index in `$EDITOR`; user-defined `./.agent/commands/<name>.md` are invokable directly as `/<name>` (the same registry the model's `SlashCommand` tool uses).
 - **Live chrome** — the thinking spinner shows elapsed seconds + `esc to interrupt`; the terminal tab title tracks the session topic; a bell rings when a long (>10s) turn finishes in a backgrounded tab; the footer warns at 80%/90% context pressure and auto-trims announce themselves.
 - **`/transcript [n]`** — the full session transcript including complete tool-result bodies (the past-turn equivalent of Ctrl-O live verbose), paged through `less`; **`/doctor`** — one-shot environment sanity check (keys, model pricing, config, session-store writability, memory, MCP mounts).
+- **Syntax-highlighted code fences** — ```` ```ts ```` (and js/py/sh/go/rust/…) blocks render with keywords bold, strings green, numbers cyan, comments dim; unknown languages keep the plain cyan body. **TodoWrite plans** pin a compact `☑ 2/5 · current step` line into the idle footer.
+- **`/agents`** — list subagent types from `./.agent/agents` (description, model, tool scope); `/agents new <name>` scaffolds a frontmatter'd definition for the `Task` tool's `agentType`. **`!<partial>` + menu** completes from past `!` shell commands. **`@server:uri`** mentions inline an MCP resource body into the prompt. Transient network drops mid-step retry automatically (2 attempts, backoff) instead of failing the turn.
 - **Project instructions** — `./AGENTS.md` (or `CLAUDE.md`) auto-loads into every run; `/init` scaffolds one.
 - **Any provider** — set `ANTHROPIC_API_KEY` / `OPENAI_API_KEY` / `GOOGLE_API_KEY` / `GROQ_API_KEY`; choose with `-m provider/model`.
 - **@-file mentions & headless JSON** — reference files inline in a prompt with `@path` (e.g. `explain @src/Agent.ts`); script with `-p --output-format json` to get one machine-readable result object on stdout (activity stays on stderr).

package/dist/cli.d.ts

@@ -183,6 +183,10 @@ declare function readImageParts(cwd: string, line: string): ContentPart[];
  *  path (so ordinary text pastes are unaffected). Paths with spaces are skipped — the `@\S+` pipeline can't carry them. */
 declare function pastePathClassifier(cwd: string): PasteClassifier;
 /** Inline `@path` file mentions: append referenced files' contents so the model sees them (missing → warn, leave as-is). */
+/** Resolves an `@server:uri` MCP-resource mention to its text body; null = not an MCP ref (fall through
+ *  to file resolution). Set by the REPL once servers are mounted; headless runs leave it unset. */
+declare let mcpMentionResolver: ((ref: string) => Promise<string | null>) | undefined;
+declare function setMcpMentionResolver(fn: typeof mcpMentionResolver): void;
 declare function expandMentions(fs: IFilesystem, line: string): Promise<{
     text: string;
     loaded: string[];
@@ -212,4 +216,4 @@ declare function jsonResult(res: RunResult, session: SessionData): {
  */
 declare function readMultiline(readLine: (continuing: boolean) => Promise<string | null>): Promise<string | null>;
 
-export { type PermMode, appendMemoryNote, cacheMultipliers, condenseReplay, costOf, estimateTranscriptTokens, expandMentions, exportMarkdown, fmtUsd, formatHistory, formatStatus, formatTranscriptFull, jsonResult, parseArgs, pastePathClassifier, readImageParts, readMultiline, resolvePermMode, runShellLine };
+export { type PermMode, appendMemoryNote, cacheMultipliers, condenseReplay, costOf, estimateTranscriptTokens, expandMentions, exportMarkdown, fmtUsd, formatHistory, formatStatus, formatTranscriptFull, jsonResult, mcpMentionResolver, parseArgs, pastePathClassifier, readImageParts, readMultiline, resolvePermMode, runShellLine, setMcpMentionResolver };

package/dist/cli.js

@@ -2985,12 +2985,24 @@ var Agent = class _Agent {
         ...o.providerOptions || cursorPo ? { providerOptions: { ...frag.providerOptions, ...o.providerOptions, ...cursorPo } } : {}
       };
       try {
-        if (useStream) {
-          const r = await o.ai.chat({ model: o.model, messages: sent, tools: wireTools, stream: true, signal: o.signal, ...o.toolChoice ? { toolChoice: o.toolChoice } : {}, ...reasonOpts });
-          res = await this.consumeStream(r);
-        } else {
-          const r = await o.ai.chat({ model: o.model, messages: sent, tools: wireTools, stream: false, signal: o.signal, ...o.toolChoice ? { toolChoice: o.toolChoice } : {}, ...reasonOpts });
-          res = r;
+        for (let attempt = 0; ; attempt++) {
+          try {
+            if (useStream) {
+              const r = await o.ai.chat({ model: o.model, messages: sent, tools: wireTools, stream: true, signal: o.signal, ...o.toolChoice ? { toolChoice: o.toolChoice } : {}, ...reasonOpts });
+              res = await this.consumeStream(r);
+            } else {
+              const r = await o.ai.chat({ model: o.model, messages: sent, tools: wireTools, stream: false, signal: o.signal, ...o.toolChoice ? { toolChoice: o.toolChoice } : {}, ...reasonOpts });
+              res = r;
+            }
+            break;
+          } catch (err2) {
+            const transient = !o.signal?.aborted && !isAbortError(err2) && !err2?.statusCode && attempt < 2 && /ECONNRESET|ECONNREFUSED|ETIMEDOUT|ENOTFOUND|EAI_AGAIN|EPIPE|socket hang up|fetch failed|network|terminated|UND_ERR/i.test(String(err2?.message ?? err2?.code ?? err2));
+            if (!transient) throw err2;
+            const waitMs = 1e3 * (attempt + 1);
+            log3.warn(`network drop mid-step (${err2?.message ?? err2}) \u2014 retrying in ${waitMs}ms`);
+            o.host?.notify?.({ kind: "retry", message: `connection dropped \u2014 retrying step (#${attempt + 1})` });
+            await new Promise((r) => setTimeout(r, waitMs));
+          }
         }
       } catch (err2) {
         if (err2?.code === "budget") return kill("budget");
@@ -7135,6 +7147,12 @@ function completeLine(line, ctx) {
     const hits = rank(ctx.commands.filter((c) => fuzzy(want, c)), want).map((c) => "/" + c);
     return [hits, token];
   }
+  if (line.startsWith("!") && line.length > 1 && ctx.bangHistory?.length) {
+    const want = line.slice(1);
+    const seen = /* @__PURE__ */ new Set();
+    const hits = ctx.bangHistory.filter((h) => h.startsWith("!") && h.length > 1 && fuzzy(want, h.slice(1)) && !seen.has(h) && !!seen.add(h));
+    return [rank(hits, line), line];
+  }
   if (token.startsWith("@")) return [completePath(ctx.listDir, token.slice(1)), token];
   return [[], line];
 }
@@ -8307,6 +8325,39 @@ function readPlainLine() {
 
 // cli/markdown.ts
 var vis = (s) => needsBidi(s) ? bidiLine(s).visual : s;
+var C_KW = new Set("const let var function return if else for while do switch case break continue class new async await try catch finally throw import export from default type interface extends implements public private protected readonly static void null undefined true false this super yield typeof instanceof in of enum namespace struct fn pub mut match impl use go defer chan func package var range nil".split(" "));
+var PY_KW = new Set("def return if elif else for while class import from as with try except finally raise lambda pass break continue global nonlocal yield async await None True False not and or in is del assert print self".split(" "));
+var SH_KW = new Set("if then else elif fi for while do done case esac function local export return echo exit set source in".split(" "));
+var HASH_COMMENT = /^(sh|bash|zsh|shell|py|python|rb|ruby|yaml|yml|toml|ini|make|makefile|dockerfile|r)$/;
+function kwFor(lang) {
+  if (!lang) return null;
+  const l = lang.toLowerCase();
+  if (/^(js|jsx|ts|tsx|javascript|typescript|java|c|h|cpp|cc|cs|go|rust|rs|swift|kotlin|kt|php|scala|dart)$/.test(l)) return C_KW;
+  if (/^(py|python)$/.test(l)) return PY_KW;
+  if (/^(sh|bash|zsh|shell|console)$/.test(l)) return SH_KW;
+  if (/^(json|yaml|yml|toml|sql|html|xml|css)$/.test(l)) return /* @__PURE__ */ new Set();
+  return null;
+}
+function highlightCode(line, lang, p) {
+  const kws = kwFor(lang);
+  if (!kws) return p.cyan(line);
+  const cm = (HASH_COMMENT.test(lang.toLowerCase()) ? /(^|\s)#.*$/ : /\/\/.*$|\/\*.*$/).exec(line);
+  let code = line, comment = "";
+  if (cm) {
+    const at = cm.index + (cm[1]?.length ?? 0);
+    comment = line.slice(at);
+    code = line.slice(0, at);
+  }
+  const str = p.green ?? p.cyan;
+  const re = /("(?:[^"\\]|\\.)*"?|'(?:[^'\\]|\\.)*'?|`[^`]*`?)|\b(\d+(?:\.\d+)?)\b|\b([A-Za-z_]\w*)\b/g;
+  const out = code.replace(re, (m, s, num, word) => {
+    if (s) return str(s);
+    if (num) return p.cyan(num);
+    if (word && kws.has(word)) return p.bold(word);
+    return m;
+  });
+  return out + (comment ? p.dim(comment) : "");
+}
 function displayText(s) {
   return s.replace(/`([^`]+)`/g, "$1").replace(/\[([^\]]+)\]\([^)]+\)/g, "$1").replace(/\*\*([^*]+)\*\*/g, "$1").replace(/~~([^~]+)~~/g, "$1").replace(/(?<![\w*])[*_]([^*_\s][^*_]*?)[*_](?![\w*])/g, "$1");
 }
@@ -8326,9 +8377,12 @@ function mdInline(line, p) {
     return (p.italic ?? ((s) => s))(italic2.slice(1, -1));
   });
 }
-function renderMdLine(line, inFence, p, cols = 80) {
-  if (/^\s*```/.test(line)) return { out: p.dim(line), inFence: !inFence };
-  if (inFence) return { out: p.cyan(line), inFence };
+function renderMdLine(line, inFence, p, cols = 80, fenceLang) {
+  if (/^\s*```/.test(line)) {
+    const lang = inFence ? void 0 : /^\s*```\s*(\w+)/.exec(line)?.[1];
+    return { out: p.dim(line), inFence: !inFence, fenceLang: lang };
+  }
+  if (inFence) return { out: highlightCode(line, fenceLang, p), inFence, fenceLang };
   if (/^\s*([-*_])(\s*\1){2,}\s*$/.test(line)) return { out: p.dim("\u2500".repeat(cols)), inFence };
   const h = line.match(/^(#{1,6})\s+(.*)$/);
   if (h) return { out: p.bold(vis(h[2])), inFence };
@@ -8352,6 +8406,8 @@ var MarkdownStream = class {
   buf = "";
   // the current (uncommitted) logical line's text
   inFence = false;
+  fenceLang;
+  // language tag of the open fence (drives syntax highlighting)
   lineRows = 0;
   // physical rows the in-progress line occupied last draw (for the next clear)
   tableBuf = [];
@@ -8400,14 +8456,15 @@ var MarkdownStream = class {
         continue;
       }
       if (this.tableBuf.length) out += this.flushTable();
-      const r = renderMdLine(line, this.inFence, this.p, this.cols);
+      const r = renderMdLine(line, this.inFence, this.p, this.cols, this.fenceLang);
       this.inFence = r.inFence;
+      this.fenceLang = r.fenceLang;
       out += r.out + "\r\n";
     }
     const tailIsTableRow = this.tableBuf.length > 0 && !this.inFence && /^\s*\|/.test(this.buf);
     if (this.buf && !tailIsTableRow) {
       if (this.tableBuf.length) out += this.flushTable();
-      out += renderMdLine(this.buf, this.inFence, this.p, this.cols).out;
+      out += renderMdLine(this.buf, this.inFence, this.p, this.cols, this.fenceLang).out;
       this.lineRows = Math.max(1, Math.ceil(this.buf.length / Math.max(1, this.cols)));
     }
     return out;
@@ -8422,6 +8479,7 @@ var MarkdownStream = class {
     out += this.tableBuf.length ? this.flushTable() : "";
     this.buf = "";
     this.inFence = false;
+    this.fenceLang = void 0;
     this.lineRows = 0;
     return out;
   }
@@ -8485,6 +8543,7 @@ var activeTurn = null;
 var exitRequested = false;
 var inputStash = [];
 var stashBuf = "";
+var latestTodos = [];
 function numFlag(raw, flag) {
   const n = Number(raw);
   if (!Number.isFinite(n) || n < 0) throw new Error(`invalid ${flag}: ${raw ?? "(missing value)"}`);
@@ -8679,7 +8738,7 @@ function apiKeysFromEnv() {
 function makeHost(format = "text", opts) {
   const streamJson = format === "stream-json";
   const cleanStdout = format === "json";
-  const md = format === "text" && useColor && opts?.stream ? new MarkdownStream({ bold, dim, cyan, italic, strike, link }, process.stdout.columns ?? 80) : null;
+  const md = format === "text" && useColor && opts?.stream ? new MarkdownStream({ bold, dim, cyan, italic, strike, green, link }, process.stdout.columns ?? 80) : null;
   if (md) process.on("SIGWINCH", () => md.resize(process.stdout.columns ?? 80));
   const flushText = () => {
     if (md && md.pending()) process.stdout.write(md.flush());
@@ -8774,6 +8833,7 @@ function displayHooks(fs, opts) {
   };
   return {
     async preToolUse(call) {
+      if (call.name === "TodoWrite" && Array.isArray(call.args?.todos)) latestTodos = call.args.todos;
       if (!on()) return;
       if (bg) err("\r\x1B[0J");
       else spinner.stop();
@@ -9201,6 +9261,10 @@ function pastePathClassifier(cwd) {
     return { display: isImg ? "Image" : `File ${basename2(abs)}`, ref: "@" + abs };
   };
 }
+var mcpMentionResolver;
+function setMcpMentionResolver(fn) {
+  mcpMentionResolver = fn;
+}
 async function expandMentions(fs, line) {
   const refs = [...line.matchAll(/(?:^|\s)@(\S+)/g)].map((m) => m[1].replace(/[?!.,;:)\]}'">]+$/, "")).filter(Boolean);
   if (!refs.length) return { text: line, loaded: [], missing: [] };
@@ -9208,6 +9272,18 @@ async function expandMentions(fs, line) {
   for (const ref of refs) {
     if (IMG_EXT[extname(ref).toLowerCase()]) continue;
     if (loaded.includes(ref) || missing.includes(ref)) continue;
+    if (ref.includes(":") && mcpMentionResolver) {
+      const body = await mcpMentionResolver(ref).catch((e) => {
+        log17.debug("mcp mention resolve failed", e);
+        return null;
+      });
+      if (body != null) {
+        blocks.push(`--- @${ref} ---
+${body}`);
+        loaded.push(ref);
+        continue;
+      }
+    }
     try {
       if (await fs.exists(ref)) {
         blocks.push(`--- @${ref} ---
@@ -9762,6 +9838,16 @@ async function repl(args, ai, cfg, cwd) {
     forceQuit();
   });
   installCancelGuards(mounted);
+  setMcpMentionResolver(async (ref) => {
+    const i = ref.indexOf(":");
+    if (i <= 0) return null;
+    const m = mounted.find((x) => x.name === ref.slice(0, i));
+    if (!m) return null;
+    const r = await m.client.readResource(ref.slice(i + 1));
+    const parts = Array.isArray(r?.contents) ? r.contents : [];
+    const texts = parts.map((c) => c?.text ?? (c?.blob ? `[binary ${c.mimeType ?? "blob"}]` : "")).filter(Boolean);
+    return texts.length ? texts.join("\n") : JSON.stringify(r);
+  });
   const store = new SessionStore(cwd);
   let session = startSession(args, store, face, cwd);
   setTermTitle(`agentx \xB7 ${session.meta.title || cwd.split("/").pop() || "session"}`);
@@ -10497,6 +10583,71 @@ ${extra}` : body);
         const data = store.load(a[0]) ?? globalSessionLoad(a[0]);
         if (data) resumeInto(data);
         else err(red(`  no such session
+`));
+      }
+    },
+    agents: {
+      desc: "list subagent types (./.agent/agents) \u2014 /agents new <name> scaffolds one",
+      run: async (a) => {
+        const fs2 = face.options.fs;
+        if (a[0] === "new") {
+          let name = a[1];
+          if (!name) {
+            const io = createInterface({ input: process.stdin, output: process.stderr });
+            try {
+              name = (await io.question(yellow("  agent name: "))).trim();
+            } finally {
+              io.close();
+            }
+          }
+          name = (name ?? "").replace(/[^A-Za-z0-9_-]/g, "-").replace(/^-+|-+$/g, "");
+          if (!name) {
+            err(yellow("  usage: /agents new <name>\n"));
+            return;
+          }
+          const dir = adot("agents");
+          const p = `${dir}/${name}.md`;
+          if (await fs2.exists(p)) {
+            err(yellow(`  ${p} already exists
+`));
+            return;
+          }
+          await mkdirp(fs2, dir);
+          await fs2.writeFile(p, [
+            "---",
+            `description: What "${name}" is for \u2014 the Task tool picks agents by this line`,
+            "# model: anthropic/claude-haiku-4-5    # optional per-agent model override",
+            "# tools: Read, Grep, Glob              # optional tool allowlist (omit = all tools)",
+            "---",
+            "",
+            `You are the "${name}" subagent.`,
+            "",
+            "Describe the persona, scope, and output contract here \u2014 this body becomes the",
+            `child agent's system prompt when a Task is delegated with agentType: "` + name + '".',
+            ""
+          ].join("\n"));
+          err(green(`  \u2713 ${p}`) + dim(` \u2014 used via Task(agentType:"${name}")${args.subagents ? "" : " (enable with --subagents)"}
+`));
+          return;
+        }
+        const seen = /* @__PURE__ */ new Map();
+        for (const d of adots("agents")) {
+          try {
+            for (const def of (await loadAgents(fs2, d)).agents) if (!seen.has(def.name)) seen.set(def.name, { def, from: d });
+          } catch (e) {
+            log17.debug(`loadAgents(${d}) failed`, e);
+          }
+        }
+        if (!seen.size) {
+          err(dim("  (no subagents defined \u2014 scaffold one with /agents new <name>)\n"));
+          return;
+        }
+        for (const { def, from } of seen.values()) {
+          const extras = [def.model, def.tools?.length ? `tools: ${def.tools.join(",")}` : ""].filter(Boolean).join(" \xB7 ");
+          err(`  ${cyan(def.name)} ${dim(`\u2014 ${def.description || "(no description)"}${extras ? ` (${extras})` : ""} \xB7 ${from}`)}
+`);
+        }
+        err(dim(`  delegated via the Task tool (agentType)${args.subagents ? "" : " \u2014 enable with --subagents"} \xB7 /agents new <name> to scaffold
 `));
       }
     },
@@ -10812,7 +10963,7 @@ ${extra}` : body);
   const commandNames = () => [...Object.keys(builtins).filter((k) => k !== "quit"), ...cmds.map((c) => c.name), ...skills.map((s) => s.name)];
   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 });
+    const [hits, token] = completeLine(lineToCursor, { commands: commandNames(), listDir, bangHistory: history });
     return { hits, token, describe };
   };
   const editor = createLineEditor(process.stderr);
@@ -11079,6 +11230,11 @@ ${extra}` : body);
       if (r && r !== "off") parts.push(`reasoning:${r}`);
       if (verboseOutput) parts.push("verbose");
       if (goalCondition) parts.push(`\u25CE goal (${goalTurns} turns)`);
+      if (latestTodos.length) {
+        const done = latestTodos.filter((t) => t.status === "completed").length;
+        const cur = latestTodos.find((t) => t.status === "in_progress")?.content;
+        if (done < latestTodos.length) parts.push(`\u2611 ${done}/${latestTodos.length}${cur ? ` \xB7 ${cur.slice(0, 48)}` : ""}`);
+      }
       if (scheduler.size) parts.push(`\u23F0 ${scheduler.size} scheduled`);
       if (inputStash.length) parts.push(`${inputStash.length} stashed (\u2303S to pop)`);
       const taskLines = [];
@@ -11321,11 +11477,13 @@ export {
   formatStatus,
   formatTranscriptFull,
   jsonResult,
+  mcpMentionResolver,
   parseArgs,
   pastePathClassifier,
   readImageParts,
   readMultiline,
   resolvePermMode,
-  runShellLine
+  runShellLine,
+  setMcpMentionResolver
 };
 //# sourceMappingURL=cli.js.map