agent.libx.js 0.89.3 → 0.89.5

package/dist/cli.d.ts

@@ -23,6 +23,25 @@ interface SessionMeta {
     costUsd?: number;
     /** Sticky: true if any turn's usage was estimated (streamed without provider usage) → cost is approximate. */
     costEstimated?: boolean;
+    /** Per-turn forensic log: timing, outcome, usage, and provider error per turn — for investigating a reported issue. */
+    events?: TurnEvent[];
+}
+/** One turn's diagnostics, captured for offline forensics (mirrors what the footer prints, but persisted). */
+interface TurnEvent {
+    ts: number;
+    durationMs: number;
+    model: string;
+    finishReason: string;
+    steps: number;
+    tools: number;
+    tokens?: number;
+    costUsd?: number;
+    estimated?: boolean;
+    error?: {
+        message: string;
+        statusCode?: number;
+        code?: string;
+    };
 }
 interface SessionData {
     meta: SessionMeta;
@@ -145,6 +164,7 @@ declare function expandMentions(fs: IFilesystem, line: string): Promise<{
 }>;
 /** The headless `--output-format json` result object for a turn. */
 declare function jsonResult(res: RunResult, session: SessionData): {
+    error?: any;
     ok: boolean;
     finishReason: "error" | "budget" | "stop" | "max_steps" | "timeout" | "loop" | "max_tool_calls" | "aborted";
     text: string;

package/dist/cli.js

@@ -2805,7 +2805,7 @@ var Agent = class _Agent {
       } catch (err2) {
         if (err2?.code === "budget") return kill("budget");
         if (o.signal?.aborted) return kill("aborted");
-        log3.error("chat() failed", err2);
+        log3.error(`chat() failed: ${err2?.message ?? err2}`, err2);
         return { text: "", steps, finishReason: "error", messages: this.transcript, usage, usageEstimated, error: err2 };
       }
       if (o.signal?.aborted) return kill("aborted");
@@ -2869,12 +2869,14 @@ var Agent = class _Agent {
   }
   async dispatch(tc) {
     const tool = this.activeTools.find((t) => t.name === tc.function.name);
-    if (!tool) return `Error: unknown tool '${tc.function.name}'`;
     let args = {};
+    let earlyError;
+    if (!tool) earlyError = `Error: unknown tool '${tc.function.name}'`;
     try {
       args = tc.function.arguments ? JSON.parse(tc.function.arguments) : {};
     } catch (e) {
-      return `Error: invalid JSON arguments for ${tc.function.name}: ${String(e)}`;
+      args = tc.function.arguments;
+      earlyError ??= `Error: invalid JSON arguments for ${tc.function.name}: ${String(e)}`;
     }
     const hooks = this.activeHooks;
     const call = { name: tc.function.name, args };
@@ -2887,6 +2889,12 @@ var Agent = class _Agent {
       return blocked;
     }
     this.options.host?.notify?.({ kind: "tool_use", id: tc.id ?? "", name: tc.function.name, input: args });
+    if (earlyError) {
+      log3.debug(`${tc.function.name} -> ${earlyError}`);
+      await hooks?.postToolUse?.(call, earlyError, meta);
+      this.options.host?.notify?.({ kind: "tool_result", id: tc.id ?? "", output: earlyError, isError: true });
+      return earlyError;
+    }
     let result;
     let threw = false;
     try {
@@ -4639,6 +4647,137 @@ function completePath(listDir, ref) {
 
 // cli/lineEditor.ts
 import { emitKeypressEvents } from "readline";
+
+// cli/bidi.ts
+var RTL_RE = /[\u0590-\u05ff\u0600-\u06ff\u0750-\u077f\u08a0-\u08ff\ufb1d-\ufdff\ufe70-\ufeff]/;
+var needsBidi = (s) => RTL_RE.test(s);
+function classify(c) {
+  if (c >= 1425 && c <= 1469) return "NSM";
+  if (c === 1471 || c === 1473 || c === 1474 || c === 1476 || c === 1477 || c === 1479) return "NSM";
+  if (c >= 1424 && c <= 1535 || c >= 64285 && c <= 64335) return "R";
+  if (c >= 1632 && c <= 1641 || c >= 1776 && c <= 1785) return "AN";
+  if (c >= 1536 && c <= 1791 || c >= 1872 && c <= 1919 || c >= 2208 && c <= 2303 || c >= 64336 && c <= 65023 || c >= 65136 && c <= 65279) return "AL";
+  if (c >= 48 && c <= 57) return "EN";
+  if (c === 43 || c === 45) return "ES";
+  if (c === 35 || c === 36 || c === 37 || c >= 162 && c <= 165) return "ET";
+  if (c === 44 || c === 46 || c === 58 || c === 47 || c === 160) return "CS";
+  if (c === 32 || c === 9 || c === 11 || c === 12) return "WS";
+  if (c >= 33 && c <= 47 || c >= 58 && c <= 64 || c >= 91 && c <= 96 || c >= 123 && c <= 126) return "ON";
+  return "L";
+}
+function baseLevel(types) {
+  for (const t of types) {
+    if (t === "L") return 0;
+    if (t === "R" || t === "AL") return 1;
+  }
+  return 0;
+}
+function resolveWeak(t, baseDir) {
+  const n = t.length;
+  for (let i = 0; i < n; i++) if (t[i] === "NSM") t[i] = i > 0 ? t[i - 1] : baseDir;
+  for (let i = 0; i < n; i++) if (t[i] === "EN") {
+    for (let j = i - 1; j >= 0; j--) if (t[j] === "L" || t[j] === "R" || t[j] === "AL") {
+      if (t[j] === "AL") t[i] = "AN";
+      break;
+    }
+  }
+  for (let i = 0; i < n; i++) if (t[i] === "AL") t[i] = "R";
+  for (let i = 1; i < n - 1; i++) {
+    if (t[i] === "ES" && t[i - 1] === "EN" && t[i + 1] === "EN") t[i] = "EN";
+    else if (t[i] === "CS" && t[i - 1] === "EN" && t[i + 1] === "EN") t[i] = "EN";
+    else if (t[i] === "CS" && t[i - 1] === "AN" && t[i + 1] === "AN") t[i] = "AN";
+  }
+  for (let i = 0; i < n; i++) if (t[i] === "ET") {
+    let j = i;
+    while (j < n && t[j] === "ET") j++;
+    if (i > 0 && t[i - 1] === "EN" || j < n && t[j] === "EN") for (let k = i; k < j; k++) t[k] = "EN";
+    i = j - 1;
+  }
+  for (let i = 0; i < n; i++) if (t[i] === "ES" || t[i] === "ET" || t[i] === "CS") t[i] = "ON";
+  for (let i = 0; i < n; i++) if (t[i] === "EN") {
+    let strong = baseDir;
+    for (let j = i - 1; j >= 0; j--) if (t[j] === "L" || t[j] === "R") {
+      strong = t[j];
+      break;
+    }
+    if (strong === "L") t[i] = "L";
+  }
+  return t;
+}
+function resolveNeutral(t, baseDir) {
+  const n = t.length;
+  const strong = (x) => x === "L" ? "L" : x === "R" || x === "EN" || x === "AN" ? "R" : void 0;
+  for (let i = 0; i < n; i++) if (t[i] === "ON" || t[i] === "WS") {
+    let j = i;
+    while (j < n && (t[j] === "ON" || t[j] === "WS")) j++;
+    const prev = i > 0 ? strong(t[i - 1]) : baseDir;
+    const next = j < n ? strong(t[j]) : baseDir;
+    const dir = prev && next && prev === next ? prev : baseDir;
+    for (let k = i; k < j; k++) t[k] = dir;
+    i = j - 1;
+  }
+  return t;
+}
+function implicitLevels(t, e) {
+  return t.map((x) => e % 2 === 0 ? x === "R" ? e + 1 : x === "EN" || x === "AN" ? e + 2 : e : x === "L" || x === "EN" || x === "AN" ? e + 1 : e);
+}
+function reorder(levels) {
+  const n = levels.length;
+  const order = Array.from({ length: n }, (_, i) => i);
+  let highest = 0, lowestOdd = Infinity;
+  for (const l of levels) {
+    if (l > highest) highest = l;
+    if (l % 2 && l < lowestOdd) lowestOdd = l;
+  }
+  for (let lvl = highest; lvl >= lowestOdd; lvl--) {
+    let i = 0;
+    while (i < n) {
+      if (levels[i] >= lvl) {
+        let j = i;
+        while (j < n && levels[j] >= lvl) j++;
+        for (let a = i, b = j - 1; a < b; a++, b--) {
+          const tmp = order[a];
+          order[a] = order[b];
+          order[b] = tmp;
+        }
+        i = j;
+      } else i++;
+    }
+  }
+  return order;
+}
+function bidiLine(line) {
+  const n = line.length;
+  if (n === 0) return { visual: "", caret: [0] };
+  const types = Array.from({ length: n }, (_, i) => classify(line.charCodeAt(i)));
+  const e = baseLevel(types);
+  const baseDir = e % 2 ? "R" : "L";
+  const levels = implicitLevels(resolveNeutral(resolveWeak(types, baseDir), baseDir), e);
+  const order = reorder(levels);
+  const logToVis = new Array(n);
+  for (let v = 0; v < n; v++) logToVis[order[v]] = v;
+  const caret = new Array(n + 1);
+  for (let c = 0; c < n; c++) caret[c] = levels[c] % 2 === 0 ? logToVis[c] : logToVis[c] + 1;
+  caret[n] = levels[n - 1] % 2 === 0 ? logToVis[n - 1] + 1 : logToVis[n - 1];
+  const visual = order.map((li) => line[li]).join("");
+  return { visual, caret };
+}
+function applyBidi(buf, cursor) {
+  if (!needsBidi(buf)) return { text: buf, cursor };
+  const lines = buf.split("\n");
+  const out = [];
+  let visCursor = cursor, logBase = 0, visBase = 0;
+  for (const line of lines) {
+    const { visual, caret } = bidiLine(line);
+    out.push(visual);
+    if (cursor >= logBase && cursor <= logBase + line.length) visCursor = visBase + caret[cursor - logBase];
+    logBase += line.length + 1;
+    visBase += visual.length + 1;
+  }
+  return { text: out.join("\n"), cursor: visCursor };
+}
+
+// cli/lineEditor.ts
 var visibleWidth = (s) => s.replace(/\x1b\[[0-9;]*m/g, "").length;
 var isPrintable = (str) => !!str && !/[\x00-\x1f\x7f]/.test(str);
 var EditorState = class _EditorState {
@@ -5210,8 +5349,9 @@ function createLineEditor(out) {
     const prompt = s.searching ? dim2(`(${s.searchMiss ? "failing " : ""}reverse-i-search)\`${s.searchQuery}': `) : mode ? COLOR[mode.name](`${mode.pfx} ${mode.name} \u203A `) : vimTag + promptArg;
     if (curRow > 0) out.write(`\x1B[${curRow}A`);
     out.write("\r\x1B[J");
-    const viewBuf = mode ? s.buf.slice(mode.pfx.length) : s.buf;
-    const viewCursor = mode ? Math.max(0, s.cursor - mode.pfx.length) : s.cursor;
+    const rawBuf = mode ? s.buf.slice(mode.pfx.length) : s.buf;
+    const rawCursor = mode ? Math.max(0, s.cursor - mode.pfx.length) : s.cursor;
+    const { text: viewBuf, cursor: viewCursor } = applyBidi(rawBuf, rawCursor);
     const { rows, cursorRow, cursorCol } = wrapLayout(visibleWidth(prompt), viewBuf, viewCursor, cols);
     const ghost = !mode && !s.searching ? s.ghost() : "";
     const ghostFits = ghost && rows.length === 1 && visibleWidth(prompt) + viewBuf.length + ghost.length < cols;
@@ -5795,6 +5935,22 @@ function resolveModelOrNewest(model) {
   return fallback;
 }
 var ENV_KEY_ALIASES = { google: ["GEMINI_API_KEY"] };
+function loadInstallEnv() {
+  let dir = dirname3(import.meta.path);
+  for (let i = 0; i < 5 && !existsSync7(join8(dir, "package.json")); i++) dir = dirname3(dir);
+  for (const name of [".env", ".env.local"]) {
+    const file = join8(dir, name);
+    if (!existsSync7(file)) continue;
+    for (const line of readFileSync5(file, "utf8").split("\n")) {
+      const m = line.match(/^\s*(?:export\s+)?([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*)$/);
+      if (!m || m[1] in process.env) continue;
+      let val = m[2].trim();
+      if (val.startsWith('"') && val.endsWith('"') || val.startsWith("'") && val.endsWith("'")) val = val.slice(1, -1);
+      else val = val.replace(/\s+#.*$/, "").trim();
+      process.env[m[1]] = val;
+    }
+  }
+}
 function apiKeysFromEnv() {
   const e = process.env, keys = {};
   for (const provider of listProviders()) {
@@ -5986,6 +6142,9 @@ function costOf(pricing, promptTokens = 0, completionTokens = 0) {
 function turnCost(model, usage) {
   return costOf(getModelInfo(model)?.pricing, usage?.promptTokens ?? 0, usage?.completionTokens ?? 0);
 }
+function errInfo(e) {
+  return { message: String(e?.message ?? e), statusCode: e?.statusCode, code: e?.code };
+}
 function fmtUsd(n) {
   return n >= 1 ? `$${n.toFixed(2)}` : `$${n.toFixed(4)}`;
 }
@@ -6210,7 +6369,8 @@ function jsonResult(res, session) {
     steps: res.steps,
     tools: res.messages.slice(lastUser).filter((m) => m.role === "tool").length,
     usage: res.usage,
-    sessionId: session.meta.id
+    sessionId: session.meta.id,
+    ...res.finishReason === "error" && res.error ? { error: res.error?.message ?? String(res.error) } : {}
   };
 }
 async function readMultiline(readLine) {
@@ -6253,6 +6413,12 @@ async function runTurn(agent, store, session, task, cp, cwd = process.cwd()) {
     spinner.stop();
     err(red(`  error: ${e?.message ?? e}
 `));
+    (session.meta.events ??= []).push({ ts: t0, durationMs: Date.now() - t0, model: agent.options.model, finishReason: "error", steps: 0, tools: 0, error: errInfo(e) });
+    session.meta.updated = Date.now();
+    try {
+      store.save(session);
+    } catch {
+    }
     return { ok: false };
   } finally {
     spinner.stop();
@@ -6267,8 +6433,13 @@ async function runTurn(agent, store, session, task, cp, cwd = process.cwd()) {
   const lastUser = res.messages.map((m2) => m2.role).lastIndexOf("user");
   const tools = res.messages.slice(lastUser).filter((m2) => m2.role === "tool").length;
   const ok = res.finishReason === "stop";
-  err("\n" + (ok ? green("  \u2713 done") : red(`  \u2717 ${res.finishReason}`)) + dim(` \xB7 ${res.steps} steps \xB7 ${tools} tools \xB7 ${tok}${secs}s
+  const shortId = session.meta.id.slice(-10);
+  err("\n" + (ok ? green("  \u2713 done") : red(`  \u2717 ${res.finishReason}`)) + dim(` \xB7 ${res.steps} steps \xB7 ${tools} tools \xB7 ${tok}${secs}s \xB7 ${shortId}
 `));
+  if (res.finishReason === "error" && res.error) {
+    const e = res.error;
+    err(red(`    ${e?.message ?? e}`) + (e?.statusCode ? dim(` (${e.statusCode}${e.code ? " " + e.code : ""})`) : "") + "\n");
+  }
   session.messages = agent.transcript;
   session.meta.turns += 1;
   session.meta.tokens = (session.meta.tokens ?? 0) + (res.usage?.totalTokens ?? 0);
@@ -6276,6 +6447,9 @@ async function runTurn(agent, store, session, task, cp, cwd = process.cwd()) {
   if (res.usageEstimated) session.meta.costEstimated = true;
   session.meta.updated = Date.now();
   session.meta.model = agent.options.model;
+  const ev = { ts: t0, durationMs: Date.now() - t0, model: agent.options.model, finishReason: res.finishReason, steps: res.steps, tools, tokens: res.usage?.totalTokens, costUsd: cost, estimated: res.usageEstimated };
+  if (res.finishReason === "error" && res.error) ev.error = errInfo(res.error);
+  (session.meta.events ??= []).push(ev);
   if (!session.meta.title) session.meta.title = titleOf(agent.transcript);
   try {
     store.save(session);
@@ -6307,7 +6481,10 @@ function startSession(args, store, agent, cwd) {
 `));
   }
   const now = Date.now();
-  return { meta: { id: args.sessionId ?? store.newId(now), created: now, updated: now, cwd, model: agent.options.model, turns: 0, title: "" }, messages: [] };
+  const id = args.sessionId ?? store.newId(now);
+  if (!args.task) err(dim(`  session ${id}
+`));
+  return { meta: { id, created: now, updated: now, cwd, model: agent.options.model, turns: 0, title: "" }, messages: [] };
 }
 var AGENTS_MD_TEMPLATE = `# ${"${name}"}
 
@@ -7082,7 +7259,7 @@ ${extra}` : body, checkpoints, cwd);
       }
     });
   }
-  const promptStr = bold(cyan("agent \u203A "));
+  const promptStr = bold(cyan("agentx \u203A "));
   const contPrompt = dim("  \u2026 \u203A ");
   const classifyPaste = pastePathClassifier(cwd);
   const releaseStdin = () => {
@@ -7244,6 +7421,7 @@ async function main() {
     if (!id) process.exit(0);
     args.resume = id;
   }
+  loadInstallEnv();
   const apiKeys = { ...cfg.apiKeys, ...apiKeysFromEnv() };
   if (!Object.keys(apiKeys).length) {
     console.error(red("No provider key found. Set ANTHROPIC_API_KEY (or OPENAI_API_KEY / GOOGLE_API_KEY / GROQ_API_KEY), e.g. in .env."));