@hasna/todos 0.11.71 → 0.11.73

package/dist/cli/index.js

@@ -1011,7 +1011,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
         this._exitCallback = (err) => {
           if (err.code !== "commander.executeSubCommandAsync") {
             throw err;
-          }
+          } else {}
         };
       }
       return this;
@@ -3890,6 +3890,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");
@@ -3897,6 +3902,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");
@@ -4819,34 +4828,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;
 }
@@ -7215,8 +7230,6 @@ function routeEnabledForTask(task, taskList) {
   const explicit = booleanField(task.metadata.route_enabled);
   if (explicit !== undefined)
     return explicit;
-  if (task.tags.includes("auto:route") || task.tags.includes("route:enabled"))
-    return true;
   const taskListDefault = taskList ? booleanField(taskList.metadata.route_enabled) : undefined;
   if (taskListDefault !== undefined)
     return taskListDefault;
@@ -7238,8 +7251,26 @@ function workflowPointersFromMetadata(metadata) {
 function compactWorkflowPointers(pointers) {
   return Object.fromEntries(Object.entries(pointers).filter(([, value]) => typeof value === "string" && value.length > 0));
 }
-function classifyProjectKind(path) {
-  return path.includes("/hasna/opensource/") ? "open-source" : "unknown";
+function metadataStringField(record, keys) {
+  if (!record)
+    return;
+  for (const key of keys) {
+    const value = record[key];
+    if (typeof value === "string" && value.trim())
+      return value.trim();
+  }
+  return;
+}
+function projectKindFromMetadata(...records) {
+  for (const record of records) {
+    const value = metadataStringField(record ?? undefined, ["project_kind", "projectKind", "source_kind", "sourceKind"]);
+    if (value)
+      return value;
+  }
+  return null;
+}
+function classifyProjectKind(_path, metadata) {
+  return projectKindFromMetadata(metadata);
 }
 function isWorktreePath(path) {
   return path.includes("/.codewith/worktrees/") || path.includes("/.worktrees/");
@@ -7312,7 +7343,6 @@ function taskEventMetadata(task) {
       metadata.project_canonical_path = projectPath;
     }
     if (projectPath) {
-      metadata.project_kind = classifyProjectKind(projectPath);
       metadata.project_is_worktree = isWorktreePath(projectPath);
       metadata.working_dir = task.working_dir ?? projectPath;
     }
@@ -7324,6 +7354,10 @@ function taskEventMetadata(task) {
       metadata.task_list_project_id = taskList.project_id;
       metadata.task_list_is_project_default = Boolean(project?.task_list_id && taskList.slug === project.task_list_id);
     }
+    const projectKind = projectKindFromMetadata(task.metadata, taskList?.metadata);
+    if (projectKind) {
+      metadata.project_kind = classifyProjectKind(projectPath ?? "", { project_kind: projectKind });
+    }
     const routeEnabled = routeEnabledForTask(task, taskList);
     if (routeEnabled !== undefined) {
       metadata.route_enabled = routeEnabled;
@@ -7911,851 +7945,281 @@ 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) {
-  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 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 };
-}
-function countTasks(filter = {}, db) {
-  const d = db || getDatabase();
-  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);
-  }
-  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);
-  }
-  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 updateTask(id, input, db) {
-  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);
-  }
-  if (input.description !== undefined) {
-    sets.push("description = ?");
-    params.push(input.description);
-  }
-  if (input.status !== undefined) {
-    if (input.status === "completed") {
-      checkCompletionGuard(task, task.assigned_to || task.agent_id || null, d);
-    }
-    sets.push("status = ?");
-    params.push(input.status);
-    if (input.status === "completed") {
-      sets.push("completed_at = ?");
-      params.push(completionTimestamp);
-    }
-  }
-  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);
-  }
-  if (input.assigned_to !== undefined) {
-    sets.push("assigned_to = ?");
-    params.push(input.assigned_to);
-  }
-  if (input.working_dir !== undefined) {
-    sets.push("working_dir = ?");
-    params.push(input.working_dir);
-  }
-  if (input.tags !== undefined) {
-    sets.push("tags = ?");
-    params.push(JSON.stringify(input.tags));
-  }
-  if (input.metadata !== undefined) {
-    sets.push("metadata = ?");
-    params.push(JSON.stringify(input.metadata));
-  }
-  if (input.plan_id !== undefined) {
-    sets.push("plan_id = ?");
-    params.push(input.plan_id);
-  }
-  if (input.task_list_id !== undefined) {
-    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);
-  }
-  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 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
-  };
-  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 });
-  }
-  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 (input.approved_by !== undefined) {
-    emitLocalEventHooksQuiet({ type: "approval.decided", payload: { id, approved_by: input.approved_by, title: task.title }, databasePath });
-  }
-  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] };
-  }
-  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 || "{}"),
-    priority: row.priority || "medium",
-    version: row.version ?? 1
-  };
-}
-function rowToTemplateTask(row) {
-  return {
-    ...row,
-    tags: JSON.parse(row.tags || "[]"),
-    depends_on_positions: JSON.parse(row.depends_on_positions || "[]"),
-    metadata: JSON.parse(row.metadata || "{}"),
-    priority: row.priority || "medium",
-    condition: row.condition ?? null,
-    include_template_id: row.include_template_id ?? null
-  };
-}
-function resolveTemplateId(id, d) {
-  return resolvePartialId(d, "task_templates", id);
-}
-function createTemplate(input, db) {
-  const d = db || getDatabase();
-  const id = uuid();
-  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);
-  }
-  return getTemplate(id, d);
-}
-function getTemplate(id, db) {
-  const d = db || getDatabase();
-  const resolved = resolveTemplateId(id, d);
-  if (!resolved)
-    return null;
-  const row = d.query("SELECT * FROM task_templates WHERE id = ?").get(resolved);
-  return row ? rowToTemplate(row) : null;
-}
-function listTemplates(db) {
-  const d = db || getDatabase();
-  return d.query("SELECT * FROM task_templates ORDER BY name").all().map(rowToTemplate);
-}
-function deleteTemplate(id, db) {
-  const d = db || getDatabase();
-  const resolved = resolveTemplateId(id, d);
-  if (!resolved)
-    return false;
-  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);
-  }
-  if (updates.priority !== undefined) {
-    sets.push("priority = ?");
-    values.push(updates.priority);
-  }
-  if (updates.tags !== undefined) {
-    sets.push("tags = ?");
-    values.push(JSON.stringify(updates.tags));
-  }
-  if (updates.variables !== undefined) {
-    sets.push("variables = ?");
-    values.push(JSON.stringify(updates.variables));
-  }
-  if (updates.project_id !== undefined) {
-    sets.push("project_id = ?");
-    values.push(updates.project_id);
-  }
-  if (updates.plan_id !== undefined) {
-    sets.push("plan_id = ?");
-    values.push(updates.plan_id);
-  }
-  if (updates.metadata !== undefined) {
-    sets.push("metadata = ?");
-    values.push(JSON.stringify(updates.metadata));
-  }
-  values.push(resolved);
-  d.run(`UPDATE task_templates SET ${sets.join(", ")} WHERE id = ?`, values);
-  return getTemplate(resolved, d);
-}
-function taskFromTemplate(templateId, overrides = {}, db) {
-  const t = getTemplate(templateId, db);
-  if (!t)
-    throw new Error(`Template not found: ${templateId}`);
-  const cleanOverrides = Object.fromEntries(Object.entries(overrides).filter(([, v]) => v !== undefined));
-  return {
-    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 addTemplateTasks(templateId, tasks, db) {
+function addTemplateTasks(templateId, tasks, db) {
   const d = db || getDatabase();
   const template = getTemplate(templateId, d);
   if (!template)
@@ -9151,527 +8615,1188 @@ function moveTask(taskId, target, db) {
     sets.push("project_id = ?");
     params.push(target.project_id);
   }
-  if (target.plan_id !== undefined) {
-    sets.push("plan_id = ?");
-    params.push(target.plan_id);
+  if (target.plan_id !== undefined) {
+    sets.push("plan_id = ?");
+    params.push(target.plan_id);
+  }
+  params.push(taskId);
+  d.run(`UPDATE tasks SET ${sets.join(", ")} WHERE id = ?`, params);
+  return getTask(taskId, d);
+}
+function wouldCreateCycle(taskId, dependsOn, db) {
+  const visited = new Set;
+  const queue = [dependsOn];
+  while (queue.length > 0) {
+    const current = queue.shift();
+    if (current === taskId)
+      return true;
+    if (visited.has(current))
+      continue;
+    visited.add(current);
+    const deps = db.query("SELECT depends_on FROM task_dependencies WHERE task_id = ?").all(current);
+    for (const dep of deps) {
+      queue.push(dep.depends_on);
+    }
+  }
+  return false;
+}
+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);
+  }
+  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}`);
+  }
+  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`);
+  }
+  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 (task.status === "completed") {
+    return task;
+  }
+  if (task.status === "cancelled") {
+    throw new Error(`Task ${id} is cancelled and cannot be completed`);
+  }
+  if (agentId && task.locked_by && task.locked_by !== agentId && !isLockExpired(task.locked_at)) {
+    throw new LockError(id, task.locked_by);
+  }
+  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 };
+  }
+  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)}`);
+    }
+  }
+  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 {}
+    }
+  }
+  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 (spawnedFromTemplate) {
+    meta._spawned_task = { id: spawnedFromTemplate.id, short_id: spawnedFromTemplate.short_id, title: spawnedFromTemplate.title };
+  }
+  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 });
+    }
+  }
+  return { ...task, status: "completed", locked_by: null, locked_at: null, completed_at: timestamp, confidence, version: finalVersion, updated_at: timestamp, metadata: meta };
+}
+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`
+    };
+  }
+  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) };
+  }
+  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`
+      };
+    }
+    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`
+    };
+  }
+  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);
+  }
+  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 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 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 (filters?.task_list_id) {
+    conditions.push("task_list_id = ?");
+    params.push(filters.task_list_id);
+  }
+  if (filters?.plan_id) {
+    conditions.push("plan_id = ?");
+    params.push(filters.plan_id);
+  }
+  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);
+  }
+  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);
+  }
+  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 (recentProjectIds.length > 0) {
+    const placeholders = recentProjectIds.map(() => "?").join(",");
+    sql += `CASE WHEN project_id IN (${placeholders}) THEN 0 ELSE 1 END, `;
+    params.push(...recentProjectIds);
+  }
+  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 (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 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 (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 * 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
+    }
+  };
+  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 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 (effectiveFilters?.task_list_id) {
+    conditions.push("task_list_id = ?");
+    params.push(effectiveFilters.task_list_id);
   }
