@hasna/todos 0.11.72 → 0.11.74

package/dist/server/index.js

@@ -1856,6 +1856,11 @@ function ensureSchema(db) {
   ensureColumn("tasks", "priority_score", "INTEGER");
   ensureColumn("tasks", "priority_reason", "TEXT");
   ensureColumn("tasks", "archived_at", "TEXT");
+  ensureColumn("tasks", "runner_id", "TEXT");
+  ensureColumn("tasks", "runner_started_at", "TEXT");
+  ensureColumn("tasks", "runner_completed_at", "TEXT");
+  ensureColumn("tasks", "current_step", "TEXT");
+  ensureColumn("tasks", "total_steps", "INTEGER");
   ensureColumn("agents", "role", "TEXT DEFAULT 'agent'");
   ensureColumn("agents", "permissions", `TEXT DEFAULT '["*"]'`);
   ensureColumn("agents", "reports_to", "TEXT");
@@ -1863,6 +1868,10 @@ function ensureSchema(db) {
   ensureColumn("agents", "level", "TEXT");
   ensureColumn("agents", "org_id", "TEXT");
   ensureColumn("agents", "capabilities", "TEXT DEFAULT '[]'");
+  ensureColumn("agents", "session_id", "TEXT");
+  ensureColumn("agents", "working_dir", "TEXT");
+  ensureColumn("agents", "active_project_id", "TEXT");
+  ensureColumn("agents", "status", "TEXT NOT NULL DEFAULT 'active'");
   ensureColumn("projects", "org_id", "TEXT");
   ensureColumn("plans", "slug", "TEXT");
   ensureColumn("plans", "task_list_id", "TEXT");
@@ -2780,34 +2789,40 @@ function ensureDir(filePath) {
     mkdirSync(dir, { recursive: true });
   }
 }
+function openDatabase(path) {
+  ensureDir(path);
+  const db = new Database(path);
+  db.run("PRAGMA journal_mode = WAL");
+  db.run("PRAGMA busy_timeout = 5000");
+  db.run("PRAGMA foreign_keys = ON");
+  runMigrations(db);
+  backfillTaskTags(db);
+  backfillMachineId(db);
+  return db;
+}
 function getDatabase(dbPath) {
   const path = dbPath || getDbPath();
   if (_db && _dbPath === path)
     return _db;
-  if (_db && _dbPath !== path) {
-    _db.close();
-    _db = null;
-    _dbPath = null;
-  }
-  ensureDir(path);
-  _db = new Database(path);
+  _db = openDatabase(path);
   _dbPath = path;
-  _db.run("PRAGMA journal_mode = WAL");
-  _db.run("PRAGMA busy_timeout = 5000");
-  _db.run("PRAGMA foreign_keys = ON");
-  runMigrations(_db);
-  backfillTaskTags(_db);
-  backfillMachineId(_db);
   return _db;
 }
 function closeDatabase() {
   if (_db) {
-    _db.close();
+    try {
+      _db.close();
+    } catch {}
     _db = null;
     _dbPath = null;
   }
 }
 function resetDatabase() {
+  if (_db) {
+    try {
+      _db.close();
+    } catch {}
+  }
   _db = null;
   _dbPath = null;
 }
@@ -2912,6 +2927,11 @@ function safeEqualHex(a, b) {
     return false;
   return timingSafeEqual(Buffer.from(a, "hex"), Buffer.from(b, "hex"));
 }
+function safeEqualStrings(a, b) {
+  const ah = createHash("sha256").update(a, "utf8").digest();
+  const bh = createHash("sha256").update(b, "utf8").digest();
+  return timingSafeEqual(ah, bh);
+}
 function hasActiveApiKeys(db) {
   const d = db || getDatabase();
   const row = d.query("SELECT COUNT(*) AS count FROM api_keys WHERE revoked_at IS NULL AND (expires_at IS NULL OR expires_at > ?)").get(now());
@@ -5739,1767 +5759,1858 @@ var init_checklists = __esm(() => {
   init_database();
 });
 
-// src/db/task-crud.ts
-function rowToTask(row) {
+// src/lib/recurrence.ts
+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);
+    }
+    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;
+    }
+    const next = new Date(base);
+    next.setDate(next.getDate() + daysToAdd);
+    return next.toISOString();
+  }
+  throw new Error(`Cannot calculate next occurrence for rule: "${rule}"`);
+}
+var DAY_NAMES;
+var init_recurrence = __esm(() => {
+  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
+  };
+});
+
+// src/db/templates.ts
+var exports_templates = {};
+__export(exports_templates, {
+  updateTemplate: () => updateTemplate,
+  tasksFromTemplate: () => tasksFromTemplate,
+  taskFromTemplate: () => taskFromTemplate,
+  resolveVariables: () => resolveVariables,
+  previewTemplate: () => previewTemplate,
+  listTemplates: () => listTemplates,
+  listTemplateVersions: () => listTemplateVersions,
+  importTemplate: () => importTemplate,
+  getTemplateWithTasks: () => getTemplateWithTasks,
+  getTemplateVersion: () => getTemplateVersion,
+  getTemplateTasks: () => getTemplateTasks,
+  getTemplate: () => getTemplate,
+  exportTemplate: () => exportTemplate,
+  evaluateCondition: () => evaluateCondition,
+  deleteTemplate: () => deleteTemplate,
+  createTemplate: () => createTemplate,
+  addTemplateTasks: () => addTemplateTasks
+});
+function rowToTemplate(row) {
   return {
     ...row,
     tags: JSON.parse(row.tags || "[]"),
+    variables: JSON.parse(row.variables || "[]"),
     metadata: JSON.parse(row.metadata || "{}"),
-    status: row.status,
-    priority: row.priority,
-    requires_approval: !!row.requires_approval
+    priority: row.priority || "medium",
+    version: row.version ?? 1
   };
 }
