@co0ontty/wand 1.21.4 → 1.21.5

package/dist/claude-pty-bridge.d.ts

@@ -177,16 +177,11 @@ export declare class ClaudePtyBridge extends EventEmitter {
     private finalizeResponse;
     /**
      * Find the end index of the echoed user input in the PTY buffer.
-     * The echo may contain ANSI codes between characters.
-     * Returns the index after the last character of the echo.
+     * Returns 0 if the echo cannot be fully matched.
      *
-     * Matching strategy:
-     * - Keep every printable codepoint of `userInput` (anything that is not a
-     *   control char or whitespace) for comparison. The previous version dropped
-     *   common symbols like `/`, `(`, `:`, space — which made commands such as
-     *   `ls /tmp` mismatch and start parsing the chat response from a wrong offset.
-     * - In the buffer, skip ANSI escape sequences entirely, and skip whitespace
-     *   so wrapped echoes (line continuation, padded columns) still align.
+     * Why: ANSI escapes and whitespace can interleave the echoed characters
+     * (line wrapping, padding, color codes), so matching skips them while
+     * comparing every printable codepoint of `userInput` in order.
      */
     private findEchoEndIndex;
     private cleanForChat;

package/dist/claude-pty-bridge.js

@@ -7,14 +7,9 @@
  * 2. Structured messages for chat view (parsed)
  */
 import { EventEmitter } from "node:events";
-import { stripAnsi, isNoiseLine, appendWindow, normalizePromptText, hasExplicitConfirmSyntax, hasPermissionActionContext, scorePermissionLikelihood, FALLBACK_SCORE_THRESHOLD, isSlashCommandMenu, stripForEchoMatch, skipAnsiSequence } from "./pty-text-utils.js";
+import { stripAnsi, isNoiseLine, appendWindow, normalizePromptText, hasExplicitConfirmSyntax, hasPermissionActionContext, scorePermissionLikelihood, FALLBACK_SCORE_THRESHOLD, isSlashCommandMenu, stripForEchoMatch, skipAnsiSequence, PTY_OUTPUT_MAX_SIZE } from "./pty-text-utils.js";
 // ── Constants ──
-/**
- * Hard cap on the in-memory PTY replay buffer. Aligned with the non-bridge
- * branch of `ProcessManager.start()` so a session keeps the same amount of
- * history regardless of which capture path is active.
- */
-const OUTPUT_MAX_SIZE = 200000;
+const OUTPUT_MAX_SIZE = PTY_OUTPUT_MAX_SIZE;
 const SESSION_ID_WINDOW_SIZE = 16384;
 const PERMISSION_WINDOW_SIZE = 2000;
 const AUTO_APPROVE_DELAY_MS = 350;
@@ -835,16 +830,11 @@ export class ClaudePtyBridge extends EventEmitter {
     // ── Text Processing Utilities ──
     /**
      * Find the end index of the echoed user input in the PTY buffer.
-     * The echo may contain ANSI codes between characters.
-     * Returns the index after the last character of the echo.
+     * Returns 0 if the echo cannot be fully matched.
      *
-     * Matching strategy:
-     * - Keep every printable codepoint of `userInput` (anything that is not a
-     *   control char or whitespace) for comparison. The previous version dropped
-     *   common symbols like `/`, `(`, `:`, space — which made commands such as
-     *   `ls /tmp` mismatch and start parsing the chat response from a wrong offset.
-     * - In the buffer, skip ANSI escape sequences entirely, and skip whitespace
-     *   so wrapped echoes (line continuation, padded columns) still align.
+     * Why: ANSI escapes and whitespace can interleave the echoed characters
+     * (line wrapping, padding, color codes), so matching skips them while
+     * comparing every printable codepoint of `userInput` in order.
      */
     findEchoEndIndex(buffer, userInput) {
         const inputChars = stripForEchoMatch(userInput);

package/dist/config.js

@@ -20,6 +20,7 @@ export const defaultConfig = () => ({
     android: defaultAndroidApkConfig(),
     cardDefaults: defaultCardExpandDefaults(),
     defaultModel: "",
+    structuredRunner: "cli",
     commandPresets: [
         {
             label: "Claude",
@@ -185,6 +186,7 @@ function mergeWithDefaults(input) {
         android: normalizeAndroidApkConfig(input.android) ?? defaults.android,
         cardDefaults: normalizeCardDefaults(input.cardDefaults),
         defaultModel: typeof input.defaultModel === "string" ? input.defaultModel.trim() : defaults.defaultModel,
+        structuredRunner: (input.structuredRunner === "sdk" || input.structuredRunner === "cli") ? input.structuredRunner : defaults.structuredRunner,
     };
 }
 export function isExecutionMode(value) {

package/dist/process-manager.js

@@ -8,7 +8,7 @@ import pty from "node-pty";
 import { SessionLogger } from "./session-logger.js";
 import { ClaudePtyBridge } from "./claude-pty-bridge.js";
 import { truncateMessagesForTransport } from "./message-truncator.js";
-import { appendWindow, hasExplicitConfirmSyntax, hasPermissionActionContext, normalizePromptText } from "./pty-text-utils.js";
+import { appendWindow, hasExplicitConfirmSyntax, hasPermissionActionContext, normalizePromptText, PTY_OUTPUT_MAX_SIZE } from "./pty-text-utils.js";
 import { prepareSessionWorktree } from "./git-worktree.js";
 import { getResumeCommandSessionId } from "./resume-policy.js";
 function resolveProviderFromCommand(command) {
@@ -744,7 +744,7 @@ export class ProcessManager extends EventEmitter {
                 rec.output = rec.ptyBridge.getRawOutput();
             }
             else {
-                rec.output = appendWindow(rec.output, chunk, 200_000);
+                rec.output = appendWindow(rec.output, chunk, PTY_OUTPUT_MAX_SIZE);
             }
             this.logger.appendPtyOutput(id, chunk);
             if (!rec.ptyBridge) {

package/dist/pty-text-utils.d.ts

@@ -1,6 +1,12 @@
 /**
  * Shared PTY text processing utilities for consistent ANSI stripping and noise filtering.
  */
+/**
+ * Hard cap on the in-memory PTY replay buffer. Shared between ProcessManager
+ * and ClaudePtyBridge so a session keeps the same amount of history regardless
+ * of which capture path is active.
+ */
+export declare const PTY_OUTPUT_MAX_SIZE = 200000;
 /** Strip ANSI escape sequences and control characters from raw PTY output. */
 export declare function stripAnsi(text: string): string;
 /** Lines considered as UI noise that should be excluded from chat view. */

package/dist/pty-text-utils.js

@@ -1,6 +1,12 @@
 /**
  * Shared PTY text processing utilities for consistent ANSI stripping and noise filtering.
  */
+/**
+ * Hard cap on the in-memory PTY replay buffer. Shared between ProcessManager
+ * and ClaudePtyBridge so a session keeps the same amount of history regardless
+ * of which capture path is active.
+ */
+export const PTY_OUTPUT_MAX_SIZE = 200_000;
 /** Strip ANSI escape sequences and control characters from raw PTY output. */
 export function stripAnsi(text) {
     return text

package/dist/server-session-routes.js

@@ -207,13 +207,19 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     app.post("/api/structured-sessions/:id/messages", express.json(), async (req, res) => {
         const input = String(req.body?.input ?? "");
         const interrupt = !!req.body?.interrupt;
-        console.log("[WAND] POST /api/structured-sessions/:id/messages id:", req.params.id, "input:", input.substring(0, 50), "interrupt:", interrupt);
+        const idempotencyKey = typeof req.body?.idempotencyKey === "string" ? req.body.idempotencyKey : undefined;
+        console.log("[WAND] POST /api/structured-sessions/:id/messages id:", req.params.id, "input:", input.substring(0, 50), "interrupt:", interrupt, "idempotencyKey:", idempotencyKey);
         try {
-            const snapshot = await structured.sendMessage(req.params.id, input, { interrupt });
+            const snapshot = await structured.sendMessage(req.params.id, input, { interrupt, idempotencyKey });
             res.json(snapshot);
         }
         catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法发送结构化消息。") });
+            const errorCode = error?.code;
+            const status = errorCode === "duplicate_idempotency_key" ? 409 : 400;
+            res.status(status).json({
+                error: getErrorMessage(error, "无法发送结构化消息。"),
+                errorCode,
+            });
         }
     });
     // ── Tool content lazy-load endpoint ──

package/dist/server.js

@@ -724,6 +724,7 @@ export async function startServer(config, configPath) {
             defaultMode: config.defaultMode,
             defaultCwd: config.defaultCwd,
             commandPresets: config.commandPresets,
+            structuredRunner: config.structuredRunner ?? "cli",
             structuredRunners: [
                 { label: "Claude Structured", runner: "claude-cli-print" },
                 { label: "Codex Structured", runner: "codex-cli-exec" },
@@ -815,7 +816,7 @@ export async function startServer(config, configPath) {
     });
     app.post("/api/settings/config", async (req, res) => {
         const body = req.body;
-        const allowedFields = ["host", "port", "https", "defaultMode", "defaultCwd", "shell", "language", "defaultModel"];
+        const allowedFields = ["host", "port", "https", "defaultMode", "defaultCwd", "shell", "language", "defaultModel", "structuredRunner"];
         let changed = false;
         for (const field of allowedFields) {
             if (field in body && body[field] !== undefined) {
@@ -852,6 +853,9 @@ export async function startServer(config, configPath) {
                 else if (field === "defaultModel") {
                     config.defaultModel = typeof body.defaultModel === "string" ? body.defaultModel.trim() : "";
                 }
+                else if (field === "structuredRunner") {
+                    config.structuredRunner = body.structuredRunner === "sdk" ? "sdk" : "cli";
+                }
                 changed = true;
             }
         }

package/dist/session-logger.d.ts

@@ -35,6 +35,8 @@ export interface ShortcutLogContext {
 export declare class SessionLogger {
     private readonly baseDir;
     private readonly dirs;
+    /** Cached on-disk size of hot-path log files so we can rotate without stat'ing on every chunk. */
+    private readonly logSizes;
     private readonly shortcutLogMaxBytes;
     constructor(configDir: string, shortcutLogMaxBytes?: number);
     private ensureDir;
@@ -67,6 +69,6 @@ export declare class SessionLogger {
     deleteSession(sessionId: string): void;
     /** Append a shortcut key interaction log entry (for analyzing auto-confirm gaps) */
     appendShortcutLog(sessionId: string, shortcutKey: string, tailLines: string, ctx?: ShortcutLogContext): void;
-    /** Truncate shortcut log by keeping only the most recent half of entries */
+    /** Truncate shortcut log by keeping only the most recent half of entries. Returns the new on-disk size. */
     private truncateShortcutLog;
 }

package/dist/session-logger.js

@@ -23,6 +23,8 @@ const DEFAULT_SHORTCUT_LOG_MAX_BYTES = 10 * 1024 * 1024;
 export class SessionLogger {
     baseDir;
     dirs = new Map();
+    /** Cached on-disk size of hot-path log files so we can rotate without stat'ing on every chunk. */
+    logSizes = new Map();
     shortcutLogMaxBytes;
     constructor(configDir, shortcutLogMaxBytes) {
         this.baseDir = path.join(configDir, "sessions");
@@ -46,6 +48,10 @@ export class SessionLogger {
             // ignore
         }
         this.dirs.set(sessionId, dir);
+        // Seed the size cache from disk on first use; subsequent appends maintain
+        // the counter in memory so the hot path no longer touches stat/exists.
+        const sizes = { pty: tryStatSize(path.join(dir, "pty-output.log")), shortcut: tryStatSize(path.join(dir, "shortcut-interactions.jsonl")) };
+        this.logSizes.set(sessionId, sizes);
         return dir;
     }
     /**
@@ -78,15 +84,14 @@ export class SessionLogger {
     appendPtyOutput(sessionId, chunk) {
         try {
             const dir = this.ensureDir(sessionId);
-            const logPath = path.join(dir, "pty-output.log");
-            // Check size and rotate if needed
-            if (existsSync(logPath)) {
-                const stats = statSync(logPath);
-                if (stats.size >= PTY_LOG_MAX_SIZE) {
-                    this.rotatePtyLog(dir);
-                }
+            const sizes = this.logSizes.get(sessionId);
+            if (sizes.pty >= PTY_LOG_MAX_SIZE) {
+                this.rotatePtyLog(dir);
+                sizes.pty = 0;
             }
+            const logPath = path.join(dir, "pty-output.log");
             appendFileSync(logPath, chunk);
+            sizes.pty += Buffer.byteLength(chunk);
         }
         catch {
             // Non-critical — don't let logging failures affect main flow
@@ -200,6 +205,7 @@ export class SessionLogger {
             // Non-critical
         }
         this.dirs.delete(sessionId);
+        this.logSizes.delete(sessionId);
     }
     /** Append a shortcut key interaction log entry (for analyzing auto-confirm gaps) */
     appendShortcutLog(sessionId, shortcutKey, tailLines, ctx) {
@@ -207,6 +213,7 @@ export class SessionLogger {
             return;
         try {
             const dir = this.ensureDir(sessionId);
+            const sizes = this.logSizes.get(sessionId);
             const logPath = path.join(dir, "shortcut-interactions.jsonl");
             const entry = JSON.stringify({
                 ts: new Date().toISOString(),
@@ -217,35 +224,41 @@ export class SessionLogger {
                 input: ctx?.input,
                 tail: tailLines,
             }) + "\n";
-            // Check size and truncate if needed
-            if (existsSync(logPath)) {
-                const size = statSync(logPath).size;
-                if (size + entry.length > this.shortcutLogMaxBytes) {
-                    this.truncateShortcutLog(logPath);
-                }
+            const entryBytes = Buffer.byteLength(entry);
+            if (sizes.shortcut + entryBytes > this.shortcutLogMaxBytes) {
+                sizes.shortcut = this.truncateShortcutLog(logPath);
             }
             appendFileSync(logPath, entry);
+            sizes.shortcut += entryBytes;
         }
         catch {
             // Non-critical
         }
     }
-    /** Truncate shortcut log by keeping only the most recent half of entries */
+    /** Truncate shortcut log by keeping only the most recent half of entries. Returns the new on-disk size. */
     truncateShortcutLog(logPath) {
         try {
             const content = readFileSync(logPath, "utf8");
             const lines = content.split("\n").filter(Boolean);
-            // Keep the latter half
             const keepFrom = Math.floor(lines.length / 2);
             const trimmed = lines.slice(keepFrom).join("\n") + "\n";
             writeFileSync(logPath, trimmed);
+            return Buffer.byteLength(trimmed);
         }
         catch {
-            // If truncation fails, delete the file to prevent unbounded growth
             try {
                 unlinkSync(logPath);
             }
             catch { /* ignore */ }
+            return 0;
         }
     }
 }
+function tryStatSize(filePath) {
+    try {
+        return existsSync(filePath) ? statSync(filePath).size : 0;
+    }
+    catch {
+        return 0;
+    }
+}

package/dist/structured-session-manager.d.ts

@@ -17,12 +17,30 @@ export declare class StructuredSessionManager {
     private readonly logger;
     private readonly sessions;
     private readonly pendingChildren;
+    private readonly pendingSdkAbort;
     private readonly interruptedWith;
+    /** Last wall-clock time (ms) we did a full saveSession for a streaming session. */
+    private readonly lastStreamSaveAt;
+    /**
+     * Idempotency keys we've already accepted, mapped to their wall-clock timestamp.
+     * Android WebView 在进程恢复时偶尔会重发上一个未收到响应的 POST（HTTP/2 stream
+     * reset 等场景），客户端 JS 没有重试逻辑也拦不住。这里用 (sessionId, key) 永
+     * 久去重，重复就抛错让前端弹 toast 提示，**不**做任何处理。timestamp 仅用于
+     * map 大小溢出时按时间裁剪。
+     */
+    private readonly seenIdempotencyKeys;
     private emitEvent;
     private archiveTimer;
     constructor(storage: WandStorage, config: WandConfig, logger?: SessionLogger | null);
     private archiveExpiredSessions;
     setEventEmitter(emitEvent: (event: ProcessEvent) => void): void;
+    /**
+     * In-memory snapshot is updated unconditionally; the SQLite write is rate-
+     * limited to once per STREAM_SAVE_THROTTLE_MS. Caller must still invoke
+     * `storage.saveSession` directly at terminal events (close / failure) so the
+     * final state is durable.
+     */
+    private saveStreamingSnapshot;
     list(): SessionSnapshot[];
     /** Return lightweight snapshots for the session list (no output/messages). */
     listSlim(): SessionSnapshot[];
@@ -30,6 +48,7 @@ export declare class StructuredSessionManager {
     createSession(options: CreateStructuredSessionOptions): SessionSnapshot;
     sendMessage(id: string, input: string, opts?: {
         interrupt?: boolean;
+        idempotencyKey?: string;
     }): Promise<SessionSnapshot>;
     /** Approve a pending permission request. */
     approvePermission(sessionId: string): SessionSnapshot;
@@ -66,6 +85,18 @@ export declare class StructuredSessionManager {
      *   outside CWD). stdin is always "ignore" — no ACP bidirectional control.
      */
     private runClaudeStreaming;
+    /**
+     * Use @anthropic-ai/claude-agent-sdk instead of spawning claude -p directly.
+     * The SDK still spawns the claude binary but provides typed AsyncGenerator<SDKMessage>
+     * messages, so we skip NDJSON parsing. Options are 1:1 with the CLI flags.
+     *
+     * Streaming is enabled via includePartialMessages: true — the SDK emits
+     * SDKPartialAssistantMessage (type: "stream_event") with BetaRawMessageStreamEvent
+     * payloads for incremental text/thinking/tool_use updates, followed by a final
+     * SDKAssistantMessage with the authoritative complete content.
+     */
+    private runClaudeSdkStreaming;
+    private _runClaudeSdkStreamingAsync;
     private extractAssistantMessage;
     private compactContentBlocks;
     private normalizeToolInput;
@@ -76,6 +107,8 @@ export declare class StructuredSessionManager {
     private finishStructuredFailure;
     private extractModelName;
     private extractUsage;
+    /** Extract usage from an SDKResultSuccess message (sdk runner). */
+    private extractSdkUsage;
     private extractCodexUsage;
 }
 export {};