@hasna/todos 0.11.33 → 0.11.35

package/dist/cli/index.js

@@ -2888,6 +2888,42 @@ var init_migrations = __esm(() => {
   ALTER TABLE tasks ADD COLUMN current_step TEXT;
   ALTER TABLE tasks ADD COLUMN total_steps INTEGER;
   INSERT OR IGNORE INTO _migrations (id) VALUES (48);
+  `,
+    `
+  CREATE TABLE IF NOT EXISTS cycles (
+    id TEXT PRIMARY KEY,
+    project_id TEXT REFERENCES projects(id) ON DELETE CASCADE,
+    number INTEGER NOT NULL,
+    start_date TEXT NOT NULL,
+    end_date TEXT NOT NULL,
+    duration_weeks INTEGER NOT NULL DEFAULT 1,
+    status TEXT NOT NULL DEFAULT 'active' CHECK(status IN ('active', 'completed', 'archived')),
+    created_at TEXT NOT NULL DEFAULT (datetime('now')),
+    updated_at TEXT NOT NULL DEFAULT (datetime('now'))
+  );
+  CREATE INDEX IF NOT EXISTS idx_cycles_project ON cycles(project_id);
+  CREATE INDEX IF NOT EXISTS idx_cycles_number ON cycles(number);
+  CREATE INDEX IF NOT EXISTS idx_cycles_status ON cycles(status);
+  CREATE INDEX IF NOT EXISTS idx_cycles_dates ON cycles(start_date, end_date);
+  ALTER TABLE tasks ADD COLUMN cycle_id TEXT REFERENCES cycles(id) ON DELETE SET NULL;
+  CREATE INDEX IF NOT EXISTS idx_tasks_cycle ON tasks(cycle_id) WHERE cycle_id IS NOT NULL;
+  INSERT OR IGNORE INTO _migrations (id) VALUES (49);
+  `,
+    `
+  CREATE TABLE IF NOT EXISTS api_keys (
+    id TEXT PRIMARY KEY,
+    name TEXT NOT NULL,
+    key_hash TEXT NOT NULL UNIQUE,
+    prefix TEXT NOT NULL UNIQUE,
+    permissions TEXT NOT NULL DEFAULT '["*"]',
+    created_at TEXT NOT NULL DEFAULT (datetime('now')),
+    last_used_at TEXT,
+    expires_at TEXT,
+    revoked_at TEXT
+  );
+  CREATE INDEX IF NOT EXISTS idx_api_keys_prefix ON api_keys(prefix);
+  CREATE INDEX IF NOT EXISTS idx_api_keys_active ON api_keys(revoked_at, expires_at);
+  INSERT OR IGNORE INTO _migrations (id) VALUES (50);
   `
   ];
 });
@@ -3286,6 +3322,20 @@ function ensureSchema(db) {
   ensureIndex("CREATE INDEX IF NOT EXISTS idx_cycles_dates ON cycles(start_date, end_date)");
   ensureColumn("tasks", "cycle_id", "TEXT REFERENCES cycles(id) ON DELETE SET NULL");
   ensureIndex("CREATE INDEX IF NOT EXISTS idx_tasks_cycle ON tasks(cycle_id) WHERE cycle_id IS NOT NULL");
+  ensureTable("api_keys", `
+    CREATE TABLE api_keys (
+      id TEXT PRIMARY KEY,
+      name TEXT NOT NULL,
+      key_hash TEXT NOT NULL UNIQUE,
+      prefix TEXT NOT NULL UNIQUE,
+      permissions TEXT NOT NULL DEFAULT '["*"]',
+      created_at TEXT NOT NULL DEFAULT (datetime('now')),
+      last_used_at TEXT,
+      expires_at TEXT,
+      revoked_at TEXT
+    )`);
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_api_keys_prefix ON api_keys(prefix)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_api_keys_active ON api_keys(revoked_at, expires_at)");
 }
 function backfillTaskTags(db) {
   try {
@@ -4675,8 +4725,8 @@ function createTask(input, db) {
   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, requires_approval, approved_by, approved_at, recurrence_rule, recurrence_parent_id, spawns_template_id, reason, spawned_from_session, assigned_by, assigned_from_project, task_type)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
+      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, 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)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
         id,
         null,
         input.project_id || null,
@@ -4698,6 +4748,10 @@ function createTask(input, db) {
         timestamp,
         input.due_at || null,
         input.estimated_minutes || null,
+        input.confidence ?? null,
+        input.retry_count ?? 0,
+        input.max_retries ?? 3,
+        input.retry_after ?? null,
         input.requires_approval ? 1 : 0,
         null,
         null,
@@ -4722,11 +4776,11 @@ function createTask(input, db) {
   if (tags.length > 0) {
     insertTaskTags(id, tags, d);
   }
-  const task = getTask2(id, d);
+  const task = getTask(id, d);
   dispatchWebhook("task.created", { id: task.id, short_id: task.short_id, title: task.title, status: task.status, priority: task.priority, project_id: task.project_id, assigned_to: task.assigned_to }, d).catch(() => {});
   return task;
 }
-function getTask2(id, db) {
+function getTask(id, db) {
   const d = db || getDatabase();
   const row = d.query("SELECT * FROM tasks WHERE id = ?").get(id);
   if (!row)
@@ -4735,7 +4789,7 @@ function getTask2(id, db) {
 }
 function getTaskWithRelations(id, db) {
   const d = db || getDatabase();
-  const task = getTask2(id, d);
+  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);
@@ -4749,7 +4803,7 @@ function getTaskWithRelations(id, db) {
        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 ? getTask2(task.parent_id, d) : null;
+  const parent = task.parent_id ? getTask(task.parent_id, d) : null;
   const checklist = getChecklist(id, d);
   return {
     ...task,
@@ -4936,14 +4990,16 @@ function countTasks(filter = {}, db) {
 }
 function updateTask(id, input, db) {
   const d = db || getDatabase();
-  const task = getTask2(id, d);
+  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 = [now()];
+  const params = [timestamp];
   if (input.title !== undefined) {
     sets.push("title = ?");
     params.push(input.title);
@@ -4960,13 +5016,17 @@ function updateTask(id, input, db) {
     params.push(input.status);
     if (input.status === "completed") {
       sets.push("completed_at = ?");
-      params.push(now());
+      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);
@@ -4995,6 +5055,30 @@ function updateTask(id, input, db) {
     sets.push("estimated_minutes = ?");
     params.push(input.estimated_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);
@@ -5016,7 +5100,7 @@ function updateTask(id, input, db) {
   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 = getTask2(id, d);
+    const current = getTask(id, d);
     throw new VersionConflictError(id, input.version, current?.version ?? -1);
   }
   if (input.tags !== undefined) {
@@ -5045,11 +5129,16 @@ function updateTask(id, input, db) {
     tags: input.tags ?? task.tags,
     metadata: input.metadata ?? task.metadata,
     version: task.version + 1,
-    updated_at: now(),
-    completed_at: input.status === "completed" ? now() : task.completed_at,
+    updated_at: timestamp,
+    completed_at: input.status === "completed" ? completionTimestamp : input.completed_at !== undefined ? input.completed_at : task.completed_at,
+    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 ? now() : task.approved_at
+    approved_at: input.approved_by ? timestamp : task.approved_at
   };
 }
 function deleteTask(id, db) {
@@ -5622,9 +5711,9 @@ var init_templates = __esm(() => {
 // src/db/task-graph.ts
 function addDependency(taskId, dependsOn, db) {
   const d = db || getDatabase();
-  if (!getTask2(taskId, d))
+  if (!getTask(taskId, d))
     throw new TaskNotFoundError(taskId);
-  if (!getTask2(dependsOn, d))
+  if (!getTask(dependsOn, d))
     throw new TaskNotFoundError(dependsOn);
   if (wouldCreateCycle(taskId, dependsOn, d)) {
     throw new DependencyCycleError(taskId, dependsOn);
@@ -5646,7 +5735,7 @@ function getTaskDependents(taskId, db) {
 }
 function cloneTask(taskId, overrides, db) {
   const d = db || getDatabase();
-  const source = getTask2(taskId, d);
+  const source = getTask(taskId, d);
   if (!source)
     throw new TaskNotFoundError(taskId);
   const input = {
@@ -5669,13 +5758,13 @@ function cloneTask(taskId, overrides, db) {
 }
 function getTaskGraph(taskId, direction = "both", db) {
   const d = db || getDatabase();
-  const task = getTask2(taskId, d);
+  const task = getTask(taskId, d);
   if (!task)
     throw new TaskNotFoundError(taskId);
   function toNode(t) {
     const deps = getTaskDependencies(t.id, d);
     const hasUnfinishedDeps = deps.some((dep) => {
-      const depTask = getTask2(dep.depends_on, d);
+      const depTask = getTask(dep.depends_on, d);
       return depTask && depTask.status !== "completed";
     });
     return { id: t.id, short_id: t.short_id, title: t.title, status: t.status, priority: t.priority, is_blocked: hasUnfinishedDeps };
@@ -5686,7 +5775,7 @@ function getTaskGraph(taskId, direction = "both", db) {
     visited.add(id);
     const deps = d.query("SELECT depends_on FROM task_dependencies WHERE task_id = ?").all(id);
     return deps.map((dep) => {
-      const depTask = getTask2(dep.depends_on, d);
+      const depTask = getTask(dep.depends_on, d);
       if (!depTask)
         return null;
       return { task: toNode(depTask), depends_on: buildUp(dep.depends_on, visited), blocks: [] };
@@ -5698,7 +5787,7 @@ function getTaskGraph(taskId, direction = "both", db) {
     visited.add(id);
     const dependents = d.query("SELECT task_id FROM task_dependencies WHERE depends_on = ?").all(id);
     return dependents.map((dep) => {
-      const depTask = getTask2(dep.task_id, d);
+      const depTask = getTask(dep.task_id, d);
       if (!depTask)
         return null;
       return { task: toNode(depTask), depends_on: [], blocks: buildDown(dep.task_id, visited) };
@@ -5711,7 +5800,7 @@ function getTaskGraph(taskId, direction = "both", db) {
 }
 function moveTask(taskId, target, db) {
   const d = db || getDatabase();
-  const task = getTask2(taskId, d);
+  const task = getTask(taskId, d);
   if (!task)
     throw new TaskNotFoundError(taskId);
   const sets = ["updated_at = ?", "version = version + 1"];
@@ -5730,7 +5819,7 @@ function moveTask(taskId, target, db) {
   }
   params.push(taskId);
   d.run(`UPDATE tasks SET ${sets.join(", ")} WHERE id = ?`, params);
-  return getTask2(taskId, d);
+  return getTask(taskId, d);
 }
 function wouldCreateCycle(taskId, dependsOn, db) {
   const visited = new Set;
@@ -5763,7 +5852,7 @@ function getBlockingDeps(id, db) {
     return [];
   const blocking = [];
   for (const dep of deps) {
-    const task = getTask2(dep.depends_on, d);
+    const task = getTask(dep.depends_on, d);
     if (task && task.status !== "completed")
       blocking.push(task);
   }
@@ -5771,7 +5860,7 @@ function getBlockingDeps(id, db) {
 }
 function startTask(id, agentId, db) {
   const d = db || getDatabase();
-  const task = getTask2(id, d);
+  const task = getTask(id, d);
   if (!task)
     throw new TaskNotFoundError(id);
   const blocking = getBlockingDeps(id, d);
@@ -5794,7 +5883,7 @@ function startTask(id, agentId, db) {
 }
 function completeTask(id, agentId, db, options) {
   const d = db || getDatabase();
-  const task = getTask2(id, 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)) {
@@ -5810,14 +5899,14 @@ function completeTask(id, agentId, db, options) {
     completionMeta._completion = { confidence: options.confidence };
   }
   const hasMeta = Object.keys(completionMeta).length > 0;
-  const timestamp = now();
+  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 = getTask2(id, d);
+        const current = getTask(id, d);
         throw new VersionConflictError(id, task.version, current?.version ?? -1);
       }
     }
@@ -5874,7 +5963,7 @@ function completeTask(id, agentId, db, options) {
 }
 function lockTask(id, agentId, db) {
   const d = db || getDatabase();
-  const task = getTask2(id, d);
+  const task = getTask(id, d);
   if (!task)
     throw new TaskNotFoundError(id);
   if (task.locked_by === agentId && !isLockExpired(task.locked_at)) {
@@ -5885,7 +5974,7 @@ function lockTask(id, agentId, db) {
   const result = d.run(`UPDATE tasks SET locked_by = ?, locked_at = ?, version = version + 1, updated_at = ?
      WHERE id = ? AND (locked_by IS NULL OR locked_by = ? OR locked_at < ?)`, [agentId, timestamp, timestamp, id, agentId, cutoff]);
   if (result.changes === 0) {
-    const current = getTask2(id, d);
+    const current = getTask(id, d);
     if (!current)
       throw new TaskNotFoundError(id);
     if (current.locked_by && !isLockExpired(current.locked_at)) {
@@ -5901,7 +5990,7 @@ function lockTask(id, agentId, db) {
 }
 function unlockTask(id, agentId, db) {
   const d = db || getDatabase();
-  const task = getTask2(id, d);
+  const task = getTask(id, d);
   if (!task)
     throw new TaskNotFoundError(id);
   if (agentId && task.locked_by && task.locked_by !== agentId) {
@@ -6002,7 +6091,7 @@ function getTasksChangedSince(since, filters, db) {
 }
 function failTask(id, agentId, reason, options, db) {
   const d = db || getDatabase();
-  const task = getTask2(id, d);
+  const task = getTask(id, d);
   if (!task)
     throw new TaskNotFoundError(id);
   const meta = {
@@ -6201,7 +6290,7 @@ function getStatus(filters, agentId, options, db) {
 }
 function decomposeTasks(parentId, subtasks, options, db) {
   const d = db || getDatabase();
-  const parent = getTask2(parentId, d);
+  const parent = getTask(parentId, d);
   if (!parent)
     throw new TaskNotFoundError(parentId);
   const created = [];
@@ -6232,7 +6321,7 @@ function decomposeTasks(parentId, subtasks, options, db) {
 function setTaskStatus(id, status, _agentId, db) {
   const d = db || getDatabase();
   for (let attempt = 0;attempt < 3; attempt++) {
-    const task = getTask2(id, d);
+    const task = getTask(id, d);
     if (!task)
       throw new TaskNotFoundError(id);
     if (task.status === status)
@@ -6250,7 +6339,7 @@ function setTaskStatus(id, status, _agentId, db) {
 function setTaskPriority(id, priority, _agentId, db) {
   const d = db || getDatabase();
   for (let attempt = 0;attempt < 3; attempt++) {
-    const task = getTask2(id, d);
+    const task = getTask(id, d);
     if (!task)
       throw new TaskNotFoundError(id);
     if (task.priority === priority)
@@ -6358,7 +6447,7 @@ function bulkUpdateTasks(taskIds, updates, db) {
   const tx = d.transaction(() => {
     for (const id of taskIds) {
       try {
-        const task = getTask2(id, d);
+        const task = getTask(id, d);
         if (!task) {
           failed.push({ id, error: "Task not found" });
           continue;
@@ -6373,6 +6462,30 @@ function bulkUpdateTasks(taskIds, updates, db) {
   tx();
   return { updated, failed };
 }
+function bulkDeleteTasks(taskIds, force = false, db) {
+  const d = db || getDatabase();
+  let deleted = 0;
+  let skipped = 0;
+  const failed = [];
+  const tx = d.transaction(() => {
+    for (const id of taskIds) {
+      try {
+        const childCount = d.query("SELECT COUNT(*) as count FROM tasks WHERE parent_id = ?").get(id);
+        if (!force && childCount.count > 0) {
+          skipped++;
+          continue;
+        }
+        const result = d.run("DELETE FROM tasks WHERE id = ?", [id]);
+        if (result.changes > 0)
+          deleted++;
+      } catch (e) {
+        failed.push({ id, error: e instanceof Error ? e.message : String(e) });
+      }
+    }
+  });
+  tx();
+  return { deleted, skipped, failed };
+}
 function archiveTasks(options, db) {
   const d = db || getDatabase();
   const conditions = ["archived_at IS NULL"];
@@ -6397,10 +6510,33 @@ function archiveTasks(options, db) {
   const result = d.run(`UPDATE tasks SET archived_at = ? WHERE ${conditions.join(" AND ")}`, [ts, ...params]);
   return { archived: result.changes };
 }
+function archiveCompletedTasks(days = 7, projectId, db) {
+  return archiveTasks({
+    project_id: projectId,
+    older_than_days: days,
+    status: ["completed"]
+  }, db).archived;
+}
+function getArchivedTasks(opts = {}, db) {
+  const d = db || getDatabase();
+  const conditions = ["archived_at IS NOT NULL"];
+  const params = [];
+  if (opts.project_id) {
+    conditions.push("project_id = ?");
+    params.push(opts.project_id);
+  }
+  let limitClause = "";
+  if (opts.limit) {
+    limitClause = " LIMIT ?";
+    params.push(opts.limit);
+  }
+  const rows = d.query(`SELECT * FROM tasks WHERE ${conditions.join(" AND ")} ORDER BY archived_at DESC${limitClause}`).all(...params);
+  return rows.map(rowToTask);
+}
 function unarchiveTask(id, db) {
   const d = db || getDatabase();
   d.run("UPDATE tasks SET archived_at = NULL WHERE id = ?", [id]);
-  return getTask2(id, d);
+  return getTask(id, d);
 }
 function getOverdueTasks(projectId, db) {
   const d = db || getDatabase();
@@ -6415,6 +6551,80 @@ function getOverdueTasks(projectId, db) {
   const rows = d.query(query).all(...params);
   return rows.map(rowToTask);
 }
+function notifyUpcomingDeadlines(opts = {}, db) {
+  const d = db || getDatabase();
+  const hours = opts.hours ?? 24;
+  const start = new Date().toISOString();
+  const end = new Date(Date.now() + hours * 60 * 60 * 1000).toISOString();
+  const conditions = [
+    "archived_at IS NULL",
+    "due_at IS NOT NULL",
+    "due_at >= ?",
+    "due_at <= ?",
+    "status NOT IN ('completed', 'cancelled', 'failed')"
+  ];
+  const params = [start, end];
+  if (opts.project_id) {
+    conditions.push("project_id = ?");
+    params.push(opts.project_id);
+  }
+  if (opts.agent_id) {
+    conditions.push("assigned_to = ?");
+    params.push(opts.agent_id);
+  }
+  const rows = d.query(`SELECT * FROM tasks WHERE ${conditions.join(" AND ")} ORDER BY due_at ASC`).all(...params);
+  return rows.map(rowToTask);
+}
+function getBlockedTasks(projectId, db) {
+  const d = db || getDatabase();
+  const params = [];
+  let projectClause = "";
+  if (projectId) {
+    projectClause = "AND t.project_id = ?";
+    params.push(projectId);
+  }
+  const rows = d.query(`
+    SELECT t.*, GROUP_CONCAT(dep.id) AS blocked_by_ids
+    FROM tasks t
+    JOIN task_dependencies td ON td.task_id = t.id
+    JOIN tasks dep ON dep.id = td.depends_on
+    WHERE t.archived_at IS NULL
+      AND t.status NOT IN ('completed', 'cancelled', 'failed')
+      AND dep.status NOT IN ('completed', 'cancelled')
+      ${projectClause}
+    GROUP BY t.id
+    ORDER BY t.priority DESC, t.created_at DESC
+  `).all(...params);
+  return rows.map((row) => ({
+    ...rowToTask(row),
+    blocked_by: row.blocked_by_ids ? row.blocked_by_ids.split(",") : []
+  }));
+}
+function getBlockingTasks(projectId, db) {
+  const d = db || getDatabase();
+  const params = [];
+  let projectClause = "";
+  if (projectId) {
+    projectClause = "AND blocker.project_id = ?";
+    params.push(projectId);
+  }
+  const rows = d.query(`
+    SELECT blocker.*, COUNT(DISTINCT blocked.id) AS blocking_count
+    FROM tasks blocker
+    JOIN task_dependencies td ON td.depends_on = blocker.id
+    JOIN tasks blocked ON blocked.id = td.task_id
+    WHERE blocker.archived_at IS NULL
+      AND blocker.status NOT IN ('completed', 'cancelled', 'failed')
+      AND blocked.status NOT IN ('completed', 'cancelled', 'failed')
+      ${projectClause}
+    GROUP BY blocker.id
+    ORDER BY blocking_count DESC, blocker.created_at DESC
+  `).all(...params);
+  return rows.map((row) => ({
+    ...rowToTask(row),
+    blocking_count: row.blocking_count
+  }));
+}
 function logTime(input, db) {
   const d = db || getDatabase();
   const id = uuid();
@@ -6495,6 +6705,7 @@ __export(exports_tasks, {
   removeDependency: () => removeDependency,
   redistributeStaleTasks: () => redistributeStaleTasks,
   notifyWatchers: () => notifyWatchers,
+  notifyUpcomingDeadlines: () => notifyUpcomingDeadlines,
   moveTask: () => moveTask,
   logTime: () => logTime,
   logCost: () => logCost,
@@ -6510,12 +6721,15 @@ __export(exports_tasks, {
   getTaskGraph: () => getTaskGraph,
   getTaskDependents: () => getTaskDependents,
   getTaskDependencies: () => getTaskDependencies,
-  getTask: () => getTask2,
+  getTask: () => getTask,
   getStatus: () => getStatus,
   getStaleTasks: () => getStaleTasks,
   getOverdueTasks: () => getOverdueTasks,
   getNextTask: () => getNextTask,
+  getBlockingTasks: () => getBlockingTasks,
   getBlockingDeps: () => getBlockingDeps,
+  getBlockedTasks: () => getBlockedTasks,
+  getArchivedTasks: () => getArchivedTasks,
   getActiveWork: () => getActiveWork,
   failTask: () => failTask,
   deleteTask: () => deleteTask,
@@ -6527,8 +6741,10 @@ __export(exports_tasks, {
   claimOrSteal: () => claimOrSteal,
   claimNextTask: () => claimNextTask,
   bulkUpdateTasks: () => bulkUpdateTasks,
+  bulkDeleteTasks: () => bulkDeleteTasks,
   bulkCreateTasks: () => bulkCreateTasks,
   archiveTasks: () => archiveTasks,
+  archiveCompletedTasks: () => archiveCompletedTasks,
   addDependency: () => addDependency
 });
 var init_tasks = __esm(() => {
@@ -6934,9 +7150,18 @@ var init_builtin_templates = __esm(() => {
 });
 
 // src/db/comments.ts
+var exports_comments = {};
+__export(exports_comments, {
+  updateComment: () => updateComment,
+  logProgress: () => logProgress,
+  listComments: () => listComments,
+  getComment: () => getComment,
+  deleteComment: () => deleteComment,
+  addComment: () => addComment
+});
 function addComment(input, db) {
   const d = db || getDatabase();
-  if (!getTask2(input.task_id, d)) {
+  if (!getTask(input.task_id, d)) {
     throw new TaskNotFoundError(input.task_id);
   }
   const id = uuid();
@@ -6965,6 +7190,15 @@ function listComments(taskId, db) {
   const d = db || getDatabase();
   return d.query("SELECT * FROM task_comments WHERE task_id = ? ORDER BY created_at").all(taskId);
 }
+function updateComment(id, input, db) {
+  const d = db || getDatabase();
+  d.run("UPDATE task_comments SET content = ? WHERE id = ?", [input.content, id]);
+  const comment = getComment(id, d);
+  if (!comment) {
+    throw new Error(`Comment not found: ${id}`);
+  }
+  return comment;
+}
 function deleteComment(id, db) {
   const d = db || getDatabase();
   const result = d.run("DELETE FROM task_comments WHERE id = ?", [id]);
@@ -6977,6 +7211,10 @@ var init_comments = __esm(() => {
 });
 
 // src/lib/search.ts
+var exports_search = {};
+__export(exports_search, {
+  searchTasks: () => searchTasks
+});
 function rowToTask2(row) {
   return {
     ...row,
@@ -7293,14 +7531,224 @@ var init_extract = __esm(() => {
   ]);
 });
 
+// src/db/agent-names.ts
+function normalizeAgentNameInput(name) {
+  return name.trim().toLowerCase();
+}
+function hasGeneratedNumericSuffix(name) {
+  return NUMERIC_SUFFIX_RE.test(normalizeAgentNameInput(name));
+}
+function isGenericAgentName(name) {
+  const normalized = normalizeAgentNameInput(name);
+  if (RESERVED_GENERIC_NAMES.has(normalized))
+    return true;
+  for (const generic of RESERVED_GENERIC_NAMES) {
+    if (normalized === `${generic}s`)
+      return true;
+    if (normalized.match(new RegExp(`^${generic}\\d+$`)))
+      return true;
+    if (normalized.match(new RegExp(`^${generic}[-_]\\d+$`)))
+      return true;
+  }
+  return false;
+}
+function isBlockedAgentName(name) {
+  const normalized = normalizeAgentNameInput(name);
+  return isGenericAgentName(normalized) || hasGeneratedNumericSuffix(normalized) || !ONE_WORD_NAME_RE.test(normalized);
+}
+function suggestAgentNames(existingNames = []) {
+  const existing = new Set([...existingNames].map(normalizeAgentNameInput));
+  return PREFERRED_AGENT_NAMES.filter((name) => !existing.has(name));
+}
+function validateAgentName(name, existingNames = []) {
+  const normalized = normalizeAgentNameInput(name);
+  const suggestions = suggestAgentNames(existingNames).slice(0, 5);
+  if (!normalized) {
+    throw new InvalidAgentNameError(name, "choose a real one-word name instead of an empty value", suggestions);
+  }
+  if (/\s/.test(normalized)) {
+    throw new InvalidAgentNameError(name, "use a single word, preferably a Roman or Greek name", suggestions);
+  }
+  if (normalized.length < 3) {
+    throw new InvalidAgentNameError(name, "use a more distinctive name with at least three characters", suggestions);
+  }
+  if (isGenericAgentName(normalized)) {
+    throw new InvalidAgentNameError(name, "generic names like agent, agent-1, assistant, or worker-2 are reserved", suggestions);
+  }
+  if (hasGeneratedNumericSuffix(normalized)) {
+    throw new InvalidAgentNameError(name, "numbered suffix names are not allowed; pick a distinct human-readable name", suggestions);
+  }
+  if (!ONE_WORD_NAME_RE.test(normalized)) {
+    throw new InvalidAgentNameError(name, "use one word made of letters only, preferably a Roman or Greek name", suggestions);
+  }
+  return normalized;
+}
+function tableHasColumn(db, table, column) {
+  try {
+    return db.query(`PRAGMA table_info(${table})`).all().some((row) => row.name === column);
+  } catch {
+    return false;
+  }
+}
+function updateReferences(db, oldName, newName) {
+  const refs = [
+    ["tasks", "assigned_to"],
+    ["tasks", "agent_id"],
+    ["tasks", "locked_by"],
+    ["tasks", "assigned_by"],
+    ["plans", "agent_id"],
+    ["sessions", "agent_id"],
+    ["task_comments", "agent_id"],
+    ["task_history", "agent_id"],
+    ["webhooks", "agent_id"],
+    ["task_files", "agent_id"],
+    ["task_time_logs", "agent_id"],
+    ["task_watchers", "agent_id"],
+    ["task_checkpoints", "agent_id"],
+    ["task_heartbeats", "agent_id"],
+    ["project_agent_roles", "agent_id"]
+  ];
+  let changed = 0;
+  for (const [table, column] of refs) {
+    if (!tableHasColumn(db, table, column))
+      continue;
+    try {
+      changed += db.run(`UPDATE ${table} SET ${column} = ? WHERE LOWER(${column}) = ?`, [newName, oldName]).changes;
+    } catch {}
+  }
+  return changed;
+}
+function normalizeGeneratedAgentNames(db) {
+  const rows = db.query("SELECT * FROM agents ORDER BY created_at, id").all();
+  const existing = new Set(rows.map((agent) => normalizeAgentNameInput(agent.name)));
+  const renamed = [];
+  for (const agent of rows) {
+    const oldName = normalizeAgentNameInput(agent.name);
+    if (!isBlockedAgentName(oldName))
+      continue;
+    const candidates = suggestAgentNames(existing);
+    const replacement = candidates[0];
+    if (!replacement) {
+      throw new Error("No safe agent names are available for normalization");
+    }
+    existing.delete(oldName);
+    existing.add(replacement);
+    db.run("UPDATE agents SET name = ?, last_seen_at = ? WHERE id = ?", [replacement, now(), agent.id]);
+    const referenceUpdates = updateReferences(db, oldName, replacement);
+    renamed.push({
+      id: agent.id,
+      old_name: oldName,
+      new_name: replacement,
+      reference_updates: referenceUpdates
+    });
+  }
+  return renamed;
+}
+var InvalidAgentNameError, ROMAN_AGENT_NAMES, GREEK_AGENT_NAMES, NICE_AGENT_NAMES, PREFERRED_AGENT_NAMES, RESERVED_GENERIC_NAMES, NUMERIC_SUFFIX_RE, ONE_WORD_NAME_RE;
+var init_agent_names = __esm(() => {
+  init_database();
+  InvalidAgentNameError = class InvalidAgentNameError extends Error {
+    suggestions;
+    constructor(name, reason, suggestions = []) {
+      super(`Invalid agent name "${name}": ${reason}${suggestions.length > 0 ? `. Try: ${suggestions.join(", ")}` : ""}`);
+      this.name = "InvalidAgentNameError";
+      this.suggestions = suggestions;
+    }
+  };
+  ROMAN_AGENT_NAMES = [
+    "caesar",
+    "augustus",
+    "marcus",
+    "brutus",
+    "cicero",
+    "cato",
+    "nero",
+    "claudius",
+    "tiberius",
+    "hadrian",
+    "trajan",
+    "vespasian",
+    "domitian",
+    "caligula",
+    "commodus",
+    "livia",
+    "julia",
+    "octavia",
+    "claudia",
+    "agrippina",
+    "cornelia",
+    "valeria",
+    "fulvia",
+    "hortensia",
+    "fabia"
+  ];
+  GREEK_AGENT_NAMES = [
+    "athena",
+    "apollo",
+    "artemis",
+    "hera",
+    "iris",
+    "hector",
+    "achilles",
+    "odysseus",
+    "theseus",
+    "pericles",
+    "solon",
+    "sophia",
+    "thalia",
+    "calliope",
+    "clio",
+    "phoebe",
+    "daphne",
+    "leonidas",
+    "andromeda",
+    "cassander"
+  ];
+  NICE_AGENT_NAMES = [
+    "atlas",
+    "aurora",
+    "ember",
+    "nova",
+    "orion",
+    "rhea",
+    "selene",
+    "sirius",
+    "vesper",
+    "zephyr"
+  ];
+  PREFERRED_AGENT_NAMES = [
+    ...ROMAN_AGENT_NAMES,
+    ...GREEK_AGENT_NAMES,
+    ...NICE_AGENT_NAMES
+  ];
+  RESERVED_GENERIC_NAMES = new Set([
+    "agent",
+    "agents",
+    "ai",
+    "assistant",
+    "bot",
+    "coder",
+    "default",
+    "helper",
+    "model",
+    "system",
+    "user",
+    "worker"
+  ]);
+  NUMERIC_SUFFIX_RE = /[-_]\d+$/;
+  ONE_WORD_NAME_RE = /^[a-z]+$/;
+});
+
 // src/db/agents.ts
 var exports_agents = {};
 __export(exports_agents, {
   updateAgentActivity: () => updateAgentActivity,
   updateAgent: () => updateAgent,
   unarchiveAgent: () => unarchiveAgent,
+  suggestAgentNames: () => suggestAgentNames,
   releaseAgent: () => releaseAgent,
   registerAgent: () => registerAgent,
+  normalizeGeneratedAgentNames: () => normalizeGeneratedAgentNames,
   matchCapabilities: () => matchCapabilities,
   listAgents: () => listAgents,
   isAgentConflict: () => isAgentConflict,
@@ -7312,7 +7760,8 @@ __export(exports_agents, {
   getAgent: () => getAgent,
   deleteAgent: () => deleteAgent,
   autoReleaseStaleAgents: () => autoReleaseStaleAgents,
-  archiveAgent: () => archiveAgent
+  archiveAgent: () => archiveAgent,
+  InvalidAgentNameError: () => InvalidAgentNameError
 });
 function getActiveWindowMs() {
   const env = process.env["TODOS_AGENT_TIMEOUT_MS"];
@@ -7335,7 +7784,7 @@ function getAvailableNamesFromPool(pool, db) {
   autoReleaseStaleAgents(db);
   const cutoff = new Date(Date.now() - getActiveWindowMs()).toISOString();
   const activeNames = new Set(db.query("SELECT name FROM agents WHERE status = 'active' AND last_seen_at > ?").all(cutoff).map((r) => r.name.toLowerCase()));
-  return pool.filter((name) => !activeNames.has(name.toLowerCase()));
+  return pool.map(normalizeAgentNameInput).filter((name) => !activeNames.has(name));
 }
 function shortUuid() {
   return crypto.randomUUID().slice(0, 8);
@@ -7351,7 +7800,8 @@ function rowToAgent(row) {
 }
 function registerAgent(input, db) {
   const d = db || getDatabase();
-  const normalizedName = input.name.trim().toLowerCase();
+  const existingNames = d.query("SELECT name FROM agents").all().map((row) => row.name);
+  const normalizedName = validateAgentName(input.name, existingNames);
   const existing = getAgentByName(normalizedName, d);
   if (existing) {
     const lastSeenMs = new Date(existing.last_seen_at).getTime();
@@ -7484,7 +7934,8 @@ function updateAgent(id, input, db) {
   const sets = ["last_seen_at = ?"];
   const params = [now()];
   if (input.name !== undefined) {
-    const newName = input.name.trim().toLowerCase();
+    const existingNames = d.query("SELECT name FROM agents WHERE id != ?").all(id).map((row) => row.name);
+    const newName = validateAgentName(input.name, existingNames);
     const holder = getAgentByName(newName, d);
     if (holder && holder.id !== id) {
       const lastSeenMs = new Date(holder.last_seen_at).getTime();
@@ -7595,6 +8046,7 @@ function getCapableAgents(capabilities, opts, db) {
 }
 var init_agents = __esm(() => {
   init_database();
+  init_agent_names();
 });
 
 // src/db/task-lists.ts
@@ -7664,6 +8116,90 @@ var init_task_lists = __esm(() => {
   init_projects();
 });
 
+// src/db/api-keys.ts
+import { createHash, randomBytes, timingSafeEqual } from "crypto";
+function rowToRecord(row) {
+  return {
+    id: row.id,
+    name: row.name,
+    prefix: row.prefix,
+    permissions: JSON.parse(row.permissions || '["*"]'),
+    created_at: row.created_at,
+    last_used_at: row.last_used_at,
+    expires_at: row.expires_at,
+    revoked_at: row.revoked_at
+  };
+}
+function hashApiKey(key) {
+  return createHash("sha256").update(key).digest("hex");
+}
+function safeEqualHex(a, b) {
+  if (a.length !== b.length)
+    return false;
+  return timingSafeEqual(Buffer.from(a, "hex"), Buffer.from(b, "hex"));
+}
+function generatePlaintextKey() {
+  return `tdos_${randomBytes(32).toString("base64url")}`;
+}
+function createApiKey(input, db) {
+  const d = db || getDatabase();
+  const name = input.name.trim();
+  if (!name)
+    throw new Error("API key name is required");
+  const key = generatePlaintextKey();
+  const timestamp = now();
+  const id = uuid();
+  const prefix = key.slice(0, 12);
+  d.run(`INSERT INTO api_keys (id, name, key_hash, prefix, permissions, created_at, expires_at)
+     VALUES (?, ?, ?, ?, ?, ?, ?)`, [
+    id,
+    name,
+    hashApiKey(key),
+    prefix,
+    JSON.stringify(input.permissions?.length ? input.permissions : ["*"]),
+    timestamp,
+    input.expires_at || null
+  ]);
+  const row = d.query("SELECT * FROM api_keys WHERE id = ?").get(id);
+  return { key, record: rowToRecord(row) };
+}
+function listApiKeys(opts, db) {
+  const d = db || getDatabase();
+  const includeRevoked = opts?.include_revoked ?? false;
+  const sql = includeRevoked ? "SELECT * FROM api_keys ORDER BY created_at DESC" : "SELECT * FROM api_keys WHERE revoked_at IS NULL ORDER BY created_at DESC";
+  return d.query(sql).all().map(rowToRecord);
+}
+function hasActiveApiKeys(db) {
+  const d = db || getDatabase();
+  const row = d.query("SELECT COUNT(*) AS count FROM api_keys WHERE revoked_at IS NULL AND (expires_at IS NULL OR expires_at > ?)").get(now());
+  return (row?.count ?? 0) > 0;
+}
+function verifyApiKey(key, db) {
+  const d = db || getDatabase();
+  const candidateHash = hashApiKey(key);
+  const rows = d.query("SELECT * FROM api_keys WHERE revoked_at IS NULL AND (expires_at IS NULL OR expires_at > ?)").all(now());
+  for (const row of rows) {
+    if (!safeEqualHex(candidateHash, row.key_hash))
+      continue;
+    d.run("UPDATE api_keys SET last_used_at = ? WHERE id = ?", [now(), row.id]);
+    return rowToRecord({ ...row, last_used_at: now() });
+  }
+  return null;
+}
+function revokeApiKey(idOrPrefix, db) {
+  const d = db || getDatabase();
+  const identifier = idOrPrefix.trim();
+  const row = d.query("SELECT * FROM api_keys WHERE id = ? OR prefix = ?").get(identifier, identifier);
+  if (!row)
+    return null;
+  d.run("UPDATE api_keys SET revoked_at = ? WHERE id = ?", [now(), row.id]);
+  const updated = d.query("SELECT * FROM api_keys WHERE id = ?").get(row.id);
+  return rowToRecord(updated);
+}
+var init_api_keys = __esm(() => {
+  init_database();
+});
+
 // src/db/orgs.ts
 function rowToOrg(row) {
   return { ...row, metadata: JSON.parse(row.metadata || "{}") };
@@ -7994,7 +8530,7 @@ function handleTasksContext(_req, url, _ctx, json2, taskToSummary2) {
   return new Response(text, { headers: { "Content-Type": "text/plain" } });
 }
 function handleTaskAttachments(id, _ctx, json2) {
-  const task = getTask2(id);
+  const task = getTask(id);
   if (!task)
     return json2({ error: "Task not found" }, 404);
   const evidence = task.metadata?._evidence || {};
@@ -8002,7 +8538,7 @@ function handleTaskAttachments(id, _ctx, json2) {
   return json2({ task_id: id, short_id: task.short_id, attachment_ids: attachmentIds, count: attachmentIds.length, files_changed: evidence.files_changed, commit_hash: evidence.commit_hash, notes: evidence.notes });
 }
 async function handleTaskProgress(id, req, method, _ctx, json2) {
-  const task = getTask2(id);
+  const task = getTask(id);
   if (!task)
     return json2({ error: "Task not found" }, 404);
   if (method === "GET") {
@@ -8025,7 +8561,7 @@ async function handleTaskProgress(id, req, method, _ctx, json2) {
   return null;
 }
 function handleGetTask(id, _ctx, json2, taskToSummary2) {
-  const task = getTask2(id);
+  const task = getTask(id);
   if (!task)
     return json2({ error: "Task not found" }, 404);
   return json2(taskToSummary2(task));
@@ -8033,10 +8569,10 @@ function handleGetTask(id, _ctx, json2, taskToSummary2) {
 async function handlePatchTask(id, req, _ctx, json2, taskToSummary2) {
   try {
     const body = await req.json();
-    const task = getTask2(id);
+    const task = getTask(id);
     if (!task)
       return json2({ error: "Task not found" }, 404);
-    const ALLOWED = new Set(["title", "description", "status", "priority", "assigned_to", "plan_id", "task_list_id", "tags", "metadata", "due_at", "estimated_minutes", "task_type"]);
+    const ALLOWED = new Set(["title", "description", "status", "priority", "assigned_to", "plan_id", "task_list_id", "tags", "metadata", "due_at", "estimated_minutes", "actual_minutes", "confidence", "retry_count", "max_retries", "retry_after", "task_type"]);
     const safeBody = {};
     for (const [key, value] of Object.entries(body)) {
       if (ALLOWED.has(key))
@@ -8109,31 +8645,37 @@ function handleDeleteProject(id, _ctx, json2) {
   return json2({ success: true });
 }
 async function handleAgentMe(_req, url, _ctx, json2, taskToSummary2) {
-  const name = url.searchParams.get("name");
-  if (!name)
-    return json2({ error: "Missing name param" }, 400);
-  const agentResult = registerAgent({ name });
-  if (isAgentConflict(agentResult))
-    return json2({ error: agentResult.message, conflict: true }, 409);
-  const agent = agentResult;
-  const tasks = listTasks({ assigned_to: name });
-  const agentIdTasks = listTasks({ agent_id: agent.id });
-  const allTasks = [...tasks, ...agentIdTasks.filter((t) => !tasks.some((tt) => tt.id === t.id))];
-  const pending = allTasks.filter((t) => t.status === "pending");
-  const inProgress = allTasks.filter((t) => t.status === "in_progress");
-  const completed = allTasks.filter((t) => t.status === "completed");
-  return json2({
-    agent,
-    pending_tasks: pending.map((t) => taskToSummary2(t)),
-    in_progress_tasks: inProgress.map((t) => taskToSummary2(t)),
-    stats: {
-      total: allTasks.length,
-      pending: pending.length,
-      in_progress: inProgress.length,
-      completed: completed.length,
-      completion_rate: allTasks.length > 0 ? Math.round(completed.length / allTasks.length * 100) : 0
-    }
-  });
+  try {
+    const name = url.searchParams.get("name");
+    if (!name)
+      return json2({ error: "Missing name param" }, 400);
+    const agentResult = registerAgent({ name });
+    if (isAgentConflict(agentResult))
+      return json2({ error: agentResult.message, conflict: true }, 409);
+    const agent = agentResult;
+    const tasks = listTasks({ assigned_to: agent.name });
+    const agentIdTasks = listTasks({ agent_id: agent.id });
+    const allTasks = [...tasks, ...agentIdTasks.filter((t) => !tasks.some((tt) => tt.id === t.id))];
+    const pending = allTasks.filter((t) => t.status === "pending");
+    const inProgress = allTasks.filter((t) => t.status === "in_progress");
+    const completed = allTasks.filter((t) => t.status === "completed");
+    return json2({
+      agent,
+      pending_tasks: pending.map((t) => taskToSummary2(t)),
+      in_progress_tasks: inProgress.map((t) => taskToSummary2(t)),
+      stats: {
+        total: allTasks.length,
+        pending: pending.length,
+        in_progress: inProgress.length,
+        completed: completed.length,
+        completion_rate: allTasks.length > 0 ? Math.round(completed.length / allTasks.length * 100) : 0
+      }
+    });
+  } catch (e) {
+    if (e instanceof InvalidAgentNameError)
+      return json2({ error: e.message, suggestions: e.suggestions }, 400);
+    return json2({ error: e instanceof Error ? e.message : "Failed to get agent profile" }, 500);
+  }
 }
 function handleAgentQueue(agentId, _ctx, json2, taskToSummary2) {
   const pending = listTasks({ status: "pending" });
@@ -8199,6 +8741,8 @@ async function handleRegisterAgent(req, _ctx, json2) {
       return json2({ error: result.message, conflict: true }, 409);
     return json2(result, 201);
   } catch (e) {
+    if (e instanceof InvalidAgentNameError)
+      return json2({ error: e.message, suggestions: e.suggestions }, 400);
     return json2({ error: e instanceof Error ? e.message : "Failed to register agent" }, 500);
   }
 }
@@ -8208,6 +8752,8 @@ async function handleUpdateAgent(id, req, _ctx, json2) {
     const agent = updateAgent(id, body);
     return json2(agent);
   } catch (e) {
+    if (e instanceof InvalidAgentNameError)
+      return json2({ error: e.message, suggestions: e.suggestions }, 400);
     return json2({ error: e instanceof Error ? e.message : "Failed to update agent" }, 500);
   }
 }
@@ -8444,14 +8990,26 @@ function resolveDashboardDir() {
   }
   return join9(process.cwd(), "dashboard", "dist");
 }
+function getProvidedApiKey(req) {
+  const headerKey = req.headers.get("x-api-key");
+  if (headerKey)
+    return headerKey.trim();
+  const auth = req.headers.get("authorization");
+  if (!auth)
+    return null;
+  return auth.replace(/^Bearer\s+/i, "").trim() || null;
+}
 function checkAuth(req, apiKey) {
-  if (!apiKey)
+  const generatedKeysEnabled = hasActiveApiKeys();
+  if (!apiKey && !generatedKeysEnabled)
     return null;
-  const provided = req.headers.get("x-api-key") || req.headers.get("authorization")?.replace("Bearer ", "");
-  if (!provided || provided !== apiKey) {
+  const provided = getProvidedApiKey(req);
+  const matchesEnvKey = Boolean(apiKey && provided && provided === apiKey);
+  const matchesGeneratedKey = Boolean(provided && verifyApiKey(provided));
+  if (!matchesEnvKey && !matchesGeneratedKey) {
     return new Response(JSON.stringify({ error: "Unauthorized" }), {
       status: 401,
-      headers: { "Content-Type": "application/json", ...SECURITY_HEADERS }
+      headers: { "Content-Type": "application/json", "WWW-Authenticate": "Bearer", ...SECURITY_HEADERS }
     });
   }
   return null;
@@ -8833,6 +9391,7 @@ Dashboard not found at: ${dashboardDir}`);
 var MIME_TYPES, SECURITY_HEADERS, rateLimitMap, RATE_LIMIT_WINDOW_MS = 60000, RATE_LIMIT_MAX = 120;
 var init_serve = __esm(() => {
   init_database();
+  init_api_keys();
   init_routes();
   MIME_TYPES = {
     ".html": "text/html; charset=utf-8",
@@ -10199,6 +10758,77 @@ var init_Dashboard = __esm(() => {
   init_audit();
 });
 
+// src/db/handoffs.ts
+var exports_handoffs = {};
+__export(exports_handoffs, {
+  listHandoffs: () => listHandoffs,
+  getLatestHandoff: () => getLatestHandoff,
+  createHandoff: () => createHandoff
+});
+function createHandoff(input, db) {
+  const d = db || getDatabase();
+  const id = uuid();
+  const timestamp = now();
+  d.run(`INSERT INTO handoffs (id, agent_id, project_id, summary, completed, in_progress, blockers, next_steps, created_at)
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
+    id,
+    input.agent_id || null,
+    input.project_id || null,
+    input.summary,
+    input.completed ? JSON.stringify(input.completed) : null,
+    input.in_progress ? JSON.stringify(input.in_progress) : null,
+    input.blockers ? JSON.stringify(input.blockers) : null,
+    input.next_steps ? JSON.stringify(input.next_steps) : null,
+    timestamp
+  ]);
+  return {
+    id,
+    agent_id: input.agent_id || null,
+    project_id: input.project_id || null,
+    summary: input.summary,
+    completed: input.completed || null,
+    in_progress: input.in_progress || null,
+    blockers: input.blockers || null,
+    next_steps: input.next_steps || null,
+    created_at: timestamp
+  };
+}
+function rowToHandoff(row) {
+  return {
+    ...row,
+    completed: row.completed ? JSON.parse(row.completed) : null,
+    in_progress: row.in_progress ? JSON.parse(row.in_progress) : null,
+    blockers: row.blockers ? JSON.parse(row.blockers) : null,
+    next_steps: row.next_steps ? JSON.parse(row.next_steps) : null
+  };
+}
+function listHandoffs(projectId, limit = 10, db) {
+  const d = db || getDatabase();
+  if (projectId) {
+    return d.query("SELECT * FROM handoffs WHERE project_id = ? ORDER BY rowid DESC LIMIT ?").all(projectId, limit).map(rowToHandoff);
+  }
+  return d.query("SELECT * FROM handoffs ORDER BY rowid DESC LIMIT ?").all(limit).map(rowToHandoff);
+}
+function getLatestHandoff(agentId, projectId, db) {
+  const d = db || getDatabase();
+  let query = "SELECT * FROM handoffs WHERE 1=1";
+  const params = [];
+  if (agentId) {
+    query += " AND agent_id = ?";
+    params.push(agentId);
+  }
+  if (projectId) {
+    query += " AND project_id = ?";
+    params.push(projectId);
+  }
+  query += " ORDER BY rowid DESC LIMIT 1";
+  const row = d.query(query).get(...params);
+  return row ? rowToHandoff(row) : null;
+}
+var init_handoffs = __esm(() => {
+  init_database();
+});
+
 // src/lib/auto-assign.ts
 var exports_auto_assign = {};
 __export(exports_auto_assign, {
@@ -10289,7 +10919,7 @@ async function callCerebras(prompt, apiKey) {
 }
 async function autoAssignTask(taskId, db) {
   const d = db || getDatabase();
-  const task = getTask2(taskId, d);
+  const task = getTask(taskId, d);
   if (!task)
     throw new Error(`Task ${taskId} not found`);
   const agents = listAgents(d).filter((a) => a.status === "active");
@@ -14489,7 +15119,7 @@ var init_dist = __esm(() => {
     var nodeCrypto = __require2("crypto");
     module.exports = {
       postgresMd5PasswordHash,
-      randomBytes,
+      randomBytes: randomBytes2,
       deriveKey,
       sha256,
       hashByName,
@@ -14499,7 +15129,7 @@ var init_dist = __esm(() => {
     var webCrypto = nodeCrypto.webcrypto || globalThis.crypto;
     var subtleCrypto = webCrypto.subtle;
     var textEncoder = new TextEncoder;
-    function randomBytes(length) {
+    function randomBytes2(length) {
       return webCrypto.getRandomValues(Buffer.alloc(length));
     }
     async function md5(string) {
@@ -26215,12 +26845,21 @@ var init_dispatch2 = __esm(() => {
 // src/mcp/tools/task-crud.ts
 function registerTaskCrudTools(server, ctx) {
   const { shouldRegisterTool, resolveId, formatError, formatTask } = ctx;
+  function versionFor(taskId, version) {
+    const current = getTask(taskId);
+    if (!current)
+      throw new TaskNotFoundError(taskId);
+    if (version !== undefined && current.version !== version) {
+      throw new VersionConflictError(taskId, version, current.version);
+    }
+    return current.version;
+  }
   if (shouldRegisterTool("create_task")) {
     server.tool("create_task", "Create a new task in a project. Pass short_id=null to auto-generate.", {
       title: exports_external2.string().describe("Task title"),
       description: exports_external2.string().optional().describe("Task description (markdown)"),
-      status: exports_external2.enum(["pending", "in_progress", "completed", "cancelled"]).optional().describe("Initial status (default: pending)"),
-      priority: exports_external2.enum(["low", "medium", "high", "urgent"]).optional().describe("Priority (default: medium)"),
+      status: exports_external2.enum(["pending", "in_progress", "completed", "failed", "cancelled"]).optional().describe("Initial status (default: pending)"),
+      priority: exports_external2.enum(["low", "medium", "high", "critical"]).optional().describe("Priority (default: medium)"),
       project_id: exports_external2.string().optional().describe("Project ID"),
       task_list_id: exports_external2.string().optional().describe("Task list ID"),
       assigned_to: exports_external2.string().optional().describe("Agent ID or name to assign to"),
@@ -26250,9 +26889,9 @@ function registerTaskCrudTools(server, ctx) {
         if (confidence !== undefined)
           resolved.confidence = confidence;
         if (retry_count !== undefined)
-          resolved.retry_count = retry_count;
+          resolved.max_retries = retry_count;
         if (deadline)
-          resolved.deadline = deadline;
+          resolved.due_at = deadline;
         const task = createTask(resolved);
         return { content: [{ type: "text", text: formatTask(task) }] };
       } catch (e) {
@@ -26262,8 +26901,8 @@ function registerTaskCrudTools(server, ctx) {
   }
   if (shouldRegisterTool("list_tasks")) {
     server.tool("list_tasks", "List tasks with optional filters. Pass empty arrays for multi-value filters (e.g. status=[] shows all).", {
-      status: exports_external2.union([exports_external2.enum(["pending", "in_progress", "completed", "cancelled"]), exports_external2.array(exports_external2.enum(["pending", "in_progress", "completed", "cancelled"]))]).optional().describe("Filter by status"),
-      priority: exports_external2.union([exports_external2.enum(["low", "medium", "high", "urgent"]), exports_external2.array(exports_external2.enum(["low", "medium", "high", "urgent"]))]).optional().describe("Filter by priority"),
+      status: exports_external2.union([exports_external2.enum(["pending", "in_progress", "completed", "failed", "cancelled"]), exports_external2.array(exports_external2.enum(["pending", "in_progress", "completed", "failed", "cancelled"]))]).optional().describe("Filter by status"),
+      priority: exports_external2.union([exports_external2.enum(["low", "medium", "high", "critical"]), exports_external2.array(exports_external2.enum(["low", "medium", "high", "critical"]))]).optional().describe("Filter by priority"),
       project_id: exports_external2.string().optional().describe("Filter by project"),
       task_list_id: exports_external2.string().optional().describe("Filter by task list"),
       assigned_to: exports_external2.string().optional().describe("Filter by assignee (agent ID or name, empty string = unassigned)"),
@@ -26298,9 +26937,9 @@ function registerTaskCrudTools(server, ctx) {
     }, async ({ task_id }) => {
       try {
         const resolvedId = resolveId(task_id);
-        const task = getTask2(resolvedId);
+        const task = getTask(resolvedId);
         if (!task)
-          throw new NotFoundError(`Task not found: ${task_id}`);
+          throw new TaskNotFoundError(task_id);
         const focus = ctx.getAgentFocus(task.assigned_to || "");
         const lines = [
           `ID:       ${task.id}`,
@@ -26314,7 +26953,7 @@ function registerTaskCrudTools(server, ctx) {
           task.estimated_minutes != null ? `Estimate: ${task.estimated_minutes} min` : null,
           task.actual_minutes != null ? `Actual:   ${task.actual_minutes} min` : null,
           task.confidence != null ? `Confidence: ${task.confidence}` : null,
-          task.deadline ? `Deadline: ${task.deadline}` : null,
+          task.due_at ? `Due: ${task.due_at}` : null,
           task.completed_at ? `Completed: ${task.completed_at}` : null,
           focus ? `Focus:    agent=${focus.agent_id} project=${focus.project_id || "(global)"}` : null,
           task.created_at ? `Created:  ${task.created_at}` : null,
@@ -26336,8 +26975,8 @@ ${task.description}` : null
       task_id: exports_external2.string().describe("Task ID"),
       title: exports_external2.string().optional(),
       description: exports_external2.string().optional(),
-      status: exports_external2.enum(["pending", "in_progress", "completed", "cancelled"]).optional(),
-      priority: exports_external2.enum(["low", "medium", "high", "urgent"]).optional(),
+      status: exports_external2.enum(["pending", "in_progress", "completed", "failed", "cancelled"]).optional(),
+      priority: exports_external2.enum(["low", "medium", "high", "critical"]).optional(),
       assigned_to: exports_external2.string().nullable().optional().describe("Agent ID or name, null to unassign"),
       project_id: exports_external2.string().nullable().optional(),
       task_list_id: exports_external2.string().nullable().optional(),
@@ -26366,9 +27005,15 @@ ${task.description}` : null
           resolved.task_list_id = resolveId(resolved.task_list_id, "task_lists");
         if (resolved.depends_on && Array.isArray(resolved.depends_on))
           resolved.depends_on = resolved.depends_on.map(resolveId);
-        if (resolved.estimate !== undefined)
+        if (resolved.estimate !== undefined) {
           resolved.estimated_minutes = resolved.estimate;
-        const task = updateTask(resolvedId, resolved, version);
+          delete resolved.estimate;
+        }
+        if (resolved.deadline !== undefined) {
+          resolved.due_at = resolved.deadline;
+          delete resolved.deadline;
+        }
+        const task = updateTask(resolvedId, { ...resolved, version: versionFor(resolvedId, version) });
         return { content: [{ type: "text", text: formatTask(task) }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -26393,11 +27038,24 @@ ${task.description}` : null
 var init_task_crud2 = __esm(() => {
   init_zod2();
   init_tasks();
+  init_types();
 });
 
 // src/mcp/tools/task-project-tools.ts
 function registerTaskProjectTools(server, ctx) {
   const { shouldRegisterTool, resolveId, formatError, formatTask } = ctx;
+  function versionFor(taskId, version) {
+    const current = getTask(taskId);
+    if (!current)
+      throw new TaskNotFoundError(taskId);
+    if (version !== undefined && current.version !== version) {
+      throw new VersionConflictError(taskId, version, current.version);
+    }
+    return current.version;
+  }
+  function updateWithOptionalVersion(taskId, updates, version) {
+    return updateTask(taskId, { ...updates, version: versionFor(taskId, version) });
+  }
   if (shouldRegisterTool("start_task")) {
     server.tool("start_task", "Mark a task as in_progress. Uses optimistic locking via version if provided.", {
       task_id: exports_external2.string().describe("Task ID"),
@@ -26405,7 +27063,12 @@ function registerTaskProjectTools(server, ctx) {
     }, async ({ task_id, version }) => {
       try {
         const resolvedId = resolveId(task_id);
-        const task = updateTask(resolvedId, { status: "in_progress" }, version);
+        if (version !== undefined)
+          versionFor(resolvedId, version);
+        const current = getTask(resolvedId);
+        if (!current)
+          throw new TaskNotFoundError(resolvedId);
+        const task = startTask(resolvedId, current.assigned_to || current.agent_id || "mcp");
         return { content: [{ type: "text", text: formatTask(task) }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -26421,7 +27084,12 @@ function registerTaskProjectTools(server, ctx) {
     }, async ({ task_id, confidence, completed_at, version }) => {
       try {
         const resolvedId = resolveId(task_id);
-        const task = updateTask(resolvedId, { status: "completed", confidence, completed_at }, version);
+        if (version !== undefined)
+          versionFor(resolvedId, version);
+        const current = getTask(resolvedId);
+        if (!current)
+          throw new TaskNotFoundError(resolvedId);
+        const task = completeTask(resolvedId, current.assigned_to || current.agent_id || undefined, undefined, { confidence, completed_at });
         return { content: [{ type: "text", text: formatTask(task) }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -26435,7 +27103,7 @@ function registerTaskProjectTools(server, ctx) {
     }, async ({ task_id, version }) => {
       try {
         const resolvedId = resolveId(task_id);
-        const task = updateTask(resolvedId, { status: "cancelled" }, version);
+        const task = version === undefined ? setTaskStatus(resolvedId, "cancelled") : updateWithOptionalVersion(resolvedId, { status: "cancelled" }, version);
         return { content: [{ type: "text", text: formatTask(task) }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -26451,7 +27119,7 @@ function registerTaskProjectTools(server, ctx) {
       try {
         const resolvedId = resolveId(task_id);
         const resolvedAssignee = resolveId(new_assignee, "agents");
-        const task = updateTask(resolvedId, { assigned_to: resolvedAssignee }, version);
+        const task = updateWithOptionalVersion(resolvedId, { assigned_to: resolvedAssignee }, version);
         return { content: [{ type: "text", text: formatTask(task) }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -26466,7 +27134,7 @@ function registerTaskProjectTools(server, ctx) {
     }, async ({ task_id, deadline, version }) => {
       try {
         const resolvedId = resolveId(task_id);
-        const task = updateTask(resolvedId, { deadline }, version);
+        const task = updateWithOptionalVersion(resolvedId, { due_at: deadline }, version);
         return { content: [{ type: "text", text: formatTask(task) }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -26476,12 +27144,12 @@ function registerTaskProjectTools(server, ctx) {
   if (shouldRegisterTool("prioritize_task")) {
     server.tool("prioritize_task", "Set a task's priority.", {
       task_id: exports_external2.string().describe("Task ID"),
-      priority: exports_external2.enum(["low", "medium", "high", "urgent"]).describe("New priority"),
+      priority: exports_external2.enum(["low", "medium", "high", "critical"]).describe("New priority"),
       version: exports_external2.number().optional().describe("Expected version for optimistic locking")
     }, async ({ task_id, priority, version }) => {
       try {
         const resolvedId = resolveId(task_id);
-        const task = updateTask(resolvedId, { priority }, version);
+        const task = version === undefined ? setTaskPriority(resolvedId, priority) : updateWithOptionalVersion(resolvedId, { priority }, version);
         return { content: [{ type: "text", text: formatTask(task) }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -26537,18 +27205,18 @@ function registerTaskProjectTools(server, ctx) {
   if (shouldRegisterTool("bulk_update_tasks")) {
     server.tool("bulk_update_tasks", "Update multiple tasks at once. All tasks must pass the dependency check.", {
       task_ids: exports_external2.array(exports_external2.string()).describe("Array of task IDs to update"),
-      status: exports_external2.enum(["pending", "in_progress", "completed", "cancelled"]).optional(),
-      priority: exports_external2.enum(["low", "medium", "high", "urgent"]).optional(),
+      status: exports_external2.enum(["pending", "in_progress", "completed", "failed", "cancelled"]).optional(),
+      priority: exports_external2.enum(["low", "medium", "high", "critical"]).optional(),
       assigned_to: exports_external2.string().nullable().optional().describe("Agent ID or name, null to unassign")
     }, async ({ task_ids, status, priority, assigned_to }) => {
       try {
-        const { bulkUpdateTasks: bulkUpdateTasks2 } = (()=>{throw new Error("Cannot require module "+"../db/tasks.js");})();
+        const { bulkUpdateTasks: bulkUpdateTasks2 } = (init_tasks(), __toCommonJS(exports_tasks));
         const resolved = task_ids.map(resolveId);
         let resolvedAssignee = assigned_to;
         if (resolvedAssignee && typeof resolvedAssignee === "string")
           resolvedAssignee = resolveId(resolvedAssignee, "agents");
         const result = bulkUpdateTasks2(resolved, { status, priority, assigned_to: resolvedAssignee });
-        return { content: [{ type: "text", text: `${result.updated} task(s) updated, ${result.skipped} skipped (dependency check).` }] };
+        return { content: [{ type: "text", text: `${result.updated} task(s) updated, ${result.failed.length} failed.` }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
       }
@@ -26559,8 +27227,8 @@ function registerTaskProjectTools(server, ctx) {
       tasks: exports_external2.array(exports_external2.object({
         title: exports_external2.string(),
         description: exports_external2.string().optional(),
-        status: exports_external2.enum(["pending", "in_progress", "completed", "cancelled"]).optional(),
-        priority: exports_external2.enum(["low", "medium", "high", "urgent"]).optional(),
+        status: exports_external2.enum(["pending", "in_progress", "completed", "failed", "cancelled"]).optional(),
+        priority: exports_external2.enum(["low", "medium", "high", "critical"]).optional(),
         project_id: exports_external2.string().optional(),
         task_list_id: exports_external2.string().optional(),
         assigned_to: exports_external2.string().optional(),
@@ -26571,7 +27239,7 @@ function registerTaskProjectTools(server, ctx) {
       })).describe("Array of task objects")
     }, async ({ tasks }) => {
       try {
-        const { bulkCreateTasks: bulkCreateTasks2 } = (()=>{throw new Error("Cannot require module "+"../db/tasks.js");})();
+        const { bulkCreateTasks: bulkCreateTasks2 } = (init_tasks(), __toCommonJS(exports_tasks));
         const resolved = tasks.map((t) => {
           const r = { ...t };
           if (r.project_id)
@@ -26585,7 +27253,7 @@ function registerTaskProjectTools(server, ctx) {
           return r;
         });
         const result = bulkCreateTasks2(resolved);
-        return { content: [{ type: "text", text: `${result.created} task(s) created, ${result.skipped} skipped (duplicate short_id).` }] };
+        return { content: [{ type: "text", text: `${result.created.length} task(s) created.` }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
       }
@@ -26597,9 +27265,9 @@ function registerTaskProjectTools(server, ctx) {
       force: exports_external2.boolean().optional().describe("Skip child check for all tasks (dangerous)")
     }, async ({ task_ids, force }) => {
       try {
-        const { bulkDeleteTasks } = (()=>{throw new Error("Cannot require module "+"../db/tasks.js");})();
+        const { bulkDeleteTasks: bulkDeleteTasks2 } = (init_tasks(), __toCommonJS(exports_tasks));
         const resolved = task_ids.map(resolveId);
-        const result = bulkDeleteTasks(resolved, force);
+        const result = bulkDeleteTasks2(resolved, force);
         return { content: [{ type: "text", text: `${result.deleted} task(s) deleted, ${result.skipped} skipped (has children).` }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -26648,7 +27316,7 @@ function registerTaskProjectTools(server, ctx) {
         const project = getProject(resolvedId);
         if (!project)
           throw new TaskNotFoundError(`Project not found: ${project_id}`);
-        const { listTasks: listTasks3 } = (()=>{throw new Error("Cannot require module "+"../db/tasks.js");})();
+        const { listTasks: listTasks3 } = (init_tasks(), __toCommonJS(exports_tasks));
         const tasks = listTasks3({ project_id: resolvedId, limit: 100 }, undefined);
         const lines = [
           `ID:          ${project.id}`,
@@ -26749,7 +27417,7 @@ function registerTaskProjectTools(server, ctx) {
           throw new TaskNotFoundError(`Task list not found: ${task_list_id}`);
         let tasks = [];
         if (include_tasks) {
-          const { listTasks: listTasks3 } = (()=>{throw new Error("Cannot require module "+"../db/tasks.js");})();
+          const { listTasks: listTasks3 } = (init_tasks(), __toCommonJS(exports_tasks));
           tasks = listTasks3({ task_list_id: resolvedId, limit: 200 }, undefined);
         }
         const lines = [
@@ -26849,7 +27517,7 @@ Tasks:` : null,
           throw new TaskNotFoundError(`Plan not found: ${plan_id}`);
         let tasks = [];
         if (include_tasks) {
-          const { listTasks: listTasks3 } = (()=>{throw new Error("Cannot require module "+"../db/tasks.js");})();
+          const { listTasks: listTasks3 } = (init_tasks(), __toCommonJS(exports_tasks));
           tasks = listTasks3({ plan_id: resolvedId, limit: 200 }, undefined);
         }
         const lines = [
@@ -26938,7 +27606,7 @@ Tasks:` : null,
         const tag = getTag(tag_id);
         if (!tag)
           throw new TaskNotFoundError(`Tag not found: ${tag_id}`);
-        const { listTasks: listTasks3 } = (()=>{throw new Error("Cannot require module "+"../db/tasks.js");})();
+        const { listTasks: listTasks3 } = (init_tasks(), __toCommonJS(exports_tasks));
         const tasks = listTasks3({ tags: [tag.name], limit: 100 }, undefined);
         const lines = [
           `Tag: ${tag.name}${tag.color ? ` (${tag.color})` : ""}`,
@@ -27017,7 +27685,7 @@ Tasks:` : null,
         const label = getLabel(label_id);
         if (!label)
           throw new TaskNotFoundError(`Label not found: ${label_id}`);
-        const { listTasks: listTasks3 } = (()=>{throw new Error("Cannot require module "+"../db/tasks.js");})();
+        const { listTasks: listTasks3 } = (init_tasks(), __toCommonJS(exports_tasks));
         const tasks = listTasks3({ tags: [label.name], limit: 100 }, undefined);
         const lines = [
           `Label: ${label.name}${label.color ? ` (${label.color})` : ""}`,
@@ -27068,7 +27736,7 @@ Tasks:` : null,
       try {
         const resolvedId = resolveId(task_id);
         const resolvedAuthor = author ? resolveId(author, "agents") : undefined;
-        const comment = addComment({ task_id: resolvedId, body, author: resolvedAuthor });
+        const comment = addComment({ task_id: resolvedId, content: body, agent_id: resolvedAuthor });
         return { content: [{ type: "text", text: `Comment added to ${task_id.slice(0, 8)}: ${body.slice(0, 50)}${body.length > 50 ? "..." : ""}` }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -27084,8 +27752,8 @@ Tasks:` : null,
         const comments = listComments(resolvedId);
         if (comments.length === 0)
           return { content: [{ type: "text", text: "No comments." }] };
-        const lines = comments.map((c) => `[${c.author || "unknown"}] ${c.created_at?.slice(0, 16)}:
-  ${c.body}`);
+        const lines = comments.map((c) => `[${c.agent_id || "unknown"}] ${c.created_at?.slice(0, 16)}:
+  ${c.content}`);
         return { content: [{ type: "text", text: lines.join(`
 
 `) }] };
@@ -27100,7 +27768,7 @@ Tasks:` : null,
       body: exports_external2.string().describe("New comment body")
     }, async ({ comment_id, body }) => {
       try {
-        const comment = updateComment(comment_id, { body });
+        const comment = updateComment(comment_id, { content: body });
         return { content: [{ type: "text", text: `Comment ${comment_id.slice(0, 8)} updated.` }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -27123,11 +27791,11 @@ Tasks:` : null,
     server.tool("search_tasks", "Full-text search across task titles and descriptions.", {
       query: exports_external2.string().describe("Search query"),
       project_id: exports_external2.string().optional().describe("Filter by project"),
-      status: exports_external2.enum(["pending", "in_progress", "completed", "cancelled"]).optional(),
+      status: exports_external2.enum(["pending", "in_progress", "completed", "failed", "cancelled"]).optional(),
       limit: exports_external2.number().optional().describe("Max results (default: 20)")
     }, async ({ query, project_id, status, limit }) => {
       try {
-        const { searchTasks: searchTasks2 } = (()=>{throw new Error("Cannot require module "+"../db/tasks.js");})();
+        const { searchTasks: searchTasks2 } = (init_search(), __toCommonJS(exports_search));
         const resolved = { query, limit };
         if (project_id)
           resolved.project_id = resolveId(project_id, "projects");
@@ -27145,29 +27813,6 @@ ${lines.join(`
       }
     });
   }
-  if (shouldRegisterTool("sync")) {
-    server.tool("sync", "Sync tasks from a GitHub PR or external source into the project.", {
-      source: exports_external2.enum(["github_pr", "linear", "asana"]).describe("Source type"),
-      source_id: exports_external2.string().describe("PR number, Linear issue ID, or Asana task ID"),
-      project_id: exports_external2.string().optional().describe("Project ID to import into"),
-      options: exports_external2.record(exports_external2.unknown()).optional().describe("Source-specific options")
-    }, async ({ source, source_id, project_id, options }) => {
-      try {
-        const { syncFromGithubPR, syncFromLinear, syncFromAsana } = (()=>{throw new Error("Cannot require module "+"../lib/sync.js");})();
-        let result;
-        if (source === "github_pr") {
-          result = await syncFromGithubPR({ prNumber: parseInt(source_id), project_id: project_id ? resolveId(project_id, "projects") : undefined, ...options });
-        } else if (source === "linear") {
-          result = await syncFromLinear({ issueId: source_id, project_id: project_id ? resolveId(project_id, "projects") : undefined, ...options });
-        } else {
-          result = await syncFromAsana({ taskId: source_id, project_id: project_id ? resolveId(project_id, "projects") : undefined, ...options });
-        }
-        return { content: [{ type: "text", text: `Synced from ${source}: ${result.task?.title || source_id}` }] };
-      } catch (e) {
-        return { content: [{ type: "text", text: formatError(e) }], isError: true };
-      }
-    });
-  }
 }
 var init_task_project_tools = __esm(() => {
   init_zod2();
@@ -27182,6 +27827,16 @@ var init_task_project_tools = __esm(() => {
 // src/mcp/tools/task-workflow-tools.ts
 function registerTaskWorkflowTools(server, ctx) {
   const { shouldRegisterTool, resolveId, formatError, formatTask } = ctx;
+  function versionFor(taskId, version) {
+    const { getTask: getTask2 } = (init_tasks(), __toCommonJS(exports_tasks));
+    const current = getTask2(taskId);
+    if (!current)
+      throw new TaskNotFoundError(taskId);
+    if (version !== undefined && current.version !== version) {
+      throw new VersionConflictError(taskId, version, current.version);
+    }
+    return current.version;
+  }
   if (shouldRegisterTool("approve_task")) {
     server.tool("approve_task", "Approve a task that requires_approval. Records who approved it.", {
       task_id: exports_external2.string().describe("Task ID"),
@@ -27190,13 +27845,14 @@ function registerTaskWorkflowTools(server, ctx) {
       version: exports_external2.number().optional().describe("Expected version for optimistic locking")
     }, async ({ task_id, approved_by, notes, version }) => {
       try {
-        const { updateTask: updateTask2 } = (()=>{throw new Error("Cannot require module "+"../db/tasks.js");})();
+        const { updateTask: updateTask2 } = (init_tasks(), __toCommonJS(exports_tasks));
         const resolvedId = resolveId(task_id);
         const resolvedApprover = approved_by ? resolveId(approved_by, "agents") : undefined;
         const task = updateTask2(resolvedId, {
           approved_by: resolvedApprover,
-          metadata: notes ? { approval_notes: notes } : {}
-        }, version);
+          metadata: notes ? { approval_notes: notes } : {},
+          version: versionFor(resolvedId, version)
+        });
         return { content: [{ type: "text", text: `Task ${task_id.slice(0, 8)} approved by ${resolvedApprover || "unknown"}` }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -27211,15 +27867,11 @@ function registerTaskWorkflowTools(server, ctx) {
       version: exports_external2.number().optional().describe("Expected version for optimistic locking")
     }, async ({ task_id, reason, agent_id, version }) => {
       try {
-        const { updateTask: updateTask2 } = (()=>{throw new Error("Cannot require module "+"../db/tasks.js");})();
+        const { failTask: failTask2 } = (init_tasks(), __toCommonJS(exports_tasks));
         const resolvedId = resolveId(task_id);
-        const task = updateTask2(resolvedId, {
-          status: "pending",
-          retry_count: (getTask(resolvedId)?.retry_count ?? 0) + 1,
-          back_on_board: false,
-          metadata: reason ? { failure_reason: reason } : {}
-        }, version);
-        return { content: [{ type: "text", text: `Task ${task_id.slice(0, 8)} marked failed. Retry count: ${task.retry_count}` }] };
+        versionFor(resolvedId, version);
+        const result = failTask2(resolvedId, agent_id, reason);
+        return { content: [{ type: "text", text: `Task ${task_id.slice(0, 8)} marked failed. Retry count: ${result.task.retry_count}` }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
       }
@@ -27228,12 +27880,12 @@ function registerTaskWorkflowTools(server, ctx) {
   if (shouldRegisterTool("get_my_tasks")) {
     server.tool("get_my_tasks", "Get tasks assigned to the calling agent. Supports focus mode scoping.", {
       agent_id: exports_external2.string().optional().describe("Agent ID (defaults to context agent)"),
-      status: exports_external2.enum(["pending", "in_progress", "completed", "cancelled"]).optional().describe("Filter by status"),
+      status: exports_external2.enum(["pending", "in_progress", "completed", "failed", "cancelled"]).optional().describe("Filter by status"),
       project_id: exports_external2.string().optional().describe("Filter by project (respects focus mode)"),
       limit: exports_external2.number().optional().describe("Max results (default: 50)")
     }, async ({ agent_id, status, project_id, limit }) => {
       try {
-        const { listTasks: listTasks3 } = (()=>{throw new Error("Cannot require module "+"../db/tasks.js");})();
+        const { listTasks: listTasks3 } = (init_tasks(), __toCommonJS(exports_tasks));
         const focus = ctx.getAgentFocus(agent_id || "");
         const effectiveAgentId = focus ? focus.agent_id : agent_id || "";
         const effectiveProjectId = focus?.project_id || project_id;
@@ -27253,6 +27905,122 @@ function registerTaskWorkflowTools(server, ctx) {
       }
     });
   }
+  if (shouldRegisterTool("get_next_task")) {
+    server.tool("get_next_task", "Get the best available pending task without claiming it.", {
+      agent_id: exports_external2.string().optional().describe("Agent ID or name for assignment affinity"),
+      project_id: exports_external2.string().optional().describe("Filter by project"),
+      task_list_id: exports_external2.string().optional().describe("Filter by task list"),
+      plan_id: exports_external2.string().optional().describe("Filter by plan"),
+      tags: exports_external2.array(exports_external2.string()).optional().describe("Filter by tags")
+    }, async ({ agent_id, project_id, task_list_id, plan_id, tags }) => {
+      try {
+        const { getNextTask: getNextTask2 } = (init_tasks(), __toCommonJS(exports_tasks));
+        const filters = {};
+        if (project_id)
+          filters.project_id = resolveId(project_id, "projects");
+        if (task_list_id)
+          filters.task_list_id = resolveId(task_list_id, "task_lists");
+        if (plan_id)
+          filters.plan_id = resolveId(plan_id, "plans");
+        if (tags)
+          filters.tags = tags;
+        const task = getNextTask2(agent_id, filters);
+        return { content: [{ type: "text", text: task ? formatTask(task) : "No available task." }] };
+      } catch (e) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
+      }
+    });
+  }
+  if (shouldRegisterTool("claim_next_task")) {
+    server.tool("claim_next_task", "Atomically claim and start the best available pending task for an agent.", {
+      agent_id: exports_external2.string().describe("Agent ID or name claiming the task"),
+      project_id: exports_external2.string().optional().describe("Filter by project"),
+      task_list_id: exports_external2.string().optional().describe("Filter by task list"),
+      plan_id: exports_external2.string().optional().describe("Filter by plan"),
+      tags: exports_external2.array(exports_external2.string()).optional().describe("Filter by tags")
+    }, async ({ agent_id, project_id, task_list_id, plan_id, tags }) => {
+      try {
+        const { claimNextTask: claimNextTask2 } = (init_tasks(), __toCommonJS(exports_tasks));
+        const filters = {};
+        if (project_id)
+          filters.project_id = resolveId(project_id, "projects");
+        if (task_list_id)
+          filters.task_list_id = resolveId(task_list_id, "task_lists");
+        if (plan_id)
+          filters.plan_id = resolveId(plan_id, "plans");
+        if (tags)
+          filters.tags = tags;
+        const task = claimNextTask2(agent_id, filters);
+        return { content: [{ type: "text", text: task ? formatTask(task) : "No available task to claim." }] };
+      } catch (e) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
+      }
+    });
+  }
+  if (shouldRegisterTool("get_tasks_changed_since")) {
+    server.tool("get_tasks_changed_since", "List tasks changed since an ISO timestamp.", {
+      since: exports_external2.string().describe("ISO timestamp"),
+      project_id: exports_external2.string().optional().describe("Filter by project"),
+      task_list_id: exports_external2.string().optional().describe("Filter by task list"),
+      limit: exports_external2.number().optional().describe("Maximum tasks to return")
+    }, async ({ since, project_id, task_list_id, limit }) => {
+      try {
+        const { getTasksChangedSince: getTasksChangedSince2 } = (init_tasks(), __toCommonJS(exports_tasks));
+        const filters = {};
+        if (project_id)
+          filters.project_id = resolveId(project_id, "projects");
+        if (task_list_id)
+          filters.task_list_id = resolveId(task_list_id, "task_lists");
+        const tasks = getTasksChangedSince2(since, filters).slice(0, limit || 50);
+        if (tasks.length === 0)
+          return { content: [{ type: "text", text: "No changed tasks." }] };
+        return { content: [{ type: "text", text: tasks.map(formatTask).join(`
+`) }] };
+      } catch (e) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
+      }
+    });
+  }
+  function registerContextTool(name, description) {
+    if (!shouldRegisterTool(name))
+      return;
+    server.tool(name, description, {
+      agent_id: exports_external2.string().optional().describe("Agent ID or name"),
+      project_id: exports_external2.string().optional().describe("Filter by project"),
+      task_list_id: exports_external2.string().optional().describe("Filter by task list"),
+      explain_blocked: exports_external2.boolean().optional().describe("Include blocked task details")
+    }, async ({ agent_id, project_id, task_list_id, explain_blocked }) => {
+      try {
+        const { getStatus: getStatus2, getNextTask: getNextTask2, getOverdueTasks: getOverdueTasks2 } = (init_tasks(), __toCommonJS(exports_tasks));
+        const { getLatestHandoff: getLatestHandoff2 } = (init_handoffs(), __toCommonJS(exports_handoffs));
+        const filters = {};
+        if (project_id)
+          filters.project_id = resolveId(project_id, "projects");
+        if (task_list_id)
+          filters.task_list_id = resolveId(task_list_id, "task_lists");
+        const status = getStatus2(filters, agent_id, { explain_blocked });
+        const next_task = getNextTask2(agent_id, filters);
+        const overdue = getOverdueTasks2(filters.project_id);
+        const latest_handoff = getLatestHandoff2(agent_id, filters.project_id);
+        return {
+          content: [{
+            type: "text",
+            text: JSON.stringify({
+              status,
+              next_task,
+              overdue_count: overdue.length,
+              latest_handoff,
+              as_of: new Date().toISOString()
+            }, null, 2)
+          }]
+        };
+      } catch (e) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
+      }
+    });
+  }
+  registerContextTool("get_context", "Get session start context: queue status, next task, overdue count, and latest handoff.");
+  registerContextTool("bootstrap", "Bootstrap an agent session with queue context and the next available task.");
   if (shouldRegisterTool("get_org_chart")) {
     server.tool("get_org_chart", "Get the global org chart (agent hierarchy + titles).", {
       format: exports_external2.enum(["text", "json"]).optional().describe("Output format (default: text)")
@@ -27273,7 +28041,7 @@ function registerTaskWorkflowTools(server, ctx) {
           }).join(`
 `);
         };
-        const { getOrgChart: getOrgChart2 } = (()=>{throw new Error("Cannot require module "+"../db/agents.js");})();
+        const { getOrgChart: getOrgChart2 } = (init_agents(), __toCommonJS(exports_agents));
         const tree = getOrgChart2();
         if (format === "json") {
           return { content: [{ type: "text", text: JSON.stringify(tree, null, 2) }] };
@@ -27293,10 +28061,10 @@ function registerTaskWorkflowTools(server, ctx) {
       reports_to: exports_external2.string().describe("Manager agent ID or name")
     }, async ({ agent_id, reports_to }) => {
       try {
-        const { setReportsTo } = (()=>{throw new Error("Cannot require module "+"../db/agents.js");})();
+        const { updateAgent: updateAgent2 } = (init_agents(), __toCommonJS(exports_agents));
         const resolvedAgent = resolveId(agent_id, "agents");
         const resolvedManager = resolveId(reports_to, "agents");
-        setReportsTo(resolvedAgent, resolvedManager);
+        updateAgent2(resolvedAgent, { reports_to: resolvedManager });
         return { content: [{ type: "text", text: `${agent_id} now reports to ${reports_to}` }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -27306,6 +28074,7 @@ function registerTaskWorkflowTools(server, ctx) {
 }
 var init_task_workflow_tools = __esm(() => {
   init_zod2();
+  init_types();
 });
 
 // src/mcp/tools/task-auto-tools.ts
@@ -27317,9 +28086,9 @@ function registerTaskAutoTools(server, ctx) {
       project_id: exports_external2.string().optional().describe("Scope to a project")
     }, async ({ days = 7, project_id }) => {
       try {
-        const { archiveCompletedTasks } = (init_tasks(), __toCommonJS(exports_tasks));
+        const { archiveCompletedTasks: archiveCompletedTasks2 } = (init_tasks(), __toCommonJS(exports_tasks));
         const resolvedProjectId = project_id ? resolveId(project_id, "projects") : undefined;
-        const count = archiveCompletedTasks(days, resolvedProjectId);
+        const count = archiveCompletedTasks2(days, resolvedProjectId);
         return { content: [{ type: "text", text: `Archived ${count} completed task(s) older than ${days} days.` }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -27345,9 +28114,9 @@ function registerTaskAutoTools(server, ctx) {
       limit: exports_external2.number().optional().describe("Max results (default: 50)")
     }, async ({ project_id, limit }) => {
       try {
-        const { getArchivedTasks } = (init_tasks(), __toCommonJS(exports_tasks));
+        const { getArchivedTasks: getArchivedTasks2 } = (init_tasks(), __toCommonJS(exports_tasks));
         const resolvedProjectId = project_id ? resolveId(project_id, "projects") : undefined;
-        const tasks = getArchivedTasks({ project_id: resolvedProjectId, limit: limit || 50 });
+        const tasks = getArchivedTasks2({ project_id: resolvedProjectId, limit: limit || 50 });
         if (tasks.length === 0)
           return { content: [{ type: "text", text: "No archived tasks." }] };
         const lines = tasks.map((t) => `${t.short_id || t.id.slice(0, 8)} ${t.title} archived ${t.archived_at}`);
@@ -27363,14 +28132,13 @@ function registerTaskAutoTools(server, ctx) {
       task_id: exports_external2.string().describe("Task ID")
     }, async ({ task_id }) => {
       try {
-        const { autoAssign } = (init_agents(), __toCommonJS(exports_agents));
         const resolvedId = resolveId(task_id);
-        const assignment = autoAssign(resolvedId);
-        if (!assignment)
+        const { autoAssignTask: autoAssignTask2 } = (init_auto_assign(), __toCommonJS(exports_auto_assign));
+        const assignment = await autoAssignTask2(resolvedId);
+        if (!assignment.assigned_to)
           return { content: [{ type: "text", text: "No suitable agent found for this task." }] };
-        const { updateTask: updateTask2 } = (init_tasks(), __toCommonJS(exports_tasks));
-        updateTask2(resolvedId, { assigned_to: assignment.agent_id });
-        return { content: [{ type: "text", text: `Task ${task_id.slice(0, 8)} assigned to ${assignment.agent_name} (score: ${assignment.score.toFixed(2)})` }] };
+        const reason = assignment.reason ? ` \u2014 ${assignment.reason}` : "";
+        return { content: [{ type: "text", text: `Task ${task_id.slice(0, 8)} assigned to ${assignment.agent_name || assignment.assigned_to} via ${assignment.method}${reason}` }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
       }
@@ -27381,10 +28149,23 @@ function registerTaskAutoTools(server, ctx) {
       agent_id: exports_external2.string().optional().describe("Agent ID (defaults to context agent)")
     }, async ({ agent_id }) => {
       try {
-        const { getAgentWorkload } = (init_agents(), __toCommonJS(exports_agents));
+        const { listTasks: listTasks3, getBlockedTasks: getBlockedTasks2 } = (init_tasks(), __toCommonJS(exports_tasks));
         const focus = ctx.getAgentFocus(agent_id || "");
         const effectiveAgentId = focus ? focus.agent_id : agent_id || "";
-        const workload = getAgentWorkload(effectiveAgentId);
+        if (!effectiveAgentId) {
+          return { content: [{ type: "text", text: "No agent_id provided and no agent focus is active." }], isError: true };
+        }
+        const assigned = listTasks3({ assigned_to: effectiveAgentId, limit: 500 }, undefined);
+        const now2 = Date.now();
+        const dueSoonCutoff = now2 + 24 * 60 * 60 * 1000;
+        const blocked = getBlockedTasks2().filter((t) => t.assigned_to === effectiveAgentId);
+        const workload = {
+          in_progress: assigned.filter((t) => t.status === "in_progress").length,
+          pending: assigned.filter((t) => t.status === "pending").length,
+          completed_recent: assigned.filter((t) => t.status === "completed" && t.completed_at && now2 - new Date(t.completed_at).getTime() <= 7 * 24 * 60 * 60 * 1000).length,
+          due_soon: assigned.filter((t) => t.due_at && new Date(t.due_at).getTime() <= dueSoonCutoff && new Date(t.due_at).getTime() >= now2 && !["completed", "cancelled", "failed"].includes(t.status)).length,
+          blocked: blocked.length
+        };
         const lines = [
           `Agent: ${effectiveAgentId}`,
           `In Progress: ${workload.in_progress}`,
@@ -27406,10 +28187,29 @@ function registerTaskAutoTools(server, ctx) {
       max_per_agent: exports_external2.number().optional().describe("Max tasks per agent (default: 5)")
     }, async ({ project_id, max_per_agent }) => {
       try {
-        const { rebalanceWorkload } = (init_agents(), __toCommonJS(exports_agents));
+        const { listAgents: listAgents2 } = (init_agents(), __toCommonJS(exports_agents));
+        const { listTasks: listTasks3, updateTask: updateTask2 } = (init_tasks(), __toCommonJS(exports_tasks));
         const resolvedProjectId = project_id ? resolveId(project_id, "projects") : undefined;
-        const result = rebalanceWorkload({ project_id: resolvedProjectId, max_per_agent: max_per_agent || 5 });
-        return { content: [{ type: "text", text: `Rebalanced: moved ${result.moved} task(s), ${result.skipped} skipped.` }] };
+        const limit = max_per_agent || 5;
+        const agents = listAgents2().filter((agent) => agent.status === "active");
+        if (agents.length === 0)
+          return { content: [{ type: "text", text: "No active agents available for rebalancing." }] };
+        const activeTasks = listTasks3({ project_id: resolvedProjectId, status: ["pending", "in_progress"], limit: 1000 }, undefined);
+        const load = new Map(agents.map((agent) => [agent.id, activeTasks.filter((t) => t.assigned_to === agent.id).length]));
+        let moved = 0;
+        let skipped = 0;
+        for (const task of activeTasks.filter((t) => t.status === "pending" && t.assigned_to && (load.get(t.assigned_to) ?? 0) > limit)) {
+          const target = agents.filter((agent) => agent.id !== task.assigned_to).sort((a, b) => (load.get(a.id) ?? 0) - (load.get(b.id) ?? 0))[0];
+          if (!target || (load.get(target.id) ?? 0) >= limit) {
+            skipped++;
+            continue;
+          }
+          updateTask2(task.id, { assigned_to: target.id, version: task.version });
+          load.set(task.assigned_to, (load.get(task.assigned_to) ?? 1) - 1);
+          load.set(target.id, (load.get(target.id) ?? 0) + 1);
+          moved++;
+        }
+        return { content: [{ type: "text", text: `Rebalanced: moved ${moved} task(s), ${skipped} skipped.` }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
       }
@@ -27422,13 +28222,13 @@ function registerTaskAutoTools(server, ctx) {
       agent_id: exports_external2.string().optional().describe("Filter by assignee")
     }, async ({ hours = 24, project_id, agent_id }) => {
       try {
-        const { notifyUpcomingDeadlines } = (init_tasks(), __toCommonJS(exports_tasks));
+        const { notifyUpcomingDeadlines: notifyUpcomingDeadlines2 } = (init_tasks(), __toCommonJS(exports_tasks));
         const resolvedProjectId = project_id ? resolveId(project_id, "projects") : undefined;
         const resolvedAgentId = agent_id ? resolveId(agent_id, "agents") : undefined;
-        const tasks = notifyUpcomingDeadlines({ hours, project_id: resolvedProjectId, agent_id: resolvedAgentId });
+        const tasks = notifyUpcomingDeadlines2({ hours, project_id: resolvedProjectId, agent_id: resolvedAgentId });
         if (tasks.length === 0)
           return { content: [{ type: "text", text: "No deadlines approaching." }] };
-        const lines = tasks.map((t) => `${t.short_id || t.id.slice(0, 8)} ${t.title} due ${t.deadline}`);
+        const lines = tasks.map((t) => `${t.short_id || t.id.slice(0, 8)} ${t.title} due ${t.due_at}`);
         return { content: [{ type: "text", text: `${tasks.length} task(s) due within ${hours}h:
 ${lines.join(`
 `)}` }] };
@@ -27462,9 +28262,9 @@ ${lines.join(`
       project_id: exports_external2.string().optional().describe("Filter by project")
     }, async ({ project_id }) => {
       try {
-        const { getBlockedTasks } = (init_tasks(), __toCommonJS(exports_tasks));
+        const { getBlockedTasks: getBlockedTasks2 } = (init_tasks(), __toCommonJS(exports_tasks));
         const resolvedProjectId = project_id ? resolveId(project_id, "projects") : undefined;
-        const tasks = getBlockedTasks(resolvedProjectId);
+        const tasks = getBlockedTasks2(resolvedProjectId);
         if (tasks.length === 0)
           return { content: [{ type: "text", text: "No blocked tasks." }] };
         const lines = tasks.map((t) => `${t.short_id || t.id.slice(0, 8)} [${t.status}] ${t.title} \u2014 blocked by ${(t.blocked_by || []).map((b) => b.slice(0, 8)).join(", ")}`);
@@ -27481,9 +28281,9 @@ ${lines.join(`
       project_id: exports_external2.string().optional().describe("Filter by project")
     }, async ({ project_id }) => {
       try {
-        const { getBlockingTasks } = (init_tasks(), __toCommonJS(exports_tasks));
+        const { getBlockingTasks: getBlockingTasks2 } = (init_tasks(), __toCommonJS(exports_tasks));
         const resolvedProjectId = project_id ? resolveId(project_id, "projects") : undefined;
-        const tasks = getBlockingTasks(resolvedProjectId);
+        const tasks = getBlockingTasks2(resolvedProjectId);
         if (tasks.length === 0)
           return { content: [{ type: "text", text: "No tasks blocking others." }] };
         const lines = tasks.map((t) => `${t.short_id || t.id.slice(0, 8)} [${t.status}] ${t.title} \u2014 blocking ${t.blocking_count} task(s)`);
@@ -27498,20 +28298,18 @@ ${lines.join(`
   if (shouldRegisterTool("get_health")) {
     server.tool("get_health", "Get system health: task counts by status, active agents, project summary.", async () => {
       try {
-        const { listTasks: listTasks3 } = (init_tasks(), __toCommonJS(exports_tasks));
-        const { listProjects: listProjects2 } = (init_tasks(), __toCommonJS(exports_tasks));
+        const { countTasks: countTasks2 } = (init_tasks(), __toCommonJS(exports_tasks));
+        const { listProjects: listProjects2 } = (init_projects(), __toCommonJS(exports_projects));
         const { listAgents: listAgents2 } = (init_agents(), __toCommonJS(exports_agents));
-        const [pending, inProgress, completed, cancelled] = await Promise.all([
-          Promise.resolve(listTasks3({ status: "pending", limit: 1 }, undefined)),
-          Promise.resolve(listTasks3({ status: "in_progress", limit: 1 }, undefined)),
-          Promise.resolve(listTasks3({ status: "completed", limit: 1 }, undefined)),
-          Promise.resolve(listTasks3({ status: "cancelled", limit: 1 }, undefined))
-        ]);
-        const projects = listProjects2({ limit: 100 });
-        const agents = listAgents2({ limit: 100 });
+        const pending = countTasks2({ status: "pending" });
+        const inProgress = countTasks2({ status: "in_progress" });
+        const completed = countTasks2({ status: "completed" });
+        const cancelled = countTasks2({ status: "cancelled" });
+        const projects = listProjects2();
+        const agents = listAgents2();
         const lines = [
           `=== System Health ===`,
-          `Tasks: ${pending.total} pending | ${inProgress.total} in progress | ${completed.total} completed | ${cancelled.total} cancelled`,
+          `Tasks: ${pending} pending | ${inProgress} in progress | ${completed} completed | ${cancelled} cancelled`,
           `Projects: ${projects.length} total`,
           `Agents: ${agents.length} registered`
         ];
@@ -27657,17 +28455,31 @@ var init_task_relationships = __esm(() => {
 function registerTaskAdvTools(server, ctx) {
   const { shouldRegisterTool, resolveId, formatError, formatTask, formatTaskDetail } = ctx;
   if (shouldRegisterTool("get_status")) {
-    server.tool("get_status", "Get a task's current status including blockers, dependencies, comments, and assignee.", {
-      task_id: exports_external2.string().describe("Task ID")
-    }, async ({ task_id }) => {
+    server.tool("get_status", "Get queue status summary, or pass task_id for a task's detailed status.", {
+      task_id: exports_external2.string().optional().describe("Task ID for task-specific status"),
+      project_id: exports_external2.string().optional().describe("Filter summary by project"),
+      task_list_id: exports_external2.string().optional().describe("Filter summary by task list"),
+      agent_id: exports_external2.string().optional().describe("Agent for next-task affinity"),
+      explain_blocked: exports_external2.boolean().optional().describe("Include blocked task explanations in summary")
+    }, async ({ task_id, project_id, task_list_id, agent_id, explain_blocked }) => {
       try {
+        if (!task_id) {
+          const { getStatus: getStatus2 } = (init_tasks(), __toCommonJS(exports_tasks));
+          const filters = {};
+          if (project_id)
+            filters.project_id = resolveId(project_id, "projects");
+          if (task_list_id)
+            filters.task_list_id = resolveId(task_list_id, "task_lists");
+          const status = getStatus2(filters, agent_id, { explain_blocked });
+          return { content: [{ type: "text", text: JSON.stringify(status, null, 2) }] };
+        }
         const resolvedId = resolveId(task_id);
-        const { getTask: getTask4 } = (init_tasks(), __toCommonJS(exports_tasks));
-        const task = getTask4(resolvedId);
+        const { getTask: getTask2 } = (init_tasks(), __toCommonJS(exports_tasks));
+        const task = getTask2(resolvedId);
         if (!task)
           throw new Error(`Task not found: ${task_id}`);
         const { getTaskDependencies: getTaskDependencies3 } = (init_tasks(), __toCommonJS(exports_tasks));
-        const { listComments: listComments2 } = (init_tasks(), __toCommonJS(exports_tasks));
+        const { listComments: listComments2 } = (init_comments(), __toCommonJS(exports_comments));
         const { listTaskFiles: listTaskFiles2 } = (init_task_files(), __toCommonJS(exports_task_files));
         const [deps, comments, files] = await Promise.all([
           Promise.resolve(getTaskDependencies3(resolvedId, "both")),
@@ -27677,14 +28489,14 @@ function registerTaskAdvTools(server, ctx) {
         const lines = [
           `Status: ${task.status} | Priority: ${task.priority}`,
           task.assigned_to ? `Assigned: ${task.assigned_to}` : "Unassigned",
-          task.deadline ? `Deadline: ${task.deadline}` : null,
+          task.due_at ? `Due: ${task.due_at}` : null,
           task.confidence != null ? `Confidence: ${task.confidence}` : null,
           deps.length > 0 ? `
 Dependencies (${deps.length}):` : null,
           ...deps.map((d) => `  [${d.direction}] ${d.task_id.slice(0, 8)} (${d.status})`),
           comments.length > 0 ? `
 Comments (${comments.length}):` : null,
-          ...comments.map((c) => `  [${c.author || "?"}] ${c.created_at?.slice(0, 16)}: ${c.body.slice(0, 80)}`),
+          ...comments.map((c) => `  [${c.agent_id || "?"}] ${c.created_at?.slice(0, 16)}: ${c.content.slice(0, 80)}`),
           files.length > 0 ? `
 Files (${files.length}):` : null,
           ...files.map((f) => `  ${f.status} ${f.path}`)
@@ -27702,15 +28514,15 @@ Files (${files.length}):` : null,
     }, async ({ task_id }) => {
       try {
         const resolvedId = resolveId(task_id);
-        const { getTask: getTask4 } = (init_tasks(), __toCommonJS(exports_tasks));
-        const task = getTask4(resolvedId);
+        const { getTask: getTask2 } = (init_tasks(), __toCommonJS(exports_tasks));
+        const task = getTask2(resolvedId);
         if (!task)
           throw new Error(`Task not found: ${task_id}`);
         const { getTaskDependencies: getTaskDependencies3 } = (init_tasks(), __toCommonJS(exports_tasks));
         const { getTaskRelationships: getTaskRelationships2 } = (init_task_relationships(), __toCommonJS(exports_task_relationships));
-        const { listComments: listComments2 } = (init_tasks(), __toCommonJS(exports_tasks));
+        const { listComments: listComments2 } = (init_comments(), __toCommonJS(exports_comments));
         const { listTaskFiles: listTaskFiles2 } = (init_task_files(), __toCommonJS(exports_task_files));
-        const { getTaskCommits: getTaskCommits2 } = (init_tasks(), __toCommonJS(exports_tasks));
+        const { getTaskCommits: getTaskCommits2 } = (init_task_commits(), __toCommonJS(exports_task_commits));
         const { getTaskWatchers: getTaskWatchers2 } = (init_tasks(), __toCommonJS(exports_tasks));
         const [deps, rels, comments, files, commits, watchers] = await Promise.all([
           Promise.resolve(getTaskDependencies3(resolvedId, "both")),
@@ -27731,7 +28543,7 @@ Files (${files.length}):` : null,
           task.tags?.length ? `Tags:     ${task.tags.join(", ")}` : null,
           task.created_at ? `Created:  ${task.created_at}` : null,
           task.updated_at ? `Updated:  ${task.updated_at}` : null,
-          task.deadline ? `Deadline: ${task.deadline}` : null,
+          task.due_at ? `Due: ${task.due_at}` : null,
           task.completed_at ? `Completed: ${task.completed_at}` : null,
           deps.length > 0 ? `
 --- Dependencies (${deps.length}) ---` : null,
@@ -27741,7 +28553,7 @@ Files (${files.length}):` : null,
           ...rels.map((r) => `  ${r.source_task_id.slice(0, 8)} --[${r.relationship_type}]--> ${r.target_task_id.slice(0, 8)}`),
           comments.length > 0 ? `
 --- Comments (${comments.length}) ---` : null,
-          ...comments.map((c) => `  [${c.author || "?"}] ${c.created_at?.slice(0, 16)}: ${c.body.slice(0, 120)}`),
+          ...comments.map((c) => `  [${c.agent_id || "?"}] ${c.created_at?.slice(0, 16)}: ${c.content.slice(0, 120)}`),
           files.length > 0 ? `
 --- Files (${files.length}) ---` : null,
           ...files.map((f) => `  [${f.status}] ${f.path}`),
@@ -27790,8 +28602,8 @@ ${JSON.stringify(task.metadata, null, 2)}` : null
           limit: 20
         }, undefined);
         const completedYesterday = completed.filter((t) => t.completed_at && t.completed_at.startsWith(yesterdayStr));
-        const { getBlockedTasks } = (init_tasks(), __toCommonJS(exports_tasks));
-        const blocked = getBlockedTasks(effectiveProjectId ? resolveId(effectiveProjectId, "projects") : undefined).filter((t) => t.assigned_to === effectiveAgentId);
+        const { getBlockedTasks: getBlockedTasks2 } = (init_tasks(), __toCommonJS(exports_tasks));
+        const blocked = getBlockedTasks2(effectiveProjectId ? resolveId(effectiveProjectId, "projects") : undefined).filter((t) => t.assigned_to === effectiveAgentId);
         const lines = [
           `Standup for ${effectiveAgentId} (${effectiveProjectId ? `project: ${effectiveProjectId.slice(0, 8)}` : "all projects"})`,
           inProgress.length > 0 ? `
@@ -27820,11 +28632,11 @@ No blocked tasks.`,
       agent_id: exports_external2.string().optional().describe("Agent claiming (defaults to context)")
     }, async ({ task_id, agent_id }) => {
       try {
-        const { updateTask: updateTask2 } = (init_tasks(), __toCommonJS(exports_tasks));
+        const { startTask: startTask2 } = (init_tasks(), __toCommonJS(exports_tasks));
         const resolvedId = resolveId(task_id);
         const focus = ctx.getAgentFocus(agent_id || "");
-        const effectiveAgent = focus ? focus.agent_id : agent_id || "";
-        const task = updateTask2(resolvedId, { status: "in_progress", assigned_to: effectiveAgent });
+        const effectiveAgent = focus ? focus.agent_id : agent_id || "mcp";
+        const task = startTask2(resolvedId, effectiveAgent);
         return { content: [{ type: "text", text: formatTask(task) }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -27836,8 +28648,12 @@ No blocked tasks.`,
       task_id: exports_external2.string().describe("Task ID")
     }, async ({ task_id }) => {
       try {
-        const { updateTask: updateTask2 } = (init_tasks(), __toCommonJS(exports_tasks));
-        const task = updateTask2(resolveId(task_id), { status: "pending", assigned_to: null });
+        const { getTask: getTask2, updateTask: updateTask2 } = (init_tasks(), __toCommonJS(exports_tasks));
+        const resolvedId = resolveId(task_id);
+        const current = getTask2(resolvedId);
+        if (!current)
+          throw new Error(`Task not found: ${task_id}`);
+        const task = updateTask2(resolvedId, { status: "pending", assigned_to: null, version: current.version });
         return { content: [{ type: "text", text: formatTask(task) }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -27850,13 +28666,13 @@ No blocked tasks.`,
       minutes: exports_external2.number().describe("Additional minutes to add to estimate")
     }, async ({ task_id, minutes }) => {
       try {
-        const { getTask: getTask4, updateTask: updateTask2 } = (init_tasks(), __toCommonJS(exports_tasks));
+        const { getTask: getTask2, updateTask: updateTask2 } = (init_tasks(), __toCommonJS(exports_tasks));
         const resolvedId = resolveId(task_id);
-        const task = getTask4(resolvedId);
+        const task = getTask2(resolvedId);
         if (!task)
           throw new Error(`Task not found: ${task_id}`);
         const currentEstimate = task.estimated_minutes || 0;
-        const updated = updateTask2(resolvedId, { estimated_minutes: currentEstimate + minutes });
+        const updated = updateTask2(resolvedId, { estimated_minutes: currentEstimate + minutes, version: task.version });
         return { content: [{ type: "text", text: `Estimate updated: ${currentEstimate} \u2192 ${updated.estimated_minutes} min (+${minutes})` }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -27870,10 +28686,10 @@ No blocked tasks.`,
       author: exports_external2.string().optional().describe("Author agent ID or name")
     }, async ({ task_id, body, author }) => {
       try {
-        const { createComment } = (init_tasks(), __toCommonJS(exports_tasks));
+        const { addComment: addComment2 } = (init_comments(), __toCommonJS(exports_comments));
         const resolvedId = resolveId(task_id);
         const resolvedAuthor = author ? resolveId(author, "agents") : undefined;
-        createComment({ task_id: resolvedId, body, author: resolvedAuthor });
+        addComment2({ task_id: resolvedId, content: body, agent_id: resolvedAuthor });
         return { content: [{ type: "text", text: `Comment added to ${task_id.slice(0, 8)}` }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -27885,11 +28701,11 @@ No blocked tasks.`,
       task_id: exports_external2.string().describe("Task ID")
     }, async ({ task_id }) => {
       try {
-        const { listComments: listComments2 } = (init_tasks(), __toCommonJS(exports_tasks));
+        const { listComments: listComments2 } = (init_comments(), __toCommonJS(exports_comments));
         const comments = listComments2(resolveId(task_id));
         if (comments.length === 0)
           return { content: [{ type: "text", text: "No comments." }] };
-        const lines = comments.map((c) => `[${c.author || "?"}] ${c.created_at?.slice(0, 16)}: ${c.body}`);
+        const lines = comments.map((c) => `[${c.agent_id || "?"}] ${c.created_at?.slice(0, 16)}: ${c.content}`);
         return { content: [{ type: "text", text: lines.join(`
 
 `) }] };
@@ -27901,7 +28717,7 @@ No blocked tasks.`,
   if (shouldRegisterTool("list_my_tasks")) {
     server.tool("list_my_tasks", "Alias for get_my_tasks.", {
       agent_id: exports_external2.string().optional().describe("Agent ID (defaults to context agent)"),
-      status: exports_external2.enum(["pending", "in_progress", "completed", "cancelled"]).optional(),
+      status: exports_external2.enum(["pending", "in_progress", "completed", "failed", "cancelled"]).optional(),
       project_id: exports_external2.string().optional().describe("Filter by project"),
       limit: exports_external2.number().optional()
     }, async ({ agent_id, status, project_id, limit }) => {
@@ -27926,126 +28742,6 @@ No blocked tasks.`,
       }
     });
   }
-  if (shouldRegisterTool("list_agents")) {
-    server.tool("list_agents", "List all registered agents.", {
-      project_id: exports_external2.string().optional().describe("Filter by project"),
-      role: exports_external2.string().optional().describe("Filter by global role"),
-      capabilities: exports_external2.array(exports_external2.string()).optional().describe("Filter by capabilities")
-    }, async ({ project_id, role, capabilities }) => {
-      try {
-        const { listAgents: listAgents2 } = (init_agents(), __toCommonJS(exports_agents));
-        const resolved = {};
-        if (project_id)
-          resolved.project_id = resolveId(project_id, "projects");
-        if (role)
-          resolved.role = role;
-        if (capabilities)
-          resolved.capabilities = capabilities;
-        const agents = listAgents2(resolved);
-        if (agents.length === 0)
-          return { content: [{ type: "text", text: "No agents found." }] };
-        const lines = agents.map((a) => `\u25CF ${a.name} [${a.role || "no role"}]${a.capabilities?.length ? ` caps:[${a.capabilities.join(",")}]` : ""}`);
-        return { content: [{ type: "text", text: lines.join(`
-`) }] };
-      } catch (e) {
-        return { content: [{ type: "text", text: formatError(e) }], isError: true };
-      }
-    });
-  }
-  if (shouldRegisterTool("get_agent")) {
-    server.tool("get_agent", "Get full details for an agent.", {
-      agent_id: exports_external2.string().describe("Agent ID or name")
-    }, async ({ agent_id }) => {
-      try {
-        const { getAgentByName: getAgentByName2, getAgent: getAgent2 } = (init_agents(), __toCommonJS(exports_agents));
-        const resolvedId = resolveId(agent_id, "agents");
-        const agent = agent_id.includes("@") || !resolvedId.startsWith("agent_") ? getAgentByName2(agent_id) : getAgent2(resolvedId);
-        if (!agent)
-          return { content: [{ type: "text", text: `Agent not found: ${agent_id}` }], isError: true };
-        const lines = [
-          `ID:          ${agent.id}`,
-          `Name:        ${agent.name}`,
-          agent.email ? `Email:       ${agent.email}` : null,
-          agent.title ? `Title:       ${agent.title}` : null,
-          agent.role ? `Role:        ${agent.role}` : null,
-          agent.capabilities?.length ? `Capabilities: ${agent.capabilities.join(", ")}` : null,
-          agent.last_seen_at ? `Last Seen:   ${agent.last_seen_at}` : null
-        ].filter(Boolean);
-        return { content: [{ type: "text", text: lines.join(`
-`) }] };
-      } catch (e) {
-        return { content: [{ type: "text", text: formatError(e) }], isError: true };
-      }
-    });
-  }
-  if (shouldRegisterTool("update_agent")) {
-    server.tool("update_agent", "Update an agent's fields.", {
-      agent_id: exports_external2.string().describe("Agent ID or name"),
-      name: exports_external2.string().optional(),
-      email: exports_external2.string().optional(),
-      title: exports_external2.string().optional(),
-      role: exports_external2.string().optional(),
-      capabilities: exports_external2.array(exports_external2.string()).optional()
-    }, async ({ agent_id, ...updates }) => {
-      try {
-        const { getAgentByName: getAgentByName2, updateAgent: updateAgent2 } = (init_agents(), __toCommonJS(exports_agents));
-        const resolvedId = resolveId(agent_id, "agents");
-        const agent = agent_id.includes("@") || !resolvedId.startsWith("agent_") ? getAgentByName2(agent_id) : { id: resolvedId };
-        updateAgent2(agent.id, updates);
-        return { content: [{ type: "text", text: `Agent ${agent.id.slice(0, 8)} updated.` }] };
-      } catch (e) {
-        return { content: [{ type: "text", text: formatError(e) }], isError: true };
-      }
-    });
-  }
-  if (shouldRegisterTool("delete_agent")) {
-    server.tool("delete_agent", "Deregister an agent.", {
-      agent_id: exports_external2.string().describe("Agent ID or name")
-    }, async ({ agent_id }) => {
-      try {
-        const { getAgentByName: getAgentByName2, deleteAgent: deleteAgent2 } = (init_agents(), __toCommonJS(exports_agents));
-        const resolvedId = resolveId(agent_id, "agents");
-        const agent = agent_id.includes("@") || !resolvedId.startsWith("agent_") ? getAgentByName2(agent_id) : { id: resolvedId };
-        if (!agent)
-          return { content: [{ type: "text", text: `Agent not found: ${agent_id}` }], isError: true };
-        deleteAgent2(agent.id);
-        return { content: [{ type: "text", text: `Agent ${agent_id} deleted.` }] };
-      } catch (e) {
-        return { content: [{ type: "text", text: formatError(e) }], isError: true };
-      }
-    });
-  }
-  if (shouldRegisterTool("register_agent")) {
-    server.tool("register_agent", "Register a new agent.", {
-      name: exports_external2.string().describe("Agent name"),
-      email: exports_external2.string().optional(),
-      title: exports_external2.string().optional(),
-      role: exports_external2.string().optional(),
-      capabilities: exports_external2.array(exports_external2.string()).optional()
-    }, async ({ name, email, title, role, capabilities }) => {
-      try {
-        const { registerAgent: registerAgent2 } = (init_agents(), __toCommonJS(exports_agents));
-        const agent = registerAgent2({ name, email, title, role, capabilities });
-        return { content: [{ type: "text", text: `Agent registered: ${agent.name} (${agent.id})` }] };
-      } catch (e) {
-        return { content: [{ type: "text", text: formatError(e) }], isError: true };
-      }
-    });
-  }
-  if (shouldRegisterTool("heartbeat")) {
-    server.tool("heartbeat", "Agent heartbeat \u2014 updates last_seen_at timestamp.", {
-      agent_id: exports_external2.string().describe("Agent ID"),
-      status: exports_external2.string().optional().describe("Current status message")
-    }, async ({ agent_id, status }) => {
-      try {
-        const { heartbeat } = (init_agents(), __toCommonJS(exports_agents));
-        heartbeat(resolveId(agent_id, "agents"), status);
-        return { content: [{ type: "text", text: "Heartbeat received." }] };
-      } catch (e) {
-        return { content: [{ type: "text", text: formatError(e) }], isError: true };
-      }
-    });
-  }
 }
 var init_task_adv_tools = __esm(() => {
   init_zod2();
@@ -28090,6 +28786,11 @@ function registerTaskMetaTools(server, ctx) {
           prioritize_task: "prioritize_task \u2014 Set priority. Params: task_id, priority, version",
           search_tasks: "search_tasks \u2014 Full-text search. Params: query, project_id, status, limit",
           get_my_tasks: "get_my_tasks \u2014 Get tasks for calling agent. Params: agent_id, status, project_id, limit",
+          get_next_task: "get_next_task \u2014 Get the next available task without claiming it. Params: agent_id, project_id, task_list_id, plan_id, tags",
+          claim_next_task: "claim_next_task \u2014 Atomically claim and start the next available task. Params: agent_id, project_id, task_list_id, plan_id, tags",
+          get_tasks_changed_since: "get_tasks_changed_since \u2014 List tasks changed since an ISO timestamp. Params: since, project_id, task_list_id, limit",
+          get_context: "get_context \u2014 Get session start context. Params: agent_id, project_id, task_list_id, explain_blocked",
+          bootstrap: "bootstrap \u2014 Bootstrap an agent session with queue context. Params: agent_id, project_id, task_list_id, explain_blocked",
           standup: "standup \u2014 Get standup report. Params: agent_id, project_id",
           patrol_tasks: "patrol_tasks \u2014 Scan for task issues. Params: stuck_minutes, confidence_threshold, project_id",
           get_review_queue: "get_review_queue \u2014 Get tasks needing review. Params: project_id, limit",
@@ -28147,9 +28848,20 @@ function registerTaskMetaTools(server, ctx) {
           get_health: "get_health \u2014 Get system health stats",
           approve_task: "approve_task \u2014 Approve a task. Params: task_id, approved_by, notes, version",
           fail_task: "fail_task \u2014 Mark task failed. Params: task_id, reason, agent_id, version",
+          register_agent: "register_agent \u2014 Register an agent. Params: name, description, role, title, capabilities, session_id, working_dir, force",
+          list_agents: "list_agents \u2014 List registered agents. Params: include_archived",
+          get_agent: "get_agent \u2014 Get agent details. Params: agent_id, id, name",
+          update_agent: "update_agent \u2014 Update an agent. Params: agent_id, id, name, description, role, title, level, capabilities, permissions, metadata",
+          delete_agent: "delete_agent \u2014 Archive an agent. Params: agent_id, id, name",
+          unarchive_agent: "unarchive_agent \u2014 Restore an archived agent. Params: agent_id, id, name",
+          heartbeat: "heartbeat \u2014 Update an agent heartbeat. Params: agent_id",
+          release_agent: "release_agent \u2014 Release an agent session/name. Params: agent_id, session_id",
+          set_focus: "set_focus \u2014 Focus an agent on a project. Params: agent_id, project_id, task_list_id",
+          get_focus: "get_focus \u2014 Get current agent focus. Params: agent_id",
+          unfocus: "unfocus \u2014 Clear agent focus. Params: agent_id",
+          suggest_agent_name: "suggest_agent_name \u2014 Suggest available agent names. Params: working_dir",
           get_org_chart: "get_org_chart \u2014 Get global org chart. Params: format",
           set_reports_to: "set_reports_to \u2014 Set org hierarchy. Params: agent_id, reports_to",
-          sync: "sync \u2014 Sync from external source. Params: source, source_id, project_id, options",
           extract_todos: "extract_todos \u2014 Scan code for TODO comments. Params: path, project_id, task_list_id, patterns, tags, assigned_to, agent_id, dry_run, extensions",
           migrate_pg: "migrate_pg \u2014 Apply PostgreSQL migrations. Params: connection_string"
         };
@@ -28167,6 +28879,74 @@ var init_task_meta_tools = __esm(() => {
   init_zod2();
 });
 
+// src/db/file-locks.ts
+var exports_file_locks = {};
+__export(exports_file_locks, {
+  unlockFile: () => unlockFile,
+  lockFile: () => lockFile,
+  listFileLocks: () => listFileLocks,
+  forceUnlockFile: () => forceUnlockFile,
+  cleanExpiredFileLocks: () => cleanExpiredFileLocks,
+  checkFileLock: () => checkFileLock,
+  FILE_LOCK_DEFAULT_TTL_SECONDS: () => FILE_LOCK_DEFAULT_TTL_SECONDS
+});
+function expiresAt(ttlSeconds) {
+  return new Date(Date.now() + ttlSeconds * 1000).toISOString();
+}
+function cleanExpiredFileLocks(db) {
+  const d = db || getDatabase();
+  const result = d.run("DELETE FROM file_locks WHERE expires_at <= ?", [now()]);
+  return result.changes;
+}
+function lockFile(input, db) {
+  const d = db || getDatabase();
+  const ttl = input.ttl_seconds ?? FILE_LOCK_DEFAULT_TTL_SECONDS;
+  const expiry = expiresAt(ttl);
+  const timestamp = now();
+  cleanExpiredFileLocks(d);
+  const existing = d.query("SELECT * FROM file_locks WHERE path = ?").get(input.path);
+  if (existing) {
+    if (existing.agent_id === input.agent_id) {
+      d.run("UPDATE file_locks SET expires_at = ?, task_id = COALESCE(?, task_id) WHERE id = ?", [expiry, input.task_id ?? null, existing.id]);
+      return d.query("SELECT * FROM file_locks WHERE id = ?").get(existing.id);
+    }
+    throw new LockError(input.path, existing.agent_id);
+  }
+  const id = uuid();
+  d.run("INSERT INTO file_locks (id, path, agent_id, task_id, expires_at, created_at) VALUES (?, ?, ?, ?, ?, ?)", [id, input.path, input.agent_id, input.task_id ?? null, expiry, timestamp]);
+  return d.query("SELECT * FROM file_locks WHERE id = ?").get(id);
+}
+function unlockFile(path, agentId, db) {
+  const d = db || getDatabase();
+  cleanExpiredFileLocks(d);
+  const result = d.run("DELETE FROM file_locks WHERE path = ? AND agent_id = ?", [path, agentId]);
+  return result.changes > 0;
+}
+function checkFileLock(path, db) {
+  const d = db || getDatabase();
+  cleanExpiredFileLocks(d);
+  return d.query("SELECT * FROM file_locks WHERE path = ?").get(path);
+}
+function listFileLocks(agentId, db) {
+  const d = db || getDatabase();
+  cleanExpiredFileLocks(d);
+  if (agentId) {
+    return d.query("SELECT * FROM file_locks WHERE agent_id = ? ORDER BY created_at DESC").all(agentId);
+  }
+  return d.query("SELECT * FROM file_locks ORDER BY created_at DESC").all();
+}
+function forceUnlockFile(path, db) {
+  const d = db || getDatabase();
+  const result = d.run("DELETE FROM file_locks WHERE path = ?", [path]);
+  return result.changes > 0;
+}
+var FILE_LOCK_DEFAULT_TTL_SECONDS;
+var init_file_locks = __esm(() => {
+  init_database();
+  init_types();
+  FILE_LOCK_DEFAULT_TTL_SECONDS = 30 * 60;
+});
+
 // src/mcp/tools/task-resources.ts
 function registerTaskResources(server, ctx) {
   const { shouldRegisterTool, resolveId, formatError } = ctx;
@@ -28192,7 +28972,7 @@ function registerTaskResources(server, ctx) {
       note: exports_external2.string().optional().describe("Note about why this file is linked")
     }, async ({ task_id, path, paths: multiplePaths, status, agent_id, note }) => {
       try {
-        const { addTaskFile: addTaskFile2, bulkAddTaskFiles: bulkAddTaskFiles2, detectFileConflicts: detectFileConflicts2 } = (()=>{throw new Error("Cannot require module "+"../db/task-files.js");})();
+        const { addTaskFile: addTaskFile2, bulkAddTaskFiles: bulkAddTaskFiles2, detectFileConflicts: detectFileConflicts2 } = (init_task_files(), __toCommonJS(exports_task_files));
         const resolvedId = resolveId(task_id);
         let addedFiles;
         if (multiplePaths && multiplePaths.length > 0) {
@@ -28236,7 +29016,7 @@ function registerTaskResources(server, ctx) {
   if (shouldRegisterTool("list_task_files")) {
     server.tool("list_task_files", "List all files linked to a task.", { task_id: exports_external2.string().describe("Task ID") }, async ({ task_id }) => {
       try {
-        const { listTaskFiles: listTaskFiles2 } = (()=>{throw new Error("Cannot require module "+"../db/task-files.js");})();
+        const { listTaskFiles: listTaskFiles2 } = (init_task_files(), __toCommonJS(exports_task_files));
         const resolvedId = resolveId(task_id);
         const files = listTaskFiles2(resolvedId);
         if (files.length === 0)
@@ -28253,7 +29033,7 @@ ${lines.join(`
   if (shouldRegisterTool("find_tasks_by_file")) {
     server.tool("find_tasks_by_file", "Find which tasks are linked to a specific file path. Shows who's working on what files.", { path: exports_external2.string().describe("File path to search for") }, async ({ path }) => {
       try {
-        const { findTasksByFile: findTasksByFile2 } = (()=>{throw new Error("Cannot require module "+"../db/task-files.js");})();
+        const { findTasksByFile: findTasksByFile2 } = (init_task_files(), __toCommonJS(exports_task_files));
         const files = findTasksByFile2(path);
         if (files.length === 0)
           return { content: [{ type: "text", text: `No tasks linked to ${path}` }] };
@@ -28273,7 +29053,7 @@ ${lines.join(`
       min_edits: exports_external2.number().optional().describe("Minimum edit count to include (default: 1)")
     }, async ({ limit, project_id, min_edits }) => {
       try {
-        const { getFileHeatMap: getFileHeatMap2 } = (()=>{throw new Error("Cannot require module "+"../db/task-files.js");})();
+        const { getFileHeatMap: getFileHeatMap2 } = (init_task_files(), __toCommonJS(exports_task_files));
         const resolvedProjectId = project_id ? resolveId(project_id, "projects") : undefined;
         const results = getFileHeatMap2({ limit, project_id: resolvedProjectId, min_edits });
         return { content: [{ type: "text", text: JSON.stringify(results, null, 2) }] };
@@ -28287,7 +29067,7 @@ ${lines.join(`
       paths: exports_external2.array(exports_external2.string()).describe("Array of file paths to check")
     }, async ({ paths }) => {
       try {
-        const { bulkFindTasksByFiles: bulkFindTasksByFiles2 } = (()=>{throw new Error("Cannot require module "+"../db/task-files.js");})();
+        const { bulkFindTasksByFiles: bulkFindTasksByFiles2 } = (init_task_files(), __toCommonJS(exports_task_files));
         const results = bulkFindTasksByFiles2(paths);
         return { content: [{ type: "text", text: JSON.stringify(results, null, 2) }] };
       } catch (e) {
@@ -28300,11 +29080,11 @@ ${lines.join(`
       project_id: exports_external2.string().optional().describe("Filter by project")
     }, async ({ project_id }) => {
       try {
-        const { listActiveFiles: listActiveFiles2 } = (()=>{throw new Error("Cannot require module "+"../db/task-files.js");})();
+        const { listActiveFiles: listActiveFiles2 } = (init_task_files(), __toCommonJS(exports_task_files));
         let files = listActiveFiles2();
         if (project_id) {
           const pid = resolveId(project_id, "projects");
-          const db = (()=>{throw new Error("Cannot require module "+"../db/database.js");})().getDatabase();
+          const db = (init_database(), __toCommonJS(exports_database)).getDatabase();
           files = db.query(`
               SELECT
                 tf.path,
@@ -28386,8 +29166,8 @@ ${lines.join(`
       ttl_seconds: exports_external2.number().optional().describe("Lock TTL in seconds (default: 1800 = 30 min)")
     }, async ({ path, agent_id, task_id, ttl_seconds }) => {
       try {
-        const { lockFile } = (()=>{throw new Error("Cannot require module "+"../db/file-locks.js");})();
-        const lock = lockFile({ path, agent_id, task_id, ttl_seconds });
+        const { lockFile: lockFile2 } = (init_file_locks(), __toCommonJS(exports_file_locks));
+        const lock = lockFile2({ path, agent_id, task_id, ttl_seconds });
         return { content: [{ type: "text", text: JSON.stringify(lock, null, 2) }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -28400,8 +29180,8 @@ ${lines.join(`
       agent_id: exports_external2.string().describe("Agent releasing the lock (must be the lock holder)")
     }, async ({ path, agent_id }) => {
       try {
-        const { unlockFile } = (()=>{throw new Error("Cannot require module "+"../db/file-locks.js");})();
-        const released = unlockFile(path, agent_id);
+        const { unlockFile: unlockFile2 } = (init_file_locks(), __toCommonJS(exports_file_locks));
+        const released = unlockFile2(path, agent_id);
         return { content: [{ type: "text", text: JSON.stringify({ released, path }) }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -28413,8 +29193,8 @@ ${lines.join(`
       path: exports_external2.string().describe("File path to check")
     }, async ({ path }) => {
       try {
-        const { checkFileLock } = (()=>{throw new Error("Cannot require module "+"../db/file-locks.js");})();
-        const lock = checkFileLock(path);
+        const { checkFileLock: checkFileLock2 } = (init_file_locks(), __toCommonJS(exports_file_locks));
+        const lock = checkFileLock2(path);
         if (!lock)
           return { content: [{ type: "text", text: JSON.stringify({ path, locked: false }) }] };
         return { content: [{ type: "text", text: JSON.stringify({ path, locked: true, ...lock }) }] };
@@ -28428,8 +29208,8 @@ ${lines.join(`
       agent_id: exports_external2.string().optional().describe("Filter locks by agent")
     }, async ({ agent_id }) => {
       try {
-        const { listFileLocks } = (()=>{throw new Error("Cannot require module "+"../db/file-locks.js");})();
-        const locks = listFileLocks(agent_id);
+        const { listFileLocks: listFileLocks2 } = (init_file_locks(), __toCommonJS(exports_file_locks));
+        const locks = listFileLocks2(agent_id);
         return { content: [{ type: "text", text: JSON.stringify(locks, null, 2) }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -28445,49 +29225,576 @@ var init_task_resources = __esm(() => {
   init_task_commits();
 });
 
-// src/mcp/tools/task-rel-tools.ts
-function registerTaskRelTools(server, ctx) {
-  const { shouldRegisterTool, resolveId, formatError, formatTask } = ctx;
-  if (shouldRegisterTool("create_handoff")) {
-    server.tool("create_handoff", "Create a session handoff note for agent coordination.", {
-      agent_id: exports_external2.string().optional().describe("Agent creating the handoff"),
-      project_id: exports_external2.string().optional().describe("Project ID"),
-      summary: exports_external2.string().describe("What was accomplished this session"),
-      completed: exports_external2.array(exports_external2.string()).optional().describe("Items completed"),
-      in_progress: exports_external2.array(exports_external2.string()).optional().describe("Items still in progress"),
-      blockers: exports_external2.array(exports_external2.string()).optional().describe("Blocking issues"),
-      next_steps: exports_external2.array(exports_external2.string()).optional().describe("Recommended next actions")
-    }, async ({ agent_id, project_id, summary, completed, in_progress, blockers, next_steps }) => {
-      try {
-        const { createHandoff: createHandoff2 } = (()=>{throw new Error("Cannot require module "+"../db/handoffs.js");})();
-        const handoff = createHandoff2({
-          agent_id,
-          project_id: project_id ? resolveId(project_id, "projects") : undefined,
-          summary,
-          completed,
-          in_progress,
-          blockers,
-          next_steps
-        });
-        return { content: [{ type: "text", text: `Handoff created: ${handoff.id.slice(0, 8)} by ${handoff.agent_id || "unknown"}` }] };
-      } catch (e) {
-        return { content: [{ type: "text", text: formatError(e) }], isError: true };
+// src/db/kg.ts
+var exports_kg = {};
+__export(exports_kg, {
+  syncKgEdges: () => syncKgEdges,
+  removeKgEdges: () => removeKgEdges,
+  getRelated: () => getRelated,
+  getImpactAnalysis: () => getImpactAnalysis,
+  getCriticalPath: () => getCriticalPath,
+  findPath: () => findPath,
+  addKgEdge: () => addKgEdge
+});
+function rowToEdge(row) {
+  return {
+    ...row,
+    metadata: JSON.parse(row.metadata || "{}")
+  };
+}
+function syncKgEdges(db) {
+  const d = db || getDatabase();
+  let synced = 0;
+  const tx = d.transaction(() => {
+    const deps = d.query("SELECT task_id, depends_on FROM task_dependencies").all();
+    for (const dep of deps) {
+      synced += upsertEdge(d, dep.task_id, "task", dep.depends_on, "task", "depends_on");
+    }
+    const assignments = d.query("SELECT id, assigned_to FROM tasks WHERE assigned_to IS NOT NULL").all();
+    for (const a of assignments) {
+      synced += upsertEdge(d, a.id, "task", a.assigned_to, "agent", "assigned_to");
+    }
+    const agents = d.query("SELECT id, reports_to FROM agents WHERE reports_to IS NOT NULL").all();
+    for (const a of agents) {
+      synced += upsertEdge(d, a.id, "agent", a.reports_to, "agent", "reports_to");
+    }
+    const files = d.query("SELECT task_id, path FROM task_files WHERE status != 'removed'").all();
+    for (const f of files) {
+      synced += upsertEdge(d, f.task_id, "task", f.path, "file", "references_file");
+    }
+    const taskProjects = d.query("SELECT id, project_id FROM tasks WHERE project_id IS NOT NULL").all();
+    for (const tp of taskProjects) {
+      synced += upsertEdge(d, tp.id, "task", tp.project_id, "project", "in_project");
+    }
+    const taskPlans = d.query("SELECT id, plan_id FROM tasks WHERE plan_id IS NOT NULL").all();
+    for (const tp of taskPlans) {
+      synced += upsertEdge(d, tp.id, "task", tp.plan_id, "plan", "in_plan");
+    }
+    try {
+      const rels = d.query("SELECT source_task_id, target_task_id, relationship_type FROM task_relationships").all();
+      for (const r of rels) {
+        synced += upsertEdge(d, r.source_task_id, "task", r.target_task_id, "task", r.relationship_type);
       }
-    });
+    } catch {}
+  });
+  tx();
+  return { synced };
+}
+function upsertEdge(d, sourceId, sourceType, targetId, targetType, relationType, weight = 1) {
+  try {
+    d.run(`INSERT OR IGNORE INTO kg_edges (id, source_id, source_type, target_id, target_type, relation_type, weight, metadata, created_at)
+       VALUES (?, ?, ?, ?, ?, ?, ?, '{}', ?)`, [uuid(), sourceId, sourceType, targetId, targetType, relationType, weight, now()]);
+    return 1;
+  } catch {
+    return 0;
   }
-  if (shouldRegisterTool("get_latest_handoff")) {
-    server.tool("get_latest_handoff", "Get the most recent handoff for an agent or project.", {
-      agent_id: exports_external2.string().optional().describe("Filter by agent"),
-      project_id: exports_external2.string().optional().describe("Filter by project")
-    }, async ({ agent_id, project_id }) => {
-      try {
-        const { getLatestHandoff: getLatestHandoff2 } = (()=>{throw new Error("Cannot require module "+"../db/handoffs.js");})();
-        const handoff = getLatestHandoff2(agent_id, project_id ? resolveId(project_id, "projects") : undefined);
-        if (!handoff)
-          return { content: [{ type: "text", text: "No handoffs found." }] };
-        const lines = [
-          `${handoff.created_at.slice(0, 16)} ${handoff.agent_id || "unknown"}`,
-          handoff.summary
+}
+function getRelated(entityId, opts, db) {
+  const d = db || getDatabase();
+  const direction = opts?.direction || "both";
+  const conditions = [];
+  const params = [];
+  if (direction === "outgoing" || direction === "both") {
+    conditions.push("source_id = ?");
+    params.push(entityId);
+  }
+  if (direction === "incoming" || direction === "both") {
+    conditions.push("target_id = ?");
+    params.push(entityId);
+  }
+  let sql = `SELECT * FROM kg_edges WHERE (${conditions.join(" OR ")})`;
+  if (opts?.relation_type) {
+    sql += " AND relation_type = ?";
+    params.push(opts.relation_type);
+  }
+  if (opts?.entity_type) {
+    sql += " AND (source_type = ? OR target_type = ?)";
+    params.push(opts.entity_type, opts.entity_type);
+  }
+  sql += " ORDER BY weight DESC, created_at DESC";
+  if (opts?.limit) {
+    sql += " LIMIT ?";
+    params.push(opts.limit);
+  }
+  return d.query(sql).all(...params).map(rowToEdge);
+}
+function findPath(sourceId, targetId, opts, db) {
+  const d = db || getDatabase();
+  const maxDepth = opts?.max_depth || 5;
+  const visited = new Set;
+  const queue = [{ id: sourceId, path: [] }];
+  const results = [];
+  visited.add(sourceId);
+  while (queue.length > 0) {
+    const current = queue.shift();
+    if (current.path.length >= maxDepth)
+      continue;
+    let sql = "SELECT * FROM kg_edges WHERE source_id = ?";
+    const params = [current.id];
+    if (opts?.relation_types && opts.relation_types.length > 0) {
+      const placeholders = opts.relation_types.map(() => "?").join(",");
+      sql += ` AND relation_type IN (${placeholders})`;
+      params.push(...opts.relation_types);
+    }
+    const edges = d.query(sql).all(...params).map(rowToEdge);
+    for (const edge of edges) {
+      const nextId = edge.target_id;
+      const newPath = [...current.path, edge];
+      if (nextId === targetId) {
+        results.push(newPath);
+        if (results.length >= 3)
+          return results;
+        continue;
+      }
+      if (!visited.has(nextId)) {
+        visited.add(nextId);
+        queue.push({ id: nextId, path: newPath });
+      }
+    }
+  }
+  return results;
+}
+function getImpactAnalysis(entityId, opts, db) {
+  const d = db || getDatabase();
+  const maxDepth = opts?.max_depth || 3;
+  const results = [];
+  const visited = new Set;
+  visited.add(entityId);
+  const queue = [{ id: entityId, depth: 0 }];
+  while (queue.length > 0) {
+    const current = queue.shift();
+    if (current.depth >= maxDepth)
+      continue;
+    let sql = "SELECT * FROM kg_edges WHERE source_id = ?";
+    const params = [current.id];
+    if (opts?.relation_types && opts.relation_types.length > 0) {
+      const placeholders = opts.relation_types.map(() => "?").join(",");
+      sql += ` AND relation_type IN (${placeholders})`;
+      params.push(...opts.relation_types);
+    }
+    const edges = d.query(sql).all(...params).map(rowToEdge);
+    for (const edge of edges) {
+      if (!visited.has(edge.target_id)) {
+        visited.add(edge.target_id);
+        results.push({
+          entity_id: edge.target_id,
+          entity_type: edge.target_type,
+          depth: current.depth + 1,
+          relation: edge.relation_type
+        });
+        queue.push({ id: edge.target_id, depth: current.depth + 1 });
+      }
+    }
+  }
+  return results;
+}
+function getCriticalPath(opts, db) {
+  const d = db || getDatabase();
+  let sql = `SELECT source_id, target_id FROM kg_edges WHERE relation_type = 'depends_on'`;
+  const params = [];
+  if (opts?.project_id) {
+    sql += ` AND source_id IN (SELECT id FROM tasks WHERE project_id = ?)`;
+    params.push(opts.project_id);
+  }
+  const edges = d.query(sql).all(...params);
+  const blocks = new Map;
+  for (const e of edges) {
+    if (!blocks.has(e.target_id))
+      blocks.set(e.target_id, new Set);
+    blocks.get(e.target_id).add(e.source_id);
+  }
+  const results = [];
+  for (const [taskId] of blocks) {
+    const visited = new Set;
+    const q = [taskId];
+    let maxDepth = 0;
+    let depth = 0;
+    let levelSize = q.length;
+    while (q.length > 0) {
+      const node = q.shift();
+      levelSize--;
+      const downstream = blocks.get(node);
+      if (downstream) {
+        for (const d2 of downstream) {
+          if (!visited.has(d2)) {
+            visited.add(d2);
+            q.push(d2);
+          }
+        }
+      }
+      if (levelSize === 0) {
+        depth++;
+        maxDepth = Math.max(maxDepth, depth);
+        levelSize = q.length;
+      }
+    }
+    if (visited.size > 0) {
+      results.push({ task_id: taskId, blocking_count: visited.size, depth: maxDepth });
+    }
+  }
+  results.sort((a, b) => b.blocking_count - a.blocking_count);
+  return results.slice(0, opts?.limit || 20);
+}
+function addKgEdge(sourceId, sourceType, targetId, targetType, relationType, weight = 1, metadata, db) {
+  const d = db || getDatabase();
+  const id = uuid();
+  const timestamp = now();
+  d.run(`INSERT OR IGNORE INTO kg_edges (id, source_id, source_type, target_id, target_type, relation_type, weight, metadata, created_at)
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`, [id, sourceId, sourceType, targetId, targetType, relationType, weight, JSON.stringify(metadata || {}), timestamp]);
+  return { id, source_id: sourceId, source_type: sourceType, target_id: targetId, target_type: targetType, relation_type: relationType, weight, metadata: metadata || {}, created_at: timestamp };
+}
+function removeKgEdges(sourceId, targetId, relationType, db) {
+  const d = db || getDatabase();
+  if (relationType) {
+    return d.run("DELETE FROM kg_edges WHERE source_id = ? AND target_id = ? AND relation_type = ?", [sourceId, targetId, relationType]).changes;
+  }
+  return d.run("DELETE FROM kg_edges WHERE source_id = ? AND target_id = ?", [sourceId, targetId]).changes;
+}
+var init_kg = __esm(() => {
+  init_database();
+});
+
+// src/db/project-agent-roles.ts
+var exports_project_agent_roles = {};
+__export(exports_project_agent_roles, {
+  setProjectAgentRole: () => setProjectAgentRole,
+  removeProjectAgentRole: () => removeProjectAgentRole,
+  listProjectAgentRoles: () => listProjectAgentRoles,
+  getProjectOrgChart: () => getProjectOrgChart,
+  getAgentProjectRoles: () => getAgentProjectRoles
+});
+function rowToRole(row) {
+  return { ...row, is_lead: row.is_lead === 1 };
+}
+function setProjectAgentRole(projectId, agentId, role, isLead = false, db) {
+  const d = db || getDatabase();
+  const existing = d.query("SELECT * FROM project_agent_roles WHERE project_id = ? AND agent_id = ? AND role = ?").get(projectId, agentId, role);
+  if (existing) {
+    d.run("UPDATE project_agent_roles SET is_lead = ? WHERE id = ?", [isLead ? 1 : 0, existing.id]);
+    return rowToRole(d.query("SELECT * FROM project_agent_roles WHERE id = ?").get(existing.id));
+  }
+  const id = uuid();
+  d.run("INSERT INTO project_agent_roles (id, project_id, agent_id, role, is_lead, created_at) VALUES (?, ?, ?, ?, ?, ?)", [id, projectId, agentId, role, isLead ? 1 : 0, now()]);
+  return rowToRole(d.query("SELECT * FROM project_agent_roles WHERE id = ?").get(id));
+}
+function removeProjectAgentRole(projectId, agentId, role, db) {
+  const d = db || getDatabase();
+  if (role) {
+    return d.run("DELETE FROM project_agent_roles WHERE project_id = ? AND agent_id = ? AND role = ?", [projectId, agentId, role]).changes;
+  }
+  return d.run("DELETE FROM project_agent_roles WHERE project_id = ? AND agent_id = ?", [projectId, agentId]).changes;
+}
+function listProjectAgentRoles(projectId, db) {
+  const d = db || getDatabase();
+  return d.query("SELECT * FROM project_agent_roles WHERE project_id = ? ORDER BY role, created_at").all(projectId).map(rowToRole);
+}
+function getAgentProjectRoles(agentId, db) {
+  const d = db || getDatabase();
+  return d.query("SELECT * FROM project_agent_roles WHERE agent_id = ? ORDER BY project_id, role").all(agentId).map(rowToRole);
+}
+function getProjectOrgChart(projectId, opts, db) {
+  const d = db || getDatabase();
+  const globalTree = getOrgChart(d);
+  const projectRoles = listProjectAgentRoles(projectId, d);
+  const rolesByAgent = new Map;
+  for (const pr of projectRoles) {
+    if (!rolesByAgent.has(pr.agent_id))
+      rolesByAgent.set(pr.agent_id, { roles: [], isLead: false });
+    const entry = rolesByAgent.get(pr.agent_id);
+    entry.roles.push(pr.role);
+    if (pr.is_lead)
+      entry.isLead = true;
+  }
+  function augmentTree(nodes) {
+    return nodes.map((n) => {
+      const override = rolesByAgent.get(n.agent.id);
+      return {
+        ...n,
+        reports: augmentTree(n.reports),
+        project_roles: override?.roles ?? [],
+        is_project_lead: override?.isLead ?? false
+      };
+    }).filter((n) => {
+      if (!opts?.filter_to_project)
+        return true;
+      const hasRole = n.project_roles.length > 0;
+      const hasDescendant = n.reports.length > 0;
+      return hasRole || hasDescendant;
+    });
+  }
+  return augmentTree(globalTree);
+}
+var init_project_agent_roles = __esm(() => {
+  init_database();
+  init_agents();
+});
+
+// src/db/patrol.ts
+var exports_patrol = {};
+__export(exports_patrol, {
+  patrolTasks: () => patrolTasks,
+  getReviewQueue: () => getReviewQueue
+});
+function rowToTask3(row) {
+  return {
+    ...row,
+    status: row.status,
+    priority: row.priority,
+    tags: JSON.parse(row.tags || "[]"),
+    metadata: JSON.parse(row.metadata || "{}"),
+    requires_approval: Boolean(row.requires_approval)
+  };
+}
+function patrolTasks(opts, db) {
+  const d = db || getDatabase();
+  const stuckMinutes = opts?.stuck_minutes || 60;
+  const confidenceThreshold = opts?.confidence_threshold || 0.5;
+  const issues = [];
+  let projectFilter = "";
+  const projectParams = [];
+  if (opts?.project_id) {
+    projectFilter = " AND project_id = ?";
+    projectParams.push(opts.project_id);
+  }
+  const stuckCutoff = new Date(Date.now() - stuckMinutes * 60 * 1000).toISOString();
+  const stuckRows = d.query(`SELECT * FROM tasks WHERE status = 'in_progress' AND updated_at < ?${projectFilter} ORDER BY updated_at ASC`).all(stuckCutoff, ...projectParams);
+  for (const row of stuckRows) {
+    const task = rowToTask3(row);
+    const minutesStuck = Math.round((Date.now() - new Date(task.updated_at).getTime()) / 60000);
+    issues.push({
+      type: "stuck",
+      task_id: task.id,
+      task_title: task.title,
+      severity: minutesStuck > 480 ? "critical" : minutesStuck > 120 ? "high" : "medium",
+      detail: `In progress for ${minutesStuck} minutes without update`
+    });
+  }
+  const lowConfRows = d.query(`SELECT * FROM tasks WHERE status = 'completed' AND confidence IS NOT NULL AND confidence < ?${projectFilter} ORDER BY confidence ASC`).all(confidenceThreshold, ...projectParams);
+  for (const row of lowConfRows) {
+    const task = rowToTask3(row);
+    issues.push({
+      type: "low_confidence",
+      task_id: task.id,
+      task_title: task.title,
+      severity: (task.confidence ?? 0) < 0.3 ? "high" : "medium",
+      detail: `Completed with confidence ${task.confidence} (threshold: ${confidenceThreshold})`
+    });
+  }
+  const orphanedRows = d.query(`SELECT * FROM tasks WHERE status = 'pending' AND project_id IS NULL AND agent_id IS NULL AND assigned_to IS NULL ORDER BY created_at ASC`).all();
+  for (const row of orphanedRows) {
+    const task = rowToTask3(row);
+    issues.push({
+      type: "orphaned",
+      task_id: task.id,
+      task_title: task.title,
+      severity: "low",
+      detail: "Pending task with no project, no agent, and no assignee"
+    });
+  }
+  const needsReviewRows = d.query(`SELECT * FROM tasks WHERE status = 'completed' AND requires_approval = 1 AND approved_by IS NULL${projectFilter} ORDER BY completed_at DESC`).all(...projectParams);
+  for (const row of needsReviewRows) {
+    const task = rowToTask3(row);
+    issues.push({
+      type: "needs_review",
+      task_id: task.id,
+      task_title: task.title,
+      severity: "medium",
+      detail: "Completed but requires approval \u2014 not yet reviewed"
+    });
+  }
+  const pendingWithDeps = d.query(`SELECT t.* FROM tasks t
+     WHERE t.status = 'pending'${projectFilter}
+       AND t.id IN (SELECT task_id FROM task_dependencies)`).all(...projectParams);
+  for (const row of pendingWithDeps) {
+    const deps = d.query(`SELECT d.depends_on, t.status FROM task_dependencies d
+       JOIN tasks t ON t.id = d.depends_on
+       WHERE d.task_id = ?`).all(row.id);
+    if (deps.length > 0 && deps.every((dep) => dep.status === "failed" || dep.status === "cancelled")) {
+      const task = rowToTask3(row);
+      issues.push({
+        type: "zombie_blocked",
+        task_id: task.id,
+        task_title: task.title,
+        severity: "high",
+        detail: `Blocked by ${deps.length} task(s) that are all failed/cancelled \u2014 will never unblock`
+      });
+    }
+  }
+  const severityOrder = { critical: 0, high: 1, medium: 2, low: 3 };
+  issues.sort((a, b) => severityOrder[a.severity] - severityOrder[b.severity]);
+  return {
+    issues,
+    total_issues: issues.length,
+    scanned_at: new Date().toISOString()
+  };
+}
+function getReviewQueue(opts, db) {
+  const d = db || getDatabase();
+  let sql = `SELECT * FROM tasks WHERE status = 'completed' AND (
+    (requires_approval = 1 AND approved_by IS NULL)
+    OR (confidence IS NOT NULL AND confidence < 0.5)
+  )`;
+  const params = [];
+  if (opts?.project_id) {
+    sql += " AND project_id = ?";
+    params.push(opts.project_id);
+  }
+  sql += " ORDER BY CASE WHEN requires_approval = 1 AND approved_by IS NULL THEN 0 ELSE 1 END, confidence ASC";
+  if (opts?.limit) {
+    sql += " LIMIT ?";
+    params.push(opts.limit);
+  }
+  return d.query(sql).all(...params).map(rowToTask3);
+}
+var init_patrol = __esm(() => {
+  init_database();
+});
+
+// src/db/agent-metrics.ts
+var exports_agent_metrics = {};
+__export(exports_agent_metrics, {
+  scoreTask: () => scoreTask,
+  getLeaderboard: () => getLeaderboard,
+  getAgentMetrics: () => getAgentMetrics
+});
+function getAgentMetrics(agentId, opts, db) {
+  const d = db || getDatabase();
+  const agent = d.query("SELECT id, name FROM agents WHERE id = ? OR LOWER(name) = LOWER(?)").get(agentId, agentId);
+  if (!agent)
+    return null;
+  let projectFilter = "";
+  const params = [agent.id, agent.id];
+  if (opts?.project_id) {
+    projectFilter = " AND project_id = ?";
+    params.push(opts.project_id);
+  }
+  const completed = d.query(`SELECT COUNT(*) as count FROM tasks WHERE (agent_id = ? OR assigned_to = ?) AND status = 'completed'${projectFilter}`).get(...params).count;
+  const failed = d.query(`SELECT COUNT(*) as count FROM tasks WHERE (agent_id = ? OR assigned_to = ?) AND status = 'failed'${projectFilter}`).get(...params).count;
+  const inProgress = d.query(`SELECT COUNT(*) as count FROM tasks WHERE (agent_id = ? OR assigned_to = ?) AND status = 'in_progress'${projectFilter}`).get(...params).count;
+  const total = completed + failed;
+  const completionRate = total > 0 ? completed / total : 0;
+  const avgTime = d.query(`SELECT AVG(
+       (julianday(completed_at) - julianday(created_at)) * 24 * 60
+     ) as avg_minutes
+     FROM tasks
+     WHERE (agent_id = ? OR assigned_to = ?) AND status = 'completed' AND completed_at IS NOT NULL${projectFilter}`).get(...params);
+  const avgConf = d.query(`SELECT AVG(confidence) as avg_confidence
+     FROM tasks
+     WHERE (agent_id = ? OR assigned_to = ?) AND status = 'completed' AND confidence IS NOT NULL${projectFilter}`).get(...params);
+  const reviewTasks = d.query(`SELECT metadata FROM tasks
+     WHERE (agent_id = ? OR assigned_to = ?) AND status = 'completed'${projectFilter}
+       AND metadata LIKE '%_review_score%'`).all(...params);
+  let reviewScoreAvg = null;
+  if (reviewTasks.length > 0) {
+    let total2 = 0;
+    let count = 0;
+    for (const row of reviewTasks) {
+      try {
+        const meta = JSON.parse(row.metadata);
+        if (typeof meta._review_score === "number") {
+          total2 += meta._review_score;
+          count++;
+        }
+      } catch {}
+    }
+    if (count > 0)
+      reviewScoreAvg = total2 / count;
+  }
+  const speedScore = avgTime?.avg_minutes != null ? Math.max(0, 1 - avgTime.avg_minutes / (60 * 24)) : 0.5;
+  const confidenceScore = avgConf?.avg_confidence ?? 0.5;
+  const volumeScore = Math.min(1, completed / 50);
+  const compositeScore = completionRate * 0.3 + speedScore * 0.2 + confidenceScore * 0.3 + volumeScore * 0.2;
+  return {
+    agent_id: agent.id,
+    agent_name: agent.name,
+    tasks_completed: completed,
+    tasks_failed: failed,
+    tasks_in_progress: inProgress,
+    completion_rate: Math.round(completionRate * 1000) / 1000,
+    avg_completion_minutes: avgTime?.avg_minutes != null ? Math.round(avgTime.avg_minutes * 10) / 10 : null,
+    avg_confidence: avgConf?.avg_confidence != null ? Math.round(avgConf.avg_confidence * 1000) / 1000 : null,
+    review_score_avg: reviewScoreAvg != null ? Math.round(reviewScoreAvg * 1000) / 1000 : null,
+    composite_score: Math.round(compositeScore * 1000) / 1000
+  };
+}
+function getLeaderboard(opts, db) {
+  const d = db || getDatabase();
+  const agents = d.query("SELECT id FROM agents ORDER BY name").all();
+  const entries = [];
+  for (const agent of agents) {
+    const metrics = getAgentMetrics(agent.id, { project_id: opts?.project_id }, d);
+    if (metrics && (metrics.tasks_completed > 0 || metrics.tasks_failed > 0 || metrics.tasks_in_progress > 0)) {
+      entries.push(metrics);
+    }
+  }
+  entries.sort((a, b) => b.composite_score - a.composite_score);
+  const limit = opts?.limit || 20;
+  return entries.slice(0, limit).map((entry, idx) => ({
+    ...entry,
+    rank: idx + 1
+  }));
+}
+function scoreTask(taskId, score, reviewerId, db) {
+  const d = db || getDatabase();
+  if (score < 0 || score > 1)
+    throw new Error("Score must be between 0 and 1");
+  const task = d.query("SELECT metadata FROM tasks WHERE id = ?").get(taskId);
+  if (!task)
+    throw new Error(`Task not found: ${taskId}`);
+  const metadata = JSON.parse(task.metadata || "{}");
+  metadata._review_score = score;
+  if (reviewerId)
+    metadata._reviewed_by = reviewerId;
+  metadata._reviewed_at = now();
+  d.run("UPDATE tasks SET metadata = ?, updated_at = ? WHERE id = ?", [JSON.stringify(metadata), now(), taskId]);
+}
+var init_agent_metrics = __esm(() => {
+  init_database();
+});
+
+// src/mcp/tools/task-rel-tools.ts
+function registerTaskRelTools(server, ctx) {
+  const { shouldRegisterTool, resolveId, formatError, formatTask } = ctx;
+  if (shouldRegisterTool("create_handoff")) {
+    server.tool("create_handoff", "Create a session handoff note for agent coordination.", {
+      agent_id: exports_external2.string().optional().describe("Agent creating the handoff"),
+      project_id: exports_external2.string().optional().describe("Project ID"),
+      summary: exports_external2.string().describe("What was accomplished this session"),
+      completed: exports_external2.array(exports_external2.string()).optional().describe("Items completed"),
+      in_progress: exports_external2.array(exports_external2.string()).optional().describe("Items still in progress"),
+      blockers: exports_external2.array(exports_external2.string()).optional().describe("Blocking issues"),
+      next_steps: exports_external2.array(exports_external2.string()).optional().describe("Recommended next actions")
+    }, async ({ agent_id, project_id, summary, completed, in_progress, blockers, next_steps }) => {
+      try {
+        const { createHandoff: createHandoff2 } = (init_handoffs(), __toCommonJS(exports_handoffs));
+        const handoff = createHandoff2({
+          agent_id,
+          project_id: project_id ? resolveId(project_id, "projects") : undefined,
+          summary,
+          completed,
+          in_progress,
+          blockers,
+          next_steps
+        });
+        return { content: [{ type: "text", text: `Handoff created: ${handoff.id.slice(0, 8)} by ${handoff.agent_id || "unknown"}` }] };
+      } catch (e) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
+      }
+    });
+  }
+  if (shouldRegisterTool("get_latest_handoff")) {
+    server.tool("get_latest_handoff", "Get the most recent handoff for an agent or project.", {
+      agent_id: exports_external2.string().optional().describe("Filter by agent"),
+      project_id: exports_external2.string().optional().describe("Filter by project")
+    }, async ({ agent_id, project_id }) => {
+      try {
+        const { getLatestHandoff: getLatestHandoff2 } = (init_handoffs(), __toCommonJS(exports_handoffs));
+        const handoff = getLatestHandoff2(agent_id, project_id ? resolveId(project_id, "projects") : undefined);
+        if (!handoff)
+          return { content: [{ type: "text", text: "No handoffs found." }] };
+        const lines = [
+          `${handoff.created_at.slice(0, 16)} ${handoff.agent_id || "unknown"}`,
+          handoff.summary
         ];
         if (handoff.completed?.length)
           lines.push(`Done: ${handoff.completed.join(", ")}`);
@@ -28512,7 +29819,7 @@ function registerTaskRelTools(server, ctx) {
       created_by: exports_external2.string().optional().describe("Agent ID who created this relationship")
     }, async ({ source_task_id, target_task_id, relationship_type, created_by }) => {
       try {
-        const { addTaskRelationship: addTaskRelationship2 } = (()=>{throw new Error("Cannot require module "+"../db/task-relationships.js");})();
+        const { addTaskRelationship: addTaskRelationship2 } = (init_task_relationships(), __toCommonJS(exports_task_relationships));
         const rel = addTaskRelationship2({
           source_task_id: resolveId(source_task_id),
           target_task_id: resolveId(target_task_id),
@@ -28533,7 +29840,7 @@ function registerTaskRelTools(server, ctx) {
       relationship_type: exports_external2.enum(["related_to", "conflicts_with", "similar_to", "duplicates", "supersedes", "modifies_same_file"]).optional()
     }, async ({ id, source_task_id, target_task_id, relationship_type }) => {
       try {
-        const { removeTaskRelationship: removeTaskRelationship2, removeTaskRelationshipByPair: removeTaskRelationshipByPair2 } = (()=>{throw new Error("Cannot require module "+"../db/task-relationships.js");})();
+        const { removeTaskRelationship: removeTaskRelationship2, removeTaskRelationshipByPair: removeTaskRelationshipByPair2 } = (init_task_relationships(), __toCommonJS(exports_task_relationships));
         let removed = false;
         if (id) {
           removed = removeTaskRelationship2(id);
@@ -28554,7 +29861,7 @@ function registerTaskRelTools(server, ctx) {
       relationship_type: exports_external2.enum(["related_to", "conflicts_with", "similar_to", "duplicates", "supersedes", "modifies_same_file"]).optional()
     }, async ({ task_id, relationship_type }) => {
       try {
-        const { getTaskRelationships: getTaskRelationships2 } = (()=>{throw new Error("Cannot require module "+"../db/task-relationships.js");})();
+        const { getTaskRelationships: getTaskRelationships2 } = (init_task_relationships(), __toCommonJS(exports_task_relationships));
         const rels = getTaskRelationships2(resolveId(task_id), relationship_type);
         if (rels.length === 0)
           return { content: [{ type: "text", text: "No relationships found." }] };
@@ -28571,7 +29878,7 @@ function registerTaskRelTools(server, ctx) {
       task_id: exports_external2.string().describe("Task ID to detect file relationships for")
     }, async ({ task_id }) => {
       try {
-        const { autoDetectFileRelationships: autoDetectFileRelationships2 } = (()=>{throw new Error("Cannot require module "+"../db/task-relationships.js");})();
+        const { autoDetectFileRelationships: autoDetectFileRelationships2 } = (init_task_relationships(), __toCommonJS(exports_task_relationships));
         const created = autoDetectFileRelationships2(resolveId(task_id));
         return { content: [{ type: "text", text: created.length > 0 ? `Created ${created.length} file relationship(s).` : "No file overlaps detected." }] };
       } catch (e) {
@@ -28582,8 +29889,8 @@ function registerTaskRelTools(server, ctx) {
   if (shouldRegisterTool("sync_kg")) {
     server.tool("sync_kg", "Sync all existing relationships into the knowledge graph edges table. Idempotent.", {}, async () => {
       try {
-        const { syncKgEdges } = (()=>{throw new Error("Cannot require module "+"../db/kg.js");})();
-        const result = syncKgEdges();
+        const { syncKgEdges: syncKgEdges2 } = (init_kg(), __toCommonJS(exports_kg));
+        const result = syncKgEdges2();
         return { content: [{ type: "text", text: `Knowledge graph synced: ${result.synced} edge(s) processed.` }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -28599,8 +29906,8 @@ function registerTaskRelTools(server, ctx) {
       limit: exports_external2.number().optional().describe("Max results")
     }, async ({ entity_id, relation_type, entity_type, direction, limit }) => {
       try {
-        const { getRelated } = (()=>{throw new Error("Cannot require module "+"../db/kg.js");})();
-        const edges = getRelated(entity_id, { relation_type, entity_type, direction, limit });
+        const { getRelated: getRelated2 } = (init_kg(), __toCommonJS(exports_kg));
+        const edges = getRelated2(entity_id, { relation_type, entity_type, direction, limit });
         if (edges.length === 0)
           return { content: [{ type: "text", text: "No related entities found." }] };
         const lines = edges.map((e) => `${e.source_id.slice(0, 12)}(${e.source_type}) --[${e.relation_type}]--> ${e.target_id.slice(0, 12)}(${e.target_type})`);
@@ -28619,8 +29926,8 @@ function registerTaskRelTools(server, ctx) {
       relation_types: exports_external2.array(exports_external2.string()).optional().describe("Filter by relation types")
     }, async ({ source_id, target_id, max_depth, relation_types }) => {
       try {
-        const { findPath } = (()=>{throw new Error("Cannot require module "+"../db/kg.js");})();
-        const paths = findPath(source_id, target_id, { max_depth, relation_types });
+        const { findPath: findPath2 } = (init_kg(), __toCommonJS(exports_kg));
+        const paths = findPath2(source_id, target_id, { max_depth, relation_types });
         if (paths.length === 0)
           return { content: [{ type: "text", text: "No path found." }] };
         const lines = paths.map((path, i) => {
@@ -28644,8 +29951,8 @@ function registerTaskRelTools(server, ctx) {
       relation_types: exports_external2.array(exports_external2.string()).optional().describe("Filter by relation types")
     }, async ({ entity_id, max_depth, relation_types }) => {
       try {
-        const { getImpactAnalysis } = (()=>{throw new Error("Cannot require module "+"../db/kg.js");})();
-        const impact = getImpactAnalysis(entity_id, { max_depth, relation_types });
+        const { getImpactAnalysis: getImpactAnalysis2 } = (init_kg(), __toCommonJS(exports_kg));
+        const impact = getImpactAnalysis2(entity_id, { max_depth, relation_types });
         if (impact.length === 0)
           return { content: [{ type: "text", text: "No downstream impact detected." }] };
         const byDepth = new Map;
@@ -28675,8 +29982,8 @@ Depth ${depth}:`);
       limit: exports_external2.number().optional().describe("Max results (default: 20)")
     }, async ({ project_id, limit }) => {
       try {
-        const { getCriticalPath } = (()=>{throw new Error("Cannot require module "+"../db/kg.js");})();
-        const result = getCriticalPath({ project_id: project_id ? resolveId(project_id, "projects") : undefined, limit });
+        const { getCriticalPath: getCriticalPath2 } = (init_kg(), __toCommonJS(exports_kg));
+        const result = getCriticalPath2({ project_id: project_id ? resolveId(project_id, "projects") : undefined, limit });
         if (result.length === 0)
           return { content: [{ type: "text", text: "No critical path data. Run sync_kg first to populate the knowledge graph." }] };
         const lines = result.map((r, i) => `${i + 1}. ${r.task_id.slice(0, 8)} blocks ${r.blocking_count} task(s), max depth ${r.depth}`);
@@ -28696,13 +30003,13 @@ ${lines.join(`
       is_lead: exports_external2.coerce.boolean().optional().describe("Whether this agent is the project lead for this role")
     }, async ({ project_id, agent_name, role, is_lead }) => {
       try {
-        const { setProjectAgentRole } = (()=>{throw new Error("Cannot require module "+"../db/project-agent-roles.js");})();
-        const { getAgentByName: getAgentByName2 } = (()=>{throw new Error("Cannot require module "+"../db/agents.js");})();
+        const { setProjectAgentRole: setProjectAgentRole2 } = (init_project_agent_roles(), __toCommonJS(exports_project_agent_roles));
+        const { getAgentByName: getAgentByName2 } = (init_agents(), __toCommonJS(exports_agents));
         const agent = getAgentByName2(agent_name);
         if (!agent)
           return { content: [{ type: "text", text: `Agent not found: ${agent_name}` }], isError: true };
         const pid = resolveId(project_id, "projects");
-        const result = setProjectAgentRole(pid, agent.id, role, is_lead ?? false);
+        const result = setProjectAgentRole2(pid, agent.id, role, is_lead ?? false);
         return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -28732,9 +30039,9 @@ ${lines.join(`
           }).join(`
 `);
         };
-        const { getProjectOrgChart } = (()=>{throw new Error("Cannot require module "+"../db/project-agent-roles.js");})();
+        const { getProjectOrgChart: getProjectOrgChart2 } = (init_project_agent_roles(), __toCommonJS(exports_project_agent_roles));
         const pid = resolveId(project_id, "projects");
-        const tree = getProjectOrgChart(pid, { filter_to_project });
+        const tree = getProjectOrgChart2(pid, { filter_to_project });
         if (format === "json") {
           return { content: [{ type: "text", text: JSON.stringify(tree, null, 2) }] };
         }
@@ -28752,9 +30059,9 @@ ${lines.join(`
       project_id: exports_external2.string().describe("Project ID")
     }, async ({ project_id }) => {
       try {
-        const { listProjectAgentRoles } = (()=>{throw new Error("Cannot require module "+"../db/project-agent-roles.js");})();
+        const { listProjectAgentRoles: listProjectAgentRoles2 } = (init_project_agent_roles(), __toCommonJS(exports_project_agent_roles));
         const pid = resolveId(project_id, "projects");
-        const roles = listProjectAgentRoles(pid);
+        const roles = listProjectAgentRoles2(pid);
         return { content: [{ type: "text", text: JSON.stringify(roles, null, 2) }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -28768,7 +30075,7 @@ ${lines.join(`
       limit: exports_external2.number().optional().describe("Max results")
     }, async ({ capabilities, min_score, limit }) => {
       try {
-        const { getCapableAgents: getCapableAgents2 } = (()=>{throw new Error("Cannot require module "+"../db/agents.js");})();
+        const { getCapableAgents: getCapableAgents2 } = (init_agents(), __toCommonJS(exports_agents));
         const results = getCapableAgents2(capabilities, { min_score, limit });
         if (results.length === 0)
           return { content: [{ type: "text", text: "No agents match the given capabilities." }] };
@@ -28787,8 +30094,8 @@ ${lines.join(`
       project_id: exports_external2.string().optional().describe("Filter by project")
     }, async ({ stuck_minutes, confidence_threshold, project_id }) => {
       try {
-        const { patrolTasks } = (()=>{throw new Error("Cannot require module "+"../db/patrol.js");})();
-        const result = patrolTasks({
+        const { patrolTasks: patrolTasks2 } = (init_patrol(), __toCommonJS(exports_patrol));
+        const result = patrolTasks2({
           stuck_minutes,
           confidence_threshold,
           project_id: project_id ? resolveId(project_id, "projects") : undefined
@@ -28814,8 +30121,8 @@ ${lines.join(`
       limit: exports_external2.number().optional().describe("Max results (default: all)")
     }, async ({ project_id, limit }) => {
       try {
-        const { getReviewQueue } = (()=>{throw new Error("Cannot require module "+"../db/patrol.js");})();
-        const tasks = getReviewQueue({
+        const { getReviewQueue: getReviewQueue2 } = (init_patrol(), __toCommonJS(exports_patrol));
+        const tasks = getReviewQueue2({
           project_id: project_id ? resolveId(project_id, "projects") : undefined,
           limit
         });
@@ -28841,8 +30148,8 @@ ${lines.join(`
       reviewer_id: exports_external2.string().optional().describe("Agent ID of reviewer")
     }, async ({ task_id, score, reviewer_id }) => {
       try {
-        const { scoreTask } = (()=>{throw new Error("Cannot require module "+"../db/agent-metrics.js");})();
-        scoreTask(resolveId(task_id), score, reviewer_id);
+        const { scoreTask: scoreTask2 } = (init_agent_metrics(), __toCommonJS(exports_agent_metrics));
+        scoreTask2(resolveId(task_id), score, reviewer_id);
         return { content: [{ type: "text", text: `Task ${task_id.slice(0, 8)} scored: ${score}` }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -28859,7 +30166,7 @@ ${lines.join(`
       notes: exports_external2.string().optional().describe("Notes about what was done")
     }, async ({ task_id, minutes, agent_id, started_at, ended_at, notes }) => {
       try {
-        const { logTime: logTime2 } = (()=>{throw new Error("Cannot require module "+"../db/tasks.js");})();
+        const { logTime: logTime2 } = (init_tasks(), __toCommonJS(exports_tasks));
         logTime2({ task_id: resolveId(task_id), minutes, agent_id, started_at, ended_at, notes });
         return { content: [{ type: "text", text: `Logged ${minutes} min on task ${task_id.slice(0, 8)}` }] };
       } catch (e) {
@@ -28874,7 +30181,7 @@ ${lines.join(`
       since: exports_external2.string().optional().describe("ISO date \u2014 only tasks completed after this date")
     }, async ({ project_id, agent_id, since }) => {
       try {
-        const { getTimeReport: getTimeReport2 } = (()=>{throw new Error("Cannot require module "+"../db/tasks.js");})();
+        const { getTimeReport: getTimeReport2 } = (init_tasks(), __toCommonJS(exports_tasks));
         const report = getTimeReport2({ project_id: project_id ? resolveId(project_id, "projects") : undefined, agent_id, since });
         if (report.length === 0)
           return { content: [{ type: "text", text: "No completed tasks found." }] };
@@ -28898,7 +30205,7 @@ ${lines.join(`
       agent_id: exports_external2.string().optional().describe("Agent subscribing (defaults to context agent)")
     }, async ({ task_id, agent_id }) => {
       try {
-        const { watchTask: watchTask2 } = (()=>{throw new Error("Cannot require module "+"../db/tasks.js");})();
+        const { watchTask: watchTask2 } = (init_tasks(), __toCommonJS(exports_tasks));
         watchTask2(resolveId(task_id), agent_id || "");
         return { content: [{ type: "text", text: `Now watching task ${task_id.slice(0, 8)}` }] };
       } catch (e) {
@@ -28912,7 +30219,7 @@ ${lines.join(`
       agent_id: exports_external2.string().optional().describe("Agent unsubscribing (defaults to context agent)")
     }, async ({ task_id, agent_id }) => {
       try {
-        const { unwatchTask: unwatchTask2 } = (()=>{throw new Error("Cannot require module "+"../db/tasks.js");})();
+        const { unwatchTask: unwatchTask2 } = (init_tasks(), __toCommonJS(exports_tasks));
         unwatchTask2(resolveId(task_id), agent_id || "");
         return { content: [{ type: "text", text: `Stopped watching task ${task_id.slice(0, 8)}` }] };
       } catch (e) {
@@ -28925,7 +30232,7 @@ ${lines.join(`
       task_id: exports_external2.string().describe("Task ID")
     }, async ({ task_id }) => {
       try {
-        const { getTaskWatchers: getTaskWatchers2 } = (()=>{throw new Error("Cannot require module "+"../db/tasks.js");})();
+        const { getTaskWatchers: getTaskWatchers2 } = (init_tasks(), __toCommonJS(exports_tasks));
         const watchers = getTaskWatchers2(resolveId(task_id));
         if (watchers.length === 0)
           return { content: [{ type: "text", text: "No watchers." }] };
@@ -28944,15 +30251,15 @@ ${lines.join(`
       agent_id: exports_external2.string().optional().describe("Filter by assignee")
     }, async ({ project_id, plan_id, task_list_id, since, agent_id }) => {
       try {
-        const { listTasks: listTasks3 } = (()=>{throw new Error("Cannot require module "+"../db/tasks.js");})();
-        const { patrolTasks } = (()=>{throw new Error("Cannot require module "+"../db/patrol.js");})();
+        const { listTasks: listTasks3 } = (init_tasks(), __toCommonJS(exports_tasks));
+        const { patrolTasks: patrolTasks2 } = (init_patrol(), __toCommonJS(exports_patrol));
         const completed = listTasks3({ status: "completed", project_id, plan_id, task_list_id, assigned_to: agent_id, limit: 500 }, undefined);
         const filtered = since ? completed.filter((t) => t.completed_at && t.completed_at >= since) : completed;
         const total = filtered.length;
         const lowConf = filtered.filter((t) => t.confidence != null && t.confidence < 0.7).length;
         const withEstimate = filtered.filter((t) => t.estimated_minutes != null && t.actual_minutes != null);
         const avgDiff = withEstimate.length > 0 ? withEstimate.reduce((acc, t) => acc + (t.actual_minutes - t.estimated_minutes), 0) / withEstimate.length : 0;
-        const patrolResult = patrolTasks({ project_id: project_id ? resolveId(project_id, "projects") : undefined });
+        const patrolResult = patrolTasks2({ project_id: project_id ? resolveId(project_id, "projects") : undefined });
         const stuck = patrolResult.issues.filter((i) => i.type === "stuck").length;
         const lines = [
           `Retro (${total} completed tasks${since ? ` since ${since}` : ""})`,
@@ -28973,7 +30280,7 @@ ${lines.join(`
       limit: exports_external2.number().optional().describe("Max results (default: 20)")
     }, async ({ project_id, limit }) => {
       try {
-        const { listTasks: listTasks3 } = (()=>{throw new Error("Cannot require module "+"../db/tasks.js");})();
+        const { listTasks: listTasks3 } = (init_tasks(), __toCommonJS(exports_tasks));
         const tasks = listTasks3({ status: "pending", project_id, assigned_to: "", limit: limit || 20 }, undefined);
         if (tasks.length === 0)
           return { content: [{ type: "text", text: "Inbox is empty." }] };
@@ -28992,8 +30299,8 @@ ${lines.join(`
       project_id: exports_external2.string().optional().describe("Filter by project")
     }, async ({ agent_id, project_id }) => {
       try {
-        const { getAgentMetrics } = (()=>{throw new Error("Cannot require module "+"../db/agent-metrics.js");})();
-        const metrics = getAgentMetrics(agent_id, {
+        const { getAgentMetrics: getAgentMetrics2 } = (init_agent_metrics(), __toCommonJS(exports_agent_metrics));
+        const metrics = getAgentMetrics2(agent_id, {
           project_id: project_id ? resolveId(project_id, "projects") : undefined
         });
         if (!metrics)
@@ -29020,8 +30327,8 @@ ${lines.join(`
       limit: exports_external2.number().optional().describe("Max entries (default: 20)")
     }, async ({ project_id, limit }) => {
       try {
-        const { getLeaderboard } = (()=>{throw new Error("Cannot require module "+"../db/agent-metrics.js");})();
-        const entries = getLeaderboard({
+        const { getLeaderboard: getLeaderboard2 } = (init_agent_metrics(), __toCommonJS(exports_agent_metrics));
+        const entries = getLeaderboard2({
           project_id: project_id ? resolveId(project_id, "projects") : undefined,
           limit
         });
@@ -29868,116 +31175,493 @@ SSH: ${machine.ssh_address ?? "(not set)"}`
             }
           ]
         };
-      } catch (error) {
-        return { content: [{ type: "text", text: ctx.formatError(error) }] };
+      } catch (error) {
+        return { content: [{ type: "text", text: ctx.formatError(error) }] };
+      }
+    });
+  }
+  if (ctx.shouldRegisterTool("machines_list")) {
+    server.tool("machines_list", "List all registered machines", {
+      include_archived: exports_external2.boolean().optional().describe("Include archived machines")
+    }, async (params) => {
+      try {
+        const db = getDb();
+        const machines = listMachines(db, params.include_archived);
+        if (machines.length === 0) {
+          return {
+            content: [{ type: "text", text: "No machines registered. Use machines_register to add one." }]
+          };
+        }
+        const lines = machines.map((m) => {
+          const primaryTag = m.is_primary ? " [PRIMARY]" : "";
+          const archivedTag = m.archived_at ? " [ARCHIVED]" : "";
+          return `${m.name} (${m.id.slice(0, 8)}) | ${m.hostname ?? "unknown"} | ${m.platform ?? "unknown"} | last: ${m.last_seen_at}${primaryTag}${archivedTag}`;
+        });
+        return { content: [{ type: "text", text: `Machines:
+${lines.join(`
+`)}` }] };
+      } catch (error) {
+        return { content: [{ type: "text", text: ctx.formatError(error) }] };
+      }
+    });
+  }
+  if (ctx.shouldRegisterTool("machines_set_primary")) {
+    server.tool("machines_set_primary", "Set the primary machine", {
+      name: exports_external2.string().describe("Machine name to set as primary")
+    }, async (params) => {
+      try {
+        const db = getDb();
+        const machine = setPrimaryMachine(params.name, db);
+        return {
+          content: [
+            { type: "text", text: `Primary machine set to: ${machine.name} (${machine.id.slice(0, 8)})` }
+          ]
+        };
+      } catch (error) {
+        return { content: [{ type: "text", text: ctx.formatError(error) }] };
+      }
+    });
+  }
+  if (ctx.shouldRegisterTool("machines_archive")) {
+    server.tool("machines_archive", "Archive (soft-delete) a machine. Cannot archive primary or machines with active tasks.", {
+      name: exports_external2.string().describe("Machine name to archive")
+    }, async (params) => {
+      try {
+        const db = getDb();
+        const machine = getMachineByName(params.name, db);
+        if (!machine) {
+          return { content: [{ type: "text", text: `Machine '${params.name}' not found` }] };
+        }
+        archiveMachine(machine.id, db);
+        return { content: [{ type: "text", text: `Machine '${params.name}' archived` }] };
+      } catch (error) {
+        return { content: [{ type: "text", text: ctx.formatError(error) }] };
+      }
+    });
+  }
+  if (ctx.shouldRegisterTool("machines_unarchive")) {
+    server.tool("machines_unarchive", "Unarchive a machine", {
+      name: exports_external2.string().describe("Machine name to unarchive")
+    }, async (params) => {
+      try {
+        const db = getDb();
+        const machine = getMachineByName(params.name, db);
+        if (!machine) {
+          return { content: [{ type: "text", text: `Machine '${params.name}' not found` }] };
+        }
+        const result = unarchiveMachine(machine.id, db);
+        return {
+          content: [
+            { type: "text", text: `Machine '${params.name}' unarchived${result ? ` (${result.id.slice(0, 8)})` : ""}` }
+          ]
+        };
+      } catch (error) {
+        return { content: [{ type: "text", text: ctx.formatError(error) }] };
+      }
+    });
+  }
+  if (ctx.shouldRegisterTool("machines_delete")) {
+    server.tool("machines_delete", "Hard-delete a machine. Cannot delete primary or machines with active tasks.", {
+      name: exports_external2.string().describe("Machine name to delete")
+    }, async (params) => {
+      try {
+        const db = getDb();
+        const machine = getMachineByName(params.name, db);
+        if (!machine) {
+          return { content: [{ type: "text", text: `Machine '${params.name}' not found` }] };
+        }
+        const result = deleteMachine(machine.id, db);
+        return {
+          content: [
+            { type: "text", text: result ? `Machine '${params.name}' deleted` : `Failed to delete machine '${params.name}'` }
+          ]
+        };
+      } catch (error) {
+        return { content: [{ type: "text", text: ctx.formatError(error) }] };
+      }
+    });
+  }
+}
+var init_machines2 = __esm(() => {
+  init_zod2();
+  init_machines();
+  init_database();
+});
+
+// src/mcp/tools/agents.ts
+function registerAgentTools(server, { shouldRegisterTool, resolveId, formatError, agentFocusMap, getAgentFocus }) {
+  if (shouldRegisterTool("set_focus")) {
+    server.tool("set_focus", "Focus this agent on a project. All list/search/status tools will default to this project.", {
+      agent_id: exports_external2.string().describe("Agent ID or name"),
+      project_id: exports_external2.string().optional().describe("Project to focus on. Omit to clear."),
+      task_list_id: exports_external2.string().optional().describe("Task list to focus on")
+    }, async ({ agent_id, project_id, task_list_id }) => {
+      try {
+        const resolvedProject = project_id ? resolveId(project_id, "projects") : undefined;
+        const focus = { agent_id, project_id: resolvedProject, task_list_id };
+        agentFocusMap.set(agent_id, focus);
+        try {
+          const agent = getAgentByName(agent_id) || getAgent(agent_id);
+          if (agent) {
+            const db = getDatabase();
+            db.run("UPDATE agents SET active_project_id = ? WHERE id = ?", [resolvedProject || null, agent.id]);
+          }
+        } catch {}
+        const projectName = resolvedProject ? ` (${resolvedProject.slice(0, 8)})` : "";
+        return { content: [{ type: "text", text: `Focused on project${projectName}. Read tools will default to this scope. Pass explicit project_id to override.` }] };
+      } catch (e) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
+      }
+    });
+  }
+  if (shouldRegisterTool("get_focus")) {
+    server.tool("get_focus", "Get the current focus for an agent.", { agent_id: exports_external2.string().describe("Agent ID or name") }, async ({ agent_id }) => {
+      const focus = getAgentFocus(agent_id);
+      if (!focus?.project_id) {
+        return { content: [{ type: "text", text: "No focus set. Showing all projects." }] };
+      }
+      return { content: [{ type: "text", text: `Focused on project: ${focus.project_id}${focus.task_list_id ? `, task list: ${focus.task_list_id}` : ""}` }] };
+    });
+  }
+  if (shouldRegisterTool("unfocus")) {
+    server.tool("unfocus", "Clear focus \u2014 show all projects and tasks.", { agent_id: exports_external2.string().describe("Agent ID or name") }, async ({ agent_id }) => {
+      agentFocusMap.delete(agent_id);
+      try {
+        const agent = getAgentByName(agent_id) || getAgent(agent_id);
+        if (agent) {
+          const db = getDatabase();
+          db.run("UPDATE agents SET active_project_id = NULL WHERE id = ?", [agent.id]);
+        }
+      } catch {}
+      return { content: [{ type: "text", text: "Focus cleared. Showing all projects." }] };
+    });
+  }
+  if (shouldRegisterTool("register_agent")) {
+    server.tool("register_agent", "Register an agent with a distinctive one-word name. Generic/generated names like agent, agent-1, assistant, or worker-2 are rejected. Prefer Roman or Greek names from suggest_agent_name.", {
+      name: exports_external2.string().describe("Distinctive one-word agent name. Use suggest_agent_name first; avoid agent, agent-1, and other numbered generated names."),
+      description: exports_external2.string().optional(),
+      role: exports_external2.string().optional(),
+      title: exports_external2.string().optional(),
+      level: exports_external2.string().optional(),
+      permissions: exports_external2.array(exports_external2.string()).optional(),
+      capabilities: exports_external2.array(exports_external2.string()).optional().describe("Agent capabilities/skills for task routing (e.g. ['typescript', 'testing', 'devops'])"),
+      session_id: exports_external2.string().optional().describe("Unique ID for this coding session (e.g. process PID + timestamp, or env var). Used to detect name collisions across sessions. Store it and pass on every register_agent call."),
+      working_dir: exports_external2.string().optional().describe("Working directory of this session \u2014 used to look up the project's agent pool and identify who holds the name in a conflict"),
+      force: exports_external2.boolean().optional().describe("Force takeover of an active agent's name. Use with caution \u2014 only when you know the previous session is dead.")
+    }, async ({ name, description, role, title, level, permissions, capabilities, session_id, working_dir, force }) => {
+      try {
+        const pool = getAgentPoolForProject(working_dir);
+        const result = registerAgent({ name, description, role, title, level, permissions, capabilities, session_id, working_dir, force, pool: pool || undefined });
+        if (isAgentConflict(result)) {
+          const suggestLine = result.suggestions && result.suggestions.length > 0 ? `
+Available names: ${result.suggestions.join(", ")}` : "";
+          const hint = `CONFLICT: ${result.message}${suggestLine}`;
+          return {
+            content: [{ type: "text", text: hint }],
+            isError: true
+          };
+        }
+        const agent = result;
+        const poolLine = pool ? `
+Pool: [${pool.join(", ")}]` : "";
+        return {
+          content: [{
+            type: "text",
+            text: `Agent registered:
+ID: ${agent.id}
+Name: ${agent.name}${agent.description ? `
+Description: ${agent.description}` : ""}
+Session: ${agent.session_id ?? "unbound"}${poolLine}
+Created: ${agent.created_at}
+Last seen: ${agent.last_seen_at}`
+          }]
+        };
+      } catch (e) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
+      }
+    });
+  }
+  if (shouldRegisterTool("suggest_agent_name")) {
+    server.tool("suggest_agent_name", "Get available Roman/Greek-style agent names for a project. Use these instead of generic generated names.", {
+      working_dir: exports_external2.string().optional().describe("Your working directory \u2014 used to look up the project's allowed name pool from config")
+    }, async ({ working_dir }) => {
+      try {
+        const pool = getAgentPoolForProject(working_dir);
+        const cutoff = new Date(Date.now() - 30 * 60 * 1000).toISOString();
+        const allActive = listAgents().filter((a) => a.last_seen_at > cutoff);
+        if (!pool) {
+          const suggestions = getAvailableNamesFromPool([
+            "caesar",
+            "augustus",
+            "marcus",
+            "brutus",
+            "cicero",
+            "cato",
+            "nero",
+            "claudius",
+            "tiberius",
+            "hadrian",
+            "athena",
+            "apollo",
+            "artemis",
+            "iris",
+            "hector",
+            "sophia",
+            "thalia",
+            "phoebe",
+            "daphne"
+          ], getDatabase());
+          const lines2 = [
+            "No project pool configured. Use a distinctive one-word name; generic generated names are blocked.",
+            `Suggested names: ${suggestions.slice(0, 8).join(", ")}`,
+            allActive.length > 0 ? `Active agents (avoid these names): ${allActive.map((a) => `${a.name} (seen ${Math.round((Date.now() - new Date(a.last_seen_at).getTime()) / 60000)}m ago)`).join(", ")}` : "No active agents.",
+            `
+To restrict names, configure agent_pool or project_pools in ~/.hasna/todos/config.json`
+          ];
+          return { content: [{ type: "text", text: lines2.join(`
+`) }] };
+        }
+        const available = getAvailableNamesFromPool(pool, getDatabase());
+        const activeInPool = allActive.filter((a) => pool.map((n) => n.toLowerCase()).includes(a.name));
+        const lines = [
+          `Project pool: ${pool.join(", ")}`,
+          `Available now (${available.length}): ${available.length > 0 ? available.join(", ") : "none \u2014 all names in use"}`,
+          activeInPool.length > 0 ? `Active agents: ${activeInPool.map((a) => `${a.name} (seen ${Math.round((Date.now() - new Date(a.last_seen_at).getTime()) / 60000)}m ago)`).join(", ")}` : "Active agents: none",
+          available.length > 0 ? `
+Suggested: ${available[0]}` : `
+No names available. Wait for an active agent to go stale (30min timeout).`
+        ];
+        return { content: [{ type: "text", text: lines.join(`
+`) }] };
+      } catch (e) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
+      }
+    });
+  }
+  if (shouldRegisterTool("list_agents")) {
+    server.tool("list_agents", "List all registered agents. By default shows only active agents \u2014 set include_archived to see archived ones too.", {
+      include_archived: exports_external2.boolean().optional().describe("Include archived agents in the list (default: false)")
+    }, async ({ include_archived }) => {
+      try {
+        const agents = listAgents({ include_archived: include_archived ?? false });
+        if (agents.length === 0) {
+          return { content: [{ type: "text", text: "No agents registered." }] };
+        }
+        const text = agents.map((a) => {
+          const statusTag = a.status === "archived" ? " [archived]" : "";
+          return `${a.id} | ${a.name}${statusTag}${a.description ? ` - ${a.description}` : ""} (last seen: ${a.last_seen_at})`;
+        }).join(`
+`);
+        return { content: [{ type: "text", text: `${agents.length} agent(s):
+${text}` }] };
+      } catch (e) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
+      }
+    });
+  }
+  if (shouldRegisterTool("get_agent")) {
+    server.tool("get_agent", "Get agent details by ID or name. Provide one of id or name.", {
+      agent_id: exports_external2.string().optional(),
+      id: exports_external2.string().optional(),
+      name: exports_external2.string().optional()
+    }, async ({ agent_id, id, name }) => {
+      try {
+        const identifier = agent_id || id || name;
+        if (!identifier) {
+          return { content: [{ type: "text", text: "Provide agent_id, id, or name." }], isError: true };
+        }
+        const agent = getAgent(identifier) || getAgentByName(identifier);
+        if (!agent) {
+          return { content: [{ type: "text", text: `Agent not found: ${identifier}` }], isError: true };
+        }
+        const parts = [
+          `ID: ${agent.id}`,
+          `Name: ${agent.name}`
+        ];
+        if (agent.description)
+          parts.push(`Description: ${agent.description}`);
+        if (Object.keys(agent.metadata).length > 0)
+          parts.push(`Metadata: ${JSON.stringify(agent.metadata)}`);
+        parts.push(`Created: ${agent.created_at}`);
+        parts.push(`Last seen: ${agent.last_seen_at}`);
+        return { content: [{ type: "text", text: parts.join(`
+`) }] };
+      } catch (e) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
+      }
+    });
+  }
+  if (shouldRegisterTool("rename_agent")) {
+    server.tool("rename_agent", "Rename an agent. Resolve by id or current name.", {
+      id: exports_external2.string().optional(),
+      name: exports_external2.string().optional(),
+      new_name: exports_external2.string()
+    }, async ({ id, name, new_name }) => {
+      try {
+        if (!id && !name) {
+          return { content: [{ type: "text", text: "Provide either id or name." }], isError: true };
+        }
+        const agent = id ? getAgent(id) : getAgentByName(name);
+        if (!agent) {
+          return { content: [{ type: "text", text: `Agent not found: ${id || name}` }], isError: true };
+        }
+        const oldName = agent.name;
+        const updated = updateAgent(agent.id, { name: new_name });
+        const db = getDatabase();
+        const tasksResult = db.run("UPDATE tasks SET assigned_to = ? WHERE assigned_to = ?", [new_name, oldName]);
+        const taskNote = tasksResult.changes > 0 ? `
+Updated assigned_to on ${tasksResult.changes} task(s).` : "";
+        return {
+          content: [{
+            type: "text",
+            text: `Agent renamed: ${oldName} -> ${updated.name}
+ID: ${updated.id}${taskNote}`
+          }]
+        };
+      } catch (e) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
       }
     });
   }
-  if (ctx.shouldRegisterTool("machines_list")) {
-    server.tool("machines_list", "List all registered machines", {
-      include_archived: exports_external2.boolean().optional().describe("Include archived machines")
-    }, async (params) => {
+  if (shouldRegisterTool("update_agent")) {
+    server.tool("update_agent", "Update an agent's description, role, title, or other metadata. Resolve by id or name.", {
+      agent_id: exports_external2.string().optional(),
+      id: exports_external2.string().optional(),
+      name: exports_external2.string().optional(),
+      description: exports_external2.string().optional(),
+      role: exports_external2.string().optional(),
+      title: exports_external2.string().optional(),
+      level: exports_external2.string().optional(),
+      capabilities: exports_external2.array(exports_external2.string()).optional(),
+      permissions: exports_external2.array(exports_external2.string()).optional(),
+      metadata: exports_external2.record(exports_external2.unknown()).optional()
+    }, async ({ agent_id, id, name, ...updates }) => {
       try {
-        const db = getDb();
-        const machines = listMachines(db, params.include_archived);
-        if (machines.length === 0) {
-          return {
-            content: [{ type: "text", text: "No machines registered. Use machines_register to add one." }]
-          };
+        const identifier = agent_id || id || name;
+        if (!identifier) {
+          return { content: [{ type: "text", text: "Provide agent_id, id, or name." }], isError: true };
         }
-        const lines = machines.map((m) => {
-          const primaryTag = m.is_primary ? " [PRIMARY]" : "";
-          const archivedTag = m.archived_at ? " [ARCHIVED]" : "";
-          return `${m.name} (${m.id.slice(0, 8)}) | ${m.hostname ?? "unknown"} | ${m.platform ?? "unknown"} | last: ${m.last_seen_at}${primaryTag}${archivedTag}`;
-        });
-        return { content: [{ type: "text", text: `Machines:
-${lines.join(`
-`)}` }] };
-      } catch (error) {
-        return { content: [{ type: "text", text: ctx.formatError(error) }] };
+        const agent = getAgent(identifier) || getAgentByName(identifier);
+        if (!agent) {
+          return { content: [{ type: "text", text: `Agent not found: ${identifier}` }], isError: true };
+        }
+        const updated = updateAgent(agent.id, updates);
+        return { content: [{ type: "text", text: `Agent updated: ${updated.name} (${updated.id.slice(0, 8)})` }] };
+      } catch (e) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
       }
     });
   }
-  if (ctx.shouldRegisterTool("machines_set_primary")) {
-    server.tool("machines_set_primary", "Set the primary machine", {
-      name: exports_external2.string().describe("Machine name to set as primary")
-    }, async (params) => {
+  if (shouldRegisterTool("delete_agent")) {
+    server.tool("delete_agent", "Archive an agent (soft delete). The agent is hidden from list_agents but preserved for task history. Use unarchive_agent to restore. Resolve by id or name.", {
+      agent_id: exports_external2.string().optional(),
+      id: exports_external2.string().optional(),
+      name: exports_external2.string().optional()
+    }, async ({ agent_id, id, name }) => {
       try {
-        const db = getDb();
-        const machine = setPrimaryMachine(params.name, db);
+        const identifier = agent_id || id || name;
+        if (!identifier) {
+          return { content: [{ type: "text", text: "Provide agent_id, id, or name." }], isError: true };
+        }
+        const agent = getAgent(identifier) || getAgentByName(identifier);
+        if (!agent) {
+          return { content: [{ type: "text", text: `Agent not found: ${identifier}` }], isError: true };
+        }
+        const archived = archiveAgent(agent.id);
         return {
-          content: [
-            { type: "text", text: `Primary machine set to: ${machine.name} (${machine.id.slice(0, 8)})` }
-          ]
+          content: [{
+            type: "text",
+            text: archived ? `Agent archived: ${agent.name} (${agent.id}). Use unarchive_agent to restore.` : `Failed to archive agent: ${agent.name}`
+          }],
+          isError: !archived
         };
-      } catch (error) {
-        return { content: [{ type: "text", text: ctx.formatError(error) }] };
+      } catch (e) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
       }
     });
   }
-  if (ctx.shouldRegisterTool("machines_archive")) {
-    server.tool("machines_archive", "Archive (soft-delete) a machine. Cannot archive primary or machines with active tasks.", {
-      name: exports_external2.string().describe("Machine name to archive")
-    }, async (params) => {
+  if (shouldRegisterTool("unarchive_agent")) {
+    server.tool("unarchive_agent", "Restore an archived agent back to active status. Resolve by id or name.", {
+      agent_id: exports_external2.string().optional(),
+      id: exports_external2.string().optional(),
+      name: exports_external2.string().optional()
+    }, async ({ agent_id, id, name }) => {
       try {
-        const db = getDb();
-        const machine = getMachineByName(params.name, db);
-        if (!machine) {
-          return { content: [{ type: "text", text: `Machine '${params.name}' not found` }] };
+        const identifier = agent_id || id || name;
+        if (!identifier) {
+          return { content: [{ type: "text", text: "Provide agent_id, id, or name." }], isError: true };
         }
-        archiveMachine(machine.id, db);
-        return { content: [{ type: "text", text: `Machine '${params.name}' archived` }] };
-      } catch (error) {
-        return { content: [{ type: "text", text: ctx.formatError(error) }] };
+        const agent = getAgent(identifier) || getAgentByName(identifier);
+        if (!agent) {
+          return { content: [{ type: "text", text: `Agent not found: ${identifier}` }], isError: true };
+        }
+        if (agent.status === "active") {
+          return { content: [{ type: "text", text: `Agent ${agent.name} is already active.` }] };
+        }
+        const restored = unarchiveAgent(agent.id);
+        return {
+          content: [{
+            type: "text",
+            text: restored ? `Agent restored: ${agent.name} (${agent.id}) is now active.` : `Failed to restore agent: ${agent.name}`
+          }],
+          isError: !restored
+        };
+      } catch (e) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
       }
     });
   }
-  if (ctx.shouldRegisterTool("machines_unarchive")) {
-    server.tool("machines_unarchive", "Unarchive a machine", {
-      name: exports_external2.string().describe("Machine name to unarchive")
-    }, async (params) => {
+  if (shouldRegisterTool("heartbeat")) {
+    server.tool("heartbeat", "Update your last_seen_at timestamp to signal you're still active. Call periodically during long tasks to prevent being marked stale.", {
+      agent_id: exports_external2.string().describe("Your agent ID or name.")
+    }, async ({ agent_id }) => {
       try {
-        const db = getDb();
-        const machine = getMachineByName(params.name, db);
-        if (!machine) {
-          return { content: [{ type: "text", text: `Machine '${params.name}' not found` }] };
+        const agent = getAgent(agent_id) || getAgentByName(agent_id);
+        if (!agent) {
+          return { content: [{ type: "text", text: `Agent not found: ${agent_id}` }], isError: true };
         }
-        const result = unarchiveMachine(machine.id, db);
+        updateAgentActivity(agent.id);
         return {
-          content: [
-            { type: "text", text: `Machine '${params.name}' unarchived${result ? ` (${result.id.slice(0, 8)})` : ""}` }
-          ]
+          content: [{
+            type: "text",
+            text: `Heartbeat: ${agent.name} (${agent.id}) \u2014 last_seen_at updated to ${new Date().toISOString()}`
+          }]
         };
-      } catch (error) {
-        return { content: [{ type: "text", text: ctx.formatError(error) }] };
+      } catch (e) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
       }
     });
   }
-  if (ctx.shouldRegisterTool("machines_delete")) {
-    server.tool("machines_delete", "Hard-delete a machine. Cannot delete primary or machines with active tasks.", {
-      name: exports_external2.string().describe("Machine name to delete")
-    }, async (params) => {
+  if (shouldRegisterTool("release_agent")) {
+    server.tool("release_agent", "Explicitly release/logout an agent \u2014 clears session binding and makes the name immediately available. Call this when your session ends instead of waiting for the 30-minute stale timeout.", {
+      agent_id: exports_external2.string().describe("Your agent ID or name."),
+      session_id: exports_external2.string().optional().describe("Your session ID \u2014 if provided, release only succeeds if it matches (prevents other sessions from releasing your agent).")
+    }, async ({ agent_id, session_id }) => {
       try {
-        const db = getDb();
-        const machine = getMachineByName(params.name, db);
-        if (!machine) {
-          return { content: [{ type: "text", text: `Machine '${params.name}' not found` }] };
+        const agent = getAgent(agent_id) || getAgentByName(agent_id);
+        if (!agent) {
+          return { content: [{ type: "text", text: `Agent not found: ${agent_id}` }], isError: true };
+        }
+        const released = releaseAgent(agent.id, session_id);
+        if (!released) {
+          return { content: [{ type: "text", text: `Release denied: session_id does not match agent's current session.` }], isError: true };
         }
-        const result = deleteMachine(machine.id, db);
         return {
-          content: [
-            { type: "text", text: result ? `Machine '${params.name}' deleted` : `Failed to delete machine '${params.name}'` }
-          ]
+          content: [{
+            type: "text",
+            text: `Agent released: ${agent.name} (${agent.id}) \u2014 session cleared, name is now available.`
+          }]
         };
-      } catch (error) {
-        return { content: [{ type: "text", text: ctx.formatError(error) }] };
+      } catch (e) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
       }
     });
   }
 }
-var init_machines2 = __esm(() => {
+var init_agents2 = __esm(() => {
   init_zod2();
-  init_machines();
+  init_agents();
+  init_config();
   init_database();
 });
 
@@ -29988,17 +31672,23 @@ __export(exports_mcp, {
 });
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { readFileSync as readFileSync7 } from "fs";
+import { existsSync as existsSync9, readFileSync as readFileSync7 } from "fs";
 import { join as join12, dirname as dirname6 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 function getMcpVersion() {
   try {
-    const __dir = dirname6(fileURLToPath3(import.meta.url));
-    const pkgPath = join12(__dir, "..", "package.json");
-    return JSON.parse(readFileSync7(pkgPath, "utf-8")).version || "0.0.0";
+    let dir = dirname6(fileURLToPath3(import.meta.url));
+    for (let i = 0;i < 4; i++) {
+      const pkgPath = join12(dir, "package.json");
+      if (existsSync9(pkgPath)) {
+        return JSON.parse(readFileSync7(pkgPath, "utf-8")).version || "0.0.0";
+      }
+      dir = dirname6(dir);
+    }
   } catch {
     return "0.0.0";
   }
+  return "0.0.0";
 }
 function shouldRegisterTool(name) {
   if (TODOS_PROFILE === "minimal")
@@ -30159,6 +31849,7 @@ var init_mcp = __esm(() => {
   init_task_rel_tools();
   init_code_tools();
   init_machines2();
+  init_agents2();
   server = new McpServer({
     name: "todos",
     version: getMcpVersion()
@@ -30176,6 +31867,7 @@ var init_mcp = __esm(() => {
     "get_next_task",
     "bootstrap",
     "get_tasks_changed_since",
+    "get_health",
     "heartbeat",
     "release_agent"
   ]);
@@ -30216,6 +31908,7 @@ var init_mcp = __esm(() => {
   registerTaskResources(server, toolContext);
   registerTaskRelTools(server, toolContext);
   registerCodeTools(server, toolContext);
+  registerAgentTools(server, { ...toolContext, agentFocusMap });
   registerMachineTools(server, { shouldRegisterTool, formatError });
   registerDispatchTools(server, { shouldRegisterTool, resolveId, formatError });
   registerCloudSyncTools(server, { shouldRegisterTool, formatError });
@@ -30766,7 +32459,7 @@ ${chalk2.cyan(sid)} ${statusColor(task.status)} ${prioColor(task.priority)} ${ta
     opts.tags = opts.tags || opts.tag;
     opts.list = opts.list || opts.taskList;
     const resolvedId = resolveTaskId(id);
-    const current = getTask2(resolvedId);
+    const current = getTask(resolvedId);
     if (!current) {
       console.error(chalk2.red(`Task not found: ${id}`));
       process.exit(1);
@@ -30827,7 +32520,7 @@ ${chalk2.cyan(sid)} ${statusColor(task.status)} ${prioColor(task.priority)} ${ta
   program2.command("approve <id>").description("Approve a task that requires approval").action((id) => {
     const globalOpts = program2.opts();
     const resolvedId = resolveTaskId(id);
-    const task = getTask2(resolvedId);
+    const task = getTask(resolvedId);
     if (!task) {
       console.error(chalk2.red(`Task not found: ${id}`));
       process.exit(1);
@@ -31429,7 +33122,7 @@ function pushToClaudeTaskList(taskListId, projectId, options = {}) {
         updated.activeForm = existing.task.activeForm;
         writeClaudeTask(dir, updated);
         if (recordConflict) {
-          const latest = getTask2(task.id);
+          const latest = getTask(task.id);
           if (latest) {
             const conflict = {
               agent: "claude",
@@ -31452,7 +33145,7 @@ function pushToClaudeTaskList(taskListId, projectId, options = {}) {
           ct.subject = formatPrefixedSubject(task.title, prefixConfig.prefix, prefixCounter);
         }
         writeClaudeTask(dir, ct);
-        const current = getTask2(task.id);
+        const current = getTask(task.id);
         if (current) {
           const newMeta = { ...current.metadata, claude_task_id: claudeId };
           updateTask(task.id, { version: current.version, metadata: newMeta });
@@ -31654,7 +33347,7 @@ function pushToAgentTaskList(agent, taskListId, projectId, options = {}) {
         const updated = taskToAgentTask(task, existing.task.id, existing.task.metadata);
         writeAgentTask(dir, updated);
         if (recordConflict) {
-          const latest = getTask2(task.id);
+          const latest = getTask(task.id);
           if (latest) {
             const conflict = {
               agent,
@@ -31673,7 +33366,7 @@ function pushToAgentTaskList(agent, taskListId, projectId, options = {}) {
         hwm++;
         const at = taskToAgentTask(task, externalId);
         writeAgentTask(dir, at);
-        const current = getTask2(task.id);
+        const current = getTask(task.id);
         if (current) {
           const newMeta = { ...current.metadata, [metaKey]: externalId };
           updateTask(task.id, { version: current.version, metadata: newMeta });
@@ -32324,6 +34017,27 @@ Use ${chalk5.cyan(`--agent ${result.id}`)} on future commands.`);
       handleError(e);
     }
   });
+  program2.command("agents-normalize").alias("normalize-agents").description("Rename invalid/generated agent names (agent, agent-1, name-2, two-word names) to safe one-word names").action(async () => {
+    const globalOpts = program2.opts();
+    try {
+      const db = getDatabase();
+      const renamed = normalizeGeneratedAgentNames(db);
+      if (globalOpts.json) {
+        output({ renamed, suggestions: suggestAgentNames(listAgents().map((agent) => agent.name)).slice(0, 5) }, true);
+        return;
+      }
+      if (renamed.length === 0) {
+        console.log(chalk5.green("No invalid or generated agent names found."));
+        return;
+      }
+      console.log(chalk5.green(`Normalized ${renamed.length} agent name(s):`));
+      for (const item of renamed) {
+        console.log(`  ${chalk5.cyan(item.id)} ${chalk5.red(item.old_name)} ${chalk5.dim("->")} ${chalk5.bold(item.new_name)} ${chalk5.dim(`(${item.reference_updates} reference updates)`)}`);
+      }
+    } catch (e) {
+      handleError(e);
+    }
+  });
   program2.command("agent-update <name>").alias("agents-update").description("Update an agent's description, role, or other fields").option("--description <text>", "New description").option("--role <role>", "New role").option("--title <title>", "New title").action(async (name, opts) => {
     const globalOpts = program2.opts();
     try {
@@ -32624,7 +34338,7 @@ function registerConfigServeCommands(program2) {
       console.log(JSON.stringify(config, null, 2));
     }
   });
-  program2.command("serve").description("Start the web dashboard").option("--port <port>", "Port number", "19427").option("--host <host>", "Host to bind (default: 127.0.0.1 localhost only, use 0.0.0.0 for all interfaces)").option("--no-open", "Don't open browser automatically").action(async (opts) => {
+  program2.command("serve").description("Start the web dashboard").option("--port <port>", "Port number", "19427").option("--host <host>", "Host to bind (default: 127.0.0.1 localhost only, use 0.0.0.0 for all interfaces)").option("--api-key <key>", "Require this API key for /api/* requests").option("--no-open", "Don't open browser automatically").action(async (opts) => {
     const { startServer: startServer2 } = await Promise.resolve().then(() => (init_serve(), exports_serve));
     const requestedPort = parseInt(opts.port, 10);
     let port = requestedPort;
@@ -32639,7 +34353,7 @@ function registerConfigServeCommands(program2) {
     if (port !== requestedPort) {
       console.log(`Port ${requestedPort} in use, using ${port}`);
     }
-    await startServer2(port, { open: opts.open !== false, host: opts.host });
+    await startServer2(port, { open: opts.open !== false, host: opts.host, apiKey: opts.apiKey });
   });
   program2.command("watch").description("Live-updating task list (refreshes every few seconds)").option("-s, --status <status>", "Filter by status (default: pending,in_progress)").option("-i, --interval <seconds>", "Refresh interval in seconds", "5").action(async (opts) => {
     const globalOpts = program2.opts();
@@ -32756,7 +34470,7 @@ ${tasks.length} task(s) shown`));
   program2.command("blame <file>").description("Show which tasks/agents touched a file and why \u2014 combines task_files + task_commits").action(async (filePath) => {
     const globalOpts = program2.opts();
     const { findTasksByFile: findTasksByFile2 } = await Promise.resolve().then(() => (init_task_files(), exports_task_files));
-    const { getTask: getTask3 } = await Promise.resolve().then(() => (init_tasks(), exports_tasks));
+    const { getTask: getTask2 } = await Promise.resolve().then(() => (init_tasks(), exports_tasks));
     const db = getDatabase();
     const taskFiles = findTasksByFile2(filePath, db);
     const commitRows = db.query("SELECT tc.*, t.title, t.short_id FROM task_commits tc JOIN tasks t ON t.id = tc.task_id WHERE tc.files_changed LIKE ? ORDER BY tc.committed_at DESC").all(`%${filePath}%`);
@@ -32770,7 +34484,7 @@ Blame: ${filePath}
     if (taskFiles.length > 0) {
       console.log(chalk6.bold("Task File Links:"));
       for (const tf of taskFiles) {
-        const task = getTask3(tf.task_id, db);
+        const task = getTask2(tf.task_id, db);
         const title = task ? task.title : "unknown";
         const sid = task?.short_id || tf.task_id.slice(0, 8);
         console.log(`  ${chalk6.cyan(sid)} ${title} \u2014 ${chalk6.dim(tf.role || "file")} ${chalk6.dim(tf.updated_at)}`);
@@ -32804,74 +34518,10 @@ Commit Links (${commitRows.length}):`));
 init_database();
 init_tasks();
 init_audit();
-import chalk7 from "chalk";
-
-// src/db/handoffs.ts
-init_database();
-function createHandoff(input, db) {
-  const d = db || getDatabase();
-  const id = uuid();
-  const timestamp = now();
-  d.run(`INSERT INTO handoffs (id, agent_id, project_id, summary, completed, in_progress, blockers, next_steps, created_at)
-     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
-    id,
-    input.agent_id || null,
-    input.project_id || null,
-    input.summary,
-    input.completed ? JSON.stringify(input.completed) : null,
-    input.in_progress ? JSON.stringify(input.in_progress) : null,
-    input.blockers ? JSON.stringify(input.blockers) : null,
-    input.next_steps ? JSON.stringify(input.next_steps) : null,
-    timestamp
-  ]);
-  return {
-    id,
-    agent_id: input.agent_id || null,
-    project_id: input.project_id || null,
-    summary: input.summary,
-    completed: input.completed || null,
-    in_progress: input.in_progress || null,
-    blockers: input.blockers || null,
-    next_steps: input.next_steps || null,
-    created_at: timestamp
-  };
-}
-function rowToHandoff(row) {
-  return {
-    ...row,
-    completed: row.completed ? JSON.parse(row.completed) : null,
-    in_progress: row.in_progress ? JSON.parse(row.in_progress) : null,
-    blockers: row.blockers ? JSON.parse(row.blockers) : null,
-    next_steps: row.next_steps ? JSON.parse(row.next_steps) : null
-  };
-}
-function listHandoffs(projectId, limit = 10, db) {
-  const d = db || getDatabase();
-  if (projectId) {
-    return d.query("SELECT * FROM handoffs WHERE project_id = ? ORDER BY rowid DESC LIMIT ?").all(projectId, limit).map(rowToHandoff);
-  }
-  return d.query("SELECT * FROM handoffs ORDER BY rowid DESC LIMIT ?").all(limit).map(rowToHandoff);
-}
-function getLatestHandoff(agentId, projectId, db) {
-  const d = db || getDatabase();
-  let query = "SELECT * FROM handoffs WHERE 1=1";
-  const params = [];
-  if (agentId) {
-    query += " AND agent_id = ?";
-    params.push(agentId);
-  }
-  if (projectId) {
-    query += " AND project_id = ?";
-    params.push(projectId);
-  }
-  query += " ORDER BY rowid DESC LIMIT 1";
-  const row = d.query(query).get(...params);
-  return row ? rowToHandoff(row) : null;
-}
-
-// src/cli/commands/query-commands.ts
+init_handoffs();
 init_recurrence();
 init_helpers();
+import chalk7 from "chalk";
 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();
@@ -33160,7 +34810,7 @@ No task claimed (nothing available).`));
     const globalOpts = program2.opts();
     const resolvedId = resolveTaskId(id);
     const db = getDatabase();
-    const task = getTask2(resolvedId, db);
+    const task = getTask(resolvedId, db);
     if (!task) {
       console.error(chalk7.red(`Task not found: ${id}`));
       process.exit(1);
@@ -33180,7 +34830,7 @@ No task claimed (nothing available).`));
     const globalOpts = program2.opts();
     const resolvedId = resolveTaskId(id);
     const db = getDatabase();
-    const task = getTask2(resolvedId, db);
+    const task = getTask(resolvedId, db);
     if (!task) {
       console.error(chalk7.red(`Task not found: ${id}`));
       process.exit(1);
@@ -33200,7 +34850,7 @@ No task claimed (nothing available).`));
     const globalOpts = program2.opts();
     const resolvedId = resolveTaskId(id);
     const db = getDatabase();
-    const task = getTask2(resolvedId, db);
+    const task = getTask(resolvedId, db);
     if (!task) {
       console.error(chalk7.red(`Task not found: ${id}`));
       process.exit(1);
@@ -33221,7 +34871,7 @@ No task claimed (nothing available).`));
     const globalOpts = program2.opts();
     const resolvedId = resolveTaskId(id);
     const db = getDatabase();
-    const task = getTask2(resolvedId, db);
+    const task = getTask(resolvedId, db);
     if (!task) {
       console.error(chalk7.red(`Task not found: ${id}`));
       process.exit(1);
@@ -34384,7 +36034,7 @@ init_tasks();
 init_helpers();
 import chalk9 from "chalk";
 import { execSync as execSync3 } from "child_process";
-import { existsSync as existsSync9, readFileSync as readFileSync8, writeFileSync as writeFileSync5, mkdirSync as mkdirSync5, chmodSync } from "fs";
+import { existsSync as existsSync10, readFileSync as readFileSync8, writeFileSync as writeFileSync5, mkdirSync as mkdirSync5, chmodSync } from "fs";
 import { dirname as dirname7, join as join13 } from "path";
 var HOME2 = process.env["HOME"] || process.env["USERPROFILE"] || "~";
 function getMcpBinaryPath() {
@@ -34394,12 +36044,12 @@ function getMcpBinaryPath() {
       return p;
   } catch {}
   const bunBin = join13(HOME2, ".bun", "bin", "todos-mcp");
-  if (existsSync9(bunBin))
+  if (existsSync10(bunBin))
     return bunBin;
   return "todos-mcp";
 }
 function readJsonFile2(path) {
-  if (!existsSync9(path))
+  if (!existsSync10(path))
     return {};
   try {
     return JSON.parse(readFileSync8(path, "utf-8"));
@@ -34409,19 +36059,19 @@ function readJsonFile2(path) {
 }
 function writeJsonFile2(path, data) {
   const dir = dirname7(path);
-  if (!existsSync9(dir))
+  if (!existsSync10(dir))
     mkdirSync5(dir, { recursive: true });
   writeFileSync5(path, JSON.stringify(data, null, 2) + `
 `);
 }
 function readTomlFile(path) {
-  if (!existsSync9(path))
+  if (!existsSync10(path))
     return "";
   return readFileSync8(path, "utf-8");
 }
 function writeTomlFile(path, content) {
   const dir = dirname7(path);
-  if (!existsSync9(dir))
+  if (!existsSync10(dir))
     mkdirSync5(dir, { recursive: true });
   writeFileSync5(path, content);
 }
@@ -34565,7 +36215,7 @@ function registerMcpHooksCommands(program2) {
         todosBin = p;
     } catch {}
     const hooksDir = join13(process.cwd(), ".claude", "hooks");
-    if (!existsSync9(hooksDir))
+    if (!existsSync10(hooksDir))
       mkdirSync5(hooksDir, { recursive: true });
     const hookScript = `#!/usr/bin/env bash
 # Auto-generated by: todos hooks install
@@ -34687,7 +36337,7 @@ exit 0
       const gitDir = execSync3("git rev-parse --git-dir", { encoding: "utf-8" }).trim();
       const hookPath = `${gitDir}/hooks/post-commit`;
       const marker = "# todos-auto-link";
-      if (existsSync9(hookPath)) {
+      if (existsSync10(hookPath)) {
         const existing = readFileSync8(hookPath, "utf-8");
         if (existing.includes(marker)) {
           console.log(chalk9.yellow("Hook already installed."));
@@ -34715,7 +36365,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 (!existsSync9(hookPath)) {
+      if (!existsSync10(hookPath)) {
         console.log(chalk9.dim("No post-commit hook found."));
         return;
       }
@@ -35132,6 +36782,91 @@ Sync complete: ${totalPulled} task(s) pulled.`));
   });
 }
 
+// src/cli/commands/api-key-commands.ts
+init_api_keys();
+init_helpers();
+import chalk12 from "chalk";
+function registerApiKeyCommands(program2) {
+  const apiKeys = program2.command("api-keys").alias("api-key").description("Generate, list, and revoke API keys for secured app/API access");
+  apiKeys.command("create <name>").alias("generate").description("Generate a new API key. The plaintext key is shown once.").option("--expires-at <iso>", "Optional ISO timestamp when this key expires").option("--permissions <list>", "Comma-separated permissions (default: *)").action((name, opts) => {
+    const globalOpts = program2.opts();
+    try {
+      const permissions = opts.permissions ? opts.permissions.split(",").map((item) => item.trim()).filter(Boolean) : undefined;
+      const created = createApiKey({ name, permissions, expires_at: opts.expiresAt || null });
+      if (globalOpts.json) {
+        output(created, true);
+        return;
+      }
+      console.log(chalk12.green("API key generated:"));
+      console.log(`  ${chalk12.dim("ID:")}     ${created.record.id}`);
+      console.log(`  ${chalk12.dim("Name:")}   ${created.record.name}`);
+      console.log(`  ${chalk12.dim("Prefix:")} ${created.record.prefix}`);
+      console.log();
+      console.log(chalk12.yellow("Copy this key now. It will not be shown again:"));
+      console.log(created.key);
+    } catch (e) {
+      handleError(e);
+    }
+  });
+  apiKeys.command("list").description("List API keys without showing plaintext secrets").option("--include-revoked", "Include revoked keys").action((opts) => {
+    const globalOpts = program2.opts();
+    try {
+      const keys = listApiKeys({ include_revoked: opts.includeRevoked ?? false });
+      if (globalOpts.json) {
+        output(keys, true);
+        return;
+      }
+      if (keys.length === 0) {
+        console.log(chalk12.dim("No API keys found."));
+        return;
+      }
+      for (const key of keys) {
+        const state = key.revoked_at ? chalk12.red("revoked") : key.expires_at && key.expires_at < new Date().toISOString() ? chalk12.yellow("expired") : chalk12.green("active");
+        console.log(`${chalk12.cyan(key.id)} ${chalk12.bold(key.name)} ${chalk12.dim(key.prefix)} ${state}`);
+        if (key.last_used_at)
+          console.log(chalk12.dim(`  last used: ${key.last_used_at}`));
+        if (key.expires_at)
+          console.log(chalk12.dim(`  expires:   ${key.expires_at}`));
+      }
+    } catch (e) {
+      handleError(e);
+    }
+  });
+  apiKeys.command("revoke <id-or-prefix>").description("Revoke an API key by id or prefix").action((idOrPrefix) => {
+    const globalOpts = program2.opts();
+    try {
+      const revoked = revokeApiKey(idOrPrefix);
+      if (!revoked) {
+        throw new Error(`API key not found: ${idOrPrefix}`);
+      }
+      if (globalOpts.json) {
+        output(revoked, true);
+        return;
+      }
+      console.log(chalk12.green(`Revoked API key: ${revoked.name} (${revoked.prefix})`));
+    } catch (e) {
+      handleError(e);
+    }
+  });
+  apiKeys.command("verify <key>").description("Verify an API key locally without printing stored hashes").action((key) => {
+    const globalOpts = program2.opts();
+    try {
+      const record = verifyApiKey(key);
+      if (globalOpts.json) {
+        output({ valid: Boolean(record), key: record }, true);
+        return;
+      }
+      if (!record) {
+        console.error(chalk12.red("API key is invalid, revoked, or expired."));
+        process.exit(1);
+      }
+      console.log(chalk12.green(`API key valid: ${record.name} (${record.prefix})`));
+    } catch (e) {
+      handleError(e);
+    }
+  });
+}
+
 // src/cli/index.tsx
 var program2 = new Command;
 program2.name("todos").description("Universal task management for AI coding agents").version(getPackageVersion()).option("--project <path>", "Project path").option("-j, --json", "Output as JSON").option("--agent <name>", "Agent name").option("--session <id>", "Session ID");
@@ -35145,4 +36880,5 @@ registerCloudCommands2(program2);
 registerMcpHooksCommands(program2);
 registerDispatchCommands(program2);
 registerMachineCommands(program2);
+registerApiKeyCommands(program2);
 program2.parse();