@sna-sdk/core 0.0.5 → 0.0.10

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

@@ -174,21 +174,23 @@ class ClaudeCodeProcess {
       }
       case "result": {
         if (msg.subtype === "success") {
+          const u = msg.usage ?? {};
           const mu = msg.modelUsage ?? {};
           const modelKey = Object.keys(mu)[0] ?? "";
-          const u = mu[modelKey] ?? {};
+          const modelInfo = mu[modelKey] ?? {};
           return {
             type: "complete",
             message: msg.result ?? "Done",
             data: {
               durationMs: msg.duration_ms,
               costUsd: msg.total_cost_usd,
-              inputTokens: u.inputTokens ?? 0,
-              outputTokens: u.outputTokens ?? 0,
-              cacheReadTokens: u.cacheReadInputTokens ?? 0,
-              cacheWriteTokens: u.cacheCreationInputTokens ?? 0,
-              contextWindow: u.contextWindow ?? 0,
-              maxOutputTokens: u.maxOutputTokens ?? 0,
+              // Per-turn: actual context window usage this turn
+              inputTokens: u.input_tokens ?? 0,
+              outputTokens: u.output_tokens ?? 0,
+              cacheReadTokens: u.cache_read_input_tokens ?? 0,
+              cacheWriteTokens: u.cache_creation_input_tokens ?? 0,
+              // Static model info
+              contextWindow: modelInfo.contextWindow ?? 0,
               model: modelKey
             },
             timestamp: Date.now()

package/dist/db/schema.d.ts

@@ -1,8 +1,24 @@
 import Database from 'better-sqlite3';
 
 declare function getDb(): Database.Database;
+interface ChatSession {
+    id: string;
+    label: string;
+    type: "main" | "background";
+    created_at: string;
+}
+interface ChatMessage {
+    id: number;
+    session_id: string;
+    role: string;
+    content: string;
+    skill_name: string | null;
+    meta: string | null;
+    created_at: string;
+}
 interface SkillEvent {
     id: number;
+    session_id: string | null;
     skill: string;
     type: "invoked" | "called" | "success" | "failed" | "permission_needed" | "start" | "progress" | "milestone" | "complete" | "error";
     message: string;
@@ -10,4 +26,4 @@ interface SkillEvent {
     created_at: string;
 }
 
-export { type SkillEvent, getDb };
+export { type ChatMessage, type ChatSession, type SkillEvent, getDb };

package/dist/db/schema.js

@@ -23,8 +23,31 @@ function migrateSkillEvents(db) {
 function initSchema(db) {
   migrateSkillEvents(db);
   db.exec(`
+    CREATE TABLE IF NOT EXISTS chat_sessions (
+      id         TEXT PRIMARY KEY,
+      label      TEXT NOT NULL DEFAULT '',
+      type       TEXT NOT NULL DEFAULT 'main',
+      created_at TEXT NOT NULL DEFAULT (datetime('now'))
+    );
+
+    -- Ensure default session always exists
+    INSERT OR IGNORE INTO chat_sessions (id, label, type) VALUES ('default', 'Chat', 'main');
+
+    CREATE TABLE IF NOT EXISTS chat_messages (
+      id         INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL REFERENCES chat_sessions(id) ON DELETE CASCADE,
+      role       TEXT NOT NULL,
+      content    TEXT NOT NULL DEFAULT '',
+      skill_name TEXT,
+      meta       TEXT,
+      created_at TEXT NOT NULL DEFAULT (datetime('now'))
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_chat_messages_session ON chat_messages(session_id);
+
     CREATE TABLE IF NOT EXISTS skill_events (
       id         INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT REFERENCES chat_sessions(id) ON DELETE SET NULL,
       skill      TEXT NOT NULL,
       type       TEXT NOT NULL,
       message    TEXT NOT NULL,
@@ -34,6 +57,7 @@ function initSchema(db) {
 
     CREATE INDEX IF NOT EXISTS idx_skill_events_skill ON skill_events(skill);
     CREATE INDEX IF NOT EXISTS idx_skill_events_created ON skill_events(created_at);
+    CREATE INDEX IF NOT EXISTS idx_skill_events_session ON skill_events(session_id);
   `);
 }
 export {

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { SkillEvent } from './db/schema.js';
+export { ChatMessage, ChatSession, SkillEvent } from './db/schema.js';
 export { AgentEvent, AgentProcess, AgentProvider, SpawnOptions } from './core/providers/types.js';
 export { Session, SessionInfo, SessionManagerOptions } from './server/session-manager.js';
 import 'better-sqlite3';

package/dist/lib/skill-parser.d.ts

@@ -0,0 +1,23 @@
+/**
+ * skill-parser.ts — Parse SKILL.md frontmatter for sna schema definitions.
+ *
+ * Reads .claude/skills/<name>/SKILL.md files and extracts the `sna` field
+ * from YAML frontmatter.
+ */
+interface SkillArgDef {
+    type: "string" | "number" | "boolean" | "string[]" | "number[]";
+    required?: boolean;
+    description?: string;
+}
+interface SkillSchema {
+    name: string;
+    camelName: string;
+    description: string;
+    args: Record<string, SkillArgDef>;
+}
+/** Parse a single SKILL.md file and extract sna schema. */
+declare function parseSkillFile(filePath: string): SkillSchema | null;
+/** Scan a directory for SKILL.md files and parse all sna schemas. */
+declare function scanSkills(skillsDir: string): SkillSchema[];
+
+export { type SkillArgDef, type SkillSchema, parseSkillFile, scanSkills };

package/dist/lib/skill-parser.js

@@ -0,0 +1,54 @@
+import fs from "fs";
+import path from "path";
+import yaml from "js-yaml";
+function toCamelCase(kebab) {
+  return kebab.replace(/-([a-z])/g, (_, c) => c.toUpperCase());
+}
+function parseFrontmatter(content) {
+  const match = content.match(/^---\n([\s\S]*?)\n---/);
+  if (!match) return null;
+  try {
+    return yaml.load(match[1]);
+  } catch {
+    return null;
+  }
+}
+function parseSkillFile(filePath) {
+  const content = fs.readFileSync(filePath, "utf-8");
+  const fm = parseFrontmatter(content);
+  if (!fm) return null;
+  const name = path.basename(path.dirname(filePath));
+  const description = fm.description ?? "";
+  const sna = fm.sna;
+  const rawArgs = sna?.args ?? {};
+  const args = {};
+  for (const [key, def] of Object.entries(rawArgs)) {
+    args[key] = {
+      type: def.type ?? "string",
+      required: def.required === true,
+      description: def.description ?? void 0
+    };
+  }
+  return {
+    name,
+    camelName: toCamelCase(name),
+    description,
+    args
+  };
+}
+function scanSkills(skillsDir) {
+  if (!fs.existsSync(skillsDir)) return [];
+  const schemas = [];
+  const entries = fs.readdirSync(skillsDir);
+  for (const entry of entries) {
+    const skillMd = path.join(skillsDir, entry, "SKILL.md");
+    if (!fs.existsSync(skillMd)) continue;
+    const schema = parseSkillFile(skillMd);
+    if (schema) schemas.push(schema);
+  }
+  return schemas;
+}
+export {
+  parseSkillFile,
+  scanSkills
+};

package/dist/scripts/emit.js

@@ -21,18 +21,21 @@ const VALID_TYPES = [
   "error"
 ];
 if (!flags.skill || !flags.type || !flags.message) {
-  console.error("Usage: tsx node_modules/sna/src/scripts/emit.ts --skill <name> --type <type> --message <text> [--data <json>]");
+  console.error("Usage: tsx node_modules/@sna-sdk/core/src/scripts/emit.ts --skill <name> --type <type> --message <text> [--data <json>]");
   process.exit(1);
 }
 if (!VALID_TYPES.includes(flags.type)) {
   console.error(`Invalid type: ${flags.type}. Must be one of: ${VALID_TYPES.join(", ")}`);
   process.exit(1);
 }
-const db = getDb();
-db.prepare(`
-  INSERT INTO skill_events (skill, type, message, data)
-  VALUES (?, ?, ?, ?)
-`).run(flags.skill, flags.type, flags.message, flags.data ?? null);
+const sessionId = process.env.SNA_SESSION_ID;
+if (sessionId) {
+  const db = getDb();
+  db.prepare(`
+    INSERT INTO skill_events (session_id, skill, type, message, data)
+    VALUES (?, ?, ?, ?, ?)
+  `).run(sessionId, flags.skill, flags.type, flags.message, flags.data ?? null);
+}
 const prefix = {
   called: "\u2192",
   success: "\u2713",

package/dist/scripts/gen-client.d.ts

@@ -0,0 +1,2 @@
+
+export {  }

package/dist/scripts/gen-client.js

@@ -0,0 +1,114 @@
+import fs from "fs";
+import path from "path";
+import { scanSkills } from "../lib/skill-parser.js";
+const ROOT = process.cwd();
+function parseFlags(args) {
+  const flags2 = {};
+  for (let i = 0; i < args.length; i += 2) {
+    const key = args[i]?.replace(/^--/, "");
+    if (key) flags2[key] = args[i + 1] ?? "";
+  }
+  return flags2;
+}
+function tsType(argDef) {
+  switch (argDef.type) {
+    case "number":
+      return "number";
+    case "boolean":
+      return "boolean";
+    case "string[]":
+      return "string[]";
+    case "number[]":
+      return "number[]";
+    default:
+      return "string";
+  }
+}
+function generateClient(schemas2) {
+  const lines = [];
+  lines.push(`/**`);
+  lines.push(` * SNA Client \u2014 Auto-generated from SKILL.md frontmatter.`);
+  lines.push(` * DO NOT EDIT. Re-generate with: sna gen client`);
+  lines.push(` */`);
+  lines.push(``);
+  lines.push(`import type { SkillResult } from "@sna-sdk/react/hooks";`);
+  lines.push(``);
+  for (const s of schemas2) {
+    const argEntries = Object.entries(s.args);
+    if (argEntries.length > 0) {
+      lines.push(`export interface ${capitalize(s.camelName)}Args {`);
+      for (const [key, def] of argEntries) {
+        if (def.description) lines.push(`  /** ${def.description} */`);
+        lines.push(`  ${key}${def.required ? "" : "?"}: ${tsType(def)};`);
+      }
+      lines.push(`}`);
+      lines.push(``);
+    }
+  }
+  lines.push(`export interface SnaSkills {`);
+  for (const s of schemas2) {
+    const argEntries = Object.entries(s.args);
+    const argsType = argEntries.length > 0 ? `${capitalize(s.camelName)}Args` : "void";
+    lines.push(`  /** ${s.description} */`);
+    lines.push(`  ${s.camelName}: (${argsType === "void" ? "" : `args: ${argsType}`}) => Promise<SkillResult>;`);
+  }
+  lines.push(`}`);
+  lines.push(``);
+  lines.push(`export const skillDefinitions = {`);
+  for (const s of schemas2) {
+    const argKeys = Object.keys(s.args);
+    lines.push(`  ${s.camelName}: { name: "${s.name}", argKeys: [${argKeys.map((k) => `"${k}"`).join(", ")}] },`);
+  }
+  lines.push(`} as const;`);
+  lines.push(``);
+  lines.push(`/**`);
+  lines.push(` * Create a typed SNA client.`);
+  lines.push(` *`);
+  lines.push(` * @example`);
+  lines.push(` * const { skills } = useSnaClient();`);
+  lines.push(` * await skills.formFill({ sessionId: 123 });`);
+  lines.push(` */`);
+  lines.push(`export function bindSkills(`);
+  lines.push(`  runner: (command: string) => Promise<SkillResult>,`);
+  lines.push(`): SnaSkills {`);
+  lines.push(`  const skills = {} as SnaSkills;`);
+  lines.push(`  for (const [method, def] of Object.entries(skillDefinitions)) {`);
+  lines.push(`    (skills as any)[method] = (args?: Record<string, unknown>) => {`);
+  lines.push(`      const parts = [def.name];`);
+  lines.push(`      if (args) {`);
+  lines.push(`        for (const key of def.argKeys) {`);
+  lines.push(`          if (args[key] !== undefined) {`);
+  lines.push(`            const val = args[key];`);
+  lines.push(`            parts.push(Array.isArray(val) ? val.join(" ") : String(val));`);
+  lines.push(`          }`);
+  lines.push(`        }`);
+  lines.push(`      }`);
+  lines.push(`      return runner(parts.join(" "));`);
+  lines.push(`    };`);
+  lines.push(`  }`);
+  lines.push(`  return skills;`);
+  lines.push(`}`);
+  return lines.join("\n") + "\n";
+}
+function capitalize(s) {
+  return s.charAt(0).toUpperCase() + s.slice(1);
+}
+const [, , ...rawArgs] = process.argv;
+const flags = parseFlags(rawArgs);
+const skillsDir = flags["skills-dir"] ?? path.join(ROOT, ".claude/skills");
+const outPath = flags.out ?? path.join(ROOT, "src/sna-client.ts");
+const schemas = scanSkills(skillsDir);
+if (schemas.length === 0) {
+  console.log("No skills with sna.args found in", skillsDir);
+  process.exit(0);
+}
+const code = generateClient(schemas);
+const outDir = path.dirname(outPath);
+if (!fs.existsSync(outDir)) fs.mkdirSync(outDir, { recursive: true });
+fs.writeFileSync(outPath, code);
+console.log(`\u2713 Generated ${outPath}`);
+console.log(`  ${schemas.length} skills:`);
+for (const s of schemas) {
+  const argCount = Object.keys(s.args).length;
+  console.log(`    ${s.camelName}(${argCount > 0 ? `{${Object.keys(s.args).join(", ")}}` : ""}) \u2192 ${s.name}`);
+}

package/dist/scripts/sna.js

@@ -1,5 +1,6 @@
 import { execSync, spawn } from "child_process";
 import fs from "fs";
+import net from "net";
 import path from "path";
 import { cmdNew, cmdWorkflow, cmdCancel, cmdTasks } from "./workflow.js";
 const ROOT = process.cwd();
@@ -13,7 +14,7 @@ const SNA_API_LOG_FILE = path.join(STATE_DIR, "sna-api.log");
 const PORT = process.env.PORT ?? "3000";
 const DB_PATH = path.join(ROOT, "data/app.db");
 const CLAUDE_PATH_FILE = path.join(STATE_DIR, "claude-path");
-const SNA_CORE_DIR = path.join(ROOT, "node_modules/sna");
+const SNA_CORE_DIR = path.join(ROOT, "node_modules/@sna-sdk/core");
 function ensureStateDir() {
   if (!fs.existsSync(STATE_DIR)) fs.mkdirSync(STATE_DIR, { recursive: true });
 }
@@ -56,10 +57,10 @@ function clearSnaApiState() {
   }
 }
 function findFreePort() {
-  const net = require("net");
   const srv = net.createServer();
   srv.listen(0);
-  const port = String(srv.address().port);
+  const addr = srv.address();
+  const port = String(addr.port);
   srv.close();
   return port;
 }
@@ -373,7 +374,7 @@ function cmdInit(force2 = false) {
   if (!fs.existsSync(claudeDir)) {
     fs.mkdirSync(claudeDir, { recursive: true });
   }
-  const hookCommand = `node "$CLAUDE_PROJECT_DIR"/node_modules/sna/dist/scripts/hook.js`;
+  const hookCommand = `node "$CLAUDE_PROJECT_DIR"/node_modules/@sna-sdk/core/dist/scripts/hook.js`;
   const permissionHook = {
     matcher: ".*",
     hooks: [{ type: "command", async: true, command: hookCommand }]
@@ -398,7 +399,7 @@ function cmdInit(force2 = false) {
   } else {
     step(".claude/settings.json \u2014 hook already set, skipped");
   }
-  const claudeMdTemplate = path.join(ROOT, "node_modules/sna/CLAUDE.md.template");
+  const claudeMdTemplate = path.join(ROOT, "node_modules/@sna-sdk/core/CLAUDE.md.template");
   const claudeMdDest = path.join(claudeDir, "CLAUDE.md");
   if (fs.existsSync(claudeMdTemplate)) {
     if (force2 || !fs.existsSync(claudeMdDest)) {
@@ -408,7 +409,7 @@ function cmdInit(force2 = false) {
       step(".claude/CLAUDE.md \u2014 already exists, skipped");
     }
   }
-  const snaCoreSkillsDir = path.join(ROOT, "node_modules/sna/skills");
+  const snaCoreSkillsDir = path.join(ROOT, "node_modules/@sna-sdk/core/skills");
   const destSkillsDir = path.join(claudeDir, "skills");
   if (fs.existsSync(snaCoreSkillsDir)) {
     const skillNames = fs.readdirSync(snaCoreSkillsDir);
@@ -644,6 +645,15 @@ Run "sna help submit" for data submission patterns.`);
       console.log();
       cmdUp();
       break;
+    case "gen":
+      if (args[0] === "client") {
+        const { execSync: exec } = require("child_process");
+        const genScript = path.join(__dirname, "gen-client.js");
+        exec(`node "${genScript}" ${args.slice(1).join(" ")}`, { stdio: "inherit", cwd: ROOT });
+      } else {
+        console.log("Usage: sna gen client [--out <path>] [--skills-dir <path>]");
+      }
+      break;
     default:
       printHelp();
   }

package/dist/server/index.d.ts

@@ -6,6 +6,7 @@ export { eventsRoute } from './routes/events.js';
 export { emitRoute } from './routes/emit.js';
 export { createRunRoute } from './routes/run.js';
 export { createAgentRoutes } from './routes/agent.js';
+export { createChatRoutes } from './routes/chat.js';
 import '../core/providers/types.js';
 import 'hono/utils/http-status';
 

package/dist/server/index.js

@@ -5,6 +5,7 @@ import { eventsRoute } from "./routes/events.js";
 import { emitRoute } from "./routes/emit.js";
 import { createRunRoute } from "./routes/run.js";
 import { createAgentRoutes } from "./routes/agent.js";
+import { createChatRoutes } from "./routes/chat.js";
 import { SessionManager } from "./session-manager.js";
 function createSnaApp(options = {}) {
   const sessionManager = options.sessionManager ?? new SessionManager();
@@ -13,6 +14,7 @@ function createSnaApp(options = {}) {
   app.get("/events", eventsRoute);
   app.post("/emit", emitRoute);
   app.route("/agent", createAgentRoutes(sessionManager));
+  app.route("/chat", createChatRoutes());
   if (options.runCommands) {
     app.get("/run", createRunRoute(options.runCommands));
   }
@@ -22,6 +24,7 @@ import { eventsRoute as eventsRoute2 } from "./routes/events.js";
 import { emitRoute as emitRoute2 } from "./routes/emit.js";
 import { createRunRoute as createRunRoute2 } from "./routes/run.js";
 import { createAgentRoutes as createAgentRoutes2 } from "./routes/agent.js";
+import { createChatRoutes as createChatRoutes2 } from "./routes/chat.js";
 import { SessionManager as SessionManager2 } from "./session-manager.js";
 function snaPortRoute(c) {
   const portFile = _path.join(process.cwd(), ".sna/sna-api.port");
@@ -35,6 +38,7 @@ function snaPortRoute(c) {
 export {
   SessionManager2 as SessionManager,
   createAgentRoutes2 as createAgentRoutes,
+  createChatRoutes2 as createChatRoutes,
   createRunRoute2 as createRunRoute,
   createSnaApp,
   emitRoute2 as emitRoute,

package/dist/server/routes/agent.js

@@ -4,6 +4,7 @@ import {
   getProvider
 } from "../../core/providers/index.js";
 import { logger } from "../../lib/logger.js";
+import { getDb } from "../../db/schema.js";
 function getSessionId(c) {
   return c.req.query("session") ?? "default";
 }
@@ -55,12 +56,23 @@ function createAgentRoutes(sessionManager) {
     }
     session.eventBuffer.length = 0;
     const provider = getProvider(body.provider ?? "claude-code");
+    const skillMatch = body.prompt?.match(/^Execute the skill:\s*(\S+)/);
+    if (skillMatch) {
+      try {
+        const db = getDb();
+        db.prepare(
+          `INSERT INTO skill_events (session_id, skill, type, message) VALUES (?, ?, 'invoked', ?)`
+        ).run(sessionId, skillMatch[1], `Skill ${skillMatch[1]} invoked`);
+      } catch {
+      }
+    }
     try {
       const proc = provider.spawn({
         cwd: session.cwd,
         prompt: body.prompt,
         model: body.model ?? "claude-sonnet-4-6",
-        permissionMode: body.permissionMode ?? "acceptEdits"
+        permissionMode: body.permissionMode ?? "acceptEdits",
+        env: { SNA_SESSION_ID: sessionId }
       });
       sessionManager.setProcess(sessionId, proc);
       logger.log("route", `POST /start?session=${sessionId} \u2192 started`);

package/dist/server/routes/chat.d.ts

@@ -0,0 +1,6 @@
+import * as hono_types from 'hono/types';
+import { Hono } from 'hono';
+
+declare function createChatRoutes(): Hono<hono_types.BlankEnv, hono_types.BlankSchema, "/">;
+
+export { createChatRoutes };

package/dist/server/routes/chat.js

@@ -0,0 +1,67 @@
+import { Hono } from "hono";
+import { getDb } from "../../db/schema.js";
+function createChatRoutes() {
+  const app = new Hono();
+  app.get("/sessions", (c) => {
+    const db = getDb();
+    const sessions = db.prepare(
+      `SELECT id, label, type, created_at FROM chat_sessions ORDER BY created_at DESC`
+    ).all();
+    return c.json({ sessions });
+  });
+  app.post("/sessions", async (c) => {
+    const body = await c.req.json().catch(() => ({}));
+    const id = body.id ?? crypto.randomUUID().slice(0, 8);
+    const db = getDb();
+    db.prepare(
+      `INSERT OR IGNORE INTO chat_sessions (id, label, type) VALUES (?, ?, ?)`
+    ).run(id, body.label ?? id, body.type ?? "background");
+    return c.json({ status: "created", id });
+  });
+  app.delete("/sessions/:id", (c) => {
+    const id = c.req.param("id");
+    if (id === "default") {
+      return c.json({ status: "error", message: "Cannot delete default session" }, 400);
+    }
+    const db = getDb();
+    db.prepare(`DELETE FROM chat_sessions WHERE id = ?`).run(id);
+    return c.json({ status: "deleted" });
+  });
+  app.get("/sessions/:id/messages", (c) => {
+    const id = c.req.param("id");
+    const sinceParam = c.req.query("since");
+    const db = getDb();
+    const query = sinceParam ? db.prepare(`SELECT * FROM chat_messages WHERE session_id = ? AND id > ? ORDER BY id ASC`) : db.prepare(`SELECT * FROM chat_messages WHERE session_id = ? ORDER BY id ASC`);
+    const messages = sinceParam ? query.all(id, parseInt(sinceParam, 10)) : query.all(id);
+    return c.json({ messages });
+  });
+  app.post("/sessions/:id/messages", async (c) => {
+    const sessionId = c.req.param("id");
+    const body = await c.req.json().catch(() => ({}));
+    if (!body.role) {
+      return c.json({ status: "error", message: "role is required" }, 400);
+    }
+    const db = getDb();
+    db.prepare(`INSERT OR IGNORE INTO chat_sessions (id, label, type) VALUES (?, ?, 'main')`).run(sessionId, sessionId);
+    const result = db.prepare(
+      `INSERT INTO chat_messages (session_id, role, content, skill_name, meta) VALUES (?, ?, ?, ?, ?)`
+    ).run(
+      sessionId,
+      body.role,
+      body.content ?? "",
+      body.skill_name ?? null,
+      body.meta ? JSON.stringify(body.meta) : null
+    );
+    return c.json({ status: "created", id: result.lastInsertRowid });
+  });
+  app.delete("/sessions/:id/messages", (c) => {
+    const id = c.req.param("id");
+    const db = getDb();
+    db.prepare(`DELETE FROM chat_messages WHERE session_id = ?`).run(id);
+    return c.json({ status: "cleared" });
+  });
+  return app;
+}
+export {
+  createChatRoutes
+};

package/dist/server/routes/events.js

@@ -5,7 +5,7 @@ const KEEPALIVE_INTERVAL_MS = 15e3;
 function eventsRoute(c) {
   const sinceParam = c.req.query("since");
   let lastId = sinceParam ? parseInt(sinceParam) : -1;
-  if (lastId === -1) {
+  if (lastId <= 0) {
     const db = getDb();
     const row = db.prepare("SELECT MAX(id) as maxId FROM skill_events").get();
     lastId = row.maxId ?? 0;

package/dist/server/standalone.js

@@ -1,11 +1,11 @@
 // src/server/standalone.ts
 import { serve } from "@hono/node-server";
-import { Hono as Hono3 } from "hono";
+import { Hono as Hono4 } from "hono";
 import { cors } from "hono/cors";
 import chalk2 from "chalk";
 
 // src/server/index.ts
-import { Hono as Hono2 } from "hono";
+import { Hono as Hono3 } from "hono";
 
 // src/server/routes/events.ts
 import { streamSSE } from "hono/streaming";
@@ -36,8 +36,31 @@ function migrateSkillEvents(db) {
 function initSchema(db) {
   migrateSkillEvents(db);
   db.exec(`
+    CREATE TABLE IF NOT EXISTS chat_sessions (
+      id         TEXT PRIMARY KEY,
+      label      TEXT NOT NULL DEFAULT '',
+      type       TEXT NOT NULL DEFAULT 'main',
+      created_at TEXT NOT NULL DEFAULT (datetime('now'))
+    );
+
+    -- Ensure default session always exists
+    INSERT OR IGNORE INTO chat_sessions (id, label, type) VALUES ('default', 'Chat', 'main');
+
+    CREATE TABLE IF NOT EXISTS chat_messages (
+      id         INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL REFERENCES chat_sessions(id) ON DELETE CASCADE,
+      role       TEXT NOT NULL,
+      content    TEXT NOT NULL DEFAULT '',
+      skill_name TEXT,
+      meta       TEXT,
+      created_at TEXT NOT NULL DEFAULT (datetime('now'))
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_chat_messages_session ON chat_messages(session_id);
+
     CREATE TABLE IF NOT EXISTS skill_events (
       id         INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT REFERENCES chat_sessions(id) ON DELETE SET NULL,
       skill      TEXT NOT NULL,
       type       TEXT NOT NULL,
       message    TEXT NOT NULL,
@@ -47,6 +70,7 @@ function initSchema(db) {
 
     CREATE INDEX IF NOT EXISTS idx_skill_events_skill ON skill_events(skill);
     CREATE INDEX IF NOT EXISTS idx_skill_events_created ON skill_events(created_at);
+    CREATE INDEX IF NOT EXISTS idx_skill_events_session ON skill_events(session_id);
   `);
 }
 
@@ -56,7 +80,7 @@ var KEEPALIVE_INTERVAL_MS = 15e3;
 function eventsRoute(c) {
   const sinceParam = c.req.query("since");
   let lastId = sinceParam ? parseInt(sinceParam) : -1;
-  if (lastId === -1) {
+  if (lastId <= 0) {
     const db = getDb();
     const row = db.prepare("SELECT MAX(id) as maxId FROM skill_events").get();
     lastId = row.maxId ?? 0;
@@ -395,21 +419,23 @@ var ClaudeCodeProcess = class {
       }
       case "result": {
         if (msg.subtype === "success") {
+          const u = msg.usage ?? {};
           const mu = msg.modelUsage ?? {};
           const modelKey = Object.keys(mu)[0] ?? "";
-          const u = mu[modelKey] ?? {};
+          const modelInfo = mu[modelKey] ?? {};
           return {
             type: "complete",
             message: msg.result ?? "Done",
             data: {
               durationMs: msg.duration_ms,
               costUsd: msg.total_cost_usd,
-              inputTokens: u.inputTokens ?? 0,
-              outputTokens: u.outputTokens ?? 0,
-              cacheReadTokens: u.cacheReadInputTokens ?? 0,
-              cacheWriteTokens: u.cacheCreationInputTokens ?? 0,
-              contextWindow: u.contextWindow ?? 0,
-              maxOutputTokens: u.maxOutputTokens ?? 0,
+              // Per-turn: actual context window usage this turn
+              inputTokens: u.input_tokens ?? 0,
+              outputTokens: u.output_tokens ?? 0,
+              cacheReadTokens: u.cache_read_input_tokens ?? 0,
+              cacheWriteTokens: u.cache_creation_input_tokens ?? 0,
+              // Static model info
+              contextWindow: modelInfo.contextWindow ?? 0,
               model: modelKey
             },
             timestamp: Date.now()
@@ -550,12 +576,23 @@ function createAgentRoutes(sessionManager2) {
     }
     session.eventBuffer.length = 0;
     const provider2 = getProvider(body.provider ?? "claude-code");
+    const skillMatch = body.prompt?.match(/^Execute the skill:\s*(\S+)/);
+    if (skillMatch) {
+      try {
+        const db = getDb();
+        db.prepare(
+          `INSERT INTO skill_events (session_id, skill, type, message) VALUES (?, ?, 'invoked', ?)`
+        ).run(sessionId, skillMatch[1], `Skill ${skillMatch[1]} invoked`);
+      } catch {
+      }
+    }
     try {
       const proc = provider2.spawn({
         cwd: session.cwd,
         prompt: body.prompt,
         model: body.model ?? "claude-sonnet-4-6",
-        permissionMode: body.permissionMode ?? "acceptEdits"
+        permissionMode: body.permissionMode ?? "acceptEdits",
+        env: { SNA_SESSION_ID: sessionId }
       });
       sessionManager2.setProcess(sessionId, proc);
       logger.log("route", `POST /start?session=${sessionId} \u2192 started`);
@@ -639,6 +676,71 @@ function createAgentRoutes(sessionManager2) {
   return app;
 }
 
+// src/server/routes/chat.ts
+import { Hono as Hono2 } from "hono";
+function createChatRoutes() {
+  const app = new Hono2();
+  app.get("/sessions", (c) => {
+    const db = getDb();
+    const sessions = db.prepare(
+      `SELECT id, label, type, created_at FROM chat_sessions ORDER BY created_at DESC`
+    ).all();
+    return c.json({ sessions });
+  });
+  app.post("/sessions", async (c) => {
+    const body = await c.req.json().catch(() => ({}));
+    const id = body.id ?? crypto.randomUUID().slice(0, 8);
+    const db = getDb();
+    db.prepare(
+      `INSERT OR IGNORE INTO chat_sessions (id, label, type) VALUES (?, ?, ?)`
+    ).run(id, body.label ?? id, body.type ?? "background");
+    return c.json({ status: "created", id });
+  });
+  app.delete("/sessions/:id", (c) => {
+    const id = c.req.param("id");
+    if (id === "default") {
+      return c.json({ status: "error", message: "Cannot delete default session" }, 400);
+    }
+    const db = getDb();
+    db.prepare(`DELETE FROM chat_sessions WHERE id = ?`).run(id);
+    return c.json({ status: "deleted" });
+  });
+  app.get("/sessions/:id/messages", (c) => {
+    const id = c.req.param("id");
+    const sinceParam = c.req.query("since");
+    const db = getDb();
+    const query = sinceParam ? db.prepare(`SELECT * FROM chat_messages WHERE session_id = ? AND id > ? ORDER BY id ASC`) : db.prepare(`SELECT * FROM chat_messages WHERE session_id = ? ORDER BY id ASC`);
+    const messages = sinceParam ? query.all(id, parseInt(sinceParam, 10)) : query.all(id);
+    return c.json({ messages });
+  });
+  app.post("/sessions/:id/messages", async (c) => {
+    const sessionId = c.req.param("id");
+    const body = await c.req.json().catch(() => ({}));
+    if (!body.role) {
+      return c.json({ status: "error", message: "role is required" }, 400);
+    }
+    const db = getDb();
+    db.prepare(`INSERT OR IGNORE INTO chat_sessions (id, label, type) VALUES (?, ?, 'main')`).run(sessionId, sessionId);
+    const result = db.prepare(
+      `INSERT INTO chat_messages (session_id, role, content, skill_name, meta) VALUES (?, ?, ?, ?, ?)`
+    ).run(
+      sessionId,
+      body.role,
+      body.content ?? "",
+      body.skill_name ?? null,
+      body.meta ? JSON.stringify(body.meta) : null
+    );
+    return c.json({ status: "created", id: result.lastInsertRowid });
+  });
+  app.delete("/sessions/:id/messages", (c) => {
+    const id = c.req.param("id");
+    const db = getDb();
+    db.prepare(`DELETE FROM chat_messages WHERE session_id = ?`).run(id);
+    return c.json({ status: "cleared" });
+  });
+  return app;
+}
+
 // src/server/session-manager.ts
 var DEFAULT_MAX_SESSIONS = 5;
 var MAX_EVENT_BUFFER = 500;
@@ -742,11 +844,12 @@ var SessionManager = class {
 // src/server/index.ts
 function createSnaApp(options = {}) {
   const sessionManager2 = options.sessionManager ?? new SessionManager();
-  const app = new Hono2();
+  const app = new Hono3();
   app.get("/health", (c) => c.json({ ok: true, name: "sna", version: "1" }));
   app.get("/events", eventsRoute);
   app.post("/emit", emitRoute);
   app.route("/agent", createAgentRoutes(sessionManager2));
+  app.route("/chat", createChatRoutes());
   if (options.runCommands) {
     app.get("/run", createRunRoute(options.runCommands));
   }
@@ -758,7 +861,7 @@ var port = parseInt(process.env.SNA_PORT ?? "3099", 10);
 var permissionMode = process.env.SNA_PERMISSION_MODE ?? "acceptEdits";
 var defaultModel = process.env.SNA_MODEL ?? "claude-sonnet-4-6";
 var maxSessions = parseInt(process.env.SNA_MAX_SESSIONS ?? "5", 10);
-var root = new Hono3();
+var root = new Hono4();
 root.use("*", cors({ origin: "*", allowMethods: ["GET", "POST", "DELETE", "OPTIONS"] }));
 var methodColor = {
   GET: chalk2.green,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sna-sdk/core",
-  "version": "0.0.5",
+  "version": "0.0.10",
   "description": "Skills-Native Application runtime — server, providers, session management, database, and CLI",
   "type": "module",
   "bin": {
@@ -44,6 +44,11 @@
       "types": "./dist/server/routes/agent.d.ts",
       "default": "./dist/server/routes/agent.js"
     },
+    "./server/routes/chat": {
+      "source": "./src/server/routes/chat.ts",
+      "types": "./dist/server/routes/chat.d.ts",
+      "default": "./dist/server/routes/chat.js"
+    },
     "./db/schema": {
       "source": "./src/db/schema.ts",
       "types": "./dist/db/schema.d.ts",
@@ -60,12 +65,6 @@
       "default": "./dist/lib/sna-run.js"
     }
   },
-  "scripts": {
-    "build": "tsup",
-    "dev": "tsx --watch src/server/standalone.ts || true",
-    "test": "node --import tsx --test test/**/*.test.ts",
-    "prepublishOnly": "pnpm build"
-  },
   "engines": {
     "node": ">=18.0.0"
   },
@@ -96,5 +95,10 @@
     "tsup": "^8.0.0",
     "tsx": "^4.0.0",
     "typescript": "^5.0.0"
+  },
+  "scripts": {
+    "build": "tsup",
+    "dev": "tsx --watch src/server/standalone.ts || true",
+    "test": "node --import tsx --test test/**/*.test.ts"
   }
-}
+}