@co0ontty/wand 4.76.0 → 4.77.0-beta.g6c4df97

package/dist/web-ui/scripts.d.ts

@@ -1 +1,9 @@
 export declare function getScriptContent(configPath: string): string;
+/**
+ * 按需加载的 AI 团队脚本（content/ai-teams.js）。与 scripts.js 一样优先读磁盘上的新产物，
+ * 自更新期间目录消失时退回内嵌副本；hash 进页面 meta 里的地址，长缓存按它失效。
+ */
+export declare function getAiTeamsChunk(): {
+    content: string;
+    hash: string;
+};

package/dist/web-ui/scripts.js

@@ -1,3 +1,4 @@
+import { createHash } from "node:crypto";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
@@ -27,6 +28,31 @@ export function getScriptContent(configPath) {
         // old process is still serving requests. The embedded build asset keeps the
         // app shell renderable even when dist/web-ui/content has disappeared.
     }
-    // Inject the config path
-    return _scriptCache.replace("${escapeHtml(configPath)}", escapeHtml(configPath));
+    // Inject the config path and the hashed on-demand AI teams script URL
+    return _scriptCache
+        .replace("${escapeHtml(configPath)}", escapeHtml(configPath))
+        .replace("${aiTeamsChunkSrc}", `/assets/ai-teams.js?v=${getAiTeamsChunk().hash}`);
+}
+let _aiTeamsChunk = withHash(EMBEDDED_WEB_ASSETS.aiTeamsJs);
+let _aiTeamsChunkMtimeMs = 0;
+function withHash(content) {
+    return { content, hash: createHash("md5").update(content).digest("hex").slice(0, 8) };
+}
+/**
+ * 按需加载的 AI 团队脚本（content/ai-teams.js）。与 scripts.js 一样优先读磁盘上的新产物，
+ * 自更新期间目录消失时退回内嵌副本；hash 进页面 meta 里的地址，长缓存按它失效。
+ */
+export function getAiTeamsChunk() {
+    const chunkPath = path.join(__dirname, "content", "ai-teams.js");
+    try {
+        const stat = fs.statSync(chunkPath);
+        if (stat.mtimeMs !== _aiTeamsChunkMtimeMs) {
+            _aiTeamsChunk = withHash(fs.readFileSync(chunkPath, "utf-8"));
+            _aiTeamsChunkMtimeMs = stat.mtimeMs;
+        }
+    }
+    catch {
+        // 同 getScriptContent：用内嵌副本兜底。
+    }
+    return _aiTeamsChunk;
 }

package/dist/ws-broadcast.js

@@ -157,6 +157,7 @@ export class WsBroadcastManager {
                             supportsAck: msg.capabilities?.ptyAck === true,
                             unackedBytes: 0,
                             degraded: false,
+                            resyncRequested: false,
                             lastResyncNoticeAt: 0,
                         });
                         this.flushOutput(msg.sessionId);
@@ -350,6 +351,25 @@ export class WsBroadcastManager {
         const seq = (client.outputSeqBySession.get(sessionId) ?? 0) + 1;
         client.outputSeqBySession.set(sessionId, seq);
         client.pendingResyncSessions.delete(sessionId);
+        const subscription = client.ptySubscriptions.get(sessionId);
+        if (resync && subscription) {
+            // sendInit bypasses the per-client send queue. Queued pre-snapshot output must not
+            // arrive after the new screen (or trigger a false sequence gap on the client).
+            client.sendQueue = client.sendQueue.filter((frame) => {
+                try {
+                    return JSON.parse(frame).sessionId !== sessionId;
+                }
+                catch {
+                    return true;
+                }
+            });
+            if (subscription.resyncTimer)
+                clearTimeout(subscription.resyncTimer);
+            subscription.resyncTimer = undefined;
+            subscription.unackedBytes = 0;
+            subscription.degraded = false;
+            subscription.resyncRequested = false;
+        }
         const terminalState = (snapshot.sessionKind ?? "pty") === "pty"
             ? this.port?.getTerminalState?.(sessionId) ?? undefined
             : undefined;
@@ -385,6 +405,7 @@ export class WsBroadcastManager {
                 messageTotal: w.messageTotal,
                 leadingBlockOffset: w.leadingBlockOffset,
                 leadingBlockTotal: w.leadingBlockTotal,
+                leadingVisibleCount: w.leadingVisibleCount,
             };
         }
         const w = windowMessagesForTransport(messages, this.getCardDefaults());
