@co0ontty/wand 4.72.2 → 4.75.0-beta.g1d477a2

package/dist/web-ui/thinking-efforts.d.ts

@@ -0,0 +1,24 @@
+/**
+ * 思考档位下拉。
+ *
+ * 旧的 off/standard/deep/max 继续表示「不覆盖 / 各 CLI 的低、中、高档」，
+ * CLI 新报出来的档位用 `provider:level` 存，避免和旧的 max 撞车。
+ */
+export interface CliThinkingEffort {
+    effort: string;
+    description?: string;
+}
+export interface ThinkingChoice {
+    id: string;
+    /** CLI 原生档位名，例如 low / xhigh。off 档的 label 是 auto。 */
+    label: string;
+    hint: string;
+}
+/** 能和旧四档对上的原生档位继续用旧 id，其余写成 `provider:level`。 */
+export declare function thinkingChoiceId(provider: string, native: string): string;
+export declare function compactThinkingLabel(native: string): string;
+/**
+ * 用 CLI 报出的档位生成下拉。完全没有档位时返回 null，调用方继续用旧的四档兜底。
+ * 模型明确只支持 off 时只保留「不覆盖」。原生 off 不重复列出。
+ */
+export declare function dynamicThinkingChoices(provider: string, efforts: readonly CliThinkingEffort[], defaultEffort?: string): ThinkingChoice[] | null;

package/dist/web-ui/thinking-efforts.js

@@ -0,0 +1,81 @@
+/**
+ * 思考档位下拉。
+ *
+ * 旧的 off/standard/deep/max 继续表示「不覆盖 / 各 CLI 的低、中、高档」，
+ * CLI 新报出来的档位用 `provider:level` 存，避免和旧的 max 撞车。
+ */
+const LEGACY_NATIVE = {
+    claude: { standard: "low", deep: "medium", max: "max" },
+    codex: { standard: "low", deep: "medium", max: "xhigh" },
+    opencode: { standard: "low", deep: "high", max: "max" },
+    grok: { standard: "low", deep: "high", max: "xhigh" },
+    qoder: { standard: "low", deep: "high", max: "max" },
+    pi: { standard: "low", deep: "high", max: "max" },
+};
+const COMPACT_LABELS = {
+    auto: "自动",
+    none: "关闭",
+    minimal: "最低",
+    low: "低",
+    medium: "中",
+    high: "高",
+    xhigh: "超高",
+    max: "极高",
+    ultra: "极限",
+    ultracode: "极限代码",
+};
+/** 能和旧四档对上的原生档位继续用旧 id，其余写成 `provider:level`。 */
+export function thinkingChoiceId(provider, native) {
+    const legacy = LEGACY_NATIVE[provider];
+    if (legacy?.standard === native)
+        return "standard";
+    if (legacy?.deep === native)
+        return "deep";
+    if (legacy?.max === native)
+        return "max";
+    return `${provider}:${native}`;
+}
+export function compactThinkingLabel(native) {
+    return COMPACT_LABELS[native] ?? native;
+}
+/**
+ * 用 CLI 报出的档位生成下拉。完全没有档位时返回 null，调用方继续用旧的四档兜底。
+ * 模型明确只支持 off 时只保留「不覆盖」。原生 off 不重复列出。
+ */
+export function dynamicThinkingChoices(provider, efforts, defaultEffort) {
+    const reported = efforts
+        .map((level) => level.effort.trim().toLowerCase())
+        .filter((effort) => /^[a-z][a-z0-9_-]{0,31}$/.test(effort));
+    if (!reported.length)
+        return null;
+    const natives = efforts
+        .map((level) => ({
+        effort: level.effort.trim().toLowerCase(),
+        description: level.description?.trim() || "",
+    }))
+        .filter((level) => /^[a-z][a-z0-9_-]{0,31}$/.test(level.effort) && level.effort !== "off");
+    if (!natives.length) {
+        return [{
+                id: "off",
+                label: "auto",
+                hint: "这个模型不能调思考深度",
+            }];
+    }
+    const hint = defaultEffort
+        ? `使用模型默认档位（${defaultEffort}）`
+        : "使用模型默认档位";
+    const choices = [{ id: "off", label: "auto", hint }];
+    const seen = new Set(["off"]);
+    for (const level of natives) {
+        const id = thinkingChoiceId(provider, level.effort);
+        if (seen.has(id))
+            continue;
+        seen.add(id);
+        choices.push({
+            id,
+            label: level.effort,
+            hint: level.description || level.effort,
+        });
+    }
+    return choices;
+}

