@rynx-ai/runtime 0.1.11-beta.5 → 0.1.11-beta.6

package/dist/runner/child.js

@@ -1,5 +1,14 @@
 import { TerminalRegistry } from "../terminal/registry.js";
 import { toWireError } from "./protocol.js";
+const TRAEX_STARTUP_WATCH_MS = 20_000;
+const TRAEX_STARTUP_POLL_MS = 100;
+const TRAEX_PROMPT_RETRY_MS = 500;
+function normalizeTraexPane(pane) {
+    return pane.toLowerCase().replace(/\s+/g, " ").trim();
+}
+function isTerminalProtocolResponse(input) {
+    return /^(?:\x1b\[(?:(?:\?|>)[0-9;]*c|[0-9;]*(?:n|R|t)|[IO]))+$/.test(input);
+}
 export class RunnerSession {
     transport;
     executor;
@@ -48,8 +57,17 @@ export class RunnerSession {
                 });
                 return;
             case "term.input":
-                this.cancelTraexStartupWatcher(this.attachmentThreadIds.get(msg.attachId));
-                this.attachments.get(msg.attachId)?.write(Buffer.from(msg.dataB64, "base64").toString("utf8"));
+                {
+                    const localThreadId = this.attachmentThreadIds.get(msg.attachId);
+                    const input = Buffer.from(msg.dataB64, "base64").toString("utf8");
+                    // xterm sends device/focus reports through the same onData channel as
+                    // keystrokes. They must reach the TUI without pretending the user has
+                    // taken over startup prompt handling.
+                    if (!isTerminalProtocolResponse(input)) {
+                        this.cancelTraexStartupWatcher(localThreadId);
+                    }
+                    this.attachments.get(msg.attachId)?.write(input);
+                }
                 return;
             case "term.resize":
                 this.attachments.get(msg.attachId)?.resize(msg.cols, msg.rows);
@@ -215,8 +233,8 @@ export class RunnerSession {
         try {
             const input = msg.input ?? msg.text;
             const outcome = (await provider.injectMessage?.(msg.localThreadId, input)) ?? "notLive";
-            if (outcome === "injected")
-                this.cancelTraexStartupWatcher(msg.localThreadId);
+            // App-server injection is independent of the Terminal TUI startup, so it
+            // must not cancel prompt handling for the pane that is still starting.
             this.transport.send({ t: "injected", reqId: msg.reqId, localThreadId: msg.localThreadId, outcome });
         }
         catch (error) {
@@ -255,7 +273,6 @@ export class RunnerSession {
         if (!spec)
             return;
         const terminalId = `${localThreadId}-main`;
-        const coldStart = !this.terminals.has(terminalId);
         const term = this.terminals.getOrCreate(terminalId, {
             cwd: spec.cwd,
             command: spec.command,
@@ -264,7 +281,7 @@ export class RunnerSession {
             rows: rows ?? 40,
             ...(spec.env ? { env: spec.env } : {}),
         });
-        if (coldStart && spec.skipTraexStartupPrompts) {
+        if (spec.skipTraexStartupPrompts) {
             const watcher = Symbol(localThreadId);
             this.traexStartupWatchers.set(localThreadId, watcher);
             void this.skipTraexStartupPrompts(localThreadId, term, watcher);
@@ -279,46 +296,48 @@ export class RunnerSession {
         const prompts = [
             {
                 id: "welcome",
-                matches: (pane) => pane.includes("Welcome to TRAE CLI") && pane.includes("Press enter to continue"),
+                matches: (pane) => pane.includes("welcome to trae cli") && pane.includes("press enter to continue"),
                 dismiss: () => terminal.sendEnter(),
             },
             {
                 id: "migration",
-                matches: (pane) => pane.includes("Legacy TRAE CLI data detected") &&
-                    pane.includes("Would you like to migrate detected data to the new TRAE CLI storage?") &&
-                    pane.includes("Select what to import:"),
+                matches: (pane) => pane.includes("legacy trae cli data detected") &&
+                    pane.includes("select what to import") &&
+                    (pane.includes("skip for now") || pane.includes("don't ask again")),
                 dismiss: () => terminal.interrupt(),
             },
             {
                 id: "hooks",
-                matches: (pane) => pane.includes("Hooks need review") &&
-                    pane.includes("hooks are new or changed.") &&
-                    pane.includes("Trust all and continue") &&
-                    pane.includes("Continue without trusting"),
+                matches: (pane) => pane.includes("hooks need review") &&
+                    pane.includes("trust all and continue") &&
+                    pane.includes("continue without trusting"),
                 dismiss: () => terminal.interrupt(),
             },
         ];
-        const dismissed = new Set();
-        const deadline = Date.now() + 20_000;
+        let activePromptId;
+        let lastDismissedAt = 0;
+        const deadline = Date.now() + TRAEX_STARTUP_WATCH_MS;
         const terminalId = `${localThreadId}-main`;
         while (!this.shuttingDown &&
             Date.now() < deadline &&
             this.traexStartupWatchers.get(localThreadId) === watcher &&
             this.terminals.get(terminalId) === terminal) {
-            const pane = terminal.capturePane();
-            // Once the normal composer is visible, startup is complete and there is
-            // no reason to keep polling the tmux pane for the remainder of the window.
-            if (pane.includes("TRAE CLI Next"))
-                break;
+            // Do not treat a composer frame as completion: Traex can render it before
+            // the startup modals arrive. The bounded deadline stops this watcher.
+            const pane = normalizeTraexPane(terminal.capturePane());
             const prompt = prompts.find((candidate) => candidate.matches(pane));
-            if (prompt && !dismissed.has(prompt.id)) {
+            const now = Date.now();
+            if (!prompt) {
+                activePromptId = undefined;
+            }
+            else if (prompt.id !== activePromptId ||
+                now - lastDismissedAt >= TRAEX_PROMPT_RETRY_MS) {
                 prompt.dismiss();
-                dismissed.add(prompt.id);
-                if (dismissed.size === prompts.length)
-                    break;
+                activePromptId = prompt.id;
+                lastDismissedAt = now;
             }
             await new Promise((resolve) => {
-                const timer = setTimeout(resolve, 100);
+                const timer = setTimeout(resolve, TRAEX_STARTUP_POLL_MS);
                 timer.unref();
             });
         }

package/dist/terminal/tmux.d.ts

@@ -146,7 +146,9 @@ export declare class TmuxTerminal {
     paste(text: string, bufferName?: string): void;
     /**
      * Attach a client. `role: "read-only"` passes tmux `-r` so the viewer cannot
-     * type (defense-in-depth on top of the WS bridge dropping input frames).
+     * type and `ignore-size` so even its initial PTY dimensions cannot resize the
+     * owner's pane (defense-in-depth on top of the WS bridge dropping input and
+     * resize frames).
      */
     attach(role: "owner" | "read-only", dims?: {
         cols?: number;

package/dist/terminal/tmux.js

@@ -319,14 +319,17 @@ export class TmuxTerminal {
     }
     /**
      * Attach a client. `role: "read-only"` passes tmux `-r` so the viewer cannot
-     * type (defense-in-depth on top of the WS bridge dropping input frames).
+     * type and `ignore-size` so even its initial PTY dimensions cannot resize the
+     * owner's pane (defense-in-depth on top of the WS bridge dropping input and
+     * resize frames).
      */
     async attach(role, dims) {
         this.start();
         const spawn = this.injectedSpawn ?? (await loadPtySpawn());
-        const args = [...this.base(), "attach-session", "-t", TMUX_TARGET];
+        const args = [...this.base(), "attach-session"];
         if (role === "read-only")
-            args.push("-r");
+            args.push("-r", "-f", "ignore-size");
+        args.push("-t", TMUX_TARGET);
         const proc = spawn(this.tmuxBin, args, {
             name: "xterm-256color",
             cols: dims?.cols ?? this.cols,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rynx-ai/runtime",
-  "version": "0.1.11-beta.5",
+  "version": "0.1.11-beta.6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/rynx-ai/rynx.git",
@@ -26,7 +26,7 @@
   "dependencies": {
     "node-pty": "^1.0.0",
     "ws": "^8.21.0",
-    "@rynx-ai/core": "0.1.11-beta.5"
+    "@rynx-ai/core": "0.1.11-beta.6"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"