@co0ontty/wand 1.21.4 → 1.21.7

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/storage.d.ts

@@ -16,6 +16,12 @@ export declare class WandStorage {
     setConfigValue(key: string, value: string): void;
     /** Delete a config value */
     deleteConfigValue(key: string): void;
+    /** 读取偏好。未设置或 JSON 解析失败时返回 fallback。 */
+    getPreference<T>(key: string, fallback: T): T;
+    /** 写入偏好。undefined / null 视为删除。 */
+    setPreference<T>(key: string, value: T | null | undefined): void;
+    /** 判断偏好是否在 DB 中存在（区别于值为 null/false/""）。 */
+    hasPreference(key: string): boolean;
     /** Get password from database */
     getPassword(): string | null;
     /** Set password in database */

package/dist/storage.js

@@ -261,6 +261,35 @@ export class WandStorage {
     deleteConfigValue(key) {
         this.db.prepare("DELETE FROM app_config WHERE key = ?").run(key);
     }
+    // ============ Preference Methods ============
+    // Preferences 与 getConfigValue/setConfigValue 共用 app_config 表，
+    // 区别在于：preference 自动 JSON 序列化/反序列化，并按"未设置时返回 fallback"语义返回。
+    // 用于存放 UI 设置面板可改的用户偏好（defaultMode/defaultModel/cardDefaults 等），
+    // 与 JSON 配置中的部署期参数（host/port/shell 等）分开。
+    /** 读取偏好。未设置或 JSON 解析失败时返回 fallback。 */
+    getPreference(key, fallback) {
+        const raw = this.getConfigValue(key);
+        if (raw === null)
+            return fallback;
+        try {
+            return JSON.parse(raw);
+        }
+        catch {
+            return fallback;
+        }
+    }
+    /** 写入偏好。undefined / null 视为删除。 */
+    setPreference(key, value) {
+        if (value === undefined || value === null) {
+            this.deleteConfigValue(key);
+            return;
+        }
+        this.setConfigValue(key, JSON.stringify(value));
+    }
+    /** 判断偏好是否在 DB 中存在（区别于值为 null/false/""）。 */
+    hasPreference(key) {
+        return this.getConfigValue(key) !== null;
+    }
     /** Get password from database */
     getPassword() {
         return this.getConfigValue("password");

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 {};