terminal-pilot 0.0.28 → 0.0.30

package/dist/commands/press-key.js

@@ -425,6 +425,84 @@ function defineCommand(config) {
   );
 }
 
+// src/keys.ts
+var NAMED_KEY_SEQUENCES = {
+  Enter: "\r",
+  Tab: "	",
+  Escape: "\x1B",
+  Backspace: "\x7F",
+  Delete: "\x1B[3~",
+  ArrowUp: "\x1B[A",
+  ArrowDown: "\x1B[B",
+  ArrowRight: "\x1B[C",
+  ArrowLeft: "\x1B[D",
+  Home: "\x1B[H",
+  End: "\x1B[F",
+  PageUp: "\x1B[5~",
+  PageDown: "\x1B[6~",
+  Space: " "
+};
+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}`);
+}
+function keyToSequence(key) {
+  const lowerKey = key.toLowerCase();
+  const namedSequence = NAMED_KEY_LOWER.get(lowerKey);
+  if (namedSequence !== void 0) {
+    return namedSequence;
+  }
+  if (lowerKey.startsWith("control+")) {
+    return controlKeyToSequence(key.slice("control+".length));
+  }
+  if (lowerKey.startsWith("alt+")) {
+    const nestedKey = key.slice("alt+".length);
+    if (nestedKey.length === 0) {
+      throw unknownKeyError(key);
+    }
+    if (nestedKey.length === 1) {
+      return "\x1B" + nestedKey;
+    }
+    try {
+      return "\x1B" + keyToSequence(nestedKey);
+    } catch {
+      throw unknownKeyError(key);
+    }
+  }
+  if (key.length === 1) {
+    return key;
+  }
+  throw unknownKeyError(key);
+}
+function controlKeyToSequence(controlKey) {
+  if (controlKey.length !== 1) {
+    throw unknownKeyError(`Control+${controlKey}`);
+  }
+  const uppercaseLetter = controlKey.toUpperCase();
+  const charCode = uppercaseLetter.charCodeAt(0);
+  if (charCode < 65 || charCode > 90) {
+    throw unknownKeyError(`Control+${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-pilot.ts
 import { randomUUID } from "node:crypto";
 
@@ -678,6 +756,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();
@@ -712,11 +794,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) {
@@ -857,7 +968,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);
@@ -1222,6 +1334,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) {
@@ -1254,70 +1369,6 @@ function serializeStyleState(state) {
   return codes.length === 0 ? "" : `\x1B[${codes.join(";")}m`;
 }
 
-// src/keys.ts
-var NAMED_KEY_SEQUENCES = {
-  Enter: "\r",
-  Tab: "	",
-  Escape: "\x1B",
-  Backspace: "\x7F",
-  Delete: "\x1B[3~",
-  ArrowUp: "\x1B[A",
-  ArrowDown: "\x1B[B",
-  ArrowRight: "\x1B[C",
-  ArrowLeft: "\x1B[D",
-  Home: "\x1B[H",
-  End: "\x1B[F",
-  PageUp: "\x1B[5~",
-  PageDown: "\x1B[6~",
-  Space: " "
-};
-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>`;
-function unknownKeyError(key) {
-  return new Error(`Unknown terminal key: ${key}. ${VALID_KEYS_HINT}`);
-}
-function keyToSequence(key) {
-  const lowerKey = key.toLowerCase();
-  const namedSequence = NAMED_KEY_LOWER.get(lowerKey);
-  if (namedSequence !== void 0) {
-    return namedSequence;
-  }
-  if (lowerKey.startsWith("control+")) {
-    return controlKeyToSequence(key.slice("control+".length));
-  }
-  if (lowerKey.startsWith("alt+")) {
-    const nestedKey = key.slice("alt+".length);
-    if (nestedKey.length === 0) {
-      throw unknownKeyError(key);
-    }
-    if (nestedKey.length === 1) {
-      return "\x1B" + nestedKey;
-    }
-    try {
-      return "\x1B" + keyToSequence(nestedKey);
-    } catch {
-      throw unknownKeyError(key);
-    }
-  }
-  if (key.length === 1) {
-    return key;
-  }
-  throw unknownKeyError(key);
-}
-function controlKeyToSequence(controlKey) {
-  if (controlKey.length !== 1) {
-    throw unknownKeyError(`Control+${controlKey}`);
-  }
-  const uppercaseLetter = controlKey.toUpperCase();
-  const charCode = uppercaseLetter.charCodeAt(0);
-  if (charCode < 65 || charCode > 90) {
-    throw unknownKeyError(`Control+${controlKey}`);
-  }
-  return String.fromCharCode(charCode - 64);
-}
-
 // src/terminal-screen.ts
 var TerminalScreen = class {
   lines;
@@ -1756,7 +1807,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();
@@ -1792,7 +1847,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 {
@@ -1800,7 +1857,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() {
@@ -1831,6 +1890,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)) {
@@ -1896,8 +1958,10 @@ function createTerminalPilotRuntime(options = {}) {
 
 // src/commands/press-key.ts
 var params = S.Object({
-  key: S.String({ description: "Named key to press" }),
-  session: S.Optional(S.String({ short: "s", description: "Session name" }))
+  key: S.String({ description: "Named key to press", pattern: TERMINAL_KEY_PATTERN }),
+  session: S.Optional(
+    S.String({ short: "s", description: "Session name", minLength: 1, pattern: "\\S" })
+  )
 });
 var pressKey = defineCommand({
   name: "press-key",
@@ -1906,11 +1970,22 @@ var pressKey = defineCommand({
   positional: ["key"],
   params,
   handler: async ({ params: params2, env, terminalPilotRuntime }) => {
-    const namedSession = await getTerminalPilotRuntime(terminalPilotRuntime).resolveSession(params2.session, env);
+    assertTerminalKey(params2.key);
+    const namedSession = await getTerminalPilotRuntime(terminalPilotRuntime).resolveSession(
+      params2.session,
+      env
+    );
     await namedSession.session.press(params2.key);
     return void 0;
   }
 });
+function assertTerminalKey(key) {
+  try {
+    keyToSequence(key);
+  } catch (error) {
+    throw new UserError(error instanceof Error ? error.message : String(error));
+  }
+}
 export {
   pressKey
 };