@@ -438,18 +459,11 @@ export class WsBroadcastManager {
                 continue;
             if (isRawPtyOutput && !client.ptySubscriptions.has(event.sessionId))
                 continue;
-            const clientEvent = eventForClient(client);
-            // Stamp output events with a per-(client, session) sequence number so
-            // the client can detect a gap caused by backpressure drops.
-            let outgoing = clientEvent;
-            if (event.type === "output") {
-                const seq = (client.outputSeqBySession.get(event.sessionId) ?? 0) + 1;
-                client.outputSeqBySession.set(event.sessionId, seq);
-                outgoing = { ...clientEvent, seq };
-            }
             const subscription = client.ptySubscriptions.get(event.sessionId);
             const usesPtyAckFlowControl = isRawPtyOutput && subscription?.supportsAck === true;
-            if (usesPtyAckFlowControl && subscription.degraded) {
+            if (usesPtyAckFlowControl
+                && (subscription.degraded || subscription.unackedBytes >= PTY_UNACKED_HIGH_WATER)) {
+                subscription.degraded = true;
                 // 已经积压到高水位的客户端：后面这些原始字节对它是**过期的 TUI 帧**（终端
                 // 每帧整屏重绘，中间帧没有任何保留价值），停发这些分片；等它 ack 追上来
                 // 再由 requestPtyResync 让它按终端快照重建屏幕。
@@ -460,12 +474,6 @@ export class WsBroadcastManager {
                 // 才恢复；手机不回来就永久冻住。降级只影响积压的这一个客户端。
                 continue;
             }
-            if (usesPtyAckFlowControl) {
-                outgoing = { ...outgoing, ptyBytes };
-                subscription.unackedBytes += ptyBytes;
-                if (subscription.unackedBytes >= PTY_UNACKED_HIGH_WATER)
-                    subscription.degraded = true;
-            }
             // Backpressure only gates new business messages. The send pump must
             // keep draining messages that were already accepted; otherwise a queue
             // at the high-water mark can never reach the low-water mark again.
@@ -481,6 +489,21 @@ export class WsBroadcastManager {
                 this.processWsQueue(client);
                 continue;
             }
+            // Only delivered output consumes a sequence number. In particular, do not advance it
+            // while waiting for a resync: the next init is the new ordering boundary.
+            const clientEvent = eventForClient(client);
+            const seq = event.type === "output"
+                ? (client.outputSeqBySession.get(event.sessionId) ?? 0) + 1
+                : undefined;
+            if (seq !== undefined)
+                client.outputSeqBySession.set(event.sessionId, seq);
+            const outgoing = {
+                ...clientEvent,
+                ...(seq !== undefined ? { seq } : {}),
+                ...(usesPtyAckFlowControl ? { ptyBytes } : {}),
+            };
+            if (usesPtyAckFlowControl)
+                subscription.unackedBytes += ptyBytes;
             client.sendQueue.push(JSON.stringify(outgoing));
             if (client.sendQueue.length >= MAX_QUEUE_SIZE) {
                 client.backpressurePaused = true;
@@ -535,7 +558,6 @@ export class WsBroadcastManager {
             return;
         subscription.unackedBytes = Math.max(0, subscription.unackedBytes - Math.max(0, Math.floor(bytes)));
         if (subscription.degraded && subscription.unackedBytes <= PTY_UNACKED_LOW_WATER) {
-            subscription.degraded = false;
             this.requestPtyResync(client, sessionId);
         }
     }
@@ -547,11 +569,22 @@ export class WsBroadcastManager {
      */
     requestPtyResync(client, sessionId) {
         const subscription = client.ptySubscriptions.get(sessionId);
-        if (!subscription)
+        if (!subscription || subscription.resyncRequested || subscription.resyncTimer)
             return;
         const now = Date.now();
-        if (now - subscription.lastResyncNoticeAt < PTY_RESYNC_MIN_INTERVAL_MS)
+        const delay = PTY_RESYNC_MIN_INTERVAL_MS - (now - subscription.lastResyncNoticeAt);
+        if (delay > 0) {
+            subscription.resyncTimer = setTimeout(() => {
+                subscription.resyncTimer = undefined;
+                if (client.ptySubscriptions.get(sessionId) === subscription && subscription.degraded
+                    && subscription.unackedBytes <= PTY_UNACKED_LOW_WATER) {
+                    this.requestPtyResync(client, sessionId);
+                }
+            }, delay);
+            subscription.resyncTimer.unref();
             return;
+        }
+        subscription.resyncRequested = true;
         subscription.lastResyncNoticeAt = now;
         this.queueResyncNotice(client, sessionId, "pty_backlog_drop");
     }

package/package.json

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