-  params.push(taskId);
-  d.run(`UPDATE tasks SET ${sets.join(", ")} WHERE id = ?`, params);
-  return getTask(taskId, d);
+  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 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);
+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;
+}
+function claimOrSteal(agentId, filters, 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);
   }
-  return false;
+  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);
 }
-var init_task_graph = __esm(() => {
+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-lifecycle.ts
-function lockExpiresAt(lockedAt) {
-  if (!lockedAt)
-    return null;
-  return new Date(new Date(lockedAt).getTime() + LOCK_EXPIRY_MINUTES * 60 * 1000).toISOString();
+// 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 assertStartable(task, agentId) {
-  if (task.status === "pending")
-    return;
-  if (task.status === "in_progress")
+function insertTaskTags(taskId, tags, db) {
+  if (tags.length === 0)
     return;
-  throw new Error(`Task is ${task.status} and cannot be started by ${agentId}`);
+  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 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);
+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 blocking;
 }
-function startTask(id, agentId, db) {
+function createTask(input, 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);
+  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;
+      }
+      throw e;
     }
-    throw new Error(`Task ${id} could not be started because it changed during claim`);
   }
-  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;
+  if (tags.length > 0) {
+    insertTaskTags(id, tags, 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;
 }
-function completeTask(id, agentId, db, options) {
+function getTask(id, db) {
+  const d = db || getDatabase();
+  const row = d.query("SELECT * FROM tasks WHERE id = ?").get(id);
+  if (!row)
+    return null;
+  return rowToTask(row);
+}
+function getTaskWithRelations(id, db) {
   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);
+    return null;
+  const subtaskRows = d.query("SELECT * FROM tasks WHERE parent_id = ? ORDER BY created_at").all(id);
+  const subtasks = subtaskRows.map(rowToTask);
+  const depRows = d.query(`SELECT t.* FROM tasks t
+       JOIN task_dependencies td ON td.depends_on = t.id
+       WHERE td.task_id = ?`).all(id);
+  const dependencies = depRows.map(rowToTask);
+  const blockedByRows = d.query(`SELECT t.* FROM tasks t
+       JOIN task_dependencies td ON td.task_id = t.id
+       WHERE td.depends_on = ?`).all(id);
+  const blocked_by = blockedByRows.map(rowToTask);
+  const comments = d.query("SELECT * FROM task_comments WHERE task_id = ? ORDER BY created_at").all(id);
+  const parent = task.parent_id ? getTask(task.parent_id, d) : null;
+  const checklist = getChecklist(id, d);
+  return {
+    ...task,
+    subtasks,
+    dependencies,
+    blocked_by,
+    comments,
+    parent,
+    checklist
+  };
+}
+function listTasks(filter = {}, 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);
   }
-  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.ids && filter.ids.length > 0) {
+    conditions.push(`id IN (${filter.ids.map(() => "?").join(",")})`);
+    params.push(...filter.ids);
   }
-  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.parent_id !== undefined) {
+    if (filter.parent_id === null) {
+      conditions.push("parent_id IS NULL");
+    } else {
+      conditions.push("parent_id = ?");
+      params.push(filter.parent_id);
     }
-    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.status) {
+    if (Array.isArray(filter.status)) {
+      conditions.push(`status IN (${filter.status.map(() => "?").join(",")})`);
+      params.push(...filter.status);
     } 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("status = ?");
+      params.push(filter.status);
     }
   }
-  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.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 (spawnedFromTemplate) {
-    meta._spawned_task = { id: spawnedFromTemplate.id, short_id: spawnedFromTemplate.short_id, title: spawnedFromTemplate.title };
+  if (filter.assigned_to) {
+    conditions.push("assigned_to = ?");
+    params.push(filter.assigned_to);
   }
-  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.agent_id) {
+    conditions.push("agent_id = ?");
+    params.push(filter.agent_id);
   }
