@hasna/todos 0.11.27 → 0.11.29

package/dist/cli/index.js

@@ -6,60 +6,39 @@ var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-function __accessProp(key) {
-  return this[key];
-}
-var __toESMCache_node;
-var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
-  var canCache = mod != null && typeof mod === "object";
-  if (canCache) {
-    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
-    var cached = cache.get(mod);
-    if (cached)
-      return cached;
-  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: __accessProp.bind(mod, key),
+        get: () => mod[key],
         enumerable: true
       });
-  if (canCache)
-    cache.set(mod, to);
   return to;
 };
+var __moduleCache = /* @__PURE__ */ new WeakMap;
 var __toCommonJS = (from) => {
-  var entry = (__moduleCache ??= new WeakMap).get(from), desc;
+  var entry = __moduleCache.get(from), desc;
   if (entry)
     return entry;
   entry = __defProp({}, "__esModule", { value: true });
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (var key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(entry, key))
-        __defProp(entry, key, {
-          get: __accessProp.bind(from, key),
-          enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-        });
-  }
+  if (from && typeof from === "object" || typeof from === "function")
+    __getOwnPropNames(from).map((key) => !__hasOwnProp.call(entry, key) && __defProp(entry, key, {
+      get: () => from[key],
+      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+    }));
   __moduleCache.set(from, entry);
   return entry;
 };
