@co0ontty/wand 0.3.0 → 0.4.0

package/dist/session-lifecycle.js

@@ -150,19 +150,24 @@ export class SessionLifecycleManager {
     checkSessions() {
         const now = Date.now();
         for (const [sessionId, lifecycle] of this.sessions) {
-            if (lifecycle.state === "archived") {
-                continue;
+            try {
+                if (lifecycle.state === "archived") {
+                    continue;
+                }
+                const timeSinceLastActivity = now - lifecycle.lastActivityAt;
+                // Check for archive timeout
+                if (timeSinceLastActivity > this.archiveTimeout) {
+                    this.archive(sessionId, "Session timed out", "timeout");
+                    continue;
+                }
+                // Check for idle timeout
+                if (timeSinceLastActivity > this.idleTimeout && lifecycle.state !== "idle") {
+                    this.setState(sessionId, "idle");
+                    this.events.onIdle?.(sessionId);
+                }
             }
-            const timeSinceLastActivity = now - lifecycle.lastActivityAt;
-            // Check for archive timeout
-            if (timeSinceLastActivity > this.archiveTimeout) {
-                this.archive(sessionId, "Session timed out", "timeout");
-                continue;
-            }
-            // Check for idle timeout
-            if (timeSinceLastActivity > this.idleTimeout && lifecycle.state !== "idle") {
-                this.setState(sessionId, "idle");
-                this.events.onIdle?.(sessionId);
+            catch (err) {
+                console.error(`[Lifecycle] Error checking session ${sessionId}: ${String(err)}`);
             }
         }
     }

package/dist/session-logger.d.ts

@@ -3,15 +3,23 @@ import type { ConversationTurn } from "./types.js";
  * SessionLogger saves raw session content to local files for debugging and analysis.
  *
  * Directory structure: .wand/sessions/{sessionId}/
- *   - pty-output.log     Raw PTY output (append-only)
- *   - stream-events.jsonl NDJSON events from native mode (append-only)
- *   - messages.json       Final structured messages (overwritten on each update)
+ *   - pty-output.log       Raw PTY output (current, rotated when > 50 MB)
+ *   - pty-output.log.1..3  Rotated PTY output backups
+ *   - stream-events.jsonl  NDJSON events from native mode (append-only)
+ *   - messages.json        Final structured messages (overwritten on each update)
  */
 export declare class SessionLogger {
     private readonly baseDir;
     private readonly dirs;
     constructor(configDir: string);
     private ensureDir;
+    /**
+     * Rotate PTY log files if the current one exceeds the size limit.
+     * pty-output.log.2 → pty-output.log.3 (deleted if at max)
+     * pty-output.log.1 → pty-output.log.2
+     * pty-output.log   → pty-output.log.1
+     */
+    private rotatePtyLog;
     /** Append raw PTY output chunk */
     appendPtyOutput(sessionId: string, chunk: string): void;
     /** Append a native mode NDJSON event */
@@ -20,4 +28,6 @@ export declare class SessionLogger {
     saveMessages(sessionId: string, messages: ConversationTurn[]): void;
     /** Save session metadata */
     saveMetadata(sessionId: string, meta: Record<string, unknown>): void;
+    /** Delete all log files for a session */
+    deleteSession(sessionId: string): void;
 }

package/dist/session-logger.js

@@ -1,13 +1,19 @@
-import { mkdirSync, appendFileSync, writeFileSync } from "node:fs";
+import { mkdirSync, rmSync, appendFileSync, writeFileSync, existsSync, statSync, renameSync, unlinkSync } from "node:fs";
 import path from "node:path";
 import process from "node:process";
+// ── Constants ──
+/** Max size for a single PTY log file before rotation (50 MB) */
+const PTY_LOG_MAX_SIZE = 50 * 1024 * 1024;
+/** Maximum number of rotated log files to keep */
+const PTY_LOG_MAX_ROTATIONS = 3;
 /**
  * SessionLogger saves raw session content to local files for debugging and analysis.
  *
  * Directory structure: .wand/sessions/{sessionId}/
- *   - pty-output.log     Raw PTY output (append-only)
- *   - stream-events.jsonl NDJSON events from native mode (append-only)
- *   - messages.json       Final structured messages (overwritten on each update)
+ *   - pty-output.log       Raw PTY output (current, rotated when > 50 MB)
+ *   - pty-output.log.1..3  Rotated PTY output backups
+ *   - stream-events.jsonl  NDJSON events from native mode (append-only)
+ *   - messages.json        Final structured messages (overwritten on each update)
  */
 export class SessionLogger {
     baseDir;
@@ -35,11 +41,45 @@ export class SessionLogger {
         this.dirs.set(sessionId, dir);
         return dir;
     }
+    /**
+     * Rotate PTY log files if the current one exceeds the size limit.
+     * pty-output.log.2 → pty-output.log.3 (deleted if at max)
+     * pty-output.log.1 → pty-output.log.2
+     * pty-output.log   → pty-output.log.1
+     */
+    rotatePtyLog(dir) {
+        // Delete oldest if it exists (beyond max rotations)
+        const oldest = path.join(dir, `pty-output.log.${PTY_LOG_MAX_ROTATIONS}`);
+        if (existsSync(oldest)) {
+            unlinkSync(oldest);
+        }
+        // Shift existing rotations up by one
+        for (let i = PTY_LOG_MAX_ROTATIONS - 1; i >= 1; i--) {
+            const src = path.join(dir, `pty-output.log.${i}`);
+            const dst = path.join(dir, `pty-output.log.${i + 1}`);
+            if (existsSync(src)) {
+                renameSync(src, dst);
+            }
+        }
+        // Rotate current to .1
+        const current = path.join(dir, "pty-output.log");
+        if (existsSync(current)) {
+            renameSync(current, path.join(dir, "pty-output.log.1"));
+        }
+    }
     /** Append raw PTY output chunk */
     appendPtyOutput(sessionId, chunk) {
         try {
             const dir = this.ensureDir(sessionId);
-            appendFileSync(path.join(dir, "pty-output.log"), chunk);
+            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);
+                }
+            }
+            appendFileSync(logPath, chunk);
         }
         catch {
             // Non-critical — don't let logging failures affect main flow
@@ -75,4 +115,15 @@ export class SessionLogger {
             // Non-critical
         }
     }
+    /** Delete all log files for a session */
+    deleteSession(sessionId) {
+        const dir = path.join(this.baseDir, sessionId);
+        try {
+            rmSync(dir, { recursive: true, force: true });
+        }
+        catch {
+            // Non-critical
+        }
+        this.dirs.delete(sessionId);
+    }
 }

package/dist/storage.d.ts

@@ -27,6 +27,15 @@ export declare class WandStorage {
     deleteAuthSession(token: string): void;
     deleteExpiredAuthSessions(now: number): void;
     saveSession(snapshot: SessionSnapshot): void;
+    /**
+     * Lightweight update — only touches scalar session fields, skips messages.
+     * Use this in the hot persist path to avoid serializing large message arrays.
+     * Full messages are written by saveSession() at state transitions (exit/stop).
+     */
+    saveSessionMetadata(snapshot: SessionSnapshot): void;
+    getSession(id: string): SessionSnapshot | null;
+    getLatestSessionByClaudeSessionId(claudeSessionId: string): SessionSnapshot | null;
     loadSessions(): SessionSnapshot[];
+    private mapSessionRow;
     deleteSession(id: string): void;
 }

package/dist/storage.js

@@ -124,9 +124,10 @@ export class WandStorage {
         try {
             this.db
                 .prepare(`INSERT INTO command_sessions (
-             id, command, cwd, mode, status, exit_code, started_at, ended_at, output
+           id, command, cwd, mode, status, exit_code, started_at, ended_at, output
              , archived, archived_at, claude_session_id, messages
-           ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+             , resumed_from_session_id, resumed_to_session_id, auto_recovered
+           ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
            ON CONFLICT(id) DO UPDATE SET
              command = excluded.command,
              cwd = excluded.cwd,
@@ -139,8 +140,11 @@ export class WandStorage {
              archived = excluded.archived,
              archived_at = excluded.archived_at,
              claude_session_id = excluded.claude_session_id,
-             messages = excluded.messages`)
-                .run(snapshot.id, snapshot.command, snapshot.cwd, snapshot.mode, snapshot.status, snapshot.exitCode, snapshot.startedAt, snapshot.endedAt, snapshot.output, snapshot.archived ? 1 : 0, snapshot.archivedAt, snapshot.claudeSessionId, snapshot.messages ? JSON.stringify(snapshot.messages) : null);
+             messages = excluded.messages,
+             resumed_from_session_id = excluded.resumed_from_session_id,
+             resumed_to_session_id = excluded.resumed_to_session_id,
+             auto_recovered = excluded.auto_recovered`)
+                .run(snapshot.id, snapshot.command, snapshot.cwd, snapshot.mode, snapshot.status, snapshot.exitCode, snapshot.startedAt, snapshot.endedAt, snapshot.output, snapshot.archived ? 1 : 0, snapshot.archivedAt, snapshot.claudeSessionId, snapshot.messages ? JSON.stringify(snapshot.messages) : null, snapshot.resumedFromSessionId ?? null, snapshot.resumedToSessionId ?? null, snapshot.autoRecovered ? 1 : 0);
             this.db.exec("COMMIT");
         }
         catch (error) {
@@ -148,13 +152,52 @@ export class WandStorage {
             throw error;
         }
     }
+    /**
+     * Lightweight update — only touches scalar session fields, skips messages.
+     * Use this in the hot persist path to avoid serializing large message arrays.
+     * Full messages are written by saveSession() at state transitions (exit/stop).
+     */
+    saveSessionMetadata(snapshot) {
+        this.db
+            .prepare(`UPDATE command_sessions SET
+           command = ?, cwd = ?, mode = ?, status = ?, exit_code = ?,
+           started_at = ?, ended_at = ?, output = ?,
+           archived = ?, archived_at = ?, claude_session_id = ?,
+           resumed_from_session_id = ?, resumed_to_session_id = ?, auto_recovered = ?
+         WHERE id = ?`)
+            .run(snapshot.command, snapshot.cwd, snapshot.mode, snapshot.status, snapshot.exitCode, snapshot.startedAt, snapshot.endedAt, snapshot.output, snapshot.archived ? 1 : 0, snapshot.archivedAt, snapshot.claudeSessionId, snapshot.resumedFromSessionId ?? null, snapshot.resumedToSessionId ?? null, snapshot.autoRecovered ? 1 : 0, snapshot.id);
+    }
+    getSession(id) {
+        const row = this.db
+            .prepare(`SELECT id, command, cwd, mode, status, exit_code, started_at, ended_at, output, archived, archived_at, claude_session_id, messages
+             , resumed_from_session_id, resumed_to_session_id, auto_recovered
+         FROM command_sessions
+         WHERE id = ?`)
+            .get(id);
+        return row ? this.mapSessionRow(row) : null;
+    }
+    getLatestSessionByClaudeSessionId(claudeSessionId) {
+        const row = this.db
+            .prepare(`SELECT id, command, cwd, mode, status, exit_code, started_at, ended_at, output, archived, archived_at, claude_session_id, messages
+             , resumed_from_session_id, resumed_to_session_id, auto_recovered
+         FROM command_sessions
+         WHERE claude_session_id = ?
+         ORDER BY started_at DESC
+         LIMIT 1`)
+            .get(claudeSessionId);
+        return row ? this.mapSessionRow(row) : null;
+    }
     loadSessions() {
         const rows = this.db
             .prepare(`SELECT id, command, cwd, mode, status, exit_code, started_at, ended_at, output, archived, archived_at, claude_session_id, messages
+             , resumed_from_session_id, resumed_to_session_id, auto_recovered
          FROM command_sessions
          ORDER BY started_at DESC`)
             .all();
-        return rows.map((row) => ({
+        return rows.map((row) => this.mapSessionRow(row));
+    }
+    mapSessionRow(row) {
+        return {
             id: row.id,
             command: row.command,
             cwd: row.cwd,
@@ -167,8 +210,11 @@ export class WandStorage {
             archived: Boolean(row.archived),
             archivedAt: row.archived_at,
             claudeSessionId: row.claude_session_id,
-            messages: parseStoredMessages(row.messages)
-        }));
+            messages: parseStoredMessages(row.messages),
+            resumedFromSessionId: row.resumed_from_session_id ?? undefined,
+            resumedToSessionId: row.resumed_to_session_id ?? undefined,
+            autoRecovered: Boolean(row.auto_recovered)
+        };
     }
     deleteSession(id) {
         this.db.prepare("DELETE FROM command_sessions WHERE id = ?").run(id);
@@ -189,4 +235,13 @@ function ensureCommandSessionSchema(db) {
     if (!names.has("messages")) {
         db.exec("ALTER TABLE command_sessions ADD COLUMN messages TEXT");
     }
+    if (!names.has("resumed_from_session_id")) {
+        db.exec("ALTER TABLE command_sessions ADD COLUMN resumed_from_session_id TEXT");
+    }
+    if (!names.has("resumed_to_session_id")) {
+        db.exec("ALTER TABLE command_sessions ADD COLUMN resumed_to_session_id TEXT");
+    }
+    if (!names.has("auto_recovered")) {
+        db.exec("ALTER TABLE command_sessions ADD COLUMN auto_recovered INTEGER NOT NULL DEFAULT 0");
+    }
 }

package/dist/types.d.ts

@@ -31,7 +31,7 @@ export interface CommandPreset {
 export interface WandConfig {
     host: string;
     port: number;
-    /** Enable HTTPS with self-signed certificate (default: true) */
+    /** Enable HTTPS with self-signed certificate (default: false) */
     https?: boolean;
     password: string;
     defaultMode: ExecutionMode;
@@ -147,7 +147,13 @@ export interface SessionSnapshot {
     /** Session lifecycle state */
     lifecycleState?: "running" | "idle" | "archived";
     /** Last activity timestamp */
-    lastActivityAt?: string;
+    lastActivityAt?: string | null;
+    /** 此会话是从哪个 Wand 会话恢复而来 */
+    resumedFromSessionId?: string | null;
+    /** 此会话被哪个恢复后的会话替代 */
+    resumedToSessionId?: string | null;
+    /** 服务器重启时是否自动恢复 */
+    autoRecovered?: boolean;
 }
 export type SessionLifecycleState = "initializing" | "running" | "idle" | "thinking" | "waiting-input" | "archived";
 export interface SessionLifecycle {