-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 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 addMetadataConditions(metadata, conditions, params) {
-  if (!metadata)
-    return;
-  for (const [key, value] of Object.entries(metadata)) {
-    if (!/^[A-Za-z0-9_.-]+$/.test(key)) {
-      throw new Error(`Invalid metadata filter key: ${key}`);
-    }
-    conditions.push(`json_extract(metadata, '$."${key}"') = ?`);
-    params.push(value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean" ? value : JSON.stringify(value));
-  }
+function resolveTemplateId(id, d) {
+  return resolvePartialId(d, "task_templates", id);
 }
-function createTask(input, db) {
+function createTemplate(input, db) {
   const d = db || getDatabase();
-  const timestamp = now();
-  const tags = input.tags || [];
+  const id = uuid();
   const machineId = currentStorageMachineId(d);
-  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, cycle_id, title, description, status, priority, agent_id, assigned_to, session_id, working_dir, tags, metadata, version, created_at, updated_at, due_at, estimated_minutes, sla_minutes, confidence, retry_count, max_retries, retry_after, 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, machine_id)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
-        id,
-        null,
-        input.project_id || null,
-        input.parent_id || null,
-        input.plan_id || null,
-        input.task_list_id || null,
-        input.cycle_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.sla_minutes ?? null,
-        input.confidence ?? null,
-        input.retry_count ?? 0,
-        input.max_retries ?? 3,
-        input.retry_after ?? 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,
-        machineId
-      ]);
-      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);
+  d.run(`INSERT INTO task_templates (id, name, title_pattern, description, priority, tags, variables, project_id, plan_id, metadata, created_at, machine_id)
+     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(),
+    machineId
+  ]);
+  if (input.tasks && input.tasks.length > 0) {
+    addTemplateTasks(id, input.tasks, d);
   }
-  const task = getTask(id, d);
-  const payload = taskEventData(task);
-  const databasePath = databasePathFromDatabase(d);
-  dispatchWebhook2("task.created", payload, d).catch(() => {});
-  emitLocalEventHooksQuiet({ type: "task.created", payload, databasePath });
-  emitSharedTaskEventQuiet({ type: "task.created", task, databasePath });
-  return task;
+  return getTemplate(id, d);
 }
-function getTask(id, db) {
+function getTemplate(id, 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 task_templates WHERE id = ?").get(resolved);
+  return row ? rowToTemplate(row) : null;
 }
-function getTaskWithRelations(id, db) {
+function listTemplates(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
-  };
+  return d.query("SELECT * FROM task_templates ORDER BY name").all().map(rowToTemplate);
 }
-function listTasks(filter = {}, db) {
+function deleteTemplate(id, db) {
   const d = db || getDatabase();
-  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);
-  }
-  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);
-    }
-  }
-  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);
+  const resolved = resolveTemplateId(id, d);
+  if (!resolved)
+    return false;
+  const template = getTemplate(resolved, d);
+  if (!template)
+    return false;
+  recordStorageTombstone({
+    object_type: "templates",
+    object_id: resolved,
+    payload: template,
+    version: template.version
+  }, d);
+  return d.run("DELETE FROM task_templates WHERE id = ?", [resolved]).changes > 0;
+}
+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()]);
   }
-  if (filter.session_id) {
-    conditions.push("session_id = ?");
-    params.push(filter.session_id);
+  const sets = ["version = version + 1"];
+  const values = [];
+  if (updates.name !== undefined) {
+    sets.push("name = ?");
+    values.push(updates.name);
   }
-  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 (updates.title_pattern !== undefined) {
+    sets.push("title_pattern = ?");
+    values.push(updates.title_pattern);
   }
-  if (filter.plan_id) {
-    conditions.push("plan_id = ?");
-    params.push(filter.plan_id);
+  if (updates.description !== undefined) {
+    sets.push("description = ?");
+    values.push(updates.description);
   }
-  if (filter.task_list_id) {
-    conditions.push("task_list_id = ?");
-    params.push(filter.task_list_id);
+  if (updates.priority !== undefined) {
+    sets.push("priority = ?");
+    values.push(updates.priority);
   }
-  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 (updates.tags !== undefined) {
+    sets.push("tags = ?");
+    values.push(JSON.stringify(updates.tags));
   }
-  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);
-    }
+  if (updates.variables !== undefined) {
+    sets.push("variables = ?");
+    values.push(JSON.stringify(updates.variables));
   }
-  addMetadataConditions(filter.metadata, conditions, params);
-  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 (updates.project_id !== undefined) {
+    sets.push("project_id = ?");
+    values.push(updates.project_id);
   }
-  if (!filter.include_archived) {
-    conditions.push("archived_at IS NULL");
+  if (updates.plan_id !== undefined) {
+    sets.push("plan_id = ?");
+    values.push(updates.plan_id);
   }
-  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);
-    }
+  if (updates.metadata !== undefined) {
+    sets.push("metadata = ?");
+    values.push(JSON.stringify(updates.metadata));
   }
-  const rows = d.query(`SELECT * FROM tasks ${where} ORDER BY ${PRIORITY_RANK}, created_at DESC${limitClause}`).all(...params);
-  return rows.map(rowToTask);
-}
-function getTaskByFingerprint(fingerprint, db) {
-  const tasks = listTasks({ metadata: { fingerprint }, limit: 1 }, db);
-  return tasks[0] ?? null;
+  values.push(resolved);
+  d.run(`UPDATE task_templates SET ${sets.join(", ")} WHERE id = ?`, values);
+  return getTemplate(resolved, d);
 }
-function mergeTaskMetadata(current, next, fingerprint) {
+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 {
-    ...current,
-    ...next ?? {},
-    fingerprint
+    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
   };
 }
-function upsertTaskByFingerprint(input, db) {
+function addTemplateTasks(templateId, tasks, db) {
   const d = db || getDatabase();
-  const fingerprint = input.fingerprint.trim();
-  if (!fingerprint)
-    throw new Error("fingerprint is required");
-  const existing = getTaskByFingerprint(fingerprint, d);
-  const metadata = mergeTaskMetadata(existing?.metadata ?? {}, input.metadata, fingerprint);
-  if (!existing) {
-    const task2 = createTask({ ...input, metadata }, d);
-    return { task: task2, created: true };
+  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));
   }
-  const task = updateTask(existing.id, {
-    version: existing.version,
-    title: input.title,
-    description: input.description,
-    status: input.status,
-    priority: input.priority,
-    project_id: input.project_id,
-    assigned_to: input.assigned_to,
-    working_dir: input.working_dir,
-    plan_id: input.plan_id,
-    task_list_id: input.task_list_id,
-    tags: input.tags,
-    metadata,
-    due_at: input.due_at,
-    estimated_minutes: input.estimated_minutes,
-    sla_minutes: input.sla_minutes,
-    confidence: input.confidence,
-    retry_count: input.retry_count,
-    max_retries: input.max_retries,
-    retry_after: input.retry_after,
-    requires_approval: input.requires_approval,
-    recurrence_rule: input.recurrence_rule,
-    task_type: input.task_type
-  }, d);
-  return { task, created: false };
+  return results;
 }
-function countTasks(filter = {}, db) {
+function getTemplateWithTasks(id, db) {
   const d = db || getDatabase();
-  const conditions = [];
-  const params = [];
-  if (filter.project_id) {
-    conditions.push("project_id = ?");
-    params.push(filter.project_id);
+  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 };
+}
+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);
+}
+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;
   }
-  if (filter.ids && filter.ids.length > 0) {
-    conditions.push(`id IN (${filter.ids.map(() => "?").join(",")})`);
-    params.push(...filter.ids);
+  const neqMatch = trimmed.match(/^\{([^}]+)\}\s*!=\s*(.+)$/);
+  if (neqMatch) {
+    const varName = neqMatch[1];
+    const expected = neqMatch[2].trim();
+    return (variables[varName] ?? "") !== expected;
   }
-  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 falsyMatch = trimmed.match(/^!\{([^}]+)\}$/);
+  if (falsyMatch) {
+    const varName = falsyMatch[1];
+    const val = variables[varName];
+    return !val || val === "" || val === "false";
   }
-  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);
-    }
+  const truthyMatch = trimmed.match(/^\{([^}]+)\}$/);
+  if (truthyMatch) {
+    const varName = truthyMatch[1];
+    const val = variables[varName];
+    return !!val && val !== "" && val !== "false";
   }
-  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);
+  return true;
+}
+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
+    }))
+  };
+}
+function importTemplate(json, 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);
+}
+function getTemplateVersion(id, version, 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;
+}
+function listTemplateVersions(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);
+}
+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.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);
+  const missing = [];
+  for (const v of templateVars) {
+    if (v.required && merged[v.name] === undefined) {
+      missing.push(v.name);
+    }
   }
-  if (filter.task_list_id) {
-    conditions.push("task_list_id = ?");
-    params.push(filter.task_list_id);
+  if (missing.length > 0) {
+    throw new Error(`Missing required template variable(s): ${missing.join(", ")}`);
   }
-  addMetadataConditions(filter.metadata, conditions, params);
-  if (!filter.include_archived) {
-    conditions.push("archived_at IS NULL");
+  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);
   }
-  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;
+  return result;
 }
-function updateTask(id, input, db) {
+function tasksFromTemplate(templateId, projectId, variables, taskListId, db, _visitedTemplateIds) {
   const d = db || getDatabase();
-  const task = getTask(id, d);
-  if (!task)
-    throw new TaskNotFoundError(id);
-  if (task.version !== input.version) {
-    throw new VersionConflictError(id, input.version, task.version);
-  }
-  const timestamp = now();
-  const completionTimestamp = input.completed_at ?? timestamp;
-  const sets = ["version = version + 1", "updated_at = ?"];
-  const params = [timestamp];
-  if (input.title !== undefined) {
-    sets.push("title = ?");
-    params.push(input.title);
+  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 (input.description !== undefined) {
-    sets.push("description = ?");
-    params.push(input.description);
+  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 (input.status !== undefined) {
-    if (input.status === "completed") {
-      checkCompletionGuard(task, task.assigned_to || task.agent_id || null, d);
+  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;
     }
-    sets.push("status = ?");
-    params.push(input.status);
-    if (input.status === "completed") {
-      sets.push("completed_at = ?");
-      params.push(completionTimestamp);
+    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 (input.priority !== undefined) {
-    sets.push("priority = ?");
-    params.push(input.priority);
-  }
-  if (input.project_id !== undefined) {
-    sets.push("project_id = ?");
-    params.push(input.project_id);
+  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 (input.assigned_to !== undefined) {
-    sets.push("assigned_to = ?");
-    params.push(input.assigned_to);
+  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 (input.working_dir !== undefined) {
-    sets.push("working_dir = ?");
-    params.push(input.working_dir);
+  return {
+    template_id: template.id,
+    template_name: template.name,
+    description: template.description,
+    variables: template.variables,
+    resolved_variables: resolved,
+    tasks
+  };
+}
+var init_templates = __esm(() => {
+  init_database();
+  init_tasks();
+  init_storage_tombstones();
+});
+
+// src/db/task-graph.ts
+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 (input.tags !== undefined) {
-    sets.push("tags = ?");
-    params.push(JSON.stringify(input.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 (input.metadata !== undefined) {
-    sets.push("metadata = ?");
-    params.push(JSON.stringify(input.metadata));
+  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 (input.plan_id !== undefined) {
-    sets.push("plan_id = ?");
-    params.push(input.plan_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);
   }
-  if (input.task_list_id !== undefined) {
+  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(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.sla_minutes !== undefined) {
-    sets.push("sla_minutes = ?");
-    params.push(input.sla_minutes);
-  }
-  if (input.actual_minutes !== undefined) {
-    sets.push("actual_minutes = ?");
-    params.push(input.actual_minutes);
-  }
-  if (input.completed_at !== undefined && input.status !== "completed") {
-    sets.push("completed_at = ?");
-    params.push(input.completed_at);
-  }
-  if (input.confidence !== undefined) {
-    sets.push("confidence = ?");
-    params.push(input.confidence);
-  }
-  if (input.retry_count !== undefined) {
-    sets.push("retry_count = ?");
-    params.push(input.retry_count);
+    params.push(target.task_list_id);
   }
-  if (input.max_retries !== undefined) {
-    sets.push("max_retries = ?");
-    params.push(input.max_retries);
+  if (target.project_id !== undefined) {
+    sets.push("project_id = ?");
+    params.push(target.project_id);
   }
-  if (input.retry_after !== undefined) {
-    sets.push("retry_after = ?");
-    params.push(input.retry_after);
+  if (target.plan_id !== undefined) {
+    sets.push("plan_id = ?");
+    params.push(target.plan_id);
   }
-  if (input.requires_approval !== undefined) {
-    sets.push("requires_approval = ?");
-    params.push(input.requires_approval ? 1 : 0);
+  params.push(taskId);
+  d.run(`UPDATE tasks SET ${sets.join(", ")} WHERE id = ?`, params);
+  return getTask(taskId, d);
+}
+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);
+    }
   }
-  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);
+  return false;
+}
+var init_task_graph = __esm(() => {
+  init_types();
+  init_database();
+  init_task_crud();
+});
+
+// src/db/task-lifecycle.ts
+var exports_task_lifecycle = {};
+__export(exports_task_lifecycle, {
+  unlockTask: () => unlockTask,
+  stealTask: () => stealTask,
+  startTask: () => startTask,
+  spawnNextRecurrence: () => spawnNextRecurrence,
+  lockTask: () => lockTask,
+  getTasksChangedSince: () => getTasksChangedSince,
+  getTaskLockStatus: () => getTaskLockStatus,
+  getStaleTasks: () => getStaleTasks,
+  getNextTask: () => getNextTask,
+  getBlockingDeps: () => getBlockingDeps,
+  getActiveWork: () => getActiveWork,
+  failTask: () => failTask,
+  completeTask: () => completeTask,
+  claimOrSteal: () => claimOrSteal,
+  claimNextTask: () => claimNextTask
+});
+function lockExpiresAt(lockedAt) {
+  if (!lockedAt)
+    return null;
+  return new Date(new Date(lockedAt).getTime() + LOCK_EXPIRY_MINUTES * 60 * 1000).toISOString();
+}
+function assertStartable(task, agentId) {
+  if (task.status === "pending")
+    return;
+  if (task.status === "in_progress")
+    return;
+  throw new Error(`Task is ${task.status} and cannot be started by ${agentId}`);
+}
+function getBlockingDeps(id, db) {
+  const d = db || getDatabase();
+  const deps = getTaskDependencies(id, d);
+  if (deps.length === 0)
+    return [];
+  const blocking = [];
+  for (const dep of deps) {
+    const task = getTask(dep.depends_on, d);
+    if (task && task.status !== "completed")
+      blocking.push(task);
   }
-  if (input.task_type !== undefined) {
-    sets.push("task_type = ?");
-    params.push(input.task_type ?? null);
+  return blocking;
+}
+function startTask(id, agentId, db) {
+  const d = db || getDatabase();
+  const databasePath = databasePathFromDatabase(d);
+  const task = getTask(id, d);
+  if (!task)
+    throw new TaskNotFoundError(id);
+  assertStartable(task, agentId);
+  const blocking = getBlockingDeps(id, d);
+  if (blocking.length > 0) {
+    const blockerIds = blocking.map((b) => b.id.slice(0, 8)).join(", ");
+    emitLocalEventHooksQuiet({
+      type: "task.blocked",
+      payload: {
+        id,
+        agent_id: agentId,
+        title: task.title,
+        blockers: blocking.map((b) => ({ id: b.id, short_id: b.short_id, title: b.title, status: b.status }))
+      },
+      databasePath
+    });
+    throw new Error(`Task is blocked by ${blocking.length} unfinished dependency(ies): ${blockerIds}`);
   }
-  params.push(id, input.version);
-  const result = d.run(`UPDATE tasks SET ${sets.join(", ")} WHERE id = ? AND version = ?`, params);
+  const cutoff = lockExpiryCutoff();
+  const timestamp = now();
+  const result = d.run(`UPDATE tasks SET status = 'in_progress', assigned_to = ?, locked_by = ?, locked_at = ?, started_at = COALESCE(started_at, ?), version = version + 1, updated_at = ?
+     WHERE id = ? AND status IN ('pending', 'in_progress') AND (locked_by IS NULL OR locked_by = ? OR locked_at < ?)`, [agentId, agentId, timestamp, timestamp, timestamp, id, agentId, cutoff]);
   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);
+    if (!current)
+      throw new TaskNotFoundError(id);
+    assertStartable(current, agentId);
+    if (current.locked_by && current.locked_by !== agentId && !isLockExpired(current.locked_at)) {
+      throw new LockError(id, current.locked_by);
+    }
+    throw new Error(`Task ${id} could not be started because it changed during claim`);
   }
-  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.working_dir !== undefined && input.working_dir !== task.working_dir)
-    logTaskChange(id, "update", "working_dir", task.working_dir, input.working_dir, agentId, d);
-  if (input.approved_by !== undefined)
-    logTaskChange(id, "approve", "approved_by", null, input.approved_by, agentId, d);
-  const updatedTask = {
-    ...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: timestamp,
-    completed_at: input.status === "completed" ? completionTimestamp : input.completed_at !== undefined ? input.completed_at : task.completed_at,
-    sla_minutes: input.sla_minutes !== undefined ? input.sla_minutes : task.sla_minutes,
-    actual_minutes: input.actual_minutes ?? task.actual_minutes,
-    confidence: input.confidence !== undefined ? input.confidence : task.confidence,
-    retry_count: input.retry_count ?? task.retry_count,
-    max_retries: input.max_retries ?? task.max_retries,
-    retry_after: input.retry_after !== undefined ? input.retry_after : task.retry_after,
-    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 ? timestamp : task.approved_at
-  };
+  logTaskChange(id, "start", "status", "pending", "in_progress", agentId, d);
+  const startedTask = { ...task, status: "in_progress", assigned_to: agentId, locked_by: agentId, locked_at: timestamp, started_at: task.started_at || timestamp, version: task.version + 1, updated_at: timestamp };
+  const payload = taskEventData(startedTask, { agent_id: agentId });
+  dispatchWebhook2("task.started", payload, d).catch(() => {});
+  emitLocalEventHooksQuiet({ type: "task.started", payload, databasePath });
+  emitSharedTaskEventQuiet({ type: "task.started", task: startedTask, data: { agent_id: agentId }, databasePath });
+  return startedTask;
+}
+function completeTask(id, agentId, db, options) {
+  const d = db || getDatabase();
   const databasePath = databasePathFromDatabase(d);
-  if (input.assigned_to !== undefined && input.assigned_to !== task.assigned_to) {
-    const payload = taskEventData(updatedTask, { assigned_to: input.assigned_to, old_assigned_to: task.assigned_to });
-    dispatchWebhook2("task.assigned", payload, d).catch(() => {});
-    emitLocalEventHooksQuiet({ type: "task.assigned", payload, databasePath });
-    emitSharedTaskEventQuiet({ type: "task.assigned", task: updatedTask, data: { old_assigned_to: task.assigned_to }, databasePath });
+  const task = getTask(id, d);
+  if (!task)
+    throw new TaskNotFoundError(id);
+  if (task.status === "completed") {
+    return task;
   }
-  if (input.status !== undefined && input.status !== task.status) {
-    const payload = taskEventData(updatedTask, { old_status: task.status, new_status: input.status });
-    dispatchWebhook2("task.status_changed", payload, d).catch(() => {});
-    emitLocalEventHooksQuiet({ type: "task.status_changed", payload, databasePath });
-    emitSharedTaskEventQuiet({ type: "task.status_changed", task: updatedTask, data: { old_status: task.status, new_status: input.status }, databasePath });
+  if (task.status === "cancelled") {
+    throw new Error(`Task ${id} is cancelled and cannot be completed`);
   }
-  if (input.approved_by !== undefined) {
-    emitLocalEventHooksQuiet({ type: "approval.decided", payload: { id, approved_by: input.approved_by, title: task.title }, databasePath });
+  if (agentId && task.locked_by && task.locked_by !== agentId && !isLockExpired(task.locked_at)) {
+    throw new LockError(id, task.locked_by);
   }
-  const updatePayload = taskEventData(updatedTask);
-  dispatchWebhook2("task.updated", updatePayload, d).catch(() => {});
-  emitLocalEventHooksQuiet({ type: "task.updated", payload: updatePayload, databasePath });
-  emitSharedTaskEventQuiet({ type: "task.updated", task: updatedTask, databasePath });
-  return updatedTask;
-}
-function deleteTask(id, db) {
-  const d = db || getDatabase();
-  const row = d.query("SELECT * FROM tasks WHERE id = ?").get(id);
-  if (!row)
-    return false;
-  recordStorageTombstone({
-    object_type: "tasks",
-    object_id: id,
-    payload: rowToTask(row),
-    version: row.version
-  }, d);
-  const result = d.run("DELETE FROM tasks WHERE id = ?", [id]);
-  return result.changes > 0;
-}
-var init_task_crud = __esm(() => {
-  init_types();
-  init_database();
-  init_completion_guard();
-  init_event_emission_safety();
-  init_event_hooks();
-  init_shared_events();
-  init_audit();
-  init_webhooks();
-  init_checklists();
-  init_storage_tombstones();
-});
-
-// src/lib/recurrence.ts
-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] };
+  checkCompletionGuard(task, agentId || null, d);
+  const evidence = options ? { files_changed: options.files_changed, test_results: options.test_results, commit_hash: options.commit_hash, notes: options.notes, attachment_ids: options.attachment_ids } : undefined;
+  const hasEvidence = evidence && (evidence.files_changed || evidence.test_results || evidence.commit_hash || evidence.notes || evidence.attachment_ids);
+  const completionMeta = {};
+  if (hasEvidence)
+    completionMeta._evidence = evidence;
+  if (options?.confidence !== undefined) {
+    completionMeta._completion = { confidence: options.confidence };
   }
-  if (normalized === "every day" || normalized === "daily") {
-    return { type: "interval", interval: 1, unit: "day" };
+  const hasMeta = Object.keys(completionMeta).length > 0;
+  const timestamp = options?.completed_at || now();
+  const confidence = options?.confidence !== undefined ? options.confidence : task.confidence;
+  const versionBeforeStatus = task.version + (hasMeta ? 1 : 0);
+  const finalVersion = versionBeforeStatus + 1;
+  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);
+      }
+    }
+    const statusResult = d.run(`UPDATE tasks SET status = 'completed', locked_by = NULL, locked_at = NULL, completed_at = ?, confidence = ?, version = version + 1, updated_at = ?
+       WHERE id = ? AND version = ?`, [timestamp, confidence, timestamp, id, versionBeforeStatus]);
+    if (statusResult.changes === 0) {
+      const current = getTask(id, d);
+      throw new VersionConflictError(id, versionBeforeStatus, current?.version ?? -1);
+    }
+  });
+  tx();
+  logTaskChange(id, "complete", "status", task.status, "completed", agentId || null, d);
+  const completedTaskForEvent = {
+    ...task,
+    status: "completed",
+    locked_by: null,
+    locked_at: null,
+    completed_at: timestamp,
+    confidence,
+    version: finalVersion,
+    updated_at: timestamp,
+    metadata: hasMeta ? { ...task.metadata, ...completionMeta } : task.metadata
+  };
+  const completionPayload = taskEventData(completedTaskForEvent, { agent_id: agentId, completed_at: timestamp });
+  dispatchWebhook2("task.completed", completionPayload, d).catch(() => {});
+  emitLocalEventHooksQuiet({ type: "task.completed", payload: completionPayload, databasePath });
+  emitSharedTaskEventQuiet({ type: "task.completed", task: completedTaskForEvent, data: { agent_id: agentId, completed_at: timestamp }, databasePath });
+  let spawnedTask = null;
+  if (task.recurrence_rule && !options?.skip_recurrence) {
+    try {
+      spawnedTask = spawnNextRecurrence(task, d, timestamp);
+    } catch (e) {
+      spawnedTask = null;
+      console.warn(`[tasks] failed to spawn next recurrence for ${id}: ${e instanceof Error ? e.message : String(e)}`);
+    }
   }
-  if (normalized === "every week" || normalized === "weekly") {
-    return { type: "interval", interval: 1, unit: "week" };
+  let spawnedFromTemplate = null;
+  if (task.spawns_template_id) {
+    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 {}
+    }
   }
-  if (normalized === "every month" || normalized === "monthly") {
-    return { type: "interval", interval: 1, unit: "month" };
+  const meta = hasMeta ? { ...task.metadata, ...completionMeta } : task.metadata;
+  if (spawnedTask) {
+    meta._next_recurrence = { id: spawnedTask.id, short_id: spawnedTask.short_id, due_at: spawnedTask.due_at };
   }
-  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]
-    };
+  if (spawnedFromTemplate) {
+    meta._spawned_task = { id: spawnedFromTemplate.id, short_id: spawnedFromTemplate.short_id, title: spawnedFromTemplate.title };
   }
-  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) };
+  const unblockedDeps = d.query(`SELECT DISTINCT t.id, t.short_id, t.title FROM tasks t
+     JOIN task_dependencies td ON td.task_id = t.id
+     WHERE td.depends_on = ? AND t.status = 'pending'
+     AND NOT EXISTS (
+       SELECT 1 FROM task_dependencies td2
+       JOIN tasks dep2 ON dep2.id = td2.depends_on
+       WHERE td2.task_id = t.id AND dep2.status NOT IN ('completed', 'cancelled') AND dep2.id != ?
+     )`).all(id, id);
+  if (unblockedDeps.length > 0) {
+    meta._unblocked = unblockedDeps.map((d2) => ({ id: d2.id, short_id: d2.short_id, title: d2.title }));
+    for (const dep of unblockedDeps) {
+      const depTask = getTask(dep.id, d);
+      const payload = depTask ? taskEventData(depTask, { unblocked_by: id }) : { id: dep.id, unblocked_by: id, title: dep.title };
+      dispatchWebhook2("task.unblocked", payload, d).catch(() => {});
+      emitLocalEventHooksQuiet({ type: "task.unblocked", payload, databasePath });
+      if (depTask)
+        emitSharedTaskEventQuiet({ type: "task.unblocked", task: depTask, data: { unblocked_by: id }, databasePath });
     }
   }
-  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"`);
+  return { ...task, status: "completed", locked_by: null, locked_at: null, completed_at: timestamp, confidence, version: finalVersion, updated_at: timestamp, metadata: meta };
 }
