agent.libx.js 0.93.27 → 0.93.29

package/cli/cli.ts

@@ -314,14 +314,19 @@ function makeHost(format: 'text' | 'json' | 'stream-json' = 'text', opts?: { str
   const md = format === 'text' && useColor && opts?.stream ? new MarkdownStream({ bold, dim, cyan }, process.stdout.columns ?? 80) : null;
   if (md) process.on('SIGWINCH', () => md.resize(process.stdout.columns ?? 80)); // reflow streamed markdown on resize
   const flushText = () => { if (md && md.pending()) process.stdout.write(md.flush()); };
+  // `thinking_delta` streams to stderr WITHOUT a trailing newline (a continuous dimmed reasoning flow).
+  // Any other output that follows (the answer on stdout, a `· notice`, the next step header) must first
+  // close that open line — else it collides mid-word into the reasoning tail (`· step 2` → `step ya`).
+  let openReasonLine = false;
+  const closeReasonLine = () => { if (openReasonLine) { process.stderr.write('\n'); openReasonLine = false; } };
   return {
     flushText,
     notify(e) {
       spinner.stop(); // real output arriving → clear the spinner first
       if (e.kind === 'text_delta') {
         if (streamJson) process.stdout.write(JSON.stringify({ type: 'text', text: e.message }) + '\n');
-        else if (md) process.stdout.write(md.feed(e.message)); // line-buffered markdown render
-        else (cleanStdout ? process.stderr : process.stdout).write(e.message); // json keeps stdout clean → stderr
+        else if (md) { closeReasonLine(); process.stdout.write(md.feed(e.message)); } // line-buffered markdown render
+        else { if (!cleanStdout) closeReasonLine(); (cleanStdout ? process.stderr : process.stdout).write(e.message); } // json keeps stdout clean → stderr
         return;
       }
       // extended-thinking (reasoning-native models): a dimmed stderr flow in text mode; a typed event in
@@ -333,12 +338,17 @@ function makeHost(format: 'text' | 'json' | 'stream-json' = 'text', opts?: { str
           // stay in order — otherwise late-flushed markdown lands after the thinking it preceded.
           if (md && md.pending()) process.stdout.write(md.flush() + '\n');
           process.stderr.write(dim(e.message));
+          openReasonLine = true; // unterminated reasoning line — next output must close it
         }
         return;
       }
+      // Structural events (tool_use/tool_result/tool_result_image/turn_start) have dedicated renderers
+      // (displayHooks ⚙ chrome, the step header) — never dump their raw `kind` as a `· notice`, or the
+      // result preview gets sandwiched between junk `· tool_use`/`· tool_result` labels.
+      if (!('message' in e)) return;
+      closeReasonLine(); // close an open reasoning line so the notice starts fresh (not glued mid-word)
       if (md && md.pending()) process.stdout.write(md.flush() + '\n'); // finish the in-progress line before a notice
-      const notice = 'message' in e ? e.message : e.kind; // not every HostEvent variant carries `message`
-      err(dim(`  · ${notice}\n`)); // tool-activity notices stay on stderr (human chrome) for every format
+      err(dim(`  · ${e.message}\n`)); // tool-activity notices stay on stderr (human chrome) for every format
     },
     async confirm(prompt) {
       // arrow-select on a TTY; fall back to a typed y/N when piped (selectMenu → null)

package/dist/cli.js

@@ -3468,9 +3468,11 @@ init_tools_structured();
 init_todo();
 init_tools_web();
 
-// src/artifacts.ts
+// src/scratch.ts
+init_tools();
+init_tools_structured();
 init_logging();
-var log4 = forComponent("artifacts");
+var log4 = forComponent("scratch");
 
 // src/lessons.ts
 init_logging();
@@ -5427,6 +5429,7 @@ function defaultOpenBrowser(url) {
 }
 
 // cli/core.ts
+import { randomUUID } from "crypto";
 import { resolve, basename, join as join3 } from "path";
 import { existsSync as existsSync2, mkdirSync as mkdirSync2 } from "fs";
 import { platform, arch, release, userInfo, homedir } from "os";
@@ -5571,7 +5574,9 @@ Reference files in them by their mount path (the left side).`;
     // host's MCP servers so the delegated cursor agent runs in the same environment. Gated to cursor:
     // openai/google adapters Object.assign providerOptions into the request body, so a blanket cwd
     // would corrupt those calls.
-    ...isCursor ? { providerOptions: { cwd, ...toCursorMcp(o.mcpServers) ?? {} } } : {},
+    // Warm cursor session (default on; CURSOR_WARM=0 to disable): one long-lived agent reused across
+    // turns, amortising the ~2s Agent.create + h2 handshake. Keyed per agentx launch.
+    ...isCursor ? { providerOptions: { cwd, ...toCursorMcp(o.mcpServers) ?? {}, ...process.env.CURSOR_WARM === "0" ? {} : { cursorSession: randomUUID() } } } : {},
     ...(() => {
       const now5 = /* @__PURE__ */ new Date();
       const platformNames = { darwin: "macOS", linux: "Linux", win32: "Windows" };
@@ -7988,14 +7993,26 @@ function makeHost(format = "text", opts) {
   const flushText = () => {
     if (md && md.pending()) process.stdout.write(md.flush());
   };
+  let openReasonLine = false;
+  const closeReasonLine = () => {
+    if (openReasonLine) {
+      process.stderr.write("\n");
+      openReasonLine = false;
+    }
+  };
   return {
     flushText,
     notify(e) {
       spinner.stop();
       if (e.kind === "text_delta") {
         if (streamJson) process.stdout.write(JSON.stringify({ type: "text", text: e.message }) + "\n");
-        else if (md) process.stdout.write(md.feed(e.message));
-        else (cleanStdout ? process.stderr : process.stdout).write(e.message);
+        else if (md) {
+          closeReasonLine();
+          process.stdout.write(md.feed(e.message));
+        } else {
+          if (!cleanStdout) closeReasonLine();
+          (cleanStdout ? process.stderr : process.stdout).write(e.message);
+        }
         return;
       }
       if (e.kind === "thinking_delta") {
@@ -8003,12 +8020,14 @@ function makeHost(format = "text", opts) {
         else if (!cleanStdout) {
           if (md && md.pending()) process.stdout.write(md.flush() + "\n");
           process.stderr.write(dim(e.message));
+          openReasonLine = true;
         }
         return;
       }
+      if (!("message" in e)) return;
+      closeReasonLine();
       if (md && md.pending()) process.stdout.write(md.flush() + "\n");
-      const notice = "message" in e ? e.message : e.kind;
-      err(dim(`  \xB7 ${notice}
+      err(dim(`  \xB7 ${e.message}
 `));
     },
     async confirm(prompt) {