@sna-sdk/core 0.3.0 → 0.5.0

package/dist/server/ws.js

@@ -4,6 +4,7 @@ import { getDb } from "../db/schema.js";
 import { logger } from "../lib/logger.js";
 import { runOnce } from "./routes/agent.js";
 import { wsReply } from "./api-types.js";
+import { buildHistoryFromDb } from "./history-builder.js";
 import { saveImages } from "./image-store.js";
 function send(ws, data) {
   if (ws.readyState === ws.OPEN) {
@@ -30,13 +31,16 @@ function attachWebSocket(server, sessionManager) {
   });
   wss.on("connection", (ws) => {
     logger.log("ws", "client connected");
-    const state = { agentUnsubs: /* @__PURE__ */ new Map(), skillEventUnsub: null, skillPollTimer: null, permissionUnsub: null, lifecycleUnsub: null, configChangedUnsub: null };
+    const state = { agentUnsubs: /* @__PURE__ */ new Map(), skillEventUnsub: null, skillPollTimer: null, permissionUnsub: null, lifecycleUnsub: null, configChangedUnsub: null, stateChangedUnsub: null };
     state.lifecycleUnsub = sessionManager.onSessionLifecycle((event) => {
       send(ws, { type: "session.lifecycle", ...event });
     });
     state.configChangedUnsub = sessionManager.onConfigChanged((event) => {
       send(ws, { type: "session.config-changed", ...event });
     });
+    state.stateChangedUnsub = sessionManager.onStateChanged((event) => {
+      send(ws, { type: "session.state-changed", ...event });
+    });
     ws.on("message", (raw) => {
       let msg;
       try {
@@ -67,6 +71,8 @@ function attachWebSocket(server, sessionManager) {
       state.lifecycleUnsub = null;
       state.configChangedUnsub?.();
       state.configChangedUnsub = null;
+      state.stateChangedUnsub?.();
+      state.stateChangedUnsub = null;
     });
   });
   return wss;
@@ -85,6 +91,8 @@ function handleMessage(ws, msg, sm, state) {
       return handleAgentStart(ws, msg, sm);
     case "agent.send":
       return handleAgentSend(ws, msg, sm);
+    case "agent.resume":
+      return handleAgentResume(ws, msg, sm);
     case "agent.restart":
       return handleAgentRestart(ws, msg, sm);
     case "agent.interrupt":
@@ -226,7 +234,13 @@ 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 {
   }
-  session.state = "processing";
+  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) {
     const content = [
@@ -242,6 +256,43 @@ function handleAgentSend(ws, msg, sm) {
   }
   wsReply(ws, msg, { status: "sent" });
 }
+function handleAgentResume(ws, msg, sm) {
+  const sessionId = msg.session ?? "default";
+  const session = sm.getOrCreateSession(sessionId);
+  if (session.process?.alive) {
+    return replyError(ws, msg, "Session already running. Use agent.send instead.");
+  }
+  const history = buildHistoryFromDb(sessionId);
+  if (history.length === 0 && !msg.prompt) {
+    return replyError(ws, msg, "No history in DB \u2014 nothing to resume.");
+  }
+  const providerName = msg.provider ?? session.lastStartConfig?.provider ?? "claude-code";
+  const model = msg.model ?? session.lastStartConfig?.model ?? "claude-sonnet-4-6";
+  const permissionMode = msg.permissionMode ?? session.lastStartConfig?.permissionMode ?? "acceptEdits";
+  const extraArgs = msg.extraArgs ?? session.lastStartConfig?.extraArgs;
+  const provider = getProvider(providerName);
+  try {
+    const proc = provider.spawn({
+      cwd: session.cwd,
+      prompt: msg.prompt,
+      model,
+      permissionMode,
+      env: { SNA_SESSION_ID: sessionId },
+      history: history.length > 0 ? history : void 0,
+      extraArgs
+    });
+    sm.setProcess(sessionId, proc, "resumed");
+    sm.saveStartConfig(sessionId, { provider: providerName, model, permissionMode, extraArgs });
+    wsReply(ws, msg, {
+      status: "resumed",
+      provider: providerName,
+      sessionId: session.id,
+      historyCount: history.length
+    });
+  } catch (e) {
+    replyError(ws, msg, e.message);
+  }
+}
 function handleAgentRestart(ws, msg, sm) {
   const sessionId = msg.session ?? "default";
   try {
@@ -298,11 +349,25 @@ function handleAgentKill(ws, msg, sm) {
 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: session?.process?.alive ?? false,
+    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
   });
 }
@@ -319,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);
@@ -327,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 });
@@ -439,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/dist/testing/mock-api.js

@@ -1,4 +1,6 @@
 import http from "http";
+import fs from "fs";
+import path from "path";
 function ts() {
   return (/* @__PURE__ */ new Date()).toISOString().slice(11, 23);
 }
@@ -35,6 +37,24 @@ async function startMockAnthropicServer() {
         const realText = textBlocks.find((t) => !t.startsWith("<system-reminder>"));
         userText = realText ?? textBlocks[textBlocks.length - 1] ?? "(no text)";
       }
+      console.log(`[${ts()}] BODY KEYS: ${Object.keys(body).join(", ")}`);
+      try {
+        const dumpPath = path.join(process.cwd(), ".sna/mock-api-last-request.json");
+        fs.writeFileSync(dumpPath, JSON.stringify(body, null, 2));
+        console.log(`[${ts()}] FULL BODY dumped to .sna/mock-api-last-request.json`);
+      } catch {
+      }
+      if (body.system) {
+        const sysText = typeof body.system === "string" ? body.system : JSON.stringify(body.system);
+        console.log(`[${ts()}] SYSTEM PROMPT (${sysText.length} chars): ${sysText.slice(0, 300)}...`);
+        if (sysText.includes("\uC720\uB2C8") || sysText.includes("\uCEE4\uD53C") || sysText.includes("\uAE30\uC5B5")) {
+          console.log(`[${ts()}] *** HISTORY FOUND IN SYSTEM PROMPT ***`);
+          for (const keyword of ["\uC720\uB2C8", "\uCEE4\uD53C", "\uAE30\uC5B5"]) {
+            const idx = sysText.indexOf(keyword);
+            if (idx >= 0) console.log(`[${ts()}]   "${keyword}" at pos ${idx}: ...${sysText.slice(Math.max(0, idx - 50), idx + 80)}...`);
+          }
+        }
+      }
       console.log(`[${ts()}] REQ model=${body.model} stream=${body.stream} messages=${body.messages?.length} user="${userText.slice(0, 120)}"`);
       for (let mi = 0; mi < body.messages.length; mi++) {
         const m = body.messages[mi];

package/package.json

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