-var __moduleCache;
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
-var __returnValue = (v) => v;
-function __exportSetter(name, newValue) {
-  this[name] = __returnValue.bind(null, newValue);
-}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: __exportSetter.bind(all, name)
+      set: (newValue) => all[name] = () => newValue
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
@@ -2444,6 +2423,32 @@ function ensureSchema(db) {
   ensureIndex("CREATE INDEX IF NOT EXISTS idx_tasks_synced ON tasks(synced_at)");
   ensureIndex("CREATE INDEX IF NOT EXISTS idx_projects_machine ON projects(machine_id)");
   ensureIndex("CREATE INDEX IF NOT EXISTS idx_agents_machine ON agents(machine_id)");
+  ensureTable("task_time_logs", `
+    CREATE TABLE task_time_logs (
+      id TEXT PRIMARY KEY,
+      task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
+      agent_id TEXT,
+      started_at TEXT,
+      ended_at TEXT,
+      minutes INTEGER NOT NULL,
+      notes TEXT,
+      created_at TEXT NOT NULL DEFAULT (datetime('now'))
+    )`);
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_time_logs_task ON task_time_logs(task_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_time_logs_agent ON task_time_logs(agent_id)");
+  ensureColumn("tasks", "actual_minutes", "INTEGER");
+  ensureTable("task_watchers", `
+    CREATE TABLE task_watchers (
+      id TEXT PRIMARY KEY,
+      task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
+      agent_id TEXT NOT NULL,
+      created_at TEXT NOT NULL DEFAULT (datetime('now')),
+      UNIQUE(task_id, agent_id)
+    )`);
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_watchers_task ON task_watchers(task_id)");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_task_watchers_agent ON task_watchers(agent_id)");
+  ensureColumn("task_dependencies", "external_project_id", "TEXT");
+  ensureColumn("task_dependencies", "external_task_id", "TEXT");
 }
 function backfillTaskTags(db) {
   try {
@@ -3171,6 +3176,39 @@ var init_schema = __esm(() => {
   CREATE UNIQUE INDEX IF NOT EXISTS idx_tasks_short_id ON tasks(short_id, machine_id) WHERE short_id IS NOT NULL AND machine_id IS NOT NULL;
   CREATE INDEX IF NOT EXISTS idx_tasks_short_id_lookup ON tasks(short_id) WHERE short_id IS NOT NULL;
   INSERT OR IGNORE INTO _migrations (id) VALUES (44);
+  `,
+    `
+  CREATE TABLE IF NOT EXISTS task_time_logs (
+    id TEXT PRIMARY KEY,
+    task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
+    agent_id TEXT,
+    started_at TEXT,
+    ended_at TEXT,
+    minutes INTEGER NOT NULL,
+    notes TEXT,
+    created_at TEXT NOT NULL DEFAULT (datetime('now'))
+  );
+  CREATE INDEX IF NOT EXISTS idx_task_time_logs_task ON task_time_logs(task_id);
+  CREATE INDEX IF NOT EXISTS idx_task_time_logs_agent ON task_time_logs(agent_id);
+  ALTER TABLE tasks ADD COLUMN actual_minutes INTEGER;
+  INSERT OR IGNORE INTO _migrations (id) VALUES (45);
+  `,
+    `
+  CREATE TABLE IF NOT EXISTS task_watchers (
+    id TEXT PRIMARY KEY,
+    task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
+    agent_id TEXT NOT NULL,
+    created_at TEXT NOT NULL DEFAULT (datetime('now')),
+    UNIQUE(task_id, agent_id)
+  );
+  CREATE INDEX IF NOT EXISTS idx_task_watchers_task ON task_watchers(task_id);
+  CREATE INDEX IF NOT EXISTS idx_task_watchers_agent ON task_watchers(agent_id);
+  INSERT OR IGNORE INTO _migrations (id) VALUES (46);
+  `,
+    `
+  ALTER TABLE task_dependencies ADD COLUMN external_project_id TEXT;
+  ALTER TABLE task_dependencies ADD COLUMN external_task_id TEXT;
+  INSERT OR IGNORE INTO _migrations (id) VALUES (47);
   `
   ];
 });
@@ -4161,6 +4199,7 @@ var init_recurrence = __esm(() => {
 // src/db/webhooks.ts
 var exports_webhooks = {};
 __export(exports_webhooks, {
+  validateWebhookUrl: () => validateWebhookUrl,
   listWebhooks: () => listWebhooks,
   listDeliveries: () => listDeliveries,
   getWebhook: () => getWebhook,
@@ -4168,6 +4207,40 @@ __export(exports_webhooks, {
   deleteWebhook: () => deleteWebhook,
   createWebhook: () => createWebhook
 });
+function validateWebhookUrl(urlString) {
+  try {
+    const url = new URL(urlString);
+    if (url.protocol !== "https:") {
+      throw new Error("Webhook URLs must use HTTPS");
+    }
+    const hostname = url.hostname.toLowerCase();
+    if (hostname === "localhost" || hostname === "127.0.0.1" || hostname === "::1" || hostname === "0.0.0.0") {
+      throw new Error("Webhook URLs cannot target localhost");
+    }
+    if (hostname === "169.254.169.254" || hostname.startsWith("169.254.")) {
+      throw new Error("Webhook URLs cannot target cloud metadata endpoints");
+    }
+    const privateRanges = [
+      /^10\./,
+      /^172\.(1[6-9]|2\d|3[01])\./,
+      /^192\.168\./,
+      /^127\./,
+      /^169\.254\./,
+      /^fc00:/i,
+      /^fe80:/i
+    ];
+    for (const range of privateRanges) {
+      if (range.test(hostname)) {
+        throw new Error("Webhook URLs cannot target private IP ranges");
+      }
+    }
+  } catch (e) {
+    if (e instanceof Error && e.message.startsWith("Webhook URLs")) {
+      throw e;
+    }
+    throw new Error(`Invalid webhook URL: ${urlString}`);
+  }
+}
 function rowToWebhook(row) {
   return {
     ...row,
@@ -4181,6 +4254,7 @@ function rowToWebhook(row) {
 }
 function createWebhook(input, db) {
   const d = db || getDatabase();
+  validateWebhookUrl(input.url);
   const id = uuid();
   d.run(`INSERT INTO webhooks (id, url, events, secret, project_id, task_list_id, agent_id, task_id, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
     id,
@@ -4779,7 +4853,9 @@ var init_checklists = __esm(() => {
 // src/db/tasks.ts
 var exports_tasks = {};
 __export(exports_tasks, {
+  watchTask: () => watchTask,
   updateTask: () => updateTask,
+  unwatchTask: () => unwatchTask,
   unlockTask: () => unlockTask,
   unarchiveTask: () => unarchiveTask,
   stealTask: () => stealTask,
@@ -4788,12 +4864,17 @@ __export(exports_tasks, {
   setTaskPriority: () => setTaskPriority,
   removeDependency: () => removeDependency,
   redistributeStaleTasks: () => redistributeStaleTasks,
+  notifyWatchers: () => notifyWatchers,
   moveTask: () => moveTask,
+  logTime: () => logTime,
   logCost: () => logCost,
   lockTask: () => lockTask,
   listTasks: () => listTasks,
+  getTimeReport: () => getTimeReport,
+  getTimeLogs: () => getTimeLogs,
   getTasksChangedSince: () => getTasksChangedSince,
   getTaskWithRelations: () => getTaskWithRelations,
+  getTaskWatchers: () => getTaskWatchers,
   getTaskStats: () => getTaskStats,
   getTaskGraph: () => getTaskGraph,
   getTaskDependents: () => getTaskDependents,
@@ -5976,6 +6057,58 @@ function getOverdueTasks(projectId, db) {
   const rows = d.query(query).all(...params);
   return rows.map(rowToTask);
 }
+function logTime(input, db) {
+  const d = db || getDatabase();
+  const id = uuid();
+  const ts = now();
+  d.run(`INSERT INTO task_time_logs (id, task_id, agent_id, minutes, started_at, ended_at, notes, created_at)
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?)`, [id, input.task_id, input.agent_id || null, input.minutes, input.started_at || null, input.ended_at || null, input.notes || null, ts]);
+  return { id, task_id: input.task_id, agent_id: input.agent_id || null, minutes: input.minutes, started_at: input.started_at || null, ended_at: input.ended_at || null, notes: input.notes || null, created_at: ts };
+}
+function getTimeLogs(taskId, db) {
+  const d = db || getDatabase();
+  return d.query(`SELECT * FROM task_time_logs WHERE task_id = ? ORDER BY created_at DESC`).all(taskId);
+}
+function getTimeReport(opts, db) {
+  const d = db || getDatabase();
+  let query = `SELECT t.id as task_id, t.title, t.estimated_minutes, t.actual_minutes FROM tasks t WHERE t.status = 'completed'`;
+  const params = [];
+  if (opts?.project_id) {
+    query += ` AND t.project_id = ?`;
+    params.push(opts.project_id);
+  }
+  if (opts?.agent_id) {
+    query += ` AND t.assigned_to = ?`;
+    params.push(opts.agent_id);
+  }
+  if (opts?.since) {
+    query += ` AND t.completed_at >= ?`;
+    params.push(opts.since);
+  }
+  const rows = d.query(query).all(...params);
+  return rows.map((row) => ({ ...row, time_logs: getTimeLogs(row.task_id, d) }));
+}
+function watchTask(taskId, agentId, db) {
+  const d = db || getDatabase();
+  const id = uuid();
+  const ts = now();
+  d.run(`INSERT OR IGNORE INTO task_watchers (id, task_id, agent_id, created_at) VALUES (?, ?, ?, ?)`, [id, taskId, agentId, ts]);
+  const existing = d.query(`SELECT * FROM task_watchers WHERE task_id = ? AND agent_id = ?`).get(taskId, agentId);
+  return existing;
+}
+function unwatchTask(taskId, agentId, db) {
+  const d = db || getDatabase();
+  const result = d.run(`DELETE FROM task_watchers WHERE task_id = ? AND agent_id = ?`, [taskId, agentId]);
+  return result.changes > 0;
+}
+function getTaskWatchers(taskId, db) {
+  const d = db || getDatabase();
+  return d.query(`SELECT * FROM task_watchers WHERE task_id = ?`).all(taskId);
+}
+function notifyWatchers(taskId, event, data, db) {
+  const watchers = getTaskWatchers(taskId, db);
+  dispatchWebhook(`task.watcher.${event}`, { task_id: taskId, watchers: watchers.map((w) => w.agent_id), ...data }, db).catch(() => {});
+}
 var init_tasks = __esm(() => {
   init_types();
   init_database();
@@ -6062,6 +6195,9 @@ function registerAgent(input, db) {
       if (callerHasNoSession && existingHasActiveSession) {
         return buildConflictError(existing, lastSeenMs, input.pool, d);
       }
+      if (input.project_id && existing.session_id && isActive && existing.active_project_id && existing.active_project_id !== input.project_id) {
+        return buildConflictError(existing, lastSeenMs, input.pool, d);
+      }
     }
     const updates = ["last_seen_at = ?", "status = 'active'"];
     const params = [now()];
@@ -6077,14 +6213,18 @@ function registerAgent(input, db) {
       updates.push("description = ?");
       params.push(input.description);
     }
+    if (input.project_id && input.session_id) {
+      updates.push("active_project_id = ?");
+      params.push(input.project_id);
+    }
     params.push(existing.id);
     d.run(`UPDATE agents SET ${updates.join(", ")} WHERE id = ?`, params);
     return getAgent(existing.id, d);
   }
   const id = shortUuid();
   const timestamp = now();
-  d.run(`INSERT INTO agents (id, name, description, role, title, level, permissions, capabilities, reports_to, org_id, metadata, created_at, last_seen_at, session_id, working_dir)
-     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
+  d.run(`INSERT INTO agents (id, name, description, role, title, level, permissions, capabilities, reports_to, org_id, metadata, created_at, last_seen_at, session_id, working_dir, active_project_id)
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
     id,
     normalizedName,
     input.description || null,
@@ -6099,7 +6239,8 @@ function registerAgent(input, db) {
     timestamp,
     timestamp,
     input.session_id || null,
-    input.working_dir || null
+    input.working_dir || null,
+    input.project_id && input.session_id ? input.project_id : null
   ]);
   return getAgent(id, d);
 }
@@ -11889,7 +12030,7 @@ var init_zod = __esm(() => {
   init_external();
 });
 
-// node_modules/@hasna/cloud/dist/index.js
+// ../../../../node_modules/@hasna/cloud/dist/index.js
 var exports_dist = {};
 __export(exports_dist, {
   translateSql: () => translateSql,
@@ -11984,11 +12125,11 @@ import { join as join52 } from "path";
 import { join as join62, dirname as dirname2 } from "path";
 import { existsSync as existsSync62, writeFileSync as writeFileSync22, unlinkSync, mkdirSync as mkdirSync32 } from "fs";
 import { homedir as homedir5, platform } from "os";
-function __accessProp2(key) {
+function __accessProp(key) {
   return this[key];
 }
-function __exportSetter2(name, newValue) {
-  this[name] = __returnValue2.bind(null, newValue);
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
 }
 function translateSql(sql, dialect) {
   if (dialect === "sqlite")
@@ -14445,7 +14586,7 @@ async function ensureAllPgDatabases() {
   }
   return results;
 }
-function registerCloudTools(server, serviceName) {
+function registerCloudTools(server, serviceName, opts = {}) {
   server.tool(`${serviceName}_cloud_status`, "Show cloud configuration and connection health", {}, async () => {
     const config = getCloudConfig();
     const lines = [
@@ -14478,8 +14619,13 @@ function registerCloudTools(server, serviceName) {
         isError: true
       };
     }
-    const local = new SqliteAdapter(getDbPath2(serviceName));
+    const local = new SqliteAdapter(opts.dbPath ?? getDbPath2(serviceName));
     const cloud = new PgAdapterAsync(getConnectionString(serviceName));
+    if (opts.migrations?.length) {
+      for (const sql of opts.migrations) {
+        await cloud.run(sql);
+      }
+    }
     const tableList = tablesStr ? tablesStr.split(",").map((t) => t.trim()) : listSqliteTables(local);
     const results = await syncPush(local, cloud, { tables: tableList });
     local.close();
@@ -14501,7 +14647,7 @@ function registerCloudTools(server, serviceName) {
         isError: true
       };
     }
-    const local = new SqliteAdapter(getDbPath2(serviceName));
+    const local = new SqliteAdapter(opts.dbPath ?? getDbPath2(serviceName));
     const cloud = new PgAdapterAsync(getConnectionString(serviceName));
     let tableList;
     if (tablesStr) {
@@ -14624,10 +14770,10 @@ function registerCloudCommands(program2, serviceName) {
     }
   });
 }
-var __create2, __getProtoOf2, __defProp2, __getOwnPropNames2, __hasOwnProp2, __toESMCache_node2, __toESMCache_esm2, __toESM2 = (mod, isNodeMode, target) => {
+var __create2, __getProtoOf2, __defProp2, __getOwnPropNames2, __hasOwnProp2, __toESMCache_node, __toESMCache_esm, __toESM2 = (mod, isNodeMode, target) => {
   var canCache = mod != null && typeof mod === "object";
   if (canCache) {
-    var cache = isNodeMode ? __toESMCache_node2 ??= new WeakMap : __toESMCache_esm2 ??= new WeakMap;
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
     var cached2 = cache.get(mod);
     if (cached2)
       return cached2;
@@ -14637,19 +14783,19 @@ var __create2, __getProtoOf2, __defProp2, __getOwnPropNames2, __hasOwnProp2, __t
   for (let key of __getOwnPropNames2(mod))
     if (!__hasOwnProp2.call(to, key))
       __defProp2(to, key, {
-        get: __accessProp2.bind(mod, key),
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
   if (canCache)
     cache.set(mod, to);
   return to;
-}, __commonJS2 = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports), __returnValue2 = (v) => v, __export2 = (target, all) => {
+}, __commonJS2 = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports), __returnValue = (v) => v, __export2 = (target, all) => {
   for (var name in all)
     __defProp2(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: __exportSetter2.bind(all, name)
+      set: __exportSetter.bind(all, name)
     });
 }, __esm2 = (fn, res) => () => (fn && (res = fn(fn = 0)), res), __require2, require_postgres_array, require_arrayParser, require_postgres_date, require_mutable, require_postgres_interval, require_postgres_bytea, require_textParsers, require_pg_int8, require_binaryParsers, require_builtins, require_pg_types, require_defaults, require_utils, require_utils_legacy, require_utils_webcrypto, require_utils2, require_cert_signatures, require_sasl, require_type_overrides, require_pg_connection_string, require_connection_parameters, require_result, require_query, require_messages, require_buffer_writer, require_serializer, require_buffer_reader, require_parser, require_dist, require_empty, require_stream, require_connection, require_split2, require_helper, require_lib, require_client, require_pg_pool, require_query2, require_client2, require_lib2, import_lib, Client, Pool, Connection, types2, Query, DatabaseError, escapeIdentifier, escapeLiteral, Result, TypeOverrides, defaults, esm_default, init_esm, init_adapter, util3, objectUtil2, ZodParsedType2, getParsedType2 = (data) => {
   const t = typeof data;
@@ -23710,7 +23856,8 @@ function registerWebhookTools(server, { shouldRegisterTool, formatError }) {
       task_id: exports_external.string().optional().describe("Only fire for events on this specific task")
     }, async (params) => {
       try {
-        const { createWebhook: createWebhook2 } = await Promise.resolve().then(() => (init_webhooks(), exports_webhooks));
+        const { createWebhook: createWebhook2, validateWebhookUrl: validateWebhookUrl2 } = await Promise.resolve().then(() => (init_webhooks(), exports_webhooks));
+        validateWebhookUrl2(params.url);
         const wh = createWebhook2(params);
         const scope = [wh.project_id && `project:${wh.project_id}`, wh.task_list_id && `list:${wh.task_list_id}`, wh.agent_id && `agent:${wh.agent_id}`, wh.task_id && `task:${wh.task_id}`].filter(Boolean).join(", ");
         return { content: [{ type: "text", text: `Webhook created: ${wh.id.slice(0, 8)} | ${wh.url} | events: ${wh.events.length === 0 ? "all" : wh.events.join(",")}${scope ? ` | scope: ${scope}` : ""}` }] };
@@ -25979,6 +26126,39 @@ var init_pg_migrations = __esm(() => {
   CREATE UNIQUE INDEX IF NOT EXISTS idx_tasks_short_id ON tasks(short_id, machine_id) WHERE short_id IS NOT NULL AND machine_id IS NOT NULL;
   CREATE INDEX IF NOT EXISTS idx_tasks_short_id_lookup ON tasks(short_id) WHERE short_id IS NOT NULL;
   INSERT INTO _migrations (id) VALUES (40) ON CONFLICT DO NOTHING;
+  `,
+    `
+  CREATE TABLE IF NOT EXISTS task_time_logs (
+    id TEXT PRIMARY KEY,
+    task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
+    agent_id TEXT,
+    started_at TIMESTAMPTZ,
+    ended_at TIMESTAMPTZ,
+    minutes INTEGER NOT NULL,
+    notes TEXT,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+  );
+  CREATE INDEX IF NOT EXISTS idx_task_time_logs_task ON task_time_logs(task_id);
+  CREATE INDEX IF NOT EXISTS idx_task_time_logs_agent ON task_time_logs(agent_id);
+  ALTER TABLE tasks ADD COLUMN actual_minutes INTEGER;
+  INSERT INTO _migrations (id) VALUES (41) ON CONFLICT DO NOTHING;
+  `,
+    `
+  CREATE TABLE IF NOT EXISTS task_watchers (
+    id TEXT PRIMARY KEY,
+    task_id TEXT NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
+    agent_id TEXT NOT NULL,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    UNIQUE(task_id, agent_id)
+  );
+  CREATE INDEX IF NOT EXISTS idx_task_watchers_task ON task_watchers(task_id);
+  CREATE INDEX IF NOT EXISTS idx_task_watchers_agent ON task_watchers(agent_id);
+  INSERT INTO _migrations (id) VALUES (42) ON CONFLICT DO NOTHING;
+  `,
+    `
+  ALTER TABLE task_dependencies ADD COLUMN external_project_id TEXT;
+  ALTER TABLE task_dependencies ADD COLUMN external_task_id TEXT;
+  INSERT INTO _migrations (id) VALUES (43) ON CONFLICT DO NOTHING;
   `
   ];
 });
@@ -27968,7 +28148,7 @@ Blocks:
   }
   if (shouldRegisterTool("bulk_create_tasks")) {
     server.tool("bulk_create_tasks", "Create multiple tasks atomically with dependency support.", {
-      tasks: exports_external.array(exports_external.object({
+      tasks: exports_external.preprocess((val) => typeof val === "string" ? JSON.parse(val) : val, exports_external.array(exports_external.object({
         temp_id: exports_external.string().optional(),
         title: exports_external.string(),
         description: exports_external.string().optional(),
@@ -27982,7 +28162,7 @@ Blocks:
         tags: exports_external.array(exports_external.string()).optional(),
         estimated_minutes: exports_external.number().optional(),
         depends_on_temp_ids: exports_external.array(exports_external.string()).optional()
-      })),
+      }))),
       project_id: exports_external.string().optional(),
       plan_id: exports_external.string().optional(),
       task_list_id: exports_external.string().optional()
@@ -29718,6 +29898,143 @@ ${lines.join(`
       }
     });
   }
+  if (shouldRegisterTool("log_time")) {
+    server.tool("log_time", "Log time spent on a task.", {
+      task_id: exports_external.string().describe("Task ID to log time against"),
+      minutes: exports_external.number().min(1).describe("Minutes spent"),
+      agent_id: exports_external.string().optional().describe("Agent logging the time"),
+      started_at: exports_external.string().optional().describe("ISO timestamp when work started"),
+      ended_at: exports_external.string().optional().describe("ISO timestamp when work ended"),
+      notes: exports_external.string().optional().describe("Notes about what was done")
+    }, async ({ task_id, minutes, agent_id, started_at, ended_at, notes }) => {
+      try {
+        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) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
+      }
+    });
+  }
+  if (shouldRegisterTool("get_time_report")) {
+    server.tool("get_time_report", "Get time tracking report: actual vs estimated minutes for completed tasks.", {
+      project_id: exports_external.string().optional().describe("Filter by project"),
+      agent_id: exports_external.string().optional().describe("Filter by assignee"),
+      since: exports_external.string().optional().describe("ISO date \u2014 only tasks completed after this date")
+    }, async ({ project_id, agent_id, since }) => {
+      try {
+        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." }] };
+        const lines = report.map((r) => {
+          const est = r.estimated_minutes ?? "?";
+          const actual = r.actual_minutes ?? "?";
+          const diff = r.estimated_minutes != null && r.actual_minutes != null ? ` (${r.actual_minutes - r.estimated_minutes >= 0 ? "+" : ""}${r.actual_minutes - r.estimated_minutes})` : "";
+          return `${r.title.slice(0, 50)}: estimated ${est}min, actual ${actual}min${diff}`;
+        });
+        return { content: [{ type: "text", text: `Time Report:
+${lines.join(`
+`)}` }] };
+      } catch (e) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
+      }
+    });
+  }
+  if (shouldRegisterTool("watch_task")) {
+    server.tool("watch_task", "Subscribe to notifications for a task.", {
+      task_id: exports_external.string().describe("Task ID to watch"),
+      agent_id: exports_external.string().optional().describe("Agent subscribing (defaults to context agent)")
+    }, async ({ task_id, agent_id }) => {
+      try {
+        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) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
+      }
+    });
+  }
+  if (shouldRegisterTool("unwatch_task")) {
+    server.tool("unwatch_task", "Unsubscribe from notifications for a task.", {
+      task_id: exports_external.string().describe("Task ID to unwatch"),
+      agent_id: exports_external.string().optional().describe("Agent unsubscribing (defaults to context agent)")
+    }, async ({ task_id, agent_id }) => {
+      try {
+        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) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
+      }
+    });
+  }
+  if (shouldRegisterTool("get_task_watchers")) {
+    server.tool("get_task_watchers", "List agents watching a task.", {
+      task_id: exports_external.string().describe("Task ID")
+    }, async ({ task_id }) => {
+      try {
+        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." }] };
+        return { content: [{ type: "text", text: `Watching (${watchers.length}): ${watchers.map((w) => w.agent_id).join(", ")}` }] };
+      } catch (e) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
+      }
+    });
+  }
+  if (shouldRegisterTool("todos_retro")) {
+    server.tool("todos_retro", "Post-completion retrospective: stats on completed tasks, low-confidence completions, avg time vs estimate, and patterns.", {
+      project_id: exports_external.string().optional().describe("Filter by project"),
+      plan_id: exports_external.string().optional().describe("Filter by plan"),
+      task_list_id: exports_external.string().optional().describe("Filter by task list"),
+      since: exports_external.string().optional().describe("ISO date \u2014 only tasks completed after this date"),
+      agent_id: exports_external.string().optional().describe("Filter by assignee")
+    }, async ({ project_id, plan_id, task_list_id, since, agent_id }) => {
+      try {
+        const { listTasks: listTasks2 } = (init_tasks(), __toCommonJS(exports_tasks));
+        const { patrolTasks: patrolTasks2 } = (init_patrol(), __toCommonJS(exports_patrol));
+        const completed = listTasks2({ 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 = 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}` : ""})`,
+          `Low confidence: ${lowConf}/${total}`,
+          `Avg time vs estimate: ${avgDiff >= 0 ? "+" : ""}${avgDiff.toFixed(1)}min`,
+          `Currently stuck: ${stuck}`
+        ];
+        return { content: [{ type: "text", text: lines.join(`
+`) }] };
+      } catch (e) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
+      }
+    });
+  }
+  if (shouldRegisterTool("todos_inbox")) {
+    server.tool("todos_inbox", "Get unassigned tasks (GTD inbox) \u2014 tasks with no assignee, not yet started.", {
+      project_id: exports_external.string().optional().describe("Filter by project"),
+      limit: exports_external.number().optional().describe("Max results (default: 20)")
+    }, async ({ project_id, limit }) => {
+      try {
+        const { listTasks: listTasks2 } = (init_tasks(), __toCommonJS(exports_tasks));
+        const tasks = listTasks2({ status: "pending", project_id, assigned_to: "", limit: limit || 20 }, undefined);
+        if (tasks.length === 0)
+          return { content: [{ type: "text", text: "Inbox is empty." }] };
+        const lines = tasks.map((t) => `[${t.priority}] ${t.title.slice(0, 60)} (${t.id.slice(0, 8)})`);
+        return { content: [{ type: "text", text: `Inbox (${tasks.length}):
+${lines.join(`
+`)}` }] };
+      } catch (e) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
+      }
+    });
+  }
   if (shouldRegisterTool("get_agent_metrics")) {
     server.tool("get_agent_metrics", "Get performance metrics for an agent: completion rate, speed, confidence, review scores.", {
       agent_id: exports_external.string().describe("Agent ID or name"),
@@ -32779,7 +33096,7 @@ function formatTaskLine(t) {
   const plan = t.plan_id ? chalk3.magenta(` [plan:${t.plan_id.slice(0, 8)}]`) : "";
   return `${chalk3.dim(t.id.slice(0, 8))} ${statusFn(t.status.padEnd(11))} ${priorityFn(t.priority.padEnd(8))} ${t.title}${assigned}${lock}${tags}${plan}`;
 }
-program2.name("todos").description("Universal task management for AI coding agents").version(getPackageVersion()).option("--project <path>", "Project path").option("--json", "Output as JSON").option("--agent <name>", "Agent name").option("--session <id>", "Session ID");
+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");
 program2.command("add <title>").description("Create a new task").option("-d, --description <text>", "Task description").option("-p, --priority <level>", "Priority: low, medium, high, critical").option("--parent <id>", "Parent task ID").option("-t, --tags <tags>", "Comma-separated tags").option("--tag <tags>", "Comma-separated tags (alias for --tags)").option("--plan <id>", "Assign to a plan").option("--assign <agent>", "Assign to agent").option("--status <status>", "Initial status").option("--list <id>", "Task list ID").option("--task-list <id>", "Task list ID (alias for --list)").option("--estimated <minutes>", "Estimated time in minutes").option("--approval", "Require approval before completion").option("--recurrence <rule>", "Recurrence rule, e.g. 'every day', 'every weekday', 'every 2 weeks'").option("--due <date>", "Due date (ISO string or YYYY-MM-DD)").option("--reason <text>", "Why this task exists").action((title, opts) => {
   const globalOpts = program2.opts();
   const projectId = autoProject(globalOpts);
@@ -32836,6 +33153,16 @@ program2.command("list").description("List tasks").option("-s, --status <status>
   const projectId = autoProject(globalOpts);
   const hasAssignedFilter = Boolean(opts.assigned || opts.agentName);
   const hasExplicitProjectFilter = Boolean(globalOpts.project || opts.projectName);
+  const allowedSortFields = new Set(["updated", "created", "priority", "status"]);
+  if (opts.sort && !allowedSortFields.has(opts.sort)) {
+    console.error(chalk3.red(`Invalid --sort value: ${opts.sort}. Allowed values: updated, created, priority, status.`));
+    process.exit(1);
+  }
+  const allowedFormats = new Set(["table", "compact", "csv", "json"]);
+  if (opts.format && !allowedFormats.has(opts.format)) {
+    console.error(chalk3.red(`Invalid --format value: ${opts.format}. Allowed values: table, compact, csv, json.`));
+    process.exit(1);
+  }
   const filter = {};
   if (projectId && !(hasAssignedFilter && !hasExplicitProjectFilter)) {
     filter["project_id"] = projectId;
@@ -32875,8 +33202,14 @@ program2.command("list").description("List tasks").option("-s, --status <status>
   }
   if (opts.recurring)
     filter["has_recurrence"] = true;
-  if (opts.limit)
-    filter["limit"] = parseInt(opts.limit, 10);
+  if (opts.limit !== undefined) {
+    const parsedLimit = Number.parseInt(String(opts.limit), 10);
+    if (!Number.isInteger(parsedLimit) || parsedLimit <= 0) {
+      console.error(chalk3.red(`Invalid --limit value: ${opts.limit}. Must be a positive integer.`));
+      process.exit(1);
+    }
+    filter["limit"] = parsedLimit;
+  }
   let tasks = listTasks(filter);
   if (opts.dueToday) {
     const todayEnd = new Date;
@@ -33877,7 +34210,7 @@ program2.command("projects").description("List and manage projects").option("--a
     console.log(`${chalk3.dim(p.id.slice(0, 8))} ${chalk3.bold(p.name)} ${chalk3.dim(p.path)}${taskList}${p.description ? ` - ${p.description}` : ""}`);
   }
 });
-program2.command("project-rename <id-or-slug> <new-slug>").description("Rename a project slug. Cascades to matching task lists. Task prefixes (e.g. APP-00001) are unchanged.").option("--name <name>", "Also update the project display name").option("--json", "Output as JSON").action((idOrSlug, newSlug, opts) => {
+program2.command("project-rename <id-or-slug> <new-slug>").description("Rename a project slug. Cascades to matching task lists. Task prefixes (e.g. APP-00001) are unchanged.").option("--name <name>", "Also update the project display name").option("-j, --json", "Output as JSON").action((idOrSlug, newSlug, opts) => {
   const globalOpts = program2.opts();
   const useJson = opts.json || globalOpts.json;
   try {
@@ -33907,7 +34240,7 @@ program2.command("project-rename <id-or-slug> <new-slug>").description("Rename a
   }
 });
 var projectsPathCmd = program2.command("projects-path").description("Manage machine-local path overrides for projects");
-projectsPathCmd.command("set <project-id> <path>").description("Set the local path for a project on this machine").option("--json", "Output as JSON").action((projectId, projectPath, opts) => {
+projectsPathCmd.command("set <project-id> <path>").description("Set the local path for a project on this machine").option("-j, --json", "Output as JSON").action((projectId, projectPath, opts) => {
   const globalOpts = program2.opts();
   const useJson = opts.json || globalOpts.json;
   try {
@@ -33929,7 +34262,7 @@ projectsPathCmd.command("set <project-id> <path>").description("Set the local pa
     process.exit(1);
   }
 });
-projectsPathCmd.command("list <project-id>").description("List all machine path overrides for a project").option("--json", "Output as JSON").action((projectId, opts) => {
+projectsPathCmd.command("list <project-id>").description("List all machine path overrides for a project").option("-j, --json", "Output as JSON").action((projectId, opts) => {
   const globalOpts = program2.opts();
   const useJson = opts.json || globalOpts.json;
   try {
@@ -34581,7 +34914,7 @@ program2.command("agent-update <name>").alias("agents-update").description("Upda
     handleError(e);
   }
 });
-program2.command("agent <name>").description("Show all info about an agent: tasks, status, last seen, stats").option("--json", "Output as JSON").action((name, opts) => {
+program2.command("agent <name>").description("Show all info about an agent: tasks, status, last seen, stats").option("-j, --json", "Output as JSON").action((name, opts) => {
   const globalOpts = program2.opts();
   const { getAgentByName: findByName } = (init_agents(), __toCommonJS(exports_agents));
   const agent = findByName(name);
@@ -35014,7 +35347,7 @@ program2.command("dashboard").description("Live-updating dashboard showing proje
   const projectId = opts.project || autoProject(globalOpts) || undefined;
   render2(React.createElement(Dashboard2, { projectId, refreshMs: parseInt(opts.refresh, 10) }));
 });
-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("--json", "Output as JSON").action(async (opts) => {
+program2.command("next").description("Show the best pending task to work on next").option("--agent <id>", "Prefer tasks assigned to this agent").option("--project <id>", "Filter to project").option("-j, --json", "Output as JSON").action(async (opts) => {
   const globalOpts = program2.opts();
   const db = getDatabase();
   const filters = {};
@@ -35038,7 +35371,7 @@ program2.command("next").description("Show the best pending task to work on next
   if (task.description)
     console.log(chalk3.dim(`  ${task.description.slice(0, 100)}`));
 });
-program2.command("claim <agent>").description("Atomically claim the best pending task for an agent").option("--project <id>", "Filter to project").option("--json", "Output as JSON").action(async (agent, opts) => {
+program2.command("claim <agent>").description("Atomically claim the best pending task for an agent").option("--project <id>", "Filter to project").option("-j, --json", "Output as JSON").action(async (agent, opts) => {
   const db = getDatabase();
   const filters = {};
   if (opts.project)
@@ -35068,7 +35401,7 @@ program2.command("steal <agent>").description("Work-stealing: take the highest-p
   }
   console.log(chalk3.green(`Stolen: ${task.short_id || task.id.slice(0, 8)} | ${task.priority} | ${task.title}`));
 });
-program2.command("status").description("Show full project health snapshot").option("--agent <id>", "Include next task for this agent").option("--project <id>", "Filter to project").option("--json", "Output as JSON").action(async (opts) => {
+program2.command("status").description("Show full project health snapshot").option("--agent <id>", "Include next task for this agent").option("--project <id>", "Filter to project").option("-j, --json", "Output as JSON").action(async (opts) => {
   const db = getDatabase();
   const filters = {};
   if (opts.project)
@@ -35212,7 +35545,7 @@ Blocked:`));
   }
   console.log();
 });
-program2.command("fail <id>").description("Mark a task as failed with optional reason and retry").option("--reason <text>", "Why it failed").option("--agent <id>", "Agent reporting the failure").option("--retry", "Auto-create a retry copy").option("--json", "Output as JSON").action(async (id, opts) => {
+program2.command("fail <id>").description("Mark a task as failed with optional reason and retry").option("--reason <text>", "Why it failed").option("--agent <id>", "Agent reporting the failure").option("--retry", "Auto-create a retry copy").option("-j, --json", "Output as JSON").action(async (id, opts) => {
   const db = getDatabase();
   const resolvedId = resolvePartialId(db, "tasks", id);
   if (!resolvedId) {
@@ -35230,7 +35563,7 @@ program2.command("fail <id>").description("Mark a task as failed with optional r
   if (result.retryTask)
     console.log(chalk3.yellow(`Retry created: ${result.retryTask.short_id || result.retryTask.id.slice(0, 8)} | ${result.retryTask.title}`));
 });
-program2.command("active").description("Show all currently in-progress tasks").option("--project <id>", "Filter to project").option("--json", "Output as JSON").action(async (opts) => {
+program2.command("active").description("Show all currently in-progress tasks").option("--project <id>", "Filter to project").option("-j, --json", "Output as JSON").action(async (opts) => {
   const db = getDatabase();
   const filters = {};
   if (opts.project)
@@ -35251,7 +35584,7 @@ program2.command("active").description("Show all currently in-progress tasks").o
     console.log(`  ${chalk3.cyan(id)} | ${chalk3.yellow(w.priority)} | ${agent.padEnd(12)} | ${w.title}`);
   }
 });
-program2.command("stale").description("Find tasks stuck in_progress with no recent activity").option("--minutes <n>", "Stale threshold in minutes", "30").option("--project <id>", "Filter to project").option("--json", "Output as JSON").action(async (opts) => {
+program2.command("stale").description("Find tasks stuck in_progress with no recent activity").option("--minutes <n>", "Stale threshold in minutes", "30").option("--project <id>", "Filter to project").option("-j, --json", "Output as JSON").action(async (opts) => {
   const db = getDatabase();
   const filters = {};
   if (opts.project)
@@ -35272,7 +35605,7 @@ program2.command("stale").description("Find tasks stuck in_progress with no rece
     console.log(`  ${chalk3.cyan(id)} | ${t.locked_by || t.assigned_to || "?"} | ${t.title} ${chalk3.dim(`(${staleMin}min stale)`)}`);
   }
 });
-program2.command("redistribute <agent>").description("Release stale in-progress tasks and claim the best one (work-stealing)").option("--max-age <minutes>", "Stale threshold in minutes", "60").option("--project <id>", "Limit to a specific project").option("--limit <n>", "Max stale tasks to release").option("--json", "Output as JSON").action(async (agent, opts) => {
+program2.command("redistribute <agent>").description("Release stale in-progress tasks and claim the best one (work-stealing)").option("--max-age <minutes>", "Stale threshold in minutes", "60").option("--project <id>", "Limit to a specific project").option("--limit <n>", "Max stale tasks to release").option("-j, --json", "Output as JSON").action(async (agent, opts) => {
   const globalOpts = program2.opts();
   const db = getDatabase();
   const projectId = opts.project ? resolveTaskId(opts.project) : autoProject(globalOpts) ?? undefined;
@@ -35299,7 +35632,7 @@ Claimed: ${chalk3.cyan(id)} ${result.claimed.title}`));
 No task claimed (nothing available).`));
   }
 });
-program2.command("assign <id> <agent>").description("Assign a task to an agent").option("--json", "Output as JSON").action((id, agent, opts) => {
+program2.command("assign <id> <agent>").description("Assign a task to an agent").option("-j, --json", "Output as JSON").action((id, agent, opts) => {
   const globalOpts = program2.opts();
   const resolvedId = resolveTaskId(id);
   const db = getDatabase();
@@ -35319,7 +35652,7 @@ program2.command("assign <id> <agent>").description("Assign a task to an agent")
     handleError(new Error("Failed to assign"));
   }
 });
-program2.command("unassign <id>").description("Remove task assignment").option("--json", "Output as JSON").action((id, opts) => {
+program2.command("unassign <id>").description("Remove task assignment").option("-j, --json", "Output as JSON").action((id, opts) => {
   const globalOpts = program2.opts();
   const resolvedId = resolveTaskId(id);
   const db = getDatabase();
@@ -35339,7 +35672,7 @@ program2.command("unassign <id>").description("Remove task assignment").option("
     handleError(new Error("Failed to unassign"));
   }
 });
-program2.command("tag <id> <tag>").description("Add a tag to a task").option("--json", "Output as JSON").action((id, tag, opts) => {
+program2.command("tag <id> <tag>").description("Add a tag to a task").option("-j, --json", "Output as JSON").action((id, tag, opts) => {
   const globalOpts = program2.opts();
   const resolvedId = resolveTaskId(id);
   const db = getDatabase();
@@ -35360,7 +35693,7 @@ program2.command("tag <id> <tag>").description("Add a tag to a task").option("--
     handleError(new Error("Failed to tag"));
   }
 });
-program2.command("untag <id> <tag>").description("Remove a tag from a task").option("--json", "Output as JSON").action((id, tag, opts) => {
+program2.command("untag <id> <tag>").description("Remove a tag from a task").option("-j, --json", "Output as JSON").action((id, tag, opts) => {
   const globalOpts = program2.opts();
   const resolvedId = resolveTaskId(id);
   const db = getDatabase();
@@ -35381,7 +35714,7 @@ program2.command("untag <id> <tag>").description("Remove a tag from a task").opt
     handleError(new Error("Failed to untag"));
   }
 });
-program2.command("pin <id>").description("Escalate task to critical priority").option("--json", "Output as JSON").action((id, opts) => {
+program2.command("pin <id>").description("Escalate task to critical priority").option("-j, --json", "Output as JSON").action((id, opts) => {
   const globalOpts = program2.opts();
   const resolvedId = resolveTaskId(id);
   const db = getDatabase();
@@ -35397,7 +35730,7 @@ program2.command("pin <id>").description("Escalate task to critical priority").o
     handleError(new Error("Failed to pin"));
   }
 });
-program2.command("summary").description("Generate a markdown summary of recent task activity").option("--days <n>", "Days of history to include", "7").option("--project <id>", "Filter to project").option("--agent <id>", "Filter to agent").option("--json", "Output as JSON").action(async (opts) => {
+program2.command("summary").description("Generate a markdown summary of recent task activity").option("--days <n>", "Days of history to include", "7").option("--project <id>", "Filter to project").option("--agent <id>", "Filter to agent").option("-j, --json", "Output as JSON").action(async (opts) => {
   const globalOpts = program2.opts();
   const db = getDatabase();
   const days = parseInt(opts.days, 10);
@@ -35452,7 +35785,7 @@ program2.command("summary").description("Generate a markdown summary of recent t
   console.log(lines.join(`
 `));
 });
-program2.command("doctor").description("Diagnose common task data issues").option("--fix", "Auto-fix recoverable issues where possible").option("--json", "Output as JSON").action(async (opts) => {
+program2.command("doctor").description("Diagnose common task data issues").option("--fix", "Auto-fix recoverable issues where possible").option("-j, --json", "Output as JSON").action(async (opts) => {
   const globalOpts = program2.opts();
   const db = getDatabase();
   const issues = [];
@@ -35494,7 +35827,7 @@ program2.command("doctor").description("Diagnose common task data issues").optio
     console.log(chalk3[errors2 > 0 ? "red" : "yellow"](`
   ${errors2} error(s), ${warns} warning(s). Run with --fix to auto-resolve where possible.`));
 });
-program2.command("health").description("Check todos system health \u2014 database, config, connectivity").option("--json", "Output as JSON").action(async (opts) => {
+program2.command("health").description("Check todos system health \u2014 database, config, connectivity").option("-j, --json", "Output as JSON").action(async (opts) => {
   const globalOpts = program2.opts();
   const checks = [];
   try {
@@ -35549,7 +35882,7 @@ program2.command("health").description("Check todos system health \u2014 databas
   console.log(`
   ${allOk ? chalk3.green("All checks passed.") : chalk3.yellow("Some checks need attention.")}`);
 });
-program2.command("report").description("Analytics report: task activity, completion rates, agent breakdown").option("--days <n>", "Days to include in report", "7").option("--project <id>", "Filter to project").option("--markdown", "Output as markdown").option("--json", "Output as JSON").action(async (opts) => {
+program2.command("report").description("Analytics report: task activity, completion rates, agent breakdown").option("--days <n>", "Days to include in report", "7").option("--project <id>", "Filter to project").option("--markdown", "Output as markdown").option("-j, --json", "Output as JSON").action(async (opts) => {
   const globalOpts = program2.opts();
   const db = getDatabase();
   const days = parseInt(opts.days, 10);
@@ -35614,7 +35947,7 @@ program2.command("report").description("Analytics report: task activity, complet
   console.log(lines.join(`
 `));
 });
-program2.command("today").description("Show task activity from today").option("--json", "Output as JSON").action(async (opts) => {
+program2.command("today").description("Show task activity from today").option("-j, --json", "Output as JSON").action(async (opts) => {
   const globalOpts = program2.opts();
   const db = getDatabase();
   const { getTasksChangedSince: getTasksChangedSince2 } = (init_tasks(), __toCommonJS(exports_tasks));
@@ -35644,7 +35977,7 @@ program2.command("today").description("Show task activity from today").option("-
   if (completed.length === 0 && started.length === 0)
     console.log(chalk3.dim("  No activity today."));
 });
-program2.command("yesterday").description("Show task activity from yesterday").option("--json", "Output as JSON").action(async (opts) => {
+program2.command("yesterday").description("Show task activity from yesterday").option("-j, --json", "Output as JSON").action(async (opts) => {
   const globalOpts = program2.opts();
   const db = getDatabase();
   const { getTasksChangedSince: getTasksChangedSince2 } = (init_tasks(), __toCommonJS(exports_tasks));
@@ -35677,7 +36010,7 @@ program2.command("yesterday").description("Show task activity from yesterday").o
   if (completed.length === 0 && started.length === 0)
     console.log(chalk3.dim("  No activity yesterday."));
 });
-program2.command("mine").description("Show tasks assigned to you, grouped by status").argument("<agent>", "Agent name or ID").option("--json", "Output as JSON").action(async (agent, opts) => {
+program2.command("mine").description("Show tasks assigned to you, grouped by status").argument("<agent>", "Agent name or ID").option("-j, --json", "Output as JSON").action(async (agent, opts) => {
   const globalOpts = program2.opts();
   const db = getDatabase();
   const { listTasks: listTasks2 } = (init_tasks(), __toCommonJS(exports_tasks));
@@ -35728,7 +36061,7 @@ program2.command("mine").description("Show tasks assigned to you, grouped by sta
   if (tasks.length === 0)
     console.log(chalk3.dim(`  No tasks assigned to ${agent}.`));
 });
-program2.command("blocked").description("Show tasks blocked by incomplete dependencies").option("--json", "Output as JSON").option("--project <id>", "Filter to project").action(async (opts) => {
+program2.command("blocked").description("Show tasks blocked by incomplete dependencies").option("-j, --json", "Output as JSON").option("--project <id>", "Filter to project").action(async (opts) => {
   const globalOpts = program2.opts();
   const db = getDatabase();
   const { listTasks: listTasks2, getBlockingDeps: getBlockingDeps2 } = (init_tasks(), __toCommonJS(exports_tasks));
@@ -35760,7 +36093,7 @@ program2.command("blocked").description("Show tasks blocked by incomplete depend
     }
   }
 });
-program2.command("overdue").description("Show tasks past their due date").option("--json", "Output as JSON").option("--project <id>", "Filter to project").action(async (opts) => {
+program2.command("overdue").description("Show tasks past their due date").option("-j, --json", "Output as JSON").option("--project <id>", "Filter to project").action(async (opts) => {
   const globalOpts = program2.opts();
   const projectId = autoProject(globalOpts) || opts.project || undefined;
   const { getOverdueTasks: getOverdueTasks2 } = (init_tasks(), __toCommonJS(exports_tasks));
@@ -35782,7 +36115,7 @@ program2.command("overdue").description("Show tasks past their due date").option
     console.log(`  ${urgency} ${chalk3.cyan(t.short_id || t.id.slice(0, 8))} ${t.title}${t.assigned_to ? chalk3.dim(` \u2014 ${t.assigned_to}`) : ""} ${chalk3.dim(`(due ${dueDate})`)}`);
   }
 });
-program2.command("week").description("Show task activity from the past 7 days").option("--json", "Output as JSON").action(async (opts) => {
+program2.command("week").description("Show task activity from the past 7 days").option("-j, --json", "Output as JSON").action(async (opts) => {
   const globalOpts = program2.opts();
   const db = getDatabase();
   const { getTasksChangedSince: getTasksChangedSince2 } = (init_tasks(), __toCommonJS(exports_tasks));
@@ -35835,7 +36168,7 @@ program2.command("week").description("Show task activity from the past 7 days").
   if (tasks.length === 0)
     console.log(chalk3.dim("  No activity this week."));
 });
-program2.command("burndown").description("Show task completion velocity over the past 7 days").option("--days <n>", "Number of days", "7").option("--json", "Output as JSON").action(async (opts) => {
+program2.command("burndown").description("Show task completion velocity over the past 7 days").option("--days <n>", "Number of days", "7").option("-j, --json", "Output as JSON").action(async (opts) => {
   const globalOpts = program2.opts();
   const db = getDatabase();
   const { getRecentActivity: getRecentActivity2 } = (init_audit(), __toCommonJS(exports_audit));
@@ -35877,7 +36210,7 @@ program2.command("burndown").description("Show task completion velocity over the
   console.log(chalk3.dim(`
   Velocity: ${velocity}/day \xB7 ${totalCompleted} done \xB7 ${totalCreated} created`));
 });
-program2.command("log").description("Show recent task activity log (git-log style)").option("--limit <n>", "Number of entries", "30").option("--json", "Output as JSON").action(async (opts) => {
+program2.command("log").description("Show recent task activity log (git-log style)").option("--limit <n>", "Number of entries", "30").option("-j, --json", "Output as JSON").action(async (opts) => {
   const globalOpts = program2.opts();
   const db = getDatabase();
   const { getRecentActivity: getRecentActivity2 } = (init_audit(), __toCommonJS(exports_audit));
@@ -35921,7 +36254,7 @@ program2.command("log").description("Show recent task activity log (git-log styl
     console.log(`  ${chalk3.dim(time)} ${icon} ${e.action.padEnd(8)} ${taskRef}${detail}${agent}`);
   }
 });
-program2.command("ready").description("Show all tasks ready to be claimed (pending, unblocked, unlocked)").option("--json", "Output as JSON").option("--project <id>", "Filter to project").option("--limit <n>", "Max tasks to show", "20").action(async (opts) => {
+program2.command("ready").description("Show all tasks ready to be claimed (pending, unblocked, unlocked)").option("-j, --json", "Output as JSON").option("--project <id>", "Filter to project").option("--limit <n>", "Max tasks to show", "20").action(async (opts) => {
   const globalOpts = program2.opts();
   const db = getDatabase();
   const { listTasks: listTasks2, getBlockingDeps: getBlockingDeps2 } = (init_tasks(), __toCommonJS(exports_tasks));
@@ -35954,7 +36287,7 @@ program2.command("ready").description("Show all tasks ready to be claimed (pendi
     console.log(`  ${chalk3.cyan(t.short_id || t.id.slice(0, 8))} ${t.title} ${pri}${due}`);
   }
 });
-program2.command("sprint").description("Sprint dashboard: in-progress, next up, blockers, and overdue").option("--json", "Output as JSON").option("--project <id>", "Filter to project").action(async (opts) => {
+program2.command("sprint").description("Sprint dashboard: in-progress, next up, blockers, and overdue").option("-j, --json", "Output as JSON").option("--project <id>", "Filter to project").action(async (opts) => {
   const globalOpts = program2.opts();
   const db = getDatabase();
   const { listTasks: listTasks2, getBlockingDeps: getBlockingDeps2 } = (init_tasks(), __toCommonJS(exports_tasks));
@@ -36015,7 +36348,7 @@ program2.command("sprint").description("Sprint dashboard: in-progress, next up,
   console.log(chalk3.dim(`
   ${inProgress.length} active \xB7 ${pending.length} pending \xB7 ${blocked.length} blocked \xB7 ${overdue.length} overdue`));
 });
-program2.command("handoff").description("Create or view agent session handoffs").option("--create", "Create a new handoff").option("--agent <name>", "Agent name").option("--summary <text>", "Handoff summary").option("--completed <items>", "Comma-separated completed items").option("--in-progress <items>", "Comma-separated in-progress items").option("--blockers <items>", "Comma-separated blockers").option("--next <items>", "Comma-separated next steps").option("--json", "Output as JSON").option("--limit <n>", "Number of handoffs to show", "5").action(async (opts) => {
+program2.command("handoff").description("Create or view agent session handoffs").option("--create", "Create a new handoff").option("--agent <name>", "Agent name").option("--summary <text>", "Handoff summary").option("--completed <items>", "Comma-separated completed items").option("--in-progress <items>", "Comma-separated in-progress items").option("--blockers <items>", "Comma-separated blockers").option("--next <items>", "Comma-separated next steps").option("-j, --json", "Output as JSON").option("--limit <n>", "Number of handoffs to show", "5").action(async (opts) => {
   const globalOpts = program2.opts();
   const db = getDatabase();
   const { createHandoff: createHandoff2, listHandoffs: listHandoffs2 } = (init_handoffs(), __toCommonJS(exports_handoffs));
@@ -36077,7 +36410,7 @@ program2.command("handoff").description("Create or view agent session handoffs")
     }
   }
 });
-program2.command("priorities").description("Show task counts grouped by priority").option("--json", "Output as JSON").option("--project <id>", "Filter to project").action(async (opts) => {
+program2.command("priorities").description("Show task counts grouped by priority").option("-j, --json", "Output as JSON").option("--project <id>", "Filter to project").action(async (opts) => {
   const globalOpts = program2.opts();
   const db = getDatabase();
   const { countTasks: countTasks2 } = (init_tasks(), __toCommonJS(exports_tasks));
@@ -36109,7 +36442,7 @@ program2.command("priorities").description("Show task counts grouped by priority
     console.log(`  ${color(p.padEnd(9))} ${String(c.total).padStart(4)} total  ${chalk3.green(String(c.completed).padStart(3))} done  ${chalk3.blue(String(c.in_progress).padStart(3))} active  ${chalk3.dim(String(c.pending).padStart(3))} pending  ${bar}`);
   }
 });
-program2.command("context").description("Session start context: status, latest handoff, next task, overdue").option("--agent <name>", "Agent name for handoff lookup").option("--json", "Output as JSON").action(async (opts) => {
+program2.command("context").description("Session start context: status, latest handoff, next task, overdue").option("--agent <name>", "Agent name for handoff lookup").option("-j, --json", "Output as JSON").action(async (opts) => {
   const globalOpts = program2.opts();
   const db = getDatabase();
   const { getStatus: getStatus2 } = (init_tasks(), __toCommonJS(exports_tasks));
@@ -36151,7 +36484,7 @@ program2.command("context").description("Session start context: status, latest h
   console.log(chalk3.dim(`
   as_of: ${new Date().toISOString()}`));
 });
-program2.command("report-failure").description("Create a task from a test/build/typecheck failure and auto-assign it").requiredOption("--error <message>", "Error message or summary").option("--type <type>", "Failure type: test, build, typecheck, runtime, other", "test").option("--file <path>", "File where failure occurred").option("--stack <trace>", "Stack trace or detailed output").option("--title <title>", "Custom task title (auto-generated if omitted)").option("--priority <p>", "Priority: low, medium, high, critical").option("--json", "Output as JSON").action(async (opts) => {
+program2.command("report-failure").description("Create a task from a test/build/typecheck failure and auto-assign it").requiredOption("--error <message>", "Error message or summary").option("--type <type>", "Failure type: test, build, typecheck, runtime, other", "test").option("--file <path>", "File where failure occurred").option("--stack <trace>", "Stack trace or detailed output").option("--title <title>", "Custom task title (auto-generated if omitted)").option("--priority <p>", "Priority: low, medium, high, critical").option("-j, --json", "Output as JSON").action(async (opts) => {
   const globalOpts = program2.opts();
   const { createTask: createTask2 } = (init_tasks(), __toCommonJS(exports_tasks));
   const { autoAssignTask: autoAssignTask2 } = await Promise.resolve().then(() => (init_auto_assign(), exports_auto_assign));
@@ -36210,7 +36543,7 @@ program2.action(async () => {
 });
 program2.addCommand(makeBrainsCommand());
 var dbCmd = program2.command("db").description("Database management commands");
-dbCmd.command("migrate-pg").description("Apply PostgreSQL migrations to the configured RDS instance").option("--connection-string <url>", "PostgreSQL connection string (overrides cloud config)").option("--json", "Output as JSON").action(async (opts) => {
+dbCmd.command("migrate-pg").description("Apply PostgreSQL migrations to the configured RDS instance").option("--connection-string <url>", "PostgreSQL connection string (overrides cloud config)").option("-j, --json", "Output as JSON").action(async (opts) => {
   const globalOpts = program2.opts();
   const useJson = opts.json || globalOpts.json;
   let connStr;
@@ -36263,7 +36596,7 @@ dbCmd.command("migrate-pg").description("Apply PostgreSQL migrations to the conf
   }
 });
 var cloudCmd = program2.command("cloud").description("Cloud sync commands");
-cloudCmd.command("status").description("Show cloud config, connection health, machine registry, and sync status").option("--json", "Output as JSON").action(async (opts) => {
+cloudCmd.command("status").description("Show cloud config, connection health, machine registry, and sync status").option("-j, --json", "Output as JSON").action(async (opts) => {
   const globalOpts = program2.opts();
   const useJson = opts.json || globalOpts.json;
   try {
@@ -36354,7 +36687,7 @@ Conflicts`));
     }
   }
 });
-cloudCmd.command("push").description("Push local data to cloud PostgreSQL").option("--tables <tables>", "Comma-separated table names (default: all)").option("--json", "Output as JSON").action(async (opts) => {
+cloudCmd.command("push").description("Push local data to cloud PostgreSQL").option("--tables <tables>", "Comma-separated table names (default: all)").option("-j, --json", "Output as JSON").action(async (opts) => {
   const globalOpts = program2.opts();
   const useJson = opts.json || globalOpts.json;
   try {
@@ -36414,7 +36747,7 @@ cloudCmd.command("push").description("Push local data to cloud PostgreSQL").opti
     process.exit(1);
   }
 });
-cloudCmd.command("pull").description("Pull cloud data to local \u2014 merges by primary key").option("--tables <tables>", "Comma-separated table names (default: all)").option("--json", "Output as JSON").action(async (opts) => {
+cloudCmd.command("pull").description("Pull cloud data to local \u2014 merges by primary key").option("--tables <tables>", "Comma-separated table names (default: all)").option("-j, --json", "Output as JSON").action(async (opts) => {
   const globalOpts = program2.opts();
   const useJson = opts.json || globalOpts.json;
   try {
@@ -36472,7 +36805,7 @@ cloudCmd.command("pull").description("Pull cloud data to local \u2014 merges by
     process.exit(1);
   }
 });
-cloudCmd.command("sync").description("Bidirectional sync \u2014 pull remote changes then push local changes").option("--tables <tables>", "Comma-separated table names (default: all)").option("--json", "Output as JSON").action(async (opts) => {
+cloudCmd.command("sync").description("Bidirectional sync \u2014 pull remote changes then push local changes").option("--tables <tables>", "Comma-separated table names (default: all)").option("-j, --json", "Output as JSON").action(async (opts) => {
   const globalOpts = program2.opts();
   const useJson = opts.json || globalOpts.json;
   try {
@@ -36548,7 +36881,7 @@ cloudCmd.command("sync").description("Bidirectional sync \u2014 pull remote chan
     process.exit(1);
   }
 });
-cloudCmd.command("conflicts").description("List sync conflicts detected during push/pull").option("--resolved", "Show resolved conflicts instead of unresolved").option("--table <table>", "Filter by table name").option("--limit <n>", "Max conflicts to show", "20").option("--json", "Output as JSON").action(async (opts) => {
+cloudCmd.command("conflicts").description("List sync conflicts detected during push/pull").option("--resolved", "Show resolved conflicts instead of unresolved").option("--table <table>", "Filter by table name").option("--limit <n>", "Max conflicts to show", "20").option("-j, --json", "Output as JSON").action(async (opts) => {
   const globalOpts = program2.opts();
   const useJson = opts.json || globalOpts.json;
   try {