@co0ontty/wand 4.38.0 → 4.39.0

package/dist/server-session-routes.js

@@ -367,7 +367,7 @@ function isPtyProviderCommand(provider, command) {
     const executable = provider === "qoder" ? "qodercli" : provider;
     return new RegExp(`^${executable}\\b`, "i").test(command.trim());
 }
-function startResumedPtySession(processes, existingSession, sessionId, defaultMode, body, initialInput) {
+async function startResumedPtySession(processes, existingSession, sessionId, defaultMode, body, initialInput) {
     if ((existingSession.sessionKind ?? "pty") !== "pty") {
         throw new Error("结构化会话不支持 PTY resume。");
     }
@@ -1066,7 +1066,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         const slice = enrichStructuredMessages(truncateMessagesForTransport(all.slice(offset, end), config.cardDefaults ?? {}));
         res.json({ wandProtocolVersion: WAND_PROTOCOL_VERSION, messages: slice, offset, total });
     });
-    app.post("/api/sessions/:id/resume", (req, res) => {
+    app.post("/api/sessions/:id/resume", asyncRoute(async (req, res) => {
         const sessionId = req.params.id;
         const body = req.body;
         try {
@@ -1079,14 +1079,14 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 res.status(400).json({ error: "结构化会话不支持 PTY resume。" });
                 return;
             }
-            const newSnapshot = startResumedPtySession(processes, existingSession, sessionId, defaultMode, body);
+            const newSnapshot = await startResumedPtySession(processes, existingSession, sessionId, defaultMode, body);
             res.status(201).json(newSnapshot);
         }
         catch (error) {
             res.status(400).json({ error: getErrorMessage(error, "无法恢复会话。") });
         }
-    });
-    app.post("/api/claude-sessions/:claudeSessionId/resume", (req, res) => {
+    }));
+    app.post("/api/claude-sessions/:claudeSessionId/resume", asyncRoute(async (req, res) => {
         const claudeSessionId = String(req.params.claudeSessionId || "").trim();
         const body = req.body;
         try {
@@ -1122,7 +1122,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 const resumeCommand = `claude --resume ${claudeSessionId}`;
                 const reqCols = typeof body.cols === "number" && Number.isFinite(body.cols) ? body.cols : undefined;
                 const reqRows = typeof body.rows === "number" && Number.isFinite(body.rows) ? body.rows : undefined;
-                const newSnapshot = processes.start(resumeCommand, existingSession.cwd, newMode, undefined, {
+                const newSnapshot = await processes.start(resumeCommand, existingSession.cwd, newMode, undefined, {
                     reuseId: existingSession.id,
                     cols: reqCols,
                     rows: reqRows,
@@ -1140,7 +1140,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 const resumeCommand = `claude --resume ${claudeSessionId}`;
                 const reqCols = typeof body.cols === "number" && Number.isFinite(body.cols) ? body.cols : undefined;
                 const reqRows = typeof body.rows === "number" && Number.isFinite(body.rows) ? body.rows : undefined;
-                const newSnapshot = processes.start(resumeCommand, cwd, newMode, undefined, {
+                const newSnapshot = await processes.start(resumeCommand, cwd, newMode, undefined, {
                     cols: reqCols,
                     rows: reqRows,
                     ...(requestedOrigin ?? {}),
@@ -1151,7 +1151,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         catch (error) {
             res.status(400).json({ error: getErrorMessage(error, "无法按 Claude 会话 ID 恢复会话。") });
         }
-    });
+    }));
     app.post("/api/sessions/:id/input", asyncRoute(async (req, res) => {
         const body = req.body;
         const sessionId = req.params.id;
@@ -1187,7 +1187,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             const existingSession = processes.get(sessionId) || storage.getSession(sessionId);
             const autoResumeInput = getAutoResumeInitialInput(existingSession, input, view, shortcutKey);
             if (autoResumeInput !== null && canAutoResumePtyForInput(existingSession, autoResumeInput)) {
-                const snapshot = startResumedPtySession(processes, existingSession, sessionId, defaultMode, {}, autoResumeInput);
+                const snapshot = await startResumedPtySession(processes, existingSession, sessionId, defaultMode, {}, autoResumeInput);
                 res.json(sessionResponseDTO(snapshot));
                 return;
             }

package/dist/server.d.ts

@@ -3,6 +3,7 @@ import { type ModelRefreshOptions } from "./models.js";
 import { ProcessManager } from "./process-manager.js";
 import { StructuredSessionManager } from "./structured-session-manager.js";
 import { type PathRepairResult } from "./path-repair.js";
+import type { TerminalHost } from "./terminal-host.js";
 import { WandConfig } from "./types.js";
 export interface ServerUrl {
     url: string;
@@ -31,4 +32,5 @@ export declare class PortInUseError extends Error {
 export declare function isPortInUseError(error: unknown): error is PortInUseError;
 export declare function startServer(config: WandConfig, configPath: string, options?: {
     modelRefreshOptions?: () => Partial<ModelRefreshOptions>;
+    terminalHost?: TerminalHost;
 }): Promise<ServerHandle>;

package/dist/server.js

@@ -45,6 +45,7 @@ import { isLogBusActive, wandTuiLog } from "./tui/log-bus.js";
 import { EMBEDDED_WEB_ASSETS } from "./web-ui/embedded-assets.js";
 import { renderApp } from "./web-ui/index.js";
 import { WsBroadcastManager } from "./ws-broadcast.js";
+import { createTerminalHost } from "./terminal-daemon-client.js";
 import { checkRateLimit, recordFailedLogin, resetRateLimit } from "./middleware/rate-limit.js";
 import { updateProviderClis, verifyProviderCliUpdateResults, } from "./provider-cli-updater.js";
 const SERVER_MODULE_DIR = path.dirname(new URL(import.meta.url).pathname);
@@ -499,7 +500,8 @@ export async function startServer(config, configPath, options = {}) {
         config,
         repositoryUrl: PKG_REPO_URL,
     });
-    const processes = new ProcessManager(config, storage, configDir);
+    const terminalHost = options.terminalHost ?? await createTerminalHost(configPath);
+    const processes = new ProcessManager(config, storage, configDir, terminalHost);
     const structuredLogger = new SessionLogger(configDir, config.shortcutLogMaxBytes);
     const structuredSessions = new StructuredSessionManager(storage, config, structuredLogger);
     const sessionRegistry = new SessionRegistry(processes, structuredSessions, storage);
@@ -977,7 +979,7 @@ export async function startServer(config, configPath, options = {}) {
     }));
     registerFileRoutes(app, { storage, defaultCwd: config.defaultCwd });
     // ── Session control ──
-    app.post("/api/commands", (req, res) => {
+    app.post("/api/commands", asyncRoute(async (req, res) => {
         const body = req.body;
         const interactiveShell = body.shell === true;
         if (!interactiveShell && !body.command?.trim()) {
@@ -1016,7 +1018,7 @@ export async function startServer(config, configPath, options = {}) {
                 : undefined;
             const reqCols = typeof body.cols === "number" && Number.isFinite(body.cols) ? body.cols : undefined;
             const reqRows = typeof body.rows === "number" && Number.isFinite(body.rows) ? body.rows : undefined;
-            const snapshot = interactiveShell
+            const snapshot = await (interactiveShell
                 ? processes.startShell(body.cwd, body.mode ?? "default", {
                     worktreeEnabled: body.worktreeEnabled === true,
                     cols: reqCols,
@@ -1031,14 +1033,14 @@ export async function startServer(config, configPath, options = {}) {
                     rows: reqRows,
                     thinkingEffort: body.thinkingEffort ?? config.defaultThinkingEffort,
                     ...origin,
-                });
+                }));
             recordRecentPath(storage, snapshot.cwd);
             res.status(201).json(snapshot);
         }
         catch (error) {
             res.status(400).json({ error: getErrorMessage(error, "无法启动命令。请检查命令是否安装。") });
         }
-    });
+    }));
     // ── WebSocket broadcast layer ──
     let activeSslCertPath = null;
     const server = useHttps
@@ -1231,7 +1233,9 @@ export async function startServer(config, configPath, options = {}) {
     const updateChecksEnabled = !testMode && process.env.WAND_DISABLE_UPDATE_CHECK !== "1";
     // Start configured background sessions after the server is already reachable.
     if (!testMode) {
-        processes.runStartupCommands();
+        void processes.runStartupCommands().catch((error) => {
+            console.error("[wand] Failed to start configured startup commands:", getErrorMessage(error));
+        });
     }
     // Model discovery runs exclusively in the server. Its first result is
     // persisted; later checks only write when catalog content changes.

package/dist/session-transport.d.ts

@@ -1,6 +1,6 @@
 import type { ConversationTurn, SessionSnapshot } from "./types.js";
 export declare const SESSION_TRANSPORT_OUTPUT_LIMIT = 200000;
-export type SessionBaseDTO = Omit<SessionSnapshot, "output" | "messages" | "title"> & {
+export type SessionBaseDTO = Omit<SessionSnapshot, "output" | "messages" | "title" | "ptyOutputSeq" | "ptyLaunchMarkerToken"> & {
     /** Canonical server-resolved title. Clients must not invent their own fallback. */
     title: string;
 };

package/dist/storage.d.ts

@@ -85,12 +85,12 @@ export declare class WandStorage {
     /** Compatibility alias for older callers; intentionally excludes output/messages. */
     saveSessionMetadata(snapshot: SessionSnapshot): void;
     /** Checkpoint only the PTY/structured text output window. */
-    checkpointSessionOutput(id: string, output: string): void;
+    checkpointSessionOutput(id: string, output: string, ptyOutputSeq?: number): void;
     /**
      * Checkpoint the conversation payload once, optionally folding the matching
      * structured state/output into the same statement.
      */
-    checkpointSessionMessages(id: string, messages: ConversationTurn[], structuredState?: StructuredSessionState | null, output?: string): void;
+    checkpointSessionMessages(id: string, messages: ConversationTurn[], structuredState?: StructuredSessionState | null, output?: string, ptyOutputSeq?: number): void;
     getSession(id: string): SessionSnapshot | null;
     getLatestSessionByClaudeSessionId(claudeSessionId: string): SessionSnapshot | null;
     loadSessions(): SessionSnapshot[];

package/dist/storage.js

@@ -108,6 +108,9 @@ function serializeSessionOptions(snapshot) {
         thinkingEffort: snapshot.thinkingEffort,
         ptyCols: snapshot.ptyCols,
         ptyRows: snapshot.ptyRows,
+        ptyLaunchMarkerToken: snapshot.ptyLaunchMarkerToken,
+        providerCliActive: snapshot.providerCliActive,
+        providerCliExitCode: snapshot.providerCliExitCode,
         currentTaskTitle: snapshot.currentTaskTitle,
         summary: snapshot.summary,
     };
@@ -159,6 +162,14 @@ function parseSessionOptions(raw) {
     if (Number.isSafeInteger(parsed.ptyRows) && parsed.ptyRows > 0) {
         options.ptyRows = parsed.ptyRows;
     }
+    if (parsed.ptyLaunchMarkerToken === null || typeof parsed.ptyLaunchMarkerToken === "string") {
+        options.ptyLaunchMarkerToken = parsed.ptyLaunchMarkerToken;
+    }
+    if (typeof parsed.providerCliActive === "boolean")
+        options.providerCliActive = parsed.providerCliActive;
+    if (parsed.providerCliExitCode === null || Number.isSafeInteger(parsed.providerCliExitCode)) {
+        options.providerCliExitCode = parsed.providerCliExitCode;
+    }
     if (typeof parsed.currentTaskTitle === "string")
         options.currentTaskTitle = parsed.currentTaskTitle;
     if (typeof parsed.summary === "string")
@@ -243,11 +254,11 @@ function mapWorktreeMergeFields(row) {
     };
 }
 function sessionSelectFields() {
-    return `id, session_source, automation_id, provider, session_kind, runner, command, cwd, mode, status, exit_code, started_at, ended_at, output, archived, archived_at, claude_session_id, messages, queued_messages, queued_message_skills, structured_state
+    return `id, session_source, automation_id, provider, session_kind, runner, command, cwd, mode, status, exit_code, started_at, ended_at, output, pty_output_seq, archived, archived_at, claude_session_id, messages, queued_messages, queued_message_skills, structured_state
              , resumed_from_session_id, auto_recovered, worktree_enabled, worktree_info, worktree_merge_status, worktree_merge_info, title, description, session_options`;
 }
 function sessionPersistFields() {
-    return `id, session_source, automation_id, command, cwd, mode, status, exit_code, started_at, ended_at, output
+    return `id, session_source, automation_id, command, cwd, mode, status, exit_code, started_at, ended_at, output, pty_output_seq
              , archived, archived_at, claude_session_id, provider, session_kind, runner, messages, queued_messages, queued_message_skills, structured_state
              , resumed_from_session_id, auto_recovered, worktree_enabled, worktree_info, worktree_merge_status, worktree_merge_info, title, description, session_options`;
 }
@@ -262,6 +273,7 @@ function sessionPersistAssignments() {
              started_at = excluded.started_at,
              ended_at = excluded.ended_at,
              output = excluded.output,
+             pty_output_seq = excluded.pty_output_seq,
              archived = excluded.archived,
              archived_at = excluded.archived_at,
              claude_session_id = excluded.claude_session_id,
@@ -305,6 +317,7 @@ function sessionPersistValues(snapshot) {
         snapshot.startedAt,
         snapshot.endedAt,
         snapshot.output,
+        snapshot.ptyOutputSeq ?? 0,
         snapshot.archived ? 1 : 0,
         snapshot.archivedAt,
         snapshot.claudeSessionId,
@@ -377,6 +390,7 @@ function mapSessionCore(row) {
         startedAt: row.started_at,
         endedAt: row.ended_at,
         output: row.output,
+        ptyOutputSeq: row.pty_output_seq,
         archived: Boolean(row.archived),
         archivedAt: row.archived_at,
         claudeSessionId: row.claude_session_id,
@@ -424,6 +438,7 @@ const INIT_SQL = `
     started_at TEXT NOT NULL,
     ended_at TEXT,
     output TEXT NOT NULL,
+    pty_output_seq INTEGER NOT NULL DEFAULT 0,
     archived INTEGER NOT NULL DEFAULT 0,
     archived_at TEXT,
     claude_session_id TEXT,
@@ -939,7 +954,7 @@ export class WandStorage {
         this.db
             .prepare(`INSERT INTO command_sessions (
          ${sessionPersistFields()}
-         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
          ON CONFLICT(id) DO UPDATE SET
            ${sessionPersistAssignments()}`)
             .run(...sessionPersistValues(snapshot));
@@ -957,14 +972,19 @@ export class WandStorage {
         this.updateSessionRuntimeMetadata(snapshot);
     }
     /** Checkpoint only the PTY/structured text output window. */
-    checkpointSessionOutput(id, output) {
-        this.db.prepare("UPDATE command_sessions SET output = ? WHERE id = ?").run(output, id);
+    checkpointSessionOutput(id, output, ptyOutputSeq) {
+        if (ptyOutputSeq === undefined) {
+            this.db.prepare("UPDATE command_sessions SET output = ? WHERE id = ?").run(output, id);
+            return;
+        }
+        this.db.prepare("UPDATE command_sessions SET output = ?, pty_output_seq = ? WHERE id = ?")
+            .run(output, ptyOutputSeq, id);
     }
     /**
      * Checkpoint the conversation payload once, optionally folding the matching
      * structured state/output into the same statement.
      */
-    checkpointSessionMessages(id, messages, structuredState, output) {
+    checkpointSessionMessages(id, messages, structuredState, output, ptyOutputSeq) {
         const assignments = ["messages = ?"];
         const values = [JSON.stringify(messages)];
         if (structuredState !== undefined) {
@@ -975,6 +995,10 @@ export class WandStorage {
             assignments.push("output = ?");
             values.push(output);
         }
+        if (ptyOutputSeq !== undefined) {
+            assignments.push("pty_output_seq = ?");
+            values.push(ptyOutputSeq);
+        }
         this.db
             .prepare(`UPDATE command_sessions SET ${assignments.join(", ")} WHERE id = ?`)
             .run(...values, id);
@@ -1122,6 +1146,7 @@ const SCHEMA_MIGRATIONS = [
     ["worktree_merge_info", "ALTER TABLE command_sessions ADD COLUMN worktree_merge_info TEXT"],
     ["title", "ALTER TABLE command_sessions ADD COLUMN title TEXT"],
     ["description", "ALTER TABLE command_sessions ADD COLUMN description TEXT"],
+    ["pty_output_seq", "ALTER TABLE command_sessions ADD COLUMN pty_output_seq INTEGER NOT NULL DEFAULT 0"],
     ["session_options", `ALTER TABLE command_sessions ADD COLUMN session_options TEXT NOT NULL DEFAULT '{"schemaVersion":1}'`],
 ];
 const AUTH_SESSION_MIGRATIONS = [

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

@@ -0,0 +1,29 @@
+import { type TerminalDaemonRequest } from "./terminal-daemon-protocol.js";
+import { type TerminalAttachResult, type TerminalHost, type TerminalSpawnRequest } from "./terminal-host.js";
+export declare class TerminalDaemonClient implements TerminalHost {
+    private readonly socketPath;
+    private readonly token;
+    readonly persistent = true;
+    private socket;
+    private buffer;
+    private nextRequestId;
+    private readonly pending;
+    private readonly inventory;
+    private readonly handles;
+    private readonly pendingEvents;
+    constructor(socketPath: string, token: string);
+    connect(): Promise<void>;
+    attach(sessionId: string, afterSeq?: number): TerminalAttachResult | null;
+    createOrAttach(request: TerminalSpawnRequest, afterSeq?: number): Promise<TerminalAttachResult>;
+    forget(sessionId: string): void;
+    disconnect(): void;
+    request(method: TerminalDaemonRequest["method"], params?: Record<string, unknown>): Promise<unknown>;
+    reportOperationError(sessionId: string, error: unknown): void;
+    private resultFromState;
+    private consume;
+    private routeEvent;
+    private rejectPending;
+}
+export declare function createTerminalHost(configPath: string): Promise<TerminalHost>;
+/** Connect to an already-running terminal daemon without starting a replacement. */
+export declare function connectExistingTerminalHost(configPath: string): Promise<TerminalDaemonClient | null>;