-  return { ...task, status: "completed", locked_by: null, locked_at: null, completed_at: timestamp, confidence, version: task.version + 1, updated_at: timestamp, metadata: meta };
-}
-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`
-    };
+  if (filter.session_id) {
+    conditions.push("session_id = ?");
+    params.push(filter.session_id);
   }
-  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 (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);
   }
-  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`
-      };
-    }
-    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}`
-      };
+  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 {
-      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);
+  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 timestamp = now();
-  d.run(`UPDATE tasks SET locked_by = NULL, locked_at = NULL, version = version + 1, updated_at = ?
-     WHERE id = ?`, [timestamp, id]);
-  return true;
+  const rows = d.query(`SELECT * FROM tasks ${where} ORDER BY ${PRIORITY_RANK}, created_at DESC, id ASC${limitClause}`).all(...params);
+  return rows.map(rowToTask);
 }
-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);
+function getTaskByFingerprint(fingerprint, db) {
+  const tasks = listTasks({ metadata: { fingerprint }, limit: 1, include_archived: true }, db);
+  return tasks[0] ?? null;
+}
+function mergeTaskMetadata(current, next, fingerprint) {
   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
+    ...current,
+    ...next ?? {},
+    fingerprint
   };
 }
-function claimNextTask(agentId, filters, db) {
+function upsertTaskByFingerprint(input, db) {
   const d = db || getDatabase();
+  const fingerprint = input.fingerprint.trim();
+  if (!fingerprint)
+    throw new Error("fingerprint is required");
   const tx = d.transaction(() => {
-    const task = getNextTask(agentId, filters, d);
-    if (!task)
-      return null;
-    return startTask(task.id, agentId, d);
+    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 getNextTask(agentId, filters, db) {
+function countTasks(filter = {}, 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) {
+  const conditions = [];
+  const params = [];
+  if (filter.project_id) {
     conditions.push("project_id = ?");
-    params.push(filters.project_id);
+    params.push(filter.project_id);
   }
-  if (filters?.task_list_id) {
-    conditions.push("task_list_id = ?");
-    params.push(filters.task_list_id);
+  if (filter.ids && filter.ids.length > 0) {
+    conditions.push(`id IN (${filter.ids.map(() => "?").join(",")})`);
+    params.push(...filter.ids);
   }
-  if (filters?.plan_id) {
-    conditions.push("plan_id = ?");
-    params.push(filters.plan_id);
+  if (filter.parent_id !== undefined) {
+    if (filter.parent_id === null) {
+      conditions.push("parent_id IS NULL");
+    } else {
+      conditions.push("parent_id = ?");
+      params.push(filter.parent_id);
+    }
   }
-  if (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 (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);
+    }
   }
-  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 (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);
+    }
   }
-  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 (filter.assigned_to) {
+    conditions.push("assigned_to = ?");
+    params.push(filter.assigned_to);
   }
-  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 (filter.agent_id) {
+    conditions.push("agent_id = ?");
+    params.push(filter.agent_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 (filter.session_id) {
+    conditions.push("session_id = ?");
+    params.push(filter.session_id);
   }
-  if (filters?.task_list_id) {
-    conditions.push("task_list_id = ?");
-    params.push(filters.task_list_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);
   }
-  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 (filter.plan_id) {
+    conditions.push("plan_id = ?");
+    params.push(filter.plan_id);
   }
-  if (filters?.task_list_id) {
+  if (filter.task_list_id) {
     conditions.push("task_list_id = ?");
-    params.push(filters.task_list_id);
+    params.push(filter.task_list_id);
   }
-  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);
+  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);
+    }
+  }
+  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 failTask(id, agentId, reason, options, db) {
+function updateTask(id, input, 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 (task.version !== input.version) {
+    throw new VersionConflictError(id, input.version, task.version);
+  }
   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 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);
+    }
+    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");
+    }
+  }
+  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);
+  }
+  if (input.assigned_to !== undefined) {
+    sets.push("assigned_to = ?");
+    params.push(input.assigned_to);
+  }
+  if (input.working_dir !== undefined) {
+    sets.push("working_dir = ?");
+    params.push(input.working_dir);
+  }
+  if (input.tags !== undefined) {
+    sets.push("tags = ?");
+    params.push(JSON.stringify(input.tags));
+  }
+  if (input.metadata !== undefined) {
+    sets.push("metadata = ?");
+    params.push(JSON.stringify(input.metadata));
+  }
+  if (input.plan_id !== undefined) {
+    sets.push("plan_id = ?");
+    params.push(input.plan_id);
+  }
+  if (input.task_list_id !== undefined) {
+    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);
+  }
+  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 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();
@@ -9679,11 +9804,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
@@ -9773,6 +9896,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) {
@@ -12742,11 +12874,6 @@ __export(exports_task_routing, {
   setTaskWorkflowPointers: () => setTaskWorkflowPointers,
   getTaskRouteState: () => getTaskRouteState
 });
-function classifyProjectKind2(path) {
-  if (!path)
-    return null;
-  return path.includes("/hasna/opensource/") ? "open-source" : "unknown";
-}
 function machineLocalPath(project, db) {
   const machineId = process.env["TODOS_MACHINE_ID"];
   if (!machineId)
@@ -12794,6 +12921,7 @@ function getTaskRouteState(taskOrId, db) {
   const automation = routingAutomationMetadata(task, taskList) ?? {};
   const routeEnabled = routeEnabledForTask(task, taskList) === true;
   const tagOptIn = task.tags.includes("auto:route") || task.tags.includes("route:enabled");
+  const projectKind = projectKindFromMetadata(task.metadata, taskList?.metadata);
   const locked = Boolean(task.locked_by && !isLockExpired(task.locked_at));
   const blockers = getBlockingDeps(task.id, d);
   const blocked = blockers.length > 0;
@@ -12856,7 +12984,7 @@ function getTaskRouteState(taskOrId, db) {
       project_id: project?.id ?? task.project_id,
       project_path: projectPath,
       working_dir: task.working_dir ?? projectPath,
-      project_kind: classifyProjectKind2(projectPath),
+      project_kind: projectKind,
       task_list_id: taskList?.id ?? task.task_list_id,
       task_list_slug: taskList?.slug ?? null,
       task_list_name: taskList?.name ?? null,
@@ -12925,20 +13053,56 @@ import chalk2 from "chalk";
 import { basename as basename3, resolve as resolve9 } from "path";
 function resolveProjectIdOrSlug(input) {
   const db = getDatabase();
+  if (isPathLike(input)) {
+    const projectPath = resolve9(input);
+    const byPath2 = getProjectByPath(projectPath, db);
+    return (byPath2 ?? ensureProject(basename3(projectPath), projectPath, db)).id;
+  }
+  const byPath = getProjectByPath(resolve9(input), db);
+  if (byPath)
+    return byPath.id;
   const byId = getProject(input, db);
   if (byId)
     return byId.id;
-  const row = db.query("SELECT id FROM projects WHERE name LIKE ? LIMIT 1").get(`%${input}%`);
+  const partial = resolvePartialId(db, "projects", input);
+  if (partial)
+    return partial;
+  const exact = db.query("SELECT id FROM projects WHERE lower(name) = lower(?) OR task_list_id = ? ORDER BY name LIMIT 1").get(input, input);
+  if (exact)
+    return exact.id;
+  const inputSlug = slugify(input);
+  if (inputSlug) {
+    const all = db.query("SELECT id, name FROM projects ORDER BY name").all();
+    const bySlug = all.find((p) => slugify(p.name) === inputSlug);
+    if (bySlug)
+      return bySlug.id;
+  }
+  const row = db.query("SELECT id FROM projects WHERE name LIKE ? ORDER BY name LIMIT 1").get(`%${input}%`);
   if (row)
     return row.id;
-  if (isPathLike(input)) {
-    const projectPath = resolve9(input);
-    const byPath = getProjectByPath(projectPath, db);
-    return (byPath ?? ensureProject(basename3(projectPath), projectPath, db)).id;
-  }
   console.error(chalk2.red(`Project not found: ${input}`));
   process.exit(1);
 }
+function parseStatus(value) {
+  if (!value)
+    return;
+  const normalized = normalizeStatus(value);
+  if (!TASK_STATUSES.includes(normalized)) {
+    console.error(chalk2.red(`--status must be one of: ${TASK_STATUSES.join(", ")}`));
+    process.exit(1);
+  }
+  return normalized;
+}
+function parseIntOption(value, flag) {
+  if (value === undefined)
+    return;
+  const n = parseInt(value, 10);
+  if (!Number.isFinite(n)) {
+    console.error(chalk2.red(`${flag} must be a number`));
+    process.exit(1);
+  }
+  return n;
+}
 function isPathLike(input) {
   return input.startsWith(".") || input.includes("/") || input.includes("\\");
 }
@@ -13037,27 +13201,32 @@ function registerTaskCommands(program2) {
       }
       return id;
     })() : undefined;
-    const task2 = createTask({
-      title,
-      description: opts.description,
-      priority: parsePriority(opts.priority),
-      parent_id: opts.parent ? resolveTaskId(opts.parent) : undefined,
-      tags: opts.tags ? opts.tags.split(",").map((t) => t.trim()) : undefined,
-      plan_id: opts.plan ? resolvePlanId(opts.plan) : undefined,
-      assigned_to: opts.assign,
-      status: opts.status ? normalizeStatus(opts.status) : undefined,
-      task_list_id: taskListId,
-      agent_id: globalOpts.agent,
-      session_id: globalOpts.session,
-      project_id: projectId,
-      working_dir: process.cwd(),
-      estimated_minutes: opts.estimated ? parseInt(opts.estimated, 10) : undefined,
-      sla_minutes: opts.slaMinutes !== undefined || opts.sla !== undefined ? parseInt(opts.slaMinutes ?? opts.sla, 10) : undefined,
-      requires_approval: opts.approval || false,
-      recurrence_rule: opts.recurrence,
-      due_at: opts.due ? opts.due.length === 10 ? opts.due + "T00:00:00.000Z" : opts.due : undefined,
-      reason: opts.reason
-    });
+    let task2;
+    try {
+      task2 = createTask({
+        title,
+        description: opts.description,
+        priority: parsePriority(opts.priority),
+        parent_id: opts.parent ? resolveTaskId(opts.parent) : undefined,
+        tags: opts.tags ? opts.tags.split(",").map((t) => t.trim()) : undefined,
+        plan_id: opts.plan ? resolvePlanId(opts.plan) : undefined,
+        assigned_to: opts.assign,
+        status: parseStatus(opts.status),
+        task_list_id: taskListId,
+        agent_id: globalOpts.agent,
+        session_id: globalOpts.session,
+        project_id: projectId,
+        working_dir: process.cwd(),
+        estimated_minutes: parseIntOption(opts.estimated, "--estimated"),
+        sla_minutes: opts.slaMinutes !== undefined || opts.sla !== undefined ? parseIntOption(opts.slaMinutes ?? opts.sla, "--sla-minutes") : undefined,
+        requires_approval: opts.approval || false,
+        recurrence_rule: opts.recurrence,
+        due_at: opts.due ? opts.due.length === 10 ? opts.due + "T00:00:00.000Z" : opts.due : undefined,
+        reason: opts.reason
+      });
+    } catch (e) {
+      handleError(e);
+    }
     if (globalOpts.json) {
       output(task2, true);
     } else {
@@ -13088,7 +13257,7 @@ function registerTaskCommands(program2) {
         title: opts.title,
         description: opts.description,
         priority: parsePriority(opts.priority),
-        status: opts.status ? normalizeStatus(opts.status) : undefined,
+        status: parseStatus(opts.status),
         task_list_id: taskListId,
         tags: parseTags(opts.tags),
         metadata: buildExpectationMetadata(opts),
@@ -13565,7 +13734,7 @@ ${chalk2.cyan(sid)} ${statusColor(task2.status)} ${prioColor(task2.priority)} ${
       console.log(`  ${chalk2.dim(h.created_at)} ${chalk2.bold(h.action)}${field}${change}${agent}`);
     }
   });
-  program2.command("update <id>").description("Update a task").option("--title <text>", "New title").option("-d, --description <text>", "New description").option("-s, --status <status>", "New status").option("-p, --priority <priority>", "New priority").option("--assign <agent>", "Assign to agent").option("--tags <tags>", "New tags (comma-separated)").option("--tag <tags>", "New tags (alias for --tags)").option("--list <id>", "Move to a task list").option("--task-list <id>", "Move to a task list (alias for --list)").option("--plan <id>", "Move to a plan").option("--clear-plan", "Remove from its current plan").option("--estimated <minutes>", "Estimated time in minutes").option("--sla-minutes <minutes>", "SLA minutes before unfinished work is escalated").option("--sla <minutes>", "Alias for --sla-minutes").option("--due <date>", "Due date (ISO string or YYYY-MM-DD), empty to clear").option("--recurrence <rule>", "Recurrence rule, empty to clear").option("--approval", "Require approval before completion").action((id, opts) => {
+  program2.command("update <id>").description("Update a task").option("--title <text>", "New title").option("-d, --description <text>", "New description").option("-s, --status <status>", "New status").option("-p, --priority <priority>", "New priority").option("--assign <agent>", "Assign to agent").option("--tags <tags>", "New tags (comma-separated)").option("--tag <tags>", "New tags (alias for --tags)").option("--list <id>", "Move to a task list").option("--task-list <id>", "Move to a task list (alias for --list)").option("--plan <id>", "Move to a plan").option("--clear-plan", "Remove from its current plan").option("--estimated <minutes>", "Estimated time in minutes").option("--sla-minutes <minutes>", "SLA minutes before unfinished work is escalated").option("--sla <minutes>", "Alias for --sla-minutes").option("--due <date>", "Due date (ISO string or YYYY-MM-DD), empty to clear").option("--recurrence <rule>", "Recurrence rule, empty to clear").option("--approval", "Require approval before completion").option("--clear-approval", "Remove the approval requirement").action((id, opts) => {
     const globalOpts = program2.opts();
     opts.tags = opts.tags || opts.tag;
     opts.list = opts.list || opts.taskList;
@@ -13579,6 +13748,10 @@ ${chalk2.cyan(sid)} ${statusColor(task2.status)} ${prioColor(task2.priority)} ${
       console.error(chalk2.red("Use either --plan or --clear-plan, not both."));
       process.exit(1);
     }
+    if (opts.approval && opts.clearApproval) {
+      console.error(chalk2.red("Use either --approval or --clear-approval, not both."));
+      process.exit(1);
+    }
     const taskListId = opts.list ? (() => {
       const db = getDatabase();
       const resolved = resolvePartialId(db, "task_lists", opts.list);
@@ -13595,17 +13768,17 @@ ${chalk2.cyan(sid)} ${statusColor(task2.status)} ${prioColor(task2.priority)} ${
         version: current.version,
         title: opts.title,
         description: opts.description,
-        status: opts.status ? normalizeStatus(opts.status) : undefined,
-        priority: opts.priority,
+        status: parseStatus(opts.status),
+        priority: parsePriority(opts.priority),
         assigned_to: opts.assign,
         tags: opts.tags ? opts.tags.split(",").map((t) => t.trim()) : undefined,
         plan_id: planId,
         task_list_id: taskListId,
-        estimated_minutes: opts.estimated !== undefined ? parseInt(opts.estimated, 10) : undefined,
-        sla_minutes: opts.slaMinutes !== undefined || opts.sla !== undefined ? parseInt(opts.slaMinutes ?? opts.sla, 10) : undefined,
+        estimated_minutes: opts.estimated !== undefined ? parseIntOption(opts.estimated, "--estimated") : undefined,
+        sla_minutes: opts.slaMinutes !== undefined || opts.sla !== undefined ? parseIntOption(opts.slaMinutes ?? opts.sla, "--sla-minutes") : undefined,
         due_at: opts.due !== undefined ? opts.due === "" ? null : opts.due.length === 10 ? opts.due + "T00:00:00.000Z" : opts.due : undefined,
         recurrence_rule: opts.recurrence !== undefined ? opts.recurrence === "" ? null : opts.recurrence : undefined,
-        requires_approval: opts.approval !== undefined ? true : undefined
+        requires_approval: opts.clearApproval ? false : opts.approval !== undefined ? true : undefined
       });
     } catch (e) {
       handleError(e);
@@ -13622,7 +13795,14 @@ ${chalk2.cyan(sid)} ${statusColor(task2.status)} ${prioColor(task2.priority)} ${
     const resolvedId = resolveTaskId(id);
     const attachmentIds = opts.attachIds ? opts.attachIds.split(",").map((s) => s.trim()) : undefined;
     const filesChanged = opts.filesChanged ? opts.filesChanged.split(",").map((s) => s.trim()) : undefined;
-    const confidence = opts.confidence !== undefined ? parseFloat(opts.confidence) : undefined;
+    let confidence;
+    if (opts.confidence !== undefined) {
+      confidence = parseFloat(opts.confidence);
+      if (!Number.isFinite(confidence) || confidence < 0 || confidence > 1) {
+        console.error(chalk2.red("--confidence must be a number between 0.0 and 1.0"));
+        process.exit(1);
+      }
+    }
     const evidence = attachmentIds || filesChanged || opts.testResults || opts.commitHash || opts.notes ? { attachment_ids: attachmentIds, files_changed: filesChanged, test_results: opts.testResults, commit_hash: opts.commitHash, notes: opts.notes } : undefined;
     let task2;
     try {
@@ -23254,12 +23434,21 @@ function registerProjectCommands(program2) {
       handleError(e);
     }
   });
-  program2.command("comment <id> <text>").description("Add a comment to a task").action((id, text) => {
+  program2.command("comment <id> <text>").alias("log-progress").description("Add a comment to a task (alias: log-progress, for recording intermediate progress)").option("--pct <percent>", "Progress percentage (0-100) to record alongside the note").action((id, text, opts) => {
     const globalOpts = program2.opts();
     const resolvedId = resolveTaskId(id);
+    let content = text;
+    if (opts.pct !== undefined) {
+      const pct = parseInt(opts.pct, 10);
+      if (!Number.isFinite(pct) || pct < 0 || pct > 100) {
+        console.error(chalk4.red("--pct must be a number between 0 and 100"));
+        process.exit(1);
+      }
+      content = `[progress ${pct}%] ${text}`;
+    }
     const comment = addComment({
       task_id: resolvedId,
-      content: text,
+      content,
       agent_id: globalOpts.agent,
       session_id: globalOpts.session
     });
@@ -25391,10 +25580,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",
@@ -25430,7 +25617,8 @@ var init_token_utils = __esm(() => {
       "task_context",
       "unlock_task",
       "unarchive_task",
-      "update_task"
+      "update_task",
+      "upsert_task"
     ],
     projects: [
       "bootstrap_project",
@@ -25689,12 +25877,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",
@@ -25705,6 +25889,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"
     ],
@@ -25730,7 +25918,6 @@ var init_token_utils = __esm(() => {
       "update_template",
       "write_template_library"
     ],
-    webhooks: ["create_webhook", "delete_webhook", "list_webhooks"],
     machines: [
       "machines_archive",
       "machines_delete",
@@ -27288,6 +27475,11 @@ function safeEqualHex(a, b) {
     return false;
   return timingSafeEqual3(Buffer.from(a, "hex"), Buffer.from(b, "hex"));
 }
+function safeEqualStrings(a, b) {
+  const ah = createHash6("sha256").update(a, "utf8").digest();
+  const bh = createHash6("sha256").update(b, "utf8").digest();
+  return timingSafeEqual3(ah, bh);
+}
 function generatePlaintextKey() {
   return `tdos_${randomBytes2(32).toString("base64url")}`;
 }
@@ -27895,6 +28087,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;
@@ -27973,35 +28196,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) {
@@ -28080,27 +28308,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
     }
   });
 }
@@ -28274,12 +28509,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);
   }
 }
@@ -28295,6 +28534,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);
   }
 }
@@ -28314,6 +28556,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);
   }
 }
@@ -28638,6 +28883,8 @@ function handleStaticFiles(path, method, ctx, json2, serveStaticFile2) {
 }
 var init_routes = __esm(() => {
   init_tasks();
+  init_database();
+  init_types();
   init_projects();
   init_agents();
   init_plans();
@@ -51837,14 +52084,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`);
 }
