@sna-sdk/core 0.8.0 → 0.9.4

package/dist/server/session-manager.js

@@ -1,7 +1,5 @@
 import { getDb } from "../db/schema.js";
-const DEFAULT_MAX_SESSIONS = 5;
-const MAX_EVENT_BUFFER = 500;
-const PERMISSION_TIMEOUT_MS = 3e5;
+import { getConfig } from "../config.js";
 class SessionManager {
   constructor(options = {}) {
     this.sessions = /* @__PURE__ */ new Map();
@@ -13,7 +11,7 @@ class SessionManager {
     this.configChangedListeners = /* @__PURE__ */ new Set();
     this.stateChangedListeners = /* @__PURE__ */ new Set();
     this.metadataChangedListeners = /* @__PURE__ */ new Set();
-    this.maxSessions = options.maxSessions ?? DEFAULT_MAX_SESSIONS;
+    this.maxSessions = options.maxSessions ?? getConfig().maxSessions;
     this.restoreFromDb();
   }
   /** Restore session metadata from DB (cwd, label, meta). Process state is not restored. */
@@ -152,8 +150,8 @@ class SessionManager {
       if (persisted) {
         session.eventCounter++;
         session.eventBuffer.push(e);
-        if (session.eventBuffer.length > MAX_EVENT_BUFFER) {
-          session.eventBuffer.splice(0, session.eventBuffer.length - MAX_EVENT_BUFFER);
+        if (session.eventBuffer.length > getConfig().maxEventBuffer) {
+          session.eventBuffer.splice(0, session.eventBuffer.length - getConfig().maxEventBuffer);
         }
         const listeners = this.eventListeners.get(sessionId);
         if (listeners) {
@@ -212,8 +210,8 @@ class SessionManager {
     if (!session) return;
     session.eventCounter++;
     session.eventBuffer.push(event);
-    if (session.eventBuffer.length > MAX_EVENT_BUFFER) {
-      session.eventBuffer.splice(0, session.eventBuffer.length - MAX_EVENT_BUFFER);
+    if (session.eventBuffer.length > getConfig().maxEventBuffer) {
+      session.eventBuffer.splice(0, session.eventBuffer.length - getConfig().maxEventBuffer);
     }
     const listeners = this.eventListeners.get(sessionId);
     if (listeners) {
@@ -272,19 +270,22 @@ class SessionManager {
   }
   // ── Permission management ─────────────────────────────────────
   /** Create a pending permission request. Returns a promise that resolves when approved/denied. */
-  createPendingPermission(sessionId, request) {
+  createPendingPermission(sessionId, request, opts) {
     const session = this.sessions.get(sessionId);
     if (session) this.setSessionState(sessionId, session, "permission");
     return new Promise((resolve) => {
       const createdAt = Date.now();
       this.pendingPermissions.set(sessionId, { resolve, request, createdAt });
       for (const cb of this.permissionRequestListeners) cb(sessionId, request, createdAt);
-      setTimeout(() => {
-        if (this.pendingPermissions.has(sessionId)) {
-          this.pendingPermissions.delete(sessionId);
-          resolve(false);
-        }
-      }, PERMISSION_TIMEOUT_MS);
+      const timeout = opts?.timeoutMs ?? getConfig().permissionTimeoutMs;
+      if (timeout > 0) {
+        setTimeout(() => {
+          if (this.pendingPermissions.has(sessionId)) {
+            this.pendingPermissions.delete(sessionId);
+            resolve(false);
+          }
+        }, timeout);
+      }
     });
   }
   /** Resolve a pending permission request. Returns false if no pending request. */
@@ -356,7 +357,7 @@ class SessionManager {
     if (session.lastStartConfig) {
       session.lastStartConfig.model = model;
     } else {
-      session.lastStartConfig = { provider: "claude-code", model, permissionMode: "acceptEdits" };
+      session.lastStartConfig = { provider: getConfig().defaultProvider, model, permissionMode: getConfig().defaultPermissionMode };
     }
     this.persistSession(session);
     this.emitConfigChanged(id, session.lastStartConfig);
@@ -370,7 +371,7 @@ class SessionManager {
     if (session.lastStartConfig) {
       session.lastStartConfig.permissionMode = mode;
     } else {
-      session.lastStartConfig = { provider: "claude-code", model: "claude-sonnet-4-6", permissionMode: mode };
+      session.lastStartConfig = { provider: getConfig().defaultProvider, model: getConfig().model, permissionMode: mode };
     }
     this.persistSession(session);
     this.emitConfigChanged(id, session.lastStartConfig);

package/dist/server/standalone.js

@@ -111,9 +111,38 @@ function initSchema(db) {
   `);
 }
 
+// src/config.ts
+var defaults = {
+  port: 3099,
+  model: "claude-sonnet-4-6",
+  defaultProvider: "claude-code",
+  defaultPermissionMode: "default",
+  maxSessions: 5,
+  maxEventBuffer: 500,
+  permissionTimeoutMs: 0,
+  // app controls — no SDK-side timeout
+  runOnceTimeoutMs: 12e4,
+  pollIntervalMs: 500,
+  keepaliveIntervalMs: 15e3,
+  skillPollMs: 2e3,
+  dbPath: "data/sna.db"
+};
+function fromEnv() {
+  const env = {};
+  if (process.env.SNA_PORT) env.port = parseInt(process.env.SNA_PORT, 10);
+  if (process.env.SNA_MODEL) env.model = process.env.SNA_MODEL;
+  if (process.env.SNA_PERMISSION_MODE) env.defaultPermissionMode = process.env.SNA_PERMISSION_MODE;
+  if (process.env.SNA_MAX_SESSIONS) env.maxSessions = parseInt(process.env.SNA_MAX_SESSIONS, 10);
+  if (process.env.SNA_DB_PATH) env.dbPath = process.env.SNA_DB_PATH;
+  if (process.env.SNA_PERMISSION_TIMEOUT_MS) env.permissionTimeoutMs = parseInt(process.env.SNA_PERMISSION_TIMEOUT_MS, 10);
+  return env;
+}
+var current = { ...defaults, ...fromEnv() };
+function getConfig() {
+  return current;
+}
+
 // src/server/routes/events.ts
-var POLL_INTERVAL_MS = 500;
-var KEEPALIVE_INTERVAL_MS = 15e3;
 function eventsRoute(c) {
   const sinceParam = c.req.query("since");
   let lastId = sinceParam ? parseInt(sinceParam) : -1;
@@ -138,7 +167,7 @@ function eventsRoute(c) {
         closed = true;
         clearInterval(keepaliveTimer);
       }
-    }, KEEPALIVE_INTERVAL_MS);
+    }, getConfig().keepaliveIntervalMs);
     while (!closed) {
       try {
         const db = getDb();
@@ -156,7 +185,7 @@ function eventsRoute(c) {
         }
       } catch {
       }
-      await stream.sleep(POLL_INTERVAL_MS);
+      await stream.sleep(getConfig().pollIntervalMs);
     }
     clearInterval(keepaliveTimer);
   });
@@ -177,14 +206,16 @@ function wsReply(ws, msg, data) {
 function createEmitRoute(sessionManager2) {
   return async (c) => {
     const body = await c.req.json();
-    const { skill, type, message, data, session_id } = body;
+    const { skill, message, data } = body;
+    const type = body.type ?? body.eventType;
+    const session_id = c.req.query("session") ?? body.session_id ?? body.session ?? null;
     if (!skill || !type || !message) {
       return c.json({ error: "missing fields" }, 400);
     }
     const db = getDb();
     const result = db.prepare(
       `INSERT INTO skill_events (session_id, skill, type, message, data) VALUES (?, ?, ?, ?, ?)`
-    ).run(session_id ?? null, skill, type, message, data ?? null);
+    ).run(session_id, skill, type, message, data ?? null);
     const id = Number(result.lastInsertRowid);
     sessionManager2.broadcastSkillEvent({
       id,
@@ -258,6 +289,7 @@ import { spawn as spawn2, execSync } from "child_process";
 import { EventEmitter } from "events";
 import fs4 from "fs";
 import path4 from "path";
+import { fileURLToPath } from "url";
 
 // src/core/providers/cc-history-adapter.ts
 import fs2 from "fs";
@@ -417,6 +449,10 @@ var _ClaudeCodeProcess = class _ClaudeCodeProcess {
     this._sessionId = null;
     this._initEmitted = false;
     this.buffer = "";
+    /** True once we receive a real text_delta stream_event this turn */
+    this._receivedStreamEvents = false;
+    /** tool_use IDs already emitted via stream_event (to update instead of re-create in assistant block) */
+    this._streamedToolUseIds = /* @__PURE__ */ new Set();
     /**
      * FIFO event queue — ALL events (deltas, assistant, complete, etc.) go through
      * this queue. A fixed-interval timer drains one item at a time, guaranteeing
@@ -527,6 +563,9 @@ var _ClaudeCodeProcess = class _ClaudeCodeProcess {
   get alive() {
     return this._alive;
   }
+  get pid() {
+    return this.proc.pid ?? null;
+  }
   get sessionId() {
     return this._sessionId;
   }
@@ -595,7 +634,43 @@ var _ClaudeCodeProcess = class _ClaudeCodeProcess {
         }
         return null;
       }
+      case "stream_event": {
+        const inner = msg.event;
+        if (!inner) return null;
+        if (inner.type === "content_block_start" && inner.content_block?.type === "tool_use") {
+          const block = inner.content_block;
+          this._receivedStreamEvents = true;
+          this._streamedToolUseIds.add(block.id);
+          return {
+            type: "tool_use",
+            message: block.name,
+            data: { toolName: block.name, id: block.id, input: null, streaming: true },
+            timestamp: Date.now()
+          };
+        }
+        if (inner.type === "content_block_delta") {
+          const delta = inner.delta;
+          if (delta?.type === "text_delta" && delta.text) {
+            this._receivedStreamEvents = true;
+            return {
+              type: "assistant_delta",
+              delta: delta.text,
+              index: inner.index ?? 0,
+              timestamp: Date.now()
+            };
+          }
+          if (delta?.type === "thinking_delta" && delta.thinking) {
+            return {
+              type: "thinking_delta",
+              message: delta.thinking,
+              timestamp: Date.now()
+            };
+          }
+        }
+        return null;
+      }
       case "assistant": {
+        if (this._receivedStreamEvents && msg.message?.stop_reason === null) return null;
         const content = msg.message?.content;
         if (!Array.isArray(content)) return null;
         const events = [];
@@ -608,10 +683,12 @@ var _ClaudeCodeProcess = class _ClaudeCodeProcess {
               timestamp: Date.now()
             });
           } else if (block.type === "tool_use") {
+            const alreadyStreamed = this._streamedToolUseIds.has(block.id);
+            if (alreadyStreamed) this._streamedToolUseIds.delete(block.id);
             events.push({
               type: "tool_use",
               message: block.name,
-              data: { toolName: block.name, input: block.input, id: block.id },
+              data: { toolName: block.name, input: block.input, id: block.id, update: alreadyStreamed },
               timestamp: Date.now()
             });
           } else if (block.type === "text") {
@@ -626,7 +703,7 @@ var _ClaudeCodeProcess = class _ClaudeCodeProcess {
             this.enqueue(e);
           }
           for (const text of textBlocks) {
-            this.enqueueTextAsDeltas(text);
+            this.enqueue({ type: "assistant", message: text, timestamp: Date.now() });
           }
         }
         return null;
@@ -648,6 +725,15 @@ var _ClaudeCodeProcess = class _ClaudeCodeProcess {
       }
       case "result": {
         if (msg.subtype === "success") {
+          if (this._receivedStreamEvents && msg.result) {
+            this.enqueue({
+              type: "assistant",
+              message: msg.result,
+              timestamp: Date.now()
+            });
+            this._receivedStreamEvents = false;
+            this._streamedToolUseIds.clear();
+          }
           const u = msg.usage ?? {};
           const mu = msg.modelUsage ?? {};
           const modelKey = Object.keys(mu)[0] ?? "";
@@ -715,7 +801,13 @@ var ClaudeCodeProvider = class {
     const claudeParts = claudeCommand.split(/\s+/);
     const claudePath = claudeParts[0];
     const claudePrefix = claudeParts.slice(1);
-    const hookScript = new URL("../../scripts/hook.js", import.meta.url).pathname;
+    let pkgRoot = path4.dirname(fileURLToPath(import.meta.url));
+    while (!fs4.existsSync(path4.join(pkgRoot, "package.json"))) {
+      const parent = path4.dirname(pkgRoot);
+      if (parent === pkgRoot) break;
+      pkgRoot = parent;
+    }
+    const hookScript = path4.join(pkgRoot, "dist", "scripts", "hook.js");
     const sessionId = options.env?.SNA_SESSION_ID ?? "default";
     const sdkSettings = {};
     if (options.permissionMode !== "bypassPermissions") {
@@ -755,6 +847,7 @@ var ClaudeCodeProvider = class {
       "--input-format",
       "stream-json",
       "--verbose",
+      "--include-partial-messages",
       "--settings",
       JSON.stringify(sdkSettings)
     ];
@@ -776,6 +869,9 @@ var ClaudeCodeProvider = class {
       args.push(...extraArgsClean);
     }
     const cleanEnv = { ...process.env, ...options.env };
+    if (options.configDir) {
+      cleanEnv.CLAUDE_CONFIG_DIR = options.configDir;
+    }
     delete cleanEnv.CLAUDECODE;
     delete cleanEnv.CLAUDE_CODE_ENTRYPOINT;
     delete cleanEnv.CLAUDE_CODE_SESSION_ACCESS_TOKEN;
@@ -873,24 +969,24 @@ function resolveImagePath(sessionId, filename) {
 function getSessionId(c) {
   return c.req.query("session") ?? "default";
 }
-var DEFAULT_RUN_ONCE_TIMEOUT = 12e4;
 async function runOnce(sessionManager2, opts) {
   const sessionId = `run-once-${crypto.randomUUID().slice(0, 8)}`;
-  const timeout = opts.timeout ?? DEFAULT_RUN_ONCE_TIMEOUT;
+  const timeout = opts.timeout ?? getConfig().runOnceTimeoutMs;
   const session = sessionManager2.createSession({
     id: sessionId,
     label: "run-once",
     cwd: opts.cwd ?? process.cwd()
   });
-  const provider2 = getProvider(opts.provider ?? "claude-code");
+  const cfg = getConfig();
+  const provider2 = getProvider(opts.provider ?? cfg.defaultProvider);
   const extraArgs = opts.extraArgs ? [...opts.extraArgs] : [];
   if (opts.systemPrompt) extraArgs.push("--system-prompt", opts.systemPrompt);
   if (opts.appendSystemPrompt) extraArgs.push("--append-system-prompt", opts.appendSystemPrompt);
   const proc = provider2.spawn({
     cwd: session.cwd,
     prompt: opts.message,
-    model: opts.model ?? "claude-sonnet-4-6",
-    permissionMode: opts.permissionMode ?? "bypassPermissions",
+    model: opts.model ?? cfg.model,
+    permissionMode: opts.permissionMode ?? cfg.defaultPermissionMode,
     env: { SNA_SESSION_ID: sessionId },
     extraArgs
   });
@@ -931,6 +1027,7 @@ function createAgentRoutes(sessionManager2) {
     const body = await c.req.json().catch(() => ({}));
     try {
       const session = sessionManager2.createSession({
+        id: body.id,
         label: body.label,
         cwd: body.cwd,
         meta: body.meta
@@ -957,6 +1054,22 @@ function createAgentRoutes(sessionManager2) {
     logger.log("route", `DELETE /sessions/${id} \u2192 removed`);
     return httpJson(c, "sessions.remove", { status: "removed" });
   });
+  app.patch("/sessions/:id", async (c) => {
+    const id = c.req.param("id");
+    const body = await c.req.json().catch(() => ({}));
+    try {
+      sessionManager2.updateSession(id, {
+        label: body.label,
+        meta: body.meta,
+        cwd: body.cwd
+      });
+      logger.log("route", `PATCH /sessions/${id} \u2192 updated`);
+      return httpJson(c, "sessions.update", { status: "updated", session: id });
+    } catch (e) {
+      logger.err("err", `PATCH /sessions/${id} \u2192 ${e.message}`);
+      return c.json({ status: "error", message: e.message }, 404);
+    }
+  });
   app.post("/run-once", async (c) => {
     const body = await c.req.json().catch(() => ({}));
     if (!body.message) {
@@ -980,14 +1093,14 @@ function createAgentRoutes(sessionManager2) {
       logger.log("route", `POST /start?session=${sessionId} \u2192 already_running`);
       return httpJson(c, "agent.start", {
         status: "already_running",
-        provider: "claude-code",
+        provider: getConfig().defaultProvider,
         sessionId: session.process.sessionId ?? session.id
       });
     }
     if (session.process?.alive) {
       session.process.kill();
     }
-    const provider2 = getProvider(body.provider ?? "claude-code");
+    const provider2 = getProvider(body.provider ?? getConfig().defaultProvider);
     try {
       const db = getDb();
       db.prepare(`INSERT OR IGNORE INTO chat_sessions (id, label, type) VALUES (?, ?, 'main')`).run(sessionId, session.label ?? sessionId);
@@ -1002,9 +1115,10 @@ function createAgentRoutes(sessionManager2) {
       }
     } catch {
     }
-    const providerName = body.provider ?? "claude-code";
-    const model = body.model ?? "claude-sonnet-4-6";
+    const providerName = body.provider ?? getConfig().defaultProvider;
+    const model = body.model ?? getConfig().model;
     const permissionMode2 = body.permissionMode;
+    const configDir = body.configDir;
     const extraArgs = body.extraArgs;
     try {
       const proc = provider2.spawn({
@@ -1012,12 +1126,13 @@ function createAgentRoutes(sessionManager2) {
         prompt: body.prompt,
         model,
         permissionMode: permissionMode2,
+        configDir,
         env: { SNA_SESSION_ID: sessionId },
         history: body.history,
         extraArgs
       });
       sessionManager2.setProcess(sessionId, proc);
-      sessionManager2.saveStartConfig(sessionId, { provider: providerName, model, permissionMode: permissionMode2, extraArgs });
+      sessionManager2.saveStartConfig(sessionId, { provider: providerName, model, permissionMode: permissionMode2, configDir, extraArgs });
       logger.log("route", `POST /start?session=${sessionId} \u2192 started`);
       return httpJson(c, "agent.start", {
         status: "started",
@@ -1086,7 +1201,7 @@ function createAgentRoutes(sessionManager2) {
     const sinceParam = c.req.query("since");
     const sinceCursor = sinceParam ? parseInt(sinceParam, 10) : session.eventCounter;
     return streamSSE3(c, async (stream) => {
-      const KEEPALIVE_MS = 15e3;
+      const KEEPALIVE_MS = getConfig().keepaliveIntervalMs;
       const signal = c.req.raw.signal;
       const queue = [];
       let wakeUp = null;
@@ -1156,6 +1271,7 @@ function createAgentRoutes(sessionManager2) {
           cwd: sessionManager2.getSession(sessionId).cwd,
           model: cfg.model,
           permissionMode: cfg.permissionMode,
+          configDir: cfg.configDir,
           env: { SNA_SESSION_ID: sessionId },
           extraArgs: [...cfg.extraArgs ?? [], ...resumeArgs]
         });
@@ -1182,9 +1298,10 @@ function createAgentRoutes(sessionManager2) {
     if (history.length === 0 && !body.prompt) {
       return c.json({ status: "error", message: "No history in DB \u2014 nothing to resume." }, 400);
     }
-    const providerName = body.provider ?? "claude-code";
-    const model = body.model ?? session.lastStartConfig?.model ?? "claude-sonnet-4-6";
+    const providerName = body.provider ?? getConfig().defaultProvider;
+    const model = body.model ?? session.lastStartConfig?.model ?? getConfig().model;
     const permissionMode2 = body.permissionMode ?? session.lastStartConfig?.permissionMode;
+    const configDir = body.configDir ?? session.lastStartConfig?.configDir;
     const extraArgs = body.extraArgs ?? session.lastStartConfig?.extraArgs;
     const provider2 = getProvider(providerName);
     try {
@@ -1193,12 +1310,13 @@ function createAgentRoutes(sessionManager2) {
         prompt: body.prompt,
         model,
         permissionMode: permissionMode2,
+        configDir,
         env: { SNA_SESSION_ID: sessionId },
         history: history.length > 0 ? history : void 0,
         extraArgs
       });
       sessionManager2.setProcess(sessionId, proc, "resumed");
-      sessionManager2.saveStartConfig(sessionId, { provider: providerName, model, permissionMode: permissionMode2, extraArgs });
+      sessionManager2.saveStartConfig(sessionId, { provider: providerName, model, permissionMode: permissionMode2, configDir, extraArgs });
       logger.log("route", `POST /resume?session=${sessionId} \u2192 resumed (${history.length} history msgs)`);
       return httpJson(c, "agent.resume", {
         status: "resumed",
@@ -1312,11 +1430,12 @@ function createChatRoutes() {
   app.post("/sessions", async (c) => {
     const body = await c.req.json().catch(() => ({}));
     const id = body.id ?? crypto.randomUUID().slice(0, 8);
+    const sessionType = body.type ?? body.chatType ?? "background";
     try {
       const db = getDb();
       db.prepare(
         `INSERT OR IGNORE INTO chat_sessions (id, label, type, meta) VALUES (?, ?, ?, ?)`
-      ).run(id, body.label ?? id, body.type ?? "background", body.meta ? JSON.stringify(body.meta) : null);
+      ).run(id, body.label ?? id, sessionType, body.meta ? JSON.stringify(body.meta) : null);
       return httpJson(c, "chat.sessions.create", { status: "created", id, meta: body.meta ?? null });
     } catch (e) {
       return c.json({ status: "error", message: e.message }, 500);
@@ -1404,9 +1523,6 @@ function createChatRoutes() {
 }
 
 // src/server/session-manager.ts
-var DEFAULT_MAX_SESSIONS = 5;
-var MAX_EVENT_BUFFER = 500;
-var PERMISSION_TIMEOUT_MS = 3e5;
 var SessionManager = class {
   constructor(options = {}) {
     this.sessions = /* @__PURE__ */ new Map();
@@ -1418,7 +1534,7 @@ var SessionManager = class {
     this.configChangedListeners = /* @__PURE__ */ new Set();
     this.stateChangedListeners = /* @__PURE__ */ new Set();
     this.metadataChangedListeners = /* @__PURE__ */ new Set();
-    this.maxSessions = options.maxSessions ?? DEFAULT_MAX_SESSIONS;
+    this.maxSessions = options.maxSessions ?? getConfig().maxSessions;
     this.restoreFromDb();
   }
   /** Restore session metadata from DB (cwd, label, meta). Process state is not restored. */
@@ -1557,8 +1673,8 @@ var SessionManager = class {
       if (persisted) {
         session.eventCounter++;
         session.eventBuffer.push(e);
-        if (session.eventBuffer.length > MAX_EVENT_BUFFER) {
-          session.eventBuffer.splice(0, session.eventBuffer.length - MAX_EVENT_BUFFER);
+        if (session.eventBuffer.length > getConfig().maxEventBuffer) {
+          session.eventBuffer.splice(0, session.eventBuffer.length - getConfig().maxEventBuffer);
         }
         const listeners = this.eventListeners.get(sessionId);
         if (listeners) {
@@ -1617,8 +1733,8 @@ var SessionManager = class {
     if (!session) return;
     session.eventCounter++;
     session.eventBuffer.push(event);
-    if (session.eventBuffer.length > MAX_EVENT_BUFFER) {
-      session.eventBuffer.splice(0, session.eventBuffer.length - MAX_EVENT_BUFFER);
+    if (session.eventBuffer.length > getConfig().maxEventBuffer) {
+      session.eventBuffer.splice(0, session.eventBuffer.length - getConfig().maxEventBuffer);
     }
     const listeners = this.eventListeners.get(sessionId);
     if (listeners) {
@@ -1677,19 +1793,22 @@ var SessionManager = class {
   }
   // ── Permission management ─────────────────────────────────────
   /** Create a pending permission request. Returns a promise that resolves when approved/denied. */
-  createPendingPermission(sessionId, request) {
+  createPendingPermission(sessionId, request, opts) {
     const session = this.sessions.get(sessionId);
     if (session) this.setSessionState(sessionId, session, "permission");
     return new Promise((resolve) => {
       const createdAt = Date.now();
       this.pendingPermissions.set(sessionId, { resolve, request, createdAt });
       for (const cb of this.permissionRequestListeners) cb(sessionId, request, createdAt);
-      setTimeout(() => {
-        if (this.pendingPermissions.has(sessionId)) {
-          this.pendingPermissions.delete(sessionId);
-          resolve(false);
-        }
-      }, PERMISSION_TIMEOUT_MS);
+      const timeout = opts?.timeoutMs ?? getConfig().permissionTimeoutMs;
+      if (timeout > 0) {
+        setTimeout(() => {
+          if (this.pendingPermissions.has(sessionId)) {
+            this.pendingPermissions.delete(sessionId);
+            resolve(false);
+          }
+        }, timeout);
+      }
     });
   }
   /** Resolve a pending permission request. Returns false if no pending request. */
@@ -1761,7 +1880,7 @@ var SessionManager = class {
     if (session.lastStartConfig) {
       session.lastStartConfig.model = model;
     } else {
-      session.lastStartConfig = { provider: "claude-code", model, permissionMode: "acceptEdits" };
+      session.lastStartConfig = { provider: getConfig().defaultProvider, model, permissionMode: getConfig().defaultPermissionMode };
     }
     this.persistSession(session);
     this.emitConfigChanged(id, session.lastStartConfig);
@@ -1775,7 +1894,7 @@ var SessionManager = class {
     if (session.lastStartConfig) {
       session.lastStartConfig.permissionMode = mode;
     } else {
-      session.lastStartConfig = { provider: "claude-code", model: "claude-sonnet-4-6", permissionMode: mode };
+      session.lastStartConfig = { provider: getConfig().defaultProvider, model: getConfig().model, permissionMode: mode };
     }
     this.persistSession(session);
     this.emitConfigChanged(id, session.lastStartConfig);
@@ -2049,6 +2168,7 @@ function handleMessage(ws, msg, sm, state) {
 function handleSessionsCreate(ws, msg, sm) {
   try {
     const session = sm.createSession({
+      id: msg.id,
       label: msg.label,
       cwd: msg.cwd,
       meta: msg.meta
@@ -2086,11 +2206,11 @@ function handleAgentStart(ws, msg, sm) {
     cwd: msg.cwd
   });
   if (session.process?.alive && !msg.force) {
-    wsReply(ws, msg, { status: "already_running", provider: "claude-code", sessionId: session.id });
+    wsReply(ws, msg, { status: "already_running", provider: getConfig().defaultProvider, sessionId: session.id });
     return;
   }
   if (session.process?.alive) session.process.kill();
-  const provider2 = getProvider(msg.provider ?? "claude-code");
+  const provider2 = getProvider(msg.provider ?? getConfig().defaultProvider);
   try {
     const db = getDb();
     db.prepare(`INSERT OR IGNORE INTO chat_sessions (id, label, type) VALUES (?, ?, 'main')`).run(sessionId, session.label ?? sessionId);
@@ -2103,9 +2223,11 @@ function handleAgentStart(ws, msg, sm) {
     }
   } catch {
   }
-  const providerName = msg.provider ?? "claude-code";
-  const model = msg.model ?? "claude-sonnet-4-6";
+  const cfg = getConfig();
+  const providerName = msg.provider ?? cfg.defaultProvider;
+  const model = msg.model ?? cfg.model;
   const permissionMode2 = msg.permissionMode;
+  const configDir = msg.configDir;
   const extraArgs = msg.extraArgs;
   try {
     const proc = provider2.spawn({
@@ -2113,12 +2235,13 @@ function handleAgentStart(ws, msg, sm) {
       prompt: msg.prompt,
       model,
       permissionMode: permissionMode2,
+      configDir,
       env: { SNA_SESSION_ID: sessionId },
       history: msg.history,
       extraArgs
     });
     sm.setProcess(sessionId, proc);
-    sm.saveStartConfig(sessionId, { provider: providerName, model, permissionMode: permissionMode2, extraArgs });
+    sm.saveStartConfig(sessionId, { provider: providerName, model, permissionMode: permissionMode2, configDir, extraArgs });
     wsReply(ws, msg, { status: "started", provider: provider2.name, sessionId: session.id });
   } catch (e) {
     replyError(ws, msg, e.message);
@@ -2178,9 +2301,10 @@ function handleAgentResume(ws, msg, sm) {
   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 providerName = msg.provider ?? session.lastStartConfig?.provider ?? getConfig().defaultProvider;
+  const model = msg.model ?? session.lastStartConfig?.model ?? getConfig().model;
   const permissionMode2 = msg.permissionMode ?? session.lastStartConfig?.permissionMode;
+  const configDir = msg.configDir ?? session.lastStartConfig?.configDir;
   const extraArgs = msg.extraArgs ?? session.lastStartConfig?.extraArgs;
   const provider2 = getProvider(providerName);
   try {
@@ -2189,12 +2313,13 @@ function handleAgentResume(ws, msg, sm) {
       prompt: msg.prompt,
       model,
       permissionMode: permissionMode2,
+      configDir,
       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: permissionMode2, extraArgs });
+    sm.saveStartConfig(sessionId, { provider: providerName, model, permissionMode: permissionMode2, configDir, extraArgs });
     wsReply(ws, msg, {
       status: "resumed",
       provider: providerName,
@@ -2215,6 +2340,7 @@ function handleAgentRestart(ws, msg, sm) {
         provider: msg.provider,
         model: msg.model,
         permissionMode: msg.permissionMode,
+        configDir: msg.configDir,
         extraArgs: msg.extraArgs
       },
       (cfg) => {
@@ -2224,6 +2350,7 @@ function handleAgentRestart(ws, msg, sm) {
           cwd: sm.getSession(sessionId).cwd,
           model: cfg.model,
           permissionMode: cfg.permissionMode,
+          configDir: cfg.configDir,
           env: { SNA_SESSION_ID: sessionId },
           extraArgs: [...cfg.extraArgs ?? [], ...resumeArgs]
         });
@@ -2362,7 +2489,6 @@ function handleAgentUnsubscribe(ws, msg, state) {
   state.agentUnsubs.delete(sessionId);
   reply(ws, msg, {});
 }
-var SKILL_POLL_MS = 2e3;
 function handleEventsSubscribe(ws, msg, sm, state) {
   state.skillEventUnsub?.();
   state.skillEventUnsub = null;
@@ -2402,7 +2528,7 @@ function handleEventsSubscribe(ws, msg, sm, state) {
       }
     } catch {
     }
-  }, SKILL_POLL_MS);
+  }, getConfig().skillPollMs);
   reply(ws, msg, { lastId });
 }
 function handleEventsUnsubscribe(ws, msg, state) {
@@ -2586,10 +2712,7 @@ try {
   }
   process.exit(1);
 }
-var port = parseInt(process.env.SNA_PORT ?? "3099", 10);
-var permissionMode = process.env.SNA_PERMISSION_MODE;
-var defaultModel = process.env.SNA_MODEL ?? "claude-sonnet-4-6";
-var maxSessions = parseInt(process.env.SNA_MAX_SESSIONS ?? "5", 10);
+var { port, defaultPermissionMode: permissionMode, model: defaultModel, maxSessions } = getConfig();
 var root = new Hono4();
 root.use("*", cors({ origin: "*", allowMethods: ["GET", "POST", "DELETE", "OPTIONS"] }));
 root.onError((err2, c) => {