terminal-pilot 0.0.28 → 0.0.29

package/dist/commands/screenshot.js

@@ -431,6 +431,9 @@ import { rename, rm, writeFile } from "node:fs/promises";
 
 // ../terminal-png/src/ansi-parser.ts
 var ESC = "\x1B";
+var TAB_WIDTH = 8;
+var MAX_TERMINAL_ROWS = 1e3;
+var MAX_TERMINAL_COLUMNS = 1e3;
 function createDefaultStyle() {
   return {
     fg: null,
@@ -715,10 +718,34 @@ function positionParameter(params2, index, fallback) {
   const value = toInteger(params2.split(";")[index]);
   return value === null || value < 1 ? fallback : value;
 }
+function modeParameter(params2, fallback) {
+  const value = toInteger(params2.split(";")[0]);
+  return value === null ? fallback : value;
+}
+function displayWidth(text) {
+  if (text === "	") {
+    return TAB_WIDTH;
+  }
+  const codePoint = text.codePointAt(0);
+  if (codePoint === void 0) {
+    return 0;
+  }
+  if (codePoint >= 4352 && codePoint <= 4447 || codePoint === 9001 || codePoint === 9002 || codePoint >= 11904 && codePoint <= 42191 && codePoint !== 12351 || codePoint >= 44032 && codePoint <= 55203 || codePoint >= 63744 && codePoint <= 64255 || codePoint >= 65040 && codePoint <= 65049 || codePoint >= 65072 && codePoint <= 65135 || codePoint >= 65280 && codePoint <= 65376 || codePoint >= 65504 && codePoint <= 65510 || codePoint >= 127744 && codePoint <= 128591 || codePoint >= 129280 && codePoint <= 129535 || codePoint >= 131072 && codePoint <= 262141) {
+    return 2;
+  }
+  return 1;
+}
+function hasRenderableCell(line) {
+  return (line ?? []).some((cell) => cell !== void 0 && cell.text.length > 0);
+}
 function buildRuns(lines, lineBreakStyles) {
   const runs = [];
   const defaultStyle = createDefaultStyle();
-  for (let row = 0; row < lines.length; row += 1) {
+  let lastRow = lines.length - 1;
+  while (lastRow > 0 && !hasRenderableCell(lines[lastRow]) && lineBreakStyles[lastRow - 1] === void 0) {
+    lastRow -= 1;
+  }
+  for (let row = 0; row <= lastRow; row += 1) {
     const line = lines[row] ?? [];
     let lastCell = line.length - 1;
     while (lastCell >= 0 && line[lastCell] === void 0) {
@@ -728,7 +755,7 @@ function buildRuns(lines, lineBreakStyles) {
       const cell = line[column] ?? { text: " ", style: defaultStyle };
       pushRun(runs, cell.style, cell.text);
     }
-    if (row < lines.length - 1) {
+    if (row < lastRow) {
       pushRun(runs, lineBreakStyles[row] ?? defaultStyle, "\n");
     }
   }
@@ -740,7 +767,21 @@ function parseAnsi(input) {
   let style = createDefaultStyle();
   let row = 0;
   let column = 0;
+  let savedRow = 0;
+  let savedColumn = 0;
   let index = 0;
+  const clampRow = (nextRow) => {
+    if (nextRow < 0) {
+      return 0;
+    }
+    return Math.min(nextRow, MAX_TERMINAL_ROWS - 1);
+  };
+  const clampColumn = (nextColumn) => {
+    if (nextColumn < 0) {
+      return 0;
+    }
+    return Math.min(nextColumn, MAX_TERMINAL_COLUMNS - 1);
+  };
   const ensureLine = () => {
     while (lines.length <= row) {
       lines.push([]);
@@ -748,12 +789,64 @@ function parseAnsi(input) {
   };
   const moveDown = (keepColumn) => {
     lineBreakStyles[row] = cloneStyle(style);
-    row += 1;
+    row = clampRow(row + 1);
     if (!keepColumn) {
       column = 0;
     }
     ensureLine();
   };
+  const eraseLine = (mode) => {
+    const line = lines[row] ?? [];
+    if (mode === 1) {
+      for (let cell = 0; cell <= column; cell += 1) {
+        delete line[cell];
+      }
+      return;
+    }
+    if (mode === 2) {
+      lines[row] = [];
+      return;
+    }
+    line.splice(column);
+  };
+  const eraseDisplay = (mode) => {
+    if (mode === 1) {
+      for (let lineRow = 0; lineRow < row; lineRow += 1) {
+        lines[lineRow] = [];
+      }
+      eraseLine(1);
+      return;
+    }
+    if (mode === 2 || mode === 3) {
+      lines.length = 0;
+      lineBreakStyles.length = 0;
+      ensureLine();
+      return;
+    }
+    eraseLine(0);
+    lines.splice(row + 1);
+    lineBreakStyles.splice(row);
+  };
+  const saveCursor = () => {
+    savedRow = row;
+    savedColumn = column;
+  };
+  const restoreCursor = () => {
+    row = clampRow(savedRow);
+    column = clampColumn(savedColumn);
+    ensureLine();
+  };
+  const writeText = (text) => {
+    const width = displayWidth(text);
+    if (width === 0) {
+      return;
+    }
+    lines[row][column] = { text, style: cloneStyle(style) };
+    for (let offset = 1; offset < width && column + offset < MAX_TERMINAL_COLUMNS; offset += 1) {
+      lines[row][column + offset] = { text: "", style: cloneStyle(style) };
+    }
+    column = clampColumn(column + width);
+  };
   while (index < input.length) {
     const char = input[index];
     if (char === "\n") {
@@ -776,38 +869,73 @@ function parseAnsi(input) {
       index += 1;
       continue;
     }
+    if (char === "	") {
+      const nextTabStop = Math.min(
+        Math.floor(column / TAB_WIDTH) * TAB_WIDTH + TAB_WIDTH,
+        MAX_TERMINAL_COLUMNS
+      );
+      while (column < nextTabStop) {
+        writeText(" ");
+      }
+      index += 1;
+      continue;
+    }
     if (char === ESC && input[index + 1] === "]") {
       index = parseOscEnd(input, index);
       continue;
     }
+    if (char === ESC && input[index + 1] === "7") {
+      saveCursor();
+      index += 2;
+      continue;
+    }
+    if (char === ESC && input[index + 1] === "8") {
+      restoreCursor();
+      index += 2;
+      continue;
+    }
     const csiPrefixLength = char === "\x9B" ? 1 : char === ESC && input[index + 1] === "[" ? 2 : null;
     if (csiPrefixLength !== null) {
       const sequence = parseCsi(input, index, csiPrefixLength);
       if (sequence.final === "m") {
         style = applySgr(style, sequence.params);
       } else if (sequence.final === "G") {
-        column = positionParameter(sequence.params, 0, 1) - 1;
+        column = clampColumn(positionParameter(sequence.params, 0, 1) - 1);
       } else if (sequence.final === "C") {
-        column += positionParameter(sequence.params, 0, 1);
+        column = clampColumn(column + positionParameter(sequence.params, 0, 1));
       } else if (sequence.final === "D") {
         column = Math.max(0, column - positionParameter(sequence.params, 0, 1));
       } else if (sequence.final === "A") {
-        row = Math.max(0, row - positionParameter(sequence.params, 0, 1));
+        row = clampRow(row - positionParameter(sequence.params, 0, 1));
       } else if (sequence.final === "B") {
-        row += positionParameter(sequence.params, 0, 1);
+        row = clampRow(row + positionParameter(sequence.params, 0, 1));
         ensureLine();
+      } else if (sequence.final === "E") {
+        row = clampRow(row + positionParameter(sequence.params, 0, 1));
+        column = 0;
+        ensureLine();
+      } else if (sequence.final === "F") {
+        row = clampRow(row - positionParameter(sequence.params, 0, 1));
+        column = 0;
       } else if (sequence.final === "H" || sequence.final === "f") {
-        row = positionParameter(sequence.params, 0, 1) - 1;
-        column = positionParameter(sequence.params, 1, 1) - 1;
+        row = clampRow(positionParameter(sequence.params, 0, 1) - 1);
+        column = clampColumn(positionParameter(sequence.params, 1, 1) - 1);
         ensureLine();
+      } else if (sequence.final === "K") {
+        eraseLine(modeParameter(sequence.params, 0));
+      } else if (sequence.final === "J") {
+        eraseDisplay(modeParameter(sequence.params, 0));
+      } else if (sequence.final === "s") {
+        saveCursor();
+      } else if (sequence.final === "u") {
+        restoreCursor();
       }
       index = sequence.end;
       continue;
     }
     const codePoint = input.codePointAt(index);
     const text = codePoint === void 0 ? "" : String.fromCodePoint(codePoint);
-    lines[row][column] = { text, style: cloneStyle(style) };
-    column += 1;
+    writeText(text);
     index += text.length;
   }
   return buildRuns(lines, lineBreakStyles);
@@ -1215,11 +1343,11 @@ function splitIntoLines(runs) {
 }
 function measureLines(lines) {
   return Math.max(
-    ...lines.map((line) => displayWidth(line.map((run) => run.text).join("")) * CHARACTER_WIDTH),
+    ...lines.map((line) => displayWidth2(line.map((run) => run.text).join("")) * CHARACTER_WIDTH),
     0
   );
 }
-function displayWidth(text, startColumn = 0) {
+function displayWidth2(text, startColumn = 0) {
   const segmenter = new Intl.Segmenter();
   let column = startColumn;
   for (const { segment } of segmenter.segment(text)) {
@@ -1281,7 +1409,7 @@ function renderBackgrounds(line, startX, y, height) {
   let column = 0;
   const rectangles = [];
   for (const run of line) {
-    const width = displayWidth(run.text, column);
+    const width = displayWidth2(run.text, column);
     const background = resolveBackgroundColor(run);
     if (background !== BACKGROUND && width > 0) {
       rectangles.push(`<rect x="${formatNumber(startX + column * CHARACTER_WIDTH)}" y="${formatNumber(y)}" width="${formatNumber(width * CHARACTER_WIDTH)}" height="${formatNumber(height)}" fill="${escapeXmlAttribute(background)}" />`);
@@ -1315,7 +1443,7 @@ function renderRun(run) {
   if (run.dim) {
     attributes.push('opacity="0.7"');
   }
-  const text = run.conceal ? " ".repeat(displayWidth(run.text)) : run.text;
+  const text = run.conceal ? " ".repeat(displayWidth2(run.text)) : run.text;
   return `<tspan ${attributes.join(" ")}>${escapeXmlText(text)}</tspan>`;
 }
 function renderWindowControls() {
@@ -1364,13 +1492,16 @@ async function renderTerminalPng(ansiText, options = {}) {
   if (options.padding !== void 0 && (!Number.isInteger(options.padding) || options.padding < 0)) {
     throw new Error("Padding must be a non-negative integer.");
   }
+  if (options.output !== void 0 && options.output.length === 0) {
+    throw new Error("Output path must not be empty.");
+  }
   const runs = parseAnsi(ansiText);
   const svg = renderSvg(runs, {
     padding: options.padding,
     window: options.window
   });
   const png = renderPng(svg);
-  if (options.output) {
+  if (options.output !== void 0) {
     const temporaryPath = `${options.output}.${randomUUID()}.tmp`;
     let temporaryCreated = false;
     try {
@@ -1647,6 +1778,10 @@ var TerminalBuffer = class {
   }
   _writePrintable(ch) {
     const width = this._cellWidth(ch);
+    if (width === 0) {
+      this._appendCombiningMark(ch);
+      return;
+    }
     if (this._autoWrap && this._pendingWrap) {
       this._cursorX = 0;
       this._newline();
@@ -1681,11 +1816,40 @@ var TerminalBuffer = class {
   _cellWidth(ch) {
     const codePoint = ch.codePointAt(0);
     if (codePoint === void 0) return 0;
+    if (isCombiningCodePoint(codePoint)) {
+      return 0;
+    }
     if (codePoint >= 4352 && codePoint <= 4447 || codePoint === 9001 || codePoint === 9002 || codePoint >= 11904 && codePoint <= 12350 || codePoint >= 12353 && codePoint <= 13247 || codePoint >= 13312 && codePoint <= 19903 || codePoint >= 19968 && codePoint <= 42191 || codePoint >= 44032 && codePoint <= 55215 || codePoint >= 63744 && codePoint <= 64255 || codePoint >= 65040 && codePoint <= 65049 || codePoint >= 65072 && codePoint <= 65135 || codePoint >= 65280 && codePoint <= 65376 || codePoint >= 65504 && codePoint <= 65510 || codePoint >= 127488 && codePoint <= 131069 || codePoint >= 131072 && codePoint <= 262141) {
       return Math.min(2, this._cols);
     }
     return 1;
   }
+  _appendCombiningMark(ch) {
+    const target = this._findCombiningTarget();
+    if (target === null) {
+      return;
+    }
+    const cell = this._screen[target.y]?.[target.x];
+    if (cell === null || cell === void 0) {
+      return;
+    }
+    cell[1] += ch;
+  }
+  _findCombiningTarget() {
+    const startX = this._pendingWrap ? this._cursorX : this._cursorX - 1;
+    for (let y = this._cursorY; y >= 0; y -= 1) {
+      const row = this._screen[y];
+      if (row === void 0) {
+        continue;
+      }
+      for (let x = y === this._cursorY ? startX : this._cols - 1; x >= 0; x -= 1) {
+        if (row[x] !== null) {
+          return { x, y };
+        }
+      }
+    }
+    return null;
+  }
   _setChar(y, x, ch) {
     const row = this._screen[y];
     if (row && x >= 0 && x < this._cols) {
@@ -1826,7 +1990,8 @@ var TerminalBuffer = class {
       case "J":
         if (p0 === 0) {
           this._eraseLine(this._cursorY, this._cursorX, this._cols - 1);
-          for (let y = this._cursorY + 1; y < this._rows; y++) this._eraseLine(y, 0, this._cols - 1);
+          for (let y = this._cursorY + 1; y < this._rows; y++)
+            this._eraseLine(y, 0, this._cols - 1);
         } else if (p0 === 1) {
           for (let y = 0; y < this._cursorY; y++) this._eraseLine(y, 0, this._cols - 1);
           this._eraseLine(this._cursorY, 0, this._cursorX);
@@ -2191,6 +2356,9 @@ function createDefaultStyleState() {
     strikethrough: false
   };
 }
+function isCombiningCodePoint(codePoint) {
+  return codePoint >= 768 && codePoint <= 879 || codePoint >= 6832 && codePoint <= 6911 || codePoint >= 7616 && codePoint <= 7679 || codePoint >= 8400 && codePoint <= 8447 || codePoint >= 65056 && codePoint <= 65071;
+}
 function serializeStyleState(state) {
   const codes = [];
   if (state.bold) {
@@ -2244,6 +2412,8 @@ var NAMED_KEY_LOWER = new Map(
   Object.entries(NAMED_KEY_SEQUENCES).map(([k, v]) => [k.toLowerCase(), v])
 );
 var VALID_KEYS_HINT = `Valid keys: ${Object.keys(NAMED_KEY_SEQUENCES).join(", ")}, Control+<letter>, Alt+<key>`;
+var NAMED_KEY_PATTERN = Object.keys(NAMED_KEY_SEQUENCES).map(caseInsensitivePattern).join("|");
+var TERMINAL_KEY_PATTERN = `^(?:${NAMED_KEY_PATTERN}|.|[Cc][Oo][Nn][Tt][Rr][Oo][Ll]\\+[A-Za-z]|[Aa][Ll][Tt]\\+.+)$`;
 function unknownKeyError(key) {
   return new Error(`Unknown terminal key: ${key}. ${VALID_KEYS_HINT}`);
 }
@@ -2286,6 +2456,18 @@ function controlKeyToSequence(controlKey) {
   }
   return String.fromCharCode(charCode - 64);
 }
+function caseInsensitivePattern(value) {
+  let pattern = "";
+  for (const character of value) {
+    const lower = character.toLowerCase();
+    const upper = character.toUpperCase();
+    pattern += lower === upper ? escapePatternCharacter(character) : `[${upper}${lower}]`;
+  }
+  return pattern;
+}
+function escapePatternCharacter(character) {
+  return character.replace(/[\\^$.*+?()[\]{}|]/g, "\\$&");
+}
 
 // src/terminal-screen.ts
 var TerminalScreen = class {
@@ -2725,7 +2907,11 @@ function createTerminalPilotRuntime(options = {}) {
   const pendingNames = /* @__PURE__ */ new Set();
   let pilotPromise;
   function getRequestedName(name, env) {
-    return name ?? env?.get(SESSION_ENV_VAR);
+    const requestedName = name ?? env?.get(SESSION_ENV_VAR);
+    if (requestedName !== void 0 && requestedName.trim().length === 0) {
+      throw new UserError("Session name must not be empty.");
+    }
+    return requestedName;
   }
   async function getPilot() {
     pilotPromise ??= launchPilot();
@@ -2761,7 +2947,9 @@ function createTerminalPilotRuntime(options = {}) {
     const sessionId = nameToId.get(name);
     if (sessionId === void 0) {
       const active = await listSessions();
-      throw new UserError(`Session "${name}" was not found. ${formatAvailableSessions(active.map((entry) => entry.name))}`);
+      throw new UserError(
+        `Session "${name}" was not found. ${formatAvailableSessions(active.map((entry) => entry.name))}`
+      );
     }
     const pilot = await getPilot();
     try {
@@ -2769,7 +2957,9 @@ function createTerminalPilotRuntime(options = {}) {
     } catch {
       forgetSession(name, sessionId);
       const active = await listSessions();
-      throw new UserError(`Session "${name}" was not found. ${formatAvailableSessions(active.map((entry) => entry.name))}`);
+      throw new UserError(
+        `Session "${name}" was not found. ${formatAvailableSessions(active.map((entry) => entry.name))}`
+      );
     }
   }
   async function listSessions() {
@@ -2800,6 +2990,9 @@ function createTerminalPilotRuntime(options = {}) {
   }
   return {
     async createSession(params2, env) {
+      if (params2.command.trim().length === 0) {
+        throw new UserError("Command must not be empty.");
+      }
       const requestedName = getRequestedName(params2.session, env) ?? nextSessionName();
       await discardExitedSessionName(requestedName);
       if (nameToId.has(requestedName) || pendingNames.has(requestedName)) {
@@ -2865,10 +3058,19 @@ function createTerminalPilotRuntime(options = {}) {
 
 // src/commands/screenshot.ts
 var params = S.Object({
-  session: S.Optional(S.String({ short: "s", description: "Session name" })),
+  session: S.Optional(
+    S.String({ short: "s", description: "Session name", minLength: 1, pattern: "\\S" })
+  ),
   output: S.String({ short: "o", description: "Path to the output PNG file" }),
   window: S.Optional(S.Boolean({ description: "Include terminal window chrome", default: true })),
-  padding: S.Optional(S.Number({ short: "p", description: "Padding around terminal content" }))
+  padding: S.Optional(
+    S.Number({
+      short: "p",
+      description: "Padding around terminal content",
+      jsonType: "integer",
+      minimum: 0
+    })
+  )
 });
 var screenshot = defineCommand({
   name: "screenshot",
@@ -2876,7 +3078,10 @@ var screenshot = defineCommand({
   scope: ["cli"],
   params,
   handler: async ({ params: params2, env, terminalPilotRuntime }) => {
-    const namedSession = await getTerminalPilotRuntime(terminalPilotRuntime).resolveSession(params2.session, env);
+    const namedSession = await getTerminalPilotRuntime(terminalPilotRuntime).resolveSession(
+      params2.session,
+      env
+    );
     const screen = await namedSession.session.screen();
     await renderTerminalPng(screen.rawLines.join("\n"), {
       output: params2.output,