sparkecoder 0.1.3 → 0.1.5

package/dist/cli.js

@@ -13,16 +13,21 @@ import "dotenv/config";
 import { createInterface } from "readline";
 
 // src/server/index.ts
+import "dotenv/config";
 import { Hono as Hono5 } from "hono";
 import { serve } from "@hono/node-server";
 import { cors } from "hono/cors";
 import { logger } from "hono/logger";
-import { existsSync as existsSync5, mkdirSync } from "fs";
+import { existsSync as existsSync7, mkdirSync as mkdirSync2 } from "fs";
+import { resolve as resolve6, dirname as dirname4, join as join3 } from "path";
+import { spawn } from "child_process";
+import { createServer as createNetServer } from "net";
+import { fileURLToPath } from "url";
 
 // src/server/routes/sessions.ts
 import { Hono } from "hono";
 import { zValidator } from "@hono/zod-validator";
-import { z as z9 } from "zod";
+import { z as z8 } from "zod";
 
 // src/db/index.ts
 import Database from "better-sqlite3";
@@ -33,6 +38,9 @@ import { nanoid } from "nanoid";
 // src/db/schema.ts
 var schema_exports = {};
 __export(schema_exports, {
+  activeStreams: () => activeStreams,
+  checkpoints: () => checkpoints,
+  fileBackups: () => fileBackups,
   loadedSkills: () => loadedSkills,
   messages: () => messages,
   sessions: () => sessions,
@@ -108,6 +116,37 @@ var terminals = sqliteTable("terminals", {
   createdAt: integer("created_at", { mode: "timestamp" }).notNull().$defaultFn(() => /* @__PURE__ */ new Date()),
   stoppedAt: integer("stopped_at", { mode: "timestamp" })
 });
+var activeStreams = sqliteTable("active_streams", {
+  id: text("id").primaryKey(),
+  sessionId: text("session_id").notNull().references(() => sessions.id, { onDelete: "cascade" }),
+  streamId: text("stream_id").notNull().unique(),
+  // Unique stream identifier
+  status: text("status", { enum: ["active", "finished", "error"] }).notNull().default("active"),
+  createdAt: integer("created_at", { mode: "timestamp" }).notNull().$defaultFn(() => /* @__PURE__ */ new Date()),
+  finishedAt: integer("finished_at", { mode: "timestamp" })
+});
+var checkpoints = sqliteTable("checkpoints", {
+  id: text("id").primaryKey(),
+  sessionId: text("session_id").notNull().references(() => sessions.id, { onDelete: "cascade" }),
+  // The message sequence number this checkpoint was created BEFORE
+  // (i.e., the state before this user message was processed)
+  messageSequence: integer("message_sequence").notNull(),
+  // Optional git commit hash if in a git repo
+  gitHead: text("git_head"),
+  createdAt: integer("created_at", { mode: "timestamp" }).notNull().$defaultFn(() => /* @__PURE__ */ new Date())
+});
+var fileBackups = sqliteTable("file_backups", {
+  id: text("id").primaryKey(),
+  checkpointId: text("checkpoint_id").notNull().references(() => checkpoints.id, { onDelete: "cascade" }),
+  sessionId: text("session_id").notNull().references(() => sessions.id, { onDelete: "cascade" }),
+  // Relative path from working directory
+  filePath: text("file_path").notNull(),
+  // Original content (null means file didn't exist before)
+  originalContent: text("original_content"),
+  // Whether the file existed before this checkpoint
+  existed: integer("existed", { mode: "boolean" }).notNull().default(true),
+  createdAt: integer("created_at", { mode: "timestamp" }).notNull().$defaultFn(() => /* @__PURE__ */ new Date())
+});
 
 // src/db/index.ts
 var db = null;
@@ -117,14 +156,7 @@ function initDatabase(dbPath) {
   sqlite.pragma("journal_mode = WAL");
   db = drizzle(sqlite, { schema: schema_exports });
   sqlite.exec(`
-    DROP TABLE IF EXISTS terminals;
-    DROP TABLE IF EXISTS loaded_skills;
-    DROP TABLE IF EXISTS todo_items;
-    DROP TABLE IF EXISTS tool_executions;
-    DROP TABLE IF EXISTS messages;
-    DROP TABLE IF EXISTS sessions;
-
-    CREATE TABLE sessions (
+    CREATE TABLE IF NOT EXISTS sessions (
       id TEXT PRIMARY KEY,
       name TEXT,
       working_directory TEXT NOT NULL,
@@ -135,7 +167,7 @@ function initDatabase(dbPath) {
       updated_at INTEGER NOT NULL
     );
 
-    CREATE TABLE messages (
+    CREATE TABLE IF NOT EXISTS messages (
       id TEXT PRIMARY KEY,
       session_id TEXT NOT NULL REFERENCES sessions(id) ON DELETE CASCADE,
       model_message TEXT NOT NULL,
@@ -143,7 +175,7 @@ function initDatabase(dbPath) {
       created_at INTEGER NOT NULL
     );
 
-    CREATE TABLE tool_executions (
+    CREATE TABLE IF NOT EXISTS tool_executions (
       id TEXT PRIMARY KEY,
       session_id TEXT NOT NULL REFERENCES sessions(id) ON DELETE CASCADE,
       message_id TEXT REFERENCES messages(id) ON DELETE CASCADE,
@@ -158,7 +190,7 @@ function initDatabase(dbPath) {
       completed_at INTEGER
     );
 
-    CREATE TABLE todo_items (
+    CREATE TABLE IF NOT EXISTS todo_items (
       id TEXT PRIMARY KEY,
       session_id TEXT NOT NULL REFERENCES sessions(id) ON DELETE CASCADE,
       content TEXT NOT NULL,
@@ -168,14 +200,14 @@ function initDatabase(dbPath) {
       updated_at INTEGER NOT NULL
     );
 
-    CREATE TABLE loaded_skills (
+    CREATE TABLE IF NOT EXISTS loaded_skills (
       id TEXT PRIMARY KEY,
       session_id TEXT NOT NULL REFERENCES sessions(id) ON DELETE CASCADE,
       skill_name TEXT NOT NULL,
       loaded_at INTEGER NOT NULL
     );
 
-    CREATE TABLE terminals (
+    CREATE TABLE IF NOT EXISTS terminals (
       id TEXT PRIMARY KEY,
       session_id TEXT NOT NULL REFERENCES sessions(id) ON DELETE CASCADE,
       name TEXT,
@@ -189,11 +221,45 @@ function initDatabase(dbPath) {
       stopped_at INTEGER
     );
 
+    -- Table for tracking active streams (for resumable streams)
+    CREATE TABLE IF NOT EXISTS active_streams (
+      id TEXT PRIMARY KEY,
+      session_id TEXT NOT NULL REFERENCES sessions(id) ON DELETE CASCADE,
+      stream_id TEXT NOT NULL UNIQUE,
+      status TEXT NOT NULL DEFAULT 'active',
+      created_at INTEGER NOT NULL,
+      finished_at INTEGER
+    );
+
+    -- Checkpoints table - created before each user message
+    CREATE TABLE IF NOT EXISTS checkpoints (
+      id TEXT PRIMARY KEY,
+      session_id TEXT NOT NULL REFERENCES sessions(id) ON DELETE CASCADE,
+      message_sequence INTEGER NOT NULL,
+      git_head TEXT,
+      created_at INTEGER NOT NULL
+    );
+
+    -- File backups table - stores original file content
+    CREATE TABLE IF NOT EXISTS file_backups (
+      id TEXT PRIMARY KEY,
+      checkpoint_id TEXT NOT NULL REFERENCES checkpoints(id) ON DELETE CASCADE,
+      session_id TEXT NOT NULL REFERENCES sessions(id) ON DELETE CASCADE,
+      file_path TEXT NOT NULL,
+      original_content TEXT,
+      existed INTEGER NOT NULL DEFAULT 1,
+      created_at INTEGER NOT NULL
+    );
+
     CREATE INDEX IF NOT EXISTS idx_messages_session ON messages(session_id);
     CREATE INDEX IF NOT EXISTS idx_tool_executions_session ON tool_executions(session_id);
     CREATE INDEX IF NOT EXISTS idx_todo_items_session ON todo_items(session_id);
     CREATE INDEX IF NOT EXISTS idx_loaded_skills_session ON loaded_skills(session_id);
     CREATE INDEX IF NOT EXISTS idx_terminals_session ON terminals(session_id);
+    CREATE INDEX IF NOT EXISTS idx_active_streams_session ON active_streams(session_id);
+    CREATE INDEX IF NOT EXISTS idx_checkpoints_session ON checkpoints(session_id);
+    CREATE INDEX IF NOT EXISTS idx_file_backups_checkpoint ON file_backups(checkpoint_id);
+    CREATE INDEX IF NOT EXISTS idx_file_backups_session ON file_backups(session_id);
   `);
   return db;
 }
@@ -203,6 +269,13 @@ function getDb() {
   }
   return db;
 }
+function closeDatabase() {
+  if (sqlite) {
+    sqlite.close();
+    sqlite = null;
+    db = null;
+  }
+}
 var sessionQueries = {
   create(data) {
     const id = nanoid();
@@ -224,6 +297,12 @@ var sessionQueries = {
   updateStatus(id, status) {
     return getDb().update(sessions).set({ status, updatedAt: /* @__PURE__ */ new Date() }).where(eq(sessions.id, id)).returning().get();
   },
+  updateModel(id, model) {
+    return getDb().update(sessions).set({ model, updatedAt: /* @__PURE__ */ new Date() }).where(eq(sessions.id, id)).returning().get();
+  },
+  update(id, updates) {
+    return getDb().update(sessions).set({ ...updates, updatedAt: /* @__PURE__ */ new Date() }).where(eq(sessions.id, id)).returning().get();
+  },
   delete(id) {
     const result = getDb().delete(sessions).where(eq(sessions.id, id)).run();
     return result.changes > 0;
@@ -297,6 +376,19 @@ var messageQueries = {
   deleteBySession(sessionId) {
     const result = getDb().delete(messages).where(eq(messages.sessionId, sessionId)).run();
     return result.changes;
+  },
+  /**
+   * Delete all messages with sequence >= the given sequence number
+   * (Used when reverting to a checkpoint)
+   */
+  deleteFromSequence(sessionId, fromSequence) {
+    const result = getDb().delete(messages).where(
+      and(
+        eq(messages.sessionId, sessionId),
+        sql`sequence >= ${fromSequence}`
+      )
+    ).run();
+    return result.changes;
   }
 };
 var toolExecutionQueries = {
@@ -340,6 +432,19 @@ var toolExecutionQueries = {
   },
   getBySession(sessionId) {
     return getDb().select().from(toolExecutions).where(eq(toolExecutions.sessionId, sessionId)).orderBy(toolExecutions.startedAt).all();
+  },
+  /**
+   * Delete all tool executions after a given timestamp
+   * (Used when reverting to a checkpoint)
+   */
+  deleteAfterTime(sessionId, afterTime) {
+    const result = getDb().delete(toolExecutions).where(
+      and(
+        eq(toolExecutions.sessionId, sessionId),
+        sql`started_at > ${afterTime.getTime()}`
+      )
+    ).run();
+    return result.changes;
   }
 };
 var todoQueries = {
@@ -405,47 +510,146 @@ var skillQueries = {
     return !!result;
   }
 };
-var terminalQueries = {
+var activeStreamQueries = {
+  create(sessionId, streamId) {
+    const id = nanoid();
+    const result = getDb().insert(activeStreams).values({
+      id,
+      sessionId,
+      streamId,
+      status: "active",
+      createdAt: /* @__PURE__ */ new Date()
+    }).returning().get();
+    return result;
+  },
+  getBySessionId(sessionId) {
+    return getDb().select().from(activeStreams).where(
+      and(
+        eq(activeStreams.sessionId, sessionId),
+        eq(activeStreams.status, "active")
+      )
+    ).get();
+  },
+  getByStreamId(streamId) {
+    return getDb().select().from(activeStreams).where(eq(activeStreams.streamId, streamId)).get();
+  },
+  finish(streamId) {
+    return getDb().update(activeStreams).set({ status: "finished", finishedAt: /* @__PURE__ */ new Date() }).where(eq(activeStreams.streamId, streamId)).returning().get();
+  },
+  markError(streamId) {
+    return getDb().update(activeStreams).set({ status: "error", finishedAt: /* @__PURE__ */ new Date() }).where(eq(activeStreams.streamId, streamId)).returning().get();
+  },
+  deleteBySession(sessionId) {
+    const result = getDb().delete(activeStreams).where(eq(activeStreams.sessionId, sessionId)).run();
+    return result.changes;
+  }
+};
+var checkpointQueries = {
   create(data) {
     const id = nanoid();
-    const result = getDb().insert(terminals).values({
+    const result = getDb().insert(checkpoints).values({
       id,
-      ...data,
+      sessionId: data.sessionId,
+      messageSequence: data.messageSequence,
+      gitHead: data.gitHead,
       createdAt: /* @__PURE__ */ new Date()
     }).returning().get();
     return result;
   },
   getById(id) {
-    return getDb().select().from(terminals).where(eq(terminals.id, id)).get();
+    return getDb().select().from(checkpoints).where(eq(checkpoints.id, id)).get();
   },
   getBySession(sessionId) {
-    return getDb().select().from(terminals).where(eq(terminals.sessionId, sessionId)).orderBy(desc(terminals.createdAt)).all();
+    return getDb().select().from(checkpoints).where(eq(checkpoints.sessionId, sessionId)).orderBy(checkpoints.messageSequence).all();
   },
-  getRunning(sessionId) {
-    return getDb().select().from(terminals).where(
+  getByMessageSequence(sessionId, messageSequence) {
+    return getDb().select().from(checkpoints).where(
       and(
-        eq(terminals.sessionId, sessionId),
-        eq(terminals.status, "running")
+        eq(checkpoints.sessionId, sessionId),
+        eq(checkpoints.messageSequence, messageSequence)
       )
-    ).all();
+    ).get();
   },
-  updateStatus(id, status, exitCode, error) {
-    return getDb().update(terminals).set({
-      status,
-      exitCode,
-      error,
-      stoppedAt: status !== "running" ? /* @__PURE__ */ new Date() : void 0
-    }).where(eq(terminals.id, id)).returning().get();
+  getLatest(sessionId) {
+    return getDb().select().from(checkpoints).where(eq(checkpoints.sessionId, sessionId)).orderBy(desc(checkpoints.messageSequence)).limit(1).get();
   },
-  updatePid(id, pid) {
-    return getDb().update(terminals).set({ pid }).where(eq(terminals.id, id)).returning().get();
+  /**
+   * Delete all checkpoints after a given sequence number
+   * (Used when reverting to a checkpoint)
+   */
+  deleteAfterSequence(sessionId, messageSequence) {
+    const result = getDb().delete(checkpoints).where(
+      and(
+        eq(checkpoints.sessionId, sessionId),
+        sql`message_sequence > ${messageSequence}`
+      )
+    ).run();
+    return result.changes;
   },
-  delete(id) {
-    const result = getDb().delete(terminals).where(eq(terminals.id, id)).run();
-    return result.changes > 0;
+  deleteBySession(sessionId) {
+    const result = getDb().delete(checkpoints).where(eq(checkpoints.sessionId, sessionId)).run();
+    return result.changes;
+  }
+};
+var fileBackupQueries = {
+  create(data) {
+    const id = nanoid();
+    const result = getDb().insert(fileBackups).values({
+      id,
+      checkpointId: data.checkpointId,
+      sessionId: data.sessionId,
+      filePath: data.filePath,
+      originalContent: data.originalContent,
+      existed: data.existed,
+      createdAt: /* @__PURE__ */ new Date()
+    }).returning().get();
+    return result;
+  },
+  getByCheckpoint(checkpointId) {
+    return getDb().select().from(fileBackups).where(eq(fileBackups.checkpointId, checkpointId)).all();
+  },
+  getBySession(sessionId) {
+    return getDb().select().from(fileBackups).where(eq(fileBackups.sessionId, sessionId)).orderBy(fileBackups.createdAt).all();
+  },
+  /**
+   * Get all file backups from a given checkpoint sequence onwards (inclusive)
+   * (Used when reverting - need to restore these files)
+   * 
+   * When reverting to checkpoint X, we need backups from checkpoint X and all later ones
+   * because checkpoint X's backups represent the state BEFORE processing message X.
+   */
+  getFromSequence(sessionId, messageSequence) {
+    const checkpointsFrom = getDb().select().from(checkpoints).where(
+      and(
+        eq(checkpoints.sessionId, sessionId),
+        sql`message_sequence >= ${messageSequence}`
+      )
+    ).all();
+    if (checkpointsFrom.length === 0) {
+      return [];
+    }
+    const checkpointIds = checkpointsFrom.map((c) => c.id);
+    const allBackups = [];
+    for (const cpId of checkpointIds) {
+      const backups = getDb().select().from(fileBackups).where(eq(fileBackups.checkpointId, cpId)).all();
+      allBackups.push(...backups);
+    }
+    return allBackups;
+  },
+  /**
+   * Check if a file already has a backup in the current checkpoint
+   */
+  hasBackup(checkpointId, filePath) {
+    const result = getDb().select().from(fileBackups).where(
+      and(
+        eq(fileBackups.checkpointId, checkpointId),
+        eq(fileBackups.filePath, filePath)
+      )
+    ).get();
+    return !!result;
   },
   deleteBySession(sessionId) {
-    const result = getDb().delete(terminals).where(eq(terminals.sessionId, sessionId)).run();
+    const result = getDb().delete(fileBackups).where(eq(fileBackups.sessionId, sessionId)).run();
     return result.changes;
   }
 };
@@ -454,16 +658,17 @@ var terminalQueries = {
 import {
   streamText,
   generateText as generateText2,
-  tool as tool7,
+  tool as tool6,
   stepCountIs
 } from "ai";
 import { gateway as gateway2 } from "@ai-sdk/gateway";
-import { z as z8 } from "zod";
-import { nanoid as nanoid2 } from "nanoid";
+import { z as z7 } from "zod";
+import { nanoid as nanoid3 } from "nanoid";
 
 // src/config/index.ts
-import { existsSync, readFileSync } from "fs";
-import { resolve, dirname } from "path";
+import { existsSync, readFileSync, mkdirSync, writeFileSync } from "fs";
+import { resolve, dirname, join } from "path";
+import { homedir, platform } from "os";
 
 // src/config/types.ts
 import { z } from "zod";
@@ -524,6 +729,24 @@ var CONFIG_FILE_NAMES = [
   "sparkecoder.json",
   ".sparkecoder.json"
 ];
+function getAppDataDirectory() {
+  const appName = "sparkecoder";
+  switch (platform()) {
+    case "darwin":
+      return join(homedir(), "Library", "Application Support", appName);
+    case "win32":
+      return join(process.env.APPDATA || join(homedir(), "AppData", "Roaming"), appName);
+    default:
+      return join(process.env.XDG_DATA_HOME || join(homedir(), ".local", "share"), appName);
+  }
+}
+function ensureAppDataDirectory() {
+  const dir = getAppDataDirectory();
+  if (!existsSync(dir)) {
+    mkdirSync(dir, { recursive: true });
+  }
+  return dir;
+}
 var cachedConfig = null;
 function findConfigFile(startDir) {
   let currentDir = startDir;
@@ -536,6 +759,13 @@ function findConfigFile(startDir) {
     }
     currentDir = dirname(currentDir);
   }
+  const appDataDir = getAppDataDirectory();
+  for (const fileName of CONFIG_FILE_NAMES) {
+    const configPath = join(appDataDir, fileName);
+    if (existsSync(configPath)) {
+      return configPath;
+    }
+  }
   return null;
 }
 function loadConfig(configPath, workingDirectory) {
@@ -570,7 +800,14 @@ function loadConfig(configPath, workingDirectory) {
     rawConfig.databasePath = process.env.DATABASE_PATH;
   }
   const config = SparkcoderConfigSchema.parse(rawConfig);
-  const resolvedWorkingDirectory = config.workingDirectory ? resolve(configDir, config.workingDirectory) : cwd;
+  let resolvedWorkingDirectory;
+  if (workingDirectory) {
+    resolvedWorkingDirectory = workingDirectory;
+  } else if (config.workingDirectory && config.workingDirectory !== "." && config.workingDirectory.startsWith("/")) {
+    resolvedWorkingDirectory = config.workingDirectory;
+  } else {
+    resolvedWorkingDirectory = process.cwd();
+  }
   const resolvedSkillsDirectories = [
     resolve(configDir, config.skills?.directory || "./skills"),
     // Built-in skills
@@ -585,7 +822,13 @@ function loadConfig(configPath, workingDirectory) {
       return false;
     }
   });
-  const resolvedDatabasePath = resolve(configDir, config.databasePath || "./sparkecoder.db");
+  let resolvedDatabasePath;
+  if (config.databasePath && config.databasePath !== "./sparkecoder.db") {
+    resolvedDatabasePath = resolve(configDir, config.databasePath);
+  } else {
+    const appDataDir = ensureAppDataDirectory();
+    resolvedDatabasePath = join(appDataDir, "sparkecoder.db");
+  }
   const resolved = {
     ...config,
     server: {
@@ -622,7 +865,7 @@ function requiresApproval(toolName, sessionConfig) {
 function createDefaultConfig() {
   return {
     defaultModel: "anthropic/claude-opus-4-5",
-    workingDirectory: ".",
+    // workingDirectory is intentionally not set - defaults to where CLI is run
     toolApprovals: {
       bash: true,
       write_file: false,
@@ -646,12 +889,104 @@ function createDefaultConfig() {
     databasePath: "./sparkecoder.db"
   };
 }
+var API_KEYS_FILE = "api-keys.json";
+var PROVIDER_ENV_MAP = {
+  anthropic: "ANTHROPIC_API_KEY",
+  openai: "OPENAI_API_KEY",
+  google: "GOOGLE_GENERATIVE_AI_API_KEY",
+  xai: "XAI_API_KEY",
+  "ai-gateway": "AI_GATEWAY_API_KEY"
+};
+var SUPPORTED_PROVIDERS = Object.keys(PROVIDER_ENV_MAP);
+function getApiKeysPath() {
+  const appDir = ensureAppDataDirectory();
+  return join(appDir, API_KEYS_FILE);
+}
+function loadStoredApiKeys() {
+  const keysPath = getApiKeysPath();
+  if (!existsSync(keysPath)) {
+    return {};
+  }
+  try {
+    const content = readFileSync(keysPath, "utf-8");
+    return JSON.parse(content);
+  } catch {
+    return {};
+  }
+}
+function saveStoredApiKeys(keys) {
+  const keysPath = getApiKeysPath();
+  writeFileSync(keysPath, JSON.stringify(keys, null, 2), { mode: 384 });
+}
+function loadApiKeysIntoEnv() {
+  const storedKeys = loadStoredApiKeys();
+  for (const [provider, envVar] of Object.entries(PROVIDER_ENV_MAP)) {
+    if (!process.env[envVar] && storedKeys[provider]) {
+      process.env[envVar] = storedKeys[provider];
+    }
+  }
+}
+function setApiKey(provider, apiKey) {
+  const normalizedProvider = provider.toLowerCase();
+  const envVar = PROVIDER_ENV_MAP[normalizedProvider];
+  if (!envVar) {
+    throw new Error(`Unknown provider: ${provider}. Supported: ${SUPPORTED_PROVIDERS.join(", ")}`);
+  }
+  const storedKeys = loadStoredApiKeys();
+  storedKeys[normalizedProvider] = apiKey;
+  saveStoredApiKeys(storedKeys);
+  process.env[envVar] = apiKey;
+}
+function removeApiKey(provider) {
+  const normalizedProvider = provider.toLowerCase();
+  const envVar = PROVIDER_ENV_MAP[normalizedProvider];
+  if (!envVar) {
+    throw new Error(`Unknown provider: ${provider}. Supported: ${SUPPORTED_PROVIDERS.join(", ")}`);
+  }
+  const storedKeys = loadStoredApiKeys();
+  delete storedKeys[normalizedProvider];
+  saveStoredApiKeys(storedKeys);
+}
+function getApiKeyStatus() {
+  const storedKeys = loadStoredApiKeys();
+  return SUPPORTED_PROVIDERS.map((provider) => {
+    const envVar = PROVIDER_ENV_MAP[provider];
+    const envValue = process.env[envVar];
+    const storedValue = storedKeys[provider];
+    let source = "none";
+    let value;
+    if (envValue) {
+      if (storedValue && envValue === storedValue) {
+        source = "storage";
+      } else {
+        source = "env";
+      }
+      value = envValue;
+    } else if (storedValue) {
+      source = "storage";
+      value = storedValue;
+    }
+    return {
+      provider,
+      envVar,
+      configured: !!value,
+      source,
+      maskedKey: value ? maskApiKey(value) : null
+    };
+  });
+}
+function maskApiKey(key) {
+  if (key.length <= 12) {
+    return "****" + key.slice(-4);
+  }
+  return key.slice(0, 4) + "..." + key.slice(-4);
+}
 
 // src/tools/bash.ts
 import { tool } from "ai";
 import { z as z2 } from "zod";
-import { exec } from "child_process";
-import { promisify } from "util";
+import { exec as exec2 } from "child_process";
+import { promisify as promisify2 } from "util";
 
 // src/utils/truncate.ts
 var MAX_OUTPUT_CHARS = 1e4;
@@ -674,109 +1009,561 @@ function calculateContextSize(messages2) {
   }, 0);
 }
 
-// src/tools/bash.ts
+// src/terminal/tmux.ts
+import { exec } from "child_process";
+import { promisify } from "util";
+import { mkdir, writeFile, readFile } from "fs/promises";
+import { existsSync as existsSync2 } from "fs";
+import { join as join2 } from "path";
+import { nanoid as nanoid2 } from "nanoid";
 var execAsync = promisify(exec);
-var COMMAND_TIMEOUT = 6e4;
-var MAX_OUTPUT_CHARS2 = 1e4;
-var BLOCKED_COMMANDS = [
-  "rm -rf /",
-  "rm -rf ~",
-  "mkfs",
-  "dd if=/dev/zero",
-  ":(){:|:&};:",
-  "chmod -R 777 /"
-];
-function isBlockedCommand(command) {
-  const normalizedCommand = command.toLowerCase().trim();
-  return BLOCKED_COMMANDS.some(
-    (blocked) => normalizedCommand.includes(blocked.toLowerCase())
-  );
+var SESSION_PREFIX = "spark_";
+var LOG_BASE_DIR = ".sparkecoder/sessions";
+var tmuxAvailableCache = null;
+async function isTmuxAvailable() {
+  if (tmuxAvailableCache !== null) {
+    return tmuxAvailableCache;
+  }
+  try {
+    const { stdout } = await execAsync("tmux -V");
+    tmuxAvailableCache = true;
+    return true;
+  } catch (error) {
+    tmuxAvailableCache = false;
+    console.log(`[tmux] Not available: ${error instanceof Error ? error.message : "unknown error"}`);
+    return false;
+  }
 }
-var bashInputSchema = z2.object({
-  command: z2.string().describe("The bash command to execute. Can be a single command or a pipeline.")
-});
-function createBashTool(options) {
-  return tool({
-    description: `Execute a bash command in the terminal. The command runs in the working directory: ${options.workingDirectory}. 
-Use this for running shell commands, scripts, git operations, package managers (npm, pip, etc.), and other CLI tools.
-Long outputs will be automatically truncated. Commands have a 60 second timeout.
-IMPORTANT: Avoid destructive commands. Be careful with rm, chmod, and similar operations.`,
-    inputSchema: bashInputSchema,
-    execute: async ({ command }) => {
-      if (isBlockedCommand(command)) {
-        return {
-          success: false,
-          error: "This command is blocked for safety reasons.",
-          stdout: "",
-          stderr: "",
-          exitCode: 1
-        };
+function generateTerminalId() {
+  return "t" + nanoid2(9);
+}
+function getSessionName(terminalId) {
+  return `${SESSION_PREFIX}${terminalId}`;
+}
+function getLogDir(terminalId, workingDirectory, sessionId) {
+  if (sessionId) {
+    return join2(workingDirectory, LOG_BASE_DIR, sessionId, "terminals", terminalId);
+  }
+  return join2(workingDirectory, ".sparkecoder/terminals", terminalId);
+}
+function shellEscape(str) {
+  return `'${str.replace(/'/g, "'\\''")}'`;
+}
+async function initLogDir(terminalId, meta, workingDirectory) {
+  const logDir = getLogDir(terminalId, workingDirectory, meta.sessionId);
+  await mkdir(logDir, { recursive: true });
+  await writeFile(join2(logDir, "meta.json"), JSON.stringify(meta, null, 2));
+  await writeFile(join2(logDir, "output.log"), "");
+  return logDir;
+}
+async function pollUntil(condition, options) {
+  const { timeout, interval = 100 } = options;
+  const startTime = Date.now();
+  while (Date.now() - startTime < timeout) {
+    if (await condition()) {
+      return true;
+    }
+    await new Promise((r) => setTimeout(r, interval));
+  }
+  return false;
+}
+async function runSync(command, workingDirectory, options) {
+  if (!options) {
+    throw new Error("runSync: options parameter is required (must include sessionId)");
+  }
+  const id = options.terminalId || generateTerminalId();
+  const session = getSessionName(id);
+  const logDir = await initLogDir(id, {
+    id,
+    command,
+    cwd: workingDirectory,
+    createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+    sessionId: options.sessionId,
+    background: false
+  }, workingDirectory);
+  const logFile = join2(logDir, "output.log");
+  const exitCodeFile = join2(logDir, "exit_code");
+  const timeout = options.timeout || 12e4;
+  try {
+    const wrappedCommand = `(${command}) 2>&1 | tee -a ${shellEscape(logFile)}; echo $? > ${shellEscape(exitCodeFile)}`;
+    await execAsync(
+      `tmux new-session -d -s ${session} -c ${shellEscape(workingDirectory)} ${shellEscape(wrappedCommand)}`,
+      { timeout: 5e3 }
+    );
+    try {
+      await execAsync(
+        `tmux pipe-pane -t ${session} -o 'cat >> ${shellEscape(logFile)}'`,
+        { timeout: 1e3 }
+      );
+    } catch {
+    }
+    const completed = await pollUntil(
+      async () => {
+        try {
+          await execAsync(`tmux has-session -t ${session}`, { timeout: 1e3 });
+          return false;
+        } catch {
+          return true;
+        }
+      },
+      { timeout, interval: 100 }
+    );
+    if (!completed) {
+      try {
+        await execAsync(`tmux kill-session -t ${session}`, { timeout: 5e3 });
+      } catch {
       }
+      let output2 = "";
       try {
-        const { stdout, stderr } = await execAsync(command, {
-          cwd: options.workingDirectory,
-          timeout: COMMAND_TIMEOUT,
-          maxBuffer: 10 * 1024 * 1024,
-          // 10MB buffer
-          shell: "/bin/bash"
-        });
-        const truncatedStdout = truncateOutput(stdout, MAX_OUTPUT_CHARS2);
-        const truncatedStderr = truncateOutput(stderr, MAX_OUTPUT_CHARS2 / 2);
-        if (options.onOutput) {
-          options.onOutput(truncatedStdout);
-        }
-        return {
-          success: true,
-          stdout: truncatedStdout,
-          stderr: truncatedStderr,
-          exitCode: 0
-        };
-      } catch (error) {
-        const stdout = error.stdout ? truncateOutput(error.stdout, MAX_OUTPUT_CHARS2) : "";
-        const stderr = error.stderr ? truncateOutput(error.stderr, MAX_OUTPUT_CHARS2) : "";
-        if (options.onOutput) {
-          options.onOutput(stderr || error.message);
-        }
-        if (error.killed) {
-          return {
-            success: false,
-            error: `Command timed out after ${COMMAND_TIMEOUT / 1e3} seconds`,
-            stdout,
-            stderr,
-            exitCode: 124
-            // Standard timeout exit code
-          };
-        }
-        return {
-          success: false,
-          error: error.message,
-          stdout,
-          stderr,
-          exitCode: error.code ?? 1
-        };
+        output2 = await readFile(logFile, "utf-8");
+      } catch {
       }
+      return {
+        id,
+        output: output2.trim(),
+        exitCode: 124,
+        // Standard timeout exit code
+        status: "error"
+      };
     }
-  });
+    await new Promise((r) => setTimeout(r, 50));
+    let output = "";
+    try {
+      output = await readFile(logFile, "utf-8");
+    } catch {
+    }
+    let exitCode = 0;
+    try {
+      if (existsSync2(exitCodeFile)) {
+        const exitCodeStr = await readFile(exitCodeFile, "utf-8");
+        exitCode = parseInt(exitCodeStr.trim(), 10) || 0;
+      }
+    } catch {
+    }
+    return {
+      id,
+      output: output.trim(),
+      exitCode,
+      status: "completed"
+    };
+  } catch (error) {
+    try {
+      await execAsync(`tmux kill-session -t ${session}`, { timeout: 5e3 });
+    } catch {
+    }
+    throw error;
+  }
 }
-
-// src/tools/read-file.ts
-import { tool as tool2 } from "ai";
-import { z as z3 } from "zod";
-import { readFile, stat } from "fs/promises";
-import { resolve as resolve2, relative, isAbsolute } from "path";
-import { existsSync as existsSync2 } from "fs";
-var MAX_FILE_SIZE = 5 * 1024 * 1024;
-var MAX_OUTPUT_CHARS3 = 5e4;
-var readFileInputSchema = z3.object({
-  path: z3.string().describe("The path to the file to read. Can be relative to working directory or absolute."),
-  startLine: z3.number().optional().describe("Optional: Start reading from this line number (1-indexed)"),
-  endLine: z3.number().optional().describe("Optional: Stop reading at this line number (1-indexed, inclusive)")
-});
-function createReadFileTool(options) {
-  return tool2({
-    description: `Read the contents of a file. Provide a path relative to the working directory (${options.workingDirectory}) or an absolute path.
-Large files will be automatically truncated. Binary files are not supported.
-Use this to understand existing code, check file contents, or gather context.`,
+async function runBackground(command, workingDirectory, options) {
+  if (!options) {
+    throw new Error("runBackground: options parameter is required (must include sessionId)");
+  }
+  const id = options.terminalId || generateTerminalId();
+  const session = getSessionName(id);
+  const logDir = await initLogDir(id, {
+    id,
+    command,
+    cwd: workingDirectory,
+    createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+    sessionId: options.sessionId,
+    background: true
+  }, workingDirectory);
+  const logFile = join2(logDir, "output.log");
+  const wrappedCommand = `(${command}) 2>&1 | tee -a ${shellEscape(logFile)}`;
+  await execAsync(
+    `tmux new-session -d -s ${session} -c ${shellEscape(workingDirectory)} ${shellEscape(wrappedCommand)}`,
+    { timeout: 5e3 }
+  );
+  return {
+    id,
+    output: "",
+    exitCode: 0,
+    status: "running"
+  };
+}
+async function getLogs(terminalId, workingDirectory, options = {}) {
+  const session = getSessionName(terminalId);
+  const logDir = getLogDir(terminalId, workingDirectory, options.sessionId);
+  const logFile = join2(logDir, "output.log");
+  let isRunning2 = false;
+  try {
+    await execAsync(`tmux has-session -t ${session}`, { timeout: 5e3 });
+    isRunning2 = true;
+  } catch {
+  }
+  if (isRunning2) {
+    try {
+      const lines = options.tail || 1e3;
+      const { stdout } = await execAsync(
+        `tmux capture-pane -t ${session} -p -S -${lines}`,
+        { timeout: 5e3, maxBuffer: 10 * 1024 * 1024 }
+      );
+      return { output: stdout.trim(), status: "running" };
+    } catch {
+    }
+  }
+  try {
+    let output = await readFile(logFile, "utf-8");
+    if (options.tail) {
+      const lines = output.split("\n");
+      output = lines.slice(-options.tail).join("\n");
+    }
+    return { output: output.trim(), status: isRunning2 ? "running" : "stopped" };
+  } catch {
+    return { output: "", status: "unknown" };
+  }
+}
+async function isRunning(terminalId) {
+  const session = getSessionName(terminalId);
+  try {
+    await execAsync(`tmux has-session -t ${session}`, { timeout: 5e3 });
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function killTerminal(terminalId) {
+  const session = getSessionName(terminalId);
+  try {
+    await execAsync(`tmux kill-session -t ${session}`, { timeout: 5e3 });
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function listSessions() {
+  try {
+    const { stdout } = await execAsync(
+      `tmux list-sessions -F '#{session_name}' 2>/dev/null || true`,
+      { timeout: 5e3 }
+    );
+    return stdout.trim().split("\n").filter((name) => name.startsWith(SESSION_PREFIX)).map((name) => name.slice(SESSION_PREFIX.length));
+  } catch {
+    return [];
+  }
+}
+async function getMeta(terminalId, workingDirectory, sessionId) {
+  const logDir = getLogDir(terminalId, workingDirectory, sessionId);
+  const metaFile = join2(logDir, "meta.json");
+  try {
+    const content = await readFile(metaFile, "utf-8");
+    return JSON.parse(content);
+  } catch {
+    return null;
+  }
+}
+async function listSessionTerminals(sessionId, workingDirectory) {
+  const terminalsDir = join2(workingDirectory, LOG_BASE_DIR, sessionId, "terminals");
+  const terminals3 = [];
+  try {
+    const { readdir: readdir2 } = await import("fs/promises");
+    const entries = await readdir2(terminalsDir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (entry.isDirectory()) {
+        const meta = await getMeta(entry.name, workingDirectory, sessionId);
+        if (meta) {
+          terminals3.push(meta);
+        }
+      }
+    }
+  } catch {
+  }
+  return terminals3;
+}
+async function sendInput(terminalId, input, options = {}) {
+  const session = getSessionName(terminalId);
+  const { pressEnter = true } = options;
+  try {
+    await execAsync(`tmux has-session -t ${session}`, { timeout: 1e3 });
+    await execAsync(
+      `tmux send-keys -t ${session} -l ${shellEscape(input)}`,
+      { timeout: 1e3 }
+    );
+    if (pressEnter) {
+      await execAsync(
+        `tmux send-keys -t ${session} Enter`,
+        { timeout: 1e3 }
+      );
+    }
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function sendKey(terminalId, key) {
+  const session = getSessionName(terminalId);
+  try {
+    await execAsync(`tmux has-session -t ${session}`, { timeout: 1e3 });
+    await execAsync(`tmux send-keys -t ${session} ${key}`, { timeout: 1e3 });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+// src/tools/bash.ts
+var execAsync2 = promisify2(exec2);
+var COMMAND_TIMEOUT = 12e4;
+var MAX_OUTPUT_CHARS2 = 1e4;
+var BLOCKED_COMMANDS = [
+  "rm -rf /",
+  "rm -rf ~",
+  "mkfs",
+  "dd if=/dev/zero",
+  ":(){:|:&};:",
+  "chmod -R 777 /"
+];
+function isBlockedCommand(command) {
+  const normalizedCommand = command.toLowerCase().trim();
+  return BLOCKED_COMMANDS.some(
+    (blocked) => normalizedCommand.includes(blocked.toLowerCase())
+  );
+}
+var bashInputSchema = z2.object({
+  command: z2.string().optional().describe("The command to execute. Required for running new commands."),
+  background: z2.boolean().default(false).describe("Run the command in background mode (for dev servers, watchers). Returns immediately with terminal ID."),
+  id: z2.string().optional().describe("Terminal ID. Use to get logs from, send input to, or kill an existing terminal."),
+  kill: z2.boolean().optional().describe("Kill the terminal with the given ID."),
+  tail: z2.number().optional().describe("Number of lines to return from the end of output (for logs)."),
+  input: z2.string().optional().describe("Send text input to an interactive terminal (requires id). Used for responding to prompts."),
+  key: z2.enum(["Enter", "Escape", "Up", "Down", "Left", "Right", "Tab", "C-c", "C-d", "y", "n"]).optional().describe('Send a special key to an interactive terminal (requires id). Use "y" or "n" for yes/no prompts.')
+});
+var useTmux = null;
+async function shouldUseTmux() {
+  if (useTmux === null) {
+    useTmux = await isTmuxAvailable();
+    if (!useTmux) {
+      console.warn("[bash] tmux not available, using fallback exec mode");
+    }
+  }
+  return useTmux;
+}
+async function execFallback(command, workingDirectory, onOutput) {
+  try {
+    const { stdout, stderr } = await execAsync2(command, {
+      cwd: workingDirectory,
+      timeout: COMMAND_TIMEOUT,
+      maxBuffer: 10 * 1024 * 1024
+    });
+    const output = truncateOutput(stdout + (stderr ? `
+${stderr}` : ""), MAX_OUTPUT_CHARS2);
+    onOutput?.(output);
+    return {
+      success: true,
+      output,
+      exitCode: 0
+    };
+  } catch (error) {
+    const output = truncateOutput(
+      (error.stdout || "") + (error.stderr ? `
+${error.stderr}` : ""),
+      MAX_OUTPUT_CHARS2
+    );
+    onOutput?.(output || error.message);
+    if (error.killed) {
+      return {
+        success: false,
+        error: `Command timed out after ${COMMAND_TIMEOUT / 1e3} seconds`,
+        output,
+        exitCode: 124
+      };
+    }
+    return {
+      success: false,
+      error: error.message,
+      output,
+      exitCode: error.code ?? 1
+    };
+  }
+}
+function createBashTool(options) {
+  return tool({
+    description: `Execute commands in the terminal. Every command runs in its own session with logs saved to disk.
+
+**Run a command (default - waits for completion):**
+bash({ command: "npm install" })
+bash({ command: "git status" })
+
+**Run in background (for dev servers, watchers, or interactive commands):**
+bash({ command: "npm run dev", background: true })
+\u2192 Returns { id: "abc123" } - save this ID
+
+**Check on a background process:**
+bash({ id: "abc123" })
+bash({ id: "abc123", tail: 50 })  // last 50 lines only
+
+**Stop a background process:**
+bash({ id: "abc123", kill: true })
+
+**Respond to interactive prompts (for yes/no questions, etc.):**
+bash({ id: "abc123", key: "y" })   // send 'y' for yes
+bash({ id: "abc123", key: "n" })   // send 'n' for no
+bash({ id: "abc123", key: "Enter" })  // press Enter
+bash({ id: "abc123", input: "my text" })  // send text input
+
+**IMPORTANT for interactive commands:**
+- Use --yes, -y, or similar flags to avoid prompts when available
+- For create-next-app: add --yes to accept defaults
+- For npm: add --yes or -y to skip confirmation
+- If prompts are unavoidable, run in background mode and use input/key to respond
+
+Logs are saved to .sparkecoder/terminals/{id}/output.log`,
+    inputSchema: bashInputSchema,
+    execute: async (inputArgs) => {
+      const { command, background, id, kill, tail, input: textInput, key } = inputArgs;
+      if (id) {
+        if (kill) {
+          const success = await killTerminal(id);
+          return {
+            success,
+            id,
+            status: success ? "stopped" : "not_found",
+            message: success ? `Terminal ${id} stopped` : `Terminal ${id} not found or already stopped`
+          };
+        }
+        if (textInput !== void 0) {
+          const success = await sendInput(id, textInput, { pressEnter: true });
+          if (!success) {
+            return {
+              success: false,
+              id,
+              error: `Terminal ${id} not found or not running`
+            };
+          }
+          await new Promise((r) => setTimeout(r, 300));
+          const { output: output2, status: status2 } = await getLogs(id, options.workingDirectory, { tail: tail || 50, sessionId: options.sessionId });
+          const truncatedOutput2 = truncateOutput(output2, MAX_OUTPUT_CHARS2);
+          return {
+            success: true,
+            id,
+            output: truncatedOutput2,
+            status: status2,
+            message: `Sent input "${textInput}" to terminal`
+          };
+        }
+        if (key) {
+          const success = await sendKey(id, key);
+          if (!success) {
+            return {
+              success: false,
+              id,
+              error: `Terminal ${id} not found or not running`
+            };
+          }
+          await new Promise((r) => setTimeout(r, 300));
+          const { output: output2, status: status2 } = await getLogs(id, options.workingDirectory, { tail: tail || 50, sessionId: options.sessionId });
+          const truncatedOutput2 = truncateOutput(output2, MAX_OUTPUT_CHARS2);
+          return {
+            success: true,
+            id,
+            output: truncatedOutput2,
+            status: status2,
+            message: `Sent key "${key}" to terminal`
+          };
+        }
+        const { output, status } = await getLogs(id, options.workingDirectory, { tail, sessionId: options.sessionId });
+        const truncatedOutput = truncateOutput(output, MAX_OUTPUT_CHARS2);
+        return {
+          success: true,
+          id,
+          output: truncatedOutput,
+          status
+        };
+      }
+      if (!command) {
+        return {
+          success: false,
+          error: 'Either "command" (to run a new command) or "id" (to check/kill/send input) is required'
+        };
+      }
+      if (isBlockedCommand(command)) {
+        return {
+          success: false,
+          error: "This command is blocked for safety reasons.",
+          output: "",
+          exitCode: 1
+        };
+      }
+      const canUseTmux = await shouldUseTmux();
+      if (background) {
+        if (!canUseTmux) {
+          return {
+            success: false,
+            error: "Background mode requires tmux to be installed. Install with: brew install tmux (macOS) or apt install tmux (Linux)"
+          };
+        }
+        const terminalId = generateTerminalId();
+        options.onProgress?.({ terminalId, status: "started", command });
+        const result = await runBackground(command, options.workingDirectory, {
+          sessionId: options.sessionId,
+          terminalId
+        });
+        return {
+          success: true,
+          id: result.id,
+          status: "running",
+          message: `Started background process. Use bash({ id: "${result.id}" }) to check logs.`
+        };
+      }
+      if (canUseTmux) {
+        const terminalId = generateTerminalId();
+        options.onProgress?.({ terminalId, status: "started", command });
+        try {
+          const result = await runSync(command, options.workingDirectory, {
+            sessionId: options.sessionId,
+            timeout: COMMAND_TIMEOUT,
+            terminalId
+          });
+          const truncatedOutput = truncateOutput(result.output, MAX_OUTPUT_CHARS2);
+          options.onOutput?.(truncatedOutput);
+          options.onProgress?.({ terminalId, status: "completed", command });
+          return {
+            success: result.exitCode === 0,
+            id: result.id,
+            output: truncatedOutput,
+            exitCode: result.exitCode,
+            status: result.status
+          };
+        } catch (error) {
+          options.onProgress?.({ terminalId, status: "completed", command });
+          return {
+            success: false,
+            error: error.message,
+            output: "",
+            exitCode: 1
+          };
+        }
+      } else {
+        const result = await execFallback(command, options.workingDirectory, options.onOutput);
+        return {
+          success: result.success,
+          output: result.output,
+          exitCode: result.exitCode,
+          error: result.error
+        };
+      }
+    }
+  });
+}
+
+// src/tools/read-file.ts
+import { tool as tool2 } from "ai";
+import { z as z3 } from "zod";
+import { readFile as readFile2, stat } from "fs/promises";
+import { resolve as resolve2, relative, isAbsolute } from "path";
+import { existsSync as existsSync3 } from "fs";
+var MAX_FILE_SIZE = 5 * 1024 * 1024;
+var MAX_OUTPUT_CHARS3 = 5e4;
+var readFileInputSchema = z3.object({
+  path: z3.string().describe("The path to the file to read. Can be relative to working directory or absolute."),
+  startLine: z3.number().optional().describe("Optional: Start reading from this line number (1-indexed)"),
+  endLine: z3.number().optional().describe("Optional: Stop reading at this line number (1-indexed, inclusive)")
+});
+function createReadFileTool(options) {
+  return tool2({
+    description: `Read the contents of a file. Provide a path relative to the working directory (${options.workingDirectory}) or an absolute path.
+Large files will be automatically truncated. Binary files are not supported.
+Use this to understand existing code, check file contents, or gather context.`,
     inputSchema: readFileInputSchema,
     execute: async ({ path, startLine, endLine }) => {
       try {
@@ -789,7 +1576,7 @@ Use this to understand existing code, check file contents, or gather context.`,
             content: null
           };
         }
-        if (!existsSync2(absolutePath)) {
+        if (!existsSync3(absolutePath)) {
           return {
             success: false,
             error: `File not found: ${path}`,
@@ -811,7 +1598,7 @@ Use this to understand existing code, check file contents, or gather context.`,
             content: null
           };
         }
-        let content = await readFile(absolutePath, "utf-8");
+        let content = await readFile2(absolutePath, "utf-8");
         if (startLine !== void 0 || endLine !== void 0) {
           const lines = content.split("\n");
           const start = (startLine ?? 1) - 1;
@@ -859,9 +1646,198 @@ Use this to understand existing code, check file contents, or gather context.`,
 // src/tools/write-file.ts
 import { tool as tool3 } from "ai";
 import { z as z4 } from "zod";
-import { readFile as readFile2, writeFile, mkdir } from "fs/promises";
-import { resolve as resolve3, relative as relative2, isAbsolute as isAbsolute2, dirname as dirname2 } from "path";
-import { existsSync as existsSync3 } from "fs";
+import { readFile as readFile4, writeFile as writeFile3, mkdir as mkdir3 } from "fs/promises";
+import { resolve as resolve4, relative as relative3, isAbsolute as isAbsolute2, dirname as dirname3 } from "path";
+import { existsSync as existsSync5 } from "fs";
+
+// src/checkpoints/index.ts
+import { readFile as readFile3, writeFile as writeFile2, unlink, mkdir as mkdir2 } from "fs/promises";
+import { existsSync as existsSync4 } from "fs";
+import { resolve as resolve3, relative as relative2, dirname as dirname2 } from "path";
+import { exec as exec3 } from "child_process";
+import { promisify as promisify3 } from "util";
+var execAsync3 = promisify3(exec3);
+async function getGitHead(workingDirectory) {
+  try {
+    const { stdout } = await execAsync3("git rev-parse HEAD", {
+      cwd: workingDirectory,
+      timeout: 5e3
+    });
+    return stdout.trim();
+  } catch {
+    return void 0;
+  }
+}
+var activeManagers = /* @__PURE__ */ new Map();
+function getCheckpointManager(sessionId, workingDirectory) {
+  let manager = activeManagers.get(sessionId);
+  if (!manager) {
+    manager = {
+      sessionId,
+      workingDirectory,
+      currentCheckpointId: null
+    };
+    activeManagers.set(sessionId, manager);
+  }
+  return manager;
+}
+async function createCheckpoint(sessionId, workingDirectory, messageSequence) {
+  const gitHead = await getGitHead(workingDirectory);
+  const checkpoint = checkpointQueries.create({
+    sessionId,
+    messageSequence,
+    gitHead
+  });
+  const manager = getCheckpointManager(sessionId, workingDirectory);
+  manager.currentCheckpointId = checkpoint.id;
+  return checkpoint;
+}
+async function backupFile(sessionId, workingDirectory, filePath) {
+  const manager = getCheckpointManager(sessionId, workingDirectory);
+  if (!manager.currentCheckpointId) {
+    console.warn("[checkpoint] No active checkpoint, skipping file backup");
+    return null;
+  }
+  const absolutePath = resolve3(workingDirectory, filePath);
+  const relativePath = relative2(workingDirectory, absolutePath);
+  if (fileBackupQueries.hasBackup(manager.currentCheckpointId, relativePath)) {
+    return null;
+  }
+  let originalContent = null;
+  let existed = false;
+  if (existsSync4(absolutePath)) {
+    try {
+      originalContent = await readFile3(absolutePath, "utf-8");
+      existed = true;
+    } catch (error) {
+      console.warn(`[checkpoint] Failed to read file for backup: ${error.message}`);
+    }
+  }
+  const backup = fileBackupQueries.create({
+    checkpointId: manager.currentCheckpointId,
+    sessionId,
+    filePath: relativePath,
+    originalContent,
+    existed
+  });
+  return backup;
+}
+async function revertToCheckpoint(sessionId, checkpointId) {
+  const session = sessionQueries.getById(sessionId);
+  if (!session) {
+    return {
+      success: false,
+      filesRestored: 0,
+      filesDeleted: 0,
+      messagesDeleted: 0,
+      checkpointsDeleted: 0,
+      error: "Session not found"
+    };
+  }
+  const checkpoint = checkpointQueries.getById(checkpointId);
+  if (!checkpoint || checkpoint.sessionId !== sessionId) {
+    return {
+      success: false,
+      filesRestored: 0,
+      filesDeleted: 0,
+      messagesDeleted: 0,
+      checkpointsDeleted: 0,
+      error: "Checkpoint not found"
+    };
+  }
+  const workingDirectory = session.workingDirectory;
+  const backupsToRevert = fileBackupQueries.getFromSequence(sessionId, checkpoint.messageSequence);
+  const fileToEarliestBackup = /* @__PURE__ */ new Map();
+  for (const backup of backupsToRevert) {
+    if (!fileToEarliestBackup.has(backup.filePath)) {
+      fileToEarliestBackup.set(backup.filePath, backup);
+    }
+  }
+  let filesRestored = 0;
+  let filesDeleted = 0;
+  for (const [filePath, backup] of fileToEarliestBackup) {
+    const absolutePath = resolve3(workingDirectory, filePath);
+    try {
+      if (backup.existed && backup.originalContent !== null) {
+        const dir = dirname2(absolutePath);
+        if (!existsSync4(dir)) {
+          await mkdir2(dir, { recursive: true });
+        }
+        await writeFile2(absolutePath, backup.originalContent, "utf-8");
+        filesRestored++;
+      } else if (!backup.existed) {
+        if (existsSync4(absolutePath)) {
+          await unlink(absolutePath);
+          filesDeleted++;
+        }
+      }
+    } catch (error) {
+      console.error(`Failed to restore ${filePath}: ${error.message}`);
+    }
+  }
+  const messagesDeleted = messageQueries.deleteFromSequence(sessionId, checkpoint.messageSequence);
+  toolExecutionQueries.deleteAfterTime(sessionId, checkpoint.createdAt);
+  const checkpointsDeleted = checkpointQueries.deleteAfterSequence(sessionId, checkpoint.messageSequence);
+  const manager = getCheckpointManager(sessionId, workingDirectory);
+  manager.currentCheckpointId = checkpoint.id;
+  return {
+    success: true,
+    filesRestored,
+    filesDeleted,
+    messagesDeleted,
+    checkpointsDeleted
+  };
+}
+function getCheckpoints(sessionId) {
+  return checkpointQueries.getBySession(sessionId);
+}
+async function getSessionDiff(sessionId) {
+  const session = sessionQueries.getById(sessionId);
+  if (!session) {
+    return { files: [] };
+  }
+  const workingDirectory = session.workingDirectory;
+  const allBackups = fileBackupQueries.getBySession(sessionId);
+  const fileToOriginalBackup = /* @__PURE__ */ new Map();
+  for (const backup of allBackups) {
+    if (!fileToOriginalBackup.has(backup.filePath)) {
+      fileToOriginalBackup.set(backup.filePath, backup);
+    }
+  }
+  const files = [];
+  for (const [filePath, originalBackup] of fileToOriginalBackup) {
+    const absolutePath = resolve3(workingDirectory, filePath);
+    let currentContent = null;
+    let currentExists = false;
+    if (existsSync4(absolutePath)) {
+      try {
+        currentContent = await readFile3(absolutePath, "utf-8");
+        currentExists = true;
+      } catch {
+      }
+    }
+    let status;
+    if (!originalBackup.existed && currentExists) {
+      status = "created";
+    } else if (originalBackup.existed && !currentExists) {
+      status = "deleted";
+    } else {
+      status = "modified";
+    }
+    files.push({
+      path: filePath,
+      status,
+      originalContent: originalBackup.originalContent,
+      currentContent
+    });
+  }
+  return { files };
+}
+function clearCheckpointManager(sessionId) {
+  activeManagers.delete(sessionId);
+}
+
+// src/tools/write-file.ts
 var writeFileInputSchema = z4.object({
   path: z4.string().describe("The path to the file. Can be relative to working directory or absolute."),
   mode: z4.enum(["full", "str_replace"]).describe('Write mode: "full" for complete file write, "str_replace" for targeted string replacement'),
@@ -890,8 +1866,8 @@ Working directory: ${options.workingDirectory}`,
     inputSchema: writeFileInputSchema,
     execute: async ({ path, mode, content, old_string, new_string }) => {
       try {
-        const absolutePath = isAbsolute2(path) ? path : resolve3(options.workingDirectory, path);
-        const relativePath = relative2(options.workingDirectory, absolutePath);
+        const absolutePath = isAbsolute2(path) ? path : resolve4(options.workingDirectory, path);
+        const relativePath = relative3(options.workingDirectory, absolutePath);
         if (relativePath.startsWith("..") && !isAbsolute2(path)) {
           return {
             success: false,
@@ -905,16 +1881,17 @@ Working directory: ${options.workingDirectory}`,
               error: 'Content is required for "full" mode'
             };
           }
-          const dir = dirname2(absolutePath);
-          if (!existsSync3(dir)) {
-            await mkdir(dir, { recursive: true });
+          await backupFile(options.sessionId, options.workingDirectory, absolutePath);
+          const dir = dirname3(absolutePath);
+          if (!existsSync5(dir)) {
+            await mkdir3(dir, { recursive: true });
           }
-          const existed = existsSync3(absolutePath);
-          await writeFile(absolutePath, content, "utf-8");
+          const existed = existsSync5(absolutePath);
+          await writeFile3(absolutePath, content, "utf-8");
           return {
             success: true,
             path: absolutePath,
-            relativePath: relative2(options.workingDirectory, absolutePath),
+            relativePath: relative3(options.workingDirectory, absolutePath),
             mode: "full",
             action: existed ? "replaced" : "created",
             bytesWritten: Buffer.byteLength(content, "utf-8"),
@@ -927,13 +1904,14 @@ Working directory: ${options.workingDirectory}`,
               error: 'Both old_string and new_string are required for "str_replace" mode'
             };
           }
-          if (!existsSync3(absolutePath)) {
+          if (!existsSync5(absolutePath)) {
             return {
               success: false,
               error: `File not found: ${path}. Use "full" mode to create new files.`
             };
           }
-          const currentContent = await readFile2(absolutePath, "utf-8");
+          await backupFile(options.sessionId, options.workingDirectory, absolutePath);
+          const currentContent = await readFile4(absolutePath, "utf-8");
           if (!currentContent.includes(old_string)) {
             const lines = currentContent.split("\n");
             const preview = lines.slice(0, 20).join("\n");
@@ -954,13 +1932,13 @@ Working directory: ${options.workingDirectory}`,
             };
           }
           const newContent = currentContent.replace(old_string, new_string);
-          await writeFile(absolutePath, newContent, "utf-8");
+          await writeFile3(absolutePath, newContent, "utf-8");
           const oldLines = old_string.split("\n").length;
           const newLines = new_string.split("\n").length;
           return {
             success: true,
             path: absolutePath,
-            relativePath: relative2(options.workingDirectory, absolutePath),
+            relativePath: relative3(options.workingDirectory, absolutePath),
             mode: "str_replace",
             linesRemoved: oldLines,
             linesAdded: newLines,
@@ -1111,9 +2089,9 @@ import { tool as tool5 } from "ai";
 import { z as z6 } from "zod";
 
 // src/skills/index.ts
-import { readFile as readFile3, readdir } from "fs/promises";
-import { resolve as resolve4, basename, extname } from "path";
-import { existsSync as existsSync4 } from "fs";
+import { readFile as readFile5, readdir } from "fs/promises";
+import { resolve as resolve5, basename, extname } from "path";
+import { existsSync as existsSync6 } from "fs";
 function parseSkillFrontmatter(content) {
   const frontmatterMatch = content.match(/^---\n([\s\S]*?)\n---\n([\s\S]*)$/);
   if (!frontmatterMatch) {
@@ -1144,15 +2122,15 @@ function getSkillNameFromPath(filePath) {
   return basename(filePath, extname(filePath)).replace(/[-_]/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());
 }
 async function loadSkillsFromDirectory(directory) {
-  if (!existsSync4(directory)) {
+  if (!existsSync6(directory)) {
     return [];
   }
   const skills = [];
   const files = await readdir(directory);
   for (const file of files) {
     if (!file.endsWith(".md")) continue;
-    const filePath = resolve4(directory, file);
-    const content = await readFile3(filePath, "utf-8");
+    const filePath = resolve5(directory, file);
+    const content = await readFile5(filePath, "utf-8");
     const parsed = parseSkillFrontmatter(content);
     if (parsed) {
       skills.push({
@@ -1194,7 +2172,7 @@ async function loadSkillContent(skillName, directories) {
   if (!skill) {
     return null;
   }
-  const content = await readFile3(skill.filePath, "utf-8");
+  const content = await readFile5(skill.filePath, "utf-8");
   const parsed = parseSkillFrontmatter(content);
   return {
     ...skill,
@@ -1292,460 +2270,21 @@ Once loaded, a skill's content will be available in the conversation context.`,
   });
 }
 
-// src/tools/terminal.ts
-import { tool as tool6 } from "ai";
-import { z as z7 } from "zod";
-
-// src/terminal/manager.ts
-import { spawn } from "child_process";
-import { EventEmitter } from "events";
-var LogBuffer = class {
-  buffer = [];
-  maxSize;
-  totalBytes = 0;
-  maxBytes;
-  constructor(maxBytes = 50 * 1024) {
-    this.maxBytes = maxBytes;
-    this.maxSize = 1e3;
-  }
-  append(data) {
-    const lines = data.split("\n");
-    for (const line of lines) {
-      if (line) {
-        this.buffer.push(line);
-        this.totalBytes += line.length;
-      }
-    }
-    while (this.totalBytes > this.maxBytes && this.buffer.length > 1) {
-      const removed = this.buffer.shift();
-      if (removed) {
-        this.totalBytes -= removed.length;
-      }
-    }
-    while (this.buffer.length > this.maxSize) {
-      const removed = this.buffer.shift();
-      if (removed) {
-        this.totalBytes -= removed.length;
-      }
-    }
-  }
-  getAll() {
-    return this.buffer.join("\n");
-  }
-  getTail(lines) {
-    const start = Math.max(0, this.buffer.length - lines);
-    return this.buffer.slice(start).join("\n");
-  }
-  clear() {
-    this.buffer = [];
-    this.totalBytes = 0;
-  }
-  get lineCount() {
-    return this.buffer.length;
-  }
-};
-var TerminalManager = class _TerminalManager extends EventEmitter {
-  processes = /* @__PURE__ */ new Map();
-  static instance = null;
-  constructor() {
-    super();
-  }
-  static getInstance() {
-    if (!_TerminalManager.instance) {
-      _TerminalManager.instance = new _TerminalManager();
-    }
-    return _TerminalManager.instance;
-  }
-  /**
-   * Spawn a new background process
-   */
-  spawn(options) {
-    const { sessionId, command, cwd, name, env } = options;
-    const parts = this.parseCommand(command);
-    const executable = parts[0];
-    const args = parts.slice(1);
-    const terminal = terminalQueries.create({
-      sessionId,
-      name: name || null,
-      command,
-      cwd: cwd || process.cwd(),
-      status: "running"
-    });
-    const proc = spawn(executable, args, {
-      cwd: cwd || process.cwd(),
-      shell: true,
-      stdio: ["pipe", "pipe", "pipe"],
-      env: { ...process.env, ...env },
-      detached: false
-    });
-    if (proc.pid) {
-      terminalQueries.updatePid(terminal.id, proc.pid);
-    }
-    const logs = new LogBuffer();
-    proc.stdout?.on("data", (data) => {
-      const text2 = data.toString();
-      logs.append(text2);
-      this.emit("stdout", { terminalId: terminal.id, data: text2 });
-    });
-    proc.stderr?.on("data", (data) => {
-      const text2 = data.toString();
-      logs.append(`[stderr] ${text2}`);
-      this.emit("stderr", { terminalId: terminal.id, data: text2 });
-    });
-    proc.on("exit", (code, signal) => {
-      const exitCode = code ?? (signal ? 128 : 0);
-      terminalQueries.updateStatus(terminal.id, "stopped", exitCode);
-      this.emit("exit", { terminalId: terminal.id, code: exitCode, signal });
-      const managed2 = this.processes.get(terminal.id);
-      if (managed2) {
-        managed2.terminal = { ...managed2.terminal, status: "stopped", exitCode };
-      }
-    });
-    proc.on("error", (err) => {
-      terminalQueries.updateStatus(terminal.id, "error", void 0, err.message);
-      this.emit("error", { terminalId: terminal.id, error: err.message });
-      const managed2 = this.processes.get(terminal.id);
-      if (managed2) {
-        managed2.terminal = { ...managed2.terminal, status: "error", error: err.message };
-      }
-    });
-    const managed = {
-      id: terminal.id,
-      process: proc,
-      logs,
-      terminal: { ...terminal, pid: proc.pid ?? null }
-    };
-    this.processes.set(terminal.id, managed);
-    return this.toTerminalInfo(managed.terminal);
-  }
-  /**
-   * Get logs from a terminal
-   */
-  getLogs(terminalId, tail) {
-    const managed = this.processes.get(terminalId);
-    if (!managed) {
-      return null;
-    }
-    return {
-      logs: tail ? managed.logs.getTail(tail) : managed.logs.getAll(),
-      lineCount: managed.logs.lineCount
-    };
-  }
-  /**
-   * Get terminal status
-   */
-  getStatus(terminalId) {
-    const managed = this.processes.get(terminalId);
-    if (managed) {
-      if (managed.process.exitCode !== null) {
-        managed.terminal = {
-          ...managed.terminal,
-          status: "stopped",
-          exitCode: managed.process.exitCode
-        };
-      }
-      return this.toTerminalInfo(managed.terminal);
-    }
-    const terminal = terminalQueries.getById(terminalId);
-    if (terminal) {
-      return this.toTerminalInfo(terminal);
-    }
-    return null;
-  }
-  /**
-   * Kill a terminal process
-   */
-  kill(terminalId, signal = "SIGTERM") {
-    const managed = this.processes.get(terminalId);
-    if (!managed) {
-      return false;
-    }
-    try {
-      managed.process.kill(signal);
-      return true;
-    } catch (err) {
-      console.error(`Failed to kill terminal ${terminalId}:`, err);
-      return false;
-    }
-  }
-  /**
-   * Write to a terminal's stdin
-   */
-  write(terminalId, input) {
-    const managed = this.processes.get(terminalId);
-    if (!managed || !managed.process.stdin) {
-      return false;
-    }
-    try {
-      managed.process.stdin.write(input);
-      return true;
-    } catch (err) {
-      console.error(`Failed to write to terminal ${terminalId}:`, err);
-      return false;
-    }
-  }
-  /**
-   * List all terminals for a session
-   */
-  list(sessionId) {
-    const terminals3 = terminalQueries.getBySession(sessionId);
-    return terminals3.map((t) => {
-      const managed = this.processes.get(t.id);
-      if (managed) {
-        return this.toTerminalInfo(managed.terminal);
-      }
-      return this.toTerminalInfo(t);
-    });
-  }
-  /**
-   * Get all running terminals for a session
-   */
-  getRunning(sessionId) {
-    return this.list(sessionId).filter((t) => t.status === "running");
-  }
-  /**
-   * Kill all terminals for a session (cleanup)
-   */
-  killAll(sessionId) {
-    let killed = 0;
-    for (const [id, managed] of this.processes) {
-      if (managed.terminal.sessionId === sessionId) {
-        if (this.kill(id)) {
-          killed++;
-        }
-      }
-    }
-    return killed;
-  }
-  /**
-   * Clean up stopped terminals from memory (keep DB records)
-   */
-  cleanup(sessionId) {
-    let cleaned = 0;
-    for (const [id, managed] of this.processes) {
-      if (sessionId && managed.terminal.sessionId !== sessionId) {
-        continue;
-      }
-      if (managed.terminal.status !== "running") {
-        this.processes.delete(id);
-        cleaned++;
-      }
-    }
-    return cleaned;
-  }
-  /**
-   * Parse a command string into executable and arguments
-   */
-  parseCommand(command) {
-    const parts = [];
-    let current = "";
-    let inQuote = false;
-    let quoteChar = "";
-    for (const char of command) {
-      if ((char === '"' || char === "'") && !inQuote) {
-        inQuote = true;
-        quoteChar = char;
-      } else if (char === quoteChar && inQuote) {
-        inQuote = false;
-        quoteChar = "";
-      } else if (char === " " && !inQuote) {
-        if (current) {
-          parts.push(current);
-          current = "";
-        }
-      } else {
-        current += char;
-      }
-    }
-    if (current) {
-      parts.push(current);
-    }
-    return parts.length > 0 ? parts : [command];
-  }
-  toTerminalInfo(terminal) {
-    return {
-      id: terminal.id,
-      name: terminal.name,
-      command: terminal.command,
-      cwd: terminal.cwd,
-      pid: terminal.pid,
-      status: terminal.status,
-      exitCode: terminal.exitCode,
-      error: terminal.error,
-      createdAt: terminal.createdAt,
-      stoppedAt: terminal.stoppedAt
-    };
-  }
-};
-function getTerminalManager() {
-  return TerminalManager.getInstance();
-}
-
-// src/tools/terminal.ts
-var TerminalInputSchema = z7.object({
-  action: z7.enum(["spawn", "logs", "status", "kill", "write", "list"]).describe(
-    "The action to perform: spawn (start process), logs (get output), status (check if running), kill (stop process), write (send stdin), list (show all)"
-  ),
-  // For spawn
-  command: z7.string().optional().describe('For spawn: The command to run (e.g., "npm run dev")'),
-  cwd: z7.string().optional().describe("For spawn: Working directory for the command"),
-  name: z7.string().optional().describe('For spawn: Optional friendly name (e.g., "dev-server")'),
-  // For logs, status, kill, write
-  terminalId: z7.string().optional().describe("For logs/status/kill/write: The terminal ID"),
-  tail: z7.number().optional().describe("For logs: Number of lines to return from the end"),
-  // For kill
-  signal: z7.enum(["SIGTERM", "SIGKILL"]).optional().describe("For kill: Signal to send (default: SIGTERM)"),
-  // For write
-  input: z7.string().optional().describe("For write: The input to send to stdin")
-});
-function createTerminalTool(options) {
-  const { sessionId, workingDirectory } = options;
-  return tool6({
-    description: `Manage background terminal processes. Use this for long-running commands like dev servers, watchers, or any process that shouldn't block.
-
-Actions:
-- spawn: Start a new background process. Requires 'command'. Returns terminal ID.
-- logs: Get output from a terminal. Requires 'terminalId'. Optional 'tail' for recent lines.
-- status: Check if a terminal is still running. Requires 'terminalId'.
-- kill: Stop a terminal process. Requires 'terminalId'. Optional 'signal'.
-- write: Send input to a terminal's stdin. Requires 'terminalId' and 'input'.
-- list: Show all terminals for this session. No other params needed.
-
-Example workflow:
-1. spawn with command="npm run dev", name="dev-server" \u2192 { id: "abc123", status: "running" }
-2. logs with terminalId="abc123", tail=10 \u2192 "Ready on http://localhost:3000"
-3. kill with terminalId="abc123" \u2192 { success: true }`,
-    inputSchema: TerminalInputSchema,
-    execute: async (input) => {
-      const manager = getTerminalManager();
-      switch (input.action) {
-        case "spawn": {
-          if (!input.command) {
-            return { success: false, error: 'spawn requires a "command" parameter' };
-          }
-          const terminal = manager.spawn({
-            sessionId,
-            command: input.command,
-            cwd: input.cwd || workingDirectory,
-            name: input.name
-          });
-          return {
-            success: true,
-            terminal: formatTerminal(terminal),
-            message: `Started "${input.command}" with terminal ID: ${terminal.id}`
-          };
-        }
-        case "logs": {
-          if (!input.terminalId) {
-            return { success: false, error: 'logs requires a "terminalId" parameter' };
-          }
-          const result = manager.getLogs(input.terminalId, input.tail);
-          if (!result) {
-            return {
-              success: false,
-              error: `Terminal not found: ${input.terminalId}`
-            };
-          }
-          return {
-            success: true,
-            terminalId: input.terminalId,
-            logs: result.logs,
-            lineCount: result.lineCount
-          };
-        }
-        case "status": {
-          if (!input.terminalId) {
-            return { success: false, error: 'status requires a "terminalId" parameter' };
-          }
-          const status = manager.getStatus(input.terminalId);
-          if (!status) {
-            return {
-              success: false,
-              error: `Terminal not found: ${input.terminalId}`
-            };
-          }
-          return {
-            success: true,
-            terminal: formatTerminal(status)
-          };
-        }
-        case "kill": {
-          if (!input.terminalId) {
-            return { success: false, error: 'kill requires a "terminalId" parameter' };
-          }
-          const success = manager.kill(input.terminalId, input.signal);
-          if (!success) {
-            return {
-              success: false,
-              error: `Failed to kill terminal: ${input.terminalId}`
-            };
-          }
-          return {
-            success: true,
-            message: `Sent ${input.signal || "SIGTERM"} to terminal ${input.terminalId}`
-          };
-        }
-        case "write": {
-          if (!input.terminalId) {
-            return { success: false, error: 'write requires a "terminalId" parameter' };
-          }
-          if (!input.input) {
-            return { success: false, error: 'write requires an "input" parameter' };
-          }
-          const success = manager.write(input.terminalId, input.input);
-          if (!success) {
-            return {
-              success: false,
-              error: `Failed to write to terminal: ${input.terminalId}`
-            };
-          }
-          return {
-            success: true,
-            message: `Sent input to terminal ${input.terminalId}`
-          };
-        }
-        case "list": {
-          const terminals3 = manager.list(sessionId);
-          return {
-            success: true,
-            terminals: terminals3.map(formatTerminal),
-            count: terminals3.length,
-            running: terminals3.filter((t) => t.status === "running").length
-          };
-        }
-        default:
-          return { success: false, error: `Unknown action: ${input.action}` };
-      }
-    }
-  });
-}
-function formatTerminal(t) {
-  return {
-    id: t.id,
-    name: t.name,
-    command: t.command,
-    cwd: t.cwd,
-    pid: t.pid,
-    status: t.status,
-    exitCode: t.exitCode,
-    error: t.error,
-    createdAt: t.createdAt.toISOString(),
-    stoppedAt: t.stoppedAt?.toISOString() || null
-  };
-}
-
 // src/tools/index.ts
 function createTools(options) {
   return {
     bash: createBashTool({
       workingDirectory: options.workingDirectory,
-      onOutput: options.onBashOutput
+      sessionId: options.sessionId,
+      onOutput: options.onBashOutput,
+      onProgress: options.onBashProgress
     }),
     read_file: createReadFileTool({
       workingDirectory: options.workingDirectory
     }),
     write_file: createWriteFileTool({
-      workingDirectory: options.workingDirectory
+      workingDirectory: options.workingDirectory,
+      sessionId: options.sessionId
     }),
     todo: createTodoTool({
       sessionId: options.sessionId
@@ -1753,10 +2292,6 @@ function createTools(options) {
     load_skill: createLoadSkillTool({
       sessionId: options.sessionId,
       skillsDirectories: options.skillsDirectories
-    }),
-    terminal: createTerminalTool({
-      sessionId: options.sessionId,
-      workingDirectory: options.workingDirectory
     })
   };
 }
@@ -1766,25 +2301,102 @@ import { generateText } from "ai";
 import { gateway } from "@ai-sdk/gateway";
 
 // src/agent/prompts.ts
+import os from "os";
+function getSearchInstructions() {
+  const platform3 = process.platform;
+  const common = `- **Prefer \`read_file\` over shell commands** for reading files - don't use \`cat\`, \`head\`, or \`tail\` when \`read_file\` is available
+- **Avoid unbounded searches** - always scope searches with glob patterns and directory paths to prevent overwhelming output
+- **Search strategically**: Start with specific patterns and directories, then broaden only if needed`;
+  if (platform3 === "win32") {
+    return `${common}
+- **Find files**: \`dir /s /b *.ts\` or PowerShell: \`Get-ChildItem -Recurse -Filter *.ts\`
+- **Search content**: \`findstr /s /n "pattern" *.ts\` or PowerShell: \`Select-String -Pattern "pattern" -Path *.ts -Recurse\`
+- **If ripgrep (\`rg\`) is installed**: \`rg "pattern" -t ts src/\` - faster and respects .gitignore`;
+  }
+  return `${common}
+- **Find files**: \`find . -name "*.ts"\` or \`find src/ -type f -name "*.tsx"\`
+- **Search content**: \`grep -rn "pattern" --include="*.ts" src/\` - use \`-l\` for filenames only, \`-c\` for counts
+- **If ripgrep (\`rg\`) is installed**: \`rg "pattern" -t ts src/\` - faster and respects .gitignore`;
+}
 async function buildSystemPrompt(options) {
   const { workingDirectory, skillsDirectories, sessionId, customInstructions } = options;
   const skills = await loadAllSkills(skillsDirectories);
   const skillsContext = formatSkillsForContext(skills);
   const todos = todoQueries.getBySession(sessionId);
   const todosContext = formatTodosForContext(todos);
-  const systemPrompt = `You are Sparkecoder, an expert AI coding assistant. You help developers write, debug, and improve code.
+  const platform3 = process.platform === "win32" ? "Windows" : process.platform === "darwin" ? "macOS" : "Linux";
+  const currentDate = (/* @__PURE__ */ new Date()).toLocaleDateString("en-US", { weekday: "long", year: "numeric", month: "long", day: "numeric" });
+  const searchInstructions = getSearchInstructions();
+  const systemPrompt = `You are SparkECoder, an expert AI coding assistant. You help developers write, debug, and improve code.
 
-## Working Directory
-You are working in: ${workingDirectory}
+## Environment
+- **Platform**: ${platform3} (${os.release()})
+- **Date**: ${currentDate}
+- **Working Directory**: ${workingDirectory}
 
 ## Core Capabilities
 You have access to powerful tools for:
-- **bash**: Execute shell commands, run scripts, install packages, use git
+- **bash**: Execute commands in the terminal (see below for details)
 - **read_file**: Read file contents to understand code and context
 - **write_file**: Create new files or edit existing ones (supports targeted string replacement)
 - **todo**: Manage your task list to track progress on complex operations
 - **load_skill**: Load specialized knowledge documents for specific tasks
 
+
+IMPORTANT: If you have zero context of where you are working, always explore it first to understand the structure before doing things for the user.
+
+Use the TODO tool to manage your task list to track progress on complex operations. Always ask the user what they want to do specifically before doing it, and make a plan. 
+Step 1 of the plan should be researching files and understanding the components/structure of what you're working on (if you don't already have context), then after u have done that, plan out the rest of the tasks u need to do. 
+You can clear the todo and restart it, and do multiple things inside of one session.
+
+### bash Tool
+The bash tool runs commands in the terminal. Every command runs in its own session with logs saved to disk.
+
+**Run a command (default - waits for completion):**
+\`\`\`
+bash({ command: "npm install" })
+bash({ command: "git status" })
+\`\`\`
+
+**Run in background (for dev servers, watchers):**
+\`\`\`
+bash({ command: "npm run dev", background: true })
+\u2192 Returns { id: "abc123" } - save this ID to check logs or stop it later
+\`\`\`
+
+**Check on a background process:**
+\`\`\`
+bash({ id: "abc123" })              // get full output
+bash({ id: "abc123", tail: 50 })    // last 50 lines only
+\`\`\`
+
+**Stop a background process:**
+\`\`\`
+bash({ id: "abc123", kill: true })
+\`\`\`
+
+**Respond to interactive prompts (for yes/no questions, etc.):**
+\`\`\`
+bash({ id: "abc123", key: "y" })      // send 'y' for yes
+bash({ id: "abc123", key: "n" })      // send 'n' for no  
+bash({ id: "abc123", key: "Enter" })  // press Enter
+bash({ id: "abc123", input: "my text" })  // send text input
+\`\`\`
+
+**IMPORTANT - Handling Interactive Commands:**
+- ALWAYS prefer non-interactive flags when available:
+  - \`npm init --yes\` or \`npm install --yes\`
+  - \`npx create-next-app --yes\` (accepts all defaults)
+  - \`npx create-react-app --yes\`
+  - \`git commit --no-edit\`
+  - \`apt-get install -y\`
+- If a command might prompt for input, run it in background mode first
+- Check the output to see if it's waiting for input
+- Use \`key: "y"\` or \`key: "n"\` for yes/no prompts
+- Use \`input: "text"\` for text input prompts
+
+Logs are saved to \`.sparkecoder/terminals/{id}/output.log\` and can be read with \`read_file\` if needed.
+
 ## Guidelines
 
 ### Code Quality
@@ -1805,6 +2417,30 @@ You have access to powerful tools for:
 - Use \`write_file\` with mode "full" only for new files or complete rewrites
 - Always verify changes by reading files after modifications
 
+### Searching and Exploration
+${searchInstructions}
+
+Follow these principles when designing and implementing software:
+
+1. **Modularity** \u2014 Write simple parts connected by clean interfaces
+2. **Clarity** \u2014 Clarity is better than cleverness
+3. **Composition** \u2014 Design programs to be connected to other programs
+4. **Separation** \u2014 Separate policy from mechanism; separate interfaces from engines
+5. **Simplicity** \u2014 Design for simplicity; add complexity only where you must
+6. **Parsimony** \u2014 Write a big program only when it is clear by demonstration that nothing else will do
+7. **Transparency** \u2014 Design for visibility to make inspection and debugging easier
+8. **Robustness** \u2014 Robustness is the child of transparency and simplicity
+9. **Representation** \u2014 Fold knowledge into data so program logic can be stupid and robust
+10. **Least Surprise** \u2014 In interface design, always do the least surprising thing
+11. **Silence** \u2014 When a program has nothing surprising to say, it should say nothing
+12. **Repair** \u2014 When you must fail, fail noisily and as soon as possible
+13. **Economy** \u2014 Programmer time is expensive; conserve it in preference to machine time
+14. **Generation** \u2014 Avoid hand-hacking; write programs to write programs when you can
+15. **Optimization** \u2014 Prototype before polishing. Get it working before you optimize it
+16. **Diversity** \u2014 Distrust all claims for "one true way"
+17. **Extensibility** \u2014 Design for the future, because it will be here sooner than you think
+
+
 ### Communication
 - Explain your reasoning and approach
 - Be concise but thorough
@@ -1961,12 +2597,24 @@ var approvalResolvers = /* @__PURE__ */ new Map();
 var Agent = class _Agent {
   session;
   context;
-  tools;
+  baseTools;
   pendingApprovals = /* @__PURE__ */ new Map();
   constructor(session, context, tools) {
     this.session = session;
     this.context = context;
-    this.tools = tools;
+    this.baseTools = tools;
+  }
+  /**
+   * Create tools with optional progress callbacks
+   */
+  createToolsWithCallbacks(options) {
+    const config = getConfig();
+    return createTools({
+      sessionId: this.session.id,
+      workingDirectory: this.session.workingDirectory,
+      skillsDirectories: config.resolvedSkillsDirectories,
+      onBashProgress: options.onToolProgress ? (progress) => options.onToolProgress({ toolName: "bash", data: progress }) : void 0
+    });
   }
   /**
    * Create or resume an agent session
@@ -2018,7 +2666,9 @@ var Agent = class _Agent {
    */
   async stream(options) {
     const config = getConfig();
-    this.context.addUserMessage(options.prompt);
+    if (!options.skipSaveUserMessage) {
+      this.context.addUserMessage(options.prompt);
+    }
     sessionQueries.updateStatus(this.session.id, "active");
     const systemPrompt = await buildSystemPrompt({
       workingDirectory: this.session.workingDirectory,
@@ -2026,15 +2676,30 @@ var Agent = class _Agent {
       sessionId: this.session.id
     });
     const messages2 = await this.context.getMessages();
-    const wrappedTools = this.wrapToolsWithApproval(options);
+    const tools = options.onToolProgress ? this.createToolsWithCallbacks({ onToolProgress: options.onToolProgress }) : this.baseTools;
+    const wrappedTools = this.wrapToolsWithApproval(options, tools);
     const stream = streamText({
       model: gateway2(this.session.model),
       system: systemPrompt,
       messages: messages2,
       tools: wrappedTools,
-      stopWhen: stepCountIs(20),
+      stopWhen: stepCountIs(500),
+      // Forward abort signal if provided
+      abortSignal: options.abortSignal,
+      // Enable extended thinking/reasoning for models that support it
+      providerOptions: {
+        anthropic: {
+          thinking: {
+            type: "enabled",
+            budgetTokens: 1e4
+          }
+        }
+      },
       onStepFinish: async (step) => {
         options.onStepFinish?.(step);
+      },
+      onAbort: ({ steps }) => {
+        options.onAbort?.({ steps });
       }
     });
     const saveResponseMessages = async () => {
@@ -2062,13 +2727,23 @@ var Agent = class _Agent {
       sessionId: this.session.id
     });
     const messages2 = await this.context.getMessages();
-    const wrappedTools = this.wrapToolsWithApproval(options);
+    const tools = options.onToolProgress ? this.createToolsWithCallbacks({ onToolProgress: options.onToolProgress }) : this.baseTools;
+    const wrappedTools = this.wrapToolsWithApproval(options, tools);
     const result = await generateText2({
       model: gateway2(this.session.model),
       system: systemPrompt,
       messages: messages2,
       tools: wrappedTools,
-      stopWhen: stepCountIs(20)
+      stopWhen: stepCountIs(500),
+      // Enable extended thinking/reasoning for models that support it
+      providerOptions: {
+        anthropic: {
+          thinking: {
+            type: "enabled",
+            budgetTokens: 1e4
+          }
+        }
+      }
     });
     const responseMessages = result.response.messages;
     this.context.addResponseMessages(responseMessages);
@@ -2080,20 +2755,21 @@ var Agent = class _Agent {
   /**
    * Wrap tools to add approval checking
    */
-  wrapToolsWithApproval(options) {
+  wrapToolsWithApproval(options, tools) {
     const sessionConfig = this.session.config;
     const wrappedTools = {};
-    for (const [name, originalTool] of Object.entries(this.tools)) {
+    const toolsToWrap = tools || this.baseTools;
+    for (const [name, originalTool] of Object.entries(toolsToWrap)) {
       const needsApproval = requiresApproval(name, sessionConfig ?? void 0);
       if (!needsApproval) {
         wrappedTools[name] = originalTool;
         continue;
       }
-      wrappedTools[name] = tool7({
+      wrappedTools[name] = tool6({
         description: originalTool.description || "",
-        inputSchema: originalTool.inputSchema || z8.object({}),
+        inputSchema: originalTool.inputSchema || z7.object({}),
         execute: async (input, toolOptions) => {
-          const toolCallId = toolOptions.toolCallId || nanoid2();
+          const toolCallId = toolOptions.toolCallId || nanoid3();
           const execution = toolExecutionQueries.create({
             sessionId: this.session.id,
             toolName: name,
@@ -2105,8 +2781,8 @@ var Agent = class _Agent {
           this.pendingApprovals.set(toolCallId, execution);
           options.onApprovalRequired?.(execution);
           sessionQueries.updateStatus(this.session.id, "waiting");
-          const approved = await new Promise((resolve6) => {
-            approvalResolvers.set(toolCallId, { resolve: resolve6, sessionId: this.session.id });
+          const approved = await new Promise((resolve8) => {
+            approvalResolvers.set(toolCallId, { resolve: resolve8, sessionId: this.session.id });
           });
           const resolverData = approvalResolvers.get(toolCallId);
           approvalResolvers.delete(toolCallId);
@@ -2201,18 +2877,18 @@ var Agent = class _Agent {
 
 // src/server/routes/sessions.ts
 var sessions2 = new Hono();
-var createSessionSchema = z9.object({
-  name: z9.string().optional(),
-  workingDirectory: z9.string().optional(),
-  model: z9.string().optional(),
-  toolApprovals: z9.record(z9.string(), z9.boolean()).optional()
+var createSessionSchema = z8.object({
+  name: z8.string().optional(),
+  workingDirectory: z8.string().optional(),
+  model: z8.string().optional(),
+  toolApprovals: z8.record(z8.string(), z8.boolean()).optional()
 });
-var paginationQuerySchema = z9.object({
-  limit: z9.string().optional(),
-  offset: z9.string().optional()
+var paginationQuerySchema = z8.object({
+  limit: z8.string().optional(),
+  offset: z8.string().optional()
 });
-var messagesQuerySchema = z9.object({
-  limit: z9.string().optional()
+var messagesQuerySchema = z8.object({
+  limit: z8.string().optional()
 });
 sessions2.get(
   "/",
@@ -2222,16 +2898,22 @@ sessions2.get(
     const limit = parseInt(query.limit || "50");
     const offset = parseInt(query.offset || "0");
     const allSessions = sessionQueries.list(limit, offset);
-    return c.json({
-      sessions: allSessions.map((s) => ({
+    const sessionsWithStreamInfo = allSessions.map((s) => {
+      const activeStream = activeStreamQueries.getBySessionId(s.id);
+      return {
         id: s.id,
         name: s.name,
         workingDirectory: s.workingDirectory,
         model: s.model,
         status: s.status,
+        config: s.config,
+        isStreaming: !!activeStream,
         createdAt: s.createdAt.toISOString(),
         updatedAt: s.updatedAt.toISOString()
-      })),
+      };
+    });
+    return c.json({
+      sessions: sessionsWithStreamInfo,
       count: allSessions.length,
       limit,
       offset
@@ -2345,13 +3027,63 @@ sessions2.get("/:id/tools", async (c) => {
     count: executions.length
   });
 });
+var updateSessionSchema = z8.object({
+  model: z8.string().optional(),
+  name: z8.string().optional(),
+  toolApprovals: z8.record(z8.string(), z8.boolean()).optional()
+});
+sessions2.patch(
+  "/:id",
+  zValidator("json", updateSessionSchema),
+  async (c) => {
+    const id = c.req.param("id");
+    const body = c.req.valid("json");
+    const session = sessionQueries.getById(id);
+    if (!session) {
+      return c.json({ error: "Session not found" }, 404);
+    }
+    const updates = {};
+    if (body.model) updates.model = body.model;
+    if (body.name !== void 0) updates.name = body.name;
+    if (body.toolApprovals !== void 0) {
+      const existingConfig = session.config || {};
+      const existingToolApprovals = existingConfig.toolApprovals || {};
+      updates.config = {
+        ...existingConfig,
+        toolApprovals: {
+          ...existingToolApprovals,
+          ...body.toolApprovals
+        }
+      };
+    }
+    const updatedSession = Object.keys(updates).length > 0 ? sessionQueries.update(id, updates) || session : session;
+    return c.json({
+      id: updatedSession.id,
+      name: updatedSession.name,
+      model: updatedSession.model,
+      status: updatedSession.status,
+      workingDirectory: updatedSession.workingDirectory,
+      config: updatedSession.config,
+      updatedAt: updatedSession.updatedAt.toISOString()
+    });
+  }
+);
 sessions2.delete("/:id", async (c) => {
   const id = c.req.param("id");
   try {
-    const manager = getTerminalManager();
-    manager.killAll(id);
+    const session = sessionQueries.getById(id);
+    if (session) {
+      const terminalIds = await listSessions();
+      for (const tid of terminalIds) {
+        const meta = await getMeta(tid, session.workingDirectory);
+        if (meta && meta.sessionId === id) {
+          await killTerminal(tid);
+        }
+      }
+    }
   } catch (e) {
   }
+  clearCheckpointManager(id);
   const deleted = sessionQueries.delete(id);
   if (!deleted) {
     return c.json({ error: "Session not found" }, 404);
@@ -2368,160 +3100,488 @@ sessions2.post("/:id/clear", async (c) => {
   agent.clearContext();
   return c.json({ success: true, sessionId: id });
 });
-
-// src/server/routes/agents.ts
-import { Hono as Hono2 } from "hono";
-import { zValidator as zValidator2 } from "@hono/zod-validator";
-import { streamSSE } from "hono/streaming";
-import { z as z10 } from "zod";
-var agents = new Hono2();
-var runPromptSchema = z10.object({
-  prompt: z10.string().min(1)
+sessions2.get("/:id/todos", async (c) => {
+  const id = c.req.param("id");
+  const session = sessionQueries.getById(id);
+  if (!session) {
+    return c.json({ error: "Session not found" }, 404);
+  }
+  const todos = todoQueries.getBySession(id);
+  const pending = todos.filter((t) => t.status === "pending");
+  const inProgress = todos.filter((t) => t.status === "in_progress");
+  const completed = todos.filter((t) => t.status === "completed");
+  const cancelled = todos.filter((t) => t.status === "cancelled");
+  const nextTodo = inProgress[0] || pending[0] || null;
+  return c.json({
+    todos: todos.map((t) => ({
+      id: t.id,
+      content: t.content,
+      status: t.status,
+      order: t.order,
+      createdAt: t.createdAt.toISOString(),
+      updatedAt: t.updatedAt.toISOString()
+    })),
+    stats: {
+      total: todos.length,
+      pending: pending.length,
+      inProgress: inProgress.length,
+      completed: completed.length,
+      cancelled: cancelled.length
+    },
+    nextTodo: nextTodo ? {
+      id: nextTodo.id,
+      content: nextTodo.content,
+      status: nextTodo.status
+    } : null
+  });
 });
-var quickStartSchema = z10.object({
-  prompt: z10.string().min(1),
-  name: z10.string().optional(),
-  workingDirectory: z10.string().optional(),
-  model: z10.string().optional(),
-  toolApprovals: z10.record(z10.string(), z10.boolean()).optional()
+sessions2.get("/:id/checkpoints", async (c) => {
+  const id = c.req.param("id");
+  const session = sessionQueries.getById(id);
+  if (!session) {
+    return c.json({ error: "Session not found" }, 404);
+  }
+  const checkpoints2 = getCheckpoints(id);
+  return c.json({
+    sessionId: id,
+    checkpoints: checkpoints2.map((cp) => ({
+      id: cp.id,
+      messageSequence: cp.messageSequence,
+      gitHead: cp.gitHead,
+      createdAt: cp.createdAt.toISOString()
+    })),
+    count: checkpoints2.length
+  });
 });
-var rejectSchema = z10.object({
-  reason: z10.string().optional()
-}).optional();
-agents.post(
-  "/:id/run",
-  zValidator2("json", runPromptSchema),
-  async (c) => {
-    const id = c.req.param("id");
-    const { prompt } = c.req.valid("json");
-    const session = sessionQueries.getById(id);
-    if (!session) {
-      return c.json({ error: "Session not found" }, 404);
+sessions2.post("/:id/revert/:checkpointId", async (c) => {
+  const sessionId = c.req.param("id");
+  const checkpointId = c.req.param("checkpointId");
+  const session = sessionQueries.getById(sessionId);
+  if (!session) {
+    return c.json({ error: "Session not found" }, 404);
+  }
+  const activeStream = activeStreamQueries.getBySessionId(sessionId);
+  if (activeStream) {
+    return c.json({
+      error: "Cannot revert while a stream is active. Stop the stream first.",
+      streamId: activeStream.streamId
+    }, 409);
+  }
+  const result = await revertToCheckpoint(sessionId, checkpointId);
+  if (!result.success) {
+    return c.json({ error: result.error }, 400);
+  }
+  return c.json({
+    success: true,
+    sessionId,
+    checkpointId,
+    filesRestored: result.filesRestored,
+    filesDeleted: result.filesDeleted,
+    messagesDeleted: result.messagesDeleted,
+    checkpointsDeleted: result.checkpointsDeleted
+  });
+});
+sessions2.get("/:id/diff", async (c) => {
+  const id = c.req.param("id");
+  const session = sessionQueries.getById(id);
+  if (!session) {
+    return c.json({ error: "Session not found" }, 404);
+  }
+  const diff = await getSessionDiff(id);
+  return c.json({
+    sessionId: id,
+    files: diff.files.map((f) => ({
+      path: f.path,
+      status: f.status,
+      hasOriginal: f.originalContent !== null,
+      hasCurrent: f.currentContent !== null
+      // Optionally include content (can be large)
+      // originalContent: f.originalContent,
+      // currentContent: f.currentContent,
+    })),
+    summary: {
+      created: diff.files.filter((f) => f.status === "created").length,
+      modified: diff.files.filter((f) => f.status === "modified").length,
+      deleted: diff.files.filter((f) => f.status === "deleted").length,
+      total: diff.files.length
+    }
+  });
+});
+sessions2.get("/:id/diff/:filePath", async (c) => {
+  const sessionId = c.req.param("id");
+  const filePath = decodeURIComponent(c.req.param("filePath"));
+  const session = sessionQueries.getById(sessionId);
+  if (!session) {
+    return c.json({ error: "Session not found" }, 404);
+  }
+  const diff = await getSessionDiff(sessionId);
+  const fileDiff = diff.files.find((f) => f.path === filePath);
+  if (!fileDiff) {
+    return c.json({ error: "File not found in diff" }, 404);
+  }
+  return c.json({
+    sessionId,
+    path: fileDiff.path,
+    status: fileDiff.status,
+    originalContent: fileDiff.originalContent,
+    currentContent: fileDiff.currentContent
+  });
+});
+
+// src/server/routes/agents.ts
+import { Hono as Hono2 } from "hono";
+import { zValidator as zValidator2 } from "@hono/zod-validator";
+import { z as z9 } from "zod";
+
+// src/server/resumable-stream.ts
+import { createResumableStreamContext } from "resumable-stream/generic";
+var store = /* @__PURE__ */ new Map();
+var channels = /* @__PURE__ */ new Map();
+var cleanupInterval = setInterval(() => {
+  const now = Date.now();
+  for (const [key, data] of store.entries()) {
+    if (data.expiresAt && data.expiresAt < now) {
+      store.delete(key);
     }
-    c.header("Content-Type", "text/event-stream");
-    c.header("Cache-Control", "no-cache");
-    c.header("Connection", "keep-alive");
-    c.header("x-vercel-ai-ui-message-stream", "v1");
-    return streamSSE(c, async (stream) => {
+  }
+}, 6e4);
+cleanupInterval.unref();
+var publisher = {
+  connect: async () => {
+  },
+  publish: async (channel, message) => {
+    const subscribers = channels.get(channel);
+    if (subscribers) {
+      for (const callback of subscribers) {
+        setImmediate(() => callback(message));
+      }
+    }
+  },
+  set: async (key, value, options) => {
+    const expiresAt = options?.EX ? Date.now() + options.EX * 1e3 : void 0;
+    store.set(key, { value, expiresAt });
+    if (options?.EX) {
+      setTimeout(() => store.delete(key), options.EX * 1e3);
+    }
+  },
+  get: async (key) => {
+    const data = store.get(key);
+    if (!data) return null;
+    if (data.expiresAt && data.expiresAt < Date.now()) {
+      store.delete(key);
+      return null;
+    }
+    return data.value;
+  },
+  incr: async (key) => {
+    const data = store.get(key);
+    const current = data ? parseInt(data.value, 10) : 0;
+    const next = (isNaN(current) ? 0 : current) + 1;
+    store.set(key, { value: String(next), expiresAt: data?.expiresAt });
+    return next;
+  }
+};
+var subscriber = {
+  connect: async () => {
+  },
+  subscribe: async (channel, callback) => {
+    if (!channels.has(channel)) {
+      channels.set(channel, /* @__PURE__ */ new Set());
+    }
+    channels.get(channel).add(callback);
+  },
+  unsubscribe: async (channel) => {
+    channels.delete(channel);
+  }
+};
+var streamContext = createResumableStreamContext({
+  // Background task handler - just let promises run and log errors
+  waitUntil: (promise) => {
+    promise.catch((err) => {
+      console.error("[ResumableStream] Background task error:", err);
+    });
+  },
+  publisher,
+  subscriber
+});
+
+// src/server/routes/agents.ts
+import { nanoid as nanoid4 } from "nanoid";
+var agents = new Hono2();
+var runPromptSchema = z9.object({
+  prompt: z9.string().min(1)
+});
+var quickStartSchema = z9.object({
+  prompt: z9.string().min(1),
+  name: z9.string().optional(),
+  workingDirectory: z9.string().optional(),
+  model: z9.string().optional(),
+  toolApprovals: z9.record(z9.string(), z9.boolean()).optional()
+});
+var rejectSchema = z9.object({
+  reason: z9.string().optional()
+}).optional();
+var streamAbortControllers = /* @__PURE__ */ new Map();
+function createAgentStreamProducer(sessionId, prompt, streamId) {
+  return () => {
+    const { readable, writable } = new TransformStream();
+    const writer = writable.getWriter();
+    let writerClosed = false;
+    const abortController = new AbortController();
+    streamAbortControllers.set(streamId, abortController);
+    const writeSSE = async (data) => {
+      if (writerClosed) return;
       try {
-        const agent = await Agent.create({ sessionId: id });
+        await writer.write(`data: ${data}
+
+`);
+      } catch (err) {
+        writerClosed = true;
+      }
+    };
+    const safeClose = async () => {
+      if (writerClosed) return;
+      try {
+        writerClosed = true;
+        await writer.close();
+      } catch {
+      }
+    };
+    const cleanupAbortController = () => {
+      streamAbortControllers.delete(streamId);
+    };
+    (async () => {
+      let isAborted = false;
+      try {
+        const agent = await Agent.create({ sessionId });
+        await writeSSE(JSON.stringify({ type: "data-stream-id", streamId }));
+        await writeSSE(JSON.stringify({
+          type: "data-user-message",
+          data: { id: `user_${Date.now()}`, content: prompt }
+        }));
         const messageId = `msg_${Date.now()}`;
-        await stream.writeSSE({
-          data: JSON.stringify({ type: "start", messageId })
-        });
+        await writeSSE(JSON.stringify({ type: "start", messageId }));
         let textId = `text_${Date.now()}`;
         let textStarted = false;
         const result = await agent.stream({
           prompt,
-          onToolCall: async (toolCall) => {
-            await stream.writeSSE({
-              data: JSON.stringify({
-                type: "tool-input-start",
-                toolCallId: toolCall.toolCallId,
-                toolName: toolCall.toolName
-              })
-            });
-            await stream.writeSSE({
-              data: JSON.stringify({
-                type: "tool-input-available",
-                toolCallId: toolCall.toolCallId,
-                toolName: toolCall.toolName,
-                input: toolCall.input
-              })
-            });
+          abortSignal: abortController.signal,
+          // Use our managed abort controller, NOT client signal
+          skipSaveUserMessage: true,
+          // User message is saved in the route before streaming
+          // Note: tool-input-start/available events are sent from the stream loop
+          // when we see tool-call-streaming-start and tool-call events.
+          // We only use onToolCall/onToolResult for non-streaming scenarios or
+          // tools that need special handling (like approval requests).
+          onToolCall: async () => {
           },
-          onToolResult: async (result2) => {
-            await stream.writeSSE({
-              data: JSON.stringify({
-                type: "tool-output-available",
-                toolCallId: result2.toolCallId,
-                output: result2.output
-              })
-            });
+          onToolResult: async () => {
           },
           onApprovalRequired: async (execution) => {
-            await stream.writeSSE({
-              data: JSON.stringify({
-                type: "data-approval-required",
-                data: {
-                  id: execution.id,
-                  toolCallId: execution.toolCallId,
-                  toolName: execution.toolName,
-                  input: execution.input
-                }
-              })
-            });
+            await writeSSE(JSON.stringify({
+              type: "data-approval-required",
+              data: {
+                id: execution.id,
+                toolCallId: execution.toolCallId,
+                toolName: execution.toolName,
+                input: execution.input
+              }
+            }));
+          },
+          onToolProgress: async (progress) => {
+            await writeSSE(JSON.stringify({
+              type: "tool-progress",
+              toolName: progress.toolName,
+              data: progress.data
+            }));
           },
           onStepFinish: async () => {
-            await stream.writeSSE({
-              data: JSON.stringify({ type: "finish-step" })
-            });
+            await writeSSE(JSON.stringify({ type: "finish-step" }));
             if (textStarted) {
-              await stream.writeSSE({
-                data: JSON.stringify({ type: "text-end", id: textId })
-              });
+              await writeSSE(JSON.stringify({ type: "text-end", id: textId }));
               textStarted = false;
               textId = `text_${Date.now()}`;
             }
+          },
+          onAbort: async ({ steps }) => {
+            isAborted = true;
+            console.log(`Stream aborted after ${steps.length} steps`);
           }
         });
+        let reasoningId = `reasoning_${Date.now()}`;
+        let reasoningStarted = false;
         for await (const part of result.stream.fullStream) {
           if (part.type === "text-delta") {
             if (!textStarted) {
-              await stream.writeSSE({
-                data: JSON.stringify({ type: "text-start", id: textId })
-              });
+              await writeSSE(JSON.stringify({ type: "text-start", id: textId }));
               textStarted = true;
             }
-            await stream.writeSSE({
-              data: JSON.stringify({ type: "text-delta", id: textId, delta: part.text })
-            });
+            await writeSSE(JSON.stringify({ type: "text-delta", id: textId, delta: part.text }));
+          } else if (part.type === "reasoning-start") {
+            await writeSSE(JSON.stringify({ type: "reasoning-start", id: reasoningId }));
+            reasoningStarted = true;
+          } else if (part.type === "reasoning-delta") {
+            await writeSSE(JSON.stringify({ type: "reasoning-delta", id: reasoningId, delta: part.text }));
+          } else if (part.type === "reasoning-end") {
+            if (reasoningStarted) {
+              await writeSSE(JSON.stringify({ type: "reasoning-end", id: reasoningId }));
+              reasoningStarted = false;
+              reasoningId = `reasoning_${Date.now()}`;
+            }
+          } else if (part.type === "tool-call-streaming-start") {
+            const p = part;
+            await writeSSE(JSON.stringify({
+              type: "tool-input-start",
+              toolCallId: p.toolCallId,
+              toolName: p.toolName
+            }));
+          } else if (part.type === "tool-call-delta") {
+            const p = part;
+            await writeSSE(JSON.stringify({
+              type: "tool-input-delta",
+              toolCallId: p.toolCallId,
+              argsTextDelta: p.argsTextDelta
+            }));
           } else if (part.type === "tool-call") {
-            await stream.writeSSE({
-              data: JSON.stringify({
-                type: "tool-input-available",
-                toolCallId: part.toolCallId,
-                toolName: part.toolName,
-                input: part.input
-              })
-            });
+            await writeSSE(JSON.stringify({
+              type: "tool-input-available",
+              toolCallId: part.toolCallId,
+              toolName: part.toolName,
+              input: part.input
+            }));
           } else if (part.type === "tool-result") {
-            await stream.writeSSE({
-              data: JSON.stringify({
-                type: "tool-output-available",
-                toolCallId: part.toolCallId,
-                output: part.output
-              })
-            });
+            await writeSSE(JSON.stringify({
+              type: "tool-output-available",
+              toolCallId: part.toolCallId,
+              output: part.output
+            }));
           } else if (part.type === "error") {
             console.error("Stream error:", part.error);
-            await stream.writeSSE({
-              data: JSON.stringify({ type: "error", errorText: String(part.error) })
-            });
+            await writeSSE(JSON.stringify({ type: "error", errorText: String(part.error) }));
           }
         }
         if (textStarted) {
-          await stream.writeSSE({
-            data: JSON.stringify({ type: "text-end", id: textId })
-          });
+          await writeSSE(JSON.stringify({ type: "text-end", id: textId }));
         }
-        await result.saveResponseMessages();
-        await stream.writeSSE({
-          data: JSON.stringify({ type: "finish" })
-        });
-        await stream.writeSSE({ data: "[DONE]" });
+        if (reasoningStarted) {
+          await writeSSE(JSON.stringify({ type: "reasoning-end", id: reasoningId }));
+        }
+        if (!isAborted) {
+          await result.saveResponseMessages();
+        }
+        if (isAborted) {
+          await writeSSE(JSON.stringify({ type: "abort" }));
+        } else {
+          await writeSSE(JSON.stringify({ type: "finish" }));
+        }
+        activeStreamQueries.finish(streamId);
       } catch (error) {
-        await stream.writeSSE({
-          data: JSON.stringify({
-            type: "error",
-            errorText: error.message
-          })
-        });
-        await stream.writeSSE({ data: "[DONE]" });
+        if (error.name === "AbortError" || error.message?.includes("aborted")) {
+          await writeSSE(JSON.stringify({ type: "abort" }));
+        } else {
+          console.error("Agent error:", error);
+          await writeSSE(JSON.stringify({ type: "error", errorText: error.message }));
+          activeStreamQueries.markError(streamId);
+        }
+      } finally {
+        cleanupAbortController();
+        await writeSSE("[DONE]");
+        await safeClose();
+      }
+    })();
+    return readable;
+  };
+}
+agents.post(
+  "/:id/run",
+  zValidator2("json", runPromptSchema),
+  async (c) => {
+    const id = c.req.param("id");
+    const { prompt } = c.req.valid("json");
+    const session = sessionQueries.getById(id);
+    if (!session) {
+      return c.json({ error: "Session not found" }, 404);
+    }
+    const nextSequence = messageQueries.getNextSequence(id);
+    await createCheckpoint(id, session.workingDirectory, nextSequence);
+    messageQueries.create(id, { role: "user", content: prompt });
+    const streamId = `stream_${id}_${nanoid4(10)}`;
+    activeStreamQueries.create(id, streamId);
+    const stream = await streamContext.resumableStream(
+      streamId,
+      createAgentStreamProducer(id, prompt, streamId)
+    );
+    if (!stream) {
+      return c.json({ error: "Failed to create stream" }, 500);
+    }
+    const encodedStream = stream.pipeThrough(new TextEncoderStream());
+    return new Response(encodedStream, {
+      headers: {
+        "Content-Type": "text/event-stream",
+        "Cache-Control": "no-cache",
+        "Connection": "keep-alive",
+        "x-vercel-ai-ui-message-stream": "v1",
+        "x-stream-id": streamId
       }
     });
   }
 );
+agents.get("/:id/watch", async (c) => {
+  const sessionId = c.req.param("id");
+  const resumeAt = c.req.query("resumeAt");
+  const explicitStreamId = c.req.query("streamId");
+  const session = sessionQueries.getById(sessionId);
+  if (!session) {
+    return c.json({ error: "Session not found" }, 404);
+  }
+  let streamId = explicitStreamId;
+  if (!streamId) {
+    const activeStream = activeStreamQueries.getBySessionId(sessionId);
+    if (!activeStream) {
+      return c.json({ error: "No active stream for this session", hint: "Start a new run with POST /agents/:id/run" }, 404);
+    }
+    streamId = activeStream.streamId;
+  }
+  const stream = await streamContext.resumeExistingStream(
+    streamId,
+    resumeAt ? parseInt(resumeAt, 10) : void 0
+  );
+  if (!stream) {
+    return c.json({
+      error: "Stream is no longer active",
+      streamId,
+      hint: "The stream may have finished. Check /agents/:id/approvals or start a new run."
+    }, 422);
+  }
+  const encodedStream = stream.pipeThrough(new TextEncoderStream());
+  return new Response(encodedStream, {
+    headers: {
+      "Content-Type": "text/event-stream",
+      "Cache-Control": "no-cache",
+      "Connection": "keep-alive",
+      "x-vercel-ai-ui-message-stream": "v1",
+      "x-stream-id": streamId
+    }
+  });
+});
+agents.get("/:id/stream", async (c) => {
+  const sessionId = c.req.param("id");
+  const session = sessionQueries.getById(sessionId);
+  if (!session) {
+    return c.json({ error: "Session not found" }, 404);
+  }
+  const activeStream = activeStreamQueries.getBySessionId(sessionId);
+  return c.json({
+    sessionId,
+    hasActiveStream: !!activeStream,
+    stream: activeStream ? {
+      id: activeStream.id,
+      streamId: activeStream.streamId,
+      status: activeStream.status,
+      createdAt: activeStream.createdAt.toISOString()
+    } : null
+  });
+});
 agents.post(
   "/:id/generate",
   zValidator2("json", runPromptSchema),
@@ -2607,6 +3667,28 @@ agents.get("/:id/approvals", async (c) => {
     count: pendingApprovals.length
   });
 });
+agents.post("/:id/abort", async (c) => {
+  const sessionId = c.req.param("id");
+  const session = sessionQueries.getById(sessionId);
+  if (!session) {
+    return c.json({ error: "Session not found" }, 404);
+  }
+  const activeStream = activeStreamQueries.getBySessionId(sessionId);
+  if (!activeStream) {
+    return c.json({ error: "No active stream for this session" }, 404);
+  }
+  const abortController = streamAbortControllers.get(activeStream.streamId);
+  if (abortController) {
+    abortController.abort();
+    streamAbortControllers.delete(activeStream.streamId);
+    return c.json({ success: true, streamId: activeStream.streamId, aborted: true });
+  }
+  return c.json({
+    success: false,
+    streamId: activeStream.streamId,
+    message: "Stream may have already finished or was not found"
+  });
+});
 agents.post(
   "/quick",
   zValidator2("json", quickStartSchema),
@@ -2620,14 +3702,41 @@ agents.post(
       sessionConfig: body.toolApprovals ? { toolApprovals: body.toolApprovals } : void 0
     });
     const session = agent.getSession();
-    c.header("Content-Type", "text/event-stream");
-    c.header("Cache-Control", "no-cache");
-    c.header("Connection", "keep-alive");
-    c.header("x-vercel-ai-ui-message-stream", "v1");
-    return streamSSE(c, async (stream) => {
-      try {
-        await stream.writeSSE({
-          data: JSON.stringify({
+    const streamId = `stream_${session.id}_${nanoid4(10)}`;
+    await createCheckpoint(session.id, session.workingDirectory, 0);
+    activeStreamQueries.create(session.id, streamId);
+    const createQuickStreamProducer = () => {
+      const { readable, writable } = new TransformStream();
+      const writer = writable.getWriter();
+      let writerClosed = false;
+      const abortController = new AbortController();
+      streamAbortControllers.set(streamId, abortController);
+      const writeSSE = async (data) => {
+        if (writerClosed) return;
+        try {
+          await writer.write(`data: ${data}
+
+`);
+        } catch (err) {
+          writerClosed = true;
+        }
+      };
+      const safeClose = async () => {
+        if (writerClosed) return;
+        try {
+          writerClosed = true;
+          await writer.close();
+        } catch {
+        }
+      };
+      const cleanupAbortController = () => {
+        streamAbortControllers.delete(streamId);
+      };
+      (async () => {
+        let isAborted = false;
+        try {
+          await writeSSE(JSON.stringify({ type: "data-stream-id", streamId }));
+          await writeSSE(JSON.stringify({
             type: "data-session",
             data: {
               id: session.id,
@@ -2635,63 +3744,134 @@ agents.post(
               workingDirectory: session.workingDirectory,
               model: session.model
             }
-          })
-        });
-        const messageId = `msg_${Date.now()}`;
-        await stream.writeSSE({
-          data: JSON.stringify({ type: "start", messageId })
-        });
-        let textId = `text_${Date.now()}`;
-        let textStarted = false;
-        const result = await agent.stream({
-          prompt: body.prompt,
-          onStepFinish: async () => {
-            await stream.writeSSE({
-              data: JSON.stringify({ type: "finish-step" })
-            });
-            if (textStarted) {
-              await stream.writeSSE({
-                data: JSON.stringify({ type: "text-end", id: textId })
-              });
-              textStarted = false;
-              textId = `text_${Date.now()}`;
+          }));
+          const messageId = `msg_${Date.now()}`;
+          await writeSSE(JSON.stringify({ type: "start", messageId }));
+          let textId = `text_${Date.now()}`;
+          let textStarted = false;
+          const result = await agent.stream({
+            prompt: body.prompt,
+            abortSignal: abortController.signal,
+            // Use our managed abort controller, NOT client signal
+            onToolProgress: async (progress) => {
+              await writeSSE(JSON.stringify({
+                type: "tool-progress",
+                toolName: progress.toolName,
+                data: progress.data
+              }));
+            },
+            onStepFinish: async () => {
+              await writeSSE(JSON.stringify({ type: "finish-step" }));
+              if (textStarted) {
+                await writeSSE(JSON.stringify({ type: "text-end", id: textId }));
+                textStarted = false;
+                textId = `text_${Date.now()}`;
+              }
+            },
+            onAbort: async ({ steps }) => {
+              isAborted = true;
+              console.log(`Stream aborted after ${steps.length} steps`);
             }
-          }
-        });
-        for await (const part of result.stream.fullStream) {
-          if (part.type === "text-delta") {
-            if (!textStarted) {
-              await stream.writeSSE({
-                data: JSON.stringify({ type: "text-start", id: textId })
-              });
-              textStarted = true;
+          });
+          let reasoningId = `reasoning_${Date.now()}`;
+          let reasoningStarted = false;
+          for await (const part of result.stream.fullStream) {
+            if (part.type === "text-delta") {
+              if (!textStarted) {
+                await writeSSE(JSON.stringify({ type: "text-start", id: textId }));
+                textStarted = true;
+              }
+              await writeSSE(JSON.stringify({ type: "text-delta", id: textId, delta: part.text }));
+            } else if (part.type === "reasoning-start") {
+              await writeSSE(JSON.stringify({ type: "reasoning-start", id: reasoningId }));
+              reasoningStarted = true;
+            } else if (part.type === "reasoning-delta") {
+              await writeSSE(JSON.stringify({ type: "reasoning-delta", id: reasoningId, delta: part.text }));
+            } else if (part.type === "reasoning-end") {
+              if (reasoningStarted) {
+                await writeSSE(JSON.stringify({ type: "reasoning-end", id: reasoningId }));
+                reasoningStarted = false;
+                reasoningId = `reasoning_${Date.now()}`;
+              }
+            } else if (part.type === "tool-call-streaming-start") {
+              const p = part;
+              await writeSSE(JSON.stringify({
+                type: "tool-input-start",
+                toolCallId: p.toolCallId,
+                toolName: p.toolName
+              }));
+            } else if (part.type === "tool-call-delta") {
+              const p = part;
+              await writeSSE(JSON.stringify({
+                type: "tool-input-delta",
+                toolCallId: p.toolCallId,
+                argsTextDelta: p.argsTextDelta
+              }));
+            } else if (part.type === "tool-call") {
+              await writeSSE(JSON.stringify({
+                type: "tool-input-available",
+                toolCallId: part.toolCallId,
+                toolName: part.toolName,
+                input: part.input
+              }));
+            } else if (part.type === "tool-result") {
+              await writeSSE(JSON.stringify({
+                type: "tool-output-available",
+                toolCallId: part.toolCallId,
+                output: part.output
+              }));
+            } else if (part.type === "error") {
+              console.error("Stream error:", part.error);
+              await writeSSE(JSON.stringify({ type: "error", errorText: String(part.error) }));
             }
-            await stream.writeSSE({
-              data: JSON.stringify({ type: "text-delta", id: textId, delta: part.text })
-            });
-          } else if (part.type === "error") {
-            console.error("Stream error:", part.error);
-            await stream.writeSSE({
-              data: JSON.stringify({ type: "error", errorText: String(part.error) })
-            });
           }
+          if (textStarted) {
+            await writeSSE(JSON.stringify({ type: "text-end", id: textId }));
+          }
+          if (reasoningStarted) {
+            await writeSSE(JSON.stringify({ type: "reasoning-end", id: reasoningId }));
+          }
+          if (!isAborted) {
+            await result.saveResponseMessages();
+          }
+          if (isAborted) {
+            await writeSSE(JSON.stringify({ type: "abort" }));
+          } else {
+            await writeSSE(JSON.stringify({ type: "finish" }));
+          }
+          activeStreamQueries.finish(streamId);
+        } catch (error) {
+          if (error.name === "AbortError" || error.message?.includes("aborted")) {
+            await writeSSE(JSON.stringify({ type: "abort" }));
+          } else {
+            console.error("Agent error:", error);
+            await writeSSE(JSON.stringify({ type: "error", errorText: error.message }));
+            activeStreamQueries.markError(streamId);
+          }
+        } finally {
+          cleanupAbortController();
+          await writeSSE("[DONE]");
+          await safeClose();
         }
-        if (textStarted) {
-          await stream.writeSSE({
-            data: JSON.stringify({ type: "text-end", id: textId })
-          });
-        }
-        await result.saveResponseMessages();
-        await stream.writeSSE({
-          data: JSON.stringify({ type: "finish" })
-        });
-        await stream.writeSSE({ data: "[DONE]" });
-      } catch (error) {
-        console.error("Agent error:", error);
-        await stream.writeSSE({
-          data: JSON.stringify({ type: "error", errorText: error.message })
-        });
-        await stream.writeSSE({ data: "[DONE]" });
+      })();
+      return readable;
+    };
+    const stream = await streamContext.resumableStream(
+      streamId,
+      createQuickStreamProducer
+    );
+    if (!stream) {
+      return c.json({ error: "Failed to create stream" }, 500);
+    }
+    const encodedStream = stream.pipeThrough(new TextEncoderStream());
+    return new Response(encodedStream, {
+      headers: {
+        "Content-Type": "text/event-stream",
+        "Cache-Control": "no-cache",
+        "Connection": "keep-alive",
+        "x-vercel-ai-ui-message-stream": "v1",
+        "x-stream-id": streamId,
+        "x-session-id": session.id
       }
     });
   }
@@ -2699,16 +3879,23 @@ agents.post(
 
 // src/server/routes/health.ts
 import { Hono as Hono3 } from "hono";
+import { zValidator as zValidator3 } from "@hono/zod-validator";
+import { z as z10 } from "zod";
 var health = new Hono3();
 health.get("/", async (c) => {
   const config = getConfig();
+  const apiKeyStatus = getApiKeyStatus();
+  const gatewayKey = apiKeyStatus.find((s) => s.provider === "ai-gateway");
+  const hasApiKey = gatewayKey?.configured ?? false;
   return c.json({
     status: "ok",
     version: "0.1.0",
     uptime: process.uptime(),
+    apiKeyConfigured: hasApiKey,
     config: {
       workingDirectory: config.resolvedWorkingDirectory,
       defaultModel: config.defaultModel,
+      defaultToolApprovals: config.toolApprovals || {},
       port: config.server.port
     },
     timestamp: (/* @__PURE__ */ new Date()).toISOString()
@@ -2732,10 +3919,54 @@ health.get("/ready", async (c) => {
     );
   }
 });
+health.get("/api-keys", async (c) => {
+  const status = getApiKeyStatus();
+  return c.json({
+    providers: status,
+    supportedProviders: SUPPORTED_PROVIDERS
+  });
+});
+var setApiKeySchema = z10.object({
+  provider: z10.string(),
+  apiKey: z10.string().min(1)
+});
+health.post(
+  "/api-keys",
+  zValidator3("json", setApiKeySchema),
+  async (c) => {
+    const { provider, apiKey } = c.req.valid("json");
+    try {
+      setApiKey(provider, apiKey);
+      const status = getApiKeyStatus();
+      const providerStatus = status.find((s) => s.provider === provider.toLowerCase());
+      return c.json({
+        success: true,
+        provider: provider.toLowerCase(),
+        maskedKey: providerStatus?.maskedKey,
+        message: `API key for ${provider} saved successfully`
+      });
+    } catch (error) {
+      return c.json({ error: error.message }, 400);
+    }
+  }
+);
+health.delete("/api-keys/:provider", async (c) => {
+  const provider = c.req.param("provider");
+  try {
+    removeApiKey(provider);
+    return c.json({
+      success: true,
+      provider: provider.toLowerCase(),
+      message: `API key for ${provider} removed`
+    });
+  } catch (error) {
+    return c.json({ error: error.message }, 400);
+  }
+});
 
 // src/server/routes/terminals.ts
 import { Hono as Hono4 } from "hono";
-import { zValidator as zValidator3 } from "@hono/zod-validator";
+import { zValidator as zValidator4 } from "@hono/zod-validator";
 import { z as z11 } from "zod";
 var terminals2 = new Hono4();
 var spawnSchema = z11.object({
@@ -2745,7 +3976,7 @@ var spawnSchema = z11.object({
 });
 terminals2.post(
   "/:sessionId/terminals",
-  zValidator3("json", spawnSchema),
+  zValidator4("json", spawnSchema),
   async (c) => {
     const sessionId = c.req.param("sessionId");
     const body = c.req.valid("json");
@@ -2753,14 +3984,21 @@ terminals2.post(
     if (!session) {
       return c.json({ error: "Session not found" }, 404);
     }
-    const manager = getTerminalManager();
-    const terminal = manager.spawn({
-      sessionId,
+    const hasTmux = await isTmuxAvailable();
+    if (!hasTmux) {
+      return c.json({ error: "tmux is not installed. Background terminals require tmux." }, 400);
+    }
+    const workingDirectory = body.cwd || session.workingDirectory;
+    const result = await runBackground(body.command, workingDirectory, { sessionId });
+    return c.json({
+      id: result.id,
+      name: body.name || null,
       command: body.command,
-      cwd: body.cwd || session.workingDirectory,
-      name: body.name
-    });
-    return c.json(terminal, 201);
+      cwd: workingDirectory,
+      status: result.status,
+      pid: null
+      // tmux doesn't expose PID directly
+    }, 201);
   }
 );
 terminals2.get("/:sessionId/terminals", async (c) => {
@@ -2769,8 +4007,20 @@ terminals2.get("/:sessionId/terminals", async (c) => {
   if (!session) {
     return c.json({ error: "Session not found" }, 404);
   }
-  const manager = getTerminalManager();
-  const terminalList = manager.list(sessionId);
+  const sessionTerminals = await listSessionTerminals(sessionId, session.workingDirectory);
+  const terminalList = await Promise.all(
+    sessionTerminals.map(async (meta) => {
+      const running = await isRunning(meta.id);
+      return {
+        id: meta.id,
+        name: null,
+        command: meta.command,
+        cwd: meta.cwd,
+        status: running ? "running" : "stopped",
+        createdAt: meta.createdAt
+      };
+    })
+  );
   return c.json({
     sessionId,
     terminals: terminalList,
@@ -2781,31 +4031,47 @@ terminals2.get("/:sessionId/terminals", async (c) => {
 terminals2.get("/:sessionId/terminals/:terminalId", async (c) => {
   const sessionId = c.req.param("sessionId");
   const terminalId = c.req.param("terminalId");
-  const manager = getTerminalManager();
-  const terminal = manager.getStatus(terminalId);
-  if (!terminal) {
+  const session = sessionQueries.getById(sessionId);
+  if (!session) {
+    return c.json({ error: "Session not found" }, 404);
+  }
+  const meta = await getMeta(terminalId, session.workingDirectory, sessionId);
+  if (!meta) {
     return c.json({ error: "Terminal not found" }, 404);
   }
-  return c.json(terminal);
+  const running = await isRunning(terminalId);
+  return c.json({
+    id: terminalId,
+    command: meta.command,
+    cwd: meta.cwd,
+    status: running ? "running" : "stopped",
+    createdAt: meta.createdAt,
+    exitCode: running ? null : 0
+    // We don't track exit codes in tmux mode
+  });
 });
 var logsQuerySchema = z11.object({
   tail: z11.string().optional().transform((v) => v ? parseInt(v, 10) : void 0)
 });
 terminals2.get(
   "/:sessionId/terminals/:terminalId/logs",
-  zValidator3("query", logsQuerySchema),
+  zValidator4("query", logsQuerySchema),
   async (c) => {
+    const sessionId = c.req.param("sessionId");
     const terminalId = c.req.param("terminalId");
     const query = c.req.valid("query");
-    const manager = getTerminalManager();
-    const result = manager.getLogs(terminalId, query.tail);
-    if (!result) {
+    const session = sessionQueries.getById(sessionId);
+    if (!session) {
+      return c.json({ error: "Session not found" }, 404);
+    }
+    const result = await getLogs(terminalId, session.workingDirectory, { tail: query.tail, sessionId });
+    if (result.status === "unknown") {
       return c.json({ error: "Terminal not found" }, 404);
     }
     return c.json({
       terminalId,
-      logs: result.logs,
-      lineCount: result.lineCount
+      logs: result.output,
+      lineCount: result.output.split("\n").length
     });
   }
 );
@@ -2814,16 +4080,14 @@ var killSchema = z11.object({
 });
 terminals2.post(
   "/:sessionId/terminals/:terminalId/kill",
-  zValidator3("json", killSchema.optional()),
+  zValidator4("json", killSchema.optional()),
   async (c) => {
     const terminalId = c.req.param("terminalId");
-    const body = await c.req.json().catch(() => ({}));
-    const manager = getTerminalManager();
-    const success = manager.kill(terminalId, body.signal);
+    const success = await killTerminal(terminalId);
     if (!success) {
-      return c.json({ error: "Failed to kill terminal" }, 400);
+      return c.json({ error: "Failed to kill terminal (may already be stopped)" }, 400);
     }
-    return c.json({ success: true, message: `Sent ${body.signal || "SIGTERM"} to terminal` });
+    return c.json({ success: true, message: "Terminal killed" });
   }
 );
 var writeSchema = z11.object({
@@ -2831,97 +4095,164 @@ var writeSchema = z11.object({
 });
 terminals2.post(
   "/:sessionId/terminals/:terminalId/write",
-  zValidator3("json", writeSchema),
+  zValidator4("json", writeSchema),
   async (c) => {
-    const terminalId = c.req.param("terminalId");
-    const body = c.req.valid("json");
-    const manager = getTerminalManager();
-    const success = manager.write(terminalId, body.input);
-    if (!success) {
-      return c.json({ error: "Failed to write to terminal" }, 400);
-    }
-    return c.json({ success: true });
+    return c.json({
+      error: "stdin writing not supported in tmux mode. Use tmux send-keys directly if needed.",
+      hint: 'tmux send-keys -t spark_{terminalId} "your input"'
+    }, 501);
   }
 );
 terminals2.post("/:sessionId/terminals/kill-all", async (c) => {
   const sessionId = c.req.param("sessionId");
-  const manager = getTerminalManager();
-  const killed = manager.killAll(sessionId);
+  const session = sessionQueries.getById(sessionId);
+  if (!session) {
+    return c.json({ error: "Session not found" }, 404);
+  }
+  const terminalIds = await listSessions();
+  let killed = 0;
+  for (const id of terminalIds) {
+    const meta = await getMeta(id, session.workingDirectory);
+    if (meta && meta.sessionId === sessionId) {
+      const success = await killTerminal(id);
+      if (success) killed++;
+    }
+  }
   return c.json({ success: true, killed });
 });
+terminals2.get("/stream/:terminalId", async (c) => {
+  const terminalId = c.req.param("terminalId");
+  const sessions3 = sessionQueries.list();
+  let terminalMeta = null;
+  let workingDirectory = process.cwd();
+  let foundSessionId;
+  for (const session of sessions3) {
+    terminalMeta = await getMeta(terminalId, session.workingDirectory, session.id);
+    if (terminalMeta) {
+      workingDirectory = session.workingDirectory;
+      foundSessionId = session.id;
+      break;
+    }
+  }
+  if (!terminalMeta) {
+    for (const session of sessions3) {
+      terminalMeta = await getMeta(terminalId, session.workingDirectory);
+      if (terminalMeta) {
+        workingDirectory = session.workingDirectory;
+        foundSessionId = terminalMeta.sessionId;
+        break;
+      }
+    }
+  }
+  const isActive = await isRunning(terminalId);
+  if (!terminalMeta && !isActive) {
+    return c.json({ error: "Terminal not found" }, 404);
+  }
+  return new Response(
+    new ReadableStream({
+      async start(controller) {
+        const encoder = new TextEncoder();
+        let lastOutput = "";
+        let isRunning2 = true;
+        let pollCount = 0;
+        const maxPolls = 600;
+        controller.enqueue(
+          encoder.encode(`event: status
+data: ${JSON.stringify({ terminalId, status: "connected" })}
+
+`)
+        );
+        while (isRunning2 && pollCount < maxPolls) {
+          try {
+            const result = await getLogs(terminalId, workingDirectory, { sessionId: foundSessionId });
+            if (result.output !== lastOutput) {
+              const newContent = result.output.slice(lastOutput.length);
+              if (newContent) {
+                controller.enqueue(
+                  encoder.encode(`event: stdout
+data: ${JSON.stringify({ data: newContent })}
+
+`)
+                );
+              }
+              lastOutput = result.output;
+            }
+            isRunning2 = result.status === "running";
+            if (!isRunning2) {
+              controller.enqueue(
+                encoder.encode(`event: exit
+data: ${JSON.stringify({ status: "stopped" })}
+
+`)
+              );
+              break;
+            }
+            await new Promise((r) => setTimeout(r, 200));
+            pollCount++;
+          } catch {
+            break;
+          }
+        }
+        controller.close();
+      }
+    }),
+    {
+      headers: {
+        "Content-Type": "text/event-stream",
+        "Cache-Control": "no-cache",
+        "Connection": "keep-alive"
+      }
+    }
+  );
+});
 terminals2.get("/:sessionId/terminals/:terminalId/stream", async (c) => {
+  const sessionId = c.req.param("sessionId");
   const terminalId = c.req.param("terminalId");
-  const manager = getTerminalManager();
-  const terminal = manager.getStatus(terminalId);
-  if (!terminal) {
+  const session = sessionQueries.getById(sessionId);
+  if (!session) {
+    return c.json({ error: "Session not found" }, 404);
+  }
+  const meta = await getMeta(terminalId, session.workingDirectory, sessionId);
+  if (!meta) {
     return c.json({ error: "Terminal not found" }, 404);
   }
-  c.header("Content-Type", "text/event-stream");
-  c.header("Cache-Control", "no-cache");
-  c.header("Connection", "keep-alive");
   return new Response(
     new ReadableStream({
-      start(controller) {
+      async start(controller) {
         const encoder = new TextEncoder();
-        const initialLogs = manager.getLogs(terminalId);
-        if (initialLogs) {
-          controller.enqueue(
-            encoder.encode(`event: logs
-data: ${JSON.stringify({ logs: initialLogs.logs })}
-
-`)
-          );
-        }
-        const onStdout = ({ terminalId: tid, data }) => {
-          if (tid === terminalId) {
-            controller.enqueue(
-              encoder.encode(`event: stdout
-data: ${JSON.stringify({ data })}
-
-`)
-            );
-          }
-        };
-        const onStderr = ({ terminalId: tid, data }) => {
-          if (tid === terminalId) {
-            controller.enqueue(
-              encoder.encode(`event: stderr
-data: ${JSON.stringify({ data })}
+        let lastOutput = "";
+        let isRunning2 = true;
+        while (isRunning2) {
+          try {
+            const result = await getLogs(terminalId, session.workingDirectory, { sessionId });
+            if (result.output !== lastOutput) {
+              const newContent = result.output.slice(lastOutput.length);
+              if (newContent) {
+                controller.enqueue(
+                  encoder.encode(`event: stdout
+data: ${JSON.stringify({ data: newContent })}
 
 `)
-            );
-          }
-        };
-        const onExit = ({ terminalId: tid, code, signal }) => {
-          if (tid === terminalId) {
-            controller.enqueue(
-              encoder.encode(`event: exit
-data: ${JSON.stringify({ code, signal })}
+                );
+              }
+              lastOutput = result.output;
+            }
+            isRunning2 = result.status === "running";
+            if (!isRunning2) {
+              controller.enqueue(
+                encoder.encode(`event: exit
+data: ${JSON.stringify({ status: "stopped" })}
 
 `)
-            );
-            cleanup();
-            controller.close();
+              );
+              break;
+            }
+            await new Promise((r) => setTimeout(r, 500));
+          } catch {
+            break;
           }
-        };
-        const cleanup = () => {
-          manager.off("stdout", onStdout);
-          manager.off("stderr", onStderr);
-          manager.off("exit", onExit);
-        };
-        manager.on("stdout", onStdout);
-        manager.on("stderr", onStderr);
-        manager.on("exit", onExit);
-        if (terminal.status !== "running") {
-          controller.enqueue(
-            encoder.encode(`event: exit
-data: ${JSON.stringify({ code: terminal.exitCode, status: terminal.status })}
-
-`)
-          );
-          cleanup();
-          controller.close();
         }
+        controller.close();
       }
     }),
     {
@@ -2934,16 +4265,270 @@ data: ${JSON.stringify({ code: terminal.exitCode, status: terminal.status })}
   );
 });
 
+// src/utils/dependencies.ts
+import { exec as exec4 } from "child_process";
+import { promisify as promisify4 } from "util";
+import { platform as platform2 } from "os";
+var execAsync4 = promisify4(exec4);
+function getInstallInstructions() {
+  const os2 = platform2();
+  if (os2 === "darwin") {
+    return `
+Install tmux on macOS:
+  brew install tmux
+
+If you don't have Homebrew, install it first:
+  /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+`.trim();
+  }
+  if (os2 === "linux") {
+    return `
+Install tmux on Linux:
+  # Ubuntu/Debian
+  sudo apt-get update && sudo apt-get install -y tmux
+
+  # Fedora/RHEL
+  sudo dnf install -y tmux
+
+  # Arch Linux
+  sudo pacman -S tmux
+`.trim();
+  }
+  return `
+Install tmux:
+  Please install tmux for your operating system.
+  Visit: https://github.com/tmux/tmux/wiki/Installing
+`.trim();
+}
+async function checkTmux() {
+  try {
+    const { stdout } = await execAsync4("tmux -V", { timeout: 5e3 });
+    const version = stdout.trim();
+    return {
+      available: true,
+      version
+    };
+  } catch (error) {
+    return {
+      available: false,
+      error: "tmux is not installed or not in PATH",
+      installInstructions: getInstallInstructions()
+    };
+  }
+}
+async function checkDependencies(options = {}) {
+  const { quiet = false, exitOnFailure = true } = options;
+  const tmuxCheck = await checkTmux();
+  if (!tmuxCheck.available) {
+    if (!quiet) {
+      console.error("\n\u274C Missing required dependency: tmux");
+      console.error("");
+      console.error("SparkECoder requires tmux for terminal session management.");
+      console.error("");
+      if (tmuxCheck.installInstructions) {
+        console.error(tmuxCheck.installInstructions);
+      }
+      console.error("");
+      console.error("After installing tmux, run sparkecoder again.");
+      console.error("");
+    }
+    if (exitOnFailure) {
+      process.exit(1);
+    }
+    return false;
+  }
+  if (!quiet) {
+  }
+  return true;
+}
+async function tryAutoInstallTmux() {
+  const os2 = platform2();
+  try {
+    if (os2 === "darwin") {
+      try {
+        await execAsync4("which brew", { timeout: 5e3 });
+      } catch {
+        return false;
+      }
+      console.log("\u{1F4E6} Installing tmux via Homebrew...");
+      await execAsync4("brew install tmux", { timeout: 3e5 });
+      console.log("\u2705 tmux installed successfully");
+      return true;
+    }
+    if (os2 === "linux") {
+      try {
+        await execAsync4("which apt-get", { timeout: 5e3 });
+        console.log("\u{1F4E6} Installing tmux via apt-get...");
+        console.log("   (This may require sudo password)");
+        await execAsync4("sudo apt-get update && sudo apt-get install -y tmux", {
+          timeout: 3e5
+        });
+        console.log("\u2705 tmux installed successfully");
+        return true;
+      } catch {
+      }
+      try {
+        await execAsync4("which dnf", { timeout: 5e3 });
+        console.log("\u{1F4E6} Installing tmux via dnf...");
+        await execAsync4("sudo dnf install -y tmux", { timeout: 3e5 });
+        console.log("\u2705 tmux installed successfully");
+        return true;
+      } catch {
+      }
+    }
+    return false;
+  } catch (error) {
+    console.error(`Failed to auto-install tmux: ${error.message}`);
+    return false;
+  }
+}
+async function ensureDependencies(options = {}) {
+  const { autoInstall = false, quiet = false } = options;
+  const tmuxCheck = await checkTmux();
+  if (tmuxCheck.available) {
+    return;
+  }
+  if (autoInstall) {
+    const installed = await tryAutoInstallTmux();
+    if (installed) {
+      return;
+    }
+  }
+  await checkDependencies({ quiet, exitOnFailure: true });
+}
+
 // src/server/index.ts
 var serverInstance = null;
-async function createApp() {
+var webUIProcess = null;
+var DEFAULT_WEB_PORT = 6969;
+var WEB_PORT_SEQUENCE = [6969, 6970, 6971, 6972, 6973, 6974, 6975, 6976, 6977, 6978];
+function getWebDirectory() {
+  try {
+    const currentDir = dirname4(fileURLToPath(import.meta.url));
+    const webDir = resolve6(currentDir, "..", "web");
+    if (existsSync7(webDir) && existsSync7(join3(webDir, "package.json"))) {
+      return webDir;
+    }
+    const altWebDir = resolve6(currentDir, "..", "..", "web");
+    if (existsSync7(altWebDir) && existsSync7(join3(altWebDir, "package.json"))) {
+      return altWebDir;
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+async function isSparkcoderWebRunning(port) {
+  try {
+    const response = await fetch(`http://localhost:${port}/api/health`, {
+      signal: AbortSignal.timeout(1e3)
+    });
+    if (response.ok) {
+      const data = await response.json();
+      return data.name === "sparkecoder-web";
+    }
+    return false;
+  } catch {
+    return false;
+  }
+}
+function isPortInUse(port) {
+  return new Promise((resolve8) => {
+    const server = createNetServer();
+    server.once("error", (err) => {
+      if (err.code === "EADDRINUSE") {
+        resolve8(true);
+      } else {
+        resolve8(false);
+      }
+    });
+    server.once("listening", () => {
+      server.close();
+      resolve8(false);
+    });
+    server.listen(port, "0.0.0.0");
+  });
+}
+async function findWebPort(preferredPort) {
+  if (await isSparkcoderWebRunning(preferredPort)) {
+    return { port: preferredPort, alreadyRunning: true };
+  }
+  if (!await isPortInUse(preferredPort)) {
+    return { port: preferredPort, alreadyRunning: false };
+  }
+  for (const port of WEB_PORT_SEQUENCE) {
+    if (port === preferredPort) continue;
+    if (await isSparkcoderWebRunning(port)) {
+      return { port, alreadyRunning: true };
+    }
+    if (!await isPortInUse(port)) {
+      return { port, alreadyRunning: false };
+    }
+  }
+  return { port: preferredPort, alreadyRunning: false };
+}
+async function startWebUI(apiPort, webPort = DEFAULT_WEB_PORT, quiet = false) {
+  const webDir = getWebDirectory();
+  if (!webDir) {
+    if (!quiet) console.log("  \u26A0 Web UI not found, skipping...");
+    return { process: null, port: webPort };
+  }
+  const { port: actualPort, alreadyRunning } = await findWebPort(webPort);
+  if (alreadyRunning) {
+    if (!quiet) console.log(`  \u2713 Web UI already running at http://localhost:${actualPort}`);
+    return { process: null, port: actualPort };
+  }
+  const useNpm = existsSync7(join3(webDir, "package-lock.json"));
+  const command = useNpm ? "npm" : "npx";
+  const args = useNpm ? ["run", "dev", "--", "-p", String(actualPort)] : ["next", "dev", "-p", String(actualPort)];
+  const child = spawn(command, args, {
+    cwd: webDir,
+    stdio: ["ignore", "pipe", "pipe"],
+    env: {
+      ...process.env,
+      NEXT_PUBLIC_API_URL: `http://127.0.0.1:${apiPort}`
+    },
+    detached: false
+  });
+  let started = false;
+  child.stdout?.on("data", (data) => {
+    const output = data.toString();
+    if (!started && (output.includes("Ready") || output.includes("started") || output.includes("localhost"))) {
+      started = true;
+      if (!quiet) console.log(`  \u2713 Web UI running at http://localhost:${actualPort}`);
+    }
+  });
+  if (!quiet) {
+    child.stderr?.on("data", (data) => {
+      const output = data.toString();
+      if (output.toLowerCase().includes("error")) {
+        console.error(`  Web UI error: ${output.trim()}`);
+      }
+    });
+  }
+  child.on("exit", () => {
+    webUIProcess = null;
+  });
+  webUIProcess = child;
+  return { process: child, port: actualPort };
+}
+function stopWebUI() {
+  if (webUIProcess) {
+    webUIProcess.kill("SIGTERM");
+    webUIProcess = null;
+  }
+}
+async function createApp(options = {}) {
   const app = new Hono5();
   app.use("*", cors());
-  app.use("*", logger());
+  if (!options.quiet) {
+    app.use("*", logger());
+  }
   app.route("/health", health);
   app.route("/sessions", sessions2);
   app.route("/agents", agents);
   app.route("/sessions", terminals2);
+  app.route("/terminals", terminals2);
   app.get("/openapi.json", async (c) => {
     return c.json(generateOpenAPISpec());
   });
@@ -2952,7 +4537,7 @@ async function createApp() {
 <html lang="en">
 <head>
   <meta charset="UTF-8">
-  <title>Sparkecoder API - Swagger UI</title>
+  <title>SparkECoder API - Swagger UI</title>
   <link rel="stylesheet" href="https://unpkg.com/swagger-ui-dist@5/swagger-ui.css">
 </head>
 <body>
@@ -2972,7 +4557,7 @@ async function createApp() {
   });
   app.get("/", (c) => {
     return c.json({
-      name: "Sparkecoder API",
+      name: "SparkECoder API",
       version: "0.1.0",
       description: "A powerful coding agent CLI with HTTP API",
       docs: "/openapi.json",
@@ -2987,37 +4572,63 @@ async function createApp() {
   return app;
 }
 async function startServer(options = {}) {
+  const depsOk = await checkDependencies({ quiet: options.quiet, exitOnFailure: false });
+  if (!depsOk) {
+    throw new Error("Missing required dependency: tmux. See above for installation instructions.");
+  }
   const config = await loadConfig(options.configPath, options.workingDirectory);
+  loadApiKeysIntoEnv();
   if (options.workingDirectory) {
     config.resolvedWorkingDirectory = options.workingDirectory;
   }
-  if (!existsSync5(config.resolvedWorkingDirectory)) {
-    mkdirSync(config.resolvedWorkingDirectory, { recursive: true });
-    console.log(`\u{1F4C1} Created agent workspace: ${config.resolvedWorkingDirectory}`);
+  if (!existsSync7(config.resolvedWorkingDirectory)) {
+    mkdirSync2(config.resolvedWorkingDirectory, { recursive: true });
+    if (!options.quiet) console.log(`\u{1F4C1} Created agent workspace: ${config.resolvedWorkingDirectory}`);
   }
   initDatabase(config.resolvedDatabasePath);
   const port = options.port || config.server.port;
   const host = options.host || config.server.host || "0.0.0.0";
-  const app = await createApp();
-  console.log(`
-\u{1F680} Sparkecoder API Server`);
-  console.log(`   \u2192 Running at http://${host}:${port}`);
-  console.log(`   \u2192 Working directory: ${config.resolvedWorkingDirectory}`);
-  console.log(`   \u2192 Default model: ${config.defaultModel}`);
-  console.log(`   \u2192 OpenAPI spec: http://${host}:${port}/openapi.json
+  const app = await createApp({ quiet: options.quiet });
+  if (!options.quiet) {
+    console.log(`
+\u{1F680} SparkECoder API Server`);
+    console.log(`   \u2192 Running at http://${host}:${port}`);
+    console.log(`   \u2192 Working directory: ${config.resolvedWorkingDirectory}`);
+    console.log(`   \u2192 Default model: ${config.defaultModel}`);
+    console.log(`   \u2192 OpenAPI spec: http://${host}:${port}/openapi.json
 `);
+  }
   serverInstance = serve({
     fetch: app.fetch,
     port,
     hostname: host
   });
-  return { app, port, host };
+  let webPort;
+  if (options.webUI !== false) {
+    const result = await startWebUI(port, options.webPort || DEFAULT_WEB_PORT, options.quiet);
+    webPort = result.port;
+  }
+  return { app, port, host, webPort };
+}
+function stopServer() {
+  stopWebUI();
+  listSessions().then(async (sessions3) => {
+    for (const id of sessions3) {
+      await killTerminal(id);
+    }
+  }).catch(() => {
+  });
+  if (serverInstance) {
+    serverInstance.close();
+    serverInstance = null;
+  }
+  closeDatabase();
 }
 function generateOpenAPISpec() {
   return {
     openapi: "3.1.0",
     info: {
-      title: "Sparkecoder API",
+      title: "SparkECoder API",
       version: "0.1.0",
       description: "A powerful coding agent CLI with HTTP API for development environments. Supports streaming responses following the Vercel AI SDK data stream protocol."
     },
@@ -3468,8 +5079,8 @@ function generateOpenAPISpec() {
 }
 
 // src/cli.ts
-import { writeFileSync, existsSync as existsSync6 } from "fs";
-import { resolve as resolve5 } from "path";
+import { writeFileSync as writeFileSync2, existsSync as existsSync8 } from "fs";
+import { resolve as resolve7, join as join4 } from "path";
 async function apiRequest(baseUrl, path, options = {}) {
   const url = `${baseUrl}${path}`;
   const init = {
@@ -3489,11 +5100,143 @@ async function isServerRunning(baseUrl) {
     return false;
   }
 }
+async function getActiveStream(baseUrl, sessionId) {
+  try {
+    const response = await apiRequest(baseUrl, `/agents/${sessionId}/stream`);
+    if (response.ok) {
+      const data = await response.json();
+      return {
+        hasActiveStream: data.hasActiveStream,
+        streamId: data.stream?.streamId
+      };
+    }
+  } catch {
+  }
+  return { hasActiveStream: false };
+}
+function promptApproval(rl, toolName, input) {
+  return new Promise((resolve8) => {
+    const inputStr = JSON.stringify(input);
+    const truncatedInput = inputStr.length > 100 ? inputStr.slice(0, 100) + "..." : inputStr;
+    console.log(chalk.dim(`    Command: ${truncatedInput}`));
+    rl.question(chalk.yellow(`    Approve? [y/n]: `), (answer) => {
+      const approved = answer.toLowerCase().startsWith("y");
+      resolve8(approved);
+    });
+  });
+}
+async function consumeSSEStream(response, options = {}) {
+  if (!response.body) {
+    throw new Error("No response body");
+  }
+  const reader = response.body.getReader();
+  const decoder = new TextDecoder();
+  let buffer = "";
+  let currentText = "";
+  let currentReasoning = "";
+  let firstResponse = true;
+  let hasError = false;
+  while (true) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    buffer += decoder.decode(value, { stream: true });
+    const lines = buffer.split("\n");
+    buffer = lines.pop() || "";
+    for (const line of lines) {
+      if (line.startsWith("data: ")) {
+        const data = line.slice(6);
+        if (data === "[DONE]") continue;
+        try {
+          const event = JSON.parse(data);
+          if (event.type === "data-stream-id" && event.streamId) {
+            options.onStreamId?.(event.streamId);
+          }
+          if (firstResponse && (event.type === "text-delta" || event.type === "tool-input-available" || event.type === "reasoning-delta")) {
+            process.stdout.write("\r" + " ".repeat(20) + "\r");
+            process.stdout.write(chalk.cyan("\u{1F436}SparkECoder: "));
+            firstResponse = false;
+            options.onFirstResponse?.();
+          }
+          if (event.type === "reasoning-delta" && event.delta) {
+            currentReasoning += event.delta;
+          } else if (event.type === "reasoning-end" && currentReasoning) {
+            console.log(chalk.dim(`
+[Thinking: ${currentReasoning.slice(0, 100)}${currentReasoning.length > 100 ? "..." : ""}]`));
+            currentReasoning = "";
+          }
+          if (event.type === "text-delta" && (event.delta || event.text)) {
+            const text2 = event.delta || event.text || "";
+            process.stdout.write(text2);
+            currentText += text2;
+          }
+          if (event.type === "tool-input-available") {
+            if (currentText) {
+              process.stdout.write("\n");
+              currentText = "";
+            }
+            const inputStr = JSON.stringify(event.input).slice(0, 80);
+            console.log(chalk.yellow(`  \u{1F527} ${event.toolName}`), chalk.dim(inputStr));
+          } else if (event.type === "tool-output-available") {
+            const output = JSON.stringify(event.output);
+            const truncated = output.length > 100 ? output.slice(0, 100) + "..." : output;
+            console.log(chalk.dim(`     \u2192 ${truncated}`));
+          }
+          if (event.type === "data-approval-required") {
+            const approval = event.data;
+            console.log(chalk.yellow(`
+\u26A0\uFE0F  Approval required for: ${approval.toolName}`));
+            if (options.interactive && options.baseUrl && options.sessionId && options.readline) {
+              const approved = await promptApproval(options.readline, approval.toolName, approval.input);
+              const endpoint = approved ? "approve" : "reject";
+              const apiResponse = await apiRequest(options.baseUrl, `/agents/${options.sessionId}/${endpoint}/${approval.toolCallId}`, { method: "POST" });
+              if (apiResponse.ok) {
+                console.log(approved ? chalk.green("    \u2713 Approved") : chalk.red("    \u2717 Rejected"));
+              } else {
+                console.log(chalk.red(`    Failed to ${endpoint}: ${apiResponse.statusText}`));
+              }
+            } else {
+              console.log(chalk.dim(`    (Approve in web UI or use: /approve ${approval.toolCallId})`));
+            }
+          }
+          if (event.type === "finish") {
+          } else if (event.type === "abort") {
+            console.log(chalk.dim("\n[Stream aborted]"));
+          } else if (event.type === "error") {
+            if (firstResponse) {
+              process.stdout.write("\r" + " ".repeat(20) + "\r");
+              firstResponse = false;
+            }
+            hasError = true;
+            console.log(chalk.red(`
+Error: ${event.errorText || "Unknown error"}`));
+          }
+        } catch (parseErr) {
+          console.error(chalk.red(`
+[Parse error] ${parseErr.message}: ${data.slice(0, 100)}`));
+        }
+      }
+    }
+  }
+  if (firstResponse) {
+    process.stdout.write("\r" + " ".repeat(20) + "\r");
+  }
+  if (currentText) {
+    process.stdout.write("\n");
+  } else if (!hasError) {
+    console.log(chalk.dim("(no response)"));
+  }
+}
+var serverStartedByUs = false;
 async function runChat(options) {
+  await ensureDependencies({ quiet: true });
+  loadApiKeysIntoEnv();
   const baseUrl = `http://${options.host}:${options.port}`;
   try {
     const running = await isServerRunning(baseUrl);
-    if (!running) {
+    if (running) {
+      const webUrl = `http://localhost:${options.webPort || "6969"}`;
+      console.log(`\u2714 Web UI: ${chalk.cyan(webUrl)}`);
+    } else {
       if (options.autoStart === false) {
         console.error(chalk.red(`Server not running at ${baseUrl}`));
         console.error(chalk.dim("Start with: sparkecoder server"));
@@ -3505,14 +5248,63 @@ async function runChat(options) {
           port: parseInt(options.port),
           host: options.host,
           configPath: options.config,
-          workingDirectory: options.workingDir
+          workingDirectory: options.workingDir,
+          quiet: true,
+          // Clean chat output
+          webUI: options.web !== false,
+          // Server handles web UI
+          webPort: parseInt(options.webPort || "6969")
         });
-        spinner.succeed(chalk.dim(`Server running at ${baseUrl}`));
+        serverStartedByUs = true;
+        const webUrl = `http://localhost:${options.webPort || "6969"}`;
+        spinner.succeed(`Web UI: ${chalk.cyan(webUrl)}`);
+        const cleanup = () => {
+          if (serverStartedByUs) {
+            stopServer();
+          }
+          process.exit(0);
+        };
+        process.on("SIGINT", cleanup);
+        process.on("SIGTERM", cleanup);
       } catch (err) {
         spinner.fail(chalk.red(`Failed to start server: ${err.message}`));
         process.exit(1);
       }
     }
+    const healthResponse = await fetch(`${baseUrl}/health`);
+    const healthData = await healthResponse.json();
+    if (!healthData.apiKeyConfigured) {
+      console.log(chalk.yellow("\n\u26A0\uFE0F  No AI Gateway API key configured."));
+      console.log(chalk.dim("An API key is required to use SparkECoder.\n"));
+      console.log(chalk.dim("Get your API key from: https://vercel.com/d?to=%2F%5Bteam%5D%2F%7E%2Fai%2Fapi-keys\n"));
+      const keyRl = createInterface({
+        input: process.stdin,
+        output: process.stdout
+      });
+      const apiKey = await new Promise((resolve8) => {
+        keyRl.question(chalk.cyan("Enter your AI Gateway API key: "), (answer) => {
+          resolve8(answer.trim());
+        });
+      });
+      keyRl.close();
+      if (!apiKey) {
+        console.error(chalk.red("\nAPI key is required. Exiting."));
+        process.exit(1);
+      }
+      const saveResponse = await apiRequest(baseUrl, "/health/api-keys", {
+        method: "POST",
+        body: { provider: "ai-gateway", apiKey }
+      });
+      if (!saveResponse.ok) {
+        console.error(chalk.red("\nFailed to save API key. Please try again."));
+        process.exit(1);
+      }
+      console.log(chalk.green("\u2713 API key saved successfully.\n"));
+    }
+    const rl = createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
     let sessionId;
     if (options.session) {
       const response = await apiRequest(baseUrl, `/sessions/${options.session}`);
@@ -3521,8 +5313,25 @@ async function runChat(options) {
         process.exit(1);
       }
       const session = await response.json();
-      sessionId = session.session.id;
-      console.log(chalk.dim(`Resuming session: ${session.session.name || sessionId}`));
+      sessionId = session.id;
+      console.log(chalk.dim(`Resuming session: ${session.name || sessionId}`));
+      const streamInfo = await getActiveStream(baseUrl, sessionId);
+      if (streamInfo.hasActiveStream && streamInfo.streamId) {
+        console.log(chalk.cyan(`
+\u{1F4E1} Active stream detected, connecting...`));
+        console.log(chalk.dim(`   Stream ID: ${streamInfo.streamId}`));
+        console.log(chalk.dim(`   (You're watching a stream from another client)
+`));
+        try {
+          const watchResponse = await fetch(`${baseUrl}/agents/${sessionId}/watch?streamId=${streamInfo.streamId}`);
+          if (watchResponse.ok) {
+            await consumeSSEStream(watchResponse, { interactive: true, baseUrl, sessionId, readline: rl });
+          }
+        } catch (err) {
+          console.log(chalk.dim("Stream ended or connection lost."));
+        }
+        console.log("");
+      }
     } else {
       const config = loadConfig(options.config, options.workingDir);
       const response = await apiRequest(baseUrl, "/sessions", {
@@ -3542,140 +5351,208 @@ async function runChat(options) {
       sessionId = data.id;
     }
     console.log("");
-    console.log(chalk.bold.cyan("\u{1F916} Sparkecoder"));
+    console.log(chalk.bold.cyan("\u{1F436} SparkECoder"));
     console.log(chalk.dim("Commands: /quit, /clear, /session, /tools, /help"));
     console.log("");
-    const rl = createInterface({
-      input: process.stdin,
-      output: process.stdout
-    });
     const prompt = () => {
       rl.question(chalk.green("You: "), async (input) => {
-        const trimmed = input.trim();
-        if (!trimmed) {
-          prompt();
-          return;
-        }
-        if (trimmed.startsWith("/")) {
-          const cmd = trimmed.toLowerCase();
-          if (cmd === "/quit" || cmd === "/exit" || cmd === "/q") {
-            console.log(chalk.dim("Goodbye!"));
-            rl.close();
-            process.exit(0);
-          }
-          if (cmd === "/help" || cmd === "/?") {
-            console.log(chalk.dim("Commands:"));
-            console.log(chalk.dim("  /quit, /exit, /q - Exit chat"));
-            console.log(chalk.dim("  /clear          - Clear conversation"));
-            console.log(chalk.dim("  /session        - Show session info"));
-            console.log(chalk.dim("  /tools          - List available tools"));
-            console.log(chalk.dim("  /help, /?       - Show this help"));
-            prompt();
-            return;
-          }
-          if (cmd === "/clear") {
-            const response = await apiRequest(baseUrl, `/sessions/${sessionId}/clear`, { method: "POST" });
-            if (response.ok) {
-              console.log(chalk.dim("Conversation cleared."));
-            } else {
-              console.log(chalk.red("Failed to clear conversation."));
-            }
+        try {
+          const trimmed = input.trim();
+          if (!trimmed) {
             prompt();
             return;
           }
-          if (cmd === "/session") {
-            const response = await apiRequest(baseUrl, `/sessions/${sessionId}`);
-            if (response.ok) {
-              const data = await response.json();
-              const session = data.session;
-              console.log(chalk.dim(`Session: ${session.id}`));
-              console.log(chalk.dim(`Model: ${session.model}`));
-              console.log(chalk.dim(`Dir: ${session.workingDirectory}`));
+          if (trimmed.startsWith("/")) {
+            const cmd = trimmed.toLowerCase();
+            if (cmd === "/quit" || cmd === "/exit" || cmd === "/q") {
+              console.log(chalk.dim("Goodbye!"));
+              rl.close();
+              process.exit(0);
             }
-            prompt();
-            return;
-          }
-          if (cmd === "/tools") {
-            const response = await apiRequest(baseUrl, `/sessions/${sessionId}/tools`);
-            if (response.ok) {
-              const data = await response.json();
-              console.log(chalk.dim(`Tools: ${data.tools.map((t) => t.name).join(", ")}`));
-            } else {
-              console.log(chalk.dim("Tools: bash, read_file, write_file, todo, load_skill, terminal"));
+            if (cmd === "/help" || cmd === "/?") {
+              console.log(chalk.dim("Commands:"));
+              console.log(chalk.dim("  /quit, /exit, /q   - Exit chat"));
+              console.log(chalk.dim("  /clear             - Clear conversation"));
+              console.log(chalk.dim("  /session           - Show session info"));
+              console.log(chalk.dim("  /stream            - Check for active stream"));
+              console.log(chalk.dim("  /watch             - Watch active stream (if any)"));
+              console.log(chalk.dim("  /tools             - List available tools"));
+              console.log(chalk.dim("  /approve <id>      - Approve pending tool call"));
+              console.log(chalk.dim("  /reject <id>       - Reject pending tool call"));
+              console.log(chalk.dim("  /approvals         - List pending approvals"));
+              console.log(chalk.dim("  /help, /?          - Show this help"));
+              prompt();
+              return;
             }
-            prompt();
-            return;
-          }
-          console.log(chalk.yellow(`Unknown command. Type /help for commands.`));
-          prompt();
-          return;
-        }
-        process.stdout.write(chalk.cyan("Agent: "));
-        let currentText = "";
-        let hasError = false;
-        try {
-          const response = await fetch(`${baseUrl}/agents/${sessionId}/run`, {
-            method: "POST",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({ prompt: trimmed })
-          });
-          if (!response.ok) {
-            const error = await response.json();
-            throw new Error(error.error || `HTTP ${response.status}`);
-          }
-          if (!response.body) {
-            throw new Error("No response body");
-          }
-          const reader = response.body.getReader();
-          const decoder = new TextDecoder();
-          let buffer = "";
-          while (true) {
-            const { done, value } = await reader.read();
-            if (done) break;
-            buffer += decoder.decode(value, { stream: true });
-            const lines = buffer.split("\n");
-            buffer = lines.pop() || "";
-            for (const line of lines) {
-              if (line.startsWith("data: ")) {
-                const data = line.slice(6);
-                if (data === "[DONE]") continue;
+            if (cmd === "/watch") {
+              const streamInfo = await getActiveStream(baseUrl, sessionId);
+              if (streamInfo.hasActiveStream && streamInfo.streamId) {
+                console.log(chalk.cyan(`\u{1F4E1} Connecting to active stream...`));
                 try {
-                  const event = JSON.parse(data);
-                  if (event.type === "text-delta" && event.text) {
-                    process.stdout.write(event.text);
-                    currentText += event.text;
-                  } else if (event.type === "tool-call") {
-                    if (currentText) {
-                      process.stdout.write("\n");
-                      currentText = "";
-                    }
-                    const inputStr = JSON.stringify(event.input).slice(0, 80);
-                    console.log(chalk.yellow(`  \u{1F527} ${event.toolName}`), chalk.dim(inputStr));
-                  } else if (event.type === "tool-result") {
-                    const output = JSON.stringify(event.output);
-                    const truncated = output.length > 100 ? output.slice(0, 100) + "..." : output;
-                    console.log(chalk.dim(`     \u2192 ${truncated}`));
-                  } else if (event.type === "error") {
-                    hasError = true;
-                    console.log(chalk.red(`
-Error: ${event.error}`));
+                  const watchResponse = await fetch(`${baseUrl}/agents/${sessionId}/watch?streamId=${streamInfo.streamId}`);
+                  if (watchResponse.ok) {
+                    await consumeSSEStream(watchResponse, { interactive: true, baseUrl, sessionId, readline: rl });
+                  } else {
+                    console.log(chalk.dim("Failed to connect to stream."));
                   }
-                } catch {
+                } catch (err) {
+                  console.log(chalk.dim("Stream ended or connection lost."));
                 }
+              } else {
+                console.log(chalk.dim("No active stream to watch."));
               }
+              prompt();
+              return;
             }
+            if (cmd.startsWith("/approve ")) {
+              const toolCallId = trimmed.slice(9).trim();
+              if (!toolCallId) {
+                console.log(chalk.yellow("Usage: /approve <toolCallId>"));
+                prompt();
+                return;
+              }
+              const response = await apiRequest(baseUrl, `/agents/${sessionId}/approve/${toolCallId}`, { method: "POST" });
+              if (response.ok) {
+                console.log(chalk.green("\u2713 Tool approved"));
+              } else {
+                const error = await response.json();
+                console.log(chalk.red(`Failed: ${error.error || "Unknown error"}`));
+              }
+              prompt();
+              return;
+            }
+            if (cmd.startsWith("/reject ")) {
+              const toolCallId = trimmed.slice(8).trim();
+              if (!toolCallId) {
+                console.log(chalk.yellow("Usage: /reject <toolCallId>"));
+                prompt();
+                return;
+              }
+              const response = await apiRequest(baseUrl, `/agents/${sessionId}/reject/${toolCallId}`, {
+                method: "POST",
+                body: { reason: "Rejected via CLI" }
+              });
+              if (response.ok) {
+                console.log(chalk.green("\u2713 Tool rejected"));
+              } else {
+                const error = await response.json();
+                console.log(chalk.red(`Failed: ${error.error || "Unknown error"}`));
+              }
+              prompt();
+              return;
+            }
+            if (cmd === "/approvals") {
+              const response = await apiRequest(baseUrl, `/agents/${sessionId}/approvals`);
+              if (response.ok) {
+                const data = await response.json();
+                if (data.pendingApprovals.length === 0) {
+                  console.log(chalk.dim("No pending approvals."));
+                } else {
+                  console.log(chalk.bold("Pending approvals:"));
+                  for (const approval of data.pendingApprovals) {
+                    console.log(chalk.yellow(`  ${approval.toolName}`), chalk.dim(`(${approval.toolCallId})`));
+                  }
+                }
+              }
+              prompt();
+              return;
+            }
+            if (cmd === "/clear") {
+              const response = await apiRequest(baseUrl, `/sessions/${sessionId}/clear`, { method: "POST" });
+              if (response.ok) {
+                console.log(chalk.dim("Conversation cleared."));
+              } else {
+                console.log(chalk.red("Failed to clear conversation."));
+              }
+              prompt();
+              return;
+            }
+            if (cmd === "/session" || cmd.startsWith("/session ")) {
+              if (cmd.startsWith("/session ")) {
+                const arg = trimmed.slice(9).trim();
+                console.log(chalk.yellow(`To switch to session "${arg}", restart with: sparkecoder -s ${arg}`));
+                console.log(chalk.dim("Showing current session info:"));
+              }
+              const response = await apiRequest(baseUrl, `/sessions/${sessionId}`);
+              if (response.ok) {
+                const session = await response.json();
+                console.log(chalk.dim(`Session: ${session.id}`));
+                console.log(chalk.dim(`Name: ${session.name || "(unnamed)"}`));
+                console.log(chalk.dim(`Model: ${session.model}`));
+                console.log(chalk.dim(`Dir: ${session.workingDirectory}`));
+                console.log(chalk.dim(`Status: ${session.status}`));
+                const streamInfo = await getActiveStream(baseUrl, sessionId);
+                if (streamInfo.hasActiveStream) {
+                  console.log(chalk.cyan(`Stream: Active (${streamInfo.streamId})`));
+                }
+              } else {
+                console.log(chalk.red("Failed to get session info."));
+              }
+              prompt();
+              return;
+            }
+            if (cmd === "/stream") {
+              const streamInfo = await getActiveStream(baseUrl, sessionId);
+              if (streamInfo.hasActiveStream && streamInfo.streamId) {
+                console.log(chalk.cyan(`\u{1F4E1} Active stream: ${streamInfo.streamId}`));
+                console.log(chalk.dim("Use /watch to connect to this stream"));
+              } else {
+                console.log(chalk.dim("No active stream."));
+              }
+              prompt();
+              return;
+            }
+            if (cmd === "/tools") {
+              const response = await apiRequest(baseUrl, `/sessions/${sessionId}/tools`);
+              if (response.ok) {
+                const data = await response.json();
+                if (data.tools && Array.isArray(data.tools)) {
+                  console.log(chalk.dim(`Tools: ${data.tools.map((t) => t.name).join(", ")}`));
+                } else {
+                  console.log(chalk.dim("Tools: bash, read_file, write_file, todo, load_skill"));
+                }
+              } else {
+                console.log(chalk.dim("Tools: bash, read_file, write_file, todo, load_skill"));
+              }
+              prompt();
+              return;
+            }
+            console.log(chalk.yellow(`Unknown command. Type /help for commands.`));
+            prompt();
+            return;
           }
-          if (currentText) {
-            process.stdout.write("\n");
-          } else if (!hasError) {
-            console.log(chalk.dim("(no response)"));
-          }
-        } catch (error) {
-          console.log(chalk.red(`
+          process.stdout.write(chalk.dim("Thinking..."));
+          try {
+            const response = await fetch(`${baseUrl}/agents/${sessionId}/run`, {
+              method: "POST",
+              headers: { "Content-Type": "application/json" },
+              body: JSON.stringify({ prompt: trimmed })
+            });
+            if (!response.ok) {
+              process.stdout.write("\r" + " ".repeat(20) + "\r");
+              const error = await response.json();
+              throw new Error(error.error || `HTTP ${response.status}`);
+            }
+            await consumeSSEStream(response, { interactive: true, baseUrl, sessionId, readline: rl });
+          } catch (error) {
+            process.stdout.write("\r" + " ".repeat(20) + "\r");
+            console.log(chalk.red(`
 Error: ${error.message}`));
+            if (error.stack) {
+              console.log(chalk.dim(error.stack));
+            }
+          }
+          console.log("");
+          prompt();
+        } catch (outerError) {
+          console.error(chalk.red(`
+Unexpected error: ${outerError.message}`));
+          if (outerError.stack) {
+            console.log(chalk.dim(outerError.stack));
+          }
+          console.log("");
+          prompt();
         }
-        console.log("");
-        prompt();
       });
     };
     prompt();
@@ -3685,44 +5562,66 @@ Error: ${error.message}`));
   }
 }
 var program = new Command();
-program.name("sparkecoder").description("AI coding agent - just type sparkecoder to start chatting").version("0.1.0").option("-s, --session <id>", "Resume an existing session").option("-n, --name <name>", "Name for the new session").option("-m, --model <model>", "Model to use").option("-w, --working-dir <path>", "Working directory").option("-c, --config <path>", "Path to config file").option("-p, --port <port>", "Server port", "3141").option("-H, --host <host>", "Server host", "127.0.0.1").option("--no-auto-start", "Do not auto-start server if not running").action(async (options) => {
+program.name("sparkecoder").description("AI coding agent - just type sparkecoder to start chatting").version("0.1.0").option("-s, --session <id>", "Resume an existing session").option("-n, --name <name>", "Name for the new session").option("-m, --model <model>", "Model to use").option("-w, --working-dir <path>", "Working directory").option("-c, --config <path>", "Path to config file").option("-p, --port <port>", "Server port", "3141").option("-H, --host <host>", "Server host", "127.0.0.1").option("--no-auto-start", "Do not auto-start server if not running").option("--web-port <port>", "Web UI port", "6969").option("--no-web", "Do not start web UI when auto-starting server").action(async (options) => {
   await runChat(options);
 });
-program.command("server").description("Start the HTTP server (foreground mode)").option("-p, --port <port>", "Server port", "3141").option("-h, --host <host>", "Server host", "127.0.0.1").option("-c, --config <path>", "Path to config file").option("-w, --working-dir <path>", "Working directory").action(async (options) => {
-  const spinner = ora("Starting Sparkecoder server...").start();
+program.command("server").description("Start the SparkECoder server (API + Web UI)").option("-p, --port <port>", "API server port", "3141").option("-h, --host <host>", "Server host", "127.0.0.1").option("-c, --config <path>", "Path to config file").option("-w, --working-dir <path>", "Working directory").option("--web-port <port>", "Web UI port", "6969").option("--no-web", "Do not start web UI").action(async (options) => {
+  await ensureDependencies({ quiet: false });
+  const spinner = ora("Starting SparkECoder server...").start();
   try {
-    const { port, host } = await startServer({
+    const { port, host, webPort } = await startServer({
       port: parseInt(options.port),
       host: options.host,
       configPath: options.config,
-      workingDirectory: options.workingDir
+      workingDirectory: options.workingDir,
+      webUI: options.web !== false,
+      webPort: parseInt(options.webPort) || 6969
     });
-    spinner.succeed(chalk.green(`Sparkecoder server running at http://${host}:${port}`));
+    if (webPort) {
+      spinner.succeed(chalk.green(`SparkECoder running at http://localhost:${webPort}`));
+    } else {
+      spinner.succeed(chalk.green(`SparkECoder server running`));
+    }
     console.log("");
-    console.log(chalk.dim("Endpoints:"));
-    console.log(chalk.dim(`  Health:   http://${host}:${port}/health`));
-    console.log(chalk.dim(`  OpenAPI:  http://${host}:${port}/openapi.json`));
-    console.log(chalk.dim(`  Swagger:  http://${host}:${port}/swagger`));
-    console.log(chalk.dim(`  Sessions: http://${host}:${port}/sessions`));
+    console.log(chalk.dim(`  API: http://${host}:${port}`));
+    console.log(chalk.dim(`  Swagger: http://${host}:${port}/swagger`));
     console.log("");
     console.log(chalk.dim("Press Ctrl+C to stop"));
+    const cleanup = () => {
+      console.log(chalk.dim("\nShutting down..."));
+      stopServer();
+      process.exit(0);
+    };
+    process.on("SIGINT", cleanup);
+    process.on("SIGTERM", cleanup);
   } catch (error) {
     spinner.fail(chalk.red(`Failed to start server: ${error.message}`));
     process.exit(1);
   }
 });
-program.command("chat").description("Start an interactive chat session").option("-s, --session <id>", "Resume an existing session").option("-n, --name <name>", "Name for the new session").option("-m, --model <model>", "Model to use").option("-w, --working-dir <path>", "Working directory").option("-c, --config <path>", "Path to config file").option("-p, --port <port>", "Server port", "3141").option("-H, --host <host>", "Server host", "127.0.0.1").option("--no-auto-start", "Do not auto-start server if not running").action(async (options) => {
+program.command("chat").description("Start an interactive chat session").option("-s, --session <id>", "Resume an existing session").option("-n, --name <name>", "Name for the new session").option("-m, --model <model>", "Model to use").option("-w, --working-dir <path>", "Working directory").option("-c, --config <path>", "Path to config file").option("-p, --port <port>", "Server port", "3141").option("-H, --host <host>", "Server host", "127.0.0.1").option("--no-auto-start", "Do not auto-start server if not running").option("--web-port <port>", "Web UI port", "6969").option("--no-web", "Do not start web UI when auto-starting server").action(async (options) => {
   await runChat(options);
 });
-program.command("init").description("Create a sparkecoder.config.json file").option("-f, --force", "Overwrite existing config").action((options) => {
-  const configPath = resolve5(process.cwd(), "sparkecoder.config.json");
-  if (existsSync6(configPath) && !options.force) {
+program.command("init").description("Create a sparkecoder.config.json file").option("-f, --force", "Overwrite existing config").option("-g, --global", "Create global config in app data directory").action((options) => {
+  let configPath;
+  let configLocation;
+  if (options.global) {
+    const appDataDir = ensureAppDataDirectory();
+    configPath = join4(appDataDir, "sparkecoder.config.json");
+    configLocation = "global";
+  } else {
+    configPath = resolve7(process.cwd(), "sparkecoder.config.json");
+    configLocation = "local";
+  }
+  if (existsSync8(configPath) && !options.force) {
     console.log(chalk.yellow("Config file already exists. Use --force to overwrite."));
+    console.log(chalk.dim(`  ${configPath}`));
     return;
   }
   const config = createDefaultConfig();
-  writeFileSync(configPath, JSON.stringify(config, null, 2));
-  console.log(chalk.green("\u2713 Created sparkecoder.config.json"));
+  writeFileSync2(configPath, JSON.stringify(config, null, 2));
+  console.log(chalk.green(`\u2713 Created ${configLocation} config`));
+  console.log(chalk.dim(`  ${configPath}`));
   console.log(chalk.dim("Set AI_GATEWAY_API_KEY and run sparkecoder to start"));
 });
 program.command("sessions").description("List all sessions").option("-l, --limit <limit>", "Number of sessions to show", "20").option("-p, --port <port>", "Server port", "3141").option("-H, --host <host>", "Server host", "127.0.0.1").action(async (options) => {
@@ -3775,5 +5674,69 @@ program.command("config").description("Show current configuration").option("-c,
     process.exit(1);
   }
 });
+program.command("api-key").description("Manage API keys for AI providers").argument("[provider]", "Provider name (anthropic, openai, google, xai, ai-gateway)").argument("[key]", "API key to set (if not provided, shows status)").option("-l, --list", "List all API key statuses").action((provider, key, options) => {
+  try {
+    ensureAppDataDirectory();
+    if (options.list || !provider && !key) {
+      console.log(chalk.bold("\nAPI Key Status:\n"));
+      const status = getApiKeyStatus();
+      for (const s of status) {
+        const providerName = s.provider.charAt(0).toUpperCase() + s.provider.slice(1);
+        if (s.configured) {
+          const sourceLabel = s.source === "env" ? chalk.blue("(from env)") : chalk.green("(saved)");
+          console.log(`  ${chalk.green("\u2713")} ${chalk.bold(providerName)} ${sourceLabel}`);
+          console.log(`    ${chalk.dim(s.maskedKey)}`);
+          console.log(`    ${chalk.dim(`env: ${s.envVar}`)}`);
+        } else {
+          console.log(`  ${chalk.dim("\u25CB")} ${chalk.dim(providerName)} ${chalk.dim("(not configured)")}`);
+          console.log(`    ${chalk.dim(`env: ${s.envVar}`)}`);
+        }
+        console.log();
+      }
+      console.log(chalk.dim(`Supported providers: ${SUPPORTED_PROVIDERS.join(", ")}`));
+      console.log(chalk.dim(`Usage: sparkecoder api-key <provider> <key>`));
+      return;
+    }
+    if (provider && key) {
+      setApiKey(provider, key);
+      const status = getApiKeyStatus();
+      const providerStatus = status.find((s) => s.provider === provider.toLowerCase());
+      console.log(chalk.green(`
+\u2713 API key for ${provider} saved successfully`));
+      if (providerStatus?.maskedKey) {
+        console.log(`  Key: ${chalk.dim(providerStatus.maskedKey)}`);
+      }
+      console.log(chalk.dim(`
+The key is stored securely and will be loaded automatically on startup.`));
+      return;
+    }
+    if (provider && !key) {
+      const status = getApiKeyStatus();
+      const providerStatus = status.find((s) => s.provider === provider.toLowerCase());
+      if (!providerStatus) {
+        console.error(chalk.red(`Unknown provider: ${provider}`));
+        console.log(chalk.dim(`Supported providers: ${SUPPORTED_PROVIDERS.join(", ")}`));
+        process.exit(1);
+      }
+      const providerName = providerStatus.provider.charAt(0).toUpperCase() + providerStatus.provider.slice(1);
+      console.log(chalk.bold(`
+${providerName} API Key:
+`));
+      if (providerStatus.configured) {
+        const sourceLabel = providerStatus.source === "env" ? chalk.blue("(from env)") : chalk.green("(saved)");
+        console.log(`  Status: ${chalk.green("Configured")} ${sourceLabel}`);
+        console.log(`  Key: ${chalk.dim(providerStatus.maskedKey)}`);
+      } else {
+        console.log(`  Status: ${chalk.yellow("Not configured")}`);
+      }
+      console.log(`  Environment variable: ${chalk.dim(providerStatus.envVar)}`);
+      console.log();
+      console.log(chalk.dim(`To set: sparkecoder api-key ${provider} <your-api-key>`));
+    }
+  } catch (error) {
+    console.error(chalk.red(`Error: ${error.message}`));
+    process.exit(1);
+  }
+});
 program.parse();
 //# sourceMappingURL=cli.js.map