-function isValidRecurrenceRule(rule) {
-  try {
-    parseRecurrenceRule(rule);
-    return true;
-  } catch {
-    return false;
+function lockTask(id, agentId, db) {
+  const d = db || getDatabase();
+  const task = getTask(id, d);
+  if (!task)
+    throw new TaskNotFoundError(id);
+  if (task.status === "completed" || task.status === "cancelled") {
+    return {
+      success: false,
+      error: `Task is ${task.status} and cannot be locked`
+    };
   }
-}
-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();
+  if (task.locked_by === agentId && !isLockExpired(task.locked_at)) {
+    const timestamp2 = now();
+    d.run(`UPDATE tasks SET locked_at = ?, updated_at = ?, version = version + 1 WHERE id = ? AND locked_by = ?`, [timestamp2, timestamp2, id, agentId]);
+    logTaskChange(id, "lock_renew", "locked_by", agentId, agentId, agentId, d);
+    return { success: true, locked_by: agentId, locked_at: timestamp2, expires_at: lockExpiresAt(timestamp2) };
   }
-  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 cutoff = lockExpiryCutoff();
+  const timestamp = now();
+  const result = d.run(`UPDATE tasks SET locked_by = ?, locked_at = ?, version = version + 1, updated_at = ?
+     WHERE id = ? AND status NOT IN ('completed', 'cancelled') AND (locked_by IS NULL OR locked_by = ? OR locked_at < ?)`, [agentId, timestamp, timestamp, id, agentId, cutoff]);
+  if (result.changes === 0) {
+    const current = getTask(id, d);
+    if (!current)
+      throw new TaskNotFoundError(id);
+    if (current.status === "completed" || current.status === "cancelled") {
+      return {
+        success: false,
+        error: `Task is ${current.status} and cannot be locked`
+      };
     }
-    const next = new Date(base);
-    next.setDate(next.getDate() + daysToAdd);
-    return next.toISOString();
+    if (current.locked_by && !isLockExpired(current.locked_at)) {
+      return {
+        success: false,
+        locked_by: current.locked_by,
+        locked_at: current.locked_at,
+        error: `Task is locked by ${current.locked_by}`
+      };
+    }
+    return {
+      success: false,
+      error: `Task ${id} could not be locked because it changed during lock acquisition`
+    };
   }
-  throw new Error(`Cannot calculate next occurrence for rule: "${rule}"`);
-}
-var DAY_NAMES;
-var init_recurrence = __esm(() => {
-  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
-  };
-});
-
-// src/db/templates.ts
-var exports_templates = {};
-__export(exports_templates, {
-  updateTemplate: () => updateTemplate,
-  tasksFromTemplate: () => tasksFromTemplate,
-  taskFromTemplate: () => taskFromTemplate,
-  resolveVariables: () => resolveVariables,
-  previewTemplate: () => previewTemplate,
-  listTemplates: () => listTemplates,
-  listTemplateVersions: () => listTemplateVersions,
-  importTemplate: () => importTemplate,
-  getTemplateWithTasks: () => getTemplateWithTasks,
-  getTemplateVersion: () => getTemplateVersion,
-  getTemplateTasks: () => getTemplateTasks,
-  getTemplate: () => getTemplate,
-  exportTemplate: () => exportTemplate,
-  evaluateCondition: () => evaluateCondition,
-  deleteTemplate: () => deleteTemplate,
-  createTemplate: () => createTemplate,
-  addTemplateTasks: () => addTemplateTasks
-});
-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);
+  logTaskChange(id, "lock", "locked_by", task.locked_by, agentId, agentId, d);
+  return { success: true, locked_by: agentId, locked_at: timestamp, expires_at: lockExpiresAt(timestamp) };
 }
