@co0ontty/wand 4.72.2-beta.g52f54af → 4.72.2-beta.g7ff2192

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "52f54afb01f38180e2bce8b9a7ba35275772cacd",
-  "builtAt": "2026-09-23T03:06:35.233Z",
-  "version": "4.72.2-beta.g52f54af",
+  "commit": "7ff219242659cdf0ec264845fbba73b7bbf8561f",
+  "builtAt": "2026-09-23T13:28:16.101Z",
+  "version": "4.72.2-beta.g7ff2192",
   "channel": "beta"
 }

package/dist/config.js

@@ -92,6 +92,7 @@ export const defaultConfig = () => ({
     macos: defaultMacosDmgConfig(),
     ios: defaultIosIpaConfig(),
     render: defaultRenderConfig(),
+    structured: { processHost: "legacy" },
     cardDefaults: defaultCardExpandDefaults(),
     defaultModel: "",
     defaultCodexModel: "",
@@ -755,6 +756,7 @@ function mergeWithDefaults(input) {
         macos: normalizeMacosDmgConfig(input.macos) ?? defaults.macos,
         ios: normalizeIosIpaConfig(input.ios) ?? defaults.ios,
         render: normalizeRenderConfig(input.render) ?? defaults.render,
+        structured: { processHost: input.structured?.processHost === "rust" ? "rust" : "legacy" },
         cardDefaults: normalizeCardDefaults(input.cardDefaults),
         defaultProvider: isSessionProvider(input.defaultProvider) ? input.defaultProvider : "claude",
         defaultSessionKind: input.defaultSessionKind === "pty" ? "pty" : "structured",

package/dist/daemon-connection.d.ts

@@ -0,0 +1,9 @@
+import type net from "node:net";
+/** Bound connect attempts, including sockets that close before the handshake. */
+export declare function waitForDaemonSocket(socket: net.Socket): Promise<void>;
+/** Probe the application, not just the fd: a half-open socket may still be writable. */
+export declare function startDaemonHeartbeat(socket: net.Socket, probe: () => Promise<unknown>, options?: {
+    socketPath?: string;
+    intervalMs?: number;
+    timeoutMs?: number;
+}): () => void;

package/dist/daemon-connection.js

@@ -0,0 +1,86 @@
+import { lstatSync, utimesSync } from "node:fs";
+const CONNECT_TIMEOUT_MS = 10_000;
+const HEARTBEAT_INTERVAL_MS = 15_000;
+const HEARTBEAT_TIMEOUT_MS = 5_000;
+/** Bound connect attempts, including sockets that close before the handshake. */
+export function waitForDaemonSocket(socket) {
+    return new Promise((resolve, reject) => {
+        const cleanup = () => {
+            clearTimeout(timer);
+            socket.off("connect", onConnect);
+            socket.off("error", onError);
+            socket.off("close", onClose);
+        };
+        const onConnect = () => { cleanup(); resolve(); };
+        const onError = (error) => { cleanup(); socket.destroy(); reject(error); };
+        const onClose = () => onError(new Error("Daemon socket closed while connecting"));
+        const timer = setTimeout(() => onError(new Error("Daemon socket connect timed out")), CONNECT_TIMEOUT_MS);
+        socket.once("connect", onConnect);
+        socket.once("error", onError);
+        socket.once("close", onClose);
+    });
+}
+/** Probe the application, not just the fd: a half-open socket may still be writable. */
+export function startDaemonHeartbeat(socket, probe, options = {}) {
+    const { socketPath, intervalMs = HEARTBEAT_INTERVAL_MS, timeoutMs = HEARTBEAT_TIMEOUT_MS } = options;
+    // Old daemons have no listener watchdog. Refresh their existing endpoint's
+    // timestamps after a successful probe so idle /tmp cleanup won't remove it.
+    const identity = (() => {
+        if (!socketPath || process.platform === "win32")
+            return null;
+        try {
+            const stat = lstatSync(socketPath);
+            return stat.isSocket() && (typeof process.getuid !== "function" || stat.uid === process.getuid())
+                ? stat : null;
+        }
+        catch {
+            return null;
+        }
+    })();
+    let lastTouch = 0;
+    let stopped = false;
+    let inFlight = false;
+    let deadline = null;
+    const stop = () => {
+        stopped = true;
+        clearInterval(timer);
+        if (deadline)
+            clearTimeout(deadline);
+        socket.off("close", stop);
+    };
+    const fail = () => {
+        if (stopped)
+            return;
+        stop();
+        // Destroy this generation only; its close handler performs normal replay
+        // and reconnect. Never retry mutating RPCs or terminate the daemon.
+        socket.destroy(new Error("Daemon heartbeat failed; reconnecting"));
+    };
+    const timer = setInterval(() => {
+        if (stopped || inFlight || socket.destroyed)
+            return;
+        inFlight = true;
+        deadline = setTimeout(fail, timeoutMs);
+        deadline.unref();
+        void Promise.resolve().then(() => stopped ? undefined : probe()).then(() => {
+            if (deadline)
+                clearTimeout(deadline);
+            deadline = null;
+            inFlight = false;
+            if (stopped || !identity || !socketPath || Date.now() - lastTouch < 60_000)
+                return;
+            try {
+                const stat = lstatSync(socketPath);
+                if (stat.dev === identity.dev && stat.ino === identity.ino) {
+                    const now = new Date();
+                    utimesSync(socketPath, now, now);
+                    lastTouch = Date.now();
+                }
+            }
+            catch { /* The owning daemon repairs a missing path; never replace it here. */ }
+        }, fail);
+    }, intervalMs);
+    timer.unref();
+    socket.once("close", stop);
+    return stop;
+}

package/dist/distribution-manager.d.ts

@@ -82,6 +82,11 @@ export declare class DistributionManager {
         deleted: string[];
         freedBytes: number;
     }>;
+    /** Beta 仅从当前服务端的 macOS 分发目录选择，绝不回退 GitHub。 */
+    resolveLatestMacosBeta(): Promise<ResolvedDistributionAsset | null>;
+    /** 固定下载文件名，避免检查与下载之间新增包后下载到另一个版本。 */
+    resolveMacosBetaDownload(fileName: string): Promise<LocalDistributionAsset | null>;
+    private resolveMacosBetaAsset;
     resolveLatestDmg(): Promise<ResolvedDistributionAsset | null>;
     resolveMacosDownload(): Promise<LocalDistributionAsset | null>;
     resolveLatestIpa(): Promise<ResolvedDistributionAsset | null>;

package/dist/distribution-manager.js

@@ -1,9 +1,10 @@
 import { createHash } from "node:crypto";
 import { createReadStream } from "node:fs";
-import { mkdir, readdir, readFile, stat, unlink } from "node:fs/promises";
+import { lstat, mkdir, readdir, readFile, stat, unlink } from "node:fs/promises";
 import path from "node:path";
 import { compareApkInstallOrder, compareSemver, compareWandInstallOrder, extractSemver } from "./version-utils.js";
 const GITHUB_CACHE_TTL_MS = 10 * 60 * 1000;
+const MACOS_UPDATE_FILE_PATTERN = /^wand-v\d+\.\d+\.\d+(?:-[A-Za-z0-9.-]+)?(?:\+[A-Za-z0-9.-]+)?\.(?:zip|dmg)$/i;
 /**
  * GitHub Release 正文还包含 Android/macOS/iOS 的安装指引；它们属于发布页，
  * 不该出现在 Android 的更新弹窗。保留分隔线前的变更摘要，并兼容旧版正文。
@@ -211,6 +212,83 @@ export class DistributionManager {
         }
         return { deleted, freedBytes };
     }
+    /** Beta 仅从当前服务端的 macOS 分发目录选择，绝不回退 GitHub。 */
+    async resolveLatestMacosBeta() {
+        const asset = await this.resolveMacosBetaAsset();
+        if (!asset?.version || asset.size <= 0)
+            return null;
+        const sha256 = await this.computeAssetSha256(asset);
+        if (!sha256)
+            return null;
+        return {
+            version: asset.version.split("+")[0],
+            downloadUrl: `/macos/update-download?fileName=${encodeURIComponent(asset.fileName)}`,
+            fileName: asset.fileName,
+            size: asset.size,
+            source: "local",
+            sha256,
+        };
+    }
+    /** 固定下载文件名，避免检查与下载之间新增包后下载到另一个版本。 */
+    async resolveMacosBetaDownload(fileName) {
+        if (!MACOS_UPDATE_FILE_PATTERN.test(fileName))
+            return null;
+        await this.refreshConfig();
+        const { config, configDir } = this.options;
+        if (config.macos?.enabled !== true)
+            return null;
+        const directory = resolveConfiguredDir(configDir, config.macos.dmgDir, "macos");
+        const filePath = path.join(directory, fileName);
+        try {
+            if (!(await lstat(filePath)).isFile())
+                return null;
+        }
+        catch {
+            return null;
+        }
+        return this.readLocalAsset(filePath, {
+            extension: fileName.toLowerCase().endsWith(".zip") ? ".zip" : ".dmg",
+            downloadUrl: `/macos/update-download?fileName=${encodeURIComponent(fileName)}`,
+        });
+    }
+    async resolveMacosBetaAsset() {
+        await this.refreshConfig();
+        const { config, configDir } = this.options;
+        if (config.macos?.enabled !== true)
+            return null;
+        const directory = resolveConfiguredDir(configDir, config.macos.dmgDir, "macos");
+        await mkdir(directory, { recursive: true });
+        const entries = await readdir(directory, { withFileTypes: true });
+        const candidates = await Promise.all(entries
+            .filter((entry) => entry.isFile() && MACOS_UPDATE_FILE_PATTERN.test(entry.name))
+            .map(async (entry) => ({
+            name: entry.name,
+            filePath: path.join(directory, entry.name),
+            fileStat: await stat(path.join(directory, entry.name)),
+        })));
+        candidates.sort((a, b) => {
+            const aVersion = extractArtifactVersion(a.name, path.extname(a.name));
+            const bVersion = extractArtifactVersion(b.name, path.extname(b.name));
+            const order = compareWandInstallOrder(aVersion ?? "", bVersion ?? "");
+            if (order !== 0)
+                return -order;
+            // 同版本优先 ZIP，避免 DMG 挂载；同格式多构建按最新修改时间挑选。
+            const format = Number(b.name.toLowerCase().endsWith(".zip")) - Number(a.name.toLowerCase().endsWith(".zip"));
+            return format || b.fileStat.mtimeMs - a.fileStat.mtimeMs;
+        });
+        const selected = candidates[0];
+        if (!selected)
+            return null;
+        return {
+            fileName: selected.name,
+            filePath: selected.filePath,
+            size: selected.fileStat.size,
+            updatedAt: selected.fileStat.mtime.toISOString(),
+            version: extractArtifactVersion(selected.name, path.extname(selected.name)),
+            downloadUrl: `/macos/update-download?fileName=${encodeURIComponent(selected.name)}`,
+            source: "local",
+        };
+    }
     async resolveLatestDmg() {
         const localDmg = await this.resolveMacosDownload();
         if (localDmg?.version) {

package/dist/git-quick-commit.js

@@ -494,6 +494,18 @@ function runCliText(command, args, prompt, opts) {
             }
             reject(new QuickCommitError(`${command} CLI 失败：${(stderr || stdout).trim() || `exit ${code}`}`, "CLAUDE_CLI_FAILED"));
         });
+        // A CLI may exit before reading stdin (e.g. invalid credentials/argv).
+        // The writable stream emits EPIPE independently of ChildProcess.error;
+        // without a listener that becomes an uncaught exception after callers
+        // have already finished their turn or closed storage.
+        child.stdin?.on("error", (error) => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timeout);
+            child.kill("SIGTERM");
+            reject(new QuickCommitError(`${command} CLI stdin failed: ${error.code ?? "write error"}`, "CLAUDE_CLI_FAILED"));
+        });
         child.stdin?.end(prompt);
     });
 }

