@sna-sdk/core 0.4.0 → 0.5.0

package/README.md

@@ -9,6 +9,7 @@ Server runtime for [Skills-Native Applications](https://github.com/neuradex/sna)
 - **SQLite database** — schema and `getDb()` for `skill_events`, `chat_sessions`, `chat_messages`
 - **Hono server factory** — `createSnaApp()` with events, emit, agent, chat, and run routes
 - **WebSocket API** — `attachWebSocket()` wrapping all HTTP routes over a single WS connection
+- **History management** — `agent.resume` auto-loads DB history, `agent.subscribe({ since: 0 })` unified history+realtime channel
 - **One-shot execution** — `POST /agent/run-once` for single-request LLM calls
 - **CLI** — `sna up/down/status`, `sna dispatch`, `sna gen client`, `sna tu` (mock API testing)
 - **Agent providers** — Claude Code and Codex process management

package/dist/core/providers/claude-code.js

@@ -88,6 +88,36 @@ class ClaudeCodeProcess {
       this.send(options.prompt);
     }
   }
+  /**
+   * Split completed assistant text into chunks and emit assistant_delta events
+   * at a fixed rate (~270 chars/sec), followed by the final assistant event.
+   *
+   * CHUNK_SIZE chars every CHUNK_DELAY_MS → natural TPS feel regardless of length.
+   */
+  emitTextAsDeltas(text) {
+    const CHUNK_SIZE = 4;
+    const CHUNK_DELAY_MS = 15;
+    let t = 0;
+    for (let i = 0; i < text.length; i += CHUNK_SIZE) {
+      const chunk = text.slice(i, i + CHUNK_SIZE);
+      setTimeout(() => {
+        this.emitter.emit("event", {
+          type: "assistant_delta",
+          delta: chunk,
+          index: 0,
+          timestamp: Date.now()
+        });
+      }, t);
+      t += CHUNK_DELAY_MS;
+    }
+    setTimeout(() => {
+      this.emitter.emit("event", {
+        type: "assistant",
+        message: text,
+        timestamp: Date.now()
+      });
+    }, t);
+  }
   get alive() {
     return this._alive;
   }