-function createTemplate(input, db) {
+function unlockTask(id, agentId, db) {
   const d = db || getDatabase();
-  const id = uuid();
-  const machineId = currentStorageMachineId(d);
-  d.run(`INSERT INTO task_templates (id, name, title_pattern, description, priority, tags, variables, project_id, plan_id, metadata, created_at, machine_id)
-     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(),
-    machineId
-  ]);
-  if (input.tasks && input.tasks.length > 0) {
-    addTemplateTasks(id, input.tasks, d);
+  const task = getTask(id, d);
+  if (!task)
+    throw new TaskNotFoundError(id);
+  if (agentId && task.locked_by && task.locked_by !== agentId) {
+    throw new LockError(id, task.locked_by);
   }
-  return getTemplate(id, d);
+  const timestamp = now();
+  d.run(`UPDATE tasks SET locked_by = NULL, locked_at = NULL, version = version + 1, updated_at = ?
+     WHERE id = ?`, [timestamp, id]);
+  return true;
 }
-function getTemplate(id, db) {
+function getTaskLockStatus(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;
+  const task = getTask(id, d);
+  if (!task)
+    throw new TaskNotFoundError(id);
+  const expired = isLockExpired(task.locked_at);
+  return {
+    task_id: id,
+    locked: !!task.locked_by && !expired,
+    locked_by: task.locked_by,
+    locked_at: task.locked_at,
+    expires_at: lockExpiresAt(task.locked_at),
+    expired
+  };
 }
-function listTemplates(db) {
+function claimNextTask(agentId, filters, db) {
   const d = db || getDatabase();
-  return d.query("SELECT * FROM task_templates ORDER BY name").all().map(rowToTemplate);
+  const MAX_ATTEMPTS = 25;
+  const tried = new Set;
+  for (let attempt = 0;attempt < MAX_ATTEMPTS; attempt++) {
+    const outcome = d.transaction(() => {
+      const task = getNextTask(agentId, filters, d);
+      if (!task)
+        return { done: true, task: null };
+      if (tried.has(task.id))
+        return { done: true, task: null };
+      tried.add(task.id);
+      try {
+        return { done: true, task: startTask(task.id, agentId, d) };
+      } catch {
+        return { done: false, task: null };
+      }
+    })();
+    if (outcome.done)
+      return outcome.task;
+  }
+  return null;
 }
-function deleteTemplate(id, db) {
+function getNextTask(agentId, filters, db) {
   const d = db || getDatabase();
-  const resolved = resolveTemplateId(id, d);
-  if (!resolved)
-    return false;
-  const template = getTemplate(resolved, d);
-  if (!template)
-    return false;
-  recordStorageTombstone({
-    object_type: "templates",
-    object_id: resolved,
-    payload: template,
-    version: template.version
-  }, d);
-  return d.run("DELETE FROM task_templates WHERE id = ?", [resolved]).changes > 0;
-}
-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 sets = ["version = version + 1"];
-  const values = [];
-  if (updates.name !== undefined) {
-    sets.push("name = ?");
-    values.push(updates.name);
-  }
-  if (updates.title_pattern !== undefined) {
-    sets.push("title_pattern = ?");
-    values.push(updates.title_pattern);
-  }
-  if (updates.description !== undefined) {
-    sets.push("description = ?");
-    values.push(updates.description);
+  clearExpiredLocks(d);
+  const conditions = ["status = 'pending'", "(locked_by IS NULL OR locked_at < ?)"];
+  const params = [lockExpiryCutoff()];
+  if (filters?.project_id) {
+    conditions.push("project_id = ?");
+    params.push(filters.project_id);
   }
-  if (updates.priority !== undefined) {
-    sets.push("priority = ?");
-    values.push(updates.priority);
+  if (filters?.task_list_id) {
+    conditions.push("task_list_id = ?");
+    params.push(filters.task_list_id);
   }
-  if (updates.tags !== undefined) {
-    sets.push("tags = ?");
-    values.push(JSON.stringify(updates.tags));
+  if (filters?.plan_id) {
+    conditions.push("plan_id = ?");
+    params.push(filters.plan_id);
   }
-  if (updates.variables !== undefined) {
-    sets.push("variables = ?");
-    values.push(JSON.stringify(updates.variables));
+  if (filters?.tags && filters.tags.length > 0) {
+    const placeholders = filters.tags.map(() => "?").join(",");
+    conditions.push(`id IN (SELECT task_id FROM task_tags WHERE tag IN (${placeholders}))`);
+    params.push(...filters.tags);
   }
-  if (updates.project_id !== undefined) {
-    sets.push("project_id = ?");
-    values.push(updates.project_id);
+  conditions.push("id NOT IN (SELECT td.task_id FROM task_dependencies td JOIN tasks dep ON dep.id = td.depends_on WHERE dep.status != 'completed')");
+  const where = conditions.join(" AND ");
+  let recentProjectIds = [];
+  if (agentId) {
+    const recentRows = d.query(`SELECT DISTINCT project_id FROM tasks WHERE assigned_to = ? AND status = 'completed' AND project_id IS NOT NULL ORDER BY completed_at DESC LIMIT 3`).all(agentId);
+    recentProjectIds = recentRows.map((r) => r.project_id);
   }
-  if (updates.plan_id !== undefined) {
-    sets.push("plan_id = ?");
-    values.push(updates.plan_id);
+  let sql = `SELECT * FROM tasks WHERE ${where} ORDER BY `;
+  if (agentId) {
+    sql += `CASE WHEN assigned_to = ? THEN 0 WHEN assigned_to IS NULL THEN 1 ELSE 2 END, `;
+    params.push(agentId);
   }
-  if (updates.metadata !== undefined) {
-    sets.push("metadata = ?");
-    values.push(JSON.stringify(updates.metadata));
+  if (recentProjectIds.length > 0) {
+    const placeholders = recentProjectIds.map(() => "?").join(",");
+    sql += `CASE WHEN project_id IN (${placeholders}) THEN 0 ELSE 1 END, `;
+    params.push(...recentProjectIds);
   }
-  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
-  };
+  sql += `CASE priority WHEN 'critical' THEN 0 WHEN 'high' THEN 1 WHEN 'medium' THEN 2 WHEN 'low' THEN 3 END, created_at ASC LIMIT 1`;
+  const row = d.query(sql).get(...params);
+  return row ? rowToTask(row) : null;
 }
-function addTemplateTasks(templateId, tasks, db) {
+function getActiveWork(filters, 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));
+  clearExpiredLocks(d);
+  const conditions = ["status = 'in_progress'"];
+  const params = [];
+  if (filters?.project_id) {
+    conditions.push("project_id = ?");
+    params.push(filters.project_id);
   }
-  return results;
-}
-function getTemplateWithTasks(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 };
+  if (filters?.task_list_id) {
+    conditions.push("task_list_id = ?");
+    params.push(filters.task_list_id);
+  }
+  const where = conditions.join(" AND ");
+  const rows = d.query(`SELECT id, short_id, title, priority, assigned_to, locked_by, locked_at, updated_at FROM tasks WHERE ${where} ORDER BY
+    CASE priority WHEN 'critical' THEN 0 WHEN 'high' THEN 1 WHEN 'medium' THEN 2 WHEN 'low' THEN 3 END,
+    updated_at DESC`).all(...params);
+  return rows;
 }
-function getTemplateTasks(templateId, db) {
+function getTasksChangedSince(since, filters, 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);
-}
-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 conditions = ["updated_at > ?"];
+  const params = [since];
+  if (filters?.project_id) {
+    conditions.push("project_id = ?");
+    params.push(filters.project_id);
   }
-  const truthyMatch = trimmed.match(/^\{([^}]+)\}$/);
-  if (truthyMatch) {
-    const varName = truthyMatch[1];
-    const val = variables[varName];
-    return !!val && val !== "" && val !== "false";
+  if (filters?.task_list_id) {
+    conditions.push("task_list_id = ?");
+    params.push(filters.task_list_id);
   }
-  return true;
+  const where = conditions.join(" AND ");
+  const rows = d.query(`SELECT * FROM tasks WHERE ${where} ORDER BY updated_at DESC`).all(...params);
+  return rows.map(rowToTask);
 }
-function exportTemplate(id, db) {
+function failTask(id, agentId, reason, options, 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
-    }))
+  const databasePath = databasePathFromDatabase(d);
+  const task = getTask(id, d);
+  if (!task)
+    throw new TaskNotFoundError(id);
+  const meta = {
+    ...task.metadata,
+    _failure: {
+      reason: reason || "Unknown failure",
+      error_code: options?.error_code || null,
+      failed_by: agentId || null,
+      failed_at: now(),
+      retry_requested: options?.retry || false
+    }
+  };
+  const timestamp = now();
+  const failTx = d.transaction(() => {
+    const res = d.run(`UPDATE tasks SET status = 'failed', locked_by = NULL, locked_at = NULL, metadata = ?, version = version + 1, updated_at = ?
+       WHERE id = ? AND version = ?`, [JSON.stringify(meta), timestamp, id, task.version]);
+    if (res.changes === 0) {
+      const current = getTask(id, d);
+      throw new VersionConflictError(id, task.version, current?.version ?? -1);
+    }
+  });
+  failTx();
+  const failedTask = {
+    ...task,
+    status: "failed",
+    locked_by: null,
+    locked_at: null,
+    metadata: meta,
+    version: task.version + 1,
+    updated_at: timestamp
   };
+  logTaskChange(id, "fail", "status", task.status, "failed", agentId || null, d);
+  const failurePayload = taskEventData(failedTask, { reason, error_code: options?.error_code, agent_id: agentId });
+  dispatchWebhook2("task.failed", failurePayload, d).catch(() => {});
+  emitLocalEventHooksQuiet({ type: "task.failed", payload: failurePayload, databasePath });
+  emitSharedTaskEventQuiet({ type: "task.failed", task: failedTask, data: { reason, error_code: options?.error_code, agent_id: agentId }, severity: "warning", databasePath });
+  let retryTask;
+  if (options?.retry) {
+    const retryCount = (task.retry_count || 0) + 1;
+    const maxRetries = task.max_retries || 3;
+    if (retryCount > maxRetries) {
+      d.run("UPDATE tasks SET metadata = ? WHERE id = ?", [
+        JSON.stringify({ ...meta, _retry_exhausted: { retry_count: retryCount - 1, max_retries: maxRetries } }),
+        id
+      ]);
+    } else {
+      const backoffMinutes = Math.pow(5, retryCount - 1);
+      const retryAfter = options.retry_after || new Date(Date.now() + backoffMinutes * 60 * 1000).toISOString();
+      let title = task.title;
+      if (task.short_id && title.startsWith(task.short_id + ": ")) {
+        title = title.slice(task.short_id.length + 2);
+      }
+      retryTask = createTask({
+        title,
+        description: task.description ?? undefined,
+        priority: task.priority,
+        project_id: task.project_id ?? undefined,
+        task_list_id: task.task_list_id ?? undefined,
+        plan_id: task.plan_id ?? undefined,
+        assigned_to: task.assigned_to ?? undefined,
+        tags: task.tags,
+        metadata: { ...task.metadata, _retry: { original_id: task.id, retry_count: retryCount, max_retries: maxRetries, retry_after: retryAfter, failure_reason: reason } },
+        estimated_minutes: task.estimated_minutes ?? undefined,
+        recurrence_rule: task.recurrence_rule ?? undefined,
+        due_at: retryAfter
+      }, d);
+      d.run("UPDATE tasks SET retry_count = ?, max_retries = ?, retry_after = ? WHERE id = ?", [retryCount, maxRetries, retryAfter, retryTask.id]);
+    }
+  }
+  return { task: failedTask, retryTask };
 }
-function importTemplate(json, db) {
+function getStaleTasks(staleQuery = 30, filters, 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 staleMinutes = typeof staleQuery === "number" ? staleQuery : staleQuery.minutes ?? (staleQuery.hours !== undefined ? staleQuery.hours * 60 : 30);
+  const effectiveFilters = typeof staleQuery === "number" ? filters : { project_id: staleQuery.project_id, task_list_id: staleQuery.task_list_id };
+  const cutoff = new Date(Date.now() - staleMinutes * 60 * 1000).toISOString();
+  const conditions = [
+    "status = 'in_progress'",
+    "(updated_at < ? OR (locked_at IS NOT NULL AND locked_at < ?))"
+  ];
+  const params = [cutoff, cutoff];
+  if (effectiveFilters?.project_id) {
+    conditions.push("project_id = ?");
+    params.push(effectiveFilters.project_id);
+  }
+  if (effectiveFilters?.task_list_id) {
+    conditions.push("task_list_id = ?");
+    params.push(effectiveFilters.task_list_id);
+  }
+  const where = conditions.join(" AND ");
+  const rows = d.query(`SELECT * FROM tasks WHERE ${where} ORDER BY updated_at ASC`).all(...params);
+  return rows.map(rowToTask);
 }
-function getTemplateVersion(id, version, db) {
+function stealTask(agentId, opts, db) {
   const d = db || getDatabase();
-  const resolved = resolveTemplateId(id, d);
-  if (!resolved)
+  const databasePath = databasePathFromDatabase(d);
+  const staleMinutes = opts?.stale_minutes ?? 30;
+  const staleTasks = getStaleTasks(staleMinutes, { project_id: opts?.project_id, task_list_id: opts?.task_list_id }, d);
+  if (staleTasks.length === 0)
     return null;
-  const row = d.query("SELECT * FROM template_versions WHERE template_id = ? AND version = ?").get(resolved, version);
-  return row || null;
+  const priorityOrder = { critical: 0, high: 1, medium: 2, low: 3 };
+  staleTasks.sort((a, b) => (priorityOrder[a.priority] ?? 9) - (priorityOrder[b.priority] ?? 9));
+  const target = staleTasks[0];
+  const timestamp = now();
+  const cutoff = new Date(Date.now() - staleMinutes * 60 * 1000).toISOString();
+  const result = d.run(`UPDATE tasks SET assigned_to = ?, locked_by = ?, locked_at = ?, updated_at = ?, version = version + 1
+     WHERE id = ? AND status = 'in_progress' AND (updated_at < ? OR (locked_at IS NOT NULL AND locked_at < ?))`, [agentId, agentId, timestamp, timestamp, target.id, cutoff, cutoff]);
+  if (result.changes === 0)
+    return null;
+  logTaskChange(target.id, "steal", "assigned_to", target.assigned_to, agentId, agentId, d);
+  logTaskChange(target.id, "steal", "locked_by", target.locked_by, agentId, agentId, d);
+  const stolenTask = { ...target, assigned_to: agentId, locked_by: agentId, locked_at: timestamp, updated_at: timestamp, version: target.version + 1 };
+  const payload = taskEventData(stolenTask, { agent_id: agentId, stolen_from: target.assigned_to });
+  dispatchWebhook2("task.assigned", payload, d).catch(() => {});
+  emitLocalEventHooksQuiet({ type: "task.assigned", payload, databasePath });
+  emitSharedTaskEventQuiet({ type: "task.assigned", task: stolenTask, data: { agent_id: agentId, stolen_from: target.assigned_to }, databasePath });
+  return stolenTask;
 }
-function listTemplateVersions(id, db) {
+function claimOrSteal(agentId, filters, 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);
-}
-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;
-    }
-  }
-  const missing = [];
-  for (const v of templateVars) {
-    if (v.required && merged[v.name] === undefined) {
-      missing.push(v.name);
+  const tx = d.transaction(() => {
+    const next = getNextTask(agentId, filters, d);
+    if (next) {
+      const started = startTask(next.id, agentId, d);
+      return { task: started, stolen: false };
     }
-  }
-  if (missing.length > 0) {
-    throw new Error(`Missing required template variable(s): ${missing.join(", ")}`);
-  }
-  return merged;
+    const stolen = stealTask(agentId, { stale_minutes: filters?.stale_minutes, project_id: filters?.project_id, task_list_id: filters?.task_list_id }, d);
+    if (stolen)
+      return { task: stolen, stolen: true };
+    return null;
+  });
+  return tx();
 }
-function substituteVars(text, variables) {
-  let result = text;
-  for (const [key, val] of Object.entries(variables)) {
-    result = result.replace(new RegExp(`\\{${key}\\}`, "g"), val);
+function spawnNextRecurrence(completedTask, db, completedAt) {
+  const recurrenceBase = completedTask.due_at ? new Date(completedTask.due_at) : new Date(completedAt);
+  const dueAt = nextOccurrence(completedTask.recurrence_rule, recurrenceBase);
+  let title = completedTask.title;
+  if (completedTask.short_id && title.startsWith(completedTask.short_id + ": ")) {
+    title = title.slice(completedTask.short_id.length + 2);
   }
-  return result;
+  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,
+    sla_minutes: completedTask.sla_minutes ?? undefined,
+    recurrence_rule: completedTask.recurrence_rule,
+    recurrence_parent_id: recurrenceParentId,
+    due_at: dueAt
+  }, db);
 }
-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}`);
-  }
-  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];
-  }
-  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);
+var MAX_SPAWN_DEPTH = 10;
+var init_task_lifecycle = __esm(() => {
+  init_types();
+  init_database();
+  init_completion_guard();
+  init_event_emission_safety();
+  init_event_hooks();
+  init_shared_events();
+  init_audit();
+  init_recurrence();
+  init_webhooks();
+  init_templates();
+  init_task_crud();
+  init_task_graph();
+});
+
+// src/db/task-crud.ts
+function rowToTask(row) {
+  return {
+    ...row,
+    tags: JSON.parse(row.tags || "[]"),
+    metadata: JSON.parse(row.metadata || "{}"),
+    status: row.status,
+    priority: row.priority,
+    requires_approval: !!row.requires_approval
+  };
+}
+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);
   }