@@ -51933,8 +52182,22 @@ function formatError(error) {
 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) {
@@ -52023,8 +52286,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);
@@ -52200,7 +52464,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" }), {
@@ -52210,6 +52474,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);
@@ -52337,7 +52610,7 @@ Dashboard not found at: ${dashboardDir}`);
   const server = Bun.serve({
     port,
     hostname: hostname3,
-    async fetch(req) {
+    async fetch(req, server2) {
       const url = new URL(req.url);
       const path = url.pathname;
       const method = req.method;
@@ -52349,15 +52622,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_mcp2(), exports_mcp));
-        return handleMcpHttpRequest2(req, buildServer2);
-      }
       if (method === "OPTIONS") {
         return new Response(null, {
           headers: corsHeaders || {
@@ -52365,7 +52629,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 }), {
@@ -52373,6 +52637,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_mcp2(), exports_mcp));
+        return handleMcpHttpRequest2(req, buildServer2);
+      }
       if (path.startsWith("/api/")) {
         const authError = checkAuth(req, apiKey);
         if (authError)
@@ -55219,6 +55495,339 @@ var init_config_serve_commands = __esm(() => {
   init_helpers();
 });
 
+// src/lib/task-route-sources.ts
+var exports_task_route_sources = {};
+__export(exports_task_route_sources, {
+  discoverTaskRouteSources: () => discoverTaskRouteSources,
+  TASK_ROUTE_SOURCE_DISCOVERY_SCHEMA_VERSION: () => TASK_ROUTE_SOURCE_DISCOVERY_SCHEMA_VERSION
+});
+import { Database as Database3 } from "bun:sqlite";
+import { createHash as createHash13 } from "crypto";
+import { existsSync as existsSync21, readdirSync as readdirSync5, statSync as statSync9 } from "fs";
+import { basename as basename9, dirname as dirname12, join as join21, resolve as resolve21 } from "path";
+function normalizePath5(input) {
+  return resolve21(input);
+}
+function sourceStoreId(sourceDbPath) {
+  const digest = createHash13("sha256").update(sourceDbPath).digest("hex").slice(0, 16);
+  return `sqlite:${digest}`;
+}
+function inferSourceRepoPath(sourceDbPath) {
+  const normalized = normalizePath5(sourceDbPath);
+  if (normalized.endsWith(TODO_STORE_RELATIVE_PATH)) {
+    return dirname12(dirname12(dirname12(normalized)));
+  }
+  return dirname12(normalized);
+}
+function createStoreRef(sourceDbPath) {
+  const normalized = normalizePath5(sourceDbPath);
+  return {
+    source_store_id: sourceStoreId(normalized),
+    source_repo_path: inferSourceRepoPath(normalized),
+    source_db_path: normalized
+  };
+}
+function normalizePatterns(patterns) {
+  return (patterns ?? []).map((pattern) => pattern.trim()).filter(Boolean);
+}
+function escapeRegExp(value) {
+  return value.replace(/[|\\{}()[\]^$+?.]/g, "\\$&");
+}
+function globPatternToRegExp(pattern) {
+  let source3 = "";
+  for (const char of pattern) {
+    if (char === "*")
+      source3 += ".*";
+    else if (char === "?")
+      source3 += ".";
+    else
+      source3 += escapeRegExp(char);
+  }
+  return new RegExp(`^${source3}$`);
+}
+function matchesPattern4(value, pattern) {
+  const normalizedValue = value.replace(/\\/g, "/");
+  const normalizedPattern = pattern.replace(/\\/g, "/");
+  if (normalizedPattern.includes("*") || normalizedPattern.includes("?")) {
+    return globPatternToRegExp(normalizedPattern).test(normalizedValue);
+  }
+  return normalizedValue.includes(normalizedPattern);
+}
+function storeMatchesAny(ref, patterns) {
+  if (patterns.length === 0)
+    return false;
+  const paths = [ref.source_db_path, ref.source_repo_path].filter((value) => Boolean(value));
+  const values = paths.flatMap((value) => [value, basename9(value)]);
+  return patterns.some((pattern) => values.some((value) => matchesPattern4(value, pattern)));
+}
+function shouldIncludeStore(ref, include, exclude) {
+  const included = include.length === 0 || storeMatchesAny(ref, include);
+  return included && !storeMatchesAny(ref, exclude);
+}
+function discoverStoresUnderRoot(sourceRoot) {
+  const rootPath = normalizePath5(sourceRoot);
+  const errors2 = [];
+  const stores = [];
+  if (!existsSync21(rootPath)) {
+    const ref = createStoreRef(join21(rootPath, TODO_STORE_RELATIVE_PATH));
+    errors2.push({
+      ...ref,
+      code: "SOURCE_ROOT_MISSING",
+      message: `Source root does not exist: ${rootPath}`
+    });
+    return { stores, errors: errors2 };
+  }
+  let rootStat;
+  try {
+    rootStat = statSync9(rootPath);
+  } catch (error) {
+    const ref = createStoreRef(join21(rootPath, TODO_STORE_RELATIVE_PATH));
+    errors2.push({
+      ...ref,
+      code: "SOURCE_ROOT_UNREADABLE",
+      message: error instanceof Error ? error.message : `Unable to read source root: ${rootPath}`
+    });
+    return { stores, errors: errors2 };
+  }
+  if (rootStat.isFile()) {
+    stores.push(createStoreRef(rootPath));
+    return { stores, errors: errors2 };
+  }
+  function scanDirectory(dir, depth) {
+    const candidate = join21(dir, TODO_STORE_RELATIVE_PATH);
+    if (existsSync21(candidate)) {
+      stores.push(createStoreRef(candidate));
+    }
+    if (depth >= ROOT_SCAN_MAX_DEPTH)
+      return;
+    let entries;
+    try {
+      entries = readdirSync5(dir, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name));
+    } catch (error) {
+      const ref = createStoreRef(candidate);
+      errors2.push({
+        ...ref,
+        code: "SOURCE_ROOT_UNREADABLE",
+        message: error instanceof Error ? error.message : `Unable to read source root: ${dir}`
+      });
+      return;
+    }
+    for (const entry of entries) {
+      if (!entry.isDirectory() || SKIPPED_SCAN_DIRS.has(entry.name))
+        continue;
+      scanDirectory(join21(dir, entry.name), depth + 1);
+    }
+  }
+  scanDirectory(rootPath, 0);
+  return { stores, errors: errors2 };
+}
+function collectStoreRefs(input) {
+  const byPath = new Map;
+  const errors2 = [];
+  for (const storePath of input.sourceStores ?? []) {
+    const ref = createStoreRef(storePath);
+    byPath.set(ref.source_db_path, ref);
+  }
+  for (const sourceRoot of input.sourceRoots ?? []) {
+    const discovered = discoverStoresUnderRoot(sourceRoot);
+    for (const ref of discovered.stores) {
+      byPath.set(ref.source_db_path, ref);
+    }
+    errors2.push(...discovered.errors);
+  }
+  return {
+    stores: [...byPath.values()].sort((a, b) => a.source_db_path.localeCompare(b.source_db_path)),
+    errors: errors2.sort((a, b) => a.source_db_path.localeCompare(b.source_db_path))
+  };
+}
+function openReadonlyStore(ref) {
+  if (!existsSync21(ref.source_db_path)) {
+    throw Object.assign(new Error(`Store does not exist: ${ref.source_db_path}`), { code: "STORE_MISSING" });
+  }
+  return new Database3(ref.source_db_path, { readonly: true, create: false });
+}
+function hasTable2(db, tableName) {
+  const row = db.query("SELECT name FROM sqlite_master WHERE type = 'table' AND name = ?").get(tableName);
+  return Boolean(row);
+}
+function tableColumns2(db, tableName) {
+  const rows = db.query(`PRAGMA table_info(${tableName})`).all();
+  return new Set(rows.map((row) => row.name));
+}
+function listPendingTasksReadonly(db) {
+  if (!hasTable2(db, "tasks")) {
+    throw Object.assign(new Error("Store does not contain a tasks table"), { code: "STORE_INVALID" });
+  }
+  const columns = tableColumns2(db, "tasks");
+  const conditions = ["status = 'pending'"];
+  if (columns.has("archived_at"))
+    conditions.push("archived_at IS NULL");
+  const rows = db.query(`SELECT * FROM tasks WHERE ${conditions.join(" AND ")}
+       ORDER BY CASE priority WHEN 'critical' THEN 0 WHEN 'high' THEN 1 WHEN 'medium' THEN 2 WHEN 'low' THEN 3 END, created_at DESC`).all();
+  return rows.map(rowToTask);
+}
+function isReadyTask(task2, db) {
+  if (task2.locked_by && !isLockExpired(task2.locked_at))
+    return false;
+  return getBlockingDeps(task2.id, db).length === 0;
+}
+function metadataFingerprint(metadata) {
+  const value = metadata.fingerprint;
+  if (typeof value === "string" && value.trim())
+    return value;
+  if (typeof value === "number" && Number.isFinite(value))
+    return String(value);
+  return null;
+}
+function boundedMetadataValue(value, depth = 0) {
+  if (depth > 6)
+    return "[TRUNCATED]";
+  if (typeof value === "string") {
+    return value.length > 2000 ? `${value.slice(0, 2000)}[TRUNCATED]` : value;
+  }
+  if (Array.isArray(value)) {
+    return value.slice(0, 50).map((item) => boundedMetadataValue(item, depth + 1));
+  }
+  if (value && typeof value === "object") {
+    const result = {};
+    for (const [key, child] of Object.entries(value).slice(0, 80)) {
+      const normalized = key.toLowerCase();
+      if (normalized === "comment" || normalized === "comments" || normalized === "task_comments") {
+        result[key] = "[REDACTED_COMMENT]";
+        continue;
+      }
+      result[key] = boundedMetadataValue(child, depth + 1);
+    }
+    return result;
+  }
+  return value;
+}
+function discoveryMetadata(metadata) {
+  return redactValue(boundedMetadataValue(metadata));
+}
+function sourceCandidate(ref, task2, db) {
+  const routeState = getTaskRouteState(task2, db);
+  const autoRoute = task2.tags.includes("auto:route") || task2.tags.includes("route:enabled");
+  return {
+    source_store_id: ref.source_store_id,
+    source_repo_path: ref.source_repo_path,
+    source_db_path: ref.source_db_path,
+    source_task_key: `${ref.source_store_id}:${task2.id}`,
+    source_selected_by_input: true,
+    task_id: task2.id,
+    task_short_id: task2.short_id,
+    title: task2.title,
+    status: task2.status,
+    priority: task2.priority,
+    project_path: routeState.route.project_path ?? task2.working_dir ?? ref.source_repo_path,
+    task_version: task2.version,
+    task_updated_at: task2.updated_at,
+    task_fingerprint: metadataFingerprint(task2.metadata),
+    tags: task2.tags,
+    task_intent: {
+      auto_route: autoRoute
+    },
+    metadata: discoveryMetadata(task2.metadata),
+    route_state: routeState
+  };
+}
+function discoveryError(ref, code, error) {
+  return {
+    ...ref,
+    code,
+    message: error instanceof Error ? error.message : String(error)
+  };
+}
+function errorCode(error) {
+  if (typeof error === "object" && error !== null && "code" in error && error.code === "STORE_MISSING") {
+    return "STORE_MISSING";
+  }
+  if (typeof error === "object" && error !== null && "code" in error && error.code === "STORE_INVALID") {
+    return "STORE_INVALID";
+  }
+  return "STORE_UNREADABLE";
+}
+function discoverTaskRouteSources(input) {
+  const include = normalizePatterns(input.include);
+  const exclude = normalizePatterns(input.exclude);
+  const sourceRoots = (input.sourceRoots ?? []).map(normalizePath5).sort();
+  const sourceStores = (input.sourceStores ?? []).map(normalizePath5).sort();
+  const limit = Number.isFinite(input.limit ?? NaN) && (input.limit ?? 0) >= 0 ? Math.floor(input.limit ?? 0) : null;
+  const collected = collectStoreRefs(input);
+  const stores = [];
+  const errors2 = [...collected.errors];
+  const candidates = [];
+  let totalCandidateCount = 0;
+  for (const ref of collected.stores) {
+    if (!shouldIncludeStore(ref, include, exclude))
+      continue;
+    const storeErrors = [];
+    let db = null;
+    try {
+      db = openReadonlyStore(ref);
+      const readyTasks = listPendingTasksReadonly(db).filter((task2) => isReadyTask(task2, db));
+      totalCandidateCount += readyTasks.length;
+      const remaining = limit === null ? readyTasks.length : Math.max(0, limit - candidates.length);
+      const selectedTasks = limit === null ? readyTasks : readyTasks.slice(0, remaining);
+      candidates.push(...selectedTasks.map((task2) => sourceCandidate(ref, task2, db)));
+      stores.push({
+        ...ref,
+        status: "ok",
+        candidate_count: readyTasks.length,
+        returned_candidate_count: selectedTasks.length,
+        errors: []
+      });
+    } catch (error) {
+      const storeError = discoveryError(ref, errorCode(error), error);
+      storeErrors.push(storeError);
+      errors2.push(storeError);
+      stores.push({
+        ...ref,
+        status: storeError.code === "STORE_MISSING" ? "missing" : "error",
+        candidate_count: 0,
+        returned_candidate_count: 0,
+        errors: storeErrors
+      });
+    } finally {
+      db?.close();
+    }
+  }
+  return {
+    schema_version: TASK_ROUTE_SOURCE_DISCOVERY_SCHEMA_VERSION,
+    sourceRoots,
+    sourceStores,
+    include,
+    exclude,
+    limit,
+    total_candidate_count: totalCandidateCount,
+    returned_candidate_count: candidates.length,
+    truncated: limit !== null && totalCandidateCount > candidates.length,
+    stores,
+    candidates,
+    errors: errors2
+  };
+}
+var TASK_ROUTE_SOURCE_DISCOVERY_SCHEMA_VERSION = "todos.task_route_sources.v1", TODO_STORE_RELATIVE_PATH, ROOT_SCAN_MAX_DEPTH = 5, SKIPPED_SCAN_DIRS;
+var init_task_route_sources = __esm(() => {
+  init_database();
+  init_task_lifecycle();
+  init_task_crud();
+  init_redaction();
+  init_task_routing();
+  TODO_STORE_RELATIVE_PATH = join21(".hasna", "todos", "todos.db");
+  SKIPPED_SCAN_DIRS = new Set([
+    ".git",
+    ".hg",
+    ".svn",
+    "node_modules",
+    "dist",
+    "build",
+    ".next",
+    ".turbo",
+    ".cache"
+  ]);
+});
+
 // src/lib/tester-issue-reports.ts
 var exports_tester_issue_reports = {};
 __export(exports_tester_issue_reports, {
@@ -55231,7 +55840,7 @@ __export(exports_tester_issue_reports, {
   TESTERS_ISSUE_REPORT_RESULT_SCHEMA_VERSION: () => TESTERS_ISSUE_REPORT_RESULT_SCHEMA_VERSION,
   TESTERS_ISSUE_REPORT_BATCH_RESULT_SCHEMA_VERSION: () => TESTERS_ISSUE_REPORT_BATCH_RESULT_SCHEMA_VERSION
 });
-import { createHash as createHash13 } from "crypto";
+import { createHash as createHash14 } from "crypto";
 function asObject3(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : {};
 }
@@ -55403,7 +56012,7 @@ function fingerprintTesterIssueReport(report) {
     normalizeText4(report.failure?.message || report.summary || report.title).slice(0, 240),
     normalizeText4(stackTop).slice(0, 160)
   ].join("::");
-  return `testers:${createHash13("sha256").update(raw).digest("hex").slice(0, 16)}`;
+  return `testers:${createHash14("sha256").update(raw).digest("hex").slice(0, 16)}`;
 }
 function priorityForSeverity(severity, fallback) {
   return PRIORITIES5.includes(severity) ? severity : fallback;
@@ -55722,6 +56331,15 @@ function parseCsvOption(value) {
   const values = value.split(",").map((item) => item.trim()).filter(Boolean);
   return values.length > 0 ? values : undefined;
 }
+function collectOption2(value, previous = []) {
+  return [...previous, value];
+}
+function expandRepeatedCsvOption(value) {
+  if (!value || value.length === 0)
+    return;
+  const values = value.flatMap((item) => item.split(",").map((part) => part.trim()).filter(Boolean));
+  return values.length > 0 ? values : undefined;
+}
 function resolveOptionalId(table, value) {
   if (!value)
     return;
@@ -55880,6 +56498,7 @@ function registerQueryCommands(program2) {
   });
   program2.command("next").description("Show the best pending task to work on next").option("--agent <id>", "Prefer tasks assigned to this agent").option("--project <id>", "Filter to project").option("-j, --json", "Output as JSON").action(async (opts) => {
     const globalOpts = program2.opts();
+    const json2 = opts.json || globalOpts.json;
     const db = getDatabase();
     const filters = {};
     const projectInput = opts.project || globalOpts.project;
@@ -55890,10 +56509,14 @@ function registerQueryCommands(program2) {
     }
     const task2 = getNextTask(opts.agent, Object.keys(filters).length ? filters : undefined, db);
     if (!task2) {
+      if (json2) {
+        console.log(JSON.stringify(null));
+        return;
+      }
       console.log(chalk7.dim("No tasks available."));
       return;
     }
-    if (opts.json) {
+    if (json2) {
       console.log(JSON.stringify(task2, null, 2));
       return;
     }
@@ -55903,16 +56526,26 @@ function registerQueryCommands(program2) {
       console.log(chalk7.dim(`  ${task2.description.slice(0, 100)}`));
   });
   program2.command("claim <agent>").description("Atomically claim the best pending task for an agent").option("--project <id>", "Filter to project").option("--steal-stale", "Steal the highest-priority stale task when no pending task is available").option("--stale-minutes <n>", "How long a task must be stale before stealing (default: 30)", "30").option("-j, --json", "Output as JSON").action(async (agent, opts) => {
+    const globalOpts = program2.opts();
+    const json2 = opts.json || globalOpts.json;
     const db = getDatabase();
     const filters = {};
-    if (opts.project)
-      filters.project_id = opts.project;
+    const projectInput = opts.project || globalOpts.project;
+    if (projectInput) {
+      const pid = autoProject({ project: projectInput }) || resolvePartialId(db, "projects", projectInput) || db.query("SELECT id FROM projects WHERE path = ? OR name = ? OR task_list_id = ?").get(projectInput, projectInput, projectInput)?.id;
+      if (pid)
+        filters.project_id = pid;
+    }
     const task2 = opts.stealStale ? (await Promise.resolve().then(() => (init_tasks(), exports_tasks))).claimOrSteal(agent, { ...filters, stale_minutes: parseInt(opts.staleMinutes, 10) }, db)?.task ?? null : claimNextTask(agent, Object.keys(filters).length ? filters : undefined, db);
     if (!task2) {
+      if (json2) {
+        console.log(JSON.stringify(null));
+        return;
+      }
       console.log(chalk7.dim("No tasks available to claim."));
       return;
     }
-    if (opts.json) {
+    if (json2) {
       console.log(JSON.stringify(task2, null, 2));
       return;
     }
@@ -55933,12 +56566,14 @@ function registerQueryCommands(program2) {
     console.log(chalk7.green(`Stolen: ${task2.short_id || task2.id.slice(0, 8)} | ${task2.priority} | ${task2.title}`));
   });
   program2.command("status").description("Show full project health snapshot").option("--agent <id>", "Include next task for this agent").option("--project <id>", "Filter to project").option("-j, --json", "Output as JSON").action(async (opts) => {
+    const globalOpts = program2.opts();
+    const json2 = opts.json || globalOpts.json;
     const db = getDatabase();
     const filters = {};
     if (opts.project)
       filters.project_id = opts.project;
     const s = getStatus(Object.keys(filters).length ? filters : undefined, opts.agent, undefined, db);
-    if (opts.json) {
+    if (json2) {
       console.log(JSON.stringify(s, null, 2));
       return;
     }
@@ -56075,6 +56710,8 @@ Blocked:`));
     console.log();
   });
   program2.command("fail <id>").description("Mark a task as failed with optional reason and retry").option("--reason <text>", "Why it failed").option("--agent <id>", "Agent reporting the failure").option("--retry", "Auto-create a retry copy").option("-j, --json", "Output as JSON").action(async (id, opts) => {
+    const globalOpts = program2.opts();
+    const json2 = opts.json || globalOpts.json;
     const db = getDatabase();
     const resolvedId = resolvePartialId(db, "tasks", id);
     if (!resolvedId) {
@@ -56082,7 +56719,7 @@ Blocked:`));
       process.exit(1);
     }
     const result = failTask(resolvedId, opts.agent, opts.reason, { retry: opts.retry }, db);
-    if (opts.json) {
+    if (json2) {
       console.log(JSON.stringify(result, null, 2));
       return;
     }
@@ -56093,12 +56730,14 @@ Blocked:`));
       console.log(chalk7.yellow(`Retry created: ${result.retryTask.short_id || result.retryTask.id.slice(0, 8)} | ${result.retryTask.title}`));
   });
   program2.command("active").description("Show all currently in-progress tasks").option("--project <id>", "Filter to project").option("-j, --json", "Output as JSON").action(async (opts) => {
+    const globalOpts = program2.opts();
+    const json2 = opts.json || globalOpts.json;
     const db = getDatabase();
     const filters = {};
     if (opts.project)
       filters.project_id = opts.project;
     const work = getActiveWork(Object.keys(filters).length ? filters : undefined, db);
-    if (opts.json) {
+    if (json2) {
       console.log(JSON.stringify(work, null, 2));
       return;
     }
@@ -56114,12 +56753,14 @@ Blocked:`));
     }
   });
   program2.command("stale").description("Find tasks stuck in_progress with no recent activity").option("--minutes <n>", "Stale threshold in minutes", "30").option("--project <id>", "Filter to project").option("-j, --json", "Output as JSON").action(async (opts) => {
+    const globalOpts = program2.opts();
+    const json2 = opts.json || globalOpts.json;
     const db = getDatabase();
     const filters = {};
     if (opts.project)
       filters.project_id = opts.project;
     const tasks = getStaleTasks(parseInt(opts.minutes, 10), Object.keys(filters).length ? filters : undefined, db);
-    if (opts.json) {
+    if (json2) {
       console.log(JSON.stringify(tasks, null, 2));
       return;
     }
@@ -56143,7 +56784,7 @@ Blocked:`));
       project_id: projectId,
       limit: opts.limit ? parseInt(opts.limit, 10) : undefined
     }, db);
