pty-manager 1.7.2 → 1.8.0

package/dist/index.mjs

@@ -1202,24 +1202,71 @@ var PTYSession = class _PTYSession extends 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.
@@ -2221,7 +2268,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")) {
@@ -2244,7 +2302,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 };
@@ -2340,9 +2398,6 @@ var BunCompatiblePTYManager = class extends EventEmitter3 {
     const id = event.id;
     switch (eventType) {
       case "worker_ready":
-        if (this.adapterModules.length > 0) {
-          this.sendCommand({ cmd: "registerAdapters", modules: this.adapterModules });
-        }
         if (this._stallDetectionEnabled) {
           this.sendCommand({
             cmd: "configureStallDetection",
@@ -2350,9 +2405,23 @@ var BunCompatiblePTYManager = class extends EventEmitter3 {
             timeoutMs: this._stallTimeoutMs
           });
         }
-        this.ready = true;
-        this.readyResolve();
-        this.emit("ready");
+        if (this.adapterModules.length > 0) {
+          this.sendCommand({ cmd: "registerAdapters", modules: this.adapterModules });
+          this.createPending("registerAdapters").then(() => {
+            this.ready = true;
+            this.readyResolve();
+            this.emit("ready");
+          }).catch((err) => {
+            this.emit("worker_error", `Failed to register adapters: ${err}`);
+            this.ready = true;
+            this.readyResolve();
+            this.emit("ready");
+          });
+        } else {
+          this.ready = true;
+          this.readyResolve();
+          this.emit("ready");
+        }
         break;
       case "spawned": {
         const session = {
@@ -2594,6 +2663,14 @@ var BunCompatiblePTYManager = class extends EventEmitter3 {
     this.sendCommand({ cmd: "sendKeys", id, keys });
     await this.createPending(`sendKeys:${id}`);
   }
+  /**
+   * Write raw data to a session (bypasses adapter formatting)
+   */
+  async writeRaw(id, data) {
+    await this.waitForReady();
+    this.sendCommand({ cmd: "writeRaw", id, data });
+    await this.createPending(`writeRaw:${id}`);
+  }
   /**
    * Paste text to a session
    */