agent-sh 0.15.8 → 0.15.9

package/dist/shell/input-handler.js

@@ -57,7 +57,8 @@ export class InputHandler {
     loadHistory() {
         try {
             const data = fs.readFileSync(HISTORY_FILE, "utf-8");
-            this.history = data.split("\n").filter(Boolean);
+            this.history = data.split("\n").filter(Boolean)
+                .map((l) => l.replace(/\\([\\n])/g, (_, c) => c === "n" ? "\n" : "\\"));
         }
         catch {
         }
@@ -66,7 +67,8 @@ export class InputHandler {
         try {
             const { historySize } = getSettings();
             fs.mkdirSync(path.dirname(HISTORY_FILE), { recursive: true });
-            const lines = this.history.slice(-historySize);
+            const lines = this.history.slice(-historySize)
+                .map((l) => l.replace(/\\/g, "\\\\").replace(/\n/g, "\\n"));
             fs.writeFileSync(HISTORY_FILE, lines.join("\n") + "\n");
         }
         catch {
@@ -373,7 +375,7 @@ export class InputHandler {
                     this.editor.clear();
                     this.view.resetCursor();
                     this.dismissAutocomplete();
-                    if (query && query.startsWith("/")) {
+                    if (query && query.startsWith("/") && !query.includes("\n")) {
                         const spaceIdx = query.indexOf(" ");
                         const name = spaceIdx === -1 ? query : query.slice(0, spaceIdx);
                         const args = spaceIdx === -1 ? "" : query.slice(spaceIdx + 1).trim();

package/dist/shell/terminal.d.ts

@@ -1,12 +1,3 @@
-/**
- * Terminal — the user-facing I/O endpoint that a Shell talks to.
- *
- * Shell wraps a *pseudo*-terminal (the PTY the child shell sees). This
- * interface is the *real* terminal (or its substitute) on the other end:
- * bytes in, bytes out, dimensions, resize notifications. The default
- * factory wires it to process.stdin/stdout for the CLI; headless hosts
- * (multi-session web hubs, tests) supply their own.
- */
 import type { RenderSurface } from "../utils/compositor.js";
 export interface Terminal {
     write(data: string): void;
@@ -23,8 +14,8 @@ export interface Terminal {
         resume(): void;
     };
 }
-/** Default Terminal: wraps process.stdin/stdout. */
-export declare function processTerminal(): Terminal;
+/** Default Terminal: wraps process.stdin/stdout (injectable for tests). */
+export declare function processTerminal(stdin?: NodeJS.ReadStream, stdout?: NodeJS.WriteStream): Terminal;
 /**
  * No-op terminal for non-rendering hosts (tests, agent-only embeds).
  * Writes are discarded; input/resize never fire.

package/dist/shell/terminal.js

@@ -1,42 +1,60 @@
-/** Default Terminal: wraps process.stdin/stdout. */
-export function processTerminal() {
+/**
+ * Terminal — the user-facing I/O endpoint that a Shell talks to.
+ *
+ * Shell wraps a *pseudo*-terminal (the PTY the child shell sees). This
+ * interface is the *real* terminal (or its substitute) on the other end:
+ * bytes in, bytes out, dimensions, resize notifications. The default
+ * factory wires it to process.stdin/stdout for the CLI; headless hosts
+ * (multi-session web hubs, tests) supply their own.
+ */
+import { StringDecoder } from "node:string_decoder";
+/** Default Terminal: wraps process.stdin/stdout (injectable for tests). */
+export function processTerminal(stdin = process.stdin, stdout = process.stdout) {
     return {
         write(data) {
-            if (process.stdout.writable) {
+            if (stdout.writable) {
                 try {
-                    process.stdout.write(data);
+                    stdout.write(data);
                 }
                 catch { /* ignore */ }
             }
         },
         onInput(cb) {
-            const handler = (b) => cb(b.toString("utf-8"));
-            process.stdin.on("data", handler);
-            return () => { process.stdin.off("data", handler); };
+            // Stateful decode: tty chunk boundaries can land mid-way through a
+            // multibyte UTF-8 sequence (large pastes), so per-chunk toString()
+            // would emit U+FFFD for the torn halves.
+            const decoder = new StringDecoder("utf-8");
+            const handler = (b) => {
+                const text = decoder.write(b);
+                if (text)
+                    cb(text);
+            };
+            stdin.on("data", handler);
+            return () => { stdin.off("data", handler); };
         },
         onResize(cb) {
-            const handler = () => cb(process.stdout.columns || 80, process.stdout.rows || 24);
-            process.stdout.on("resize", handler);
-            return () => { process.stdout.off("resize", handler); };
+            const handler = () => cb(stdout.columns || 80, stdout.rows || 24);
+            stdout.on("resize", handler);
+            return () => { stdout.off("resize", handler); };
         },
-        cols() { return process.stdout.columns || 80; },
-        rows() { return process.stdout.rows || 24; },
+        cols() { return stdout.columns || 80; },
+        rows() { return stdout.rows || 24; },
         suspendInput() {
-            const wasRaw = process.stdin.isTTY && process.stdin.isRaw;
-            if (process.stdin.isTTY) {
+            const wasRaw = stdin.isTTY && stdin.isRaw;
+            if (stdin.isTTY) {
                 try {
-                    process.stdin.setRawMode(false);
-                    process.stdin.pause();
+                    stdin.setRawMode(false);
+                    stdin.pause();
                 }
                 catch { /* ignore */ }
             }
             return {
                 resume() {
-                    if (process.stdin.isTTY) {
+                    if (stdin.isTTY) {
                         try {
-                            process.stdin.resume();
+                            stdin.resume();
                             if (wasRaw)
-                                process.stdin.setRawMode(true);
+                                stdin.setRawMode(true);
                         }
                         catch { /* ignore */ }
                     }

package/dist/shell/tui-renderer.js

@@ -845,7 +845,7 @@ export default function activate(ctx) {
             ? getSettings().readOutputMaxLines
             : getSettings().maxCommandOutputLines;
         s.commandOutputBuffer += chunk;
-        const lines = s.commandOutputBuffer.split("\n");
+        const lines = s.commandOutputBuffer.split(/\r?\n/);
         s.commandOutputBuffer = lines.pop();
         for (const line of lines) {
             if (s.commandOutputLineCount < maxLines) {

package/dist/utils/ansi.d.ts

@@ -44,3 +44,10 @@ export declare function padEndToWidth(str: string, targetWidth: number): string;
  *  CSI, private-mode, 8-bit CSI, and newer variants). `\r` is not an escape
  *  but callers rely on it being stripped alongside. */
 export declare function stripAnsi(str: string): string;
+/**
+ * Sanitize text for painting at a fixed screen position: SGR (color/style)
+ * passes through; anything else that would move the cursor or mutate
+ * terminal state mid-row is dropped. Tabs become a single space so painted
+ * width matches `stripAnsi`-based measurement.
+ */
+export declare function stripCursorControls(str: string): string;

package/dist/utils/ansi.js

@@ -134,3 +134,23 @@ export function padEndToWidth(str, targetWidth) {
 export function stripAnsi(str) {
     return stripAnsiPkg(str).replace(/\r/g, "");
 }
+/**
+ * Sanitize text for painting at a fixed screen position: SGR (color/style)
+ * passes through; anything else that would move the cursor or mutate
+ * terminal state mid-row is dropped. Tabs become a single space so painted
+ * width matches `stripAnsi`-based measurement.
+ */
+export function stripCursorControls(str) {
+    // Park SGR behind NUL placeholders so the strips below can't eat their ESC bytes.
+    const sgr = [];
+    const cleaned = str
+        .replace(/\x00/g, "")
+        .replace(/\x1b\[[0-9;:]*m/g, (m) => { sgr.push(m); return "\x00"; })
+        .replace(/\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)?/g, "")
+        .replace(/\x1b\[[0-9;:?]*[ -/]*[@-~]/g, "")
+        .replace(/\x1b./g, "")
+        .replace(/\t/g, " ")
+        .replace(/[\x01-\x08\x0a-\x1f\x7f]/g, "");
+    let i = 0;
+    return cleaned.replace(/\x00/g, () => sgr[i++] ?? "");
+}

package/dist/utils/floating-panel.js

@@ -30,7 +30,7 @@
  * Usage from extensions:
  *   import { FloatingPanel } from "agent-sh/utils/floating-panel.js";
  */
-import { stripAnsi } from "./ansi.js";
+import { stripAnsi, stripCursorControls } from "./ansi.js";
 import { wrapLine } from "./markdown.js";
 import { LineEditor } from "./line-editor.js";
 import { TerminalBuffer } from "./terminal-buffer.js";
@@ -253,10 +253,11 @@ export class FloatingPanel {
         this.handlers.define(`${p}:input`, (_data) => false);
         // Default row builder: truncate and pad
         this.handlers.define(`${p}:build-row`, (content, width) => {
-            const plain = stripAnsi(content);
+            const clean = stripCursorControls(content);
+            const plain = stripAnsi(clean);
             const display = plain.length > width
-                ? content.slice(0, width - 1) + "\u2026"
-                : content;
+                ? clean.slice(0, width - 1) + "\u2026"
+                : clean;
             const pad = Math.max(0, width - stripAnsi(display).length);
             return display + " ".repeat(pad);
         });

package/dist/utils/line-editor.js

@@ -121,7 +121,7 @@ export class LineEditor {
         // paste, since typed input arrives one keystroke per chunk in raw mode.
         if (!this.inPaste && data.length > 1 && /[\r\n]/.test(data)
             && data.indexOf("\x1b[200~") === -1) {
-            this.pasteAccum = data.replace(/\r\n?/g, "\n");
+            this.pasteAccum = data;
             actions.push(...this.commitPaste());
             return actions;
         }
@@ -247,7 +247,7 @@ export class LineEditor {
     consumePasteChunk(data) {
         const endIdx = data.indexOf(PASTE_END);
         if (endIdx !== -1) {
-            this.pasteAccum += data.slice(0, endIdx).replace(/\r/g, "");
+            this.pasteAccum += data.slice(0, endIdx);
             return endIdx;
         }
         let suffixLen = 0;
@@ -258,14 +258,17 @@ export class LineEditor {
             }
         }
         const safeEnd = data.length - suffixLen;
-        this.pasteAccum += data.slice(0, safeEnd).replace(/\r/g, "");
+        this.pasteAccum += data.slice(0, safeEnd);
         if (suffixLen > 0)
             this.pendingSeq = data.slice(safeEnd);
         return -1;
     }
     commitPaste() {
         this.inPaste = false;
-        const accum = this.pasteAccum;
+        // Pasted line separators arrive as \n, \r (xterm convention), or \r\n
+        // depending on terminal; normalize on the full accumulation so a \r\n
+        // pair split across chunks still collapses to one newline.
+        const accum = this.pasteAccum.replace(/\r\n?/g, "\n");
         this.pasteAccum = "";
         if (!accum)
             return [];

package/examples/extensions/ashi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@guanyilun/ashi",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "Ash in an interactive TUI — agent-sh's built-in agent without the shell underneath",
   "type": "module",
   "main": "dist/cli.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-sh",
-  "version": "0.15.8",
+  "version": "0.15.9",
   "description": "A composable agent runtime — pair any frontend with any agent backend over one shared extension layer",
   "type": "module",
   "workspaces": [

package/src/shell/input-handler.ts

@@ -88,7 +88,8 @@ export class InputHandler {
   private loadHistory(): void {
     try {
       const data = fs.readFileSync(HISTORY_FILE, "utf-8");
-      this.history = data.split("\n").filter(Boolean);
+      this.history = data.split("\n").filter(Boolean)
+        .map((l) => l.replace(/\\([\\n])/g, (_, c: string) => c === "n" ? "\n" : "\\"));
     } catch {
     }
   }
@@ -97,7 +98,8 @@ export class InputHandler {
     try {
       const { historySize } = getSettings();
       fs.mkdirSync(path.dirname(HISTORY_FILE), { recursive: true });
-      const lines = this.history.slice(-historySize);
+      const lines = this.history.slice(-historySize)
+        .map((l) => l.replace(/\\/g, "\\\\").replace(/\n/g, "\\n"));
       fs.writeFileSync(HISTORY_FILE, lines.join("\n") + "\n");
     } catch {
     }
@@ -392,7 +394,7 @@ export class InputHandler {
           this.editor.clear();
           this.view.resetCursor();
           this.dismissAutocomplete();
-          if (query && query.startsWith("/")) {
+          if (query && query.startsWith("/") && !query.includes("\n")) {
             const spaceIdx = query.indexOf(" ");
             const name = spaceIdx === -1 ? query : query.slice(0, spaceIdx);
             const args = spaceIdx === -1 ? "" : query.slice(spaceIdx + 1).trim();

package/src/shell/terminal.ts

@@ -7,6 +7,7 @@
  * factory wires it to process.stdin/stdout for the CLI; headless hosts
  * (multi-session web hubs, tests) supply their own.
  */
+import { StringDecoder } from "node:string_decoder";
 import type { RenderSurface } from "../utils/compositor.js";
 
 export interface Terminal {
@@ -23,40 +24,50 @@ export interface Terminal {
   suspendInput?(): { resume(): void };
 }
 
-/** Default Terminal: wraps process.stdin/stdout. */
-export function processTerminal(): Terminal {
+/** Default Terminal: wraps process.stdin/stdout (injectable for tests). */
+export function processTerminal(
+  stdin: NodeJS.ReadStream = process.stdin,
+  stdout: NodeJS.WriteStream = process.stdout,
+): Terminal {
   return {
     write(data) {
-      if (process.stdout.writable) {
-        try { process.stdout.write(data); } catch { /* ignore */ }
+      if (stdout.writable) {
+        try { stdout.write(data); } catch { /* ignore */ }
       }
     },
     onInput(cb) {
-      const handler = (b: Buffer) => cb(b.toString("utf-8"));
-      process.stdin.on("data", handler);
-      return () => { process.stdin.off("data", handler); };
+      // Stateful decode: tty chunk boundaries can land mid-way through a
+      // multibyte UTF-8 sequence (large pastes), so per-chunk toString()
+      // would emit U+FFFD for the torn halves.
+      const decoder = new StringDecoder("utf-8");
+      const handler = (b: Buffer) => {
+        const text = decoder.write(b);
+        if (text) cb(text);
+      };
+      stdin.on("data", handler);
+      return () => { stdin.off("data", handler); };
     },
     onResize(cb) {
-      const handler = () => cb(process.stdout.columns || 80, process.stdout.rows || 24);
-      process.stdout.on("resize", handler);
-      return () => { process.stdout.off("resize", handler); };
+      const handler = () => cb(stdout.columns || 80, stdout.rows || 24);
+      stdout.on("resize", handler);
+      return () => { stdout.off("resize", handler); };
     },
-    cols() { return process.stdout.columns || 80; },
-    rows() { return process.stdout.rows || 24; },
+    cols() { return stdout.columns || 80; },
+    rows() { return stdout.rows || 24; },
     suspendInput() {
-      const wasRaw = process.stdin.isTTY && (process.stdin as { isRaw?: boolean }).isRaw;
-      if (process.stdin.isTTY) {
+      const wasRaw = stdin.isTTY && (stdin as { isRaw?: boolean }).isRaw;
+      if (stdin.isTTY) {
         try {
-          process.stdin.setRawMode(false);
-          process.stdin.pause();
+          stdin.setRawMode(false);
+          stdin.pause();
         } catch { /* ignore */ }
       }
       return {
         resume() {
-          if (process.stdin.isTTY) {
+          if (stdin.isTTY) {
             try {
-              process.stdin.resume();
-              if (wasRaw) process.stdin.setRawMode(true);
+              stdin.resume();
+              if (wasRaw) stdin.setRawMode(true);
             } catch { /* ignore */ }
           }
         },

package/src/shell/tui-renderer.ts

@@ -939,7 +939,7 @@ export default function activate(ctx: ExtensionContext): void {
       ? getSettings().readOutputMaxLines
       : getSettings().maxCommandOutputLines;
     s.commandOutputBuffer += chunk;
-    const lines = s.commandOutputBuffer.split("\n");
+    const lines = s.commandOutputBuffer.split(/\r?\n/);
     s.commandOutputBuffer = lines.pop()!;
     for (const line of lines) {
       if (s.commandOutputLineCount < maxLines) {

package/src/utils/ansi.ts

@@ -138,3 +138,24 @@ export function padEndToWidth(str: string, targetWidth: number): string {
 export function stripAnsi(str: string): string {
   return stripAnsiPkg(str).replace(/\r/g, "");
 }
+
+/**
+ * Sanitize text for painting at a fixed screen position: SGR (color/style)
+ * passes through; anything else that would move the cursor or mutate
+ * terminal state mid-row is dropped. Tabs become a single space so painted
+ * width matches `stripAnsi`-based measurement.
+ */
+export function stripCursorControls(str: string): string {
+  // Park SGR behind NUL placeholders so the strips below can't eat their ESC bytes.
+  const sgr: string[] = [];
+  const cleaned = str
+    .replace(/\x00/g, "")
+    .replace(/\x1b\[[0-9;:]*m/g, (m) => { sgr.push(m); return "\x00"; })
+    .replace(/\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)?/g, "")
+    .replace(/\x1b\[[0-9;:?]*[ -/]*[@-~]/g, "")
+    .replace(/\x1b./g, "")
+    .replace(/\t/g, " ")
+    .replace(/[\x01-\x08\x0a-\x1f\x7f]/g, "");
+  let i = 0;
+  return cleaned.replace(/\x00/g, () => sgr[i++] ?? "");
+}

package/src/utils/floating-panel.ts

@@ -30,7 +30,7 @@
  * Usage from extensions:
  *   import { FloatingPanel } from "agent-sh/utils/floating-panel.js";
  */
-import { stripAnsi } from "./ansi.js";
+import { stripAnsi, stripCursorControls } from "./ansi.js";
 import { wrapLine } from "./markdown.js";
 import { LineEditor } from "./line-editor.js";
 import { TerminalBuffer } from "./terminal-buffer.js";
@@ -408,10 +408,11 @@ export class FloatingPanel {
 
     // Default row builder: truncate and pad
     this.handlers.define(`${p}:build-row`, (content: string, width: number): string => {
-      const plain = stripAnsi(content);
+      const clean = stripCursorControls(content);
+      const plain = stripAnsi(clean);
       const display = plain.length > width
-        ? content.slice(0, width - 1) + "\u2026"
-        : content;
+        ? clean.slice(0, width - 1) + "\u2026"
+        : clean;
       const pad = Math.max(0, width - stripAnsi(display).length);
       return display + " ".repeat(pad);
     });

package/src/utils/line-editor.ts

@@ -152,7 +152,7 @@ export class LineEditor {
     // paste, since typed input arrives one keystroke per chunk in raw mode.
     if (!this.inPaste && data.length > 1 && /[\r\n]/.test(data)
         && data.indexOf("\x1b[200~") === -1) {
-      this.pasteAccum = data.replace(/\r\n?/g, "\n");
+      this.pasteAccum = data;
       actions.push(...this.commitPaste());
       return actions;
     }
@@ -263,7 +263,7 @@ export class LineEditor {
   private consumePasteChunk(data: string): number {
     const endIdx = data.indexOf(PASTE_END);
     if (endIdx !== -1) {
-      this.pasteAccum += data.slice(0, endIdx).replace(/\r/g, "");
+      this.pasteAccum += data.slice(0, endIdx);
       return endIdx;
     }
     let suffixLen = 0;
@@ -271,14 +271,17 @@ export class LineEditor {
       if (data.endsWith(PASTE_END.slice(0, p))) { suffixLen = p; break; }
     }
     const safeEnd = data.length - suffixLen;
-    this.pasteAccum += data.slice(0, safeEnd).replace(/\r/g, "");
+    this.pasteAccum += data.slice(0, safeEnd);
     if (suffixLen > 0) this.pendingSeq = data.slice(safeEnd);
     return -1;
   }
 
   private commitPaste(): LineEditAction[] {
     this.inPaste = false;
-    const accum = this.pasteAccum;
+    // Pasted line separators arrive as \n, \r (xterm convention), or \r\n
+    // depending on terminal; normalize on the full accumulation so a \r\n
+    // pair split across chunks still collapses to one newline.
+    const accum = this.pasteAccum.replace(/\r\n?/g, "\n");
     this.pasteAccum = "";
     if (!accum) return [];
     if (accum.indexOf("\n") === -1) {