-  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);
-      }
+}
+function replaceTaskTags(taskId, tags, db) {
+  db.run("DELETE FROM task_tags WHERE task_id = ?", [taskId]);
+  insertTaskTags(taskId, tags, db);
+}
+function addMetadataConditions(metadata, conditions, params) {
+  if (!metadata)
+    return;
+  for (const [key, value] of Object.entries(metadata)) {
+    if (!/^[A-Za-z0-9_.-]+$/.test(key)) {
+      throw new Error(`Invalid metadata filter key: ${key}`);
     }
+    conditions.push(`json_extract(metadata, '$."${key}"') = ?`);
+    params.push(value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean" ? value : JSON.stringify(value));
   }
-  return createdTasks;
 }
-function previewTemplate(templateId, variables, db) {
+function createTask(input, 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))
+  const timestamp = now();
+  const tags = input.tags || [];
+  const machineId = currentStorageMachineId(d);
+  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, cycle_id, title, description, status, priority, agent_id, assigned_to, session_id, working_dir, tags, metadata, version, created_at, updated_at, due_at, estimated_minutes, sla_minutes, confidence, retry_count, max_retries, retry_after, 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, machine_id)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
+        id,
+        null,
+        input.project_id || null,
+        input.parent_id || null,
+        input.plan_id || null,
+        input.task_list_id || null,
+        input.cycle_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.sla_minutes ?? null,
+        input.confidence ?? null,
+        input.retry_count ?? 0,
+        input.max_retries ?? 3,
+        input.retry_after ?? 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,
+        machineId
+      ]);
+      break;
+    } catch (e) {
+      if (attempt < 2 && e?.message?.includes("UNIQUE constraint failed: tasks.id")) {
+        id = uuid();
         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
-      });
+      }
+      throw e;
     }
   }
-  return {
-    template_id: template.id,
-    template_name: template.name,
-    description: template.description,
-    variables: template.variables,
-    resolved_variables: resolved,
-    tasks
-  };
-}
-var init_templates = __esm(() => {
-  init_database();
-  init_tasks();
-  init_storage_tombstones();
-});
-
-// src/db/task-graph.ts
-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 (tags.length > 0) {
+    insertTaskTags(id, tags, d);
   }
-  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);
+  const task = getTask(id, d);
+  const payload = taskEventData(task);
+  const databasePath = databasePathFromDatabase(d);
+  dispatchWebhook2("task.created", payload, d).catch(() => {});
+  emitLocalEventHooksQuiet({ type: "task.created", payload, databasePath });
+  emitSharedTaskEventQuiet({ type: "task.created", task, databasePath });
+  return task;
 }
-function getTaskDependents(taskId, db) {
+function getTask(id, db) {
   const d = db || getDatabase();
-  return d.query("SELECT * FROM task_dependencies WHERE depends_on = ?").all(taskId);
+  const row = d.query("SELECT * FROM tasks WHERE id = ?").get(id);
+  if (!row)
+    return null;
+  return rowToTask(row);
 }
-function cloneTask(taskId, overrides, db) {
+function getTaskWithRelations(id, 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
+  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
   };
-  return createTask(input, d);
 }
-function getTaskGraph(taskId, direction = "both", db) {
+function listTasks(filter = {}, 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 };
+  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);
   }
-  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.ids && filter.ids.length > 0) {
+    conditions.push(`id IN (${filter.ids.map(() => "?").join(",")})`);
+    params.push(...filter.ids);
   }
-  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);
+  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 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 (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 (target.project_id !== undefined) {
-    sets.push("project_id = ?");
-    params.push(target.project_id);
+  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 (target.plan_id !== undefined) {
-    sets.push("plan_id = ?");
-    params.push(target.plan_id);
+  if (filter.assigned_to) {
+    conditions.push("assigned_to = ?");
+    params.push(filter.assigned_to);
   }
-  params.push(taskId);
-  d.run(`UPDATE tasks SET ${sets.join(", ")} WHERE id = ?`, params);
-  return getTask(taskId, d);
-}
-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);
+  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);
     }
   }
-  return false;
+  addMetadataConditions(filter.metadata, conditions, params);
+  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, id ASC${limitClause}`).all(...params);
+  return rows.map(rowToTask);
 }
-var init_task_graph = __esm(() => {
-  init_types();
-  init_database();
-  init_task_crud();
-});
-
-// src/db/task-lifecycle.ts
-function lockExpiresAt(lockedAt) {
-  if (!lockedAt)
-    return null;
-  return new Date(new Date(lockedAt).getTime() + LOCK_EXPIRY_MINUTES * 60 * 1000).toISOString();
+function getTaskByFingerprint(fingerprint, db) {
+  const tasks = listTasks({ metadata: { fingerprint }, limit: 1, include_archived: true }, db);
+  return tasks[0] ?? null;
 }
-function assertStartable(task, agentId) {
-  if (task.status === "pending")
-    return;
-  if (task.status === "in_progress")
-    return;
-  throw new Error(`Task is ${task.status} and cannot be started by ${agentId}`);
+function mergeTaskMetadata(current, next, fingerprint) {
+  return {
+    ...current,
+    ...next ?? {},
+    fingerprint
+  };
 }
-function getBlockingDeps(id, db) {
+function upsertTaskByFingerprint(input, db) {
   const d = db || getDatabase();
-  const deps = getTaskDependencies(id, d);
-  if (deps.length === 0)
-    return [];
-  const blocking = [];
-  for (const dep of deps) {
-    const task = getTask(dep.depends_on, d);
-    if (task && task.status !== "completed")
-      blocking.push(task);
-  }
-  return blocking;
+  const fingerprint = input.fingerprint.trim();
+  if (!fingerprint)
+    throw new Error("fingerprint is required");
+  const tx = d.transaction(() => {
+    const existing = getTaskByFingerprint(fingerprint, d);
+    const metadata = mergeTaskMetadata(existing?.metadata ?? {}, input.metadata, fingerprint);
+    if (!existing) {
+      const task2 = createTask({ ...input, metadata }, d);
+      return { task: task2, created: true };
+    }
+    const task = updateTask(existing.id, {
+      version: existing.version,
+      title: input.title,
+      description: input.description,
+      status: input.status,
+      priority: input.priority,
+      project_id: input.project_id,
+      assigned_to: input.assigned_to,
+      working_dir: input.working_dir,
+      plan_id: input.plan_id,
+      task_list_id: input.task_list_id,
+      tags: input.tags,
+      metadata,
+      due_at: input.due_at,
+      estimated_minutes: input.estimated_minutes,
+      sla_minutes: input.sla_minutes,
+      confidence: input.confidence,
+      retry_count: input.retry_count,
+      max_retries: input.max_retries,
+      retry_after: input.retry_after,
+      requires_approval: input.requires_approval,
+      recurrence_rule: input.recurrence_rule,
+      task_type: input.task_type
+    }, d);
+    return { task, created: false };
+  });
+  return tx();
 }
-function startTask(id, agentId, db) {
+function countTasks(filter = {}, db) {
   const d = db || getDatabase();
-  const databasePath = databasePathFromDatabase(d);
-  const task = getTask(id, d);
-  if (!task)
-    throw new TaskNotFoundError(id);
-  assertStartable(task, agentId);
-  const blocking = getBlockingDeps(id, d);
-  if (blocking.length > 0) {
-    const blockerIds = blocking.map((b) => b.id.slice(0, 8)).join(", ");
-    emitLocalEventHooksQuiet({
-      type: "task.blocked",
-      payload: {
-        id,
-        agent_id: agentId,
-        title: task.title,
-        blockers: blocking.map((b) => ({ id: b.id, short_id: b.short_id, title: b.title, status: b.status }))
-      },
-      databasePath
-    });
-    throw new Error(`Task is blocked by ${blocking.length} unfinished dependency(ies): ${blockerIds}`);
-  }
-  const cutoff = lockExpiryCutoff();
-  const timestamp = now();
-  const result = d.run(`UPDATE tasks SET status = 'in_progress', assigned_to = ?, locked_by = ?, locked_at = ?, started_at = COALESCE(started_at, ?), version = version + 1, updated_at = ?
-     WHERE id = ? AND status IN ('pending', 'in_progress') AND (locked_by IS NULL OR locked_by = ? OR locked_at < ?)`, [agentId, agentId, timestamp, timestamp, timestamp, id, agentId, cutoff]);
-  if (result.changes === 0) {
-    const current = getTask(id, d);
-    if (!current)
-      throw new TaskNotFoundError(id);
-    assertStartable(current, agentId);
-    if (current.locked_by && current.locked_by !== agentId && !isLockExpired(current.locked_at)) {
-      throw new LockError(id, current.locked_by);
-    }
-    throw new Error(`Task ${id} could not be started because it changed during claim`);
+  const conditions = [];
+  const params = [];
+  if (filter.project_id) {
+    conditions.push("project_id = ?");
+    params.push(filter.project_id);
   }
-  logTaskChange(id, "start", "status", "pending", "in_progress", agentId, d);
-  const startedTask = { ...task, status: "in_progress", assigned_to: agentId, locked_by: agentId, locked_at: timestamp, started_at: task.started_at || timestamp, version: task.version + 1, updated_at: timestamp };
-  const payload = taskEventData(startedTask, { agent_id: agentId });
-  dispatchWebhook2("task.started", payload, d).catch(() => {});
-  emitLocalEventHooksQuiet({ type: "task.started", payload, databasePath });
-  emitSharedTaskEventQuiet({ type: "task.started", task: startedTask, data: { agent_id: agentId }, databasePath });
-  return startedTask;
-}
-function completeTask(id, agentId, db, options) {
-  const d = db || getDatabase();
-  const databasePath = databasePathFromDatabase(d);
-  const task = getTask(id, d);
-  if (!task)
-    throw new TaskNotFoundError(id);
-  if (agentId && task.locked_by && task.locked_by !== agentId && !isLockExpired(task.locked_at)) {
-    throw new LockError(id, task.locked_by);
+  if (filter.ids && filter.ids.length > 0) {
+    conditions.push(`id IN (${filter.ids.map(() => "?").join(",")})`);
+    params.push(...filter.ids);
   }
-  checkCompletionGuard(task, agentId || null, d);
-  const evidence = options ? { files_changed: options.files_changed, test_results: options.test_results, commit_hash: options.commit_hash, notes: options.notes, attachment_ids: options.attachment_ids } : undefined;
-  const hasEvidence = evidence && (evidence.files_changed || evidence.test_results || evidence.commit_hash || evidence.notes || evidence.attachment_ids);
-  const completionMeta = {};
-  if (hasEvidence)
-    completionMeta._evidence = evidence;
-  if (options?.confidence !== undefined) {
-    completionMeta._completion = { confidence: options.confidence };
+  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 hasMeta = Object.keys(completionMeta).length > 0;
-  const timestamp = options?.completed_at || now();
-  const confidence = options?.confidence !== undefined ? options.confidence : null;
-  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);
-      }
+  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);
     }
-    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);
-  const completedTaskForEvent = {
-    ...task,
-    status: "completed",
-    locked_by: null,
-    locked_at: null,
-    completed_at: timestamp,
-    confidence,
-    version: task.version + 1,
-    updated_at: timestamp,
-    metadata: hasMeta ? { ...task.metadata, ...completionMeta } : task.metadata
-  };
-  const completionPayload = taskEventData(completedTaskForEvent, { agent_id: agentId, completed_at: timestamp });
-  dispatchWebhook2("task.completed", completionPayload, d).catch(() => {});
-  emitLocalEventHooksQuiet({ type: "task.completed", payload: completionPayload, databasePath });
-  emitSharedTaskEventQuiet({ type: "task.completed", task: completedTaskForEvent, data: { agent_id: agentId, completed_at: timestamp }, databasePath });
-  let spawnedTask = null;
-  if (task.recurrence_rule && !options?.skip_recurrence) {
-    spawnedTask = spawnNextRecurrence(task, d, timestamp);
   }
-  let spawnedFromTemplate = null;
-  if (task.spawns_template_id) {
-    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`);
+  if (filter.priority) {
+    if (Array.isArray(filter.priority)) {
+      conditions.push(`priority IN (${filter.priority.map(() => "?").join(",")})`);
+      params.push(...filter.priority);
     } 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 {}
+      conditions.push("priority = ?");
+      params.push(filter.priority);
     }
   }
