open-agents-ai 0.104.14 → 0.104.16

package/dist/index.js

@@ -27085,31 +27085,56 @@ function setContentWriteHook(hook) {
   _contentWriteHook = hook;
 }
 function renderError(message) {
-  _contentWriteHook?.begin();
+  const redir = _contentWriteHook?.redirect?.();
   const icon = _emojisEnabled ? c2.red("\u2716") : c2.red("E");
+  if (redir) {
+    redir(`
+${icon} ${message}
+`);
+    return;
+  }
+  _contentWriteHook?.begin();
   process.stdout.write(`
 ${icon} ${message}
 `);
   _contentWriteHook?.end();
 }
 function renderInfo(message) {
-  _contentWriteHook?.begin();
+  const redir = _contentWriteHook?.redirect?.();
   const icon = _emojisEnabled ? c2.cyan("\u2139") : c2.cyan("i");
+  if (redir) {
+    redir(`${icon} ${message}
+`);
+    return;
+  }
+  _contentWriteHook?.begin();
   process.stdout.write(`${icon} ${message}
 `);
   _contentWriteHook?.end();
 }
 function renderWarning(message) {
-  _contentWriteHook?.begin();
+  const redir = _contentWriteHook?.redirect?.();
   const icon = _emojisEnabled ? c2.yellow("\u26A0") : c2.yellow("!");
+  if (redir) {
+    redir(`${icon} ${message}
+`);
+    return;
+  }
+  _contentWriteHook?.begin();
   process.stdout.write(`${icon} ${message}
 `);
   _contentWriteHook?.end();
 }
 function renderVerbose(message) {
+  const redir = _contentWriteHook?.redirect?.();
+  const text = `${c2.dim(`  > ${message}`)}
+`;
+  if (redir) {
+    redir(text);
+    return;
+  }
   _contentWriteHook?.begin();
-  process.stdout.write(`${c2.dim(`  > ${message}`)}
-`);
+  process.stdout.write(text);
   _contentWriteHook?.end();
 }
 function renderRichHeader(opts) {
@@ -34535,6 +34560,14 @@ import { execSync as execSync26 } from "node:child_process";
 function isNeovimActive() {
   return _state !== null && !_state.cleanedUp;
 }
+function isNeovimFocused() {
+  return _state?.focused ?? false;
+}
+function refocusNeovim() {
+  if (!_state || _state.cleanedUp || _state.focused)
+    return;
+  toggleFocus(_state);
+}
 async function startNeovimMode(opts) {
   if (_state && !_state.cleanedUp) {
     return "Neovim mode is already active. Use /neovim to exit first.";
@@ -34583,7 +34616,7 @@ async function startNeovimMode(opts) {
     'local lp = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"',
     'if not vim.loop.fs_stat(lp) then pcall(vim.fn.system, {"git", "clone", "--filter=blob:none", "--depth=1", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lp}) end',
     "vim.opt.rtp:prepend(lp)",
-    'pcall(function() require("lazy").setup({{"nvim-neo-tree/neo-tree.nvim", branch="v3.x", dependencies={"nvim-lua/plenary.nvim","MunifTanjim/nui.nvim"},config=function() require("neo-tree").setup({close_if_last_window=true,filesystem={follow_current_file={enabled=true},use_libuv_file_watcher=true,hijack_netrw_behavior="disabled"},window={position="left",width=30}}) end}},{install={colorscheme={}},checker={enabled=false}}) end)',
+    'pcall(function() require("lazy").setup({{"nvim-neo-tree/neo-tree.nvim", branch="v3.x", lazy=false, dependencies={"nvim-lua/plenary.nvim","MunifTanjim/nui.nvim","nvim-tree/nvim-web-devicons"},config=function() require("neo-tree").setup({close_if_last_window=true,enable_git_status=true,filesystem={follow_current_file={enabled=true},use_libuv_file_watcher=true,hijack_netrw_behavior="open_default",filtered_items={hide_dotfiles=false,hide_gitignored=false}},window={position="left",width=30}}) end}},{install={colorscheme={}},checker={enabled=false}}) end)',
     // Open neo-tree sidebar after lazy.nvim finishes loading (needs short defer).
     // Uses pcall so a missing/broken neo-tree doesn't block the editor.
     'vim.defer_fn(function() pcall(vim.cmd, "Neotree show") end, 300)'
@@ -34810,10 +34843,10 @@ function toggleFocus(state) {
     if (state.opts.rl) {
       try {
         state.opts.rl.resume();
-        state.opts.rl.prompt(false);
       } catch {
       }
     }
+    state.opts.onFocusToTUI?.();
   } else {
     state.focused = true;
     if (state.opts.rl) {
@@ -37983,6 +38016,7 @@ async function handleSlashCommand(input, ctx) {
         ctx.clearScreen();
         renderInfo("Neovim mode stopped. Main waterfall restored.");
       } else {
+        ctx.retireCarousel?.();
         const contentRows = ctx.availableContentRows?.() ?? Math.max(5, (process.stdout.rows ?? 24) - 6);
         const cols = process.stdout.columns ?? 80;
         const err = await startNeovimMode({
@@ -37993,12 +38027,11 @@ async function handleSlashCommand(input, ctx) {
           initialFile: arg || void 0,
           onExit: () => {
             renderInfo("Neovim mode exited.");
-          }
+          },
+          onFocusToTUI: ctx.showPrompt
         });
         if (err) {
           renderError(err);
-        } else {
-          renderInfo("Neovim mode started. Ctrl+N toggles focus between editor and input.");
         }
       }
       return "handled";
@@ -49367,6 +49400,22 @@ ${entry.fullContent}`
   let streamStartMs = 0;
   let streamTextBuffer = "";
   const contentWrite = (fn) => {
+    if (isNeovimActive()) {
+      const origWrite = process.stdout.write;
+      let captured = "";
+      process.stdout.write = ((chunk) => {
+        captured += typeof chunk === "string" ? chunk : Buffer.isBuffer(chunk) ? chunk.toString() : "";
+        return true;
+      });
+      try {
+        fn();
+      } finally {
+        process.stdout.write = origWrite;
+      }
+      if (captured)
+        writeToNeovimOutput(captured);
+      return;
+    }
     if (isOverlayActive()) {
       const origWrite = process.stdout.write;
       const chunks = [];
@@ -49791,7 +49840,10 @@ async function startInteractive(config, repoPath) {
     statusBar.activate(scrollTop);
     setContentWriteHook({
       begin: () => statusBar.beginContentWrite(),
-      end: () => statusBar.endContentWrite()
+      end: () => statusBar.endContentWrite(),
+      // When neovim is active, redirect all render output to the Agent Output
+      // pane instead of writing to stdout (which would push the PTY upward).
+      redirect: () => isNeovimActive() ? writeToNeovimOutput : null
     });
   }
   let resolvedContextWindowSize = 0;
@@ -50183,6 +50235,22 @@ Rationale: ${proposal.rationale}${provenanceNote}`;
     }
   }
   function writeContent(fn) {
+    if (isNeovimActive()) {
+      const origWrite = process.stdout.write;
+      let captured = "";
+      process.stdout.write = ((chunk) => {
+        captured += typeof chunk === "string" ? chunk : Buffer.isBuffer(chunk) ? chunk.toString() : "";
+        return true;
+      });
+      try {
+        fn();
+      } finally {
+        process.stdout.write = origWrite;
+      }
+      if (captured)
+        writeToNeovimOutput(captured);
+      return;
+    }
     if (isOverlayActive()) {
       const origWrite = process.stdout.write;
       const chunks = [];
@@ -50338,7 +50406,11 @@ Rationale: ${proposal.rationale}${provenanceNote}`;
     }
     sudoPromptPending = true;
     const sudoPromptStr = `  ${c2.bold(c2.yellow("\u{1F511} Password:"))} `;
-    process.stdout.write(sudoPromptStr);
+    if (isNeovimActive()) {
+      writeToNeovimOutput(sudoPromptStr);
+    } else {
+      process.stdout.write(sudoPromptStr);
+    }
   }
   async function handleAskUser(question, options, allowMultiple) {
     if (statusBar?.isActive)
@@ -51087,7 +51159,12 @@ Respond concisely and safely. Remember: you are talking to the general public.`;
         const exposeFrames = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
         let exposeFrame = 0;
         const exposeSpinner = setInterval(() => {
-          process.stdout.write(`\r  ${c2.cyan(exposeFrames[exposeFrame % exposeFrames.length])} ${c2.dim(exposeSpinnerMsg)}`);
+          if (isNeovimActive()) {
+            writeToNeovimOutput(`${c2.cyan(exposeFrames[exposeFrame % exposeFrames.length])} ${c2.dim(exposeSpinnerMsg)}\r
+`);
+          } else {
+            process.stdout.write(`\r  ${c2.cyan(exposeFrames[exposeFrame % exposeFrames.length])} ${c2.dim(exposeSpinnerMsg)}`);
+          }
           exposeFrame++;
         }, 80);
         const newP2P = new ExposeP2PGateway({
@@ -51116,7 +51193,8 @@ Respond concisely and safely. Remember: you are talking to the general public.`;
         try {
           const peerId = await newP2P.start();
           clearInterval(exposeSpinner);
-          process.stdout.write(`\r\x1B[2K`);
+          if (!isNeovimActive())
+            process.stdout.write(`\r\x1B[2K`);
           p2pGateway = newP2P;
           writeContent(() => {
             process.stdout.write("\n" + newP2P.formatConnectionInfo() + "\n\n");
@@ -51124,7 +51202,8 @@ Respond concisely and safely. Remember: you are talking to the general public.`;
           return peerId;
         } catch (err) {
           clearInterval(exposeSpinner);
-          process.stdout.write(`\r\x1B[2K`);
+          if (!isNeovimActive())
+            process.stdout.write(`\r\x1B[2K`);
           if (!transport) {
             writeContent(() => {
               renderWarning(`libp2p expose failed: ${err instanceof Error ? err.message : String(err)}`);
@@ -51388,6 +51467,17 @@ Respond concisely and safely. Remember: you are talking to the general public.`;
     availableContentRows() {
       return statusBar.isActive ? statusBar.availableContentRows : Math.max(3, (process.stdout.rows ?? 24) - 6);
     },
+    showPrompt() {
+      showPrompt();
+    },
+    retireCarousel() {
+      if (!carouselRetired && carousel.isRunning) {
+        carousel.stop();
+        carouselRetired = true;
+        if (statusBar.isActive)
+          statusBar.setScrollRegionTop(1);
+      }
+    },
     destroyProject() {
       const oaPath = join51(repoRoot, OA_DIR);
       if (existsSync42(oaPath)) {
@@ -51562,7 +51652,12 @@ ${sessionCtx}` : "",
   function showPasteIndicator() {
     const count = pasteBuffer.length;
     const label = `  ${c2.dim("[")}${c2.bold(c2.cyan(String(count)))}${c2.dim(" pasted line" + (count !== 1 ? "s" : "") + " \u2014 press Enter to submit]")}`;
-    process.stdout.write(`\r\x1B[K${label}`);
+    if (isNeovimActive()) {
+      writeToNeovimOutput(`${label}\r
+`);
+    } else {
+      process.stdout.write(`\r\x1B[K${label}`);
+    }
     pasteIndicatorShown = true;
   }
   const buildSlashCommandHandler = () => {
@@ -51627,8 +51722,13 @@ ${result.content.slice(0, 2e3)}${result.content.length > 2e3 ? "\n[truncated]" :
   async function processLine(input) {
     if (depSudoPromptPending && depSudoResolver) {
       const pw = input.trim();
-      process.stdout.write(`\r\x1B[K  ${c2.dim("\u{1F511} Password received")}
-`);
+      const pwRecvMsg = `\r\x1B[K  ${c2.dim("\u{1F511} Password received")}
+`;
+      if (isNeovimActive()) {
+        writeToNeovimOutput(pwRecvMsg);
+      } else {
+        process.stdout.write(pwRecvMsg);
+      }
       depSudoResolver(pw || null);
       showPrompt();
       return;
@@ -51637,8 +51737,13 @@ ${result.content.slice(0, 2e3)}${result.content.length > 2e3 ? "\n[truncated]" :
       sudoPromptPending = false;
       sessionSudoPassword = input;
       activeTask.runner.setSudoPassword(input);
-      process.stdout.write(`\r\x1B[K  ${c2.dim("\u{1F511} Password received")}
-`);
+      const pwRecvMsg2 = `\r\x1B[K  ${c2.dim("\u{1F511} Password received")}
+`;
+      if (isNeovimActive()) {
+        writeToNeovimOutput(pwRecvMsg2);
+      } else {
+        process.stdout.write(pwRecvMsg2);
+      }
       showPrompt();
       return;
     }
@@ -51707,6 +51812,9 @@ Execute this skill now. Follow the behavioral guidance above.`;
           }, currentTaskType, resolvedContextWindowSize, resolvedCaps, currentStyle, deepContextEnabled, compactionSNRCallback(), emotionEngine, flowEnabled, buildSlashCommandHandler(), thinkingEnabled, handleAskUser);
           activeTask = task;
           showPrompt();
+          if (isNeovimActive() && !isNeovimFocused()) {
+            refocusNeovim();
+          }
           await task.promise;
         } catch (err) {
           const errMsg = err instanceof Error ? err.message : String(err);
@@ -51767,6 +51875,9 @@ ${result.text}`;
         } else {
           writeContent(() => renderUserInterrupt(input));
         }
+        if (isNeovimActive() && !isNeovimFocused()) {
+          refocusNeovim();
+        }
         const steerRunner = activeTask.runner;
         const steerTaskGoal = lastSubmittedPrompt;
         const steerFeed = getActivityFeed();
@@ -51951,6 +52062,9 @@ NEW TASK: ${fullInput}`;
       }, currentTaskType, resolvedContextWindowSize, resolvedCaps, currentStyle, deepContextEnabled, compactionSNRCallback(), emotionEngine, flowEnabled, buildSlashCommandHandler(), thinkingEnabled, handleAskUser);
       activeTask = task;
       showPrompt();
+      if (isNeovimActive() && !isNeovimFocused()) {
+        refocusNeovim();
+      }
       await task.promise;
     } catch (err) {
       const errMsg = err instanceof Error ? err.message : String(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-agents-ai",
-  "version": "0.104.14",
+  "version": "0.104.16",
   "description": "AI coding agent powered by open-source models (Ollama/vLLM) — interactive TUI with agentic tool-calling loop",
   "type": "module",
   "main": "./dist/index.js",