agent.libx.js 0.89.4 → 0.89.6

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 {
@@ -3830,6 +3838,11 @@ async function buildAgent(o) {
   const jailedDisk = new JailedFilesystem(disk);
   jailedDisk.setCwd(cwd);
   const virtual = o.sandbox || !!o.boddb;
+  const isCursor = (o.model ?? "").startsWith("cursor/");
+  if (virtual && isCursor)
+    throw new Error(
+      "cursor/* models cannot run in --sandbox/--boddb: the Cursor agent runs its own real-disk tools and bypasses the VFS jail. Use disk mode (default)."
+    );
   let fs = jailedDisk;
   if (o.sandbox) {
     const mem = new MemFilesystem2();
@@ -3891,6 +3904,10 @@ Reference files in them by their mount path (the left side).`;
     ai: o.ai,
     fs,
     model: o.model ?? "anthropic/claude-sonnet-4-6",
+    // Anchor cursor to the launch dir (its adapter defaults to TMPDIR otherwise). Gated to cursor:
+    // openai/google adapters Object.assign providerOptions into the request body, so a blanket cwd
+    // would corrupt those calls.
+    ...isCursor ? { providerOptions: { cwd } } : {},
     ...(() => {
       const now = /* @__PURE__ */ new Date();
       const platformNames = { darwin: "macOS", linux: "Linux", win32: "Windows" };
@@ -4641,7 +4658,7 @@ function completePath(listDir, ref) {
 import { emitKeypressEvents } from "readline";
 
 // cli/bidi.ts
-var RTL_RE = /[֐-׿؀-ۿ܀-ݏݐ-ݿࢠ-ࣿיִ-﷿ﹰ-]/;
+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";
@@ -5927,6 +5944,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()) {
@@ -5956,7 +5989,10 @@ function makeHost(format = "text", opts) {
       }
       if (e.kind === "thinking_delta") {
         if (streamJson) process.stdout.write(JSON.stringify({ type: "thinking", text: e.message }) + "\n");
-        else if (!cleanStdout) process.stderr.write(dim(e.message));
+        else if (!cleanStdout) {
+          if (md && md.pending()) process.stdout.write(md.flush() + "\n");
+          process.stderr.write(dim(e.message));
+        }
         return;
       }
       if (md && md.pending()) process.stdout.write(md.flush() + "\n");
@@ -6118,6 +6154,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)}`;
 }
@@ -6342,7 +6381,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) {
@@ -6385,6 +6425,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();
@@ -6399,8 +6445,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);
@@ -6408,6 +6459,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);
@@ -6439,7 +6493,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}"}
 
@@ -7214,7 +7271,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 = () => {
@@ -7376,6 +7433,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."));