-  const meta = hasMeta ? { ...task.metadata, ...completionMeta } : task.metadata;
-  if (spawnedTask) {
-    meta._next_recurrence = { id: spawnedTask.id, short_id: spawnedTask.short_id, due_at: spawnedTask.due_at };
+  if (filter.assigned_to) {
+    conditions.push("assigned_to = ?");
+    params.push(filter.assigned_to);
   }
-  if (spawnedFromTemplate) {
-    meta._spawned_task = { id: spawnedFromTemplate.id, short_id: spawnedFromTemplate.short_id, title: spawnedFromTemplate.title };
+  if (filter.agent_id) {
+    conditions.push("agent_id = ?");
+    params.push(filter.agent_id);
   }
-  const unblockedDeps = d.query(`SELECT DISTINCT t.id, t.short_id, t.title FROM tasks t
-     JOIN task_dependencies td ON td.task_id = t.id
-     WHERE td.depends_on = ? AND t.status = 'pending'
-     AND NOT EXISTS (
-       SELECT 1 FROM task_dependencies td2
-       JOIN tasks dep2 ON dep2.id = td2.depends_on
-       WHERE td2.task_id = t.id AND dep2.status NOT IN ('completed', 'cancelled') AND dep2.id != ?
-     )`).all(id, id);
-  if (unblockedDeps.length > 0) {
-    meta._unblocked = unblockedDeps.map((d2) => ({ id: d2.id, short_id: d2.short_id, title: d2.title }));
-    for (const dep of unblockedDeps) {
-      const depTask = getTask(dep.id, d);
-      const payload = depTask ? taskEventData(depTask, { unblocked_by: id }) : { id: dep.id, unblocked_by: id, title: dep.title };
-      dispatchWebhook2("task.unblocked", payload, d).catch(() => {});
-      emitLocalEventHooksQuiet({ type: "task.unblocked", payload, databasePath });
-      if (depTask)
-        emitSharedTaskEventQuiet({ type: "task.unblocked", task: depTask, data: { unblocked_by: id }, databasePath });
+  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);
     }
   }
-  return { ...task, status: "completed", locked_by: null, locked_at: null, completed_at: timestamp, confidence, version: task.version + 1, updated_at: timestamp, metadata: meta };
+  addMetadataConditions(filter.metadata, conditions, params);
+  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 lockTask(id, agentId, db) {
+function updateTask(id, input, db) {
   const d = db || getDatabase();
   const task = getTask(id, d);
   if (!task)
     throw new TaskNotFoundError(id);
-  if (task.status === "completed" || task.status === "cancelled") {
-    return {
-      success: false,
-      error: `Task is ${task.status} and cannot be locked`
-    };
-  }
-  if (task.locked_by === agentId && !isLockExpired(task.locked_at)) {
-    const timestamp2 = now();
-    d.run(`UPDATE tasks SET locked_at = ?, updated_at = ?, version = version + 1 WHERE id = ? AND locked_by = ?`, [timestamp2, timestamp2, id, agentId]);
-    logTaskChange(id, "lock_renew", "locked_by", agentId, agentId, agentId, d);
-    return { success: true, locked_by: agentId, locked_at: timestamp2, expires_at: lockExpiresAt(timestamp2) };
+  if (task.version !== input.version) {
+    throw new VersionConflictError(id, input.version, task.version);
   }
-  const cutoff = lockExpiryCutoff();
   const timestamp = now();
-  const result = d.run(`UPDATE tasks SET locked_by = ?, locked_at = ?, version = version + 1, updated_at = ?
-     WHERE id = ? AND status NOT IN ('completed', 'cancelled') AND (locked_by IS NULL OR locked_by = ? OR locked_at < ?)`, [agentId, timestamp, timestamp, id, agentId, cutoff]);
-  if (result.changes === 0) {
-    const current = getTask(id, d);
-    if (!current)
-      throw new TaskNotFoundError(id);
-    if (current.status === "completed" || current.status === "cancelled") {
-      return {
-        success: false,
-        error: `Task is ${current.status} and cannot be locked`
-      };
+  const completionTimestamp = input.completed_at ?? timestamp;
+  const sets = ["version = version + 1", "updated_at = ?"];
+  const params = [timestamp];
+  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);
     }
-    if (current.locked_by && !isLockExpired(current.locked_at)) {
-      return {
-        success: false,
-        locked_by: current.locked_by,
-        locked_at: current.locked_at,
-        error: `Task is locked by ${current.locked_by}`
-      };
+    sets.push("status = ?");
+    params.push(input.status);
+    if (input.status === "completed") {
+      sets.push("completed_at = ?");
+      params.push(completionTimestamp);
+      sets.push("locked_by = NULL");
+      sets.push("locked_at = NULL");
+    } else if (task.status === "completed" && input.completed_at === undefined) {
+      sets.push("completed_at = NULL");
     }
-    return {
-      success: false,
-      error: `Task ${id} could not be locked because it changed during lock acquisition`
-    };
   }
-  logTaskChange(id, "lock", "locked_by", task.locked_by, agentId, agentId, d);
-  return { success: true, locked_by: agentId, locked_at: timestamp, expires_at: lockExpiresAt(timestamp) };
-}
-function unlockTask(id, agentId, db) {
-  const d = db || getDatabase();
-  const task = getTask(id, d);
-  if (!task)
-    throw new TaskNotFoundError(id);
-  if (agentId && task.locked_by && task.locked_by !== agentId) {
-    throw new LockError(id, task.locked_by);
+  if (input.priority !== undefined) {
+    sets.push("priority = ?");
+    params.push(input.priority);
   }
-  const timestamp = now();
-  d.run(`UPDATE tasks SET locked_by = NULL, locked_at = NULL, version = version + 1, updated_at = ?
-     WHERE id = ?`, [timestamp, id]);
-  return true;
-}
-function getTaskLockStatus(id, db) {
-  const d = db || getDatabase();
-  const task = getTask(id, d);
-  if (!task)
-    throw new TaskNotFoundError(id);
-  const expired = isLockExpired(task.locked_at);
-  return {
-    task_id: id,
-    locked: !!task.locked_by && !expired,
-    locked_by: task.locked_by,
-    locked_at: task.locked_at,
-    expires_at: lockExpiresAt(task.locked_at),
-    expired
-  };
-}
-function claimNextTask(agentId, filters, db) {
-  const d = db || getDatabase();
-  const tx = d.transaction(() => {
-    const task = getNextTask(agentId, filters, d);
-    if (!task)
-      return null;
-    return startTask(task.id, agentId, d);
-  });
-  return tx();
-}
-function getNextTask(agentId, filters, db) {
-  const d = db || getDatabase();
-  clearExpiredLocks(d);
-  const conditions = ["status = 'pending'", "(locked_by IS NULL OR locked_at < ?)"];
-  const params = [lockExpiryCutoff()];
-  if (filters?.project_id) {
-    conditions.push("project_id = ?");
-    params.push(filters.project_id);
+  if (input.project_id !== undefined) {
+    sets.push("project_id = ?");
+    params.push(input.project_id);
   }
-  if (filters?.task_list_id) {
-    conditions.push("task_list_id = ?");
-    params.push(filters.task_list_id);
+  if (input.assigned_to !== undefined) {
+    sets.push("assigned_to = ?");
+    params.push(input.assigned_to);
   }
-  if (filters?.plan_id) {
-    conditions.push("plan_id = ?");
-    params.push(filters.plan_id);
+  if (input.working_dir !== undefined) {
+    sets.push("working_dir = ?");
+    params.push(input.working_dir);
   }
-  if (filters?.tags && filters.tags.length > 0) {
-    const placeholders = filters.tags.map(() => "?").join(",");
-    conditions.push(`id IN (SELECT task_id FROM task_tags WHERE tag IN (${placeholders}))`);
-    params.push(...filters.tags);
+  if (input.tags !== undefined) {
+    sets.push("tags = ?");
+    params.push(JSON.stringify(input.tags));
   }
-  conditions.push("id NOT IN (SELECT td.task_id FROM task_dependencies td JOIN tasks dep ON dep.id = td.depends_on WHERE dep.status != 'completed')");
-  const where = conditions.join(" AND ");
-  let recentProjectIds = [];
-  if (agentId) {
-    const recentRows = d.query(`SELECT DISTINCT project_id FROM tasks WHERE assigned_to = ? AND status = 'completed' AND project_id IS NOT NULL ORDER BY completed_at DESC LIMIT 3`).all(agentId);
-    recentProjectIds = recentRows.map((r) => r.project_id);
+  if (input.metadata !== undefined) {
+    sets.push("metadata = ?");
+    params.push(JSON.stringify(input.metadata));
   }
-  let sql = `SELECT * FROM tasks WHERE ${where} ORDER BY `;
-  if (agentId) {
-    sql += `CASE WHEN assigned_to = ? THEN 0 WHEN assigned_to IS NULL THEN 1 ELSE 2 END, `;
-    params.push(agentId);
+  if (input.plan_id !== undefined) {
+    sets.push("plan_id = ?");
+    params.push(input.plan_id);
   }
-  if (recentProjectIds.length > 0) {
-    const placeholders = recentProjectIds.map(() => "?").join(",");
-    sql += `CASE WHEN project_id IN (${placeholders}) THEN 0 ELSE 1 END, `;
-    params.push(...recentProjectIds);
+  if (input.task_list_id !== undefined) {
+    sets.push("task_list_id = ?");
+    params.push(input.task_list_id);
   }
-  sql += `CASE priority WHEN 'critical' THEN 0 WHEN 'high' THEN 1 WHEN 'medium' THEN 2 WHEN 'low' THEN 3 END, created_at ASC LIMIT 1`;
-  const row = d.query(sql).get(...params);
-  return row ? rowToTask(row) : null;
-}
-function getActiveWork(filters, db) {
-  const d = db || getDatabase();
-  clearExpiredLocks(d);
-  const conditions = ["status = 'in_progress'"];
-  const params = [];
-  if (filters?.project_id) {
-    conditions.push("project_id = ?");
-    params.push(filters.project_id);
+  if (input.due_at !== undefined) {
+    sets.push("due_at = ?");
+    params.push(input.due_at);
   }
-  if (filters?.task_list_id) {
-    conditions.push("task_list_id = ?");
-    params.push(filters.task_list_id);
+  if (input.estimated_minutes !== undefined) {
+    sets.push("estimated_minutes = ?");
+    params.push(input.estimated_minutes);
   }
-  const where = conditions.join(" AND ");
-  const rows = d.query(`SELECT id, short_id, title, priority, assigned_to, locked_by, locked_at, updated_at FROM tasks WHERE ${where} ORDER BY
-    CASE priority WHEN 'critical' THEN 0 WHEN 'high' THEN 1 WHEN 'medium' THEN 2 WHEN 'low' THEN 3 END,
-    updated_at DESC`).all(...params);
-  return rows;
-}
-function getTasksChangedSince(since, filters, db) {
-  const d = db || getDatabase();
-  const conditions = ["updated_at > ?"];
-  const params = [since];
-  if (filters?.project_id) {
-    conditions.push("project_id = ?");
-    params.push(filters.project_id);
+  if (input.sla_minutes !== undefined) {
+    sets.push("sla_minutes = ?");
+    params.push(input.sla_minutes);
   }
-  if (filters?.task_list_id) {
-    conditions.push("task_list_id = ?");
-    params.push(filters.task_list_id);
+  if (input.actual_minutes !== undefined) {
+    sets.push("actual_minutes = ?");
+    params.push(input.actual_minutes);
   }
-  const where = conditions.join(" AND ");
-  const rows = d.query(`SELECT * FROM tasks WHERE ${where} ORDER BY updated_at DESC`).all(...params);
-  return rows.map(rowToTask);
-}
-function failTask(id, agentId, reason, options, db) {
-  const d = db || getDatabase();
-  const databasePath = databasePathFromDatabase(d);
-  const task = getTask(id, d);
-  if (!task)
-    throw new TaskNotFoundError(id);
-  const meta = {
-    ...task.metadata,
-    _failure: {
-      reason: reason || "Unknown failure",
-      error_code: options?.error_code || null,
-      failed_by: agentId || null,
-      failed_at: now(),
-      retry_requested: options?.retry || false
+  if (input.completed_at !== undefined && input.status !== "completed") {
+    sets.push("completed_at = ?");
+    params.push(input.completed_at);
+  }
+  if (input.confidence !== undefined) {
+    sets.push("confidence = ?");
+    params.push(input.confidence);
+  }
+  if (input.retry_count !== undefined) {
+    sets.push("retry_count = ?");
+    params.push(input.retry_count);
+  }
+  if (input.max_retries !== undefined) {
+    sets.push("max_retries = ?");
+    params.push(input.max_retries);
+  }
+  if (input.retry_after !== undefined) {
+    sets.push("retry_after = ?");
+    params.push(input.retry_after);
+  }
+  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 transitionedToCompleted = input.status === "completed" && task.status !== "completed";
+  if (transitionedToCompleted && task.recurrence_rule) {
+    try {
+      const { spawnNextRecurrence: spawnNextRecurrence2 } = (init_task_lifecycle(), __toCommonJS(exports_task_lifecycle));
+      spawnNextRecurrence2(task, d, completionTimestamp);
+    } catch (e) {
+      console.warn(`[tasks] failed to spawn next recurrence for ${id}: ${e instanceof Error ? e.message : String(e)}`);
     }
-  };
-  const timestamp = now();
-  d.run(`UPDATE tasks SET status = 'failed', locked_by = NULL, locked_at = NULL, metadata = ?, version = version + 1, updated_at = ?
-     WHERE id = ?`, [JSON.stringify(meta), timestamp, id]);
-  const failedTask = {
+  }
+  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.working_dir !== undefined && input.working_dir !== task.working_dir)
+    logTaskChange(id, "update", "working_dir", task.working_dir, input.working_dir, agentId, d);
+  if (input.approved_by !== undefined)
+    logTaskChange(id, "approve", "approved_by", null, input.approved_by, agentId, d);
+  const reopened = input.status !== undefined && input.status !== "completed" && task.status === "completed" && input.completed_at === undefined;
+  const completedNow = input.status === "completed";
+  const updatedTask = {
     ...task,
-    status: "failed",
-    locked_by: null,
-    locked_at: null,
-    metadata: meta,
+    ...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: timestamp
+    updated_at: timestamp,
+    locked_by: completedNow ? null : task.locked_by,
+    locked_at: completedNow ? null : task.locked_at,
+    completed_at: completedNow ? completionTimestamp : reopened ? null : input.completed_at !== undefined ? input.completed_at : task.completed_at,
+    sla_minutes: input.sla_minutes !== undefined ? input.sla_minutes : task.sla_minutes,
+    actual_minutes: input.actual_minutes ?? task.actual_minutes,
+    confidence: input.confidence !== undefined ? input.confidence : task.confidence,
+    retry_count: input.retry_count ?? task.retry_count,
+    max_retries: input.max_retries ?? task.max_retries,
+    retry_after: input.retry_after !== undefined ? input.retry_after : task.retry_after,
+    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 ? timestamp : task.approved_at
   };
-  logTaskChange(id, "fail", "status", task.status, "failed", agentId || null, d);
-  const failurePayload = taskEventData(failedTask, { reason, error_code: options?.error_code, agent_id: agentId });
-  dispatchWebhook2("task.failed", failurePayload, d).catch(() => {});
-  emitLocalEventHooksQuiet({ type: "task.failed", payload: failurePayload, databasePath });
-  emitSharedTaskEventQuiet({ type: "task.failed", task: failedTask, data: { reason, error_code: options?.error_code, agent_id: agentId }, severity: "warning", databasePath });
-  let retryTask;
-  if (options?.retry) {
-    const retryCount = (task.retry_count || 0) + 1;
-    const maxRetries = task.max_retries || 3;
-    if (retryCount > maxRetries) {
-      d.run("UPDATE tasks SET metadata = ? WHERE id = ?", [
-        JSON.stringify({ ...meta, _retry_exhausted: { retry_count: retryCount - 1, max_retries: maxRetries } }),
-        id
-      ]);
-    } else {
-      const backoffMinutes = Math.pow(5, retryCount - 1);
-      const retryAfter = options.retry_after || new Date(Date.now() + backoffMinutes * 60 * 1000).toISOString();
-      let title = task.title;
-      if (task.short_id && title.startsWith(task.short_id + ": ")) {
-        title = title.slice(task.short_id.length + 2);
-      }
-      retryTask = createTask({
-        title,
-        description: task.description ?? undefined,
-        priority: task.priority,
-        project_id: task.project_id ?? undefined,
-        task_list_id: task.task_list_id ?? undefined,
-        plan_id: task.plan_id ?? undefined,
-        assigned_to: task.assigned_to ?? undefined,
-        tags: task.tags,
-        metadata: { ...task.metadata, _retry: { original_id: task.id, retry_count: retryCount, max_retries: maxRetries, retry_after: retryAfter, failure_reason: reason } },
-        estimated_minutes: task.estimated_minutes ?? undefined,
-        recurrence_rule: task.recurrence_rule ?? undefined,
-        due_at: retryAfter
-      }, d);
-      d.run("UPDATE tasks SET retry_count = ?, max_retries = ?, retry_after = ? WHERE id = ?", [retryCount, maxRetries, retryAfter, retryTask.id]);
-    }
+  const databasePath = databasePathFromDatabase(d);
+  if (input.assigned_to !== undefined && input.assigned_to !== task.assigned_to) {
+    const payload = taskEventData(updatedTask, { assigned_to: input.assigned_to, old_assigned_to: task.assigned_to });
+    dispatchWebhook2("task.assigned", payload, d).catch(() => {});
+    emitLocalEventHooksQuiet({ type: "task.assigned", payload, databasePath });
+    emitSharedTaskEventQuiet({ type: "task.assigned", task: updatedTask, data: { old_assigned_to: task.assigned_to }, databasePath });
   }
-  return { task: failedTask, retryTask };
-}
-function getStaleTasks(staleQuery = 30, filters, db) {
-  const d = db || getDatabase();
-  const staleMinutes = typeof staleQuery === "number" ? staleQuery : staleQuery.minutes ?? (staleQuery.hours !== undefined ? staleQuery.hours * 60 : 30);
-  const effectiveFilters = typeof staleQuery === "number" ? filters : { project_id: staleQuery.project_id, task_list_id: staleQuery.task_list_id };
-  const cutoff = new Date(Date.now() - staleMinutes * 60 * 1000).toISOString();
-  const conditions = [
-    "status = 'in_progress'",
-    "(updated_at < ? OR (locked_at IS NOT NULL AND locked_at < ?))"
-  ];
-  const params = [cutoff, cutoff];
-  if (effectiveFilters?.project_id) {
-    conditions.push("project_id = ?");
-    params.push(effectiveFilters.project_id);
+  if (input.status !== undefined && input.status !== task.status) {
+    const payload = taskEventData(updatedTask, { old_status: task.status, new_status: input.status });
+    dispatchWebhook2("task.status_changed", payload, d).catch(() => {});
+    emitLocalEventHooksQuiet({ type: "task.status_changed", payload, databasePath });
+    emitSharedTaskEventQuiet({ type: "task.status_changed", task: updatedTask, data: { old_status: task.status, new_status: input.status }, databasePath });
   }
-  if (effectiveFilters?.task_list_id) {
-    conditions.push("task_list_id = ?");
-    params.push(effectiveFilters.task_list_id);
+  if (input.approved_by !== undefined) {
+    emitLocalEventHooksQuiet({ type: "approval.decided", payload: { id, approved_by: input.approved_by, title: task.title }, databasePath });
   }
-  const where = conditions.join(" AND ");
-  const rows = d.query(`SELECT * FROM tasks WHERE ${where} ORDER BY updated_at ASC`).all(...params);
-  return rows.map(rowToTask);
-}
-function stealTask(agentId, opts, db) {
-  const d = db || getDatabase();
-  const databasePath = databasePathFromDatabase(d);
-  const staleMinutes = opts?.stale_minutes ?? 30;
-  const staleTasks = getStaleTasks(staleMinutes, { project_id: opts?.project_id, task_list_id: opts?.task_list_id }, d);
-  if (staleTasks.length === 0)
-    return null;
-  const priorityOrder = { critical: 0, high: 1, medium: 2, low: 3 };
-  staleTasks.sort((a, b) => (priorityOrder[a.priority] ?? 9) - (priorityOrder[b.priority] ?? 9));
-  const target = staleTasks[0];
-  const timestamp = now();
-  const cutoff = new Date(Date.now() - staleMinutes * 60 * 1000).toISOString();
-  const result = d.run(`UPDATE tasks SET assigned_to = ?, locked_by = ?, locked_at = ?, updated_at = ?, version = version + 1
-     WHERE id = ? AND status = 'in_progress' AND (updated_at < ? OR (locked_at IS NOT NULL AND locked_at < ?))`, [agentId, agentId, timestamp, timestamp, target.id, cutoff, cutoff]);
-  if (result.changes === 0)
-    return null;
-  logTaskChange(target.id, "steal", "assigned_to", target.assigned_to, agentId, agentId, d);
-  logTaskChange(target.id, "steal", "locked_by", target.locked_by, agentId, agentId, d);
-  const stolenTask = { ...target, assigned_to: agentId, locked_by: agentId, locked_at: timestamp, updated_at: timestamp, version: target.version + 1 };
-  const payload = taskEventData(stolenTask, { agent_id: agentId, stolen_from: target.assigned_to });
-  dispatchWebhook2("task.assigned", payload, d).catch(() => {});
-  emitLocalEventHooksQuiet({ type: "task.assigned", payload, databasePath });
-  emitSharedTaskEventQuiet({ type: "task.assigned", task: stolenTask, data: { agent_id: agentId, stolen_from: target.assigned_to }, databasePath });
-  return stolenTask;
+  const updatePayload = taskEventData(updatedTask);
+  dispatchWebhook2("task.updated", updatePayload, d).catch(() => {});
+  emitLocalEventHooksQuiet({ type: "task.updated", payload: updatePayload, databasePath });
+  emitSharedTaskEventQuiet({ type: "task.updated", task: updatedTask, databasePath });
+  return updatedTask;
 }
-function claimOrSteal(agentId, filters, db) {
+function deleteTask(id, db) {
   const d = db || getDatabase();
-  const tx = d.transaction(() => {
-    const next = getNextTask(agentId, filters, d);
-    if (next) {
-      const started = startTask(next.id, agentId, d);
-      return { task: started, stolen: false };
-    }
-    const stolen = stealTask(agentId, { stale_minutes: filters?.stale_minutes, project_id: filters?.project_id, task_list_id: filters?.task_list_id }, d);
-    if (stolen)
-      return { task: stolen, stolen: true };
-    return null;
-  });
-  return tx();
-}
-function spawnNextRecurrence(completedTask, db, completedAt) {
-  const recurrenceBase = completedTask.due_at ? new Date(completedTask.due_at) : new Date(completedAt);
-  const dueAt = nextOccurrence(completedTask.recurrence_rule, recurrenceBase);
-  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,
-    sla_minutes: completedTask.sla_minutes ?? undefined,
-    recurrence_rule: completedTask.recurrence_rule,
-    recurrence_parent_id: recurrenceParentId,
-    due_at: dueAt
-  }, db);
+  const row = d.query("SELECT * FROM tasks WHERE id = ?").get(id);
+  if (!row)
+    return false;
+  recordStorageTombstone({
+    object_type: "tasks",
+    object_id: id,
+    payload: rowToTask(row),
+    version: row.version
+  }, d);
+  const result = d.run("DELETE FROM tasks WHERE id = ?", [id]);
+  return result.changes > 0;
 }
-var MAX_SPAWN_DEPTH = 10;
-var init_task_lifecycle = __esm(() => {
+var init_task_crud = __esm(() => {
   init_types();
   init_database();
   init_completion_guard();
@@ -7507,11 +7618,9 @@ var init_task_lifecycle = __esm(() => {
   init_event_hooks();
   init_shared_events();
   init_audit();
-  init_recurrence();
   init_webhooks();
-  init_templates();
-  init_task_crud();
-  init_task_graph();
+  init_checklists();
+  init_storage_tombstones();
 });
 
 // src/db/task-status.ts
@@ -7601,6 +7710,15 @@ function setTaskStatus(id, status, _agentId, db) {
       throw new TaskNotFoundError(id);
     if (task.status === status)
       return task;
+    if (status === "completed") {
+      try {
+        return completeTask(id, _agentId, d);
+      } catch (e) {
+        if (e instanceof VersionConflictError && attempt < 2)
+          continue;
+        throw e;
+      }
+    }
     try {
       return updateTask(id, { status, version: task.version }, d);
     } catch (e) {
@@ -11557,6 +11675,37 @@ function parseBoundedLimit(value, fallback, max) {
     return fallback;
   return Math.min(parsed, max);
 }
+function mapTaskError(e, json2) {
+  if (e instanceof VersionConflictError) {
+    return json2({
+      error: e.message,
+      code: VersionConflictError.code,
+      expected_version: e.expectedVersion,
+      current_version: e.actualVersion
+    }, 409);
+  }
+  if (e instanceof TaskNotFoundError) {
+    return json2({ error: e.message, code: TaskNotFoundError.code }, 404);
+  }
+  if (e instanceof LockError) {
+    return json2({ error: e.message, code: LockError.code }, 409);
+  }
+  if (e instanceof CompletionGuardError) {
+    return json2({
+      error: e.message,
+      code: CompletionGuardError.code,
+      retry_after: e.retryAfterSeconds ?? null
+    }, 409);
+  }
+  if (e instanceof Error && (/ is blocked by /.test(e.message) || /cannot be started/.test(e.message))) {
+    return json2({ error: e.message, code: "TASK_NOT_STARTABLE" }, 409);
+  }
+  return null;
+}
+function countRecurringTasks() {
+  const row = getDatabase().query("SELECT COUNT(*) as count FROM tasks WHERE recurrence_rule IS NOT NULL AND recurrence_rule != '' AND archived_at IS NULL").get();
+  return row?.count ?? 0;
+}
 function handleSseEvents(_req, url, ctx) {
   const agentId = url.searchParams.get("agent_id") || undefined;
   const projectId = url.searchParams.get("project_id") || undefined;
@@ -11635,35 +11784,40 @@ data: ${JSON.stringify({ type: "connected", agent_id: agentId, timestamp: new Da
   });
 }
 function handleHealth(_ctx, json2) {
-  const all = listTasks({ limit: 1e4 });
-  const stale = all.filter((t) => t.status === "in_progress" && new Date(t.updated_at).getTime() < Date.now() - 30 * 60 * 1000);
-  const overdue = all.filter((t) => t.recurrence_rule && t.status === "pending" && t.due_at && t.due_at < new Date().toISOString());
-  return json2({ status: stale.length === 0 && overdue.length === 0 ? "ok" : "warn", tasks: all.length, stale: stale.length, overdue_recurring: overdue.length, timestamp: new Date().toISOString() });
+  const stats = getTaskStats();
+  const staleCount = getStaleTasks(30).length;
+  const overdueRecurring = getOverdueTasks().filter((t) => t.recurrence_rule && t.status === "pending").length;
+  return json2({
+    status: staleCount === 0 && overdueRecurring === 0 ? "ok" : "warn",
+    tasks: stats.total,
+    stale: staleCount,
+    overdue_recurring: overdueRecurring,
+    timestamp: new Date().toISOString()
+  });
 }
 function handleHeadlessBoundary(_ctx, json2) {
   const { getHeadlessBoundaryManifest: getHeadlessBoundaryManifest2 } = (init_headless_boundaries(), __toCommonJS(exports_headless_boundaries));
   return json2(getHeadlessBoundaryManifest2());
 }
 function handleStats(_ctx, json2) {
-  const all = listTasks({ limit: 1e4 });
+  const stats = getTaskStats();
+  const byStatus = stats.by_status;
   const projects = listProjects();
   const agents = listAgents();
-  const staleItems = getStaleTasks(30);
-  const nowStr = new Date().toISOString();
-  const overdueRecurring = all.filter((t) => t.recurrence_rule && t.status === "pending" && t.due_at && t.due_at < nowStr).length;
-  const recurringTasks = all.filter((t) => t.recurrence_rule).length;
+  const staleCount = getStaleTasks(30).length;
+  const overdueRecurring = getOverdueTasks().filter((t) => t.recurrence_rule && t.status === "pending").length;
   return json2({
-    total_tasks: all.length,
-    pending: all.filter((t) => t.status === "pending").length,
-    in_progress: all.filter((t) => t.status === "in_progress").length,
-    completed: all.filter((t) => t.status === "completed").length,
-    failed: all.filter((t) => t.status === "failed").length,
-    cancelled: all.filter((t) => t.status === "cancelled").length,
+    total_tasks: stats.total,
+    pending: byStatus["pending"] ?? 0,
+    in_progress: byStatus["in_progress"] ?? 0,
+    completed: byStatus["completed"] ?? 0,
+    failed: byStatus["failed"] ?? 0,
+    cancelled: byStatus["cancelled"] ?? 0,
     projects: projects.length,
     agents: agents.length,
-    stale_count: staleItems.length,
+    stale_count: staleCount,
     overdue_recurring: overdueRecurring,
-    recurring_tasks: recurringTasks
+    recurring_tasks: countRecurringTasks()
   });
 }
 async function handleListTasks(_req, url, _ctx, json2, taskToSummary2) {
@@ -11742,27 +11896,34 @@ function handleTasksExport(_req, url, _ctx, _json, taskToSummary2) {
   const summaries = tasks.map((t) => taskToSummary2(t));
   if (format === "csv") {
     const headers = ["id", "short_id", "title", "status", "priority", "project_id", "assigned_to", "agent_id", "created_at", "updated_at", "completed_at", "due_at"];
-    const rows = summaries.map((t) => headers.map((h) => {
-      const val = t[h];
+    const csvCell = (val) => {
       if (val === null || val === undefined)
         return "";
-      const str = String(val);
-      return str.includes(",") || str.includes('"') || str.includes(`
-`) ? `"${str.replace(/"/g, '""')}"` : str;
-    }).join(","));
+      let str = String(val);
+      if (/^[=+\-@\t\r]/.test(str))
+        str = `'${str}`;
+      if (str.includes(",") || str.includes('"') || str.includes(`
+`) || str.includes("\r")) {
+        str = `"${str.replace(/"/g, '""')}"`;
+      }
+      return str;
+    };
+    const rows = summaries.map((t) => headers.map((h) => csvCell(t[h])).join(","));
     const csv = [headers.join(","), ...rows].join(`
 `);
     return new Response(csv, {
       headers: {
         "Content-Type": "text/csv",
-        "Content-Disposition": "attachment; filename=tasks.csv"
+        "Content-Disposition": "attachment; filename=tasks.csv",
+        ...SECURITY_HEADERS
       }
     });
   }
   return new Response(JSON.stringify(summaries, null, 2), {
     headers: {
       "Content-Type": "application/json",
-      "Content-Disposition": "attachment; filename=tasks.json"
+      "Content-Disposition": "attachment; filename=tasks.json",
+      ...SECURITY_HEADERS
     }
   });
 }
@@ -11936,12 +12097,16 @@ async function handlePatchTask(id, req, _ctx, json2, taskToSummary2) {
       if (ALLOWED.has(key))
         safeBody[key] = value;
     }
+    const clientVersion = typeof body["version"] === "number" ? body["version"] : task.version;
     const updated = updateTask(id, {
       ...safeBody,
-      version: task.version
+      version: clientVersion
     });
     return json2(taskToSummary2(updated));
   } catch (e) {
+    const mapped = mapTaskError(e, json2);
+    if (mapped)
+      return mapped;
     return json2({ error: e instanceof Error ? e.message : "Failed to update task" }, 500);
   }
 }
@@ -11957,6 +12122,9 @@ function handleStartTask(id, ctx, json2, taskToSummary2) {
     ctx.broadcastEvent({ type: "task", task_id: task.id, action: "started", agent_id: "dashboard", project_id: task.project_id });
     return json2(taskToSummary2(task));
   } catch (e) {
+    const mapped = mapTaskError(e, json2);
+    if (mapped)
+      return mapped;
     return json2({ error: e instanceof Error ? e.message : "Failed to start task" }, 500);
   }
 }
@@ -11976,6 +12144,9 @@ function handleCompleteTask(id, ctx, json2, taskToSummary2) {
     ctx.broadcastEvent({ type: "task", task_id: task.id, action: "completed", agent_id: "dashboard", project_id: task.project_id });
     return json2(taskToSummary2(task));
   } catch (e) {
+    const mapped = mapTaskError(e, json2);
+    if (mapped)
+      return mapped;
     return json2({ error: e instanceof Error ? e.message : "Failed to complete task" }, 500);
   }
 }
@@ -12300,6 +12471,8 @@ function handleStaticFiles(path, method, ctx, json2, serveStaticFile2) {
 }
 var init_routes = __esm(() => {
   init_tasks();
+  init_database();
+  init_types();
   init_projects();
   init_agents();
   init_plans();
@@ -33318,10 +33491,8 @@ var init_token_utils = __esm(() => {
       "cancel_task",
       "check_task_done_contract",
       "claim_task",
-      "clone_task",
       "delete_task",
       "extend_task",
-      "get_active_work",
       "get_archived_tasks",
       "get_blocked_tasks",
       "get_blocking_tasks",
@@ -33357,7 +33528,8 @@ var init_token_utils = __esm(() => {
       "task_context",
       "unlock_task",
       "unarchive_task",
-      "update_task"
+      "update_task",
+      "upsert_task"
     ],
     projects: [
       "bootstrap_project",
@@ -33616,12 +33788,8 @@ var init_token_utils = __esm(() => {
       "delete_tag",
       "get_label",
       "get_activity_timeline",
-      "get_recent_activity",
       "get_tag",
       "get_task_fields",
-      "get_task_graph",
-      "get_task_history",
-      "get_task_stats",
       "list_workflow_states",
       "list_labels",
       "list_tags",
@@ -33632,6 +33800,10 @@ var init_token_utils = __esm(() => {
       "describe_tools",
       "set_task_workflow_state",
       "set_task_fields",
+      "assign_label_to_task",
+      "create_custom_field",
+      "set_task_custom_field",
+      "set_task_priority_meta",
       "update_label",
       "update_tag"
     ],
@@ -33657,7 +33829,6 @@ var init_token_utils = __esm(() => {
       "update_template",
       "write_template_library"
     ],
-    webhooks: ["create_webhook", "delete_webhook", "list_webhooks"],
     machines: [
       "machines_archive",
       "machines_delete",
@@ -79511,14 +79682,16 @@ function printHelp() {
 Start the @hasna/todos MCP server.
 
 Options:
-  --stdio          Use stdio transport
-  --port <port>    Use Streamable HTTP on the given port
+  --stdio          Use stdio transport (default)
+  --http           Use Streamable HTTP transport
+  --port <port>    Use Streamable HTTP on the given port (implies --http)
   -V, --version    output the version number
   -h, --help       display help for command
 
 Environment:
-  TODOS_MCP_STDIO=true       Force stdio transport
-  TODOS_MCP_PORT=<port>      HTTP port when not using stdio
+  MCP_STDIO=1                Force stdio transport
+  MCP_HTTP=1                 Use Streamable HTTP transport
+  MCP_HTTP_PORT=<port>       HTTP port when using HTTP transport
   TODOS_PROFILE=<profile>    Tool profile filter
   TODOS_TOOL_GROUPS=<list>   Comma-separated tool group filter`);
 }
@@ -79607,8 +79780,22 @@ function formatError2(error2) {
 function resolveId(partialId, table = "tasks") {
   const db = getDatabase();
   const id = resolvePartialId(db, table, partialId);
-  if (!id)
-    throw new Error(`Could not resolve ID: ${partialId}`);
+  if (!id) {
+    switch (table) {
+      case "tasks":
+        throw new TaskNotFoundError(partialId);
+      case "projects":
+        throw new ProjectNotFoundError(partialId);
+      case "plans":
+        throw new PlanNotFoundError(partialId);
+      case "task_lists":
+        throw new TaskListNotFoundError(partialId);
+      case "agents":
+        throw new AgentNotFoundError(partialId);
+      default:
+        throw new TaskNotFoundError(partialId);
+    }
+  }
   return id;
 }
 function formatTask(task2) {
@@ -79697,8 +79884,9 @@ function buildServer() {
   return server;
 }
 async function main() {
-  const { isStdioMode, resolveHttpPort } = await Promise.resolve().then(() => (init_http(), exports_http));
-  if (isStdioMode()) {
+  const { isHttpMode, resolveHttpPort } = await Promise.resolve().then(() => (init_http(), exports_http));
+  const portRequested = process.argv.some((arg) => arg === "--port" || arg.startsWith("--port="));
+  if (!isHttpMode() && !portRequested) {
     const server = buildServer();
     const transport = new StdioServerTransport;
     await server.connect(transport);
@@ -79876,7 +80064,7 @@ function checkAuth(req, apiKey) {
   if (!apiKey && !generatedKeysEnabled)
     return null;
   const provided = getProvidedApiKey(req);
-  const matchesEnvKey = Boolean(apiKey && provided && provided === apiKey);
+  const matchesEnvKey = Boolean(apiKey && provided && safeEqualStrings(provided, apiKey));
   const matchesGeneratedKey = Boolean(provided && verifyApiKey(provided));
   if (!matchesEnvKey && !matchesGeneratedKey) {
     return new Response(JSON.stringify({ error: "Unauthorized" }), {
@@ -79886,6 +80074,15 @@ function checkAuth(req, apiKey) {
   }
   return null;
 }
+function resolveClientIp(req, server) {
+  const trustProxy = process.env["TODOS_TRUST_PROXY"] === "1" || process.env["TODOS_TRUST_PROXY"] === "true";
+  if (trustProxy) {
+    const forwarded = req.headers.get("x-forwarded-for")?.split(",")[0]?.trim() || req.headers.get("x-real-ip")?.trim();
+    if (forwarded)
+      return forwarded;
+  }
+  return server.requestIP(req)?.address || "unknown";
+}
 function checkRateLimit(ip) {
   const now4 = Date.now();
   const entry = rateLimitMap.get(ip);
@@ -80013,7 +80210,7 @@ Dashboard not found at: ${dashboardDir}`);
   const server = Bun.serve({
     port,
     hostname: hostname4,
-    async fetch(req) {
+    async fetch(req, server2) {
       const url = new URL(req.url);
       const path = url.pathname;
       const method = req.method;
@@ -80025,15 +80222,6 @@ Dashboard not found at: ${dashboardDir}`);
         Vary: "Origin"
       } : undefined;
       const jsonWithCors = (data, status = 200) => json(data, status, corsHeaders);
-      if (path === "/health" && method === "GET") {
-        const { healthResponse: healthResponse2 } = await Promise.resolve().then(() => (init_http(), exports_http));
-        return healthResponse2("todos");
-      }
-      if (path === "/mcp") {
-        const { handleMcpHttpRequest: handleMcpHttpRequest2 } = await Promise.resolve().then(() => (init_http(), exports_http));
-        const { buildServer: buildServer2 } = await Promise.resolve().then(() => (init_mcp3(), exports_mcp));
-        return handleMcpHttpRequest2(req, buildServer2);
-      }
       if (method === "OPTIONS") {
         return new Response(null, {
           headers: corsHeaders || {
@@ -80041,7 +80229,7 @@ Dashboard not found at: ${dashboardDir}`);
           }
         });
       }
-      const ip = req.headers.get("x-forwarded-for")?.split(",")[0]?.trim() || req.headers.get("x-real-ip") || "unknown";
+      const ip = resolveClientIp(req, server2);
       const rl = checkRateLimit(ip);
       if (!rl.allowed) {
         return new Response(JSON.stringify({ error: "Too many requests", retry_after: rl.retryAfter }), {
@@ -80049,6 +80237,18 @@ Dashboard not found at: ${dashboardDir}`);
           headers: { "Content-Type": "application/json", "Retry-After": String(rl.retryAfter ?? 60), ...SECURITY_HEADERS }
         });
       }
+      if (path === "/health" && method === "GET") {
+        const { healthResponse: healthResponse2 } = await Promise.resolve().then(() => (init_http(), exports_http));
+        return healthResponse2("todos");
+      }
+      if (path === "/mcp") {
+        const authError = checkAuth(req, apiKey);
+        if (authError)
+          return authError;
+        const { handleMcpHttpRequest: handleMcpHttpRequest2 } = await Promise.resolve().then(() => (init_http(), exports_http));
+        const { buildServer: buildServer2 } = await Promise.resolve().then(() => (init_mcp3(), exports_mcp));
+        return handleMcpHttpRequest2(req, buildServer2);
+      }
       if (path.startsWith("/api/")) {
         const authError = checkAuth(req, apiKey);
         if (authError)