package/dist/native/darwin-arm64/wand-render.sha256

@@ -1 +1 @@
-a8b46e0ed51802d1220434b033693eb900a32442631f60d5380001a71418dab4  wand-render
+6855db8c0423d995dbd57567076cdf019a4e3306a465d0828cca80ee2f85f34c  wand-render

package/dist/native/darwin-arm64/wand-render.version

@@ -1 +1 @@
-0.1.0
+0.1.1

package/dist/native/darwin-x64/wand-render.sha256

@@ -0,0 +1 @@
+783bd070dad27f2ec879ed5853f813f7ffdb3914d719d3ed947ec86af12a7b88  wand-render

package/dist/native/darwin-x64/wand-render.version

@@ -0,0 +1 @@
+0.1.1

package/dist/native/linux-arm64/wand-render.sha256

@@ -0,0 +1 @@
+7acb6e92e8f049ac87d8159905115dabe5f9a33f9d310e3c98f38b798c4302e5  wand-render

package/dist/native/linux-arm64/wand-render.version

@@ -0,0 +1 @@
+0.1.1

package/dist/native/linux-x64/wand-render.sha256

@@ -0,0 +1 @@
+7814590a02ae2606fedc395ee1708921aec3b16332edb46fa2369e43e9a589f5  wand-render

