@hasna/todos 0.11.29 → 0.11.31

package/dist/index.js

@@ -1,419 +1,46 @@
 // @bun
 var __defProp = Object.defineProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toCommonJS = (from) => {
+  var entry = (__moduleCache ??= new WeakMap).get(from), desc;
+  if (entry)
+    return entry;
+  entry = __defProp({}, "__esModule", { value: true });
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (var key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(entry, key))
+        __defProp(entry, key, {
+          get: __accessProp.bind(from, key),
+          enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+        });
+  }
+  __moduleCache.set(from, entry);
+  return entry;
+};
+var __moduleCache;
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 
-// src/db/schema.ts
-function runMigrations(db) {
-  try {
-    const result = db.query("SELECT MAX(id) as max_id FROM _migrations").get();
-    const currentLevel = result?.max_id ?? 0;
-    for (let i = currentLevel;i < MIGRATIONS.length; i++) {
-      try {
-        db.exec(MIGRATIONS[i]);
-      } catch {}
-    }
-  } catch {
-    for (const migration of MIGRATIONS) {
-      try {
-        db.exec(migration);
-      } catch {}
-    }
-  }
-  ensureSchema(db);
-}
-function ensureSchema(db) {
-  const ensureColumn = (table, column, type) => {
-    try {
-      db.query(`SELECT ${column} FROM ${table} LIMIT 0`).get();
-    } catch {
-      try {
-        db.exec(`ALTER TABLE ${table} ADD COLUMN ${column} ${type}`);
-      } catch {}
-    }
-  };
-  const ensureTable = (name, sql) => {
-    try {
-      const exists = db.query("SELECT name FROM sqlite_master WHERE type='table' AND name=?").get(name);
-      if (!exists)
-        db.exec(sql);
-    } catch {}
-  };
-  const ensureIndex = (sql) => {
-    try {
-      db.exec(sql);
-    } catch {}
-  };
-  ensureTable("orgs", `
-    CREATE TABLE orgs (
-      id TEXT PRIMARY KEY, name TEXT NOT NULL UNIQUE, description TEXT,
-      metadata TEXT DEFAULT '{}',
-      created_at TEXT NOT NULL DEFAULT (datetime('now')),
-      updated_at TEXT NOT NULL DEFAULT (datetime('now'))
-    )`);
-  ensureTable("agents", `
-    CREATE TABLE agents (
-      id TEXT PRIMARY KEY, name TEXT NOT NULL UNIQUE, description TEXT,
-      role TEXT DEFAULT 'agent', permissions TEXT DEFAULT '["*"]',
-      status TEXT NOT NULL DEFAULT 'active' CHECK(status IN ('active', 'archived')),
-      metadata TEXT DEFAULT '{}',
-      created_at TEXT NOT NULL DEFAULT (datetime('now')),
-      last_seen_at TEXT NOT NULL DEFAULT (datetime('now'))
-    )`);
-  ensureTable("task_lists", `
-    CREATE TABLE task_lists (
-      id TEXT PRIMARY KEY, project_id TEXT REFERENCES projects(id) ON DELETE SET NULL,
-      slug TEXT NOT NULL, name TEXT NOT NULL, description TEXT,
-      metadata TEXT DEFAULT '{}',
-      created_at TEXT NOT NULL DEFAULT (datetime('now')),
-      updated_at TEXT NOT NULL DEFAULT (datetime('now')),
-      UNIQUE(project_id, slug)
-    )`);
-  ensureTable("plans", `
-    CREATE TABLE plans (
-      id TEXT PRIMARY KEY, project_id TEXT REFERENCES projects(id) ON DELETE CASCADE,
-      task_list_id TEXT, agent_id TEXT,
-      name TEXT NOT NULL, description TEXT,
-      status TEXT NOT NULL DEFAULT 'active' CHECK(status IN ('active', 'completed', 'archived')),
-      created_at TEXT NOT NULL DEFAULT (datetime('now')),
-      updated_at TEXT NOT NULL DEFAULT (datetime('now'))
-    )`);
-  ensureTable("task_tags", `
-    CREATE TABLE task_tags (
-      task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
-      tag TEXT NOT NULL, PRIMARY KEY (task_id, tag)
-    )`);
-  ensureTable("task_history", `
-    CREATE TABLE task_history (
-      id TEXT PRIMARY KEY, task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
-      action TEXT NOT NULL, field TEXT, old_value TEXT, new_value TEXT, agent_id TEXT,
-      created_at TEXT NOT NULL DEFAULT (datetime('now'))
-    )`);
-  ensureTable("webhooks", `
-    CREATE TABLE webhooks (
-      id TEXT PRIMARY KEY, url TEXT NOT NULL, events TEXT NOT NULL DEFAULT '[]',
-      secret TEXT, active INTEGER NOT NULL DEFAULT 1,
-      created_at TEXT NOT NULL DEFAULT (datetime('now'))
-    )`);
-  ensureTable("task_templates", `
-    CREATE TABLE task_templates (
-      id TEXT PRIMARY KEY, name TEXT NOT NULL, title_pattern TEXT NOT NULL,
-      description TEXT, priority TEXT DEFAULT 'medium', tags TEXT DEFAULT '[]',
-      project_id TEXT REFERENCES projects(id) ON DELETE SET NULL,
-      plan_id TEXT REFERENCES plans(id) ON DELETE SET NULL,
-      metadata TEXT DEFAULT '{}',
-      created_at TEXT NOT NULL DEFAULT (datetime('now'))
-    )`);
-  ensureTable("template_tasks", `
-    CREATE TABLE template_tasks (
-      id TEXT PRIMARY KEY DEFAULT (lower(hex(randomblob(16)))),
-      template_id TEXT NOT NULL REFERENCES task_templates(id) ON DELETE CASCADE,
-      position INTEGER NOT NULL,
-      title_pattern TEXT NOT NULL,
-      description TEXT,
-      priority TEXT DEFAULT 'medium',
-      tags TEXT DEFAULT '[]',
-      task_type TEXT,
-      depends_on_positions TEXT DEFAULT '[]',
-      metadata TEXT DEFAULT '{}',
-      created_at TEXT NOT NULL DEFAULT (datetime('now'))
-    )`);
-  ensureTable("task_checklists", `
-    CREATE TABLE task_checklists (
-      id TEXT PRIMARY KEY,
-      task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
-      position INTEGER NOT NULL DEFAULT 0,
-      text TEXT NOT NULL,
-      checked INTEGER NOT NULL DEFAULT 0,
-      created_at TEXT NOT NULL DEFAULT (datetime('now')),
-      updated_at TEXT NOT NULL DEFAULT (datetime('now'))
-    )`);
-  ensureTable("project_sources", `
-    CREATE TABLE project_sources (
-      id TEXT PRIMARY KEY,
-      project_id TEXT NOT NULL REFERENCES projects(id) ON DELETE CASCADE,
-      type TEXT NOT NULL,
-      name TEXT NOT NULL,
-      uri TEXT NOT NULL,
-      description TEXT,
-      metadata TEXT DEFAULT '{}',
-      created_at TEXT NOT NULL DEFAULT (datetime('now')),
-      updated_at TEXT NOT NULL DEFAULT (datetime('now'))
-    )`);
-  ensureTable("task_relationships", `
-    CREATE TABLE task_relationships (
-      id TEXT PRIMARY KEY,
-      source_task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
-      target_task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
-      relationship_type TEXT NOT NULL,
-      metadata TEXT DEFAULT '{}',
-      created_by TEXT,
-      created_at TEXT NOT NULL DEFAULT (datetime('now')),
-      CHECK (source_task_id != target_task_id)
-    )`);
-  ensureTable("kg_edges", `
-    CREATE TABLE kg_edges (
-      id TEXT PRIMARY KEY,
-      source_id TEXT NOT NULL,
-      source_type TEXT NOT NULL,
-      target_id TEXT NOT NULL,
-      target_type TEXT NOT NULL,
-      relation_type TEXT NOT NULL,
-      weight REAL NOT NULL DEFAULT 1.0,
-      metadata TEXT DEFAULT '{}',
-      created_at TEXT NOT NULL DEFAULT (datetime('now')),
-      UNIQUE(source_id, source_type, target_id, target_type, relation_type)
-    )`);
-  ensureTable("project_machine_paths", `
-    CREATE TABLE project_machine_paths (
-      id TEXT PRIMARY KEY,
-      project_id TEXT NOT NULL REFERENCES projects(id) ON DELETE CASCADE,
-      machine_id TEXT NOT NULL,
-      path TEXT NOT NULL,
-      created_at TEXT NOT NULL DEFAULT (datetime('now')),
-      updated_at TEXT NOT NULL DEFAULT (datetime('now')),
-      UNIQUE(project_id, machine_id)
-    )`);
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_project_machine_paths_project ON project_machine_paths(project_id)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_project_machine_paths_machine ON project_machine_paths(machine_id)");
-  ensureTable("machines", `
-    CREATE TABLE machines (
-      id TEXT PRIMARY KEY, name TEXT NOT NULL UNIQUE, hostname TEXT, platform TEXT,
-      last_seen_at TEXT NOT NULL DEFAULT (datetime('now')),
-      metadata TEXT DEFAULT '{}',
-      created_at TEXT NOT NULL DEFAULT (datetime('now'))
-    )`);
-  ensureColumn("projects", "task_list_id", "TEXT");
-  ensureColumn("projects", "task_prefix", "TEXT");
-  ensureColumn("projects", "task_counter", "INTEGER NOT NULL DEFAULT 0");
-  ensureColumn("tasks", "plan_id", "TEXT REFERENCES plans(id) ON DELETE SET NULL");
-  ensureColumn("tasks", "task_list_id", "TEXT REFERENCES task_lists(id) ON DELETE SET NULL");
-  ensureColumn("tasks", "short_id", "TEXT");
-  ensureColumn("tasks", "due_at", "TEXT");
-  ensureColumn("tasks", "estimated_minutes", "INTEGER");
-  ensureColumn("tasks", "requires_approval", "INTEGER NOT NULL DEFAULT 0");
-  ensureColumn("tasks", "approved_by", "TEXT");
-  ensureColumn("tasks", "approved_at", "TEXT");
-  ensureColumn("tasks", "recurrence_rule", "TEXT");
-  ensureColumn("tasks", "recurrence_parent_id", "TEXT REFERENCES tasks(id) ON DELETE SET NULL");
-  ensureColumn("tasks", "confidence", "REAL");
-  ensureColumn("tasks", "reason", "TEXT");
-  ensureColumn("tasks", "spawned_from_session", "TEXT");
-  ensureColumn("tasks", "assigned_by", "TEXT");
-  ensureColumn("tasks", "assigned_from_project", "TEXT");
-  ensureColumn("tasks", "started_at", "TEXT");
-  ensureColumn("tasks", "task_type", "TEXT");
-  ensureColumn("tasks", "cost_tokens", "INTEGER DEFAULT 0");
-  ensureColumn("tasks", "cost_usd", "REAL DEFAULT 0");
-  ensureColumn("tasks", "delegated_from", "TEXT");
-  ensureColumn("tasks", "delegation_depth", "INTEGER DEFAULT 0");
-  ensureColumn("tasks", "retry_count", "INTEGER DEFAULT 0");
-  ensureColumn("tasks", "max_retries", "INTEGER DEFAULT 3");
-  ensureColumn("tasks", "retry_after", "TEXT");
-  ensureColumn("tasks", "sla_minutes", "INTEGER");
-  ensureColumn("tasks", "archived_at", "TEXT");
-  ensureColumn("agents", "role", "TEXT DEFAULT 'agent'");
-  ensureColumn("agents", "permissions", `TEXT DEFAULT '["*"]'`);
-  ensureColumn("agents", "reports_to", "TEXT");
-  ensureColumn("agents", "title", "TEXT");
-  ensureColumn("agents", "level", "TEXT");
-  ensureColumn("agents", "org_id", "TEXT");
-  ensureColumn("agents", "capabilities", "TEXT DEFAULT '[]'");
-  ensureColumn("projects", "org_id", "TEXT");
-  ensureColumn("plans", "task_list_id", "TEXT");
-  ensureColumn("plans", "agent_id", "TEXT");
-  ensureColumn("task_templates", "variables", "TEXT DEFAULT '[]'");
-  ensureColumn("task_templates", "version", "INTEGER NOT NULL DEFAULT 1");
-  ensureColumn("template_tasks", "condition", "TEXT");
-  ensureColumn("template_tasks", "include_template_id", "TEXT");
-  ensureTable("template_versions", `
-    CREATE TABLE template_versions (
-      id TEXT PRIMARY KEY DEFAULT (lower(hex(randomblob(16)))),
-      template_id TEXT NOT NULL REFERENCES task_templates(id) ON DELETE CASCADE,
-      version INTEGER NOT NULL,
-      snapshot TEXT NOT NULL,
-      created_at TEXT NOT NULL DEFAULT (datetime('now'))
-    )`);
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_template_versions_template ON template_versions(template_id)");
-  ensureTable("dispatches", `
-    CREATE TABLE dispatches (
-      id TEXT PRIMARY KEY,
-      title TEXT,
-      target_window TEXT NOT NULL,
-      task_ids TEXT NOT NULL DEFAULT '[]',
-      task_list_id TEXT REFERENCES task_lists(id) ON DELETE SET NULL,
-      message TEXT,
-      delay_ms INTEGER,
-      scheduled_at TEXT,
-      status TEXT NOT NULL DEFAULT 'pending' CHECK(status IN ('pending', 'sent', 'failed', 'cancelled')),
-      error TEXT,
-      created_at TEXT NOT NULL DEFAULT (datetime('now')),
-      sent_at TEXT
-    )`);
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_dispatches_status ON dispatches(status)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_dispatches_scheduled ON dispatches(scheduled_at)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_dispatches_task_list ON dispatches(task_list_id)");
-  ensureTable("dispatch_logs", `
-    CREATE TABLE dispatch_logs (
-      id TEXT PRIMARY KEY,
-      dispatch_id TEXT NOT NULL REFERENCES dispatches(id) ON DELETE CASCADE,
-      target_window TEXT NOT NULL,
-      message TEXT NOT NULL,
-      delay_ms INTEGER NOT NULL,
-      status TEXT NOT NULL CHECK(status IN ('sent', 'failed')),
-      error TEXT,
-      created_at TEXT NOT NULL DEFAULT (datetime('now'))
-    )`);
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_dispatch_logs_dispatch ON dispatch_logs(dispatch_id)");
-  ensureColumn("webhooks", "project_id", "TEXT");
-  ensureColumn("webhooks", "task_list_id", "TEXT");
-  ensureColumn("webhooks", "agent_id", "TEXT");
-  ensureColumn("webhooks", "task_id", "TEXT");
-  ensureTable("webhook_deliveries", `
-    CREATE TABLE webhook_deliveries (
-      id TEXT PRIMARY KEY,
-      webhook_id TEXT NOT NULL REFERENCES webhooks(id) ON DELETE CASCADE,
-      event TEXT NOT NULL,
-      payload TEXT NOT NULL,
-      status_code INTEGER,
-      response TEXT,
-      attempt INTEGER NOT NULL DEFAULT 1,
-      created_at TEXT NOT NULL DEFAULT (datetime('now'))
-    )`);
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_webhook_deliveries_webhook ON webhook_deliveries(webhook_id)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_webhook_deliveries_event ON webhook_deliveries(event)");
-  ensureColumn("task_comments", "type", "TEXT DEFAULT 'comment'");
-  ensureColumn("task_comments", "progress_pct", "INTEGER");
-  ensureColumn("projects", "machine_id", "TEXT");
-  ensureColumn("projects", "synced_at", "TEXT");
-  ensureColumn("tasks", "machine_id", "TEXT");
-  ensureColumn("tasks", "synced_at", "TEXT");
-  ensureColumn("agents", "machine_id", "TEXT");
-  ensureColumn("agents", "synced_at", "TEXT");
-  ensureColumn("task_lists", "machine_id", "TEXT");
-  ensureColumn("task_lists", "synced_at", "TEXT");
-  ensureColumn("plans", "machine_id", "TEXT");
-  ensureColumn("plans", "synced_at", "TEXT");
-  ensureColumn("task_comments", "machine_id", "TEXT");
-  ensureColumn("task_comments", "synced_at", "TEXT");
-  ensureColumn("sessions", "machine_id", "TEXT");
-  ensureColumn("sessions", "synced_at", "TEXT");
-  ensureColumn("task_history", "machine_id", "TEXT");
-  ensureColumn("webhooks", "machine_id", "TEXT");
-  ensureColumn("webhooks", "synced_at", "TEXT");
-  ensureColumn("task_templates", "machine_id", "TEXT");
-  ensureColumn("task_templates", "synced_at", "TEXT");
-  ensureColumn("orgs", "machine_id", "TEXT");
-  ensureColumn("orgs", "synced_at", "TEXT");
-  ensureColumn("handoffs", "machine_id", "TEXT");
-  ensureColumn("handoffs", "synced_at", "TEXT");
-  ensureColumn("task_checklists", "machine_id", "TEXT");
-  ensureColumn("project_sources", "machine_id", "TEXT");
-  ensureColumn("project_sources", "synced_at", "TEXT");
-  ensureColumn("task_files", "machine_id", "TEXT");
-  ensureColumn("task_relationships", "machine_id", "TEXT");
-  ensureColumn("kg_edges", "machine_id", "TEXT");
-  ensureColumn("project_agent_roles", "machine_id", "TEXT");
-  ensureColumn("dispatches", "machine_id", "TEXT");
-  ensureColumn("dispatches", "synced_at", "TEXT");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_tasks_plan ON tasks(plan_id)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_tasks_task_list ON tasks(task_list_id)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_tasks_due_at ON tasks(due_at)");
-  ensureIndex("CREATE UNIQUE INDEX IF NOT EXISTS idx_tasks_short_id ON tasks(short_id) WHERE short_id IS NOT NULL");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_agents_name ON agents(name)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_lists_project ON task_lists(project_id)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_lists_slug ON task_lists(slug)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_tags_tag ON task_tags(tag)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_tags_task ON task_tags(task_id)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_plans_project ON plans(project_id)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_plans_status ON plans(status)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_plans_task_list ON plans(task_list_id)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_plans_agent ON plans(agent_id)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_history_task ON task_history(task_id)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_history_agent ON task_history(agent_id)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_tasks_recurrence_parent ON tasks(recurrence_parent_id)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_tasks_recurrence_rule ON tasks(recurrence_rule) WHERE recurrence_rule IS NOT NULL");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_checklists_task ON task_checklists(task_id)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_project_sources_project ON project_sources(project_id)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_project_sources_type ON project_sources(type)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_tasks_assigned_by ON tasks(assigned_by)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_rel_source ON task_relationships(source_task_id)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_rel_target ON task_relationships(target_task_id)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_rel_type ON task_relationships(relationship_type)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_template_tasks_template ON template_tasks(template_id)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_kg_source ON kg_edges(source_id, source_type)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_kg_target ON kg_edges(target_id, target_type)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_kg_relation ON kg_edges(relation_type)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_tasks_machine ON tasks(machine_id)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_tasks_synced ON tasks(synced_at)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_projects_machine ON projects(machine_id)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_agents_machine ON agents(machine_id)");
-  ensureTable("task_time_logs", `
-    CREATE TABLE task_time_logs (
-      id TEXT PRIMARY KEY,
-      task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
-      agent_id TEXT,
-      started_at TEXT,
-      ended_at TEXT,
-      minutes INTEGER NOT NULL,
-      notes TEXT,
-      created_at TEXT NOT NULL DEFAULT (datetime('now'))
-    )`);
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_time_logs_task ON task_time_logs(task_id)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_time_logs_agent ON task_time_logs(agent_id)");
-  ensureColumn("tasks", "actual_minutes", "INTEGER");
-  ensureTable("task_watchers", `
-    CREATE TABLE task_watchers (
-      id TEXT PRIMARY KEY,
-      task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
-      agent_id TEXT NOT NULL,
-      created_at TEXT NOT NULL DEFAULT (datetime('now')),
-      UNIQUE(task_id, agent_id)
-    )`);
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_watchers_task ON task_watchers(task_id)");
-  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_watchers_agent ON task_watchers(agent_id)");
-  ensureColumn("task_dependencies", "external_project_id", "TEXT");
-  ensureColumn("task_dependencies", "external_task_id", "TEXT");
-}
-function backfillTaskTags(db) {
-  try {
-    const count = db.query("SELECT COUNT(*) as count FROM task_tags").get();
-    if (count && count.count > 0)
-      return;
-  } catch {
-    return;
-  }
-  try {
-    const rows = db.query("SELECT id, tags FROM tasks WHERE tags IS NOT NULL AND tags != '[]'").all();
-    if (rows.length === 0)
-      return;
-    const insert = db.prepare("INSERT OR IGNORE INTO task_tags (task_id, tag) VALUES (?, ?)");
-    for (const row of rows) {
-      if (!row.tags)
-        continue;
-      let tags = [];
-      try {
-        tags = JSON.parse(row.tags);
-      } catch {
-        continue;
-      }
-      for (const tag of tags) {
-        if (tag)
-          insert.run(row.id, tag);
-      }
-    }
-  } catch {}
-}
+// src/db/migrations.ts
 var MIGRATIONS;
