@co0ontty/wand 4.39.0 → 4.40.0

package/dist/ws-broadcast.d.ts

@@ -68,6 +68,7 @@ export declare class WsBroadcastManager {
     private discardClient;
     private acquirePtyPause;
     private releasePtyPause;
+    private releaseAllPtyPauses;
     private sendPtyError;
     private processWsQueue;
 }

package/dist/ws-broadcast.js

@@ -92,10 +92,7 @@ export class WsBroadcastManager {
                 outputSeqBySession: new Map(),
                 pendingResyncSessions: new Set(),
                 lastSeenAt: Date.now(),
-                subscribedSessionId: null,
-                supportsPtyAck: false,
-                unackedPtyBytes: 0,
-                ptyPausedSessionId: null,
+                ptySubscriptions: new Map(),
             };
             this.clients.add(client);
             ws.on("close", () => {
@@ -120,12 +117,20 @@ export class WsBroadcastManager {
                         if (Number.isSafeInteger(msg.blockBudget) && msg.blockBudget > 0) {
                             client.blockBudget = Math.min(msg.blockBudget, MAX_BLOCK_BUDGET);
                         }
-                        this.releasePtyPause(client);
-                        client.subscribedSessionId = null;
-                        client.supportsPtyAck = msg.capabilities?.ptyAck === true;
+                        // 默认仍是历史的“切换当前会话”；分屏池显式用 mode:add 叠加订阅。
+                        if (msg.mode !== "add") {
+                            this.releaseAllPtyPauses(client);
+                            client.ptySubscriptions.clear();
+                        }
+                        else {
+                            this.releasePtyPause(client, msg.sessionId);
+                        }
+                        client.ptySubscriptions.set(msg.sessionId, {
+                            supportsAck: msg.capabilities?.ptyAck === true,
+                            unackedBytes: 0,
+                            paused: false,
+                        });
                         this.flushOutput(msg.sessionId);
-                        client.subscribedSessionId = msg.sessionId;
-                        client.unackedPtyBytes = 0;
                         const snapshot = this.port?.getSession(msg.sessionId) ?? null;
                         if (snapshot) {
                             this.sendInit(client, msg.sessionId, snapshot, false);
@@ -138,6 +143,10 @@ export class WsBroadcastManager {
                             }));
                         }
                     }