package/dist/native/linux-x64/wand-render.version

@@ -0,0 +1 @@
+0.1.1

package/dist/process-manager.d.ts

@@ -15,6 +15,11 @@ export declare class SessionInputError extends Error {
     readonly sessionStatus?: SessionSnapshot["status"] | undefined;
     constructor(message: string, code: "SESSION_NOT_FOUND" | "SESSION_NOT_RUNNING" | "SESSION_NO_PTY", sessionId: string, sessionStatus?: SessionSnapshot["status"] | undefined);
 }
+/** Write outcome is unknown to the caller; do not record this as accepted input. */
+export declare class PtyInputDeliveryError extends Error {
+    readonly sessionId: string;
+    constructor(sessionId: string, cause: unknown);
+}
 export declare class ProcessManager extends EventEmitter {
     private readonly config;
     private readonly storage;
@@ -39,6 +44,7 @@ export declare class ProcessManager extends EventEmitter {
     private bindRestoredTerminal;
     private initializeClaudeBridge;
     private bindTerminalProcess;
+    private handleTerminalResync;
     private handleTerminalExit;
     private handleTerminalData;
     on(_event: "process", listener: ProcessEventHandler): this;
@@ -107,6 +113,10 @@ export declare class ProcessManager extends EventEmitter {
      */
     setSessionMode(id: string, mode: ExecutionMode): SessionSnapshot;
     sendInput(id: string, input: string, view?: "chat" | "terminal", shortcutKey?: string, trackUserInput?: boolean): SessionSnapshot;
+    sendInputConfirmed(id: string, input: string, view?: "chat" | "terminal", shortcutKey?: string, trackUserInput?: boolean): Promise<SessionSnapshot>;
+    private preparePtyInput;
+    private validatePtyInput;
+    private trackPtyInput;
     resize(id: string, cols: number, rows: number): SessionSnapshot;
     getTerminalState(id: string): PtyTerminalSnapshot | null;
     /**

package/dist/process-manager.js

@@ -150,6 +150,15 @@ export class SessionInputError extends Error {
         this.name = "SessionInputError";
     }
 }
+/** Write outcome is unknown to the caller; do not record this as accepted input. */
+export class PtyInputDeliveryError extends Error {
+    sessionId;
+    constructor(sessionId, cause) {
+        super("PTY input delivery could not be confirmed.", { cause });
+        this.sessionId = sessionId;
+        this.name = "PtyInputDeliveryError";
+    }
+}
 const REAL_CONVERSATION_MIN_LINES = 2;
 const DISCOVERY_RECENT_WINDOW_MS = 10 * 60 * 1000;
 const START_TIME_SKEW_MS = 30 * 1000;
@@ -736,8 +745,9 @@ export class ProcessManager extends EventEmitter {
         });
     }
     bindTerminalProcess(record, child, onVisibleChunk) {
-        child.onExit(({ exitCode }) => this.handleTerminalExit(record, child, exitCode));
+        child.onResync?.((state) => this.handleTerminalResync(record, child, state));
         child.onData((event) => this.handleTerminalData(record, child, event, onVisibleChunk));
+        child.onExit(({ exitCode }) => this.handleTerminalExit(record, child, exitCode));
         if (record.ptyBridge) {
             record.ptyBridge.setPtyWrite((input) => {
                 if (this.sessions.get(record.id) !== record || record.ptyProcess !== child)
@@ -746,6 +756,31 @@ export class ProcessManager extends EventEmitter {
             });
         }
     }
+    handleTerminalResync(record, child, state) {
+        const current = this.sessions.get(record.id);
+        if (current !== record || current.ptyProcess !== child)
+            return;
+        current.terminalState?.dispose();
+        current.terminalState = restoreTerminalState(state);
+        current.output = state.output;
+        current.storedOutput = state.output;
+        current.ptyOutputSeq = state.seq;
+        current.ptyCols = state.cols;
+        current.ptyRows = state.rows;
+        current.ptyLaunchMarkerToken = state.launchMarkerToken;
+        current.providerShellMarker = state.launchMarkerToken
+            ? new PtyCliExitMarker(state.launchMarkerToken)
+            : null;
+        if (current.ptyBridge)
+            current.messages = current.ptyBridge.getMessages();
+        this.initializeClaudeBridge(current, state.output);
+        current.ptyBridge?.setPtyWrite((input) => {
+            if (this.sessions.get(record.id) === current && current.ptyProcess === child)
+                child.write(input);
+        });
+        this.flushPersist(current, true);
+        this.emitEvent({ type: "resync", sessionId: record.id, data: { reason: "render_replay_gap" } });
+    }
     handleTerminalExit(record, child, exitCode) {
         const current = this.sessions.get(record.id);
         // A stopped session can be resumed under the same public id before the old
@@ -1483,6 +1518,39 @@ export class ProcessManager extends EventEmitter {
         return this.snapshot(record);
     }
     sendInput(id, input, view, shortcutKey, trackUserInput = true) {
+        const record = this.preparePtyInput(id, input, view, shortcutKey, trackUserInput);
+        record.ptyProcess.write(input);
+        this.persist(record);
+        return this.snapshot(record);
+    }
+    async sendInputConfirmed(id, input, view, shortcutKey, trackUserInput = true) {
+        const record = this.validatePtyInput(id);
+        const terminal = record.ptyProcess;
+        try {
+            if (terminal.writeConfirmed)
+                await terminal.writeConfirmed(input);
+            else
+                terminal.write(input);
+        }
+        catch (cause) {
+            throw new PtyInputDeliveryError(id, cause);
+        }
+        const current = this.sessions.get(id);
+        if (current !== record || record.ptyProcess !== terminal) {
+            // The write reached an old PTY, but the caller cannot treat it as input
+            // accepted by the current incarnation or persist the stale record.
+            throw new PtyInputDeliveryError(id, new Error("PTY incarnation changed during write"));
+        }
+        this.trackPtyInput(record, input, view, shortcutKey, trackUserInput);
+        this.persist(record);
+        return this.snapshot(record);
+    }
+    preparePtyInput(id, input, view, shortcutKey, trackUserInput = true) {
+        const record = this.validatePtyInput(id);
+        this.trackPtyInput(record, input, view, shortcutKey, trackUserInput);
+        return record;
+    }
+    validatePtyInput(id) {
         if (this.disposed)
             throw new Error("ProcessManager has been disposed.");
         const record = this.mustGet(id);
@@ -1495,6 +1563,10 @@ export class ProcessManager extends EventEmitter {
             console.error(`[ProcessManager] Rejecting input: session ${id} has no PTY`);
             throw new SessionInputError("Session is not running.", "SESSION_NO_PTY", id, record.status);
         }
+        return record;
+    }
+    trackPtyInput(record, input, view, shortcutKey, trackUserInput = true) {
+        const id = record.id;
         if (!record.ptyTopicDraft)
             record.ptyTopicDraft = createPtyTopicLineBuffer();
         const topicInput = consumePtyInputForTopic(record.ptyTopicDraft, input, view, shortcutKey);
@@ -1516,9 +1588,6 @@ export class ProcessManager extends EventEmitter {
         if (record.ptyBridge && trackUserInput) {
             record.ptyBridge.onUserInput(input);
         }
-        record.ptyProcess.write(input);
-        this.persist(record);
-        return this.snapshot(record);
     }
     resize(id, cols, rows) {
         const record = this.mustGet(id);

package/dist/render-daemon-client.d.ts

@@ -26,6 +26,8 @@ export declare class RenderDaemonClient implements TerminalHost {
      * （现象是 `createOrAttach` 全部失败、错误只显示 unavailable，旧会话被永久报成 running）。
      */
     private readonly tokenPath;
+    /** Persisted PTY IDs used only if v1 `list` exceeds its aggregate frame limit. */
+    private readonly knownSessionIds;
     readonly persistent = true;
     private socket;
     private nextRequestId;
@@ -33,6 +35,11 @@ export declare class RenderDaemonClient implements TerminalHost {
     private readonly inventory;
     private readonly handles;
     private readonly pendingEvents;
+    private readonly pendingEventOverflows;
+    private readonly refreshingSessions;
+    private reconciling;
+    private eventsDuringReconcile;
+    private reconcileDuringSync;
     private headerParts;
     private headerBytes;
     private bodyParts;
@@ -54,15 +61,20 @@ export declare class RenderDaemonClient implements TerminalHost {
     private tokenReadFailureLogged;
     /** 当前 socket 上已解出的帧数，用来区分「未鉴权被直接关闭」与网络错误。 */
     private framesOnCurrentSocket;
+    private connecting;
+    private stopHeartbeat;
     constructor(socketPath: string, token: string, 
     /**
      * token 文件路径。给了它就在**每次 connect 时重读**：Render 崩溃/升级重启后
      * 会 `generate_token()` 轮换 token，只缓存构造期的那一把会让重连永远鉴权失败
      * （现象是 `createOrAttach` 全部失败、错误只显示 unavailable，旧会话被永久报成 running）。
      */
-    tokenPath?: string | null);
+    tokenPath?: string | null, 
+    /** Persisted PTY IDs used only if v1 `list` exceeds its aggregate frame limit. */
+    knownSessionIds?: readonly string[]);
     get version(): string;
     connect(): Promise<void>;
+    private open;
     /**
      * 对端一个字节都没回就断开：daemon 对 token/协议不符的处理是直接 `close()`
      * （`wand-renderd` 的 `server.rs`），所以这是鉴权/版本问题的特征，不是网络抖动。
@@ -91,8 +103,11 @@ export declare class RenderDaemonClient implements TerminalHost {
      * 否则一次 PTY 抖动会顺着 ProcessManager 把整个会话路径打断。
      */
     fireOperation(sessionId: string, method: RenderMethod, params?: Record<string, unknown>): void;
+    confirmWrite(sessionId: string, data: string): Promise<void>;
     reportOperationError(sessionId: string, method: RenderMethod, error: unknown): void;
     private listSessions;
+    /** `list` locates sessions; each `attach` is the authoritative recovery state. */
+    private loadAuthoritativeSessions;
     private parseHello;
     private request;
     private consume;
@@ -100,6 +115,9 @@ export declare class RenderDaemonClient implements TerminalHost {
     private handleFrame;
     private handleResponse;
     private routeEvent;
+    private queuePendingEvent;
+    /** Repair a bounded event-buffer overflow without replaying a partial stream. */
+    private refreshSession;
     /**
      * Render 主动告知当前会话集合（例如自身清掉了已 forget 的会话）。不在
      * 集合里的会话要给既有句柄补一个退出事件，否则 ProcessManager 会永远停在 running。
@@ -150,4 +168,4 @@ export declare function normalizeRenderSessionState(value: unknown): TerminalSes
  * 连接一个已经存在的 Render（socket + token 都在）。**不 spawn**，找不到就返回 null，
  * 这样调用方可以区分「已被别处 adopt」和「需要自己拉起」。
  */
-export declare function connectExistingRenderClient(configPath: string): Promise<RenderDaemonClient | null>;
+export declare function connectExistingRenderClient(configPath: string, knownSessionIds?: readonly string[]): Promise<RenderDaemonClient | null>;