-var init_schema = __esm(() => {
+var init_migrations = __esm(() => {
   MIGRATIONS = [
     `
   CREATE TABLE IF NOT EXISTS projects (
@@ -557,7 +184,7 @@ var init_schema = __esm(() => {
   ALTER TABLE projects ADD COLUMN task_counter INTEGER NOT NULL DEFAULT 0;
 
   ALTER TABLE tasks ADD COLUMN short_id TEXT;
-  CREATE UNIQUE INDEX IF NOT EXISTS idx_tasks_short_id ON tasks(short_id) WHERE short_id IS NOT NULL;
+  CREATE INDEX IF NOT EXISTS idx_tasks_short_id ON tasks(short_id) WHERE short_id IS NOT NULL;
 
   INSERT OR IGNORE INTO _migrations (id) VALUES (6);
   `,
@@ -1142,15 +769,465 @@ var init_schema = __esm(() => {
   ALTER TABLE task_dependencies ADD COLUMN external_project_id TEXT;
   ALTER TABLE task_dependencies ADD COLUMN external_task_id TEXT;
   INSERT OR IGNORE INTO _migrations (id) VALUES (47);
+  `,
+    `
+  CREATE TABLE IF NOT EXISTS task_checkpoints (
+    id TEXT PRIMARY KEY,
+    task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
+    agent_id TEXT,
+    step TEXT NOT NULL,
+    status TEXT NOT NULL DEFAULT 'pending' CHECK(status IN ('pending', 'running', 'completed', 'failed', 'skipped')),
+    data TEXT DEFAULT '{}',
+    error TEXT,
+    attempt INTEGER NOT NULL DEFAULT 1,
+    max_attempts INTEGER NOT NULL DEFAULT 1,
+    started_at TEXT,
+    completed_at TEXT,
+    created_at TEXT NOT NULL DEFAULT (datetime('now')),
+    updated_at TEXT NOT NULL DEFAULT (datetime('now'))
+  );
+  CREATE INDEX IF NOT EXISTS idx_task_checkpoints_task ON task_checkpoints(task_id);
+  CREATE INDEX IF NOT EXISTS idx_task_checkpoints_status ON task_checkpoints(status);
+
+  CREATE TABLE IF NOT EXISTS task_heartbeats (
+    id TEXT PRIMARY KEY,
+    task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
+    agent_id TEXT,
+    step TEXT,
+    message TEXT,
+    progress REAL CHECK(progress >= 0 AND progress <= 1),
+    meta TEXT DEFAULT '{}',
+    created_at TEXT NOT NULL DEFAULT (datetime('now'))
+  );
+  CREATE INDEX IF NOT EXISTS idx_task_heartbeats_task ON task_heartbeats(task_id);
+  CREATE INDEX IF NOT EXISTS idx_task_heartbeats_agent ON task_heartbeats(agent_id);
+
+  ALTER TABLE tasks ADD COLUMN runner_id TEXT;
+  ALTER TABLE tasks ADD COLUMN runner_started_at TEXT;
+  ALTER TABLE tasks ADD COLUMN runner_completed_at TEXT;
+  ALTER TABLE tasks ADD COLUMN current_step TEXT;
+  ALTER TABLE tasks ADD COLUMN total_steps INTEGER;
+  INSERT OR IGNORE INTO _migrations (id) VALUES (48);
   `
   ];
 });
 
+// src/db/schema.ts
+function runMigrations(db) {
+  try {
+    const result = db.query("SELECT MAX(id) as max_id FROM _migrations").get();
+    const currentLevel = result?.max_id ?? 0;
+    for (let i = currentLevel;i < MIGRATIONS.length; i++) {
+      try {
+        db.exec(MIGRATIONS[i]);
+      } catch {}
+    }
+  } catch {
+    for (const migration of MIGRATIONS) {
+      try {
+        db.exec(migration);
+      } catch {}
+    }
+  }
+  ensureSchema(db);
+}
+function ensureSchema(db) {
+  const ensureColumn = (table, column, type) => {
+    try {
+      db.query(`SELECT ${column} FROM ${table} LIMIT 0`).get();
+    } catch {
+      try {
+        db.exec(`ALTER TABLE ${table} ADD COLUMN ${column} ${type}`);
+      } catch {}
+    }
+  };
+  const ensureTable = (name, sql) => {
+    try {
+      const exists = db.query("SELECT name FROM sqlite_master WHERE type='table' AND name=?").get(name);
+      if (!exists)
+        db.exec(sql);
+    } catch {}
+  };
+  const ensureIndex = (sql) => {
+    try {
+      db.exec(sql);
+    } catch {}
+  };
+  ensureTable("orgs", `
+    CREATE TABLE orgs (
+      id TEXT PRIMARY KEY, name TEXT NOT NULL UNIQUE, description TEXT,
+      metadata TEXT DEFAULT '{}',
+      created_at TEXT NOT NULL DEFAULT (datetime('now')),
+      updated_at TEXT NOT NULL DEFAULT (datetime('now'))
+    )`);
+  ensureTable("agents", `
+    CREATE TABLE agents (
+      id TEXT PRIMARY KEY, name TEXT NOT NULL UNIQUE, description TEXT,
+      role TEXT DEFAULT 'agent', permissions TEXT DEFAULT '["*"]',
+      status TEXT NOT NULL DEFAULT 'active' CHECK(status IN ('active', 'archived')),
+      metadata TEXT DEFAULT '{}',
+      created_at TEXT NOT NULL DEFAULT (datetime('now')),
+      last_seen_at TEXT NOT NULL DEFAULT (datetime('now'))
+    )`);
+  ensureTable("task_lists", `
+    CREATE TABLE task_lists (
+      id TEXT PRIMARY KEY, project_id TEXT REFERENCES projects(id) ON DELETE SET NULL,
+      slug TEXT NOT NULL, name TEXT NOT NULL, description TEXT,
+      metadata TEXT DEFAULT '{}',
+      created_at TEXT NOT NULL DEFAULT (datetime('now')),
+      updated_at TEXT NOT NULL DEFAULT (datetime('now')),
+      UNIQUE(project_id, slug)
+    )`);
+  ensureTable("plans", `
+    CREATE TABLE plans (
+      id TEXT PRIMARY KEY, project_id TEXT REFERENCES projects(id) ON DELETE CASCADE,
+      task_list_id TEXT, agent_id TEXT,
+      name TEXT NOT NULL, description TEXT,
+      status TEXT NOT NULL DEFAULT 'active' CHECK(status IN ('active', 'completed', 'archived')),
+      created_at TEXT NOT NULL DEFAULT (datetime('now')),
+      updated_at TEXT NOT NULL DEFAULT (datetime('now'))
+    )`);
+  ensureTable("task_tags", `
+    CREATE TABLE task_tags (
+      task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
+      tag TEXT NOT NULL, PRIMARY KEY (task_id, tag)
+    )`);
+  ensureTable("task_history", `
+    CREATE TABLE task_history (
+      id TEXT PRIMARY KEY, task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
+      action TEXT NOT NULL, field TEXT, old_value TEXT, new_value TEXT, agent_id TEXT,
+      created_at TEXT NOT NULL DEFAULT (datetime('now'))
+    )`);
+  ensureTable("webhooks", `
+    CREATE TABLE webhooks (
+      id TEXT PRIMARY KEY, url TEXT NOT NULL, events TEXT NOT NULL DEFAULT '[]',
+      secret TEXT, active INTEGER NOT NULL DEFAULT 1,
+      created_at TEXT NOT NULL DEFAULT (datetime('now'))
+    )`);
+  ensureTable("task_templates", `
+    CREATE TABLE task_templates (
+      id TEXT PRIMARY KEY, name TEXT NOT NULL, title_pattern TEXT NOT NULL,
+      description TEXT, priority TEXT DEFAULT 'medium', tags TEXT DEFAULT '[]',
+      project_id TEXT REFERENCES projects(id) ON DELETE SET NULL,
+      plan_id TEXT REFERENCES plans(id) ON DELETE SET NULL,
+      metadata TEXT DEFAULT '{}',
+      created_at TEXT NOT NULL DEFAULT (datetime('now'))
+    )`);
+  ensureTable("template_tasks", `
+    CREATE TABLE template_tasks (
+      id TEXT PRIMARY KEY DEFAULT (lower(hex(randomblob(16)))),
+      template_id TEXT NOT NULL REFERENCES task_templates(id) ON DELETE CASCADE,
+      position INTEGER NOT NULL,
+      title_pattern TEXT NOT NULL,
+      description TEXT,
+      priority TEXT DEFAULT 'medium',
+      tags TEXT DEFAULT '[]',
+      task_type TEXT,
+      depends_on_positions TEXT DEFAULT '[]',
+      metadata TEXT DEFAULT '{}',
+      created_at TEXT NOT NULL DEFAULT (datetime('now'))
+    )`);
+  ensureTable("task_checklists", `
+    CREATE TABLE task_checklists (
+      id TEXT PRIMARY KEY,
+      task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
+      position INTEGER NOT NULL DEFAULT 0,
+      text TEXT NOT NULL,
+      checked INTEGER NOT NULL DEFAULT 0,
+      created_at TEXT NOT NULL DEFAULT (datetime('now')),
+      updated_at TEXT NOT NULL DEFAULT (datetime('now'))
+    )`);
+  ensureTable("project_sources", `
+    CREATE TABLE project_sources (
+      id TEXT PRIMARY KEY,
+      project_id TEXT NOT NULL REFERENCES projects(id) ON DELETE CASCADE,
+      type TEXT NOT NULL,
+      name TEXT NOT NULL,
+      uri TEXT NOT NULL,
+      description TEXT,
+      metadata TEXT DEFAULT '{}',
+      created_at TEXT NOT NULL DEFAULT (datetime('now')),
+      updated_at TEXT NOT NULL DEFAULT (datetime('now'))
+    )`);
+  ensureTable("task_relationships", `
+    CREATE TABLE task_relationships (
+      id TEXT PRIMARY KEY,
+      source_task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
+      target_task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
+      relationship_type TEXT NOT NULL,
+      metadata TEXT DEFAULT '{}',
+      created_by TEXT,
+      created_at TEXT NOT NULL DEFAULT (datetime('now')),
+      CHECK (source_task_id != target_task_id)
+    )`);
+  ensureTable("kg_edges", `
+    CREATE TABLE kg_edges (
+      id TEXT PRIMARY KEY,
+      source_id TEXT NOT NULL,
+      source_type TEXT NOT NULL,
+      target_id TEXT NOT NULL,
+      target_type TEXT NOT NULL,
+      relation_type TEXT NOT NULL,
+      weight REAL NOT NULL DEFAULT 1.0,
+      metadata TEXT DEFAULT '{}',
+      created_at TEXT NOT NULL DEFAULT (datetime('now')),
+      UNIQUE(source_id, source_type, target_id, target_type, relation_type)
+    )`);
+  ensureTable("project_machine_paths", `
+    CREATE TABLE project_machine_paths (
+      id TEXT PRIMARY KEY,
+      project_id TEXT NOT NULL REFERENCES projects(id) ON DELETE CASCADE,
+      machine_id TEXT NOT NULL,
+      path TEXT NOT NULL,
+      created_at TEXT NOT NULL DEFAULT (datetime('now')),
+      updated_at TEXT NOT NULL DEFAULT (datetime('now')),
+      UNIQUE(project_id, machine_id)
+    )`);
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_project_machine_paths_project ON project_machine_paths(project_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_project_machine_paths_machine ON project_machine_paths(machine_id)");
+  ensureTable("machines", `
+    CREATE TABLE machines (
+      id TEXT PRIMARY KEY, name TEXT NOT NULL UNIQUE, hostname TEXT, platform TEXT,
+      ssh_address TEXT, is_primary INTEGER NOT NULL DEFAULT 0,
+      last_seen_at TEXT NOT NULL DEFAULT (datetime('now')),
+      archived_at TEXT,
+      metadata TEXT DEFAULT '{}',
+      created_at TEXT NOT NULL DEFAULT (datetime('now'))
+    )`);
+  ensureColumn("machines", "ssh_address", "TEXT");
+  ensureColumn("machines", "is_primary", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn("machines", "archived_at", "TEXT");
+  ensureColumn("projects", "task_list_id", "TEXT");
+  ensureColumn("projects", "task_prefix", "TEXT");
+  ensureColumn("projects", "task_counter", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn("tasks", "plan_id", "TEXT REFERENCES plans(id) ON DELETE SET NULL");
+  ensureColumn("tasks", "task_list_id", "TEXT REFERENCES task_lists(id) ON DELETE SET NULL");
+  ensureColumn("tasks", "short_id", "TEXT");
+  ensureColumn("tasks", "due_at", "TEXT");
+  ensureColumn("tasks", "estimated_minutes", "INTEGER");
+  ensureColumn("tasks", "requires_approval", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn("tasks", "approved_by", "TEXT");
+  ensureColumn("tasks", "approved_at", "TEXT");
+  ensureColumn("tasks", "recurrence_rule", "TEXT");
+  ensureColumn("tasks", "recurrence_parent_id", "TEXT REFERENCES tasks(id) ON DELETE SET NULL");
+  ensureColumn("tasks", "confidence", "REAL");
+  ensureColumn("tasks", "reason", "TEXT");
+  ensureColumn("tasks", "spawned_from_session", "TEXT");
+  ensureColumn("tasks", "assigned_by", "TEXT");
+  ensureColumn("tasks", "assigned_from_project", "TEXT");
+  ensureColumn("tasks", "started_at", "TEXT");
+  ensureColumn("tasks", "task_type", "TEXT");
+  ensureColumn("tasks", "cost_tokens", "INTEGER DEFAULT 0");
+  ensureColumn("tasks", "cost_usd", "REAL DEFAULT 0");
+  ensureColumn("tasks", "delegated_from", "TEXT");
+  ensureColumn("tasks", "delegation_depth", "INTEGER DEFAULT 0");
+  ensureColumn("tasks", "retry_count", "INTEGER DEFAULT 0");
+  ensureColumn("tasks", "max_retries", "INTEGER DEFAULT 3");
+  ensureColumn("tasks", "retry_after", "TEXT");
+  ensureColumn("tasks", "sla_minutes", "INTEGER");
+  ensureColumn("tasks", "archived_at", "TEXT");
+  ensureColumn("agents", "role", "TEXT DEFAULT 'agent'");
+  ensureColumn("agents", "permissions", `TEXT DEFAULT '["*"]'`);
+  ensureColumn("agents", "reports_to", "TEXT");
+  ensureColumn("agents", "title", "TEXT");
+  ensureColumn("agents", "level", "TEXT");
+  ensureColumn("agents", "org_id", "TEXT");
+  ensureColumn("agents", "capabilities", "TEXT DEFAULT '[]'");
+  ensureColumn("projects", "org_id", "TEXT");
+  ensureColumn("plans", "task_list_id", "TEXT");
+  ensureColumn("plans", "agent_id", "TEXT");
+  ensureColumn("task_templates", "variables", "TEXT DEFAULT '[]'");
+  ensureColumn("task_templates", "version", "INTEGER NOT NULL DEFAULT 1");
+  ensureColumn("template_tasks", "condition", "TEXT");
+  ensureColumn("template_tasks", "include_template_id", "TEXT");
+  ensureTable("template_versions", `
+    CREATE TABLE template_versions (
+      id TEXT PRIMARY KEY DEFAULT (lower(hex(randomblob(16)))),
+      template_id TEXT NOT NULL REFERENCES task_templates(id) ON DELETE CASCADE,
+      version INTEGER NOT NULL,
+      snapshot TEXT NOT NULL,
+      created_at TEXT NOT NULL DEFAULT (datetime('now'))
+    )`);
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_template_versions_template ON template_versions(template_id)");
+  ensureTable("dispatches", `
+    CREATE TABLE dispatches (
+      id TEXT PRIMARY KEY,
+      title TEXT,
+      target_window TEXT NOT NULL,
+      task_ids TEXT NOT NULL DEFAULT '[]',
+      task_list_id TEXT REFERENCES task_lists(id) ON DELETE SET NULL,
+      message TEXT,
+      delay_ms INTEGER,
+      scheduled_at TEXT,
+      status TEXT NOT NULL DEFAULT 'pending' CHECK(status IN ('pending', 'sent', 'failed', 'cancelled')),
+      error TEXT,
+      created_at TEXT NOT NULL DEFAULT (datetime('now')),
+      sent_at TEXT
+    )`);
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_dispatches_status ON dispatches(status)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_dispatches_scheduled ON dispatches(scheduled_at)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_dispatches_task_list ON dispatches(task_list_id)");
+  ensureTable("dispatch_logs", `
+    CREATE TABLE dispatch_logs (
+      id TEXT PRIMARY KEY,
+      dispatch_id TEXT NOT NULL REFERENCES dispatches(id) ON DELETE CASCADE,
+      target_window TEXT NOT NULL,
+      message TEXT NOT NULL,
+      delay_ms INTEGER NOT NULL,
+      status TEXT NOT NULL CHECK(status IN ('sent', 'failed')),
+      error TEXT,
+      created_at TEXT NOT NULL DEFAULT (datetime('now'))
+    )`);
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_dispatch_logs_dispatch ON dispatch_logs(dispatch_id)");
+  ensureColumn("webhooks", "project_id", "TEXT");
+  ensureColumn("webhooks", "task_list_id", "TEXT");
+  ensureColumn("webhooks", "agent_id", "TEXT");
+  ensureColumn("webhooks", "task_id", "TEXT");
+  ensureTable("webhook_deliveries", `
+    CREATE TABLE webhook_deliveries (
+      id TEXT PRIMARY KEY,
+      webhook_id TEXT NOT NULL REFERENCES webhooks(id) ON DELETE CASCADE,
+      event TEXT NOT NULL,
+      payload TEXT NOT NULL,
+      status_code INTEGER,
+      response TEXT,
+      attempt INTEGER NOT NULL DEFAULT 1,
+      created_at TEXT NOT NULL DEFAULT (datetime('now'))
+    )`);
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_webhook_deliveries_webhook ON webhook_deliveries(webhook_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_webhook_deliveries_event ON webhook_deliveries(event)");
+  ensureColumn("task_comments", "type", "TEXT DEFAULT 'comment'");
+  ensureColumn("task_comments", "progress_pct", "INTEGER");
+  ensureColumn("projects", "machine_id", "TEXT");
+  ensureColumn("projects", "synced_at", "TEXT");
+  ensureColumn("tasks", "machine_id", "TEXT");
+  ensureColumn("tasks", "synced_at", "TEXT");
+  ensureColumn("agents", "machine_id", "TEXT");
+  ensureColumn("agents", "synced_at", "TEXT");
+  ensureColumn("task_lists", "machine_id", "TEXT");
+  ensureColumn("task_lists", "synced_at", "TEXT");
+  ensureColumn("plans", "machine_id", "TEXT");
+  ensureColumn("plans", "synced_at", "TEXT");
+  ensureColumn("task_comments", "machine_id", "TEXT");
+  ensureColumn("task_comments", "synced_at", "TEXT");
+  ensureColumn("sessions", "machine_id", "TEXT");
+  ensureColumn("sessions", "synced_at", "TEXT");
+  ensureColumn("task_history", "machine_id", "TEXT");
+  ensureColumn("webhooks", "machine_id", "TEXT");
+  ensureColumn("webhooks", "synced_at", "TEXT");
+  ensureColumn("task_templates", "machine_id", "TEXT");
+  ensureColumn("task_templates", "synced_at", "TEXT");
+  ensureColumn("orgs", "machine_id", "TEXT");
+  ensureColumn("orgs", "synced_at", "TEXT");
+  ensureColumn("handoffs", "machine_id", "TEXT");
+  ensureColumn("handoffs", "synced_at", "TEXT");
+  ensureColumn("task_checklists", "machine_id", "TEXT");
+  ensureColumn("project_sources", "machine_id", "TEXT");
+  ensureColumn("project_sources", "synced_at", "TEXT");
+  ensureColumn("task_files", "machine_id", "TEXT");
+  ensureColumn("task_relationships", "machine_id", "TEXT");
+  ensureColumn("kg_edges", "machine_id", "TEXT");
+  ensureColumn("project_agent_roles", "machine_id", "TEXT");
+  ensureColumn("dispatches", "machine_id", "TEXT");
+  ensureColumn("dispatches", "synced_at", "TEXT");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_tasks_plan ON tasks(plan_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_tasks_task_list ON tasks(task_list_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_tasks_due_at ON tasks(due_at)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_tasks_short_id ON tasks(short_id) WHERE short_id IS NOT NULL");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_agents_name ON agents(name)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_lists_project ON task_lists(project_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_lists_slug ON task_lists(slug)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_tags_tag ON task_tags(tag)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_tags_task ON task_tags(task_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_plans_project ON plans(project_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_plans_status ON plans(status)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_plans_task_list ON plans(task_list_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_plans_agent ON plans(agent_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_history_task ON task_history(task_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_history_agent ON task_history(task_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_tasks_recurrence_parent ON tasks(recurrence_parent_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_tasks_recurrence_rule ON tasks(recurrence_rule) WHERE recurrence_rule IS NOT NULL");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_checklists_task ON task_checklists(task_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_project_sources_project ON project_sources(project_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_project_sources_type ON project_sources(type)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_tasks_assigned_by ON tasks(assigned_by)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_rel_source ON task_relationships(source_task_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_rel_target ON task_relationships(target_task_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_rel_type ON task_relationships(relationship_type)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_template_tasks_template ON template_tasks(template_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_kg_source ON kg_edges(source_id, source_type)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_kg_target ON kg_edges(target_id, target_type)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_kg_relation ON kg_edges(relation_type)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_tasks_machine ON tasks(machine_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_tasks_synced ON tasks(synced_at)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_projects_machine ON projects(machine_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_agents_machine ON agents(machine_id)");
+  ensureTable("task_time_logs", `
+    CREATE TABLE task_time_logs (
+      id TEXT PRIMARY KEY,
+      task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
+      agent_id TEXT,
+      started_at TEXT,
+      ended_at TEXT,
+      minutes INTEGER NOT NULL,
+      notes TEXT,
+      created_at TEXT NOT NULL DEFAULT (datetime('now'))
+    )`);
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_time_logs_task ON task_time_logs(task_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_time_logs_agent ON task_time_logs(agent_id)");
+  ensureColumn("tasks", "actual_minutes", "INTEGER");
+  ensureTable("task_watchers", `
+    CREATE TABLE task_watchers (
+      id TEXT PRIMARY KEY,
+      task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
+      agent_id TEXT NOT NULL,
+      created_at TEXT NOT NULL DEFAULT (datetime('now')),
+      UNIQUE(task_id, agent_id)
+    )`);
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_watchers_task ON task_watchers(task_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_watchers_agent ON task_watchers(agent_id)");
+  ensureColumn("task_dependencies", "external_project_id", "TEXT");
+  ensureColumn("task_dependencies", "external_task_id", "TEXT");
+}
+function backfillTaskTags(db) {
+  try {
+    const count = db.query("SELECT COUNT(*) as count FROM task_tags").get();
+    if (count && count.count > 0)
+      return;
+  } catch {
+    return;
+  }
+  try {
+    const rows = db.query("SELECT id, tags FROM tasks WHERE tags IS NOT NULL AND tags != '[]'").all();
+    if (rows.length === 0)
+      return;
+    const insert = db.prepare("INSERT OR IGNORE INTO task_tags (task_id, tag) VALUES (?, ?)");
+    for (const row of rows) {
+      if (!row.tags)
+        continue;
+      let tags = [];
+      try {
+        tags = JSON.parse(row.tags);
+      } catch {
+        continue;
+      }
+      for (const tag of tags) {
+        if (tag)
+          insert.run(row.id, tag);
+      }
+    }
+  } catch {}
+}
+var init_schema = __esm(() => {
+  init_migrations();
+});
+
 // src/db/machines.ts
 import { hostname as osHostname, platform as osPlatform } from "os";
 function rowToMachine(row) {
   return {
     ...row,
+    is_primary: !!row.is_primary,
     metadata: row.metadata ? JSON.parse(row.metadata) : {}
   };
 }
@@ -1167,7 +1244,7 @@ function getOrCreateLocalMachine(db) {
   const id = uuid();
   const ts = now();
   d.run("INSERT INTO machines (id, name, hostname, platform, last_seen_at, metadata, created_at) VALUES (?, ?, ?, ?, ?, '{}', ?)", [id, name, host, plat, ts, ts]);
-  return { id, name, hostname: host, platform: plat, last_seen_at: ts, metadata: {}, created_at: ts };
+  return { id, name, hostname: host, platform: plat, ssh_address: null, is_primary: false, last_seen_at: ts, archived_at: null, metadata: {}, created_at: ts };
 }
 function getMachineId(db) {
   if (_machineId)
@@ -1189,13 +1266,23 @@ function getMachineByName(name, db) {
   const row = d.query("SELECT * FROM machines WHERE name = ?").get(name);
   return row ? rowToMachine(row) : null;
 }
-function listMachines(db) {
+function listMachines(db, includeArchived = false) {
   const d = db || getDatabase();
-  const rows = d.query("SELECT * FROM machines ORDER BY last_seen_at DESC").all();
+  const query = includeArchived ? "SELECT * FROM machines ORDER BY last_seen_at DESC" : "SELECT * FROM machines WHERE archived_at IS NULL ORDER BY last_seen_at DESC";
+  const rows = d.query(query).all();
   return rows.map(rowToMachine);
 }
 function deleteMachine(id, db) {
   const d = db || getDatabase();
+  const row = d.query("SELECT * FROM machines WHERE id = ?").get(id);
+  if (!row)
+    return false;
+  if (row.is_primary)
+    throw new Error("Cannot delete the primary machine");
+  const activeCount = d.query("SELECT COUNT(*) as cnt FROM tasks WHERE machine_id = ? AND status IN ('pending', 'in_progress')").get(id);
+  if (activeCount.cnt > 0) {
+    throw new Error(`Cannot delete machine with ${activeCount.cnt} active/pending tasks`);
+  }
   const result = d.run("DELETE FROM machines WHERE id = ?", [id]);
   return result.changes > 0;
 }
@@ -1238,6 +1325,19 @@ var init_machines = __esm(() => {
 });
 
 // src/db/database.ts
+var exports_database = {};
+__export(exports_database, {
+  uuid: () => uuid,
+  resolvePartialId: () => resolvePartialId,
+  resetDatabase: () => resetDatabase,
+  now: () => now,
+  lockExpiryCutoff: () => lockExpiryCutoff,
+  isLockExpired: () => isLockExpired,
+  getDatabase: () => getDatabase,
+  closeDatabase: () => closeDatabase,
+  clearExpiredLocks: () => clearExpiredLocks,
+  LOCK_EXPIRY_MINUTES: () => LOCK_EXPIRY_MINUTES
+});
 import { Database } from "bun:sqlite";
 import { existsSync, mkdirSync } from "fs";
 import { dirname, join, resolve } from "path";
@@ -1347,6 +1447,9 @@ function clearExpiredLocks(db) {
   db.run("UPDATE tasks SET locked_by = NULL, locked_at = NULL WHERE locked_at IS NOT NULL AND locked_at < ?", [cutoff]);
 }
 function resolvePartialId(db, table, partialId) {
+  if (!ALLOWED_TABLES.has(table)) {
+    throw new Error(`Invalid table name: ${table}`);
+  }
   if (partialId.length >= 36) {
     const row = db.query(`SELECT id FROM ${table} WHERE id = ?`).get(partialId);
     return row?.id ?? null;
@@ -1376,10 +1479,11 @@ function resolvePartialId(db, table, partialId) {
   }
   return null;
 }
-var LOCK_EXPIRY_MINUTES = 30, _db = null;
+var LOCK_EXPIRY_MINUTES = 30, _db = null, ALLOWED_TABLES;
 var init_database = __esm(() => {
   init_schema();
   init_machines();
+  ALLOWED_TABLES = new Set(["tasks", "projects", "agents", "plans", "task_lists", "task_templates"]);
 });
 
 // src/types/index.ts
@@ -1612,231 +1716,572 @@ function getDueDispatches(db) {
        ORDER BY created_at ASC`).all(now());
   return rows.map(rowToDispatch);
 }
-var init_dispatches = __esm(() => {
-  init_database();
-  init_types();
-});
+var init_dispatches = __esm(() => {
+  init_database();
+  init_types();
+});
+
+// src/sdk/types.ts
+class TodosAPIError extends Error {
+  status;
+  statusText;
+  body;
+  constructor(message, status, statusText, body) {
+    super(message);
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+    this.name = "TodosAPIError";
+  }
+}
+
+class TodosNotFoundError extends TodosAPIError {
+  constructor(message, body) {
+    super(message, 404, "Not Found", body);
+    this.name = "TodosNotFoundError";
+  }
+}
+
+class TodosConflictError extends TodosAPIError {
+  constructor(message, body) {
+    super(message, 409, "Conflict", body);
+    this.name = "TodosConflictError";
+  }
+}
+
+class TodosUnauthorizedError extends TodosAPIError {
+  constructor(message, body) {
+    super(message, 401, "Unauthorized", body);
+    this.name = "TodosUnauthorizedError";
+  }
+}
+
+class TodosRateLimitError extends TodosAPIError {
+  retryAfter;
+  constructor(message, retryAfter, body) {
+    super(message, 429, "Too Many Requests", body);
+    this.retryAfter = retryAfter;
+    this.name = "TodosRateLimitError";
+  }
+}
+
+class TodosTimeoutError extends Error {
+  ms;
+  constructor(ms) {
+    super(`Request timed out after ${ms}ms`);
+    this.ms = ms;
+    this.name = "TodosTimeoutError";
+  }
+}
+
+// src/sdk/client.ts
+function buildQuery(params) {
+  const search = new URLSearchParams;
+  for (const [k, v] of Object.entries(params)) {
+    if (v !== undefined)
+      search.set(k, String(v));
+  }
+  const s = search.toString();
+  return s ? `?${s}` : "";
+}
+
+class TasksResource {
+  client;
+  constructor(client) {
+    this.client = client;
+  }
+  async list(options) {
+    return this.client._get("/api/tasks", buildQuery(options || {}));
+  }
+  async get(id) {
+    return this.client._get(`/api/tasks/${id}`);
+  }
+  async getWithRelations(id) {
+    return this.client._get(`/api/tasks/${id}`);
+  }
+  async create(data) {
+    return this.client._post("/api/tasks", data);
+  }
+  async update(id, data) {
+    return this.client._patch(`/api/tasks/${id}`, data);
+  }
+  async delete(id) {
+    return this.client._delete(`/api/tasks/${id}`);
+  }
+  async start(id, agentId) {
+    return this.client._post(`/api/tasks/${id}/start`, { agent_id: agentId });
+  }
+  async complete(id, agentId) {
+    return this.client._post(`/api/tasks/${id}/complete`, { agent_id: agentId });
+  }
+  async fail(id, options) {
+    return this.client._post(`/api/tasks/${id}/fail`, options || {});
+  }
+  async logProgress(taskId, message, pctComplete, agentId) {
+    return this.client._post(`/api/tasks/${taskId}/progress`, {
+      message,
+      pct_complete: pctComplete,
+      agent_id: agentId
+    });
+  }
+  async getProgress(id) {
+    return this.client._get(`/api/tasks/${id}/progress`);
+  }
+  async getHistory(id) {
+    return this.client._get(`/api/tasks/${id}/history`);
+  }
+  async getAttachments(id) {
+    return this.client._get(`/api/tasks/${id}/attachments`);
+  }
+  async status(options) {
+    return this.client._get("/api/tasks/status", buildQuery(options || {}));
+  }
+  async next(options) {
+    return this.client._get("/api/tasks/next", buildQuery(options || {}));
+  }
+  async active(projectId) {
+    return this.client._get("/api/tasks/active", projectId ? `?project_id=${projectId}` : "");
+  }
+  async stale(options) {
+    return this.client._get("/api/tasks/stale", buildQuery(options || {}));
+  }
+  async changedSince(since, projectId) {
+    return this.client._get("/api/tasks/changed", buildQuery({ since, project_id: projectId }));
+  }
+  async context(options) {
+    const q = buildQuery({
+      agent_id: options?.agentId,
+      project_id: options?.projectId,
+      format: options?.format
+    });
+    const url = `${this.client.baseUrl}/api/tasks/context${q}`;
+    const res = await this.client._fetchRaw(url);
+    if (!res.ok)
+      return options?.format === "json" ? {} : "";
+    if (options?.format === "json")
+      return res.json();
+    return res.text();
+  }
+  async export(options) {
+    const q = buildQuery(options || {});
+    const url = `${this.client.baseUrl}/api/tasks/export${q}`;
+    const res = await this.client._fetchRaw(url);
+    if (!res.ok)
+      throw new TodosAPIError("Export failed", res.status, res.statusText, null);
+    if (options?.format === "csv")
+      return res.text();
+    return res.json();
+  }
+  async bulk(ids, action) {
+    return this.client._post("/api/tasks/bulk", { ids, action });
+  }
+  async claim(agentId, projectId) {
+    return this.client._post("/api/tasks/claim", { agent_id: agentId, project_id: projectId });
+  }
+  async* subscribe(options = {}) {
+    const q = buildQuery({
+      agent_id: options.agentId,
+      project_id: options.projectId,
+      events: options.events?.join(",")
+    });
+    const url = `${this.client.baseUrl}/api/tasks/stream${q}`;
+    const resp = await fetch(url);
+    if (!resp.ok || !resp.body)
+      throw new Error(`SSE connection failed: ${resp.status}`);
+    const reader = resp.body.getReader();
+    const decoder = new TextDecoder;
+    let buffer = "";
+    try {
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done)
+          break;
+        buffer += decoder.decode(value, { stream: true });
+        const lines = buffer.split(`
+`);
+        buffer = lines.pop() || "";
+        for (const line of lines) {
+          if (line.startsWith("data: ")) {
+            try {
+              const data = JSON.parse(line.slice(6));
+              if (data.type !== "connected")
+                yield data;
+            } catch {}
+          }
+        }
+      }
+    } finally {
+      reader.releaseLock();
+    }
+  }
+}
+
+class AgentsResource {
+  client;
+  constructor(client) {
+    this.client = client;
+  }
+  async list(options) {
+    return this.client._get("/api/agents", buildQuery(options || {}));
+  }
+  async register(data) {
+    return this.client._post("/api/agents", data);
+  }
+  async fullRegister(data) {
+    return this.client._post("/api/agents", data);
+  }
+  async update(id, data) {
+    return this.client._patch(`/api/agents/${id}`, data);
+  }
+  async delete(id) {
+    return this.client._delete(`/api/agents/${id}`);
+  }
+  async bulkDelete(ids) {
+    return this.client._post("/api/agents/bulk", { ids, action: "delete" });
+  }
+  async me(name) {
+    return this.client._get("/api/agents/me", `?name=${encodeURIComponent(name)}`);
+  }
+  async queue(agentId) {
+    return this.client._get(`/api/agents/${encodeURIComponent(agentId)}/queue`);
+  }
+  async team(agentId) {
+    return this.client._get(`/api/agents/${encodeURIComponent(agentId)}/team`);
+  }
+  async orgChart() {
+    return this.client._get("/api/org");
+  }
+}
+
+class ProjectsResource {
+  client;
+  constructor(client) {
+    this.client = client;
+  }
+  async list(options) {
+    return this.client._get("/api/projects", buildQuery(options || {}));
+  }
+  async create(data) {
+    return this.client._post("/api/projects", data);
+  }
+  async delete(id) {
+    return this.client._delete(`/api/projects/${id}`);
+  }
+  async bulkDelete(ids) {
+    return this.client._post("/api/projects/bulk", { ids, action: "delete" });
+  }
+}
+
+class PlansResource {
+  client;
+  constructor(client) {
+    this.client = client;
+  }
+  async list(projectId) {
+    return this.client._get("/api/plans", projectId ? `?project_id=${projectId}` : "");
+  }
+  async create(data) {
+    return this.client._post("/api/plans", data);
+  }
+  async get(id) {
+    return this.client._get(`/api/plans/${id}`);
+  }
+  async update(id, data) {
+    return this.client._patch(`/api/plans/${id}`, data);
+  }
+  async delete(id) {
+    return this.client._delete(`/api/plans/${id}`);
+  }
+  async bulkDelete(ids) {
+    return this.client._post("/api/plans/bulk", { ids, action: "delete" });
+  }
+}
+
+class OrgsResource {
+  client;
+  constructor(client) {
+    this.client = client;
+  }
+  async list() {
+    return this.client._get("/api/orgs");
+  }
+  async create(data) {
+    return this.client._post("/api/orgs", data);
+  }
+  async update(id, data) {
+    return this.client._patch(`/api/orgs/${id}`, data);
+  }
+  async delete(id) {
+    return this.client._delete(`/api/orgs/${id}`);
+  }
+}
+
+class WebhooksResource {
+  client;
+  constructor(client) {
+    this.client = client;
+  }
+  async list() {
+    return this.client._get("/api/webhooks");
+  }
+  async create(data) {
+    return this.client._post("/api/webhooks", data);
+  }
+  async delete(id) {
+    return this.client._delete(`/api/webhooks/${id}`);
+  }
+}
+
+class TemplatesResource {
+  client;
+  constructor(client) {
+    this.client = client;
+  }
+  async list() {
+    return this.client._get("/api/templates");
+  }
+  async create(data) {
+    return this.client._post("/api/templates", data);
+  }
+  async delete(id) {
+    return this.client._delete(`/api/templates/${id}`);
+  }
+}
 
-// src/sdk.ts
 class TodosClient {
   baseUrl;
   timeout;
+  apiKey;
+  maxRetries;
+  retryDelay;
+  tasks;
+  agents;
+  projects;
+  plans;
+  orgs;
+  webhooks;
+  templates;
   constructor(options = {}) {
     this.baseUrl = options.baseUrl || process.env["TODOS_URL"] || "http://localhost:19427";
-    this.timeout = options.timeout || 1e4;
+    this.baseUrl = this.baseUrl.replace(/\/+$/, "");
+    this.timeout = options.timeout ?? 1e4;
+    this.apiKey = options.apiKey || process.env["TODOS_API_KEY"] || null;
+    this.maxRetries = options.maxRetries ?? 0;
+    this.retryDelay = options.retryDelay ?? 1000;
+    this.tasks = new TasksResource(this);
+    this.agents = new AgentsResource(this);
+    this.projects = new ProjectsResource(this);
+    this.plans = new PlansResource(this);
+    this.orgs = new OrgsResource(this);
+    this.webhooks = new WebhooksResource(this);
+    this.templates = new TemplatesResource(this);
+  }
+  static fromEnv(apiKey) {
+    return new TodosClient({ apiKey });
+  }
+  async _fetchRaw(url, init) {
+    const controller = new AbortController;
+    const timer = setTimeout(() => controller.abort(), this.timeout);
+    try {
+      const headers = this._buildHeaders(init?.headers);
+      return await fetch(url, { ...init, headers, signal: controller.signal });
+    } finally {
+      clearTimeout(timer);
+    }
   }
-  static fromEnv() {
-    return new TodosClient({ baseUrl: process.env["TODOS_URL"] });
+  _buildHeaders(existing) {
+    const headers = { "Content-Type": "application/json" };
+    if (this.apiKey)
+      headers["x-api-key"] = this.apiKey;
+    if (existing) {
+      if (existing instanceof Headers) {
+        existing.forEach((v, k) => {
+          headers[k] = v;
+        });
+      } else if (Array.isArray(existing)) {
+        for (const [k, v] of existing)
+          headers[k] = v;
+      } else {
+        Object.assign(headers, existing);
+      }
+    }
+    return headers;
+  }
+  async _fetchWithRetry(path, init) {
+    let lastError = null;
+    const maxAttempts = this.maxRetries + 1;
+    for (let attempt = 0;attempt < maxAttempts; attempt++) {
+      try {
+        return await this._fetch(path, init);
+      } catch (e) {
+        lastError = e;
+        if (e instanceof TodosAPIError && e.status < 500 && e.status !== 429)
+          throw e;
+        if (e instanceof TodosUnauthorizedError || e instanceof TodosNotFoundError || e instanceof TodosConflictError)
+          throw e;
+        if (attempt < maxAttempts - 1) {
+          const delay = this.retryDelay * Math.pow(2, attempt);
+          if (e instanceof TodosRateLimitError) {
+            await this._sleep(e.retryAfter * 1000);
+          } else {
+            await this._sleep(delay);
+          }
+        }
+      }
+    }
+    throw lastError || new Error("Request failed after retries");
   }
-  async fetch(path, init) {
+  async _fetch(path, init) {
     const controller = new AbortController;
     const timer = setTimeout(() => controller.abort(), this.timeout);
     try {
-      const res = await fetch(`${this.baseUrl}${path}`, { ...init, signal: controller.signal });
+      const url = `${this.baseUrl}${path}`;
+      const headers = this._buildHeaders(init?.headers);
+      const res = await fetch(url, { ...init, headers, signal: controller.signal });
       if (!res.ok) {
-        const err = await res.json().catch(() => ({ error: res.statusText }));
-        throw new Error(err.error || `HTTP ${res.status}`);
+        const body = await res.json().catch(() => ({ error: res.statusText }));
+        const message = body.error || `HTTP ${res.status}: ${res.statusText}`;
+        if (res.status === 401)
+          throw new TodosUnauthorizedError(message, body);
+        if (res.status === 404)
+          throw new TodosNotFoundError(message, body);
+        if (res.status === 409)
+          throw new TodosConflictError(message, body);
+        if (res.status === 429) {
+          const retryAfter = parseInt(res.headers.get("retry-after") || "60", 10);
+          throw new TodosRateLimitError(message, retryAfter, body);
+        }
+        throw new TodosAPIError(message, res.status, res.statusText, body);
       }
+      const contentLength = res.headers.get("content-length");
+      if (contentLength === "0" || contentLength === "4")
+        return null;
       return res.json();
+    } catch (e) {
+      if (e instanceof DOMException && e.name === "AbortError") {
+        throw new TodosTimeoutError(this.timeout);
+      }
+      throw e;
     } finally {
       clearTimeout(timer);
     }
   }
+  async _get(path, query = "") {
+    return this._fetchWithRetry(`${path}${query}`);
+  }
+  async _post(path, body) {
+    return this._fetchWithRetry(path, {
+      method: "POST",
+      body: body ? JSON.stringify(body) : undefined
+    });
+  }
+  async _patch(path, body) {
+    return this._fetchWithRetry(path, {
+      method: "PATCH",
+      body: JSON.stringify(body)
+    });
+  }
+  async _delete(path) {
+    return this._fetchWithRetry(path, { method: "DELETE" });
+  }
+  _sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+  }
   async getHealth() {
-    return this.fetch("/api/health");
+    return this._get("/api/health");
   }
   async isAlive() {
     try {
-      await this.fetch("/api/stats");
+      await this._get("/api/stats");
       return true;
     } catch {
       return false;
     }
   }
-  async getStatus(projectId, agentId) {
-    const params = new URLSearchParams;
-    if (projectId)
-      params.set("project_id", projectId);
-    if (agentId)
-      params.set("agent_id", agentId);
-    return this.fetch(`/api/tasks/status?${params}`);
+  async getStats() {
+    return this._get("/api/stats");
+  }
+  async getReport(options) {
+    return this._get("/api/report", buildQuery({ days: options?.days, project_id: options?.projectId }));
+  }
+  async doctor() {
+    return this._get("/api/doctor");
+  }
+  async activity(limit) {
+    return this._get("/api/activity", limit ? `?limit=${limit}` : "");
   }
   async listTasks(filter = {}) {
-    const params = new URLSearchParams;
-    for (const [k, v] of Object.entries(filter)) {
-      if (v !== undefined)
-        params.set(k, String(v));
-    }
-    return this.fetch(`/api/tasks?${params}`);
+    return this.tasks.list(filter);
   }
   async getTask(id) {
-    return this.fetch(`/api/tasks/${id}`);
+    return this.tasks.get(id);
   }
-  async getTaskAttachments(id) {
-    return this.fetch(`/api/tasks/${id}/attachments`);
+  async createTask(data) {
+    return this.tasks.create(data);
   }
-  async getTaskHistory(id) {
-    return this.fetch(`/api/tasks/${id}/history`);
+  async updateTask(id, data) {
+    return this.tasks.update(id, data);
   }
-  async getTaskProgress(id) {
-    return this.fetch(`/api/tasks/${id}/progress`);
+  async deleteTask(id) {
+    await this.tasks.delete(id);
   }
-  async claimNextTask(agentId, projectId) {
-    return this.fetch("/api/tasks/claim", {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ agent_id: agentId, project_id: projectId })
-    });
+  async startTask(id, agentId) {
+    return this.tasks.start(id, agentId);
   }
   async completeTask(id, agentId) {
-    return this.fetch(`/api/tasks/${id}/complete`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ agent_id: agentId })
-    });
-  }
-  async createTask(data) {
-    return this.fetch("/api/tasks", {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(data)
-    });
+    return this.tasks.complete(id, agentId);
   }
-  async updateTask(id, data) {
-    return this.fetch(`/api/tasks/${id}`, {
-      method: "PATCH",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(data)
-    });
+  async failTask(id, options = {}) {
+    return this.tasks.fail(id, options);
   }
-  async deleteTask(id) {
-    await this.fetch(`/api/tasks/${id}`, { method: "DELETE" });
+  async logProgress(taskId, message, pctComplete, agentId) {
+    return this.tasks.logProgress(taskId, message, pctComplete, agentId);
   }
-  async getStats() {
-    return this.fetch("/api/stats");
+  async getStatus(projectId, agentId) {
+    return this.tasks.status({ project_id: projectId, agent_id: agentId });
   }
   async getActiveWork(projectId) {
-    const params = new URLSearchParams;
-    if (projectId)
-      params.set("project_id", projectId);
-    return this.fetch(`/api/tasks/active?${params}`);
+    const res = await this.tasks.active(projectId);
+    return res.active;
   }
   async getTasksChangedSince(since, projectId) {
-    const params = new URLSearchParams({ since });
-    if (projectId)
-      params.set("project_id", projectId);
-    return this.fetch(`/api/tasks/changed?${params}`);
-  }
-  async startTask(id, agentId) {
-    return this.fetch(`/api/tasks/${id}/start`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ agent_id: agentId })
-    });
+    return this.tasks.changedSince(since, projectId);
   }
-  async failTask(id, options = {}) {
-    return this.fetch(`/api/tasks/${id}/fail`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(options)
-    });
+  async getStaleTasks(minutes, projectId) {
+    return this.tasks.stale({ minutes, project_id: projectId });
   }
-  async logProgress(taskId, message, pctComplete, agentId) {
-    return this.fetch(`/api/tasks/${taskId}/progress`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ message, pct_complete: pctComplete, agent_id: agentId })
-    });
+  async getContext(options = {}) {
+    return this.tasks.context(options);
   }
   async exportTasks(filter = {}) {
-    const params = new URLSearchParams;
-    if (filter.status)
-      params.set("status", filter.status);
-    if (filter.project_id)
-      params.set("project_id", filter.project_id);
-    const fmt = filter.format || "json";
-    if (fmt === "csv")
-      params.set("format", "csv");
-    return this.fetch(`/api/tasks/export?${params}`);
+    return this.tasks.export(filter);
   }
-  async getProjects() {
-    return this.fetch("/api/projects");
+  async claimNextTask(agentId, projectId) {
+    return this.tasks.claim(agentId, projectId);
   }
-  async getContext(options = {}) {
-    const params = new URLSearchParams;
-    if (options.agentId)
-      params.set("agent_id", options.agentId);
-    if (options.projectId)
-      params.set("project_id", options.projectId);
-    if (options.format)
-      params.set("format", options.format);
-    const url = `${this.baseUrl}/api/tasks/context?${params}`;
-    const controller = new AbortController;
-    const timer = setTimeout(() => controller.abort(), this.timeout);
-    try {
-      const res = await fetch(url, { signal: controller.signal });
-      if (!res.ok)
-        return options.format === "json" ? {} : "";
-      if (options.format === "json")
-        return res.json();
-      return res.text();
-    } catch {
-      return options.format === "json" ? {} : "";
-    } finally {
-      clearTimeout(timer);
-    }
+  async getTaskHistory(id) {
+    return this.tasks.getHistory(id);
+  }
+  async getTaskAttachments(id) {
+    return this.tasks.getAttachments(id);
   }
-  async getReport(options = {}) {
-    const params = new URLSearchParams;
-    if (options.days)
-      params.set("days", String(options.days));
-    if (options.projectId)
-      params.set("project_id", options.projectId);
-    return this.fetch(`/api/report?${params}`);
+  async getTaskProgress(id) {
+    return this.tasks.getProgress(id);
   }
   async* subscribeToStream(options = {}) {
-    const params = new URLSearchParams;
-    if (options.agentId)
-      params.set("agent_id", options.agentId);
-    if (options.projectId)
-      params.set("project_id", options.projectId);
-    if (options.events)
-      params.set("events", options.events.join(","));
-    const url = `${this.baseUrl}/api/tasks/stream?${params}`;
-    const resp = await fetch(url);
-    if (!resp.ok || !resp.body)
-      throw new Error(`SSE connection failed: ${resp.status}`);
-    const reader = resp.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(`
-`);
-      buffer = lines.pop() || "";
-      for (const line of lines) {
-        if (line.startsWith("data: ")) {
-          try {
-            const data = JSON.parse(line.slice(6));
-            if (data.type !== "connected")
-              yield data;
-          } catch {}
-        }
-      }
-    }
+    yield* this.tasks.subscribe(options);
+  }
+  async getProjects() {
+    return this.projects.list();
   }
 }
 function createClient(options) {
   return new TodosClient(options);
 }
-
 // src/index.ts
 init_database();
 
-// src/db/tasks.ts
+// src/db/task-crud.ts
 init_types();
 init_database();
 
@@ -2207,184 +2652,111 @@ function checkCompletionGuard(task, agentId, db, configOverride) {
       const remaining = Math.ceil(config.min_work_seconds - elapsedSeconds);
       throw new CompletionGuardError(`Too fast: task was started ${Math.floor(elapsedSeconds)}s ago. Minimum work duration is ${config.min_work_seconds}s. Wait ${remaining}s.`, remaining);
     }
-  }
-  if (agent && config.max_completions_per_window && config.window_minutes) {
-    const windowStart = new Date(Date.now() - config.window_minutes * 60 * 1000).toISOString();
-    const result = db.query(`SELECT COUNT(*) as count FROM tasks
-         WHERE completed_at > ? AND (assigned_to = ? OR agent_id = ?)`).get(windowStart, agent, agent);
-    if (result.count >= config.max_completions_per_window) {
-      throw new CompletionGuardError(`Rate limit: ${result.count} tasks completed in the last ${config.window_minutes} minutes (max ${config.max_completions_per_window}). Slow down.`);
-    }
-  }
-  if (agent && config.cooldown_seconds) {
-    const result = db.query(`SELECT MAX(completed_at) as last_completed FROM tasks
-         WHERE completed_at IS NOT NULL AND (assigned_to = ? OR agent_id = ?) AND id != ?`).get(agent, agent, task.id);
-    if (result.last_completed) {
-      const elapsedSeconds = (Date.now() - new Date(result.last_completed).getTime()) / 1000;
-      if (elapsedSeconds < config.cooldown_seconds) {
-        const remaining = Math.ceil(config.cooldown_seconds - elapsedSeconds);
-        throw new CompletionGuardError(`Cooldown: last completion was ${Math.floor(elapsedSeconds)}s ago. Wait ${remaining}s between completions.`, remaining);
-      }
-    }
-  }
-}
-
-// src/db/audit.ts
-init_database();
-function logTaskChange(taskId, action, field, oldValue, newValue, agentId, db) {
-  const d = db || getDatabase();
-  const id = uuid();
-  const timestamp = now();
-  d.run(`INSERT INTO task_history (id, task_id, action, field, old_value, new_value, agent_id, created_at)
-     VALUES (?, ?, ?, ?, ?, ?, ?, ?)`, [id, taskId, action, field || null, oldValue ?? null, newValue ?? null, agentId || null, timestamp]);
-  return { id, task_id: taskId, action, field: field || null, old_value: oldValue ?? null, new_value: newValue ?? null, agent_id: agentId || null, created_at: timestamp };
-}
-function getTaskHistory(taskId, db) {
-  const d = db || getDatabase();
-  return d.query("SELECT * FROM task_history WHERE task_id = ? ORDER BY created_at DESC").all(taskId);
-}
-function getRecentActivity(limit = 50, db) {
-  const d = db || getDatabase();
-  return d.query("SELECT * FROM task_history ORDER BY created_at DESC LIMIT ?").all(limit);
-}
-function getRecap(hours = 8, projectId, db) {
-  const d = db || getDatabase();
-  const since = new Date(Date.now() - hours * 60 * 60 * 1000).toISOString();
-  const staleWindow = new Date(Date.now() - 30 * 60 * 1000).toISOString();
-  const pf = projectId ? " AND project_id = ?" : "";
-  const tpf = projectId ? " AND t.project_id = ?" : "";
-  const completed = projectId ? d.query(`SELECT id, short_id, title, assigned_to, completed_at, started_at FROM tasks WHERE status = 'completed' AND completed_at > ?${pf} ORDER BY completed_at DESC`).all(since, projectId) : d.query(`SELECT id, short_id, title, assigned_to, completed_at, started_at FROM tasks WHERE status = 'completed' AND completed_at > ? ORDER BY completed_at DESC`).all(since);
-  const created = projectId ? d.query(`SELECT id, short_id, title, agent_id, created_at FROM tasks WHERE created_at > ?${pf} ORDER BY created_at DESC`).all(since, projectId) : d.query(`SELECT id, short_id, title, agent_id, created_at FROM tasks WHERE created_at > ? ORDER BY created_at DESC`).all(since);
-  const in_progress = projectId ? d.query(`SELECT id, short_id, title, assigned_to, started_at FROM tasks WHERE status = 'in_progress' AND project_id = ? ORDER BY updated_at DESC`).all(projectId) : d.query(`SELECT id, short_id, title, assigned_to, started_at FROM tasks WHERE status = 'in_progress' ORDER BY updated_at DESC`).all();
-  const blocked = projectId ? d.query(`SELECT DISTINCT t.id, t.short_id, t.title, t.assigned_to FROM tasks t JOIN task_dependencies td ON td.task_id = t.id JOIN tasks dep ON dep.id = td.depends_on AND dep.status NOT IN ('completed','cancelled') WHERE t.status = 'pending'${tpf}`).all(projectId) : d.query(`SELECT DISTINCT t.id, t.short_id, t.title, t.assigned_to FROM tasks t JOIN task_dependencies td ON td.task_id = t.id JOIN tasks dep ON dep.id = td.depends_on AND dep.status NOT IN ('completed','cancelled') WHERE t.status = 'pending'`).all();
-  const stale = projectId ? d.query(`SELECT id, short_id, title, assigned_to, updated_at FROM tasks WHERE status = 'in_progress' AND updated_at < ? AND project_id = ? ORDER BY updated_at ASC`).all(staleWindow, projectId) : d.query(`SELECT id, short_id, title, assigned_to, updated_at FROM tasks WHERE status = 'in_progress' AND updated_at < ? ORDER BY updated_at ASC`).all(staleWindow);
-  const agents = projectId ? d.query(`SELECT a.name, a.last_seen_at, (SELECT COUNT(*) FROM tasks t WHERE (t.assigned_to = a.id OR t.agent_id = a.id) AND t.status = 'completed' AND t.completed_at > ?${tpf}) as completed_count, (SELECT COUNT(*) FROM tasks t WHERE (t.assigned_to = a.id OR t.agent_id = a.id) AND t.status = 'in_progress'${tpf}) as in_progress_count FROM agents a WHERE a.status = 'active' AND a.last_seen_at > ? ORDER BY completed_count DESC`).all(since, projectId, projectId, since) : d.query(`SELECT a.name, a.last_seen_at, (SELECT COUNT(*) FROM tasks t WHERE (t.assigned_to = a.id OR t.agent_id = a.id) AND t.status = 'completed' AND t.completed_at > ?) as completed_count, (SELECT COUNT(*) FROM tasks t WHERE (t.assigned_to = a.id OR t.agent_id = a.id) AND t.status = 'in_progress') as in_progress_count FROM agents a WHERE a.status = 'active' AND a.last_seen_at > ? ORDER BY completed_count DESC`).all(since, since);
-  return {
-    hours,
-    since,
-    completed: completed.map((r) => ({
-      ...r,
-      duration_minutes: r.started_at && r.completed_at ? Math.round((new Date(r.completed_at).getTime() - new Date(r.started_at).getTime()) / 60000) : null
-    })),
-    created,
-    in_progress,
-    blocked,
-    stale,
-    agents
-  };
-}
-
-// src/lib/recurrence.ts
-var DAY_NAMES = {
-  sunday: 0,
-  sun: 0,
-  monday: 1,
-  mon: 1,
-  tuesday: 2,
-  tue: 2,
-  wednesday: 3,
-  wed: 3,
-  thursday: 4,
-  thu: 4,
-  friday: 5,
-  fri: 5,
-  saturday: 6,
-  sat: 6
-};
-function parseRecurrenceRule(rule) {
-  const normalized = rule.trim().toLowerCase();
-  if (normalized === "every weekday" || normalized === "every weekdays") {
-    return { type: "specific_days", days: [1, 2, 3, 4, 5] };
-  }
-  if (normalized === "every day" || normalized === "daily") {
-    return { type: "interval", interval: 1, unit: "day" };
-  }
-  if (normalized === "every week" || normalized === "weekly") {
-    return { type: "interval", interval: 1, unit: "week" };
-  }
-  if (normalized === "every month" || normalized === "monthly") {
-    return { type: "interval", interval: 1, unit: "month" };
-  }
-  const intervalMatch = normalized.match(/^every\s+(\d+)\s+(day|week|month)s?$/);
-  if (intervalMatch) {
-    return {
-      type: "interval",
-      interval: parseInt(intervalMatch[1], 10),
-      unit: intervalMatch[2]
-    };
-  }
-  const daysMatch = normalized.match(/^every\s+(.+)$/);
-  if (daysMatch) {
-    const dayParts = daysMatch[1].split(/[,\s]+/).map((d) => d.trim()).filter(Boolean);
-    const days = [];
-    for (const part of dayParts) {
-      const dayNum = DAY_NAMES[part];
-      if (dayNum !== undefined) {
-        days.push(dayNum);
-      }
-    }
-    if (days.length > 0) {
-      return { type: "specific_days", days: days.sort((a, b) => a - b) };
-    }
-  }
-  throw new Error(`Invalid recurrence rule: "${rule}". Supported formats: "every day", "every weekday", "every week", "every 2 weeks", "every month", "every N days/weeks/months", "every monday", "every mon,wed,fri"`);
-}
-function isValidRecurrenceRule(rule) {
-  try {
-    parseRecurrenceRule(rule);
-    return true;
-  } catch {
-    return false;
-  }
-}
-function nextOccurrence(rule, from) {
-  const parsed = parseRecurrenceRule(rule);
-  const base = from || new Date;
-  if (parsed.type === "interval") {
-    const next = new Date(base);
-    if (parsed.unit === "day") {
-      next.setDate(next.getDate() + parsed.interval);
-    } else if (parsed.unit === "week") {
-      next.setDate(next.getDate() + parsed.interval * 7);
-    } else if (parsed.unit === "month") {
-      next.setMonth(next.getMonth() + parsed.interval);
+  }
+  if (agent && config.max_completions_per_window && config.window_minutes) {
+    const windowStart = new Date(Date.now() - config.window_minutes * 60 * 1000).toISOString();
+    const result = db.query(`SELECT COUNT(*) as count FROM tasks
+         WHERE completed_at > ? AND (assigned_to = ? OR agent_id = ?)`).get(windowStart, agent, agent);
+    if (result.count >= config.max_completions_per_window) {
+      throw new CompletionGuardError(`Rate limit: ${result.count} tasks completed in the last ${config.window_minutes} minutes (max ${config.max_completions_per_window}). Slow down.`);
     }
-    return next.toISOString();
   }
-  if (parsed.type === "specific_days") {
-    const currentDay = base.getDay();
-    const days = parsed.days;
-    let daysToAdd = Infinity;
-    for (const day of days) {
-      let diff = day - currentDay;
-      if (diff <= 0)
-        diff += 7;
-      if (diff < daysToAdd)
-        daysToAdd = diff;
+  if (agent && config.cooldown_seconds) {
+    const result = db.query(`SELECT MAX(completed_at) as last_completed FROM tasks
+         WHERE completed_at IS NOT NULL AND (assigned_to = ? OR agent_id = ?) AND id != ?`).get(agent, agent, task.id);
+    if (result.last_completed) {
+      const elapsedSeconds = (Date.now() - new Date(result.last_completed).getTime()) / 1000;
+      if (elapsedSeconds < config.cooldown_seconds) {
+        const remaining = Math.ceil(config.cooldown_seconds - elapsedSeconds);
+        throw new CompletionGuardError(`Cooldown: last completion was ${Math.floor(elapsedSeconds)}s ago. Wait ${remaining}s between completions.`, remaining);
+      }
     }
-    const next = new Date(base);
-    next.setDate(next.getDate() + daysToAdd);
-    return next.toISOString();
   }
-  throw new Error(`Cannot calculate next occurrence for rule: "${rule}"`);
+}
+
+// src/db/audit.ts
+init_database();
+function logTaskChange(taskId, action, field, oldValue, newValue, agentId, db) {
+  const d = db || getDatabase();
+  const id = uuid();
+  const timestamp = now();
+  d.run(`INSERT INTO task_history (id, task_id, action, field, old_value, new_value, agent_id, created_at)
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?)`, [id, taskId, action, field || null, oldValue ?? null, newValue ?? null, agentId || null, timestamp]);
+  return { id, task_id: taskId, action, field: field || null, old_value: oldValue ?? null, new_value: newValue ?? null, agent_id: agentId || null, created_at: timestamp };
+}
+function getTaskHistory(taskId, db) {
+  const d = db || getDatabase();
+  return d.query("SELECT * FROM task_history WHERE task_id = ? ORDER BY created_at DESC").all(taskId);
+}
+function getRecentActivity(limit = 50, db) {
+  const d = db || getDatabase();
+  return d.query("SELECT * FROM task_history ORDER BY created_at DESC LIMIT ?").all(limit);
+}
+function getRecap(hours = 8, projectId, db) {
+  const d = db || getDatabase();
+  const since = new Date(Date.now() - hours * 60 * 60 * 1000).toISOString();
+  const staleWindow = new Date(Date.now() - 30 * 60 * 1000).toISOString();
+  const pf = projectId ? " AND project_id = ?" : "";
+  const tpf = projectId ? " AND t.project_id = ?" : "";
+  const completed = projectId ? d.query(`SELECT id, short_id, title, assigned_to, completed_at, started_at FROM tasks WHERE status = 'completed' AND completed_at > ?${pf} ORDER BY completed_at DESC`).all(since, projectId) : d.query(`SELECT id, short_id, title, assigned_to, completed_at, started_at FROM tasks WHERE status = 'completed' AND completed_at > ? ORDER BY completed_at DESC`).all(since);
+  const created = projectId ? d.query(`SELECT id, short_id, title, agent_id, created_at FROM tasks WHERE created_at > ?${pf} ORDER BY created_at DESC`).all(since, projectId) : d.query(`SELECT id, short_id, title, agent_id, created_at FROM tasks WHERE created_at > ? ORDER BY created_at DESC`).all(since);
+  const in_progress = projectId ? d.query(`SELECT id, short_id, title, assigned_to, started_at FROM tasks WHERE status = 'in_progress' AND project_id = ? ORDER BY updated_at DESC`).all(projectId) : d.query(`SELECT id, short_id, title, assigned_to, started_at FROM tasks WHERE status = 'in_progress' ORDER BY updated_at DESC`).all();
+  const blocked = projectId ? d.query(`SELECT DISTINCT t.id, t.short_id, t.title, t.assigned_to FROM tasks t JOIN task_dependencies td ON td.task_id = t.id JOIN tasks dep ON dep.id = td.depends_on AND dep.status NOT IN ('completed','cancelled') WHERE t.status = 'pending'${tpf}`).all(projectId) : d.query(`SELECT DISTINCT t.id, t.short_id, t.title, t.assigned_to FROM tasks t JOIN task_dependencies td ON td.task_id = t.id JOIN tasks dep ON dep.id = td.depends_on AND dep.status NOT IN ('completed','cancelled') WHERE t.status = 'pending'`).all();
+  const stale = projectId ? d.query(`SELECT id, short_id, title, assigned_to, updated_at FROM tasks WHERE status = 'in_progress' AND updated_at < ? AND project_id = ? ORDER BY updated_at ASC`).all(staleWindow, projectId) : d.query(`SELECT id, short_id, title, assigned_to, updated_at FROM tasks WHERE status = 'in_progress' AND updated_at < ? ORDER BY updated_at ASC`).all(staleWindow);
+  const agents = projectId ? d.query(`SELECT a.name, a.last_seen_at, (SELECT COUNT(*) FROM tasks t WHERE (t.assigned_to = a.id OR t.agent_id = a.id) AND t.status = 'completed' AND t.completed_at > ?${tpf}) as completed_count, (SELECT COUNT(*) FROM tasks t WHERE (t.assigned_to = a.id OR t.agent_id = a.id) AND t.status = 'in_progress'${tpf}) as in_progress_count FROM agents a WHERE a.status = 'active' AND a.last_seen_at > ? ORDER BY completed_count DESC`).all(since, projectId, projectId, since) : d.query(`SELECT a.name, a.last_seen_at, (SELECT COUNT(*) FROM tasks t WHERE (t.assigned_to = a.id OR t.agent_id = a.id) AND t.status = 'completed' AND t.completed_at > ?) as completed_count, (SELECT COUNT(*) FROM tasks t WHERE (t.assigned_to = a.id OR t.agent_id = a.id) AND t.status = 'in_progress') as in_progress_count FROM agents a WHERE a.status = 'active' AND a.last_seen_at > ? ORDER BY completed_count DESC`).all(since, since);
+  return {
+    hours,
+    since,
+    completed: completed.map((r) => ({
+      ...r,
+      duration_minutes: r.started_at && r.completed_at ? Math.round((new Date(r.completed_at).getTime() - new Date(r.started_at).getTime()) / 60000) : null
+    })),
+    created,
+    in_progress,
+    blocked,
+    stale,
+    agents
+  };
 }
 
 // src/db/webhooks.ts
 init_database();
 var MAX_RETRY_ATTEMPTS = 3;
 var RETRY_BASE_DELAY_MS = 1000;
+function isPrivateOrInternal(ip) {
+  const parts = ip.split(".").map(Number);
+  if (parts.length !== 4)
+    return true;
+  const a = parts[0];
+  const b = parts[1];
+  if (parts.some((p) => isNaN(p) || p < 0 || p > 255))
+    return true;
+  if (a === 10)
+    return true;
+  if (a === 127)
+    return true;
+  if (a === 169 && b === 254)
+    return true;
+  if (a === 172 && b >= 16 && b <= 31)
+    return true;
+  if (a === 192 && b === 168)
+    return true;
+  if (a === 0)
+    return true;
+  return false;
+}
 function validateWebhookUrl(urlString) {
   try {
     const url = new URL(urlString);
     if (url.protocol !== "https:") {
-      throw new Error("Webhook URLs must use HTTPS");
+      return { valid: false, error: "Webhook URLs must use HTTPS" };
     }
     const hostname = url.hostname.toLowerCase();
     if (hostname === "localhost" || hostname === "127.0.0.1" || hostname === "::1" || hostname === "0.0.0.0") {
-      throw new Error("Webhook URLs cannot target localhost");
+      return { valid: false, error: "Webhook URLs cannot target localhost" };
     }
     if (hostname === "169.254.169.254" || hostname.startsWith("169.254.")) {
-      throw new Error("Webhook URLs cannot target cloud metadata endpoints");
+      return { valid: false, error: "Webhook URLs cannot target cloud metadata endpoints" };
     }
     const privateRanges = [
       /^10\./,
@@ -2397,1008 +2769,1308 @@ function validateWebhookUrl(urlString) {
     ];
     for (const range of privateRanges) {
       if (range.test(hostname)) {
-        throw new Error("Webhook URLs cannot target private IP ranges");
+        return { valid: false, error: "Webhook URLs cannot target private IP ranges" };
       }
     }
+    return { valid: true };
   } catch (e) {
     if (e instanceof Error && e.message.startsWith("Webhook URLs")) {
-      throw e;
+      return { valid: false, error: e.message };
+    }
+    return { valid: false, error: `Invalid webhook URL: ${urlString}` };
+  }
+}
+async function resolveAndCheckIp(hostname) {
+  try {
+    const resolved = await Bun.dns.lookup(hostname);
+    if (!resolved)
+      return { allowed: false, error: `Could not resolve hostname: ${hostname}` };
+    const addresses = Array.isArray(resolved) ? resolved : [resolved];
+    for (const addr of addresses) {
+      const ip = typeof addr === "string" ? addr : addr.address;
+      if (isPrivateOrInternal(ip)) {
+        return { allowed: false, error: `Hostname ${hostname} resolves to blocked address ${ip}` };
+      }
+    }
+    const first = addresses[0];
+    return { allowed: true, ip: typeof first === "string" ? first : first?.address ?? "" };
+  } catch {
+    return { allowed: true, ip: "" };
+  }
+}
+var activeDeliveries = 0;
+var MAX_CONCURRENT_DELIVERIES = 20;
+function rowToWebhook(row) {
+  return {
+    ...row,
+    events: JSON.parse(row.events || "[]"),
+    active: !!row.active,
+    project_id: row.project_id || null,
+    task_list_id: row.task_list_id || null,
+    agent_id: row.agent_id || null,
+    task_id: row.task_id || null
+  };
+}
+function createWebhook(input, db) {
+  const urlValidation = validateWebhookUrl(input.url);
+  if (!urlValidation.valid) {
+    throw new Error(`Invalid webhook URL: ${urlValidation.error}`);
+  }
+  const d = db || getDatabase();
+  const id = uuid();
+  d.run(`INSERT INTO webhooks (id, url, events, secret, project_id, task_list_id, agent_id, task_id, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
+    id,
+    input.url,
+    JSON.stringify(input.events || []),
+    input.secret || null,
+    input.project_id || null,
+    input.task_list_id || null,
+    input.agent_id || null,
+    input.task_id || null,
+    now()
+  ]);
+  return getWebhook(id, d);
+}
+function getWebhook(id, db) {
+  const d = db || getDatabase();
+  const row = d.query("SELECT * FROM webhooks WHERE id = ?").get(id);
+  return row ? rowToWebhook(row) : null;
+}
+function listWebhooks(db) {
+  const d = db || getDatabase();
+  return d.query("SELECT * FROM webhooks ORDER BY created_at DESC").all().map(rowToWebhook);
+}
+function deleteWebhook(id, db) {
+  const d = db || getDatabase();
+  return d.run("DELETE FROM webhooks WHERE id = ?", [id]).changes > 0;
+}
+function listDeliveries(webhookId, limit = 50, db) {
+  const d = db || getDatabase();
+  if (webhookId) {
+    return d.query("SELECT * FROM webhook_deliveries WHERE webhook_id = ? ORDER BY created_at DESC LIMIT ?").all(webhookId, limit);
+  }
+  return d.query("SELECT * FROM webhook_deliveries ORDER BY created_at DESC LIMIT ?").all(limit);
+}
+function logDelivery(d, webhookId, event, payload, statusCode, response, attempt) {
+  const id = uuid();
+  d.run(`INSERT INTO webhook_deliveries (id, webhook_id, event, payload, status_code, response, attempt, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`, [id, webhookId, event, payload, statusCode, response, attempt, now()]);
+}
+function matchesScope(wh, payload) {
+  if (wh.project_id && payload.project_id !== wh.project_id)
+    return false;
+  if (wh.task_list_id && payload.task_list_id !== wh.task_list_id)
+    return false;
+  if (wh.agent_id && payload.agent_id !== wh.agent_id && payload.assigned_to !== wh.agent_id)
+    return false;
+  if (wh.task_id && payload.id !== wh.task_id)
+    return false;
+  return true;
+}
+async function deliverWebhook(wh, event, body, attempt, db) {
+  try {
+    const url = new URL(wh.url);
+    const hostname = url.hostname.toLowerCase();
+    if (hostname === "localhost" || hostname === "127.0.0.1" || hostname === "0.0.0.0" || hostname === "::1") {
+      logDelivery(db, wh.id, event, body, null, "Blocked: webhook URL points to localhost", attempt);
+      return;
+    }
+    const ipCheck = await resolveAndCheckIp(hostname);
+    if (!ipCheck.allowed) {
+      logDelivery(db, wh.id, event, body, null, `Blocked: ${ipCheck.error}`, attempt);
+      return;
+    }
+  } catch {
+    logDelivery(db, wh.id, event, body, null, `Invalid URL at delivery time: ${wh.url}`, attempt);
+    return;
+  }
+  if (activeDeliveries >= MAX_CONCURRENT_DELIVERIES) {
+    logDelivery(db, wh.id, event, body, null, "Dropped: too many concurrent deliveries", attempt);
+    return;
+  }
+  activeDeliveries++;
+  try {
+    const headers = { "Content-Type": "application/json" };
+    if (wh.secret) {
+      const encoder = new TextEncoder;
+      const key = await crypto.subtle.importKey("raw", encoder.encode(wh.secret), { name: "HMAC", hash: "SHA-256" }, false, ["sign"]);
+      const sig = await crypto.subtle.sign("HMAC", key, encoder.encode(body));
+      headers["X-Webhook-Signature"] = Array.from(new Uint8Array(sig)).map((b) => b.toString(16).padStart(2, "0")).join("");
+    }
+    const resp = await fetch(wh.url, { method: "POST", headers, body });
+    const respText = await resp.text().catch(() => "");
+    logDelivery(db, wh.id, event, body, resp.status, respText.slice(0, 1000), attempt);
+    if (resp.status >= 400 && attempt < MAX_RETRY_ATTEMPTS) {
+      const delay = RETRY_BASE_DELAY_MS * Math.pow(2, attempt - 1);
+      setTimeout(() => {
+        deliverWebhook(wh, event, body, attempt + 1, db).catch((retryErr) => {
+          console.error(`[webhook] Retry failed for webhook ${wh.id}:`, retryErr);
+        });
+      }, delay);
+    }
+  } catch (err) {
+    const errorMsg = err instanceof Error ? err.message : String(err);
+    logDelivery(db, wh.id, event, body, null, errorMsg.slice(0, 1000), attempt);
+    console.error(`[webhook] Delivery failed for webhook ${wh.id} (attempt ${attempt}):`, errorMsg);
+    if (attempt < MAX_RETRY_ATTEMPTS) {
+      const delay = RETRY_BASE_DELAY_MS * Math.pow(2, attempt - 1);
+      setTimeout(() => {
+        deliverWebhook(wh, event, body, attempt + 1, db).catch((retryErr) => {
+          console.error(`[webhook] Retry failed for webhook ${wh.id}:`, retryErr);
+        });
+      }, delay);
     }
-    throw new Error(`Invalid webhook URL: ${urlString}`);
+  } finally {
+    activeDeliveries--;
+  }
+}
+async function dispatchWebhook(event, payload, db) {
+  const d = db || getDatabase();
+  const webhooks = listWebhooks(d).filter((w) => w.active && (w.events.length === 0 || w.events.includes(event)));
+  const payloadObj = typeof payload === "object" && payload !== null ? payload : {};
+  for (const wh of webhooks) {
+    if (!matchesScope(wh, payloadObj))
+      continue;
+    const body = JSON.stringify({ event, payload, timestamp: now() });
+    deliverWebhook(wh, event, body, 1, d).catch((err) => {
+      console.error(`[webhook] Dispatch failed for webhook ${wh.id}:`, err);
+    });
+  }
+}
+
+// src/db/checklists.ts
+init_database();
+function rowToItem(row) {
+  return { ...row, checked: !!row.checked };
+}
+function getChecklist(taskId, db) {
+  const d = db || getDatabase();
+  const rows = d.query("SELECT * FROM task_checklists WHERE task_id = ? ORDER BY position, created_at").all(taskId);
+  return rows.map(rowToItem);
+}
+function addChecklistItem(input, db) {
+  const d = db || getDatabase();
+  const id = uuid();
+  const timestamp = now();
+  let position = input.position;
+  if (position === undefined) {
+    const maxRow = d.query("SELECT MAX(position) as max_pos FROM task_checklists WHERE task_id = ?").get(input.task_id);
+    position = (maxRow?.max_pos ?? -1) + 1;
   }
+  d.run("INSERT INTO task_checklists (id, task_id, position, text, checked, created_at, updated_at) VALUES (?, ?, ?, ?, 0, ?, ?)", [id, input.task_id, position, input.text, timestamp, timestamp]);
+  return rowToItem(d.query("SELECT * FROM task_checklists WHERE id = ?").get(id));
+}
+function checkChecklistItem(id, checked, db) {
+  const d = db || getDatabase();
+  const timestamp = now();
+  const result = d.run("UPDATE task_checklists SET checked = ?, updated_at = ? WHERE id = ?", [checked ? 1 : 0, timestamp, id]);
+  if (result.changes === 0)
+    return null;
+  return rowToItem(d.query("SELECT * FROM task_checklists WHERE id = ?").get(id));
+}
+function updateChecklistItemText(id, text, db) {
+  const d = db || getDatabase();
+  const timestamp = now();
+  const result = d.run("UPDATE task_checklists SET text = ?, updated_at = ? WHERE id = ?", [text, timestamp, id]);
+  if (result.changes === 0)
+    return null;
+  return rowToItem(d.query("SELECT * FROM task_checklists WHERE id = ?").get(id));
+}
+function removeChecklistItem(id, db) {
+  const d = db || getDatabase();
+  const result = d.run("DELETE FROM task_checklists WHERE id = ?", [id]);
+  return result.changes > 0;
+}
+function clearChecklist(taskId, db) {
+  const d = db || getDatabase();
+  const result = d.run("DELETE FROM task_checklists WHERE task_id = ?", [taskId]);
+  return result.changes;
+}
+function getChecklistStats(taskId, db) {
+  const d = db || getDatabase();
+  const row = d.query("SELECT COUNT(*) as total, SUM(checked) as checked FROM task_checklists WHERE task_id = ?").get(taskId);
+  return { total: row?.total ?? 0, checked: row?.checked ?? 0 };
 }
-function rowToWebhook(row) {
+
+// src/db/task-crud.ts
+function rowToTask(row) {
   return {
     ...row,
-    events: JSON.parse(row.events || "[]"),
-    active: !!row.active,
-    project_id: row.project_id || null,
-    task_list_id: row.task_list_id || null,
-    agent_id: row.agent_id || null,
-    task_id: row.task_id || null
+    tags: JSON.parse(row.tags || "[]"),
+    metadata: JSON.parse(row.metadata || "{}"),
+    status: row.status,
+    priority: row.priority,
+    requires_approval: !!row.requires_approval
   };
 }
-function createWebhook(input, db) {
-  const d = db || getDatabase();
-  validateWebhookUrl(input.url);
-  const id = uuid();
-  d.run(`INSERT INTO webhooks (id, url, events, secret, project_id, task_list_id, agent_id, task_id, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
-    id,
-    input.url,
-    JSON.stringify(input.events || []),
-    input.secret || null,
-    input.project_id || null,
-    input.task_list_id || null,
-    input.agent_id || null,
-    input.task_id || null,
-    now()
-  ]);
-  return getWebhook(id, d);
+function insertTaskTags(taskId, tags, db) {
+  if (tags.length === 0)
+    return;
+  const stmt = db.prepare("INSERT OR IGNORE INTO task_tags (task_id, tag) VALUES (?, ?)");
+  for (const tag of tags) {
+    if (tag)
+      stmt.run(taskId, tag);
+  }
 }
-function getWebhook(id, db) {
+function replaceTaskTags(taskId, tags, db) {
+  db.run("DELETE FROM task_tags WHERE task_id = ?", [taskId]);
+  insertTaskTags(taskId, tags, db);
+}
+function createTask(input, db) {
   const d = db || getDatabase();
-  const row = d.query("SELECT * FROM webhooks WHERE id = ?").get(id);
-  return row ? rowToWebhook(row) : null;
+  const timestamp = now();
+  const tags = input.tags || [];
+  const assignedBy = input.assigned_by || input.agent_id;
+  const assignedFromProject = input.assigned_from_project || null;
+  let id = uuid();
+  for (let attempt = 0;attempt < 3; attempt++) {
+    try {
+      d.run(`INSERT INTO tasks (id, short_id, project_id, parent_id, plan_id, task_list_id, title, description, status, priority, agent_id, assigned_to, session_id, working_dir, tags, metadata, version, created_at, updated_at, due_at, estimated_minutes, requires_approval, approved_by, approved_at, recurrence_rule, recurrence_parent_id, spawns_template_id, reason, spawned_from_session, assigned_by, assigned_from_project, task_type)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
+        id,
+        null,
+        input.project_id || null,
+        input.parent_id || null,
+        input.plan_id || null,
+        input.task_list_id || null,
+        input.title,
+        input.description || null,
+        input.status || "pending",
+        input.priority || "medium",
+        input.agent_id || null,
+        input.assigned_to || null,
+        input.session_id || null,
+        input.working_dir || null,
+        JSON.stringify(tags),
+        JSON.stringify(input.metadata || {}),
+        timestamp,
+        timestamp,
+        input.due_at || null,
+        input.estimated_minutes || null,
+        input.requires_approval ? 1 : 0,
+        null,
+        null,
+        input.recurrence_rule || null,
+        input.recurrence_parent_id || null,
+        input.spawns_template_id || null,
+        input.reason || null,
+        input.spawned_from_session || null,
+        assignedBy || null,
+        assignedFromProject || null,
+        input.task_type || null
+      ]);
+      break;
+    } catch (e) {
+      if (attempt < 2 && e?.message?.includes("UNIQUE constraint failed: tasks.id")) {
+        id = uuid();
+        continue;
+      }
+      throw e;
+    }
+  }
+  if (tags.length > 0) {
+    insertTaskTags(id, tags, d);
+  }
+  const task = getTask(id, d);
+  dispatchWebhook("task.created", { id: task.id, short_id: task.short_id, title: task.title, status: task.status, priority: task.priority, project_id: task.project_id, assigned_to: task.assigned_to }, d).catch(() => {});
+  return task;
 }
-function listWebhooks(db) {
+function getTask(id, db) {
   const d = db || getDatabase();
-  return d.query("SELECT * FROM webhooks ORDER BY created_at DESC").all().map(rowToWebhook);
+  const row = d.query("SELECT * FROM tasks WHERE id = ?").get(id);
+  if (!row)
+    return null;
+  return rowToTask(row);
 }
-function deleteWebhook(id, db) {
+function getTaskWithRelations(id, db) {
   const d = db || getDatabase();
-  return d.run("DELETE FROM webhooks WHERE id = ?", [id]).changes > 0;
+  const task = getTask(id, d);
+  if (!task)
+    return null;
+  const subtaskRows = d.query("SELECT * FROM tasks WHERE parent_id = ? ORDER BY created_at").all(id);
+  const subtasks = subtaskRows.map(rowToTask);
+  const depRows = d.query(`SELECT t.* FROM tasks t
+       JOIN task_dependencies td ON td.depends_on = t.id
+       WHERE td.task_id = ?`).all(id);
+  const dependencies = depRows.map(rowToTask);
+  const blockedByRows = d.query(`SELECT t.* FROM tasks t
+       JOIN task_dependencies td ON td.task_id = t.id
+       WHERE td.depends_on = ?`).all(id);
+  const blocked_by = blockedByRows.map(rowToTask);
+  const comments = d.query("SELECT * FROM task_comments WHERE task_id = ? ORDER BY created_at").all(id);
+  const parent = task.parent_id ? getTask(task.parent_id, d) : null;
+  const checklist = getChecklist(id, d);
+  return {
+    ...task,
+    subtasks,
+    dependencies,
+    blocked_by,
+    comments,
+    parent,
+    checklist
+  };
 }
-function listDeliveries(webhookId, limit = 50, db) {
+function listTasks(filter = {}, db) {
   const d = db || getDatabase();
-  if (webhookId) {
-    return d.query("SELECT * FROM webhook_deliveries WHERE webhook_id = ? ORDER BY created_at DESC LIMIT ?").all(webhookId, limit);
+  const { clearExpiredLocks: clearExpiredLocks2 } = (init_database(), __toCommonJS(exports_database));
+  clearExpiredLocks2(d);
+  const conditions = [];
+  const params = [];
+  if (filter.project_id) {
+    conditions.push("project_id = ?");
+    params.push(filter.project_id);
   }
-  return d.query("SELECT * FROM webhook_deliveries ORDER BY created_at DESC LIMIT ?").all(limit);
-}
-function logDelivery(d, webhookId, event, payload, statusCode, response, attempt) {
-  const id = uuid();
-  d.run(`INSERT INTO webhook_deliveries (id, webhook_id, event, payload, status_code, response, attempt, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`, [id, webhookId, event, payload, statusCode, response, attempt, now()]);
-}
-function matchesScope(wh, payload) {
-  if (wh.project_id && payload.project_id !== wh.project_id)
-    return false;
-  if (wh.task_list_id && payload.task_list_id !== wh.task_list_id)
-    return false;
-  if (wh.agent_id && payload.agent_id !== wh.agent_id && payload.assigned_to !== wh.agent_id)
-    return false;
-  if (wh.task_id && payload.id !== wh.task_id)
-    return false;
-  return true;
-}
-async function deliverWebhook(wh, event, body, attempt, db) {
-  try {
-    const headers = { "Content-Type": "application/json" };
-    if (wh.secret) {
-      const encoder = new TextEncoder;
-      const key = await crypto.subtle.importKey("raw", encoder.encode(wh.secret), { name: "HMAC", hash: "SHA-256" }, false, ["sign"]);
-      const sig = await crypto.subtle.sign("HMAC", key, encoder.encode(body));
-      headers["X-Webhook-Signature"] = Array.from(new Uint8Array(sig)).map((b) => b.toString(16).padStart(2, "0")).join("");
+  if (filter.ids && filter.ids.length > 0) {
+    conditions.push(`id IN (${filter.ids.map(() => "?").join(",")})`);
+    params.push(...filter.ids);
+  }
+  if (filter.parent_id !== undefined) {
+    if (filter.parent_id === null) {
+      conditions.push("parent_id IS NULL");
+    } else {
+      conditions.push("parent_id = ?");
+      params.push(filter.parent_id);
     }
-    const resp = await fetch(wh.url, { method: "POST", headers, body });
-    const respText = await resp.text().catch(() => "");
-    logDelivery(db, wh.id, event, body, resp.status, respText.slice(0, 1000), attempt);
-    if (resp.status >= 400 && attempt < MAX_RETRY_ATTEMPTS) {
-      const delay = RETRY_BASE_DELAY_MS * Math.pow(2, attempt - 1);
-      setTimeout(() => {
-        deliverWebhook(wh, event, body, attempt + 1, db).catch(() => {});
-      }, delay);
+  }
+  if (filter.status) {
+    if (Array.isArray(filter.status)) {
+      conditions.push(`status IN (${filter.status.map(() => "?").join(",")})`);
+      params.push(...filter.status);
+    } else {
+      conditions.push("status = ?");
+      params.push(filter.status);
     }
-  } catch (err) {
-    const errorMsg = err instanceof Error ? err.message : String(err);
-    logDelivery(db, wh.id, event, body, null, errorMsg.slice(0, 1000), attempt);
-    if (attempt < MAX_RETRY_ATTEMPTS) {
-      const delay = RETRY_BASE_DELAY_MS * Math.pow(2, attempt - 1);
-      setTimeout(() => {
-        deliverWebhook(wh, event, body, attempt + 1, db).catch(() => {});
-      }, delay);
+  }
+  if (filter.priority) {
+    if (Array.isArray(filter.priority)) {
+      conditions.push(`priority IN (${filter.priority.map(() => "?").join(",")})`);
+      params.push(...filter.priority);
+    } else {
+      conditions.push("priority = ?");
+      params.push(filter.priority);
+    }
+  }
+  if (filter.assigned_to) {
+    conditions.push("assigned_to = ?");
+    params.push(filter.assigned_to);
+  }
+  if (filter.agent_id) {
+    conditions.push("agent_id = ?");
+    params.push(filter.agent_id);
+  }
+  if (filter.session_id) {
+    conditions.push("session_id = ?");
+    params.push(filter.session_id);
+  }
+  if (filter.tags && filter.tags.length > 0) {
+    const placeholders = filter.tags.map(() => "?").join(",");
+    conditions.push(`id IN (SELECT task_id FROM task_tags WHERE tag IN (${placeholders}))`);
+    params.push(...filter.tags);
+  }
+  if (filter.plan_id) {
+    conditions.push("plan_id = ?");
+    params.push(filter.plan_id);
+  }
+  if (filter.task_list_id) {
+    conditions.push("task_list_id = ?");
+    params.push(filter.task_list_id);
+  }
+  if (filter.has_recurrence === true) {
+    conditions.push("recurrence_rule IS NOT NULL");
+  } else if (filter.has_recurrence === false) {
+    conditions.push("recurrence_rule IS NULL");
+  }
+  if (filter.task_type) {
+    if (Array.isArray(filter.task_type)) {
+      conditions.push(`task_type IN (${filter.task_type.map(() => "?").join(",")})`);
+      params.push(...filter.task_type);
+    } else {
+      conditions.push("task_type = ?");
+      params.push(filter.task_type);
+    }
+  }
+  const PRIORITY_RANK = `CASE priority WHEN 'critical' THEN 0 WHEN 'high' THEN 1 WHEN 'medium' THEN 2 WHEN 'low' THEN 3 END`;
+  if (filter.cursor) {
+    try {
+      const decoded = JSON.parse(Buffer.from(filter.cursor, "base64").toString("utf8"));
+      conditions.push(`(${PRIORITY_RANK} > ? OR (${PRIORITY_RANK} = ? AND created_at < ?) OR (${PRIORITY_RANK} = ? AND created_at = ? AND id > ?))`);
+      params.push(decoded.p, decoded.p, decoded.c, decoded.p, decoded.c, decoded.i);
+    } catch {}
+  }
+  if (!filter.include_archived) {
+    conditions.push("archived_at IS NULL");
+  }
+  const where = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
+  let limitClause = "";
+  if (filter.limit) {
+    limitClause = " LIMIT ?";
+    params.push(filter.limit);
+    if (!filter.cursor && filter.offset) {
+      limitClause += " OFFSET ?";
+      params.push(filter.offset);
     }
   }
+  const rows = d.query(`SELECT * FROM tasks ${where} ORDER BY ${PRIORITY_RANK}, created_at DESC${limitClause}`).all(...params);
+  return rows.map(rowToTask);
 }
-async function dispatchWebhook(event, payload, db) {
+function countTasks(filter = {}, db) {
   const d = db || getDatabase();
-  const webhooks = listWebhooks(d).filter((w) => w.active && (w.events.length === 0 || w.events.includes(event)));
-  const payloadObj = typeof payload === "object" && payload !== null ? payload : {};
-  for (const wh of webhooks) {
-    if (!matchesScope(wh, payloadObj))
-      continue;
-    const body = JSON.stringify({ event, payload, timestamp: now() });
-    deliverWebhook(wh, event, body, 1, d).catch(() => {});
+  const conditions = [];
+  const params = [];
+  if (filter.project_id) {
+    conditions.push("project_id = ?");
+    params.push(filter.project_id);
   }
-}
-
-// src/db/templates.ts
-init_database();
-function rowToTemplate(row) {
-  return {
-    ...row,
-    tags: JSON.parse(row.tags || "[]"),
-    variables: JSON.parse(row.variables || "[]"),
-    metadata: JSON.parse(row.metadata || "{}"),
-    priority: row.priority || "medium",
-    version: row.version ?? 1
-  };
-}
-function rowToTemplateTask(row) {
-  return {
-    ...row,
-    tags: JSON.parse(row.tags || "[]"),
-    depends_on_positions: JSON.parse(row.depends_on_positions || "[]"),
-    metadata: JSON.parse(row.metadata || "{}"),
-    priority: row.priority || "medium",
-    condition: row.condition ?? null,
-    include_template_id: row.include_template_id ?? null
-  };
-}
-function resolveTemplateId(id, d) {
-  return resolvePartialId(d, "task_templates", id);
-}
-function createTemplate(input, db) {
-  const d = db || getDatabase();
-  const id = uuid();
-  d.run(`INSERT INTO task_templates (id, name, title_pattern, description, priority, tags, variables, project_id, plan_id, metadata, created_at)
-     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
-    id,
-    input.name,
-    input.title_pattern,
-    input.description || null,
-    input.priority || "medium",
-    JSON.stringify(input.tags || []),
-    JSON.stringify(input.variables || []),
-    input.project_id || null,
-    input.plan_id || null,
-    JSON.stringify(input.metadata || {}),
-    now()
-  ]);
-  if (input.tasks && input.tasks.length > 0) {
-    addTemplateTasks(id, input.tasks, d);
+  if (filter.ids && filter.ids.length > 0) {
+    conditions.push(`id IN (${filter.ids.map(() => "?").join(",")})`);
+    params.push(...filter.ids);
   }
-  return getTemplate(id, d);
-}
-function getTemplate(id, db) {
-  const d = db || getDatabase();
-  const resolved = resolveTemplateId(id, d);
-  if (!resolved)
-    return null;
-  const row = d.query("SELECT * FROM task_templates WHERE id = ?").get(resolved);
-  return row ? rowToTemplate(row) : null;
-}
-function listTemplates(db) {
-  const d = db || getDatabase();
-  return d.query("SELECT * FROM task_templates ORDER BY name").all().map(rowToTemplate);
-}
-function deleteTemplate(id, db) {
-  const d = db || getDatabase();
-  const resolved = resolveTemplateId(id, d);
-  if (!resolved)
-    return false;
-  return d.run("DELETE FROM task_templates WHERE id = ?", [resolved]).changes > 0;
+  if (filter.parent_id !== undefined) {
+    if (filter.parent_id === null) {
+      conditions.push("parent_id IS NULL");
+    } else {
+      conditions.push("parent_id = ?");
+      params.push(filter.parent_id);
+    }
+  }
+  if (filter.status) {
+    if (Array.isArray(filter.status)) {
+      conditions.push(`status IN (${filter.status.map(() => "?").join(",")})`);
+      params.push(...filter.status);
+    } else {
+      conditions.push("status = ?");
+      params.push(filter.status);
+    }
+  }
+  if (filter.priority) {
+    if (Array.isArray(filter.priority)) {
+      conditions.push(`priority IN (${filter.priority.map(() => "?").join(",")})`);
+      params.push(...filter.priority);
+    } else {
+      conditions.push("priority = ?");
+      params.push(filter.priority);
+    }
+  }
+  if (filter.assigned_to) {
+    conditions.push("assigned_to = ?");
+    params.push(filter.assigned_to);
+  }
+  if (filter.agent_id) {
+    conditions.push("agent_id = ?");
+    params.push(filter.agent_id);
+  }
+  if (filter.session_id) {
+    conditions.push("session_id = ?");
+    params.push(filter.session_id);
+  }
+  if (filter.tags && filter.tags.length > 0) {
+    const placeholders = filter.tags.map(() => "?").join(",");
+    conditions.push(`id IN (SELECT task_id FROM task_tags WHERE tag IN (${placeholders}))`);
+    params.push(...filter.tags);
+  }
+  if (filter.plan_id) {
+    conditions.push("plan_id = ?");
+    params.push(filter.plan_id);
+  }
+  if (filter.task_list_id) {
+    conditions.push("task_list_id = ?");
+    params.push(filter.task_list_id);
+  }
+  if (!filter.include_archived) {
+    conditions.push("archived_at IS NULL");
+  }
+  const where = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
+  const row = d.query(`SELECT COUNT(*) as count FROM tasks ${where}`).get(...params);
+  return row.count;
 }
-function updateTemplate(id, updates, db) {
+function updateTask(id, input, db) {
   const d = db || getDatabase();
-  const resolved = resolveTemplateId(id, d);
-  if (!resolved)
-    return null;
-  const current = getTemplateWithTasks(resolved, d);
-  if (current) {
-    const snapshot = JSON.stringify({
-      name: current.name,
-      title_pattern: current.title_pattern,
-      description: current.description,
-      priority: current.priority,
-      tags: current.tags,
-      variables: current.variables,
-      project_id: current.project_id,
-      plan_id: current.plan_id,
-      metadata: current.metadata,
-      tasks: current.tasks
-    });
-    d.run(`INSERT INTO template_versions (id, template_id, version, snapshot, created_at) VALUES (?, ?, ?, ?, ?)`, [uuid(), resolved, current.version, snapshot, now()]);
-  }
-  const sets = ["version = version + 1"];
-  const values = [];
-  if (updates.name !== undefined) {
-    sets.push("name = ?");
-    values.push(updates.name);
+  const task = getTask(id, d);
+  if (!task)
+    throw new TaskNotFoundError(id);
+  if (task.version !== input.version) {
+    throw new VersionConflictError(id, input.version, task.version);
   }
-  if (updates.title_pattern !== undefined) {
-    sets.push("title_pattern = ?");
-    values.push(updates.title_pattern);
+  const sets = ["version = version + 1", "updated_at = ?"];
+  const params = [now()];
+  if (input.title !== undefined) {
+    sets.push("title = ?");
+    params.push(input.title);
   }
-  if (updates.description !== undefined) {
+  if (input.description !== undefined) {
     sets.push("description = ?");
-    values.push(updates.description);
+    params.push(input.description);
   }
-  if (updates.priority !== undefined) {
+  if (input.status !== undefined) {
+    if (input.status === "completed") {
+      checkCompletionGuard(task, task.assigned_to || task.agent_id || null, d);
+    }
+    sets.push("status = ?");
+    params.push(input.status);
+    if (input.status === "completed") {
+      sets.push("completed_at = ?");
+      params.push(now());
+    }
+  }
+  if (input.priority !== undefined) {
     sets.push("priority = ?");
-    values.push(updates.priority);
+    params.push(input.priority);
   }
-  if (updates.tags !== undefined) {
+  if (input.assigned_to !== undefined) {
+    sets.push("assigned_to = ?");
+    params.push(input.assigned_to);
+  }
+  if (input.tags !== undefined) {
     sets.push("tags = ?");
-    values.push(JSON.stringify(updates.tags));
+    params.push(JSON.stringify(input.tags));
+  }
+  if (input.metadata !== undefined) {
+    sets.push("metadata = ?");
+    params.push(JSON.stringify(input.metadata));
+  }
+  if (input.plan_id !== undefined) {
+    sets.push("plan_id = ?");
+    params.push(input.plan_id);
+  }
+  if (input.task_list_id !== undefined) {
+    sets.push("task_list_id = ?");
+    params.push(input.task_list_id);
+  }
+  if (input.due_at !== undefined) {
+    sets.push("due_at = ?");
+    params.push(input.due_at);
+  }
+  if (input.estimated_minutes !== undefined) {
+    sets.push("estimated_minutes = ?");
+    params.push(input.estimated_minutes);
+  }
+  if (input.requires_approval !== undefined) {
+    sets.push("requires_approval = ?");
+    params.push(input.requires_approval ? 1 : 0);
+  }
+  if (input.approved_by !== undefined) {
+    sets.push("approved_by = ?");
+    params.push(input.approved_by);
+    sets.push("approved_at = ?");
+    params.push(now());
+  }
+  if (input.recurrence_rule !== undefined) {
+    sets.push("recurrence_rule = ?");
+    params.push(input.recurrence_rule);
+  }
+  if (input.task_type !== undefined) {
+    sets.push("task_type = ?");
+    params.push(input.task_type ?? null);
   }
-  if (updates.variables !== undefined) {
-    sets.push("variables = ?");
-    values.push(JSON.stringify(updates.variables));
+  params.push(id, input.version);
+  const result = d.run(`UPDATE tasks SET ${sets.join(", ")} WHERE id = ? AND version = ?`, params);
+  if (result.changes === 0) {
+    const current = getTask(id, d);
+    throw new VersionConflictError(id, input.version, current?.version ?? -1);
   }
-  if (updates.project_id !== undefined) {
-    sets.push("project_id = ?");
-    values.push(updates.project_id);
+  if (input.tags !== undefined) {
+    replaceTaskTags(id, input.tags, d);
   }
-  if (updates.plan_id !== undefined) {
-    sets.push("plan_id = ?");
-    values.push(updates.plan_id);
+  const agentId = task.assigned_to || task.agent_id || null;
+  if (input.status !== undefined && input.status !== task.status)
+    logTaskChange(id, "update", "status", task.status, input.status, agentId, d);
+  if (input.priority !== undefined && input.priority !== task.priority)
+    logTaskChange(id, "update", "priority", task.priority, input.priority, agentId, d);
+  if (input.title !== undefined && input.title !== task.title)
+    logTaskChange(id, "update", "title", task.title, input.title, agentId, d);
+  if (input.assigned_to !== undefined && input.assigned_to !== task.assigned_to)
+    logTaskChange(id, "update", "assigned_to", task.assigned_to, input.assigned_to, agentId, d);
+  if (input.approved_by !== undefined)
+    logTaskChange(id, "approve", "approved_by", null, input.approved_by, agentId, d);
+  if (input.assigned_to !== undefined && input.assigned_to !== task.assigned_to) {
+    dispatchWebhook("task.assigned", { id, assigned_to: input.assigned_to, title: task.title }, d).catch(() => {});
   }
-  if (updates.metadata !== undefined) {
-    sets.push("metadata = ?");
-    values.push(JSON.stringify(updates.metadata));
+  if (input.status !== undefined && input.status !== task.status) {
+    dispatchWebhook("task.status_changed", { id, old_status: task.status, new_status: input.status, title: task.title }, d).catch(() => {});
   }
-  values.push(resolved);
-  d.run(`UPDATE task_templates SET ${sets.join(", ")} WHERE id = ?`, values);
-  return getTemplate(resolved, d);
-}
-function taskFromTemplate(templateId, overrides = {}, db) {
-  const t = getTemplate(templateId, db);
-  if (!t)
-    throw new Error(`Template not found: ${templateId}`);
-  const cleanOverrides = Object.fromEntries(Object.entries(overrides).filter(([, v]) => v !== undefined));
   return {
-    title: cleanOverrides.title || t.title_pattern,
-    description: cleanOverrides.description ?? t.description ?? undefined,
-    priority: cleanOverrides.priority ?? t.priority,
-    tags: cleanOverrides.tags ?? t.tags,
-    project_id: cleanOverrides.project_id ?? t.project_id ?? undefined,
-    plan_id: cleanOverrides.plan_id ?? t.plan_id ?? undefined,
-    metadata: cleanOverrides.metadata ?? t.metadata,
-    ...cleanOverrides
+    ...task,
+    ...Object.fromEntries(Object.entries(input).filter(([, v]) => v !== undefined)),
+    tags: input.tags ?? task.tags,
+    metadata: input.metadata ?? task.metadata,
+    version: task.version + 1,
+    updated_at: now(),
+    completed_at: input.status === "completed" ? now() : task.completed_at,
+    requires_approval: input.requires_approval !== undefined ? input.requires_approval : task.requires_approval,
+    approved_by: input.approved_by ?? task.approved_by,
+    approved_at: input.approved_by ? now() : task.approved_at
   };
 }
-function addTemplateTasks(templateId, tasks, db) {
-  const d = db || getDatabase();
-  const template = getTemplate(templateId, d);
-  if (!template)
-    throw new Error(`Template not found: ${templateId}`);
-  d.run("DELETE FROM template_tasks WHERE template_id = ?", [templateId]);
-  const results = [];
-  for (let i = 0;i < tasks.length; i++) {
-    const task = tasks[i];
-    const id = uuid();
-    d.run(`INSERT INTO template_tasks (id, template_id, position, title_pattern, description, priority, tags, task_type, condition, include_template_id, depends_on_positions, metadata, created_at)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
-      id,
-      templateId,
-      i,
-      task.title_pattern,
-      task.description || null,
-      task.priority || "medium",
-      JSON.stringify(task.tags || []),
-      task.task_type || null,
-      task.condition || null,
-      task.include_template_id || null,
-      JSON.stringify(task.depends_on || []),
-      JSON.stringify(task.metadata || {}),
-      now()
-    ]);
-    const row = d.query("SELECT * FROM template_tasks WHERE id = ?").get(id);
-    if (row)
-      results.push(rowToTemplateTask(row));
-  }
-  return results;
-}
-function getTemplateWithTasks(id, db) {
+function deleteTask(id, db) {
   const d = db || getDatabase();
-  const template = getTemplate(id, d);
-  if (!template)
-    return null;
-  const rows = d.query("SELECT * FROM template_tasks WHERE template_id = ? ORDER BY position").all(template.id);
-  const tasks = rows.map(rowToTemplateTask);
-  return { ...template, tasks };
+  const result = d.run("DELETE FROM tasks WHERE id = ?", [id]);
+  return result.changes > 0;
 }
-function getTemplateTasks(templateId, db) {
-  const d = db || getDatabase();
-  const resolved = resolveTemplateId(templateId, d);
-  if (!resolved)
-    return [];
-  const rows = d.query("SELECT * FROM template_tasks WHERE template_id = ? ORDER BY position").all(resolved);
-  return rows.map(rowToTemplateTask);
+// src/db/task-lifecycle.ts
+init_types();
+init_database();
+
+// src/lib/recurrence.ts
+var DAY_NAMES = {
+  sunday: 0,
+  sun: 0,
+  monday: 1,
+  mon: 1,
+  tuesday: 2,
+  tue: 2,
+  wednesday: 3,
+  wed: 3,
+  thursday: 4,
+  thu: 4,
+  friday: 5,
+  fri: 5,
+  saturday: 6,
+  sat: 6
+};
+function parseRecurrenceRule(rule) {
+  const normalized = rule.trim().toLowerCase();
+  if (normalized === "every weekday" || normalized === "every weekdays") {
+    return { type: "specific_days", days: [1, 2, 3, 4, 5] };
+  }
+  if (normalized === "every day" || normalized === "daily") {
+    return { type: "interval", interval: 1, unit: "day" };
+  }
+  if (normalized === "every week" || normalized === "weekly") {
+    return { type: "interval", interval: 1, unit: "week" };
+  }
+  if (normalized === "every month" || normalized === "monthly") {
+    return { type: "interval", interval: 1, unit: "month" };
+  }
+  const intervalMatch = normalized.match(/^every\s+(\d+)\s+(day|week|month)s?$/);
+  if (intervalMatch) {
+    return {
+      type: "interval",
+      interval: parseInt(intervalMatch[1], 10),
+      unit: intervalMatch[2]
+    };
+  }
+  const daysMatch = normalized.match(/^every\s+(.+)$/);
+  if (daysMatch) {
+    const dayParts = daysMatch[1].split(/[,\s]+/).map((d) => d.trim()).filter(Boolean);
+    const days = [];
+    for (const part of dayParts) {
+      const dayNum = DAY_NAMES[part];
+      if (dayNum !== undefined) {
+        days.push(dayNum);
+      }
+    }
+    if (days.length > 0) {
+      return { type: "specific_days", days: days.sort((a, b) => a - b) };
+    }
+  }
+  throw new Error(`Invalid recurrence rule: "${rule}". Supported formats: "every day", "every weekday", "every week", "every 2 weeks", "every month", "every N days/weeks/months", "every monday", "every mon,wed,fri"`);
 }
-function evaluateCondition(condition, variables) {
-  if (!condition || condition.trim() === "")
+function isValidRecurrenceRule(rule) {
+  try {
+    parseRecurrenceRule(rule);
     return true;
-  const trimmed = condition.trim();
-  const eqMatch = trimmed.match(/^\{([^}]+)\}\s*==\s*(.+)$/);
-  if (eqMatch) {
-    const varName = eqMatch[1];
-    const expected = eqMatch[2].trim();
-    return (variables[varName] ?? "") === expected;
-  }
-  const neqMatch = trimmed.match(/^\{([^}]+)\}\s*!=\s*(.+)$/);
-  if (neqMatch) {
-    const varName = neqMatch[1];
-    const expected = neqMatch[2].trim();
-    return (variables[varName] ?? "") !== expected;
+  } catch {
+    return false;
   }
-  const falsyMatch = trimmed.match(/^!\{([^}]+)\}$/);
-  if (falsyMatch) {
-    const varName = falsyMatch[1];
-    const val = variables[varName];
-    return !val || val === "" || val === "false";
+}
+function nextOccurrence(rule, from) {
+  const parsed = parseRecurrenceRule(rule);
+  const base = from || new Date;
+  if (parsed.type === "interval") {
+    const next = new Date(base);
+    if (parsed.unit === "day") {
+      next.setDate(next.getDate() + parsed.interval);
+    } else if (parsed.unit === "week") {
+      next.setDate(next.getDate() + parsed.interval * 7);
+    } else if (parsed.unit === "month") {
+      next.setMonth(next.getMonth() + parsed.interval);
+    }
+    return next.toISOString();
   }
-  const truthyMatch = trimmed.match(/^\{([^}]+)\}$/);
-  if (truthyMatch) {
-    const varName = truthyMatch[1];
-    const val = variables[varName];
-    return !!val && val !== "" && val !== "false";
+  if (parsed.type === "specific_days") {
+    const currentDay = base.getDay();
+    const days = parsed.days;
+    let daysToAdd = Infinity;
+    for (const day of days) {
+      let diff = day - currentDay;
+      if (diff <= 0)
+        diff += 7;
+      if (diff < daysToAdd)
+        daysToAdd = diff;
+    }
+    const next = new Date(base);
+    next.setDate(next.getDate() + daysToAdd);
+    return next.toISOString();
   }
-  return true;
+  throw new Error(`Cannot calculate next occurrence for rule: "${rule}"`);
 }
-function exportTemplate(id, db) {
-  const d = db || getDatabase();
-  const template = getTemplateWithTasks(id, d);
-  if (!template)
-    throw new Error(`Template not found: ${id}`);
-  return {
-    name: template.name,
-    title_pattern: template.title_pattern,
-    description: template.description,
-    priority: template.priority,
-    tags: template.tags,
-    variables: template.variables,
-    project_id: template.project_id,
-    plan_id: template.plan_id,
-    metadata: template.metadata,
-    tasks: template.tasks.map((t) => ({
-      position: t.position,
-      title_pattern: t.title_pattern,
-      description: t.description,
-      priority: t.priority,
-      tags: t.tags,
-      task_type: t.task_type,
-      condition: t.condition,
-      include_template_id: t.include_template_id,
-      depends_on_positions: t.depends_on_positions,
-      metadata: t.metadata
-    }))
+
+// src/db/templates.ts
+init_database();
+function rowToTemplate(row) {
+  return {
+    ...row,
+    tags: JSON.parse(row.tags || "[]"),
+    variables: JSON.parse(row.variables || "[]"),
+    metadata: JSON.parse(row.metadata || "{}"),
+    priority: row.priority || "medium",
+    version: row.version ?? 1
   };
 }
-function importTemplate(json, db) {
+function rowToTemplateTask(row) {
+  return {
+    ...row,
+    tags: JSON.parse(row.tags || "[]"),
+    depends_on_positions: JSON.parse(row.depends_on_positions || "[]"),
+    metadata: JSON.parse(row.metadata || "{}"),
+    priority: row.priority || "medium",
+    condition: row.condition ?? null,
+    include_template_id: row.include_template_id ?? null
+  };
+}
+function resolveTemplateId(id, d) {
+  return resolvePartialId(d, "task_templates", id);
+}
+function createTemplate(input, db) {
   const d = db || getDatabase();
-  const taskInputs = (json.tasks || []).map((t) => ({
-    title_pattern: t.title_pattern,
-    description: t.description ?? undefined,
-    priority: t.priority,
-    tags: t.tags,
-    task_type: t.task_type ?? undefined,
-    condition: t.condition ?? undefined,
-    include_template_id: t.include_template_id ?? undefined,
-    depends_on: t.depends_on_positions,
-    metadata: t.metadata
-  }));
-  return createTemplate({
-    name: json.name,
-    title_pattern: json.title_pattern,
-    description: json.description ?? undefined,
-    priority: json.priority,
-    tags: json.tags,
-    variables: json.variables,
-    project_id: json.project_id ?? undefined,
-    plan_id: json.plan_id ?? undefined,
-    metadata: json.metadata,
-    tasks: taskInputs
-  }, d);
+  const id = uuid();
+  d.run(`INSERT INTO task_templates (id, name, title_pattern, description, priority, tags, variables, project_id, plan_id, metadata, created_at)
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
+    id,
+    input.name,
+    input.title_pattern,
+    input.description || null,
+    input.priority || "medium",
+    JSON.stringify(input.tags || []),
+    JSON.stringify(input.variables || []),
+    input.project_id || null,
+    input.plan_id || null,
+    JSON.stringify(input.metadata || {}),
+    now()
+  ]);
+  if (input.tasks && input.tasks.length > 0) {
+    addTemplateTasks(id, input.tasks, d);
+  }
+  return getTemplate(id, d);
 }
-function getTemplateVersion(id, version, db) {
+function getTemplate(id, db) {
   const d = db || getDatabase();
   const resolved = resolveTemplateId(id, d);
   if (!resolved)
     return null;
-  const row = d.query("SELECT * FROM template_versions WHERE template_id = ? AND version = ?").get(resolved, version);
-  return row || null;
+  const row = d.query("SELECT * FROM task_templates WHERE id = ?").get(resolved);
+  return row ? rowToTemplate(row) : null;
 }
-function listTemplateVersions(id, db) {
+function listTemplates(db) {
+  const d = db || getDatabase();
+  return d.query("SELECT * FROM task_templates ORDER BY name").all().map(rowToTemplate);
+}
+function deleteTemplate(id, db) {
   const d = db || getDatabase();
   const resolved = resolveTemplateId(id, d);
   if (!resolved)
-    return [];
-  return d.query("SELECT * FROM template_versions WHERE template_id = ? ORDER BY version DESC").all(resolved);
+    return false;
+  return d.run("DELETE FROM task_templates WHERE id = ?", [resolved]).changes > 0;
 }
-function resolveVariables(templateVars, provided) {
-  const merged = { ...provided };
-  for (const v of templateVars) {
-    if (merged[v.name] === undefined && v.default !== undefined) {
-      merged[v.name] = v.default;
-    }
+function updateTemplate(id, updates, db) {
+  const d = db || getDatabase();
+  const resolved = resolveTemplateId(id, d);
+  if (!resolved)
+    return null;
+  const current = getTemplateWithTasks(resolved, d);
+  if (current) {
+    const snapshot = JSON.stringify({
+      name: current.name,
+      title_pattern: current.title_pattern,
+      description: current.description,
+      priority: current.priority,
+      tags: current.tags,
+      variables: current.variables,
+      project_id: current.project_id,
+      plan_id: current.plan_id,
+      metadata: current.metadata,
+      tasks: current.tasks
+    });
+    d.run(`INSERT INTO template_versions (id, template_id, version, snapshot, created_at) VALUES (?, ?, ?, ?, ?)`, [uuid(), resolved, current.version, snapshot, now()]);
   }
-  const missing = [];
-  for (const v of templateVars) {
-    if (v.required && merged[v.name] === undefined) {
-      missing.push(v.name);
-    }
+  const sets = ["version = version + 1"];
+  const values = [];
+  if (updates.name !== undefined) {
+    sets.push("name = ?");
+    values.push(updates.name);
   }
-  if (missing.length > 0) {
-    throw new Error(`Missing required template variable(s): ${missing.join(", ")}`);
+  if (updates.title_pattern !== undefined) {
+    sets.push("title_pattern = ?");
+    values.push(updates.title_pattern);
   }
-  return merged;
-}
-function substituteVars(text, variables) {
-  let result = text;
-  for (const [key, val] of Object.entries(variables)) {
-    result = result.replace(new RegExp(`\\{${key}\\}`, "g"), val);
+  if (updates.description !== undefined) {
+    sets.push("description = ?");
+    values.push(updates.description);
   }
-  return result;
-}
-function tasksFromTemplate(templateId, projectId, variables, taskListId, db, _visitedTemplateIds) {
-  const d = db || getDatabase();
-  const template = getTemplateWithTasks(templateId, d);
-  if (!template)
-    throw new Error(`Template not found: ${templateId}`);
-  const visited = _visitedTemplateIds || new Set;
-  if (visited.has(template.id)) {
-    throw new Error(`Circular template reference detected: ${template.id}`);
+  if (updates.priority !== undefined) {
+    sets.push("priority = ?");
+    values.push(updates.priority);
   }
-  visited.add(template.id);
-  const resolved = resolveVariables(template.variables, variables);
-  if (template.tasks.length === 0) {
-    const input = taskFromTemplate(templateId, { project_id: projectId, task_list_id: taskListId }, d);
-    const task = createTask(input, d);
-    return [task];
+  if (updates.tags !== undefined) {
+    sets.push("tags = ?");
+    values.push(JSON.stringify(updates.tags));
   }
-  const createdTasks = [];
-  const positionToId = new Map;
-  const skippedPositions = new Set;
-  for (const tt of template.tasks) {
-    if (tt.include_template_id) {
-      const includedTasks = tasksFromTemplate(tt.include_template_id, projectId, resolved, taskListId, d, visited);
-      createdTasks.push(...includedTasks);
-      if (includedTasks.length > 0) {
-        positionToId.set(tt.position, includedTasks[0].id);
-      } else {
-        skippedPositions.add(tt.position);
-      }
-      continue;
-    }
-    if (tt.condition && !evaluateCondition(tt.condition, resolved)) {
-      skippedPositions.add(tt.position);
-      continue;
-    }
-    let title = tt.title_pattern;
-    let desc = tt.description;
-    title = substituteVars(title, resolved);
-    if (desc)
-      desc = substituteVars(desc, resolved);
-    const task = createTask({
-      title,
-      description: desc ?? undefined,
-      priority: tt.priority,
-      tags: tt.tags,
-      task_type: tt.task_type ?? undefined,
-      project_id: projectId,
-      task_list_id: taskListId,
-      metadata: tt.metadata
-    }, d);
-    createdTasks.push(task);
-    positionToId.set(tt.position, task.id);
+  if (updates.variables !== undefined) {
+    sets.push("variables = ?");
+    values.push(JSON.stringify(updates.variables));
   }
-  for (const tt of template.tasks) {
-    if (skippedPositions.has(tt.position))
-      continue;
-    if (tt.include_template_id)
-      continue;
-    const deps = tt.depends_on_positions;
-    for (const depPos of deps) {
-      if (skippedPositions.has(depPos))
-        continue;
-      const taskId = positionToId.get(tt.position);
-      const depId = positionToId.get(depPos);
-      if (taskId && depId) {
-        addDependency(taskId, depId, d);
-      }
-    }
+  if (updates.project_id !== undefined) {
+    sets.push("project_id = ?");
+    values.push(updates.project_id);
   }
-  return createdTasks;
-}
-function previewTemplate(templateId, variables, db) {
-  const d = db || getDatabase();
-  const template = getTemplateWithTasks(templateId, d);
-  if (!template)
-    throw new Error(`Template not found: ${templateId}`);
-  const resolved = resolveVariables(template.variables, variables);
-  const tasks = [];
-  if (template.tasks.length === 0) {
-    tasks.push({
-      position: 0,
-      title: substituteVars(template.title_pattern, resolved),
-      description: template.description ? substituteVars(template.description, resolved) : null,
-      priority: template.priority,
-      tags: template.tags,
-      task_type: null,
-      depends_on_positions: []
-    });
-  } else {
-    for (const tt of template.tasks) {
-      if (tt.condition && !evaluateCondition(tt.condition, resolved))
-        continue;
-      tasks.push({
-        position: tt.position,
-        title: substituteVars(tt.title_pattern, resolved),
-        description: tt.description ? substituteVars(tt.description, resolved) : null,
-        priority: tt.priority,
-        tags: tt.tags,
-        task_type: tt.task_type,
-        depends_on_positions: tt.depends_on_positions
-      });
-    }
+  if (updates.plan_id !== undefined) {
+    sets.push("plan_id = ?");
+    values.push(updates.plan_id);
   }
+  if (updates.metadata !== undefined) {
+    sets.push("metadata = ?");
+    values.push(JSON.stringify(updates.metadata));
+  }
+  values.push(resolved);
+  d.run(`UPDATE task_templates SET ${sets.join(", ")} WHERE id = ?`, values);
+  return getTemplate(resolved, d);
+}
+function taskFromTemplate(templateId, overrides = {}, db) {
+  const t = getTemplate(templateId, db);
+  if (!t)
+    throw new Error(`Template not found: ${templateId}`);
+  const cleanOverrides = Object.fromEntries(Object.entries(overrides).filter(([, v]) => v !== undefined));
   return {
-    template_id: template.id,
-    template_name: template.name,
-    description: template.description,
-    variables: template.variables,
-    resolved_variables: resolved,
-    tasks
+    title: cleanOverrides.title || t.title_pattern,
+    description: cleanOverrides.description ?? t.description ?? undefined,
+    priority: cleanOverrides.priority ?? t.priority,
+    tags: cleanOverrides.tags ?? t.tags,
+    project_id: cleanOverrides.project_id ?? t.project_id ?? undefined,
+    plan_id: cleanOverrides.plan_id ?? t.plan_id ?? undefined,
+    metadata: cleanOverrides.metadata ?? t.metadata,
+    ...cleanOverrides
   };
 }
-
-// src/db/checklists.ts
-init_database();
-function rowToItem(row) {
-  return { ...row, checked: !!row.checked };
-}
-function getChecklist(taskId, db) {
-  const d = db || getDatabase();
-  const rows = d.query("SELECT * FROM task_checklists WHERE task_id = ? ORDER BY position, created_at").all(taskId);
-  return rows.map(rowToItem);
-}
-function addChecklistItem(input, db) {
+function addTemplateTasks(templateId, tasks, db) {
   const d = db || getDatabase();
-  const id = uuid();
-  const timestamp = now();
-  let position = input.position;
-  if (position === undefined) {
-    const maxRow = d.query("SELECT MAX(position) as max_pos FROM task_checklists WHERE task_id = ?").get(input.task_id);
-    position = (maxRow?.max_pos ?? -1) + 1;
+  const template = getTemplate(templateId, d);
+  if (!template)
+    throw new Error(`Template not found: ${templateId}`);
+  d.run("DELETE FROM template_tasks WHERE template_id = ?", [templateId]);
+  const results = [];
+  for (let i = 0;i < tasks.length; i++) {
+    const task = tasks[i];
+    const id = uuid();
+    d.run(`INSERT INTO template_tasks (id, template_id, position, title_pattern, description, priority, tags, task_type, condition, include_template_id, depends_on_positions, metadata, created_at)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
+      id,
+      templateId,
+      i,
+      task.title_pattern,
+      task.description || null,
+      task.priority || "medium",
+      JSON.stringify(task.tags || []),
+      task.task_type || null,
+      task.condition || null,
+      task.include_template_id || null,
+      JSON.stringify(task.depends_on || []),
+      JSON.stringify(task.metadata || {}),
+      now()
+    ]);
+    const row = d.query("SELECT * FROM template_tasks WHERE id = ?").get(id);
+    if (row)
+      results.push(rowToTemplateTask(row));
   }
-  d.run("INSERT INTO task_checklists (id, task_id, position, text, checked, created_at, updated_at) VALUES (?, ?, ?, ?, 0, ?, ?)", [id, input.task_id, position, input.text, timestamp, timestamp]);
-  return rowToItem(d.query("SELECT * FROM task_checklists WHERE id = ?").get(id));
-}
-function checkChecklistItem(id, checked, db) {
-  const d = db || getDatabase();
-  const timestamp = now();
-  const result = d.run("UPDATE task_checklists SET checked = ?, updated_at = ? WHERE id = ?", [checked ? 1 : 0, timestamp, id]);
-  if (result.changes === 0)
-    return null;
-  return rowToItem(d.query("SELECT * FROM task_checklists WHERE id = ?").get(id));
+  return results;
 }
-function updateChecklistItemText(id, text, db) {
+function getTemplateWithTasks(id, db) {
   const d = db || getDatabase();
-  const timestamp = now();
-  const result = d.run("UPDATE task_checklists SET text = ?, updated_at = ? WHERE id = ?", [text, timestamp, id]);
-  if (result.changes === 0)
+  const template = getTemplate(id, d);
+  if (!template)
     return null;
-  return rowToItem(d.query("SELECT * FROM task_checklists WHERE id = ?").get(id));
+  const rows = d.query("SELECT * FROM template_tasks WHERE template_id = ? ORDER BY position").all(template.id);
+  const tasks = rows.map(rowToTemplateTask);
+  return { ...template, tasks };
 }
-function removeChecklistItem(id, db) {
+function getTemplateTasks(templateId, db) {
   const d = db || getDatabase();
-  const result = d.run("DELETE FROM task_checklists WHERE id = ?", [id]);
-  return result.changes > 0;
+  const resolved = resolveTemplateId(templateId, d);
+  if (!resolved)
+    return [];
+  const rows = d.query("SELECT * FROM template_tasks WHERE template_id = ? ORDER BY position").all(resolved);
+  return rows.map(rowToTemplateTask);
 }
-function clearChecklist(taskId, db) {
-  const d = db || getDatabase();
-  const result = d.run("DELETE FROM task_checklists WHERE task_id = ?", [taskId]);
-  return result.changes;
+function evaluateCondition(condition, variables) {
+  if (!condition || condition.trim() === "")
+    return true;
+  const trimmed = condition.trim();
+  const eqMatch = trimmed.match(/^\{([^}]+)\}\s*==\s*(.+)$/);
+  if (eqMatch) {
+    const varName = eqMatch[1];
+    const expected = eqMatch[2].trim();
+    return (variables[varName] ?? "") === expected;
+  }
+  const neqMatch = trimmed.match(/^\{([^}]+)\}\s*!=\s*(.+)$/);
+  if (neqMatch) {
+    const varName = neqMatch[1];
+    const expected = neqMatch[2].trim();
+    return (variables[varName] ?? "") !== expected;
+  }
+  const falsyMatch = trimmed.match(/^!\{([^}]+)\}$/);
+  if (falsyMatch) {
+    const varName = falsyMatch[1];
+    const val = variables[varName];
+    return !val || val === "" || val === "false";
+  }
+  const truthyMatch = trimmed.match(/^\{([^}]+)\}$/);
+  if (truthyMatch) {
+    const varName = truthyMatch[1];
+    const val = variables[varName];
+    return !!val && val !== "" && val !== "false";
+  }
+  return true;
 }
-function getChecklistStats(taskId, db) {
+function exportTemplate(id, db) {
   const d = db || getDatabase();
-  const row = d.query("SELECT COUNT(*) as total, SUM(checked) as checked FROM task_checklists WHERE task_id = ?").get(taskId);
-  return { total: row?.total ?? 0, checked: row?.checked ?? 0 };
-}
-
-// src/db/tasks.ts
-function rowToTask(row) {
+  const template = getTemplateWithTasks(id, d);
+  if (!template)
+    throw new Error(`Template not found: ${id}`);
   return {
-    ...row,
-    tags: JSON.parse(row.tags || "[]"),
-    metadata: JSON.parse(row.metadata || "{}"),
-    status: row.status,
-    priority: row.priority,
-    requires_approval: !!row.requires_approval
+    name: template.name,
+    title_pattern: template.title_pattern,
+    description: template.description,
+    priority: template.priority,
+    tags: template.tags,
+    variables: template.variables,
+    project_id: template.project_id,
+    plan_id: template.plan_id,
+    metadata: template.metadata,
+    tasks: template.tasks.map((t) => ({
+      position: t.position,
+      title_pattern: t.title_pattern,
+      description: t.description,
+      priority: t.priority,
+      tags: t.tags,
+      task_type: t.task_type,
+      condition: t.condition,
+      include_template_id: t.include_template_id,
+      depends_on_positions: t.depends_on_positions,
+      metadata: t.metadata
+    }))
   };
 }
-function insertTaskTags(taskId, tags, db) {
-  if (tags.length === 0)
-    return;
-  const stmt = db.prepare("INSERT OR IGNORE INTO task_tags (task_id, tag) VALUES (?, ?)");
-  for (const tag of tags) {
-    if (tag)
-      stmt.run(taskId, tag);
-  }
-}
-function replaceTaskTags(taskId, tags, db) {
-  db.run("DELETE FROM task_tags WHERE task_id = ?", [taskId]);
-  insertTaskTags(taskId, tags, db);
-}
-function createTask(input, db) {
+function importTemplate(json, db) {
   const d = db || getDatabase();
-  const timestamp = now();
-  const tags = input.tags || [];
-  const assignedBy = input.assigned_by || input.agent_id;
-  const assignedFromProject = input.assigned_from_project || null;
-  let id = uuid();
-  for (let attempt = 0;attempt < 3; attempt++) {
-    try {
-      d.run(`INSERT INTO tasks (id, short_id, project_id, parent_id, plan_id, task_list_id, title, description, status, priority, agent_id, assigned_to, session_id, working_dir, tags, metadata, version, created_at, updated_at, due_at, estimated_minutes, requires_approval, approved_by, approved_at, recurrence_rule, recurrence_parent_id, spawns_template_id, reason, spawned_from_session, assigned_by, assigned_from_project, task_type)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
-        id,
-        null,
-        input.project_id || null,
-        input.parent_id || null,
-        input.plan_id || null,
-        input.task_list_id || null,
-        input.title,
-        input.description || null,
-        input.status || "pending",
-        input.priority || "medium",
-        input.agent_id || null,
-        input.assigned_to || null,
-        input.session_id || null,
-        input.working_dir || null,
-        JSON.stringify(tags),
-        JSON.stringify(input.metadata || {}),
-        timestamp,
-        timestamp,
-        input.due_at || null,
-        input.estimated_minutes || null,
-        input.requires_approval ? 1 : 0,
-        null,
-        null,
-        input.recurrence_rule || null,
-        input.recurrence_parent_id || null,
-        input.spawns_template_id || null,
-        input.reason || null,
-        input.spawned_from_session || null,
-        assignedBy || null,
-        assignedFromProject || null,
-        input.task_type || null
-      ]);
-      break;
-    } catch (e) {
-      if (attempt < 2 && e?.message?.includes("UNIQUE constraint failed: tasks.id")) {
-        id = uuid();
-        continue;
-      }
-      throw e;
-    }
-  }
-  if (tags.length > 0) {
-    insertTaskTags(id, tags, d);
-  }
-  const task = getTask(id, d);
-  dispatchWebhook("task.created", { id: task.id, short_id: task.short_id, title: task.title, status: task.status, priority: task.priority, project_id: task.project_id, assigned_to: task.assigned_to }, d).catch(() => {});
-  return task;
+  const taskInputs = (json.tasks || []).map((t) => ({
+    title_pattern: t.title_pattern,
+    description: t.description ?? undefined,
+    priority: t.priority,
+    tags: t.tags,
+    task_type: t.task_type ?? undefined,
+    condition: t.condition ?? undefined,
+    include_template_id: t.include_template_id ?? undefined,
+    depends_on: t.depends_on_positions,
+    metadata: t.metadata
+  }));
+  return createTemplate({
+    name: json.name,
+    title_pattern: json.title_pattern,
+    description: json.description ?? undefined,
+    priority: json.priority,
+    tags: json.tags,
+    variables: json.variables,
+    project_id: json.project_id ?? undefined,
+    plan_id: json.plan_id ?? undefined,
+    metadata: json.metadata,
+    tasks: taskInputs
+  }, d);
 }
-function getTask(id, db) {
+function getTemplateVersion(id, version, db) {
   const d = db || getDatabase();
-  const row = d.query("SELECT * FROM tasks WHERE id = ?").get(id);
-  if (!row)
+  const resolved = resolveTemplateId(id, d);
+  if (!resolved)
     return null;
-  return rowToTask(row);
+  const row = d.query("SELECT * FROM template_versions WHERE template_id = ? AND version = ?").get(resolved, version);
+  return row || null;
 }
-function getTaskWithRelations(id, db) {
+function listTemplateVersions(id, db) {
   const d = db || getDatabase();
-  const task = getTask(id, d);
-  if (!task)
-    return null;
-  const subtaskRows = d.query("SELECT * FROM tasks WHERE parent_id = ? ORDER BY created_at").all(id);
-  const subtasks = subtaskRows.map(rowToTask);
-  const depRows = d.query(`SELECT t.* FROM tasks t
-       JOIN task_dependencies td ON td.depends_on = t.id
-       WHERE td.task_id = ?`).all(id);
-  const dependencies = depRows.map(rowToTask);
-  const blockedByRows = d.query(`SELECT t.* FROM tasks t
-       JOIN task_dependencies td ON td.task_id = t.id
-       WHERE td.depends_on = ?`).all(id);
-  const blocked_by = blockedByRows.map(rowToTask);
-  const comments = d.query("SELECT * FROM task_comments WHERE task_id = ? ORDER BY created_at").all(id);
-  const parent = task.parent_id ? getTask(task.parent_id, d) : null;
-  const checklist = getChecklist(id, d);
-  return {
-    ...task,
-    subtasks,
-    dependencies,
-    blocked_by,
-    comments,
-    parent,
-    checklist
-  };
+  const resolved = resolveTemplateId(id, d);
+  if (!resolved)
+    return [];
+  return d.query("SELECT * FROM template_versions WHERE template_id = ? ORDER BY version DESC").all(resolved);
 }
-function listTasks(filter = {}, db) {
-  const d = db || getDatabase();
-  clearExpiredLocks(d);
-  const conditions = [];
-  const params = [];
-  if (filter.project_id) {
-    conditions.push("project_id = ?");
-    params.push(filter.project_id);
-  }
-  if (filter.parent_id !== undefined) {
-    if (filter.parent_id === null) {
-      conditions.push("parent_id IS NULL");
-    } else {
-      conditions.push("parent_id = ?");
-      params.push(filter.parent_id);
-    }
-  }
-  if (filter.status) {
-    if (Array.isArray(filter.status)) {
-      conditions.push(`status IN (${filter.status.map(() => "?").join(",")})`);
-      params.push(...filter.status);
-    } else {
-      conditions.push("status = ?");
-      params.push(filter.status);
+function resolveVariables(templateVars, provided) {
+  const merged = { ...provided };
+  for (const v of templateVars) {
+    if (merged[v.name] === undefined && v.default !== undefined) {
+      merged[v.name] = v.default;
     }
   }
-  if (filter.priority) {
-    if (Array.isArray(filter.priority)) {
-      conditions.push(`priority IN (${filter.priority.map(() => "?").join(",")})`);
-      params.push(...filter.priority);
-    } else {
-      conditions.push("priority = ?");
-      params.push(filter.priority);
+  const missing = [];
+  for (const v of templateVars) {
+    if (v.required && merged[v.name] === undefined) {
+      missing.push(v.name);
     }
   }
-  if (filter.assigned_to) {
-    conditions.push("assigned_to = ?");
-    params.push(filter.assigned_to);
-  }
-  if (filter.agent_id) {
-    conditions.push("agent_id = ?");
-    params.push(filter.agent_id);
-  }
-  if (filter.session_id) {
-    conditions.push("session_id = ?");
-    params.push(filter.session_id);
-  }
-  if (filter.tags && filter.tags.length > 0) {
-    const placeholders = filter.tags.map(() => "?").join(",");
-    conditions.push(`id IN (SELECT task_id FROM task_tags WHERE tag IN (${placeholders}))`);
-    params.push(...filter.tags);
+  if (missing.length > 0) {
+    throw new Error(`Missing required template variable(s): ${missing.join(", ")}`);
   }
-  if (filter.plan_id) {
-    conditions.push("plan_id = ?");
-    params.push(filter.plan_id);
+  return merged;
+}
+function substituteVars(text, variables) {
+  let result = text;
+  for (const [key, val] of Object.entries(variables)) {
+    result = result.replace(new RegExp(`\\{${key}\\}`, "g"), val);
   }
-  if (filter.task_list_id) {
-    conditions.push("task_list_id = ?");
-    params.push(filter.task_list_id);
+  return result;
+}
+function tasksFromTemplate(templateId, projectId, variables, taskListId, db, _visitedTemplateIds) {
+  const d = db || getDatabase();
+  const template = getTemplateWithTasks(templateId, d);
+  if (!template)
+    throw new Error(`Template not found: ${templateId}`);
+  const visited = _visitedTemplateIds || new Set;
+  if (visited.has(template.id)) {
+    throw new Error(`Circular template reference detected: ${template.id}`);
   }
-  if (filter.has_recurrence === true) {
-    conditions.push("recurrence_rule IS NOT NULL");
-  } else if (filter.has_recurrence === false) {
-    conditions.push("recurrence_rule IS NULL");
+  visited.add(template.id);
+  const resolved = resolveVariables(template.variables, variables);
+  if (template.tasks.length === 0) {
+    const input = taskFromTemplate(templateId, { project_id: projectId, task_list_id: taskListId }, d);
+    const task = createTask(input, d);
+    return [task];
   }
-  if (filter.task_type) {
-    if (Array.isArray(filter.task_type)) {
-      conditions.push(`task_type IN (${filter.task_type.map(() => "?").join(",")})`);
-      params.push(...filter.task_type);
-    } else {
-      conditions.push("task_type = ?");
-      params.push(filter.task_type);
+  const createdTasks = [];
+  const positionToId = new Map;
+  const skippedPositions = new Set;
+  for (const tt of template.tasks) {
+    if (tt.include_template_id) {
+      const includedTasks = tasksFromTemplate(tt.include_template_id, projectId, resolved, taskListId, d, visited);
+      createdTasks.push(...includedTasks);
+      if (includedTasks.length > 0) {
+        positionToId.set(tt.position, includedTasks[0].id);
+      } else {
+        skippedPositions.add(tt.position);
+      }
+      continue;
     }
+    if (tt.condition && !evaluateCondition(tt.condition, resolved)) {
+      skippedPositions.add(tt.position);
+      continue;
+    }
+    let title = tt.title_pattern;
+    let desc = tt.description;
+    title = substituteVars(title, resolved);
+    if (desc)
+      desc = substituteVars(desc, resolved);
+    const task = createTask({
+      title,
+      description: desc ?? undefined,
+      priority: tt.priority,
+      tags: tt.tags,
+      task_type: tt.task_type ?? undefined,
+      project_id: projectId,
+      task_list_id: taskListId,
+      metadata: tt.metadata
+    }, d);
+    createdTasks.push(task);
+    positionToId.set(tt.position, task.id);
   }
-  const PRIORITY_RANK = `CASE priority WHEN 'critical' THEN 0 WHEN 'high' THEN 1 WHEN 'medium' THEN 2 WHEN 'low' THEN 3 END`;
-  if (filter.cursor) {
-    try {
-      const decoded = JSON.parse(Buffer.from(filter.cursor, "base64").toString("utf8"));
-      conditions.push(`(${PRIORITY_RANK} > ? OR (${PRIORITY_RANK} = ? AND created_at < ?) OR (${PRIORITY_RANK} = ? AND created_at = ? AND id > ?))`);
-      params.push(decoded.p, decoded.p, decoded.c, decoded.p, decoded.c, decoded.i);
-    } catch {}
-  }
-  if (!filter.include_archived) {
-    conditions.push("archived_at IS NULL");
-  }
-  const where = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
-  let limitClause = "";
-  if (filter.limit) {
-    limitClause = " LIMIT ?";
-    params.push(filter.limit);
-    if (!filter.cursor && filter.offset) {
-      limitClause += " OFFSET ?";
-      params.push(filter.offset);
+  for (const tt of template.tasks) {
+    if (skippedPositions.has(tt.position))
+      continue;
+    if (tt.include_template_id)
+      continue;
+    const deps = tt.depends_on_positions;
+    for (const depPos of deps) {
+      if (skippedPositions.has(depPos))
+        continue;
+      const taskId = positionToId.get(tt.position);
+      const depId = positionToId.get(depPos);
+      if (taskId && depId) {
+        addDependency(taskId, depId, d);
+      }
     }
   }
-  const rows = d.query(`SELECT * FROM tasks ${where} ORDER BY ${PRIORITY_RANK}, created_at DESC${limitClause}`).all(...params);
-  return rows.map(rowToTask);
+  return createdTasks;
 }
-function countTasks(filter = {}, db) {
+function previewTemplate(templateId, variables, db) {
   const d = db || getDatabase();
-  const conditions = [];
-  const params = [];
-  if (filter.project_id) {
-    conditions.push("project_id = ?");
-    params.push(filter.project_id);
-  }
-  if (filter.parent_id !== undefined) {
-    if (filter.parent_id === null) {
-      conditions.push("parent_id IS NULL");
-    } else {
-      conditions.push("parent_id = ?");
-      params.push(filter.parent_id);
-    }
-  }
-  if (filter.status) {
-    if (Array.isArray(filter.status)) {
-      conditions.push(`status IN (${filter.status.map(() => "?").join(",")})`);
-      params.push(...filter.status);
-    } else {
-      conditions.push("status = ?");
-      params.push(filter.status);
-    }
-  }
-  if (filter.priority) {
-    if (Array.isArray(filter.priority)) {
-      conditions.push(`priority IN (${filter.priority.map(() => "?").join(",")})`);
-      params.push(...filter.priority);
-    } else {
-      conditions.push("priority = ?");
-      params.push(filter.priority);
+  const template = getTemplateWithTasks(templateId, d);
+  if (!template)
+    throw new Error(`Template not found: ${templateId}`);
+  const resolved = resolveVariables(template.variables, variables);
+  const tasks = [];
+  if (template.tasks.length === 0) {
+    tasks.push({
+      position: 0,
+      title: substituteVars(template.title_pattern, resolved),
+      description: template.description ? substituteVars(template.description, resolved) : null,
+      priority: template.priority,
+      tags: template.tags,
+      task_type: null,
+      depends_on_positions: []
+    });
+  } else {
+    for (const tt of template.tasks) {
+      if (tt.condition && !evaluateCondition(tt.condition, resolved))
+        continue;
+      tasks.push({
+        position: tt.position,
+        title: substituteVars(tt.title_pattern, resolved),
+        description: tt.description ? substituteVars(tt.description, resolved) : null,
+        priority: tt.priority,
+        tags: tt.tags,
+        task_type: tt.task_type,
+        depends_on_positions: tt.depends_on_positions
+      });
     }
   }
-  if (filter.assigned_to) {
-    conditions.push("assigned_to = ?");
-    params.push(filter.assigned_to);
-  }
-  if (filter.agent_id) {
-    conditions.push("agent_id = ?");
-    params.push(filter.agent_id);
-  }
-  if (filter.session_id) {
-    conditions.push("session_id = ?");
-    params.push(filter.session_id);
+  return {
+    template_id: template.id,
+    template_name: template.name,
+    description: template.description,
+    variables: template.variables,
+    resolved_variables: resolved,
+    tasks
+  };
+}
+
+// src/db/task-graph.ts
+init_types();
+init_database();
+function addDependency(taskId, dependsOn, db) {
+  const d = db || getDatabase();
+  if (!getTask(taskId, d))
+    throw new TaskNotFoundError(taskId);
+  if (!getTask(dependsOn, d))
+    throw new TaskNotFoundError(dependsOn);
+  if (wouldCreateCycle(taskId, dependsOn, d)) {
+    throw new DependencyCycleError(taskId, dependsOn);
   }
-  if (filter.tags && filter.tags.length > 0) {
-    const placeholders = filter.tags.map(() => "?").join(",");
-    conditions.push(`id IN (SELECT task_id FROM task_tags WHERE tag IN (${placeholders}))`);
-    params.push(...filter.tags);
+  d.run("INSERT OR IGNORE INTO task_dependencies (task_id, depends_on) VALUES (?, ?)", [taskId, dependsOn]);
+}
+function removeDependency(taskId, dependsOn, db) {
+  const d = db || getDatabase();
+  const result = d.run("DELETE FROM task_dependencies WHERE task_id = ? AND depends_on = ?", [taskId, dependsOn]);
+  return result.changes > 0;
+}
+function getTaskDependencies(taskId, db) {
+  const d = db || getDatabase();
+  return d.query("SELECT * FROM task_dependencies WHERE task_id = ?").all(taskId);
+}
+function getTaskDependents(taskId, db) {
+  const d = db || getDatabase();
+  return d.query("SELECT * FROM task_dependencies WHERE depends_on = ?").all(taskId);
+}
+function cloneTask(taskId, overrides, db) {
+  const d = db || getDatabase();
+  const source = getTask(taskId, d);
+  if (!source)
+    throw new TaskNotFoundError(taskId);
+  const input = {
+    title: overrides?.title ?? source.title,
+    description: overrides?.description ?? source.description ?? undefined,
+    priority: overrides?.priority ?? source.priority,
+    project_id: overrides?.project_id ?? source.project_id ?? undefined,
+    parent_id: overrides?.parent_id ?? source.parent_id ?? undefined,
+    plan_id: overrides?.plan_id ?? source.plan_id ?? undefined,
+    task_list_id: overrides?.task_list_id ?? source.task_list_id ?? undefined,
+    status: overrides?.status ?? "pending",
+    agent_id: overrides?.agent_id ?? source.agent_id ?? undefined,
+    assigned_to: overrides?.assigned_to ?? source.assigned_to ?? undefined,
+    tags: overrides?.tags ?? source.tags,
+    metadata: overrides?.metadata ?? source.metadata,
+    estimated_minutes: overrides?.estimated_minutes ?? source.estimated_minutes ?? undefined,
+    recurrence_rule: overrides?.recurrence_rule ?? source.recurrence_rule ?? undefined
+  };
+  return createTask(input, d);
+}
+function getTaskGraph(taskId, direction = "both", db) {
+  const d = db || getDatabase();
+  const task = getTask(taskId, d);
+  if (!task)
+    throw new TaskNotFoundError(taskId);
+  function toNode(t) {
+    const deps = getTaskDependencies(t.id, d);
+    const hasUnfinishedDeps = deps.some((dep) => {
+      const depTask = getTask(dep.depends_on, d);
+      return depTask && depTask.status !== "completed";
+    });
+    return { id: t.id, short_id: t.short_id, title: t.title, status: t.status, priority: t.priority, is_blocked: hasUnfinishedDeps };
   }
-  if (filter.plan_id) {
-    conditions.push("plan_id = ?");
-    params.push(filter.plan_id);
+  function buildUp(id, visited) {
+    if (visited.has(id))
+      return [];
+    visited.add(id);
+    const deps = d.query("SELECT depends_on FROM task_dependencies WHERE task_id = ?").all(id);
+    return deps.map((dep) => {
+      const depTask = getTask(dep.depends_on, d);
+      if (!depTask)
+        return null;
+      return { task: toNode(depTask), depends_on: buildUp(dep.depends_on, visited), blocks: [] };
+    }).filter(Boolean);
   }
-  if (filter.task_list_id) {
-    conditions.push("task_list_id = ?");
-    params.push(filter.task_list_id);
+  function buildDown(id, visited) {
+    if (visited.has(id))
+      return [];
+    visited.add(id);
+    const dependents = d.query("SELECT task_id FROM task_dependencies WHERE depends_on = ?").all(id);
+    return dependents.map((dep) => {
+      const depTask = getTask(dep.task_id, d);
+      if (!depTask)
+        return null;
+      return { task: toNode(depTask), depends_on: [], blocks: buildDown(dep.task_id, visited) };
+    }).filter(Boolean);
   }
-  const where = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
-  const row = d.query(`SELECT COUNT(*) as count FROM tasks ${where}`).get(...params);
-  return row.count;
+  const rootNode = toNode(task);
+  const depends_on = direction === "up" || direction === "both" ? buildUp(taskId, new Set) : [];
+  const blocks = direction === "down" || direction === "both" ? buildDown(taskId, new Set) : [];
+  return { task: rootNode, depends_on, blocks };
 }
-function updateTask(id, input, db) {
+function moveTask(taskId, target, db) {
   const d = db || getDatabase();
-  const task = getTask(id, d);
+  const task = getTask(taskId, d);
   if (!task)
-    throw new TaskNotFoundError(id);
-  if (task.version !== input.version) {
-    throw new VersionConflictError(id, input.version, task.version);
-  }
-  const sets = ["version = version + 1", "updated_at = ?"];
+    throw new TaskNotFoundError(taskId);
+  const sets = ["updated_at = ?", "version = version + 1"];
   const params = [now()];
-  if (input.title !== undefined) {
-    sets.push("title = ?");
-    params.push(input.title);
-  }
-  if (input.description !== undefined) {
-    sets.push("description = ?");
-    params.push(input.description);
-  }
-  if (input.status !== undefined) {
-    if (input.status === "completed") {
-      checkCompletionGuard(task, task.assigned_to || task.agent_id || null, d);
-    }
-    sets.push("status = ?");
-    params.push(input.status);
-    if (input.status === "completed") {
-      sets.push("completed_at = ?");
-      params.push(now());
-    }
-  }
-  if (input.priority !== undefined) {
-    sets.push("priority = ?");
-    params.push(input.priority);
-  }
-  if (input.assigned_to !== undefined) {
-    sets.push("assigned_to = ?");
-    params.push(input.assigned_to);
-  }
-  if (input.tags !== undefined) {
-    sets.push("tags = ?");
-    params.push(JSON.stringify(input.tags));
-  }
-  if (input.metadata !== undefined) {
-    sets.push("metadata = ?");
-    params.push(JSON.stringify(input.metadata));
-  }
-  if (input.plan_id !== undefined) {
-    sets.push("plan_id = ?");
-    params.push(input.plan_id);
-  }
-  if (input.task_list_id !== undefined) {
+  if (target.task_list_id !== undefined) {
     sets.push("task_list_id = ?");
-    params.push(input.task_list_id);
-  }
-  if (input.due_at !== undefined) {
-    sets.push("due_at = ?");
-    params.push(input.due_at);
-  }
-  if (input.estimated_minutes !== undefined) {
-    sets.push("estimated_minutes = ?");
-    params.push(input.estimated_minutes);
-  }
-  if (input.requires_approval !== undefined) {
-    sets.push("requires_approval = ?");
-    params.push(input.requires_approval ? 1 : 0);
-  }
-  if (input.approved_by !== undefined) {
-    sets.push("approved_by = ?");
-    params.push(input.approved_by);
-    sets.push("approved_at = ?");
-    params.push(now());
-  }
-  if (input.recurrence_rule !== undefined) {
-    sets.push("recurrence_rule = ?");
-    params.push(input.recurrence_rule);
-  }
-  if (input.task_type !== undefined) {
-    sets.push("task_type = ?");
-    params.push(input.task_type ?? null);
-  }
-  params.push(id, input.version);
-  const result = d.run(`UPDATE tasks SET ${sets.join(", ")} WHERE id = ? AND version = ?`, params);
-  if (result.changes === 0) {
-    const current = getTask(id, d);
-    throw new VersionConflictError(id, input.version, current?.version ?? -1);
-  }
-  if (input.tags !== undefined) {
-    replaceTaskTags(id, input.tags, d);
-  }
-  const agentId = task.assigned_to || task.agent_id || null;
-  if (input.status !== undefined && input.status !== task.status)
-    logTaskChange(id, "update", "status", task.status, input.status, agentId, d);
-  if (input.priority !== undefined && input.priority !== task.priority)
-    logTaskChange(id, "update", "priority", task.priority, input.priority, agentId, d);
-  if (input.title !== undefined && input.title !== task.title)
-    logTaskChange(id, "update", "title", task.title, input.title, agentId, d);
-  if (input.assigned_to !== undefined && input.assigned_to !== task.assigned_to)
-    logTaskChange(id, "update", "assigned_to", task.assigned_to, input.assigned_to, agentId, d);
-  if (input.approved_by !== undefined)
-    logTaskChange(id, "approve", "approved_by", null, input.approved_by, agentId, d);
-  if (input.assigned_to !== undefined && input.assigned_to !== task.assigned_to) {
-    dispatchWebhook("task.assigned", { id, assigned_to: input.assigned_to, title: task.title }, d).catch(() => {});
+    params.push(target.task_list_id);
   }
-  if (input.status !== undefined && input.status !== task.status) {
-    dispatchWebhook("task.status_changed", { id, old_status: task.status, new_status: input.status, title: task.title }, d).catch(() => {});
+  if (target.project_id !== undefined) {
+    sets.push("project_id = ?");
+    params.push(target.project_id);
   }
-  return {
-    ...task,
-    ...Object.fromEntries(Object.entries(input).filter(([, v]) => v !== undefined)),
-    tags: input.tags ?? task.tags,
-    metadata: input.metadata ?? task.metadata,
-    version: task.version + 1,
-    updated_at: now(),
-    completed_at: input.status === "completed" ? now() : task.completed_at,
-    requires_approval: input.requires_approval !== undefined ? input.requires_approval : task.requires_approval,
-    approved_by: input.approved_by ?? task.approved_by,
-    approved_at: input.approved_by ? now() : task.approved_at
-  };
+  if (target.plan_id !== undefined) {
+    sets.push("plan_id = ?");
+    params.push(target.plan_id);
+  }
+  params.push(taskId);
+  d.run(`UPDATE tasks SET ${sets.join(", ")} WHERE id = ?`, params);
+  return getTask(taskId, d);
 }
-function deleteTask(id, db) {
-  const d = db || getDatabase();
-  const result = d.run("DELETE FROM tasks WHERE id = ?", [id]);
-  return result.changes > 0;
+function wouldCreateCycle(taskId, dependsOn, db) {
+  const visited = new Set;
+  const queue = [dependsOn];
+  while (queue.length > 0) {
+    const current = queue.shift();
+    if (current === taskId)
+      return true;
+    if (visited.has(current))
+      continue;
+    visited.add(current);
+    const deps = db.query("SELECT depends_on FROM task_dependencies WHERE task_id = ?").all(current);
+    for (const dep of deps) {
+      queue.push(dep.depends_on);
+    }
+  }
+  return false;
 }
+
+// src/db/task-lifecycle.ts
+var MAX_SPAWN_DEPTH = 10;
 function getBlockingDeps(id, db) {
   const d = db || getDatabase();
   const deps = getTaskDependencies(id, d);
@@ -3453,14 +4125,21 @@ function completeTask(id, agentId, db, options) {
     completionMeta._completion = { confidence: options.confidence };
   }
   const hasMeta = Object.keys(completionMeta).length > 0;
-  if (hasMeta) {
-    const meta2 = { ...task.metadata, ...completionMeta };
-    d.run("UPDATE tasks SET metadata = ? WHERE id = ?", [JSON.stringify(meta2), id]);
-  }
   const timestamp = now();
   const confidence = options?.confidence !== undefined ? options.confidence : null;
-  d.run(`UPDATE tasks SET status = 'completed', locked_by = NULL, locked_at = NULL, completed_at = ?, confidence = ?, version = version + 1, updated_at = ?
-     WHERE id = ?`, [timestamp, confidence, timestamp, id]);
+  const tx = d.transaction(() => {
+    if (hasMeta) {
+      const meta2 = { ...task.metadata, ...completionMeta };
+      const metaResult = d.run("UPDATE tasks SET metadata = ?, version = version + 1, updated_at = ? WHERE id = ? AND version = ?", [JSON.stringify(meta2), timestamp, id, task.version]);
+      if (metaResult.changes === 0) {
+        const current = getTask(id, d);
+        throw new VersionConflictError(id, task.version, current?.version ?? -1);
+      }
+    }
+    d.run(`UPDATE tasks SET status = 'completed', locked_by = NULL, locked_at = NULL, completed_at = ?, confidence = ?, version = version + 1, updated_at = ?
+       WHERE id = ?`, [timestamp, confidence, timestamp, id]);
+  });
+  tx();
   logTaskChange(id, "complete", "status", task.status, "completed", agentId || null, d);
   dispatchWebhook("task.completed", { id, agent_id: agentId, title: task.title, completed_at: timestamp }, d).catch(() => {});
   let spawnedTask = null;
@@ -3469,15 +4148,21 @@ function completeTask(id, agentId, db, options) {
   }
   let spawnedFromTemplate = null;
   if (task.spawns_template_id) {
-    try {
-      const input = taskFromTemplate(task.spawns_template_id, {
-        project_id: task.project_id ?? undefined,
-        plan_id: task.plan_id ?? undefined,
-        task_list_id: task.task_list_id ?? undefined,
-        assigned_to: task.assigned_to ?? undefined
-      }, d);
-      spawnedFromTemplate = createTask(input, d);
-    } catch {}
+    const spawnDepth = task.metadata?._spawn_depth || 0;
+    if (spawnDepth >= MAX_SPAWN_DEPTH) {
+      console.warn(`[tasks] Task ${id} exceeded max spawn depth (${MAX_SPAWN_DEPTH}), skipping template spawn`);
+    } else {
+      try {
+        const input = taskFromTemplate(task.spawns_template_id, {
+          project_id: task.project_id ?? undefined,
+          plan_id: task.plan_id ?? undefined,
+          task_list_id: task.task_list_id ?? undefined,
+          assigned_to: task.assigned_to ?? undefined
+        }, d);
+        input.metadata = { ...input.metadata || {}, _spawn_depth: spawnDepth + 1 };
+        spawnedFromTemplate = createTask(input, d);
+      } catch {}
+    }
   }
   const meta = hasMeta ? { ...task.metadata, ...completionMeta } : task.metadata;
   if (spawnedTask) {
@@ -3542,141 +4227,6 @@ function unlockTask(id, agentId, db) {
      WHERE id = ?`, [timestamp, id]);
   return true;
 }
-function addDependency(taskId, dependsOn, db) {
-  const d = db || getDatabase();
-  if (!getTask(taskId, d))
-    throw new TaskNotFoundError(taskId);
-  if (!getTask(dependsOn, d))
-    throw new TaskNotFoundError(dependsOn);
-  if (wouldCreateCycle(taskId, dependsOn, d)) {
-    throw new DependencyCycleError(taskId, dependsOn);
-  }
-  d.run("INSERT OR IGNORE INTO task_dependencies (task_id, depends_on) VALUES (?, ?)", [taskId, dependsOn]);
-}
-function removeDependency(taskId, dependsOn, db) {
-  const d = db || getDatabase();
-  const result = d.run("DELETE FROM task_dependencies WHERE task_id = ? AND depends_on = ?", [taskId, dependsOn]);
-  return result.changes > 0;
-}
-function getTaskDependencies(taskId, db) {
-  const d = db || getDatabase();
-  return d.query("SELECT * FROM task_dependencies WHERE task_id = ?").all(taskId);
-}
-function getTaskDependents(taskId, db) {
-  const d = db || getDatabase();
-  return d.query("SELECT * FROM task_dependencies WHERE depends_on = ?").all(taskId);
-}
-function cloneTask(taskId, overrides, db) {
-  const d = db || getDatabase();
-  const source = getTask(taskId, d);
-  if (!source)
-    throw new TaskNotFoundError(taskId);
-  const input = {
-    title: overrides?.title ?? source.title,
-    description: overrides?.description ?? source.description ?? undefined,
-    priority: overrides?.priority ?? source.priority,
-    project_id: overrides?.project_id ?? source.project_id ?? undefined,
-    parent_id: overrides?.parent_id ?? source.parent_id ?? undefined,
-    plan_id: overrides?.plan_id ?? source.plan_id ?? undefined,
-    task_list_id: overrides?.task_list_id ?? source.task_list_id ?? undefined,
-    status: overrides?.status ?? "pending",
-    agent_id: overrides?.agent_id ?? source.agent_id ?? undefined,
-    assigned_to: overrides?.assigned_to ?? source.assigned_to ?? undefined,
-    tags: overrides?.tags ?? source.tags,
-    metadata: overrides?.metadata ?? source.metadata,
-    estimated_minutes: overrides?.estimated_minutes ?? source.estimated_minutes ?? undefined,
-    recurrence_rule: overrides?.recurrence_rule ?? source.recurrence_rule ?? undefined
-  };
-  return createTask(input, d);
-}
-function getTaskGraph(taskId, direction = "both", db) {
-  const d = db || getDatabase();
-  const task = getTask(taskId, d);
-  if (!task)
-    throw new TaskNotFoundError(taskId);
-  function toNode(t) {
-    const deps = getTaskDependencies(t.id, d);
-    const hasUnfinishedDeps = deps.some((dep) => {
-      const depTask = getTask(dep.depends_on, d);
-      return depTask && depTask.status !== "completed";
-    });
-    return { id: t.id, short_id: t.short_id, title: t.title, status: t.status, priority: t.priority, is_blocked: hasUnfinishedDeps };
-  }
-  function buildUp(id, visited) {
-    if (visited.has(id))
-      return [];
-    visited.add(id);
-    const deps = d.query("SELECT depends_on FROM task_dependencies WHERE task_id = ?").all(id);
-    return deps.map((dep) => {
-      const depTask = getTask(dep.depends_on, d);
-      if (!depTask)
-        return null;
-      return { task: toNode(depTask), depends_on: buildUp(dep.depends_on, visited), blocks: [] };
-    }).filter(Boolean);
-  }
-  function buildDown(id, visited) {
-    if (visited.has(id))
-      return [];
-    visited.add(id);
-    const dependents = d.query("SELECT task_id FROM task_dependencies WHERE depends_on = ?").all(id);
-    return dependents.map((dep) => {
-      const depTask = getTask(dep.task_id, d);
-      if (!depTask)
-        return null;
-      return { task: toNode(depTask), depends_on: [], blocks: buildDown(dep.task_id, visited) };
-    }).filter(Boolean);
-  }
-  const rootNode = toNode(task);
-  const depends_on = direction === "up" || direction === "both" ? buildUp(taskId, new Set) : [];
-  const blocks = direction === "down" || direction === "both" ? buildDown(taskId, new Set) : [];
-  return { task: rootNode, depends_on, blocks };
-}
-function moveTask(taskId, target, db) {
-  const d = db || getDatabase();
-  const task = getTask(taskId, d);
-  if (!task)
-    throw new TaskNotFoundError(taskId);
-  const sets = ["updated_at = ?", "version = version + 1"];
-  const params = [now()];
-  if (target.task_list_id !== undefined) {
-    sets.push("task_list_id = ?");
-    params.push(target.task_list_id);
-  }
-  if (target.project_id !== undefined) {
-    sets.push("project_id = ?");
-    params.push(target.project_id);
-  }
-  if (target.plan_id !== undefined) {
-    sets.push("plan_id = ?");
-    params.push(target.plan_id);
-  }
-  params.push(taskId);
-  d.run(`UPDATE tasks SET ${sets.join(", ")} WHERE id = ?`, params);
-  return getTask(taskId, d);
-}
-function spawnNextRecurrence(completedTask, db) {
-  const dueAt = nextOccurrence(completedTask.recurrence_rule, new Date);
-  let title = completedTask.title;
-  if (completedTask.short_id && title.startsWith(completedTask.short_id + ": ")) {
-    title = title.slice(completedTask.short_id.length + 2);
-  }
-  const recurrenceParentId = completedTask.recurrence_parent_id || completedTask.id;
-  return createTask({
-    title,
-    description: completedTask.description ?? undefined,
-    priority: completedTask.priority,
-    project_id: completedTask.project_id ?? undefined,
-    task_list_id: completedTask.task_list_id ?? undefined,
-    plan_id: completedTask.plan_id ?? undefined,
-    assigned_to: completedTask.assigned_to ?? undefined,
-    tags: completedTask.tags,
-    metadata: completedTask.metadata,
-    estimated_minutes: completedTask.estimated_minutes ?? undefined,
-    recurrence_rule: completedTask.recurrence_rule,
-    recurrence_parent_id: recurrenceParentId,
-    due_at: dueAt
-  }, db);
-}
 function claimNextTask(agentId, filters, db) {
   const d = db || getDatabase();
   const tx = d.transaction(() => {
@@ -3849,10 +4399,6 @@ function getStaleTasks(staleMinutes = 30, filters, db) {
   const rows = d.query(`SELECT * FROM tasks WHERE ${where} ORDER BY updated_at ASC`).all(...params);
   return rows.map(rowToTask);
 }
-function logCost(taskId, tokens, usd, db) {
-  const d = db || getDatabase();
-  d.run("UPDATE tasks SET cost_tokens = cost_tokens + ?, cost_usd = cost_usd + ?, updated_at = ? WHERE id = ?", [tokens, usd, now(), taskId]);
-}
 function stealTask(agentId, opts, db) {
   const d = db || getDatabase();
   const staleMinutes = opts?.stale_minutes ?? 30;
@@ -3883,6 +4429,32 @@ function claimOrSteal(agentId, filters, db) {
   });
   return tx();
 }
+function spawnNextRecurrence(completedTask, db) {
+  const dueAt = nextOccurrence(completedTask.recurrence_rule, new Date);
+  let title = completedTask.title;
+  if (completedTask.short_id && title.startsWith(completedTask.short_id + ": ")) {
+    title = title.slice(completedTask.short_id.length + 2);
+  }
+  const recurrenceParentId = completedTask.recurrence_parent_id || completedTask.id;
+  return createTask({
+    title,
+    description: completedTask.description ?? undefined,
+    priority: completedTask.priority,
+    project_id: completedTask.project_id ?? undefined,
+    task_list_id: completedTask.task_list_id ?? undefined,
+    plan_id: completedTask.plan_id ?? undefined,
+    assigned_to: completedTask.assigned_to ?? undefined,
+    tags: completedTask.tags,
+    metadata: completedTask.metadata,
+    estimated_minutes: completedTask.estimated_minutes ?? undefined,
+    recurrence_rule: completedTask.recurrence_rule,
+    recurrence_parent_id: recurrenceParentId,
+    due_at: dueAt
+  }, db);
+}
+// src/db/task-status.ts
+init_types();
+init_database();
 function getStatus(filters, agentId, options, db) {
   const d = db || getDatabase();
   const pending = countTasks({ ...filters, status: "pending" }, d);
@@ -4011,23 +4583,6 @@ function redistributeStaleTasks(agentId, options, db) {
   const claimed = released.length > 0 ? claimNextTask(agentId, options?.project_id ? { project_id: options.project_id } : undefined, d) : null;
   return { released, claimed };
 }
-function wouldCreateCycle(taskId, dependsOn, db) {
-  const visited = new Set;
-  const queue = [dependsOn];
-  while (queue.length > 0) {
-    const current = queue.shift();
-    if (current === taskId)
-      return true;
-    if (visited.has(current))
-      continue;
-    visited.add(current);
-    const deps = db.query("SELECT depends_on FROM task_dependencies WHERE task_id = ?").all(current);
-    for (const dep of deps) {
-      queue.push(dep.depends_on);
-    }
-  }
-  return false;
-}
 function getTaskStats(filters, db) {
   const d = db || getDatabase();
   const conditions = [];
@@ -4062,6 +4617,8 @@ function getTaskStats(filters, db) {
   const completion_rate = totalRow.count > 0 ? Math.round(completed / totalRow.count * 100) : 0;
   return { total: totalRow.count, by_status, by_priority, completion_rate, by_agent };
 }
+// src/db/task-relations.ts
+init_database();
 function bulkCreateTasks(inputs, db) {
   const d = db || getDatabase();
   const tempIdToRealId = new Map;
@@ -4155,6 +4712,10 @@ function getOverdueTasks(projectId, db) {
   const rows = d.query(query).all(...params);
   return rows.map(rowToTask);
 }
+function logCost(taskId, tokens, usd, db) {
+  const d = db || getDatabase();
+  d.run("UPDATE tasks SET cost_tokens = cost_tokens + ?, cost_usd = cost_usd + ?, updated_at = ? WHERE id = ?", [tokens, usd, now(), taskId]);
+}
 // src/db/plans.ts
 init_types();
 init_database();
@@ -6266,7 +6827,7 @@ function syncWithAgents(agents, taskListIdByAgent, projectId, direction = "both"
   }
   return { pushed, pulled, errors };
 }
-// ../../../../node_modules/@hasna/cloud/dist/index.js
+// node_modules/@hasna/cloud/dist/index.js
 import { createRequire } from "module";
 import { Database as Database2 } from "bun:sqlite";
 import {
@@ -6290,9 +6851,9 @@ import { homedir as homedir5, platform } from "os";
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
 var __defProp2 = Object.defineProperty;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-function __accessProp(key) {
+var __getOwnPropNames2 = Object.getOwnPropertyNames;
+var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+function __accessProp2(key) {
   return this[key];
 }
 var __toESMCache_node;
@@ -6307,10 +6868,10 @@ var __toESM = (mod, isNodeMode, target) => {
   }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp2(target, "default", { value: mod, enumerable: true }) : target;
-  for (let key of __getOwnPropNames(mod))
-    if (!__hasOwnProp.call(to, key))
+  for (let key of __getOwnPropNames2(mod))
+    if (!__hasOwnProp2.call(to, key))
       __defProp2(to, key, {
-        get: __accessProp.bind(mod, key),
+        get: __accessProp2.bind(mod, key),
         enumerable: true
       });
   if (canCache)
@@ -6318,9 +6879,9 @@ var __toESM = (mod, isNodeMode, target) => {
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
-var __returnValue = (v) => v;
-function __exportSetter(name, newValue) {
-  this[name] = __returnValue.bind(null, newValue);
+var __returnValue2 = (v) => v;
+function __exportSetter2(name, newValue) {
+  this[name] = __returnValue2.bind(null, newValue);
 }
 var __export2 = (target, all) => {
   for (var name in all)
@@ -6328,7 +6889,7 @@ var __export2 = (target, all) => {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: __exportSetter.bind(all, name)
+      set: __exportSetter2.bind(all, name)
     });
 };
 var __esm2 = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
@@ -16459,6 +17020,45 @@ var PG_MIGRATIONS = [
   ALTER TABLE task_dependencies ADD COLUMN external_project_id TEXT;
   ALTER TABLE task_dependencies ADD COLUMN external_task_id TEXT;
   INSERT INTO _migrations (id) VALUES (43) ON CONFLICT DO NOTHING;
+  `,
+  `
+  CREATE TABLE IF NOT EXISTS task_checkpoints (
+    id TEXT PRIMARY KEY,
+    task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
+    agent_id TEXT,
+    step TEXT NOT NULL,
+    status TEXT NOT NULL DEFAULT 'pending' CHECK(status IN ('pending', 'running', 'completed', 'failed', 'skipped')),
+    data TEXT DEFAULT '{}',
+    error TEXT,
+    attempt INTEGER NOT NULL DEFAULT 1,
+    max_attempts INTEGER NOT NULL DEFAULT 1,
+    started_at TIMESTAMPTZ,
+    completed_at TIMESTAMPTZ,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+  );
+  CREATE INDEX IF NOT EXISTS idx_task_checkpoints_task ON task_checkpoints(task_id);
+  CREATE INDEX IF NOT EXISTS idx_task_checkpoints_status ON task_checkpoints(status);
+
+  CREATE TABLE IF NOT EXISTS task_heartbeats (
+    id TEXT PRIMARY KEY,
+    task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
+    agent_id TEXT,
+    step TEXT,
+    message TEXT,
+    progress REAL CHECK(progress >= 0 AND progress <= 1),
+    meta TEXT DEFAULT '{}',
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+  );
+  CREATE INDEX IF NOT EXISTS idx_task_heartbeats_task ON task_heartbeats(task_id);
+  CREATE INDEX IF NOT EXISTS idx_task_heartbeats_agent ON task_heartbeats(agent_id);
+
+  ALTER TABLE tasks ADD COLUMN runner_id TEXT;
+  ALTER TABLE tasks ADD COLUMN runner_started_at TIMESTAMPTZ;
+  ALTER TABLE tasks ADD COLUMN runner_completed_at TIMESTAMPTZ;
+  ALTER TABLE tasks ADD COLUMN current_step TEXT;
+  ALTER TABLE tasks ADD COLUMN total_steps INTEGER;
+  INSERT INTO _migrations (id) VALUES (44) ON CONFLICT DO NOTHING;
   `
 ];
 
@@ -16772,15 +17372,24 @@ function renderBurndownChart(total, days) {
 `);
 }
 // src/lib/github.ts
-import { execSync } from "child_process";
+import { execFileSync } from "child_process";
 function parseGitHubUrl(url) {
-  const match = url.match(/github\.com\/([^/]+)\/([^/]+)\/issues\/(\d+)/);
+  const match = url.match(/github\.com\/([a-zA-Z0-9](?:[a-zA-Z0-9._-]{0,38}[a-zA-Z0-9])?)\/([a-zA-Z0-9._-]+)\/issues\/(\d+)/);
   if (!match)
     return null;
   return { owner: match[1], repo: match[2], number: parseInt(match[3], 10) };
 }
+function isSafeOwnerRepo(value) {
+  return /^[a-zA-Z0-9][a-zA-Z0-9._-]*$/.test(value) && value.length <= 39;
+}
 function fetchGitHubIssue(owner, repo, number) {
-  const json = execSync(`gh api repos/${owner}/${repo}/issues/${number}`, { encoding: "utf-8", timeout: 15000 });
+  if (!isSafeOwnerRepo(owner))
+    throw new Error(`Invalid GitHub owner: ${owner}`);
+  if (!isSafeOwnerRepo(repo))
+    throw new Error(`Invalid GitHub repo: ${repo}`);
+  if (!Number.isInteger(number) || number < 1)
+    throw new Error(`Invalid issue number: ${number}`);
+  const json = execFileSync("gh", ["api", `repos/${owner}/${repo}/issues/${number}`], { encoding: "utf-8", timeout: 15000 });
   const data = JSON.parse(json);
   return {
     number: data.number,