+                    else if (msg.type === "unsubscribe" && msg.sessionId) {
+                        this.releasePtyPause(client, msg.sessionId);
+                        client.ptySubscriptions.delete(msg.sessionId);
+                    }
                     else if (msg.type === "resync" && msg.sessionId) {
                         this.flushOutput(msg.sessionId);
                         const snapshot = this.port?.getSession(msg.sessionId) ?? null;
@@ -145,7 +154,7 @@ export class WsBroadcastManager {
                             this.sendInit(client, msg.sessionId, snapshot, true);
                     }
                     else if (msg.type === "pty_input" && msg.sessionId && typeof msg.data === "string") {
-                        if (client.subscribedSessionId !== msg.sessionId || msg.data.length > MAX_PTY_INPUT_CHARS)
+                        if (!client.ptySubscriptions.has(msg.sessionId) || msg.data.length > MAX_PTY_INPUT_CHARS)
                             return;
                         try {
                             this.port?.sendPtyInput?.(msg.sessionId, msg.data, typeof msg.shortcutKey === "string" ? msg.shortcutKey : undefined, msg.userInput !== false);
@@ -155,7 +164,7 @@ export class WsBroadcastManager {
                         }
                     }
                     else if (msg.type === "pty_resize" && msg.sessionId) {
-                        if (client.subscribedSessionId !== msg.sessionId)
+                        if (!client.ptySubscriptions.has(msg.sessionId))
                             return;
                         if (!Number.isFinite(msg.cols) || !Number.isFinite(msg.rows))
                             return;
@@ -167,11 +176,12 @@ export class WsBroadcastManager {
                         }
                     }
                     else if (msg.type === "pty_ack" && msg.sessionId && Number.isFinite(msg.bytes)) {
-                        if (!client.supportsPtyAck || client.subscribedSessionId !== msg.sessionId)
+                        const subscription = client.ptySubscriptions.get(msg.sessionId);
+                        if (!subscription?.supportsAck)
                             return;
-                        client.unackedPtyBytes = Math.max(0, client.unackedPtyBytes - Math.max(0, Math.floor(msg.bytes)));
-                        if (client.ptyPausedSessionId && client.unackedPtyBytes <= PTY_UNACKED_LOW_WATER) {
-                            this.releasePtyPause(client);
+                        subscription.unackedBytes = Math.max(0, subscription.unackedBytes - Math.max(0, Math.floor(msg.bytes)));
+                        if (subscription.paused && subscription.unackedBytes <= PTY_UNACKED_LOW_WATER) {
+                            this.releasePtyPause(client, msg.sessionId);
                         }
                     }
                     else if (msg.type === "pong") {
@@ -389,7 +399,7 @@ export class WsBroadcastManager {
         for (const client of this.clients) {
             if (client.ws.readyState !== WebSocket.OPEN)
                 continue;
-            if (isRawPtyOutput && client.subscribedSessionId !== event.sessionId)
+            if (isRawPtyOutput && !client.ptySubscriptions.has(event.sessionId))
                 continue;
             const clientEvent = eventForClient(client);
             // Stamp output events with a per-(client, session) sequence number so
@@ -400,11 +410,12 @@ export class WsBroadcastManager {
                 client.outputSeqBySession.set(event.sessionId, seq);
                 outgoing = { ...clientEvent, seq };
             }
-            const usesPtyAckFlowControl = isRawPtyOutput && client.supportsPtyAck;
+            const subscription = client.ptySubscriptions.get(event.sessionId);
+            const usesPtyAckFlowControl = isRawPtyOutput && subscription?.supportsAck === true;
             if (usesPtyAckFlowControl) {
                 outgoing = { ...outgoing, ptyBytes };
-                client.unackedPtyBytes += ptyBytes;
-                if (client.unackedPtyBytes >= PTY_UNACKED_HIGH_WATER) {
+                subscription.unackedBytes += ptyBytes;
+                if (subscription.unackedBytes >= PTY_UNACKED_HIGH_WATER) {
                     this.acquirePtyPause(client, event.sessionId);
                 }
             }
@@ -451,7 +462,7 @@ export class WsBroadcastManager {
         }
     }
     discardClient(client, terminate) {
-        this.releasePtyPause(client);
+        this.releaseAllPtyPauses(client);
         client.sendQueue.length = 0;
         client.pendingResyncSessions.clear();
         client.sendInProgress = false;
@@ -465,20 +476,20 @@ export class WsBroadcastManager {
         }
     }
     acquirePtyPause(client, sessionId) {
-        if (client.ptyPausedSessionId === sessionId)
+        const subscription = client.ptySubscriptions.get(sessionId);
+        if (!subscription || subscription.paused)
             return;
-        this.releasePtyPause(client);
-        client.ptyPausedSessionId = sessionId;
+        subscription.paused = true;
         const next = (this.ptyPauseRefs.get(sessionId) ?? 0) + 1;
         this.ptyPauseRefs.set(sessionId, next);
         if (next === 1)
             this.port?.pausePtyOutput?.(sessionId);
     }
-    releasePtyPause(client) {
-        const sessionId = client.ptyPausedSessionId;
-        if (!sessionId)
+    releasePtyPause(client, sessionId) {
+        const subscription = client.ptySubscriptions.get(sessionId);
+        if (!subscription?.paused)
             return;
-        client.ptyPausedSessionId = null;
+        subscription.paused = false;
         const next = Math.max(0, (this.ptyPauseRefs.get(sessionId) ?? 1) - 1);
         if (next === 0) {
             this.ptyPauseRefs.delete(sessionId);
@@ -488,6 +499,11 @@ export class WsBroadcastManager {
             this.ptyPauseRefs.set(sessionId, next);
         }
     }
+    releaseAllPtyPauses(client) {
+        for (const sessionId of client.ptySubscriptions.keys()) {
+            this.releasePtyPause(client, sessionId);
+        }
+    }
     sendPtyError(client, sessionId, error) {
         if (client.ws.readyState !== WebSocket.OPEN)
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@co0ontty/wand",
-  "version": "4.39.0",
+  "version": "4.40.0",
   "description": "A web console for Claude Code, Codex, OpenCode, and other local CLI tools.",
   "type": "module",
   "bin": {