-    if (opts.json) {
+    if (opts.json || globalOpts.json) {
       console.log(JSON.stringify(result, null, 2));
       return;
     }
@@ -56360,13 +57001,13 @@ Repairs`));
     try {
       const db = getDatabase();
       const row = db.query("SELECT COUNT(*) as count FROM tasks").get();
-      const { statSync: statSync9 } = await import("fs");
-      const { join: join21 } = await import("path");
+      const { statSync: statSync10 } = await import("fs");
+      const { join: join22 } = await import("path");
       const home = process.env["HOME"] || process.env["USERPROFILE"] || "~";
-      const dbPath = process.env["HASNA_TODOS_DB_PATH"] || process.env["TODOS_DB_PATH"] || join21(home, ".hasna", "todos", "todos.db");
+      const dbPath = process.env["HASNA_TODOS_DB_PATH"] || process.env["TODOS_DB_PATH"] || join22(home, ".hasna", "todos", "todos.db");
       let size = "unknown";
       try {
-        size = `${(statSync9(dbPath).size / 1024 / 1024).toFixed(1)} MB`;
+        size = `${(statSync10(dbPath).size / 1024 / 1024).toFixed(1)} MB`;
       } catch {}
       checks.push({ name: "Database", ok: true, message: `${row.count} tasks \xB7 ${size} \xB7 ${chalk7.dim(dbPath)}` });
     } catch (e) {
@@ -56856,8 +57497,42 @@ Repairs`));
       console.log(`  ${chalk7.dim(time2)} ${chalk7.cyan(entry.source)} ${chalk7.dim(ref)} ${entry.event_type}${message}${agent}`);
     }
   });