@@ -163,6 +193,7 @@ class ClaudeCodeProcess {
         const content = msg.message?.content;
         if (!Array.isArray(content)) return null;
         const events = [];
+        const textBlocks = [];
         for (const block of content) {
           if (block.type === "thinking") {
             events.push({
@@ -180,15 +211,17 @@ class ClaudeCodeProcess {
           } else if (block.type === "text") {
             const text = (block.text ?? "").trim();
             if (text) {
-              events.push({ type: "assistant", message: text, timestamp: Date.now() });
+              textBlocks.push(text);
             }
           }
         }
-        if (events.length > 0) {
-          for (let i = 1; i < events.length; i++) {
-            this.emitter.emit("event", events[i]);
+        if (events.length > 0 || textBlocks.length > 0) {
+          for (const e of events) {
+            this.emitter.emit("event", e);
+          }
+          for (const text of textBlocks) {
+            this.emitTextAsDeltas(text);
           }
-          return events[0];
         }
         return null;
       }

package/dist/core/providers/types.d.ts

@@ -5,9 +5,13 @@
  * Codex JSONL, etc.) into these common types.
  */
 interface AgentEvent {
-    type: "init" | "thinking" | "text_delta" | "assistant" | "tool_use" | "tool_result" | "permission_needed" | "milestone" | "interrupted" | "error" | "complete";
+    type: "init" | "thinking" | "text_delta" | "assistant_delta" | "assistant" | "tool_use" | "tool_result" | "permission_needed" | "milestone" | "user_message" | "interrupted" | "error" | "complete";
     message?: string;
     data?: Record<string, unknown>;
+    /** Streaming text delta (for assistant_delta events only) */
+    delta?: string;
+    /** Content block index (for assistant_delta events only) */
+    index?: number;
     timestamp: number;
 }
 /**

package/dist/server/api-types.d.ts

@@ -56,6 +56,12 @@ interface ApiResponses {
         sessionId: string | null;
         ccSessionId: string | null;
         eventCount: number;
+        messageCount: number;
+        lastMessage: {
+            role: string;
+            content: string;
+            created_at: string;
+        } | null;
         config: {
             provider: string;
             model: string;

package/dist/server/routes/agent.js

@@ -195,6 +195,12 @@ function createAgentRoutes(sessionManager) {
       db.prepare(`INSERT INTO chat_messages (session_id, role, content, meta) VALUES (?, 'user', ?, ?)`).run(sessionId, textContent, Object.keys(meta).length > 0 ? JSON.stringify(meta) : null);
     } catch {
     }
+    sessionManager.pushEvent(sessionId, {
+      type: "user_message",
+      message: textContent,
+      data: Object.keys(meta).length > 0 ? meta : void 0,
+      timestamp: Date.now()
+    });
     sessionManager.updateSessionState(sessionId, "processing");
     sessionManager.touch(sessionId);
     if (body.images?.length) {
@@ -217,32 +223,59 @@ function createAgentRoutes(sessionManager) {
     const sessionId = getSessionId(c);
     const session = sessionManager.getOrCreateSession(sessionId);
     const sinceParam = c.req.query("since");
-    let cursor = sinceParam ? parseInt(sinceParam, 10) : session.eventCounter;
+    const sinceCursor = sinceParam ? parseInt(sinceParam, 10) : session.eventCounter;
     return streamSSE(c, async (stream) => {
-      const POLL_MS = 300;
       const KEEPALIVE_MS = 15e3;
-      let lastSend = Date.now();
-      while (true) {
+      const signal = c.req.raw.signal;
+      const queue = [];
+      let wakeUp = null;
+      const unsub = sessionManager.onSessionEvent(sessionId, (eventCursor, event) => {
+        queue.push({ cursor: eventCursor, event });
+        const fn = wakeUp;
+        wakeUp = null;
+        fn?.();
+      });
+      signal.addEventListener("abort", () => {
+        const fn = wakeUp;
+        wakeUp = null;
+        fn?.();
+      });
+      try {
+        let cursor = sinceCursor;
         if (cursor < session.eventCounter) {
           const startIdx = Math.max(
             0,
             session.eventBuffer.length - (session.eventCounter - cursor)
           );
-          const newEvents = session.eventBuffer.slice(startIdx);
-          for (const event of newEvents) {
+          for (const event of session.eventBuffer.slice(startIdx)) {
             cursor++;
-            await stream.writeSSE({
-              id: String(cursor),
-              data: JSON.stringify(event)
-            });
-            lastSend = Date.now();
+            await stream.writeSSE({ id: String(cursor), data: JSON.stringify(event) });
           }
+        } else {
+          cursor = session.eventCounter;
         }
-        if (Date.now() - lastSend > KEEPALIVE_MS) {
-          await stream.writeSSE({ data: "" });
-          lastSend = Date.now();
+        while (queue.length > 0 && queue[0].cursor <= cursor) queue.shift();
+        while (!signal.aborted) {
+          if (queue.length === 0) {
+            await Promise.race([
+              new Promise((r) => {
+                wakeUp = r;
+              }),
+              new Promise((r) => setTimeout(r, KEEPALIVE_MS))
+            ]);
+          }
+          if (signal.aborted) break;
+          if (queue.length > 0) {
+            while (queue.length > 0) {
+              const item = queue.shift();
+              await stream.writeSSE({ id: String(item.cursor), data: JSON.stringify(item.event) });
+            }
+          } else {
+            await stream.writeSSE({ data: "" });
+          }
         }
-        await new Promise((r) => setTimeout(r, POLL_MS));
+      } finally {
+        unsub();
       }
     });
   });
@@ -341,12 +374,24 @@ function createAgentRoutes(sessionManager) {
     const sessionId = getSessionId(c);
     const session = sessionManager.getSession(sessionId);
     const alive = session?.process?.alive ?? false;
+    let messageCount = 0;
+    let lastMessage = null;
+    try {
+      const db = getDb();
+      const count = db.prepare("SELECT COUNT(*) as c FROM chat_messages WHERE session_id = ?").get(sessionId);
+      messageCount = count?.c ?? 0;
+      const last = db.prepare("SELECT role, content, created_at FROM chat_messages WHERE session_id = ? ORDER BY id DESC LIMIT 1").get(sessionId);
+      if (last) lastMessage = { role: last.role, content: last.content, created_at: last.created_at };
+    } catch {
+    }
     return httpJson(c, "agent.status", {
       alive,
       agentStatus: !alive ? "disconnected" : session?.state === "processing" ? "busy" : "idle",
       sessionId: session?.process?.sessionId ?? null,
       ccSessionId: session?.ccSessionId ?? null,
       eventCount: session?.eventCounter ?? 0,
+      messageCount,
+      lastMessage,
       config: session?.lastStartConfig ?? null
     });
   });

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

@@ -41,6 +41,12 @@ interface SessionInfo {
     config: StartConfig | null;
     ccSessionId: string | null;
     eventCount: number;
+    messageCount: number;
+    lastMessage: {
+        role: string;
+        content: string;
+        created_at: string;
+    } | null;
     createdAt: number;
     lastActivityAt: number;
 }
@@ -94,6 +100,8 @@ declare class SessionManager {
     onSkillEvent(cb: (event: Record<string, unknown>) => void): () => void;
     /** Broadcast a skill event to all subscribers (called after DB insert). */
     broadcastSkillEvent(event: Record<string, unknown>): void;
+    /** Push a synthetic event into a session's event stream (for user message broadcast). */
+    pushEvent(sessionId: string, event: AgentEvent): void;
     /** Subscribe to permission request notifications. Returns unsubscribe function. */
     onPermissionRequest(cb: (sessionId: string, request: Record<string, unknown>, createdAt: number) => void): () => void;
     /** Subscribe to session lifecycle events (started/killed/exited/crashed). Returns unsubscribe function. */
@@ -147,6 +155,7 @@ declare class SessionManager {
     /** Touch a session's lastActivityAt timestamp. */
     touch(id: string): void;
     /** Persist an agent event to chat_messages. */
+    private getMessageStats;
     private persistEvent;
     /** Kill all sessions. Used during shutdown. */
     killAll(): void;

package/dist/server/session-manager.js

@@ -135,11 +135,13 @@ class SessionManager {
         session.ccSessionId = e.data.sessionId;
         this.persistSession(session);
       }
-      session.eventBuffer.push(e);
-      session.eventCounter++;
-      if (session.eventBuffer.length > MAX_EVENT_BUFFER) {
-        session.eventBuffer.splice(0, session.eventBuffer.length - MAX_EVENT_BUFFER);
+      if (e.type !== "assistant_delta") {
+        session.eventBuffer.push(e);
+        if (session.eventBuffer.length > MAX_EVENT_BUFFER) {
+          session.eventBuffer.splice(0, session.eventBuffer.length - MAX_EVENT_BUFFER);
+        }
       }
+      session.eventCounter++;
       if (e.type === "complete" || e.type === "error" || e.type === "interrupted") {
         this.setSessionState(sessionId, session, "waiting");
       }
@@ -183,6 +185,20 @@ class SessionManager {
   broadcastSkillEvent(event) {
     for (const cb of this.skillEventListeners) cb(event);
   }
+  /** Push a synthetic event into a session's event stream (for user message broadcast). */
+  pushEvent(sessionId, event) {
+    const session = this.sessions.get(sessionId);
+    if (!session) return;
+    session.eventBuffer.push(event);
+    session.eventCounter++;
+    if (session.eventBuffer.length > MAX_EVENT_BUFFER) {
+      session.eventBuffer.splice(0, session.eventBuffer.length - MAX_EVENT_BUFFER);
+    }
+    const listeners = this.eventListeners.get(sessionId);
+    if (listeners) {
+      for (const cb of listeners) cb(session.eventCounter, event);
+    }
+  }
   // ── Permission pub/sub ────────────────────────────────────────
   /** Subscribe to permission request notifications. Returns unsubscribe function. */
   onPermissionRequest(cb) {
@@ -364,6 +380,7 @@ class SessionManager {
       config: s.lastStartConfig,
       ccSessionId: s.ccSessionId,
       eventCount: s.eventCounter,
+      ...this.getMessageStats(s.id),
       createdAt: s.createdAt,
       lastActivityAt: s.lastActivityAt
     }));
@@ -374,6 +391,23 @@ class SessionManager {
     if (session) session.lastActivityAt = Date.now();
   }
   /** Persist an agent event to chat_messages. */
+  getMessageStats(sessionId) {
+    try {
+      const db = getDb();
+      const count = db.prepare(
+        `SELECT COUNT(*) as c FROM chat_messages WHERE session_id = ?`
+      ).get(sessionId);
+      const last = db.prepare(
+        `SELECT role, content, created_at FROM chat_messages WHERE session_id = ? ORDER BY id DESC LIMIT 1`
+      ).get(sessionId);
+      return {
+        messageCount: count.c,
+        lastMessage: last ? { role: last.role, content: last.content, created_at: last.created_at } : null
+      };
+    } catch {
+      return { messageCount: 0, lastMessage: null };
+    }
+  }
   persistEvent(sessionId, e) {
     try {
       const db = getDb();

package/dist/server/standalone.js

@@ -454,6 +454,36 @@ var ClaudeCodeProcess = class {
       this.send(options.prompt);
     }
   }
+  /**
+   * Split completed assistant text into chunks and emit assistant_delta events
+   * at a fixed rate (~270 chars/sec), followed by the final assistant event.
+   *
+   * CHUNK_SIZE chars every CHUNK_DELAY_MS → natural TPS feel regardless of length.
+   */
+  emitTextAsDeltas(text) {
+    const CHUNK_SIZE = 4;
+    const CHUNK_DELAY_MS = 15;
+    let t = 0;
+    for (let i = 0; i < text.length; i += CHUNK_SIZE) {
+      const chunk = text.slice(i, i + CHUNK_SIZE);
+      setTimeout(() => {
+        this.emitter.emit("event", {
+          type: "assistant_delta",
+          delta: chunk,
+          index: 0,
+          timestamp: Date.now()
+        });
+      }, t);
+      t += CHUNK_DELAY_MS;
+    }
+    setTimeout(() => {
+      this.emitter.emit("event", {
+        type: "assistant",
+        message: text,
+        timestamp: Date.now()
+      });
+    }, t);
+  }
   get alive() {
     return this._alive;
   }
@@ -529,6 +559,7 @@ var ClaudeCodeProcess = class {
         const content = msg.message?.content;
         if (!Array.isArray(content)) return null;
         const events = [];
+        const textBlocks = [];
         for (const block of content) {
           if (block.type === "thinking") {
             events.push({
@@ -546,15 +577,17 @@ var ClaudeCodeProcess = class {
           } else if (block.type === "text") {
             const text = (block.text ?? "").trim();
             if (text) {
-              events.push({ type: "assistant", message: text, timestamp: Date.now() });
+              textBlocks.push(text);
             }
           }
         }
-        if (events.length > 0) {
-          for (let i = 1; i < events.length; i++) {
-            this.emitter.emit("event", events[i]);
+        if (events.length > 0 || textBlocks.length > 0) {
+          for (const e of events) {
+            this.emitter.emit("event", e);
+          }
+          for (const text of textBlocks) {
+            this.emitTextAsDeltas(text);
           }
-          return events[0];
         }
         return null;
       }
@@ -982,6 +1015,12 @@ function createAgentRoutes(sessionManager2) {
       db.prepare(`INSERT INTO chat_messages (session_id, role, content, meta) VALUES (?, 'user', ?, ?)`).run(sessionId, textContent, Object.keys(meta).length > 0 ? JSON.stringify(meta) : null);
     } catch {
     }
+    sessionManager2.pushEvent(sessionId, {
+      type: "user_message",
+      message: textContent,
+      data: Object.keys(meta).length > 0 ? meta : void 0,
+      timestamp: Date.now()
+    });
     sessionManager2.updateSessionState(sessionId, "processing");
     sessionManager2.touch(sessionId);
     if (body.images?.length) {
@@ -1004,32 +1043,59 @@ function createAgentRoutes(sessionManager2) {
     const sessionId = getSessionId(c);
     const session = sessionManager2.getOrCreateSession(sessionId);
     const sinceParam = c.req.query("since");
-    let cursor = sinceParam ? parseInt(sinceParam, 10) : session.eventCounter;
+    const sinceCursor = sinceParam ? parseInt(sinceParam, 10) : session.eventCounter;
     return streamSSE3(c, async (stream) => {
-      const POLL_MS = 300;
       const KEEPALIVE_MS = 15e3;
-      let lastSend = Date.now();
-      while (true) {
+      const signal = c.req.raw.signal;
+      const queue = [];
+      let wakeUp = null;
+      const unsub = sessionManager2.onSessionEvent(sessionId, (eventCursor, event) => {
+        queue.push({ cursor: eventCursor, event });
+        const fn = wakeUp;
+        wakeUp = null;
+        fn?.();
+      });
+      signal.addEventListener("abort", () => {
+        const fn = wakeUp;
+        wakeUp = null;
+        fn?.();
+      });
+      try {
+        let cursor = sinceCursor;
         if (cursor < session.eventCounter) {
           const startIdx = Math.max(
             0,
             session.eventBuffer.length - (session.eventCounter - cursor)
           );
-          const newEvents = session.eventBuffer.slice(startIdx);
-          for (const event of newEvents) {
+          for (const event of session.eventBuffer.slice(startIdx)) {
             cursor++;
-            await stream.writeSSE({
-              id: String(cursor),
-              data: JSON.stringify(event)
-            });
-            lastSend = Date.now();
+            await stream.writeSSE({ id: String(cursor), data: JSON.stringify(event) });
           }
+        } else {
+          cursor = session.eventCounter;
         }
-        if (Date.now() - lastSend > KEEPALIVE_MS) {
-          await stream.writeSSE({ data: "" });
-          lastSend = Date.now();
+        while (queue.length > 0 && queue[0].cursor <= cursor) queue.shift();
+        while (!signal.aborted) {
+          if (queue.length === 0) {
+            await Promise.race([
+              new Promise((r) => {
+                wakeUp = r;
+              }),
+              new Promise((r) => setTimeout(r, KEEPALIVE_MS))
+            ]);
+          }
+          if (signal.aborted) break;
+          if (queue.length > 0) {
+            while (queue.length > 0) {
+              const item = queue.shift();
+              await stream.writeSSE({ id: String(item.cursor), data: JSON.stringify(item.event) });
+            }
+          } else {
+            await stream.writeSSE({ data: "" });
+          }
         }
-        await new Promise((r) => setTimeout(r, POLL_MS));
+      } finally {
+        unsub();
       }
     });
   });
@@ -1128,12 +1194,24 @@ function createAgentRoutes(sessionManager2) {
     const sessionId = getSessionId(c);
     const session = sessionManager2.getSession(sessionId);
     const alive = session?.process?.alive ?? false;
+    let messageCount = 0;
+    let lastMessage = null;
+    try {
+      const db = getDb();
+      const count = db.prepare("SELECT COUNT(*) as c FROM chat_messages WHERE session_id = ?").get(sessionId);
+      messageCount = count?.c ?? 0;
+      const last = db.prepare("SELECT role, content, created_at FROM chat_messages WHERE session_id = ? ORDER BY id DESC LIMIT 1").get(sessionId);
+      if (last) lastMessage = { role: last.role, content: last.content, created_at: last.created_at };
+    } catch {
+    }
     return httpJson(c, "agent.status", {
       alive,
       agentStatus: !alive ? "disconnected" : session?.state === "processing" ? "busy" : "idle",
       sessionId: session?.process?.sessionId ?? null,
       ccSessionId: session?.ccSessionId ?? null,
       eventCount: session?.eventCounter ?? 0,
+      messageCount,
+      lastMessage,
       config: session?.lastStartConfig ?? null
     });
   });
@@ -1417,11 +1495,13 @@ var SessionManager = class {
         session.ccSessionId = e.data.sessionId;
         this.persistSession(session);
       }
-      session.eventBuffer.push(e);
-      session.eventCounter++;
-      if (session.eventBuffer.length > MAX_EVENT_BUFFER) {
-        session.eventBuffer.splice(0, session.eventBuffer.length - MAX_EVENT_BUFFER);
+      if (e.type !== "assistant_delta") {
+        session.eventBuffer.push(e);
+        if (session.eventBuffer.length > MAX_EVENT_BUFFER) {
+          session.eventBuffer.splice(0, session.eventBuffer.length - MAX_EVENT_BUFFER);
+        }
       }
+      session.eventCounter++;
       if (e.type === "complete" || e.type === "error" || e.type === "interrupted") {
         this.setSessionState(sessionId, session, "waiting");
       }
@@ -1465,6 +1545,20 @@ var SessionManager = class {
   broadcastSkillEvent(event) {
     for (const cb of this.skillEventListeners) cb(event);
   }
+  /** Push a synthetic event into a session's event stream (for user message broadcast). */
+  pushEvent(sessionId, event) {
+    const session = this.sessions.get(sessionId);
+    if (!session) return;
+    session.eventBuffer.push(event);
+    session.eventCounter++;
+    if (session.eventBuffer.length > MAX_EVENT_BUFFER) {
+      session.eventBuffer.splice(0, session.eventBuffer.length - MAX_EVENT_BUFFER);
+    }
+    const listeners = this.eventListeners.get(sessionId);
+    if (listeners) {
+      for (const cb of listeners) cb(session.eventCounter, event);
+    }
+  }
   // ── Permission pub/sub ────────────────────────────────────────
   /** Subscribe to permission request notifications. Returns unsubscribe function. */
   onPermissionRequest(cb) {
@@ -1646,6 +1740,7 @@ var SessionManager = class {
       config: s.lastStartConfig,
       ccSessionId: s.ccSessionId,
       eventCount: s.eventCounter,
+      ...this.getMessageStats(s.id),
       createdAt: s.createdAt,
       lastActivityAt: s.lastActivityAt
     }));
@@ -1656,6 +1751,23 @@ var SessionManager = class {
     if (session) session.lastActivityAt = Date.now();
   }
   /** Persist an agent event to chat_messages. */
+  getMessageStats(sessionId) {
+    try {
+      const db = getDb();
+      const count = db.prepare(
+        `SELECT COUNT(*) as c FROM chat_messages WHERE session_id = ?`
+      ).get(sessionId);
+      const last = db.prepare(
+        `SELECT role, content, created_at FROM chat_messages WHERE session_id = ? ORDER BY id DESC LIMIT 1`
+      ).get(sessionId);
+      return {
+        messageCount: count.c,
+        lastMessage: last ? { role: last.role, content: last.content, created_at: last.created_at } : null
+      };
+    } catch {
+      return { messageCount: 0, lastMessage: null };
+    }
+  }
   persistEvent(sessionId, e) {
     try {
       const db = getDb();
@@ -1931,6 +2043,12 @@ function handleAgentSend(ws, msg, sm) {
     db.prepare(`INSERT INTO chat_messages (session_id, role, content, meta) VALUES (?, 'user', ?, ?)`).run(sessionId, textContent, Object.keys(meta).length > 0 ? JSON.stringify(meta) : null);
   } catch {
   }
+  sm.pushEvent(sessionId, {
+    type: "user_message",
+    message: textContent,
+    data: Object.keys(meta).length > 0 ? meta : void 0,
+    timestamp: Date.now()
+  });
   sm.updateSessionState(sessionId, "processing");
   sm.touch(sessionId);
   if (images?.length) {
@@ -2041,12 +2159,24 @@ function handleAgentStatus(ws, msg, sm) {
   const sessionId = msg.session ?? "default";
   const session = sm.getSession(sessionId);
   const alive = session?.process?.alive ?? false;
+  let messageCount = 0;
+  let lastMessage = null;
+  try {
+    const db = getDb();
+    const count = db.prepare("SELECT COUNT(*) as c FROM chat_messages WHERE session_id = ?").get(sessionId);
+    messageCount = count?.c ?? 0;
+    const last = db.prepare("SELECT role, content, created_at FROM chat_messages WHERE session_id = ? ORDER BY id DESC LIMIT 1").get(sessionId);
+    if (last) lastMessage = { role: last.role, content: last.content, created_at: last.created_at };
+  } catch {
+  }
   wsReply(ws, msg, {
     alive,
     agentStatus: !alive ? "disconnected" : session?.state === "processing" ? "busy" : "idle",
     sessionId: session?.process?.sessionId ?? null,
     ccSessionId: session?.ccSessionId ?? null,
     eventCount: session?.eventCounter ?? 0,
+    messageCount,
+    lastMessage,
     config: session?.lastStartConfig ?? null
   });
 }
@@ -2063,7 +2193,38 @@ function handleAgentSubscribe(ws, msg, sm, state) {
   const sessionId = msg.session ?? "default";
   const session = sm.getOrCreateSession(sessionId);
   state.agentUnsubs.get(sessionId)?.();
-  let cursor = typeof msg.since === "number" ? msg.since : session.eventCounter;
+  const includeHistory = msg.since === 0 || msg.includeHistory === true;
+  let cursor = 0;
+  if (includeHistory) {
+    try {
+      const db = getDb();
+      const rows = db.prepare(
+        `SELECT role, content, meta, created_at FROM chat_messages
+         WHERE session_id = ? ORDER BY id ASC`
+      ).all(sessionId);
+      for (const row of rows) {
+        cursor++;
+        const eventType = row.role === "user" ? "user_message" : row.role === "assistant" ? "assistant" : row.role === "thinking" ? "thinking" : row.role === "tool" ? "tool_use" : row.role === "tool_result" ? "tool_result" : row.role === "error" ? "error" : null;
+        if (!eventType) continue;
+        const meta = row.meta ? JSON.parse(row.meta) : void 0;
+        send(ws, {
+          type: "agent.event",
+          session: sessionId,
+          cursor,
+          isHistory: true,
+          event: {
+            type: eventType,
+            message: row.content,
+            data: meta,
+            timestamp: new Date(row.created_at).getTime()
+          }
+        });
+      }
+    } catch {
+    }
+  }
+  const bufferStart = typeof msg.since === "number" && msg.since > 0 ? msg.since : session.eventCounter;
+  if (!includeHistory) cursor = bufferStart;
   if (cursor < session.eventCounter) {
     const startIdx = Math.max(0, session.eventBuffer.length - (session.eventCounter - cursor));
     const events = session.eventBuffer.slice(startIdx);
@@ -2071,6 +2232,8 @@ function handleAgentSubscribe(ws, msg, sm, state) {
       cursor++;
       send(ws, { type: "agent.event", session: sessionId, cursor, event });
     }
+  } else {
+    cursor = session.eventCounter;
   }
   const unsub = sm.onSessionEvent(sessionId, (eventCursor, event) => {
     send(ws, { type: "agent.event", session: sessionId, cursor: eventCursor, event });
@@ -2183,10 +2346,14 @@ function handlePermissionPending(ws, msg, sm) {
 }
 function handlePermissionSubscribe(ws, msg, sm, state) {
   state.permissionUnsub?.();
+  const pending = sm.getAllPendingPermissions();
+  for (const p of pending) {
+    send(ws, { type: "permission.request", session: p.sessionId, request: p.request, createdAt: p.createdAt, isHistory: true });
+  }
   state.permissionUnsub = sm.onPermissionRequest((sessionId, request, createdAt) => {
     send(ws, { type: "permission.request", session: sessionId, request, createdAt });
   });
-  reply(ws, msg, {});
+  reply(ws, msg, { pendingCount: pending.length });
 }
 function handlePermissionUnsubscribe(ws, msg, state) {
   state.permissionUnsub?.();

package/dist/server/ws.js

@@ -234,6 +234,12 @@ function handleAgentSend(ws, msg, sm) {
     db.prepare(`INSERT INTO chat_messages (session_id, role, content, meta) VALUES (?, 'user', ?, ?)`).run(sessionId, textContent, Object.keys(meta).length > 0 ? JSON.stringify(meta) : null);
   } catch {
   }
+  sm.pushEvent(sessionId, {
+    type: "user_message",
+    message: textContent,
+    data: Object.keys(meta).length > 0 ? meta : void 0,
+    timestamp: Date.now()
+  });
   sm.updateSessionState(sessionId, "processing");
   sm.touch(sessionId);
   if (images?.length) {
@@ -344,12 +350,24 @@ function handleAgentStatus(ws, msg, sm) {
   const sessionId = msg.session ?? "default";
   const session = sm.getSession(sessionId);
   const alive = session?.process?.alive ?? false;
+  let messageCount = 0;
+  let lastMessage = null;
+  try {
+    const db = getDb();
+    const count = db.prepare("SELECT COUNT(*) as c FROM chat_messages WHERE session_id = ?").get(sessionId);
+    messageCount = count?.c ?? 0;
+    const last = db.prepare("SELECT role, content, created_at FROM chat_messages WHERE session_id = ? ORDER BY id DESC LIMIT 1").get(sessionId);
+    if (last) lastMessage = { role: last.role, content: last.content, created_at: last.created_at };
+  } catch {
+  }
   wsReply(ws, msg, {
     alive,
     agentStatus: !alive ? "disconnected" : session?.state === "processing" ? "busy" : "idle",
     sessionId: session?.process?.sessionId ?? null,
     ccSessionId: session?.ccSessionId ?? null,
     eventCount: session?.eventCounter ?? 0,
+    messageCount,
+    lastMessage,
     config: session?.lastStartConfig ?? null
   });
 }
@@ -366,7 +384,38 @@ function handleAgentSubscribe(ws, msg, sm, state) {
   const sessionId = msg.session ?? "default";
   const session = sm.getOrCreateSession(sessionId);
   state.agentUnsubs.get(sessionId)?.();
-  let cursor = typeof msg.since === "number" ? msg.since : session.eventCounter;
+  const includeHistory = msg.since === 0 || msg.includeHistory === true;
+  let cursor = 0;
+  if (includeHistory) {
+    try {
+      const db = getDb();
+      const rows = db.prepare(
+        `SELECT role, content, meta, created_at FROM chat_messages
+         WHERE session_id = ? ORDER BY id ASC`
+      ).all(sessionId);
+      for (const row of rows) {
+        cursor++;
+        const eventType = row.role === "user" ? "user_message" : row.role === "assistant" ? "assistant" : row.role === "thinking" ? "thinking" : row.role === "tool" ? "tool_use" : row.role === "tool_result" ? "tool_result" : row.role === "error" ? "error" : null;
+        if (!eventType) continue;
+        const meta = row.meta ? JSON.parse(row.meta) : void 0;
+        send(ws, {
+          type: "agent.event",
+          session: sessionId,
+          cursor,
+          isHistory: true,
+          event: {
+            type: eventType,
+            message: row.content,
+            data: meta,
+            timestamp: new Date(row.created_at).getTime()
+          }
+        });
+      }
+    } catch {
+    }
+  }
+  const bufferStart = typeof msg.since === "number" && msg.since > 0 ? msg.since : session.eventCounter;
+  if (!includeHistory) cursor = bufferStart;
   if (cursor < session.eventCounter) {
     const startIdx = Math.max(0, session.eventBuffer.length - (session.eventCounter - cursor));
     const events = session.eventBuffer.slice(startIdx);
@@ -374,6 +423,8 @@ function handleAgentSubscribe(ws, msg, sm, state) {
       cursor++;
       send(ws, { type: "agent.event", session: sessionId, cursor, event });
     }
+  } else {
+    cursor = session.eventCounter;
   }
   const unsub = sm.onSessionEvent(sessionId, (eventCursor, event) => {
     send(ws, { type: "agent.event", session: sessionId, cursor: eventCursor, event });
@@ -486,10 +537,14 @@ function handlePermissionPending(ws, msg, sm) {
 }
 function handlePermissionSubscribe(ws, msg, sm, state) {
   state.permissionUnsub?.();
+  const pending = sm.getAllPendingPermissions();
+  for (const p of pending) {
+    send(ws, { type: "permission.request", session: p.sessionId, request: p.request, createdAt: p.createdAt, isHistory: true });
+  }
   state.permissionUnsub = sm.onPermissionRequest((sessionId, request, createdAt) => {
     send(ws, { type: "permission.request", session: sessionId, request, createdAt });
   });
-  reply(ws, msg, {});
+  reply(ws, msg, { pendingCount: pending.length });
 }
 function handlePermissionUnsubscribe(ws, msg, state) {
   state.permissionUnsub?.();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sna-sdk/core",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Skills-Native Application runtime — server, providers, session management, database, and CLI",
   "type": "module",
   "bin": {