nexrall-code 0.5.73 → 0.5.75

package/dist/index.js

@@ -9873,6 +9873,7 @@ var require_client = __commonJS({
     exports.streamChat = streamChat;
     exports.cancelTurn = cancelTurn;
     exports.revokeRefreshToken = revokeRefreshToken2;
+    exports.describeAttachment = describeAttachment2;
     exports.getBalance = getBalance3;
     exports.exchangeVscodeCode = exchangeVscodeCode;
     exports.login = login2;
@@ -10596,6 +10597,37 @@ var require_client = __commonJS({
       } catch {
       }
     }
+    async function describeAttachment2(kind, data, mediaType, name) {
+      const fetchOnce = () => (0, node_fetch_1.default)(`${exports.API_BASE}/api/code/assets/describe`, {
+        method: "POST",
+        headers: { ...authHeaders(), "Content-Type": "application/json" },
+        body: JSON.stringify({ kind, data, media_type: mediaType, name })
+      });
+      let response = await fetchOnce();
+      if (response.status === 401 || response.status === 403) {
+        const body = await response.text().catch(() => "");
+        if (isExpiredTokenResponse(response.status, body) && await refreshAccessToken()) {
+          response = await fetchOnce();
+        } else {
+          throw new Error(`API error ${response.status}: ${body}`);
+        }
+      }
+      if (!response.ok) {
+        let message = `API error ${response.status}`;
+        try {
+          const body = await response.json();
+          if (body?.error)
+            message = body.error;
+        } catch {
+        }
+        throw new Error(message);
+      }
+      const json = await response.json();
+      return {
+        text: typeof json.text === "string" ? json.text : "",
+        balance: typeof json.balance === "number" ? json.balance : 0
+      };
+    }
     async function getBalance3() {
       const fetchOnce = () => (0, node_fetch_1.default)(`${exports.API_BASE}/api/code/balance`, { method: "GET", headers: authHeaders() });
       let response = await fetchOnce();
@@ -64700,23 +64732,50 @@ function footerText(info) {
 }
 var IntlWithSegmenter = Intl;
 var graphemeSegmenter = typeof IntlWithSegmenter.Segmenter === "function" ? new IntlWithSegmenter.Segmenter(void 0, { granularity: "grapheme" }) : null;
-function dropLastGrapheme(text) {
-  if (!text)
-    return "";
+function graphemeBoundaries(text) {
   if (graphemeSegmenter) {
-    let lastStart = 0;
-    for (const { index } of graphemeSegmenter.segment(text))
-      lastStart = index;
-    return text.slice(0, lastStart);
-  }
-  let end = text.length - 1;
-  while (end > 0 && /[\u0300-\u036F\u1AB0-\u1AFF\u20D0-\u20F0]/.test(text[end]))
-    end--;
-  const prev = text.charCodeAt(end - 1);
-  const curr = text.charCodeAt(end);
-  if (end > 0 && prev >= 55296 && prev <= 56319 && curr >= 56320 && curr <= 57343)
-    end--;
-  return text.slice(0, end);
+    const bounds2 = [0];
+    for (const { index } of graphemeSegmenter.segment(text)) {
+      if (index > 0)
+        bounds2.push(index);
+    }
+    bounds2.push(text.length);
+    return bounds2;
+  }
+  const bounds = [0];
+  let i2 = 0;
+  while (i2 < text.length) {
+    let next = i2 + 1;
+    const code = text.charCodeAt(i2);
+    if (code >= 55296 && code <= 56319 && next < text.length) {
+      const low = text.charCodeAt(next);
+      if (low >= 56320 && low <= 57343)
+        next++;
+    }
+    while (next < text.length && /[\u0300-\u036F\u1AB0-\u1AFF\u20D0-\u20F0]/.test(text[next]))
+      next++;
+    bounds.push(next);
+    i2 = next;
+  }
+  return bounds;
+}
+function prevGraphemeBoundary(text, pos) {
+  const bounds = graphemeBoundaries(text);
+  let prev = 0;
+  for (const b of bounds) {
+    if (b >= pos)
+      break;
+    prev = b;
+  }
+  return prev;
+}
+function nextGraphemeBoundary(text, pos) {
+  const bounds = graphemeBoundaries(text);
+  for (const b of bounds) {
+    if (b > pos)
+      return b;
+  }
+  return text.length;
 }
 var handle = null;
 var inkInstance = null;
@@ -64726,8 +64785,9 @@ var App2 = ({ onReady }) => {
   const [items, setItems] = (0, import_react35.useState)([]);
   const [footer, setFooterState] = (0, import_react35.useState)({ mode: "auto", autoApprove: false });
   const { columns } = use_window_size_default();
-  const [inputEnabled, setInputEnabledState] = (0, import_react35.useState)(true);
+  const [busy, setBusyState] = (0, import_react35.useState)(false);
   const [line, setLineState] = (0, import_react35.useState)("");
+  const [cursorPos, setCursorPosState] = (0, import_react35.useState)(0);
   const [prompt2, setPrompt] = (0, import_react35.useState)(DEFAULT_PROMPT);
   const { exit } = use_app_default();
   const lineRef = (0, import_react35.useRef)("");
@@ -64736,18 +64796,30 @@ var App2 = ({ onReady }) => {
     lineRef.current = value;
     setLineState(value);
   }, []);
+  const cursorRef = (0, import_react35.useRef)(0);
+  const setCursorPos = (0, import_react35.useCallback)((next) => {
+    const value = typeof next === "function" ? next(cursorRef.current) : next;
+    cursorRef.current = value;
+    setCursorPosState(value);
+  }, []);
   const askResolverRef = (0, import_react35.useRef)(null);
   const onLineRef = (0, import_react35.useRef)(null);
+  const onQueuedLineRef = (0, import_react35.useRef)(null);
+  const busyRef = (0, import_react35.useRef)(false);
   const [live, setLiveState] = (0, import_react35.useState)("");
   const print = (0, import_react35.useCallback)((text) => {
     setItems((prev) => [...prev, { id: idCounter++, content: text }]);
   }, []);
   const setFooter = (0, import_react35.useCallback)((info) => setFooterState(info), []);
   const setLive = (0, import_react35.useCallback)((text) => setLiveState(text), []);
-  const setInputEnabled = (0, import_react35.useCallback)((enabled) => setInputEnabledState(enabled), []);
+  const setBusy = (0, import_react35.useCallback)((value) => {
+    busyRef.current = value;
+    setBusyState(value);
+  }, []);
   const askLine = (0, import_react35.useCallback)((promptText) => {
     setPrompt(promptText || DEFAULT_PROMPT);
     setLine("");
+    setCursorPos(0);
     return new Promise((resolve3) => {
       askResolverRef.current = (answer) => {
         setPrompt(DEFAULT_PROMPT);
@@ -64758,18 +64830,58 @@ var App2 = ({ onReady }) => {
   const onLine = (0, import_react35.useCallback)((cb) => {
     onLineRef.current = cb;
   }, []);
+  const onQueuedLine = (0, import_react35.useCallback)((cb) => {
+    onQueuedLineRef.current = cb;
+  }, []);
+  const onInterruptRef = (0, import_react35.useRef)(null);
+  const onInterrupt = (0, import_react35.useCallback)((cb) => {
+    onInterruptRef.current = cb;
+  }, []);
   use_input_default((char, key) => {
-    if (!inputEnabled)
-      return;
     if (key.ctrl && char === "c") {
+      const askResolve = askResolverRef.current;
+      if (askResolve) {
+        askResolverRef.current = null;
+        setLine("");
+        setCursorPos(0);
+        askResolve("n");
+        return;
+      }
+      if (busyRef.current && onInterruptRef.current) {
+        onInterruptRef.current();
+        return;
+      }
       exit();
       return;
     }
     if (key.backspace || key.delete) {
-      setLine((s2) => dropLastGrapheme(s2));
+      if (key.delete) {
+        setLine((s2) => {
+          const pos = cursorRef.current;
+          const end = nextGraphemeBoundary(s2, pos);
+          return s2.slice(0, pos) + s2.slice(end);
+        });
+        return;
+      }
+      setLine((s2) => {
+        const pos = cursorRef.current;
+        if (pos === 0)
+          return s2;
+        const start = prevGraphemeBoundary(s2, pos);
+        setCursorPos(start);
+        return s2.slice(0, start) + s2.slice(pos);
+      });
       return;
     }
-    if (key.upArrow || key.downArrow || key.leftArrow || key.rightArrow || key.tab) {
+    if (key.leftArrow) {
+      setCursorPos((pos) => prevGraphemeBoundary(lineRef.current, pos));
+      return;
+    }
+    if (key.rightArrow) {
+      setCursorPos((pos) => nextGraphemeBoundary(lineRef.current, pos));
+      return;
+    }
+    if (key.upArrow || key.downArrow || key.tab) {
       return;
     }
     const newlineIdx = char.search(/[\r\n]/);
@@ -64777,24 +64889,42 @@ var App2 = ({ onReady }) => {
     if (hasNewline) {
       const before = newlineIdx === -1 ? char : char.slice(0, newlineIdx);
       const after = newlineIdx === -1 ? "" : char.slice(newlineIdx + 1).replace(/^[\r\n]/, "");
-      const submitted = lineRef.current + before;
+      const pos = cursorRef.current;
+      const submitted = lineRef.current.slice(0, pos) + before + lineRef.current.slice(pos);
       setLine(after);
+      setCursorPos(0);
       print(prompt2 + submitted);
       const askResolve = askResolverRef.current;
       if (askResolve) {
         askResolverRef.current = null;
         askResolve(submitted);
+      } else if (busyRef.current) {
+        onQueuedLineRef.current?.(submitted);
       } else {
         onLineRef.current?.(submitted);
       }
       return;
     }
-    setLine((s2) => s2 + char);
+    setLine((s2) => {
+      const pos = cursorRef.current;
+      setCursorPos(pos + char.length);
+      return s2.slice(0, pos) + char + s2.slice(pos);
+    });
   });
   import_react35.default.useEffect(() => {
-    onReady({ print, setFooter, setLive, askLine, onLine, setInputEnabled, close: () => exit() });
+    onReady({
+      print,
+      setFooter,
+      setLive,
+      askLine,
+      onLine,
+      onQueuedLine,
+      onInterrupt,
+      setBusy,
+      close: () => exit()
+    });
   }, []);
-  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))), inputEnabled ? /* @__PURE__ */ import_react35.default.createElement(Box_default, null, /* @__PURE__ */ import_react35.default.createElement(Text, null, prompt2), /* @__PURE__ */ import_react35.default.createElement(Text, null, line), /* @__PURE__ */ import_react35.default.createElement(Text, { inverse: true }, " ")) : /* @__PURE__ */ import_react35.default.createElement(Text, { dimColor: true }, "  (working\u2026)"), /* @__PURE__ */ import_react35.default.createElement(Text, { dimColor: true }, footerText(footer)));
+  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" : ""));
 };
 function startInkTerminal() {
   if (handle)
@@ -64835,26 +64965,31 @@ var InkReadlineAdapter = class extends EventEmitter3 {
   line = "";
   cursor = 0;
   ink;
-  paused = false;
+  busy = false;
+  pendingInput = [];
   constructor(ink) {
     super();
     this.ink = ink;
     this.ink.onLine((text) => {
-      if (this.paused)
-        return;
       this.emit("line", text);
     });
+    this.ink.onQueuedLine((text) => {
+      this.pendingInput.push(text);
+    });
+    this.ink.onInterrupt(() => {
+      this.emit("interrupt");
+    });
   }
   prompt(_preserveCursor) {
   }
   pause() {
-    this.paused = true;
-    this.ink.setInputEnabled(false);
+    this.busy = true;
+    this.ink.setBusy(true);
     return this;
   }
   resume() {
-    this.paused = false;
-    this.ink.setInputEnabled(true);
+    this.busy = false;
+    this.ink.setBusy(false);
     return this;
   }
   close() {
@@ -64864,6 +64999,21 @@ var InkReadlineAdapter = class extends EventEmitter3 {
   question(query, cb) {
     this.ink.askLine(query).then(cb);
   }
+  /**
+   * Drains and returns every follow-up message the user typed and sent while
+   * `pause()` was active (i.e. during a running agent turn). Intended to be
+   * passed straight through as `AgentLoopOptions.takePendingInput` — see
+   * loop.ts, and the VS Code panel's `_pendingInjections.splice(0)` for the
+   * pattern this mirrors. Returns `[]` when nothing is queued, and empties
+   * the queue on every call so the same follow-up is never folded in twice.
+   */
+  takePendingInput() {
+    return this.pendingInput.splice(0);
+  }
+  /** True while a `pause()`/`resume()` pair is in effect (an agent turn is running). */
+  isBusy() {
+    return this.busy;
+  }
 };
 
 // src/commands/chat.ts
@@ -65179,7 +65329,7 @@ function formatAgentsList(workDir) {
   }
   return lines.join("\n");
 }
-async function runTurn(messages, modelAlias, workDir, abortSignal, env3, nexrallMd, mode, effort, checkpointManager, onProgress) {
+async function runTurn(messages, modelAlias, workDir, abortSignal, env3, nexrallMd, mode, effort, checkpointManager, onProgress, takePendingInput) {
   let lastUsage;
   const spinner = new Spinner();
   const mdRender = new MarkdownStreamRenderer();
@@ -65220,6 +65370,14 @@ async function runTurn(messages, modelAlias, workDir, abortSignal, env3, nexrall
     // prompt, and sub-agents inherit the lock.
     planMode: mode === "plan",
     effort,
+    // Claude-Code-style follow-ups: text the user typed and sent WHILE this
+    // turn was already running. inkTerminal.tsx echoes each one into the
+    // transcript itself the moment it's submitted (chronological, matching
+    // the VS Code panel's queueMessage) — so onInjectedInput is intentionally
+    // a no-op here rather than printing it again.
+    takePendingInput,
+    onInjectedInput: () => {
+    },
     // The backend streams a cumulative output-token count (routes/code.js's
     // sendProgress, throttled to ≤5/s) covering thinking, visible text AND
     // tool-argument JSON. This used to be stored in a variable and rendered only
@@ -65720,12 +65878,22 @@ ${text}` : "");
     }
   });
   const rl = interactive ? new InkReadlineAdapter(getInkTerminal()) : readline3.createInterface({ input: process.stdin, output: process.stdout, terminal: true });
+  if (rl instanceof InkReadlineAdapter) {
+    rl.on("interrupt", () => {
+      if (agentRunning) {
+        console.log("\n" + source_default.yellow("  Interrupted."));
+        abortSignal.aborted = true;
+        agentRunning = false;
+      }
+    });
+  }
   setReadlineInterface(rl);
   const updateFooter = () => {
     if (interactive)
       getInkTerminal().setFooter({ mode: agentMode, autoApprove: isYoloMode() });
   };
   updateFooter();
+  const takePendingInput = rl instanceof InkReadlineAdapter ? () => rl.takePendingInput() : void 0;
   let inputBuffer = "";
   rl.on("line", async (rawLine) => {
     if (rawLine.endsWith("\\")) {
@@ -65879,7 +66047,10 @@ ${convText}`;
               env3,
               nexrallMd,
               agentMode,
-              effortLevel
+              effortLevel,
+              void 0,
+              void 0,
+              takePendingInput
             );
             agentRunning = false;
             const summaryText = [...r2.messages].reverse().find((m2) => m2.role === "assistant")?.content[0]?.text ?? "";
@@ -65938,7 +66109,10 @@ ${dirList}`;
               env3,
               nexrallMd,
               "auto",
-              effortLevel
+              effortLevel,
+              void 0,
+              void 0,
+              takePendingInput
             );
             agentRunning = false;
             const content = [...r2.messages].reverse().find((m2) => m2.role === "assistant")?.content[0]?.text ?? "";
@@ -66113,20 +66287,6 @@ ${content}
             return;
           }
           const model = normaliseModelId(modelAlias);
-          if (isPdf && NO_PDF_MODELS.has(model)) {
-            console.log(source_default.red(
-              `  ${resolveModelLabel(modelAlias)} does not support PDF attachments. Switch models with /model (Claude models support PDFs), or extract the text yourself and use /add instead.`
-            ));
-            rl.prompt();
-            return;
-          }
-          if (!isPdf && NO_VISION_MODELS.has(model)) {
-            console.log(source_default.red(
-              `  ${resolveModelLabel(modelAlias)} does not support image input. Switch models with /model, or attach as text with /add instead.`
-            ));
-            rl.prompt();
-            return;
-          }
           let buf;
           try {
             buf = fs8.readFileSync(filePath);
@@ -66146,9 +66306,24 @@ ${content}
           const label = caption ? `[Attached: ${rel}]
 ${caption}` : `[Attached: ${rel}]`;
           const content = [{ type: "text", text: label }];
-          content.push(
-            isPdf ? { type: "document", source: { type: "base64", media_type: "application/pdf", data } } : { type: "image", source: { type: "base64", media_type: mimeType, data } }
-          );
+          const needsSidecar = isPdf ? NO_PDF_MODELS.has(model) : NO_VISION_MODELS.has(model);
+          if (needsSidecar) {
+            console.log(source_default.dim(`  ${resolveModelLabel(modelAlias)} can't read ${isPdf ? "PDFs" : "images"} directly \u2014 describing ${rel} with Claude Sonnet 5 first\u2026`));
+            try {
+              const { text } = await (0, import_code_core3.describeAttachment)(isPdf ? "pdf" : "image", data, mimeType, rel);
+              content.push({ type: "text", text: `<attachment_description>
+${text}
+</attachment_description>` });
+            } catch (err) {
+              console.log(source_default.red(`  Could not describe ${rel}: ${err.message}`));
+              rl.prompt();
+              return;
+            }
+          } else {
+            content.push(
+              isPdf ? { type: "document", source: { type: "base64", media_type: "application/pdf", data } } : { type: "image", source: { type: "base64", media_type: mimeType, data } }
+            );
+          }
           console.log(source_default.dim(`  Attached ${rel} (${(buf.length / 1024).toFixed(0)}KB) \u2014 sending\u2026`));
           checkpoints.beginTurn(`/image ${rel}${caption ? " " + caption : ""}`, messages.length);
           messages.push({ role: "user", content });
@@ -66156,7 +66331,7 @@ ${caption}` : `[Attached: ${rel}]`;
           abortSignal.aborted = false;
           agentRunning = true;
           try {
-            const result = await runTurn(messages, modelAlias, workDir, abortSignal, env3, nexrallMd, agentMode, effortLevel, checkpoints, saveProgress);
+            const result = await runTurn(messages, modelAlias, workDir, abortSignal, env3, nexrallMd, agentMode, effortLevel, checkpoints, saveProgress, takePendingInput);
             messages = result.messages;
             updateTitle();
             saveSession(sessionId, sessionTitle, workDir, messages);
@@ -66276,7 +66451,7 @@ ${caption}` : `[Attached: ${rel}]`;
           abortSignal.aborted = false;
           agentRunning = true;
           try {
-            const result = await runTurn(messages, turnModel, workDir, abortSignal, env3, nexrallMd, turnMode, effortLevel, checkpoints, saveProgress);
+            const result = await runTurn(messages, turnModel, workDir, abortSignal, env3, nexrallMd, turnMode, effortLevel, checkpoints, saveProgress, takePendingInput);
             messages = result.messages;
             updateTitle();
             saveSession(sessionId, sessionTitle, workDir, messages);
@@ -66300,7 +66475,7 @@ ${caption}` : `[Attached: ${rel}]`;
     abortSignal.aborted = false;
     agentRunning = true;
     try {
-      const result = await runTurn(messages, modelAlias, workDir, abortSignal, env3, nexrallMd, agentMode, effortLevel, checkpoints, saveProgress);
+      const result = await runTurn(messages, modelAlias, workDir, abortSignal, env3, nexrallMd, agentMode, effortLevel, checkpoints, saveProgress, takePendingInput);
       messages = result.messages;
       updateTitle();
       saveSession(sessionId, sessionTitle, workDir, messages);

package/package.json

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