nexrall-code 0.5.77 → 0.5.78

package/dist/index.js

@@ -55817,7 +55817,18 @@ function prepareSessionScreen() {
     return;
   process.stdout.write("\x1B[2J\x1B[3J\x1B[H");
 }
-var BOTTOM_CHROME_ROWS = 3;
+function bottomChromeRows(opts = {
+  footerText: ""
+}) {
+  const columns = opts.columns ?? process.stdout.columns ?? 80;
+  const separatorRows = 1;
+  const inputRows = rowsOccupied(
+    " ".repeat(opts.promptWidth ?? 2) + (opts.inputText ?? ""),
+    columns
+  );
+  const footerRows = rowsOccupied(opts.footerText, columns);
+  return separatorRows + inputRows + footerRows;
+}
 function rowsOccupied(text, columns = process.stdout.columns || 80) {
   let rows = 0;
   for (const line of text.split("\n")) {
@@ -55826,11 +55837,12 @@ function rowsOccupied(text, columns = process.stdout.columns || 80) {
   }
   return rows;
 }
-function padToBottom(rowsAlreadyPrinted) {
+function padToBottom(rowsAlreadyPrinted, footerText2 = "") {
   const rows = process.stdout.rows;
   if (!process.stdout.isTTY || !rows)
     return;
-  const filler = rows - rowsAlreadyPrinted - BOTTOM_CHROME_ROWS - 2;
+  const chromeRows = bottomChromeRows({ footerText: footerText2, columns: process.stdout.columns ?? 80 });
+  const filler = rows - rowsAlreadyPrinted - chromeRows - 2;
   const MIN_WORTHWHILE_FILLER = 3;
   if (filler < MIN_WORTHWHILE_FILLER)
     return;
@@ -55841,19 +55853,26 @@ function startRowCount() {
   if (rowCounter)
     return;
   const columns = process.stdout.columns || 80;
-  const original = console.log;
-  const state = { rows: 0, original };
+  const originalLog = console.log;
+  const originalError = console.error;
+  const state = { rows: 0, originalLog, originalError };
   rowCounter = state;
+  const measure = (args) => args.length === 0 ? 1 : rowsOccupied(args.map(String).join(" "), columns);
   console.log = (...args) => {
-    state.rows += args.length === 0 ? 1 : rowsOccupied(args.map(String).join(" "), columns);
-    original(...args);
+    state.rows += measure(args);
+    originalLog(...args);
+  };
+  console.error = (...args) => {
+    state.rows += measure(args);
+    originalError(...args);
   };
 }
 function stopRowCount() {
   if (!rowCounter)
     return 0;
-  const { rows, original } = rowCounter;
-  console.log = original;
+  const { rows, originalLog, originalError } = rowCounter;
+  console.log = originalLog;
+  console.error = originalError;
   rowCounter = null;
   return rows;
 }
@@ -64873,6 +64892,26 @@ function nextGraphemeBoundary(text, pos) {
   }
   return text.length;
 }
+function renderInputSlices(line, cursorPos) {
+  const end = nextGraphemeBoundary(line, cursorPos);
+  return {
+    before: line.slice(0, cursorPos),
+    atCursor: line.slice(cursorPos, end) || " ",
+    after: line.slice(end)
+  };
+}
+var CTRL_C_QUIT_WINDOW_MS = 3e3;
+var CTRL_C_HINT = "Press Ctrl+C again to exit";
+function decideCtrlC(state) {
+  if (state.hasPendingQuestion)
+    return "answer-prompt";
+  if (state.busy)
+    return "interrupt-turn";
+  if (state.quitArmedAt !== null && state.now - state.quitArmedAt <= CTRL_C_QUIT_WINDOW_MS) {
+    return "quit";
+  }
+  return "arm-quit";
+}
 var handle = null;
 var inkInstance = null;
 var idCounter = 0;
@@ -64902,6 +64941,12 @@ var App2 = ({ onReady }) => {
   const onLineRef = (0, import_react35.useRef)(null);
   const onQueuedLineRef = (0, import_react35.useRef)(null);
   const busyRef = (0, import_react35.useRef)(false);
+  const [quitArmed, setQuitArmedState] = (0, import_react35.useState)(null);
+  const quitArmedAtRef = (0, import_react35.useRef)(null);
+  const setQuitArmed = (0, import_react35.useCallback)((at) => {
+    quitArmedAtRef.current = at;
+    setQuitArmedState(at);
+  }, []);
   const [live, setLiveState] = (0, import_react35.useState)("");
   const print = (0, import_react35.useCallback)((text) => {
     setItems((prev) => [...prev, { id: idCounter++, content: text }]);
@@ -64933,23 +64978,49 @@ var App2 = ({ onReady }) => {
   const onInterrupt = (0, import_react35.useCallback)((cb) => {
     onInterruptRef.current = cb;
   }, []);
+  const onExitRef = (0, import_react35.useRef)(null);
+  const onExit = (0, import_react35.useCallback)((cb) => {
+    onExitRef.current = cb;
+  }, []);
+  const exitedRef = (0, import_react35.useRef)(false);
+  const requestExit = (0, import_react35.useCallback)((notify) => {
+    if (exitedRef.current)
+      return;
+    exitedRef.current = true;
+    if (notify)
+      onExitRef.current?.();
+    exit();
+  }, []);
   use_input_default((char, key) => {
     if (key.ctrl && char === "c") {
-      const askResolve = askResolverRef.current;
-      if (askResolve) {
+      const action = decideCtrlC({
+        hasPendingQuestion: askResolverRef.current !== null,
+        busy: busyRef.current && onInterruptRef.current !== null,
+        quitArmedAt: quitArmedAtRef.current,
+        now: Date.now()
+      });
+      if (action === "answer-prompt") {
+        const askResolve = askResolverRef.current;
         askResolverRef.current = null;
         setLine("");
         setCursorPos(0);
         askResolve("n");
         return;
       }
-      if (busyRef.current && onInterruptRef.current) {
-        onInterruptRef.current();
+      if (action === "interrupt-turn") {
+        setQuitArmed(null);
+        onInterruptRef.current?.();
         return;
       }
-      exit();
+      if (action === "arm-quit") {
+        setQuitArmed(Date.now());
+        return;
+      }
+      requestExit(true);
       return;
     }
+    if (quitArmedAtRef.current !== null)
+      setQuitArmed(null);
     if (key.backspace || key.delete) {
       if (key.delete) {
         setLine((s2) => {
@@ -65022,11 +65093,13 @@ var App2 = ({ onReady }) => {
       onLine,
       onQueuedLine,
       onInterrupt,
+      onExit,
       setBusy,
-      close: () => exit()
+      close: () => requestExit(false)
     });
   }, []);
-  return /* @__PURE__ */ import_react35.default.createElement(Box_default, { flexDirection: "column" }, /* @__PURE__ */ import_react35.default.createElement(Static, { items }, (item) => /* @__PURE__ */ import_react35.default.createElement(Text, { key: item.id }, item.content)), live ? /* @__PURE__ */ import_react35.default.createElement(Text, null, live) : null, /* @__PURE__ */ import_react35.default.createElement(Text, { dimColor: true }, "\u2500".repeat(Math.max(1, columns - 1))), /* @__PURE__ */ import_react35.default.createElement(Box_default, null, /* @__PURE__ */ import_react35.default.createElement(Text, null, prompt2), /* @__PURE__ */ import_react35.default.createElement(Text, null, line.slice(0, cursorPos)), /* @__PURE__ */ import_react35.default.createElement(Text, { inverse: true }, line.slice(cursorPos, cursorPos + 1) || " "), /* @__PURE__ */ import_react35.default.createElement(Text, null, line.slice(cursorPos + 1))), /* @__PURE__ */ import_react35.default.createElement(Text, { dimColor: true }, footerText(footer), busy ? "  \xB7 agent working\u2026" : ""));
+  const slices = renderInputSlices(line, cursorPos);
+  return /* @__PURE__ */ import_react35.default.createElement(Box_default, { flexDirection: "column" }, /* @__PURE__ */ import_react35.default.createElement(Static, { items }, (item) => /* @__PURE__ */ import_react35.default.createElement(Text, { key: item.id }, item.content)), live ? /* @__PURE__ */ import_react35.default.createElement(Text, null, live) : null, /* @__PURE__ */ import_react35.default.createElement(Text, { dimColor: true }, "\u2500".repeat(Math.max(1, columns - 1))), /* @__PURE__ */ import_react35.default.createElement(Box_default, null, /* @__PURE__ */ import_react35.default.createElement(Text, null, prompt2), /* @__PURE__ */ import_react35.default.createElement(Text, null, slices.before), /* @__PURE__ */ import_react35.default.createElement(Text, { inverse: true }, slices.atCursor), /* @__PURE__ */ import_react35.default.createElement(Text, null, slices.after)), quitArmed !== null ? /* @__PURE__ */ import_react35.default.createElement(Text, { color: "yellow" }, CTRL_C_HINT) : /* @__PURE__ */ import_react35.default.createElement(Text, { dimColor: true }, footerText(footer), busy ? "  \xB7 agent working\u2026" : ""));
 };
 function startInkTerminal() {
   if (handle)
@@ -65110,6 +65183,9 @@ var InkReadlineAdapter = class extends EventEmitter3 {
     this.ink.onInterrupt(() => {
       this.emit("interrupt");
     });
+    this.ink.onExit(() => {
+      this.emit("close");
+    });
   }
   prompt(_preserveCursor) {
   }
@@ -65868,15 +65944,20 @@ Set ${TRUST_ENV_VAR}=1 to confirm non-interactively, or run \`nex\` interactivel
   let skills = (0, import_code_core3.loadSkills)(workDir);
   if (skills.length && !headless)
     console.log(source_default.dim(`  ${skills.length} skill(s) loaded`));
-  try {
-    await initMcp(workDir);
-    const connected = _mcpManager?.serverNames.length ?? 0;
-    const total = _mcpConfig ? Object.keys(_mcpConfig.mcpServers).length : 0;
-    if (total && !headless) {
-      console.log(source_default.dim(`  ${connected}/${total} MCP server(s) connected`) + source_default.dim("  (/mcp for details)"));
+  const mcpStarted = (async () => {
+    try {
+      await initMcp(workDir);
+      const connected = _mcpManager?.serverNames.length ?? 0;
+      const total = _mcpConfig ? Object.keys(_mcpConfig.mcpServers).length : 0;
+      if (total && !headless) {
+        console.log(source_default.dim(`  ${connected}/${total} MCP server(s) connected`) + source_default.dim("  (/mcp for details)"));
+      }
+    } catch {
     }
-  } catch {
-  }
+  })();
+  const mcpReady = () => mcpStarted;
+  if (!interactive)
+    await mcpStarted;
   if (headless && !options.prompt && !options.stdinText) {
     process.stdout.write(JSON.stringify({ type: "error", error: "--output-format json/stream-json requires a one-shot prompt (or piped stdin)." }) + "\n");
     process.exit(1);
@@ -65999,7 +66080,7 @@ ${text}` : "");
   console.log();
   if (interactive) {
     await flushInkFrame();
-    padToBottom(stopRowCount());
+    padToBottom(stopRowCount(), footerText({ mode: agentMode, autoApprove: isYoloMode() }));
   }
   let agentRunning = false;
   const abortSignal = { aborted: false };
@@ -66469,6 +66550,7 @@ ${text}
           rl.pause();
           abortSignal.aborted = false;
           agentRunning = true;
+          await mcpReady();
           try {
             const result = await runTurn(messages, modelAlias, workDir, abortSignal, env3, nexrallMd, agentMode, effortLevel, checkpoints, saveProgress, takePendingInput);
             messages = result.messages;
@@ -66510,6 +66592,7 @@ ${text}
           return;
         }
         case "/mcp": {
+          await mcpReady();
           console.log();
           console.log(source_default.bold("  MCP servers:"));
           console.log(formatMcpStatus());
@@ -66589,6 +66672,7 @@ ${text}
           rl.pause();
           abortSignal.aborted = false;
           agentRunning = true;
+          await mcpReady();
           try {
             const result = await runTurn(messages, turnModel, workDir, abortSignal, env3, nexrallMd, turnMode, effortLevel, checkpoints, saveProgress, takePendingInput);
             messages = result.messages;
@@ -66613,6 +66697,7 @@ ${text}
     rl.pause();
     abortSignal.aborted = false;
     agentRunning = true;
+    await mcpReady();
     try {
       const result = await runTurn(messages, modelAlias, workDir, abortSignal, env3, nexrallMd, agentMode, effortLevel, checkpoints, saveProgress, takePendingInput);
       messages = result.messages;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nexrall-code",
-  "version": "0.5.77",
+  "version": "0.5.78",
   "description": "Nexrall Code — AI coding assistant for your terminal (headless agent for scripts, CI and automation)",
   "keywords": [
     "ai",
@@ -41,7 +41,7 @@
     "release": "node build.js && node scripts/upload-release.cjs"
   },
   "dependencies": {
-    "@nexrall/code-core": "^1.4.45",
+    "@nexrall/code-core": "^1.4.46",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "diff": "^5.2.0",