package/dist/ws-broadcast.d.ts

@@ -11,7 +11,7 @@ export type { ProcessEvent } from "./types.js";
 export interface WsSessionPort {
     getSession(id: string): SessionSnapshot | null;
     getTerminalState?(id: string): PtyTerminalSnapshot | null;
-    sendPtyInput?(id: string, input: string, shortcutKey?: string, userInput?: boolean): void;
+    sendPtyInput?(id: string, input: string, shortcutKey?: string, userInput?: boolean): void | Promise<void>;
     resizePty?(id: string, cols: number, rows: number): void;
 }
 export declare class WsBroadcastManager {

package/dist/ws-broadcast.js

@@ -185,7 +185,10 @@ export class WsBroadcastManager {
                         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);
+                            const delivery = this.port?.sendPtyInput?.(msg.sessionId, msg.data, typeof msg.shortcutKey === "string" ? msg.shortcutKey : undefined, msg.userInput !== false);
+                            if (delivery) {
+                                void delivery.catch((error) => this.sendPtyError(client, msg.sessionId, error));
+                            }
                         }
                         catch (error) {
                             this.sendPtyError(client, msg.sessionId, error);
@@ -263,6 +266,15 @@ export class WsBroadcastManager {
     emitEvent(event) {
         if (this.disposed)
             return;
+        if (event.type === "resync") {
+            this.flushOutput(event.sessionId);
+            for (const client of this.clients) {
+                if (client.ptySubscriptions.has(event.sessionId)) {
+                    this.queueResyncNotice(client, event.sessionId, "render_replay_gap");
+                }
+            }
+            return;
+        }
         // Debounce output events to reduce flicker during rapid streaming
         if (event.type === "output") {
             const existing = this.outputDebounceCache.get(event.sessionId);
@@ -332,20 +344,27 @@ export class WsBroadcastManager {
      * and the first incremental update.
      */
     sendInit(client, sessionId, snapshot, resync) {
-        // 块级窗口客户端（iOS）只下发最近 blockBudget 个块；其余走 turn 级窗口。
+        // 块级窗口客户端（Web/iOS）只下发最近 blockBudget 个块；其余走 turn 级窗口。
         // 两种都附 offset/total，更早的客户端按需翻页。
-        const windowed = this.windowForClient(client, snapshot.messages);
+        const windowed = this.windowForClient(client, sessionId, snapshot.messages);
         const seq = (client.outputSeqBySession.get(sessionId) ?? 0) + 1;
         client.outputSeqBySession.set(sessionId, seq);
         client.pendingResyncSessions.delete(sessionId);
+        const terminalState = (snapshot.sessionKind ?? "pty") === "pty"
+            ? this.port?.getTerminalState?.(sessionId) ?? undefined
+            : undefined;
         client.ws.send(JSON.stringify({
             type: "init",
             sessionId,
             seq,
             ...(resync ? { resync: true } : {}),
             data: {
-                ...toSessionDetailDTO(snapshot, { output: snapshot.output, ...windowed }),
-                terminalState: this.port?.getTerminalState?.(sessionId) ?? undefined,
+                ...toSessionDetailDTO(snapshot, {
+                    output: snapshot.output,
+                    outputLimit: terminalState ? 16_000 : undefined,
+                    ...windowed,
+                }),
+                terminalState,
             },
         }));
     }
@@ -353,11 +372,11 @@ export class WsBroadcastManager {
      * 按客户端偏好窗口化一段完整 messages：opted-in 的块级窗口（iOS）会附带
      * leadingBlockOffset/leadingBlockTotal；否则 turn 级窗口（字段与改动前一致）。
      */
-    windowForClient(client, messages) {
+    windowForClient(client, sessionId, messages) {
         if (!messages) {
             return { messages: undefined, messageOffset: 0, messageTotal: 0 };
         }
-        messages = enrichStructuredMessages(messages);
+        messages = enrichStructuredMessages(messages, sessionId);
         if (client.blockBudget && client.blockBudget > 0) {
             const w = blockWindowMessagesForTransport(messages, this.getCardDefaults(), client.blockBudget);
             return {
@@ -377,7 +396,7 @@ export class WsBroadcastManager {
         // 非增量事件若带完整 messages（结构化 output/ended 快照、PTY 非流式 chat 快照），
         // 在这个统一出口窗口化——避免逐个 emit 点各自处理、也防止超大帧撑爆移动端 WS。
         // 增量事件只带 lastMessage，不含 messages 数组，不受影响。
-        // 块级窗口客户端（iOS）需按各自预算切，所以这里改为「按客户端」窗口化；
+        // 块级窗口客户端（Web/iOS）需按各自预算切，所以这里改为「按客户端」窗口化；
         // turn 级（Web/Android）的结果跨客户端一致，缓存一次复用，避免重复计算。
         const boundedData = boundSessionEventData(event.data);
         const boundedEvent = boundedData === event.data ? event : { ...event, data: boundedData };
@@ -397,7 +416,7 @@ export class WsBroadcastManager {
             if (client.blockBudget && client.blockBudget > 0) {
                 return {
                     ...boundedEvent,
-                    data: { ...data, ...this.windowForClient(client, rawMessages) },
+                    data: { ...data, ...this.windowForClient(client, event.sessionId, rawMessages) },
                 };
             }
             if (!turnWindowedEvent) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@co0ontty/wand",
-  "version": "4.72.2",
+  "version": "4.75.0-beta.g1d477a2",
   "description": "A web console for Claude Code, Codex, OpenCode, and other local CLI tools.",
   "type": "module",
   "bin": {
@@ -13,13 +13,18 @@
   },
   "files": [
     "dist",
-    "browser-extension"
+    "browser-extension",
+    "scripts/install-render-binary.js",
+    "scripts/stage-render-binaries.js"
   ],
   "preferGlobal": true,
   "scripts": {
     "generate:web-assets": "node scripts/generate-web-assets.js",
-    "build": "rm -rf dist && node scripts/bundle-tailwind.js && node scripts/bundle-xterm.js && node scripts/bundle-qrcode.js && node scripts/bundle-browser.js && npm run generate:web-assets && tsc -p tsconfig.json && npm run build:copy-content && node scripts/check-bundle-budget.js && node scripts/stamp-build-info.js && node scripts/fix-dist-permissions.js",
+    "build": "rm -rf dist && node scripts/bundle-tailwind.js && node scripts/bundle-xterm.js && node scripts/bundle-qrcode.js && node scripts/bundle-browser.js && npm run generate:web-assets && tsc -p tsconfig.json && npm run build:copy-content && node scripts/check-bundle-budget.js && (npm run build:render-bin || echo '[wand] WARNING: build:render-bin failed; dist/native/ has no wand-render (run: npm run build:render-bin)' >&2) && node scripts/stamp-build-info.js && node scripts/fix-dist-permissions.js",
     "build:copy-content": "cp -r src/web-ui/content dist/web-ui/ && node scripts/minify-dist-content.js",
+    "build:render-bin": "node scripts/stage-render-binaries.js --all",
+    "build:render-native": "cargo build --release --manifest-path render/Cargo.toml -p wand-renderd",
+    "build:structured-render-native": "cargo build --release --manifest-path render/Cargo.toml -p wand-structured-renderd",
     "dev": "node scripts/bundle-tailwind.js && node scripts/bundle-xterm.js && node scripts/bundle-browser.js --development && npm run generate:web-assets && tsx src/cli.ts web",
     "check": "node scripts/bundle-tailwind.js && node scripts/bundle-xterm.js && node scripts/bundle-browser.js && npm run generate:web-assets && tsc --noEmit -p tsconfig.json && tsc --noEmit -p tsconfig.browser.json && tsc --noEmit -p tsconfig.react.json",
     "test": "node --test --import tsx tests/*.test.ts",