-  program2.command("ready").description("Show all tasks ready to be claimed (pending, unblocked, unlocked)").option("-j, --json", "Output as JSON").option("--project <id>", "Filter to project").option("--limit <n>", "Max tasks to show", "20").action(async (opts) => {
+  program2.command("ready").description("Show all tasks ready to be claimed (pending, unblocked, unlocked)").option("-j, --json", "Output as JSON").option("--project <id>", "Filter to project").option("--limit <n>", "Max tasks to show", "20").option("--source-root <path>", "Read-only source root to scan for .hasna/todos/todos.db (repeatable)", collectOption2, []).option("--source-store <path>", "Read-only todos SQLite store path to scan (repeatable)", collectOption2, []).option("--include <pattern>", "Include source repo/store paths matching substring or glob (repeatable or comma-separated)", collectOption2, []).option("--exclude <pattern>", "Exclude source repo/store paths matching substring or glob (repeatable or comma-separated)", collectOption2, []).action(async (opts) => {
     const globalOpts = program2.opts();
+    const sourceRoots = expandRepeatedCsvOption(opts.sourceRoot);
+    const sourceStores = expandRepeatedCsvOption(opts.sourceStore);
+    const include = expandRepeatedCsvOption(opts.include);
+    const exclude = expandRepeatedCsvOption(opts.exclude);
+    if (sourceRoots || sourceStores || include || exclude) {
+      const { discoverTaskRouteSources: discoverTaskRouteSources2 } = await Promise.resolve().then(() => (init_task_route_sources(), exports_task_route_sources));
+      const result = discoverTaskRouteSources2({
+        sourceRoots,
+        sourceStores,
+        include,
+        exclude,
+        limit: parseInt(opts.limit, 10)
+      });
+      if (opts.json || globalOpts.json) {
+        console.log(JSON.stringify(result));
+        return;
+      }
+      if (result.candidates.length === 0) {
+        console.log(chalk7.dim("  No source tasks ready to claim."));
+      } else {
+        console.log(chalk7.bold(`Ready source tasks (${result.candidates.length}):
+`));
+        for (const candidate of result.candidates) {
+          const source3 = candidate.source_repo_path ?? candidate.source_db_path;
+          const pri = candidate.priority === "critical" ? chalk7.bgRed.white(" CRIT ") : candidate.priority === "high" ? chalk7.red("[high]") : candidate.priority === "medium" ? chalk7.yellow("[med]") : "";
+          console.log(`  ${chalk7.cyan(candidate.task_short_id || candidate.task_id.slice(0, 8))} ${candidate.title} ${pri}${chalk7.dim(` ${source3}`)}`);
+        }
+      }
+      if (result.errors.length > 0) {
+        console.log(chalk7.yellow(`
+  ${result.errors.length} source error${result.errors.length === 1 ? "" : "s"} isolated; rerun with --json for details.`));
+      }
+      return;
+    }
     const db = getDatabase();
     const { getBlockingDeps: getBlockingDeps2 } = await Promise.resolve().then(() => (init_tasks(), exports_tasks));
     const { isLockExpired: isLockExpired2 } = await Promise.resolve().then(() => (init_database(), exports_database));
@@ -58179,21 +58854,21 @@ __export(exports_mcp_hooks_commands, {
 });
 import chalk8 from "chalk";
 import { execSync as execSync3 } from "child_process";
-import { existsSync as existsSync21, readFileSync as readFileSync17, writeFileSync as writeFileSync10, mkdirSync as mkdirSync11, chmodSync as chmodSync2 } from "fs";
-import { dirname as dirname12, join as join21 } from "path";
+import { existsSync as existsSync22, readFileSync as readFileSync17, writeFileSync as writeFileSync10, mkdirSync as mkdirSync11, chmodSync as chmodSync2 } from "fs";
+import { dirname as dirname13, join as join22 } from "path";
 function getMcpBinaryPath() {
   try {
     const p = execSync3("which todos-mcp", { encoding: "utf-8" }).trim();
     if (p)
       return p;
   } catch {}
-  const bunBin = join21(HOME2, ".bun", "bin", "todos-mcp");
-  if (existsSync21(bunBin))
+  const bunBin = join22(HOME2, ".bun", "bin", "todos-mcp");
+  if (existsSync22(bunBin))
     return bunBin;
   return "todos-mcp";
 }
 function readJsonFile2(path) {
-  if (!existsSync21(path))
+  if (!existsSync22(path))
     return {};
   try {
     return JSON.parse(readFileSync17(path, "utf-8"));
@@ -58202,20 +58877,20 @@ function readJsonFile2(path) {
   }
 }
 function writeJsonFile2(path, data) {
-  const dir = dirname12(path);
-  if (!existsSync21(dir))
+  const dir = dirname13(path);
+  if (!existsSync22(dir))
     mkdirSync11(dir, { recursive: true });
   writeFileSync10(path, JSON.stringify(data, null, 2) + `
 `);
 }
 function readTomlFile(path) {
-  if (!existsSync21(path))
+  if (!existsSync22(path))
     return "";
   return readFileSync17(path, "utf-8");
 }
 function writeTomlFile(path, content) {
-  const dir = dirname12(path);
-  if (!existsSync21(dir))
+  const dir = dirname13(path);
+  if (!existsSync22(dir))
     mkdirSync11(dir, { recursive: true });
   writeFileSync10(path, content);
 }
@@ -58262,7 +58937,7 @@ function envOption(value) {
 }
 function registerClaude(binPath, global) {
   const scope = global ? "user" : "project";
-  const cmd = `claude mcp add --transport stdio --scope ${scope} todos -- ${binPath}`;
+  const cmd = `claude mcp add --transport stdio --scope ${scope} todos -- ${binPath} --stdio`;
   try {
     execSync3(cmd, { stdio: "pipe" });
     console.log(chalk8.green(`Claude Code (${scope}): registered via 'claude mcp add'`));
@@ -58281,13 +58956,13 @@ function unregisterClaude(_global) {
   }
 }
 function registerCodex(binPath) {
-  const configPath = join21(HOME2, ".codex", "config.toml");
+  const configPath = join22(HOME2, ".codex", "config.toml");
   let content = readTomlFile(configPath);
   content = removeTomlBlock(content, "mcp_servers.todos");
   const block = `
 [mcp_servers.todos]
 command = "${binPath}"
-args = []
+args = ["--stdio"]
 `;
   content = content.trimEnd() + `
 ` + block;
@@ -58295,7 +58970,7 @@ args = []
   console.log(chalk8.green(`Codex CLI: registered in ${configPath}`));
 }
 function unregisterCodex() {
-  const configPath = join21(HOME2, ".codex", "config.toml");
+  const configPath = join22(HOME2, ".codex", "config.toml");
   let content = readTomlFile(configPath);
   if (!content.includes("[mcp_servers.todos]")) {
     console.log(chalk8.dim(`Codex CLI: todos not found in ${configPath}`));
@@ -58307,7 +58982,7 @@ function unregisterCodex() {
   console.log(chalk8.green(`Codex CLI: unregistered from ${configPath}`));
 }
 function registerGemini(binPath) {
-  const configPath = join21(HOME2, ".gemini", "settings.json");
+  const configPath = join22(HOME2, ".gemini", "settings.json");
   const config = readJsonFile2(configPath);
   if (!config["mcpServers"]) {
     config["mcpServers"] = {};
@@ -58315,13 +58990,13 @@ function registerGemini(binPath) {
   const servers = config["mcpServers"];
   servers["todos"] = {
     command: binPath,
-    args: []
+    args: ["--stdio"]
   };
   writeJsonFile2(configPath, config);
   console.log(chalk8.green(`Gemini CLI: registered in ${configPath}`));
 }
 function unregisterGemini() {
-  const configPath = join21(HOME2, ".gemini", "settings.json");
+  const configPath = join22(HOME2, ".gemini", "settings.json");
   const config = readJsonFile2(configPath);
   const servers = config["mcpServers"];
   if (!servers || !("todos" in servers)) {
@@ -58378,8 +59053,8 @@ function registerMcpHooksCommands(program2) {
       if (p)
         todosBin = p;
     } catch {}
-    const hooksDir = join21(process.cwd(), ".claude", "hooks");
-    if (!existsSync21(hooksDir))
+    const hooksDir = join22(process.cwd(), ".claude", "hooks");
+    if (!existsSync22(hooksDir))
       mkdirSync11(hooksDir, { recursive: true });
     const hookScript = `#!/usr/bin/env bash
 # Auto-generated by: todos hooks install
@@ -58404,11 +59079,11 @@ esac
 
 exit 0
 `;
-    const hookPath = join21(hooksDir, "todos-sync.sh");
+    const hookPath = join22(hooksDir, "todos-sync.sh");
     writeFileSync10(hookPath, hookScript);
     execSync3(`chmod +x "${hookPath}"`);
     console.log(chalk8.green(`Hook script created: ${hookPath}`));
-    const settingsPath = join21(process.cwd(), ".claude", "settings.json");
+    const settingsPath = join22(process.cwd(), ".claude", "settings.json");
     const settings = readJsonFile2(settingsPath);
     if (!settings["hooks"]) {
       settings["hooks"] = {};
@@ -58446,7 +59121,11 @@ exit 0
       unregisterMcp(opts.unregister, opts.global);
       return;
     }
-    await Promise.resolve().then(() => (init_mcp2(), exports_mcp));
+    const { buildServer: buildServer2 } = await Promise.resolve().then(() => (init_mcp2(), exports_mcp));
+    const { StdioServerTransport: StdioServerTransport2 } = await import("@modelcontextprotocol/sdk/server/stdio.js");
+    const server = buildServer2();
+    const transport = new StdioServerTransport2;
+    await server.connect(transport);
   });
   program2.command("import <url>").description("Import a GitHub issue as a task").option("--project <id>", "Project ID").option("--list <id>", "Task list ID").action(async (url, opts) => {
     const globalOpts = program2.opts();
@@ -59277,7 +59956,7 @@ Artifacts:`));
       const gitDir = execSync3("git rev-parse --git-dir", { encoding: "utf-8" }).trim();
       const hookPath = `${gitDir}/hooks/post-commit`;
       const marker = "# todos-auto-link";
-      if (existsSync21(hookPath)) {
+      if (existsSync22(hookPath)) {
         const existing = readFileSync17(hookPath, "utf-8");
         if (existing.includes(marker)) {
           console.log(chalk8.yellow("Hook already installed."));
@@ -59305,7 +59984,7 @@ $(dirname "$0")/../../scripts/post-commit-hook.sh
       const gitDir = execSync3("git rev-parse --git-dir", { encoding: "utf-8" }).trim();
       const hookPath = `${gitDir}/hooks/post-commit`;
       const marker = "# todos-auto-link";
-      if (!existsSync21(hookPath)) {
+      if (!existsSync22(hookPath)) {
         console.log(chalk8.dim("No post-commit hook found."));
         return;
       }
@@ -59491,7 +60170,7 @@ import chalk10 from "chalk";
 import { execSync as execSync4 } from "child_process";
 import { readFileSync as readFileSync18, unlinkSync as unlinkSync2, writeFileSync as writeFileSync11 } from "fs";
 import { tmpdir as tmpdir4 } from "os";
-import { join as join22 } from "path";
+import { join as join23 } from "path";
 function getOrCreateLocalMachineName() {
   return process.env["TODOS_MACHINE_NAME"] || __require("os").hostname() || "unknown";
 }
@@ -59529,7 +60208,7 @@ function remoteTempPath(sshAddress) {
 }
 function readRemoteBridgeBundle(sshAddress) {
   const remotePath = remoteTempPath(sshAddress);
-  const localPath = join22(tmpdir4(), `todos-bridge-pull-${uuid()}.json`);
+  const localPath = join23(tmpdir4(), `todos-bridge-pull-${uuid()}.json`);
   try {
     runSsh(sshAddress, `todos export --format bridge --allow-plaintext-sensitive --output ${shellQuote(remotePath)}`, 120000);
     scpFromRemote(sshAddress, remotePath, localPath);
@@ -59544,7 +60223,7 @@ function readRemoteBridgeBundle(sshAddress) {
   }
 }
 function writeLocalBridgeBundle() {
-  const localPath = join22(tmpdir4(), `todos-bridge-push-${uuid()}.json`);
+  const localPath = join23(tmpdir4(), `todos-bridge-push-${uuid()}.json`);
   writeFileSync11(localPath, JSON.stringify(createLocalBridgeBundle(), null, 2));
   return localPath;
 }
@@ -60608,7 +61287,7 @@ __export(exports_onboarding_commands, {
   registerOnboardingCommands: () => registerOnboardingCommands
 });
 import chalk17 from "chalk";
-import { resolve as resolve21 } from "path";
+import { resolve as resolve22 } from "path";
 function registerOnboardingCommands(program2) {
   program2.command("onboarding").alias("demo-fixtures").description("List, show, write, or import bundled local onboarding fixtures").option("--show <name>", "Show one fixture bridge bundle as JSON").option("--write <dir>", "Write all bundled fixture bridge bundles to a directory").option("--import <name>", "Dry-run or apply an onboarding fixture import").option("--apply", "Apply an onboarding fixture import. Defaults to dry-run.").option("--resolve-conflicts", "Safely merge existing local tasks while preserving divergent fields").action(async (opts) => {
     const globalOpts = program2.opts();
@@ -60624,7 +61303,7 @@ function registerOnboardingCommands(program2) {
         return;
       }
       if (opts.write) {
-        const result = writeOnboardingFixtureFiles2(resolve21(opts.write));
+        const result = writeOnboardingFixtureFiles2(resolve22(opts.write));
         if (globalOpts.json) {
           output(result, true);
           return;
@@ -60838,7 +61517,6 @@ var init_cli_mcp_parity = __esm(() => {
         "bulk_create_tasks",
         "get_next_task",
         "claim_next_task",
-        "get_active_work",
         "get_stale_tasks",
         "get_my_tasks",
         "get_blocked_tasks",
@@ -61870,11 +62548,8 @@ var init_cli_mcp_parity = __esm(() => {
         "delete_search_view",
         "get_status",
         "standup",
-        "get_task_stats",
         "get_context",
-        "task_context",
-        "get_task_graph",
-        "get_recent_activity"
+        "task_context"
       ],
       jsonContracts: ["task", "saved_search_view", "saved_search_run_result", "status_summary", "audit_history", "structured_error", "api_error"],
       errorContracts: ["structured_error", "api_error"],
@@ -64073,7 +64748,7 @@ __export(exports_sdk_integration_fixtures, {
   TODOS_SDK_INTEGRATION_FIXTURE_GENERATED_AT: () => TODOS_SDK_INTEGRATION_FIXTURE_GENERATED_AT
 });
 import { mkdirSync as mkdirSync12, writeFileSync as writeFileSync12 } from "fs";
-import { join as join23 } from "path";
+import { join as join24 } from "path";
 function source5(version) {
   return {
     packageName: "@hasna/todos",
@@ -64180,7 +64855,7 @@ function writeSdkIntegrationFixtures(directory, options = {}) {
   ];
   const written = [];
   for (const [name, payload] of files) {
-    const file = join23(directory, name);
+    const file = join24(directory, name);
     writeFileSync12(file, `${JSON.stringify(payload, null, 2)}
 `, "utf-8");
     written.push(file);
@@ -64204,7 +64879,7 @@ __export(exports_sdk_fixture_commands, {
   registerSdkFixtureCommands: () => registerSdkFixtureCommands
 });
 import chalk19 from "chalk";
-import { resolve as resolve22 } from "path";
+import { resolve as resolve23 } from "path";
 function registerSdkFixtureCommands(program2) {
   program2.command("sdk-fixtures").description("List, show, or write local SDK integration fixtures").option("--show", "Print the full fixture pack JSON").option("--write <dir>", "Write fixture pack, bridge fixture, contract snapshots, and example index to a directory").action(async (opts) => {
     const globalOpts = program2.opts();
@@ -64215,7 +64890,7 @@ function registerSdkFixtureCommands(program2) {
         writeSdkIntegrationFixtures: writeSdkIntegrationFixtures2
       } = await Promise.resolve().then(() => (init_sdk_integration_fixtures(), exports_sdk_integration_fixtures));
       if (opts.write) {
-        const result = writeSdkIntegrationFixtures2(resolve22(opts.write));
+        const result = writeSdkIntegrationFixtures2(resolve23(opts.write));
         if (globalOpts.json) {
           console.log(JSON.stringify(result));
           return;
@@ -65037,7 +65712,7 @@ __export(exports_local_backup_commands, {
   registerLocalBackupCommands: () => registerLocalBackupCommands
 });
 import chalk26 from "chalk";
-import { resolve as resolve23 } from "path";
+import { resolve as resolve24 } from "path";
 function globalOptions6(program2) {
   const command = program2;
   return command.optsWithGlobals?.() ?? program2.opts();
@@ -65059,10 +65734,10 @@ function registerLocalBackupCommands(program2) {
       const projectId = opts.projectId ?? autoProject(globalOpts);
       const backupBundle = createLocalBackup2({
         project_id: projectId,
-        output_path: opts.output ? resolve23(opts.output) : undefined
+        output_path: opts.output ? resolve24(opts.output) : undefined
       });
       const result = {
-        output_path: opts.output ? resolve23(opts.output) : null,
+        output_path: opts.output ? resolve24(opts.output) : null,
         backup: backupBundle
       };
       if (opts.json || globalOpts.json) {
@@ -65387,7 +66062,7 @@ function upsertById(db, table, columns, row, updateClockColumn) {
   const placeholders2 = presentColumns.map(() => "?").join(", ");
   const values = presentColumns.map((column) => valueForColumn(column, row[column]));
   const updateColumns = presentColumns.filter((column) => column !== "id");
-  const updateSet = updateColumns.map((column) => `${column} = excluded.${column}`).join(", ");
+  const updateSet = updateColumns.map((column) => column === "version" ? `version = MAX(COALESCE(${table}.version, 0), excluded.version)` : `${column} = excluded.${column}`).join(", ");
   const clockGuard = updateClockColumn && presentColumns.includes(updateClockColumn) ? ` WHERE ${table}.${updateClockColumn} IS NULL OR ${table}.${updateClockColumn} <= excluded.${updateClockColumn}` : "";
   const sql = updateSet ? `INSERT INTO ${table} (${presentColumns.join(", ")}) VALUES (${placeholders2})
        ON CONFLICT(id) DO UPDATE SET ${updateSet}${clockGuard}` : `INSERT OR IGNORE INTO ${table} (${presentColumns.join(", ")}) VALUES (${placeholders2})`;
@@ -65831,7 +66506,9 @@ class PostgresTodosSyncStore {
           deleted_at = EXCLUDED.deleted_at,
           source_machine_id = EXCLUDED.source_machine_id,
           version = EXCLUDED.version
-        WHERE ${this.tableName}.updated_at <= EXCLUDED.updated_at`, [
+        WHERE ${this.tableName}.updated_at < EXCLUDED.updated_at
+           OR (${this.tableName}.updated_at = EXCLUDED.updated_at
+               AND COALESCE(${this.tableName}.version, 0) <= COALESCE(EXCLUDED.version, 0))`, [
         this.service,
         entry.type,
         entry.id,
@@ -66184,7 +66861,7 @@ class PostgresJsonRecordStore {
   async upsert(type, value, context = {}) {
     await this.ensureSchema();
     const updatedAt = stringValue2(value.updated_at) ?? stringValue2(value.created_at) ?? new Date().toISOString();
-    await this.options.client.query(`INSERT INTO ${this.tableName} (
+    const result = await this.options.client.query(`INSERT INTO ${this.tableName} (
         service, object_type, object_id, payload, updated_at,
         deleted_at, source_machine_id, version
       ) VALUES ($1, $2, $3, $4::jsonb, $5::timestamptz, NULL, $6, $7)
@@ -66194,7 +66871,11 @@ class PostgresJsonRecordStore {
         deleted_at = NULL,
         source_machine_id = EXCLUDED.source_machine_id,
         version = EXCLUDED.version
-      WHERE ${this.tableName}.updated_at IS NULL OR ${this.tableName}.updated_at <= EXCLUDED.updated_at`, [
+      WHERE ${this.tableName}.updated_at IS NULL
+         OR ${this.tableName}.updated_at < EXCLUDED.updated_at
+         OR (${this.tableName}.updated_at = EXCLUDED.updated_at
+             AND COALESCE(${this.tableName}.version, 0) <= COALESCE(EXCLUDED.version, 0))
+      RETURNING object_id`, [
       this.service,
       type,
       value.id,
@@ -66203,8 +66884,27 @@ class PostgresJsonRecordStore {
       context.requestId ?? this.sourceMachineId ?? null,
       numberValue3(value.version)
     ]);
+    if (result.rows.length === 0) {
+      const current = await this.get(type, value.id);
+      if (current)
+        return current;
+    }
     return value;
   }
+  async incrementProjectTaskCounter(projectId, _context = {}) {
+    await this.ensureSchema();
+    const result = await this.options.client.query(`UPDATE ${this.tableName}
+         SET payload = jsonb_set(payload, '{task_counter}',
+               to_jsonb(COALESCE((payload->>'task_counter')::bigint, 0) + 1)),
+             updated_at = $3::timestamptz,
+             version = COALESCE(version, 0) + 1
+       WHERE service = $1 AND object_type = 'projects' AND object_id = $2 AND deleted_at IS NULL
+       RETURNING payload->>'task_counter' AS counter`, [this.service, projectId, new Date().toISOString()]);
+    const row = result.rows[0];
+    if (!row || row.counter === null || row.counter === undefined)
+      return null;
+    return Number(row.counter);
+  }
   async delete(type, id, context = {}) {
     await this.ensureSchema();
     const existing = await this.get(type, id);
@@ -66360,6 +67060,9 @@ async function updateTask2(id, input, store) {
 }
 async function startTask2(id, agentId, store) {
   const task2 = await requireRecord("tasks", id, store);
+  if (task2.status !== "pending" && task2.status !== "in_progress") {
+    throw new Error(`Task is ${task2.status} and cannot be started by ${agentId}`);
+  }
   return patchTask(task2, {
     status: "in_progress",
     assigned_to: task2.assigned_to ?? agentId,
@@ -66429,8 +67132,20 @@ async function getNextTask2(filters, store) {
   return (await listTasks3({ ...filters, status: "pending", limit: 1 }, store))[0] ?? null;
 }
 async function claimNextTask2(agentId, filters, store) {
-  const task2 = await getNextTask2(filters, store);
-  return task2 ? startTask2(task2.id, agentId, store) : null;
+  const MAX_ATTEMPTS = 25;
+  const tried = new Set;
+  for (let attempt = 0;attempt < MAX_ATTEMPTS; attempt++) {
+    const task2 = await getNextTask2(filters, store);
+    if (!task2)
+      return null;
+    if (tried.has(task2.id))
+      return null;
+    tried.add(task2.id);
+    try {
+      return await startTask2(task2.id, agentId, store);
+    } catch {}
+  }
+  return null;
 }
 async function getActiveWork2(filters, store) {
   const tasks = await listTasks3({ ...filters, status: "in_progress" }, store);
@@ -66703,12 +67418,9 @@ async function nextTaskShortId2(projectId, store, context) {
   const project = await store.get("projects", projectId);
   if (!project?.task_prefix)
     return null;
-  const counter = project.task_counter + 1;
-  await store.upsert("projects", {
-    ...project,
-    task_counter: counter,
-    updated_at: new Date().toISOString()
-  }, context);
+  const counter = await store.incrementProjectTaskCounter(projectId, context);
+  if (counter === null)
+    return null;
   return `${project.task_prefix}-${String(counter).padStart(5, "0")}`;
 }
 async function generateProjectPrefix(name, store) {
@@ -66866,7 +67578,7 @@ var init_factory = __esm(() => {
 });
 
 // src/storage/s3-artifacts.ts
-import { createHash as createHash14, createHmac as createHmac2 } from "crypto";
+import { createHash as createHash15, createHmac as createHmac2 } from "crypto";
 function createTodosS3ArtifactStore(options) {
   const requestFetch = options.fetch ?? fetch;
   const now4 = options.now ?? (() => new Date);
@@ -67038,7 +67750,7 @@ function toAmzDate(date) {
   return date.toISOString().replace(/[:-]|\.\d{3}/g, "");
 }
 function sha256Hex(value) {
-  return createHash14("sha256").update(value).digest("hex");
+  return createHash15("sha256").update(value).digest("hex");
 }
 function hmac(key, value) {
   return createHmac2("sha256", key).update(value).digest();