@tuidom/terminal-backend 0.2.1 → 0.3.0

package/dist/nodeTerminalBackend.d.ts

@@ -16,6 +16,9 @@ export declare class NodeTerminalBackend implements ITerminalBackend {
     private resizeCallbacks;
     private oscResponseCallbacks;
     private deviceReportCallbacks;
+    /** DA1-запросов отправлено / ответов получено — чтобы проба ждала именно свой DA1. */
+    private da1Sent;
+    private da1Received;
     private stdin;
     private stdout;
     private onDataHandler;
@@ -69,6 +72,14 @@ export declare class NodeTerminalBackend implements ITerminalBackend {
     onResize(callback: (size: Size) => void): void;
     onOscResponse(callback: (code: number, data: string) => void): void;
     probeKeyboardProtocol(onResult: (supported: boolean) => void): void;
+    probeTerminalVersion(onResult: (nameAndVersion: string | undefined) => void): void;
+    /**
+     * Send `query` followed by DA1 and collect device reports until *our* DA1 reply
+     * arrives (or the timeout fires), then call `finish` exactly once. Replies come back
+     * in request order, so the n-th DA1 reply closes the n-th probe — two probes in
+     * flight don't settle each other early.
+     */
+    private probe;
     /** Fan a parsed input batch out to the registered callbacks. */
     private dispatchInput;
     /** If a partial sequence is buffered, flush it after a short grace period (the rest never came). */

package/dist/nodeTerminalBackend.js

@@ -45,7 +45,13 @@ const BRACKETED_PASTE_DISABLE = "\x1b[?2004l";
  */
 const KITTY_FLAGS_QUERY = "\x1b[?u";
 const DA1_QUERY = "\x1b[c";
-const KEYBOARD_PROBE_TIMEOUT_MS = 200;
+const PROBE_TIMEOUT_MS = 200;
+/**
+ * Terminal name/version probe: XTVERSION (`CSI > 0 q`) → `DCS > | <name(version)> ST`,
+ * then DA1 as the same "all replies are in" sentinel — terminals without XTVERSION stay
+ * silent on the first query but always answer DA1.
+ */
+const XTVERSION_QUERY = "\x1b[>0q";
 /**
  * How long to hold a partial escape sequence that arrived at the end of a stdin read,
  * waiting for the rest to follow (it does, on a split keypress over SSH/tmux). If nothing
@@ -82,6 +88,9 @@ export class NodeTerminalBackend {
     resizeCallbacks = [];
     oscResponseCallbacks = [];
     deviceReportCallbacks = [];
+    /** DA1-запросов отправлено / ответов получено — чтобы проба ждала именно свой DA1. */
+    da1Sent = 0;
+    da1Received = 0;
     stdin;
     stdout;
     onDataHandler = null;
@@ -155,28 +164,53 @@ export class NodeTerminalBackend {
         this.oscResponseCallbacks.push(callback);
     }
     probeKeyboardProtocol(onResult) {
-        let settled = false;
         let supported = false;
+        // Direct (not passthrough): the reply must reflect tmux's own Kitty support, per-pane.
+        this.probe(KITTY_FLAGS_QUERY, (report) => {
+            if (report === "kitty-flags")
+                supported = true;
+        }, () => {
+            onResult(supported);
+        });
+    }
+    probeTerminalVersion(onResult) {
+        let nameAndVersion;
+        // Direct, как и проба клавиатуры: под tmux отвечает сам tmux — это его панель.
+        this.probe(XTVERSION_QUERY, (report, params) => {
+            if (report === "xtversion")
+                nameAndVersion = params;
+        }, () => {
+            onResult(nameAndVersion);
+        });
+    }
+    /**
+     * Send `query` followed by DA1 and collect device reports until *our* DA1 reply
+     * arrives (or the timeout fires), then call `finish` exactly once. Replies come back
+     * in request order, so the n-th DA1 reply closes the n-th probe — two probes in
+     * flight don't settle each other early.
+     */
+    probe(query, onReport, finish) {
+        const myDa1 = ++this.da1Sent;
+        let settled = false;
         let timer = null;
-        const finish = () => {
+        const settle = () => {
             if (settled)
                 return;
             settled = true;
             if (timer !== null)
                 clearTimeout(timer);
-            onResult(supported);
+            finish();
         };
-        this.deviceReportCallbacks.push((report) => {
+        this.deviceReportCallbacks.push((report, params) => {
             if (settled)
                 return;
-            if (report === "kitty-flags")
-                supported = true;
-            else
-                finish(); // DA1 reply = all replies are in
+            if (report !== "da1")
+                onReport(report, params);
+            else if (this.da1Received >= myDa1)
+                settle(); // our DA1 reply = all replies are in
         });
-        // Direct (not passthrough): the reply must reflect tmux's own Kitty support, per-pane.
-        this.writeDirect(KITTY_FLAGS_QUERY + DA1_QUERY);
-        timer = setTimeout(finish, KEYBOARD_PROBE_TIMEOUT_MS);
+        this.writeDirect(query + DA1_QUERY);
+        timer = setTimeout(settle, PROBE_TIMEOUT_MS);
     }
     /** Fan a parsed input batch out to the registered callbacks. */
     dispatchInput(result) {
@@ -197,6 +231,8 @@ export class NodeTerminalBackend {
                 cb(oscToken.code, oscToken.data);
         }
         for (const report of result.deviceReports) {
+            if (report.report === "da1")
+                this.da1Received++;
             for (const cb of this.deviceReportCallbacks)
                 cb(report.report, report.params);
         }
@@ -271,11 +307,15 @@ export class NodeTerminalBackend {
         this.stdout.write("\x1b[?1049h");
         // Show cursor (will be positioned by the focused element)
         this.stdout.write("\x1b[?25h");
-        // Enable Kitty Keyboard Protocol — direct, so tmux tracks it per-pane (no passthrough)
-        this.writeDirect(KITTY_ENABLE);
-        // Also enable xterm modifyOtherKeys — tmux ignores the Kitty push but honors this,
+        // Enable xterm modifyOtherKeys — tmux ignores the Kitty push but honors this,
         // delivering Ctrl+Tab / Ctrl+Shift+<key> as CSI-u. Direct, per-pane.
+        // Порядок важен: ДО kitty-push. iTerm2 трактует любой `CSI > 4 ; n m` как сброс
+        // стека kitty-флагов (VT100Terminal.m: `_keyReportingFlags = 0` + `removeAllObjects`),
+        // так что modifyOtherKeys после push откатывал его в legacy — и Cmd терялся.
         this.writeDirect(MODIFY_OTHER_KEYS_ENABLE);
+        // Enable Kitty Keyboard Protocol — direct, so tmux tracks it per-pane (no passthrough).
+        // Последним из клавиатурных режимов — см. выше.
+        this.writeDirect(KITTY_ENABLE);
         // Enable mouse tracking (all-motion mode for hover/enter/leave) — direct, per-pane
         this.writeDirect(MOUSE_TRACKING_ALL_ENABLE);
         // Enable bracketed paste so pastes arrive as one text block — direct, per-pane
@@ -326,6 +366,8 @@ export class NodeTerminalBackend {
         });
     }
     teardown() {
+        // Клавиатурные режимы снимаются в порядке, обратном setup (LIFO): сначала pop
+        // kitty-флагов, который setup положил последним, затем сброс modifyOtherKeys.
         // Disable Kitty Keyboard Protocol — direct (matches the per-pane enable in setup)
         this.writeDirect(KITTY_DISABLE);
         // Reset modifyOtherKeys — direct (matches the per-pane enable in setup)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@tuidom/terminal-backend",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "type": "module",
     "description": "Experimental terminal UI DOM — real terminal backend for Node (tty, ANSI diffing, Kitty protocol). API is unstable.",
     "license": "MIT",
@@ -28,6 +28,6 @@
         "./*": "./dist/*.js"
     },
     "dependencies": {
-        "@tuidom/core": "0.2.1"
+        "@tuidom/core": "0.3.0"
     }
 }