pty-manager 1.7.2 → 1.8.0

package/dist/pty-worker.js

@@ -1223,24 +1223,71 @@ var PTYSession = class _PTYSession extends import_events.EventEmitter {
       throw new Error("Session not started");
     }
     const keyList = Array.isArray(keys) ? keys : [keys];
+    const normalized = _PTYSession.normalizeKeyList(keyList);
     this._stallEmissionCount = 0;
     this.resetStallTimer();
-    for (const key of keyList) {
-      const normalizedKey = key.toLowerCase().trim();
-      const sequence = SPECIAL_KEYS[normalizedKey];
+    for (const key of normalized) {
+      const sequence = SPECIAL_KEYS[key];
       if (sequence) {
         this._lastActivityAt = /* @__PURE__ */ new Date();
         this.ptyProcess.write(sequence);
-        this.logger.debug({ sessionId: this.id, key: normalizedKey }, "Sent special key");
+        this.logger.debug({ sessionId: this.id, key }, "Sent special key");
       } else {
         this.logger.warn(
-          { sessionId: this.id, key: normalizedKey },
+          { sessionId: this.id, key },
           "Unknown special key, sending as literal"
         );
         this.ptyProcess.write(key);
       }
     }
   }
+  /**
+   * Normalize a list of key names for SPECIAL_KEYS lookup.
+   *
+   * Handles two problems:
+   * 1. Modifier aliases: "control" → "ctrl", "command" → "meta", "option" → "alt"
+   * 2. Comma-separated compound keys from stall classifier: ["control", "c"] → ["ctrl+c"]
+   *    A bare modifier followed by a single char/key is joined with "+".
+   */
+  static normalizeKeyList(keys) {
+    const MODIFIER_MAP = {
+      control: "ctrl",
+      command: "meta",
+      cmd: "meta",
+      option: "alt",
+      opt: "alt"
+    };
+    const MODIFIER_NAMES = /* @__PURE__ */ new Set([
+      "ctrl",
+      "alt",
+      "shift",
+      "meta",
+      // Also match the aliases so we can detect them before remapping
+      ...Object.keys(MODIFIER_MAP)
+    ]);
+    const result = [];
+    let i = 0;
+    while (i < keys.length) {
+      let key = keys[i].toLowerCase().trim();
+      if (MODIFIER_MAP[key]) {
+        key = MODIFIER_MAP[key];
+      }
+      if (MODIFIER_NAMES.has(key) && i + 1 < keys.length) {
+        let nextKey = keys[i + 1].toLowerCase().trim();
+        if (MODIFIER_MAP[nextKey]) {
+          nextKey = MODIFIER_MAP[nextKey];
+        }
+        if (!MODIFIER_NAMES.has(nextKey)) {
+          result.push(`${key}+${nextKey}`);
+          i += 2;
+          continue;
+        }
+      }
+      result.push(key);
+      i++;
+    }
+    return result;
+  }
   /**
    * Select a TUI menu option by index (0-based).
    * Sends Down arrow `optionIndex` times, then Enter, with 50ms delays.
@@ -1721,7 +1768,18 @@ var ShellAdapter = class {
     return { detected: false };
   }
   detectReady(output) {
-    return output.includes(this.promptStr) || output.includes("$") || output.length > 10;
+    if (this.isContinuationPrompt(output)) {
+      return false;
+    }
+    return this.getPromptPattern().test(this.stripAnsi(output));
+  }
+  /**
+   * Detect shell continuation prompts that indicate the shell is NOT ready
+   * for a new command (e.g., unclosed quote, heredoc, backtick).
+   */
+  isContinuationPrompt(output) {
+    const stripped = this.stripAnsi(output);
+    return /(?:quote|dquote|heredoc|bquote|cmdsubst|pipe|then|else|do|loop)>\s*$/.test(stripped) || /(?:quote|dquote|heredoc|bquote)>\s*$/m.test(stripped);
   }
   detectExit(output) {
     if (output.includes("exit")) {
@@ -1744,7 +1802,7 @@ var ShellAdapter = class {
   }
   getPromptPattern() {
     const escaped = this.promptStr.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    return new RegExp(`(?:${escaped}|\\$|#|>)\\s*$`, "m");
+    return new RegExp(`(?:${escaped}|\\$|#)\\s*$`, "m");
   }
   async validateInstallation() {
     return { installed: true };
@@ -1892,6 +1950,19 @@ function handleSendKeys(id, keys) {
     ack("sendKeys", id, false, err instanceof Error ? err.message : String(err));
   }
 }
+function handleWriteRaw(id, data) {
+  try {
+    const session = manager.getSession(id);
+    if (!session) {
+      ack("writeRaw", id, false, `Session ${id} not found`);
+      return;
+    }
+    session.writeRaw(data);
+    ack("writeRaw", id, true);
+  } catch (err) {
+    ack("writeRaw", id, false, err instanceof Error ? err.message : String(err));
+  }
+}
 function handlePaste(id, text, bracketed = true) {
   try {
     const session = manager.getSession(id);
@@ -2104,6 +2175,13 @@ function processCommand(line) {
       }
       handleSendKeys(command.id, command.keys);
       break;
+    case "writeRaw":
+      if (!command.id || command.data === void 0) {
+        ack("writeRaw", command.id, false, "Missing id or data");
+        return;
+      }
+      handleWriteRaw(command.id, command.data);
+      break;
     case "paste":
       if (!command.id || command.text === void 0) {
         ack("paste", command.id, false, "Missing id or text");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pty-manager",
-  "version": "1.7.2",
+  "version": "1.8.0",
   "description": "PTY session manager with lifecycle management, pluggable adapters, and blocking prompt detection",
   "main": "dist/index.js",
   "module": "dist/index.mjs",