@hasna/todos 0.13.9 → 0.13.11

package/dist/cli/index.js

@@ -2123,7 +2123,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@hasna/todos",
-    version: "0.13.9",
+    version: "0.13.11",
     description: "Universal task management for AI coding agents - CLI + MCP server + interactive TUI",
     type: "module",
     main: "dist/index.js",
@@ -2173,8 +2173,8 @@ var init_package = __esm(() => {
       "README.md"
     ],
     scripts: {
-      build: "rm -rf dist dashboard/dist && cd dashboard && bun install --frozen-lockfile && bun run build && cd .. && bun build src/cli/index.tsx --outdir dist/cli --target bun --external ink --external react --external chalk --external @modelcontextprotocol/sdk --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/mcp/index.ts --outdir dist/mcp --target bun --external @modelcontextprotocol/sdk --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/server/index.ts --outdir dist/server --target bun --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/sdk/index.ts --outdir dist/sdk --target bun --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/index.ts src/mcp.ts src/registry.ts src/contracts.ts src/storage.ts src/testing.ts --outdir dist --target bun --external '@hasna/contracts' --external '@hasna/contracts/*' && tsc --emitDeclarationOnly --outDir dist",
-      "build:server": "rm -rf dist && bun build src/cli/index.tsx --outdir dist/cli --target bun --external ink --external react --external chalk --external @modelcontextprotocol/sdk --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/mcp/index.ts --outdir dist/mcp --target bun --external @modelcontextprotocol/sdk --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/server/index.ts --outdir dist/server --target bun --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/sdk/index.ts --outdir dist/sdk --target bun --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/index.ts src/mcp.ts src/registry.ts src/contracts.ts src/storage.ts src/testing.ts --outdir dist --target bun --external '@hasna/contracts' --external '@hasna/contracts/*'",
+      build: "rm -rf dist dashboard/dist && cd dashboard && bun install --frozen-lockfile && bun run build && cd .. && bun build src/cli/index.tsx --outdir dist/cli --target bun --external ink --external react --external chalk --external @modelcontextprotocol/sdk --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/mcp/index.ts --outdir dist/mcp --target bun --external @modelcontextprotocol/sdk --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/server/index.ts --outdir dist/server --target bun && bun build src/sdk/index.ts --outdir dist/sdk --target bun --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/index.ts src/mcp.ts src/registry.ts src/contracts.ts src/storage.ts src/testing.ts --outdir dist --target bun --external '@hasna/contracts' --external '@hasna/contracts/*' && tsc --emitDeclarationOnly --outDir dist",
+      "build:server": "rm -rf dist && bun build src/cli/index.tsx --outdir dist/cli --target bun --external ink --external react --external chalk --external @modelcontextprotocol/sdk --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/mcp/index.ts --outdir dist/mcp --target bun --external @modelcontextprotocol/sdk --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/server/index.ts --outdir dist/server --target bun && bun build src/sdk/index.ts --outdir dist/sdk --target bun --external '@hasna/contracts' --external '@hasna/contracts/*' && bun build src/index.ts src/mcp.ts src/registry.ts src/contracts.ts src/storage.ts src/testing.ts --outdir dist --target bun --external '@hasna/contracts' --external '@hasna/contracts/*'",
       migrate: "bun run src/server/index.ts migrate",
       "backfill:comment-redaction": "bun run src/server/index.ts redact-comments",
       "generate:sdk": "bun run scripts/generate-sdk.ts",
@@ -2258,7 +2258,7 @@ var init_package_version = __esm(() => {
 function isBlockingDependencyStatus(status) {
   return status !== "completed" && status !== "cancelled";
 }
-var TASK_STATUSES, TASK_PRIORITIES, VersionConflictError, TaskNotFoundError, TaskReferenceAmbiguousError, ProjectNotFoundError, ResourceConflictError, PlanNotFoundError, LockError, AgentNotFoundError, IdentityAliasAmbiguousError, IdentityIdImmutableError, TaskListNotFoundError, DependencyCycleError, CompletionGuardError, DispatchNotFoundError;
+var TASK_STATUSES, TASK_PRIORITIES, VersionConflictError, TaskNotFoundError, TaskNotStartableError, TaskReferenceAmbiguousError, ProjectNotFoundError, ResourceConflictError, PlanNotFoundError, LockError, AgentNotFoundError, IdentityAliasAmbiguousError, IdentityIdImmutableError, TaskListNotFoundError, DependencyCycleError, CompletionGuardError, DispatchNotFoundError;
 var init_types = __esm(() => {
   TASK_STATUSES = [
     "pending",
@@ -2297,6 +2297,20 @@ var init_types = __esm(() => {
       this.name = "TaskNotFoundError";
     }
   };
+  TaskNotStartableError = class TaskNotStartableError extends Error {
+    taskId;
+    status;
+    agentId;
+    static code = "TASK_NOT_STARTABLE";
+    static suggestion = "Reset the task status to pending before starting it again.";
+    constructor(taskId, status, agentId) {
+      super(`Task ${taskId} is ${status} and cannot be started by ${agentId}; ` + "reset the task status to pending before starting it again");
+      this.taskId = taskId;
+      this.status = status;
+      this.agentId = agentId;
+      this.name = "TaskNotStartableError";
+    }
+  };
   TaskReferenceAmbiguousError = class TaskReferenceAmbiguousError extends Error {
     reference;
     static code = "TASK_REFERENCE_AMBIGUOUS";
@@ -5174,6 +5188,16 @@ function classifyRemoteRequestError(baseUrl, route, error) {
   if (status === 403) {
     throw new Error(`REMOTE_API_FORBIDDEN: configured Todos authority ${baseUrl} denied ${route}; local SQLite fallback is disabled`, { cause: error });
   }
+  if (status === 409) {
+    const body = error && typeof error === "object" ? error.body : undefined;
+    if (body && typeof body === "object" && !Array.isArray(body)) {
+      const remoteError = body;
+      if (remoteError.code === "TASK_NOT_STARTABLE" && typeof remoteError.error === "string" && remoteError.error.length > 0) {
+        throw new Error(`${remoteError.code}: ${remoteError.error}`, { cause: error });
+      }
+    }
+    throw error;
+  }
   if (typeof status === "number" && status >= 300 && status < 400) {
     throw new Error(`REMOTE_API_REDIRECT_REJECTED: configured Todos authority ${baseUrl} redirected ${route}; ` + "authenticated redirects are disabled to prevent credential leakage", { cause: error });
   }
@@ -5608,7 +5632,10 @@ function resolveCloudProjectRef(projects, ref) {
     if (matches.length > 1)
       throw new Error(`Project reference is ambiguous: "${input}"`);
   }
-  throw new Error(`Project not found: "${input}"`);
+  if (UUID_RE.test(input) || /^[0-9a-f]{4,}$/i.test(input)) {
+    throw new Error(`Project not found: "${input}"`);
+  }
+  throw new Error(`Project not found: "${input}" \u2014 no project in todos's own project registry matches this ` + `name, path, or slug. This does not know about projects registered elsewhere (for example ` + `a Hasna Projects CLI workspace) \u2014 resolve it there first (e.g. "projects show ${input} ` + `--json") and pass the resulting id or task-list slug, or run "todos projects create" to ` + `register it here. Do not assume "${input}" has never been created.`);
 }
 async function cloudResolveProjectRef(client, ref) {
   return resolveCloudProjectRef(await cloudListProjects(client), ref);
@@ -5625,6 +5652,16 @@ async function cloudUpdateProject(client, id, patch) {
   }
   return raw;
 }
+async function cloudDeleteProject(client, id) {
+  try {
+    await client.transport.del(`/projects/${encodeURIComponent(id)}`);
+  } catch (error) {
+    if (error && typeof error === "object" && error.status === 404)
+      return false;
+    throw error;
+  }
+  return true;
+}
 async function cloudListPlans(client, projectId) {
   const query = projectId ? { project_id: projectId } : {};
   const res = await requiredRemoteRoute(client, "/v1/plans", () => client.list("plans", { query }));
@@ -6412,7 +6449,9 @@ function disqualifyingArgument(invocation) {
         return dropIt("the `routing` subcommand");
       return firstPresentOption(args, ["--apply", "--fix"]);
     case "projects":
-      return firstPresentOption(args, ["--deregister", "--path-prefix", "--dry-run"]);
+      if (hasOption(args, "--deregister"))
+        return null;
+      return firstPresentOption(args, ["--path-prefix", "--dry-run"]);
     case "plans":
       return firstPresentOption(args, ["--artifact", "--write-artifacts"]);
     case "list":
@@ -11363,6 +11402,24 @@ var init_projects = __esm(() => {
   init_storage_tombstones();
 });
 
+// src/lib/lock-display.ts
+function lockDisplayState(lockedBy, lockedAt, nowMs = Date.now()) {
+  const holder = lockedBy ?? null;
+  const at = lockedAt ?? null;
+  if (!holder) {
+    return { present: false, held: false, expired: false, holder: null, lockedAt: at };
+  }
+  const expired = isLockExpired(at, nowMs);
+  return { present: true, held: !expired, expired, holder, lockedAt: at };
+}
+function formatExpiredLock(state) {
+  const at = state.lockedAt ? ` at ${state.lockedAt}` : "";
+  return `expired (last held by ${state.holder}${at})`;
+}
+var init_lock_display = __esm(() => {
+  init_database();
+});
+
 // src/cli/helpers.ts
 var exports_helpers = {};
 __export(exports_helpers, {
@@ -11628,7 +11685,8 @@ function output(data, jsonMode) {
 function formatTaskLine(t) {
   const statusFn = statusColors[t.status] || chalk.white;
   const priorityFn = priorityColors[t.priority] || chalk.white;
-  const lock = t.locked_by ? chalk.magenta(` [locked:${t.locked_by}]`) : "";
+  const lockState = lockDisplayState(t.locked_by, t.locked_at);
+  const lock = lockState.held ? chalk.magenta(` [locked:${lockState.holder}]`) : "";
   const assigned = t.assigned_to ? chalk.cyan(` -> ${t.assigned_to}`) : "";
   const tags = t.tags.length > 0 ? chalk.dim(` [${t.tags.join(",")}]`) : "";
   const plan = t.plan_id ? chalk.magenta(` [plan:${t.plan_id.slice(0, 8)}]`) : "";
@@ -11639,6 +11697,7 @@ var init_helpers = __esm(() => {
   init_cloud_router();
   init_database();
   init_projects();
+  init_lock_display();
   init_package_version();
   stdoutRetryBuffer = new SharedArrayBuffer(4);
   stdoutRetrySignal = new Int32Array(stdoutRetryBuffer);
@@ -14865,7 +14924,7 @@ function assertStartable(task, agentId) {
     return;
   if (task.status === "in_progress")
     return;
-  throw new Error(`Task is ${task.status} and cannot be started by ${agentId}`);
+  throw new TaskNotStartableError(task.id, task.status, agentId);
 }
 function getBlockingDeps(id, db) {
   const d = db || getDatabase();
@@ -14936,7 +14995,7 @@ function completeTask(id, agentId, db, options) {
   if (task.status === "cancelled") {
     throw new Error(`Task ${id} is cancelled and cannot be completed`);
   }
-  if (agentId && task.locked_by && !sameHolder(task.locked_by, agentId) && !isLockExpired(task.locked_at)) {
+  if (task.locked_by && !sameHolder(task.locked_by, agentId) && !isLockExpired(task.locked_at)) {
     throw new LockError(id, task.locked_by);
   }
   checkCompletionGuard(task, agentId || null, d);
@@ -15571,6 +15630,30 @@ function getTaskWithRelations(id, db) {
     checklist
   };
 }
+function resolveAssignedToAliases(db, ref) {
+  const aliases = new Set([ref]);
+  let agentId;
+  try {
+    agentId = resolvePartialId(db, "agents", ref);
+  } catch (err) {
+    if (!(err instanceof IdentityAliasAmbiguousError))
+      throw err;
+    agentId = null;
+  }
+  if (agentId) {
+    aliases.add(agentId);
+    const row = db.query("SELECT name FROM agents WHERE id = ?").get(agentId);
+    if (row?.name)
+      aliases.add(row.name);
+  }
+  return [...aliases];
+}
+function lowerInClause(column, values, params) {
+  if (values.length === 0)
+    return "1=0";
+  params.push(...values.map((v) => v.toLowerCase()));
+  return `LOWER(${column}) IN (${values.map(() => "?").join(",")})`;
+}
 function listTasks(filter = {}, db) {
   const d = db || getDatabase();
   const { clearExpiredLocks: clearExpiredLocks2 } = (init_database(), __toCommonJS(exports_database));
@@ -15612,8 +15695,7 @@ function listTasks(filter = {}, db) {
     }
   }
   if (filter.assigned_to) {
-    conditions.push("assigned_to = ?");
-    params.push(filter.assigned_to);
+    conditions.push(lowerInClause("assigned_to", resolveAssignedToAliases(d, filter.assigned_to), params));
   }
   if (filter.agent_id) {
     conditions.push("agent_id = ?");
@@ -15773,8 +15855,7 @@ function countTasks(filter = {}, db) {
     }
   }
   if (filter.assigned_to) {
-    conditions.push("assigned_to = ?");
-    params.push(filter.assigned_to);
+    conditions.push(lowerInClause("assigned_to", resolveAssignedToAliases(d, filter.assigned_to), params));
   }
   if (filter.agent_id) {
     conditions.push("agent_id = ?");
@@ -19009,10 +19090,11 @@ function validateAssignee(input, ctx) {
     if (ctx.allowSeat) {
       return { ok: true, assignee: byId ? byId.name : raw, agentId: byId?.id, isSeat: true };
     }
+    const hint = ctx.seatHint?.(raw);
     return {
       ok: false,
       reason: "seat",
-      message: `'${raw}' is a durable SEAT, and a task assigned to a seat is assigned to nobody \u2014 no session is watching that queue. ` + `Assign a specific agent, use --unassigned to file it with no owner on purpose, or pass --assign-seat if filing at the seat is what you mean.`
+      message: `'${raw}' is a durable SEAT, and a task assigned to a seat is assigned to nobody \u2014 no session is watching that queue. ` + `Assign a specific agent, use --unassigned to file it with no owner on purpose, or repeat the command with --assign-seat added to confirm the seat is deliberate` + (hint ? `: ${hint}` : " (see --help for this command's exact form).")
     };
   }
   if (byId) {
@@ -19740,10 +19822,10 @@ var init_agents = __esm(() => {
 
 // src/cli/assignee-guard.ts
 import chalk2 from "chalk";
-async function resolveValidatedAssignee(value, allowSeat) {
+async function resolveValidatedAssignee(value, allowSeat, buildSeatHint) {
   const cloud = getTodosCloudClient();
   const ctx = await loadAssigneeContext(() => cloud ? cloudListAgents(cloud) : listAgents(), allowSeat);
-  const verdict = validateAssignee(value, ctx);
+  const verdict = validateAssignee(value, { ...ctx, seatHint: buildSeatHint });
   if (!verdict.ok) {
     handleError(new Error(`Cannot assign to '${value}'. ${verdict.message}`));
   }
@@ -20263,7 +20345,7 @@ function registerTaskCommands(program2) {
     opts.list = opts.list || opts.taskList;
     const creator = resolveCreatorIdentity(opts.createdBy || globalOpts.agent);
     const router = resolveWritableIdentity(opts.createdBy || globalOpts.agent);
-    const requestedAssign = opts.assign ? await resolveValidatedAssignee(opts.assign, Boolean(opts.assignSeat)) : undefined;
+    const requestedAssign = opts.assign ? await resolveValidatedAssignee(opts.assign, Boolean(opts.assignSeat), (v) => `--assign ${v} --assign-seat`) : undefined;
     const assignee = requestedAssign || (opts.unassigned ? undefined : router.agent_id || undefined);
     if (!assignee && !opts.unassigned) {
       console.error(chalk3.yellow("Warning: task is ownerless and unattributable \u2014 export TODOS_AGENT_ID=<name> for this session, or pass --agent/--assign <agent> or --unassigned."));
@@ -20366,7 +20448,7 @@ function registerTaskCommands(program2) {
     opts.tags = opts.tags || opts.tag;
     opts.list = opts.list || opts.taskList;
     if (opts.assign) {
-      opts.assign = await resolveValidatedAssignee(opts.assign, Boolean(opts.assignSeat));
+      opts.assign = await resolveValidatedAssignee(opts.assign, Boolean(opts.assignSeat), (v) => `--assign ${v} --assign-seat`);
     }
     const explicitProject = opts.project || globalOpts.project;
     const cloud = getTodosCloudClient();
@@ -20736,8 +20818,11 @@ function registerTaskCommands(program2) {
       console.log(`  ${chalk3.dim("Agent:")}    ${task2.agent_id}`);
     if (task2.session_id)
       console.log(`  ${chalk3.dim("Session:")}  ${task2.session_id}`);
-    if (task2.locked_by)
-      console.log(`  ${chalk3.dim("Locked:")}   ${task2.locked_by} (at ${task2.locked_at})`);
+    const showLock = lockDisplayState(task2.locked_by, task2.locked_at);
+    if (showLock.held)
+      console.log(`  ${chalk3.dim("Locked:")}   ${showLock.holder} (at ${showLock.lockedAt})`);
+    else if (showLock.expired)
+      console.log(`  ${chalk3.dim("Lock:")}     ${chalk3.dim(formatExpiredLock(showLock))}`);
     if (task2.requires_approval) {
       const approvalStatus = task2.approved_by ? chalk3.green(`approved by ${task2.approved_by}`) : chalk3.yellow("pending approval");
       console.log(`  ${chalk3.dim("Approval:")} ${approvalStatus}`);
@@ -20880,8 +20965,11 @@ ${chalk3.cyan(sid)} ${statusColor(task2.status)} ${prioColor(task2.priority)} ${
     }
     if (task2.assigned_to)
       console.log(`  ${chalk3.dim("Assigned:")}  ${task2.assigned_to}`);
-    if (task2.locked_by)
-      console.log(`  ${chalk3.dim("Locked by:")} ${task2.locked_by}`);
+    const inspectLock = lockDisplayState(task2.locked_by, task2.locked_at);
+    if (inspectLock.held)
+      console.log(`  ${chalk3.dim("Locked by:")} ${inspectLock.holder}`);
+    else if (inspectLock.expired)
+      console.log(`  ${chalk3.dim("Lock:")}      ${chalk3.dim(formatExpiredLock(inspectLock))}`);
     if (task2.project_id)
       console.log(`  ${chalk3.dim("Project:")}   ${task2.project_id}`);
     if (task2.plan_id)
@@ -21021,7 +21109,7 @@ ${chalk3.cyan(sid)} ${statusColor(task2.status)} ${prioColor(task2.priority)} ${
       handleError(new Error("Use either --working-dir or --clear-working-dir, not both."));
     }
     if (opts.assign) {
-      opts.assign = await resolveValidatedAssignee(opts.assign, Boolean(opts.assignSeat));
+      opts.assign = await resolveValidatedAssignee(opts.assign, Boolean(opts.assignSeat), (v) => `--assign ${v} --assign-seat`);
     }
     const cloud = getTodosCloudClient();
     if (cloud) {
@@ -21189,10 +21277,12 @@ ${chalk3.cyan(sid)} ${statusColor(task2.status)} ${prioColor(task2.priority)} ${
     };
     const cloud = getTodosCloudClient();
     if (cloud) {
+      const resolvedId2 = await resolveTaskIdForCommand(id, cloud);
+      const agentId2 = resolveClaimIdentity("complete", globalOpts.agent);
       let task3;
       try {
-        task3 = await cloudCompleteTask(cloud, await resolveTaskIdForCommand(id, cloud), {
-          ...globalOpts.agent ? { agent_id: globalOpts.agent } : {},
+        task3 = await cloudCompleteTask(cloud, resolvedId2, {
+          agent_id: agentId2,
           ...completionOptions
         });
       } catch (e) {
@@ -21207,9 +21297,10 @@ ${chalk3.cyan(sid)} ${statusColor(task2.status)} ${prioColor(task2.priority)} ${
       return;
     }
     const resolvedId = resolveTaskId(id);
+    const agentId = resolveClaimIdentity("complete", globalOpts.agent);
     let task2;
     try {
-      task2 = completeTask(resolvedId, globalOpts.agent, undefined, completionOptions);
+      task2 = completeTask(resolvedId, agentId, undefined, completionOptions);
     } catch (e) {
       handleError(e);
     }
@@ -21492,6 +21583,7 @@ var init_task_commands = __esm(() => {
   init_task_lists();
   init_cloud_router();
   init_creator_identity();
+  init_lock_display();
   init_claim_guard();
   init_assignee_guard();
   init_helpers();
@@ -26176,6 +26268,12 @@ function countProjectTasks(projectId) {
      FROM tasks
      WHERE project_id = ?`).get(projectId);
 }
+function countTasksForDeregistration(tasks) {
+  return {
+    total: tasks.length,
+    incomplete: tasks.filter((task) => task.status !== "completed" && task.status !== "cancelled").length
+  };
+}
 function pathIsWithinPrefix(projectPath, prefix) {
   const normalizedPath = resolve13(projectPath);
   const normalizedPrefix = resolve13(prefix);
@@ -26651,11 +26749,8 @@ function registerProjectCommands(program2) {
       return;
     }
     if (opts.deregister) {
-      if (cloud) {
-        handleError(new Error("REMOTE_COMMAND_UNSUPPORTED: projects --deregister has no safe /v1 equivalent; local SQLite fallback is disabled"));
-      }
-      const project = resolveExplicitProject(opts.deregister);
-      const counts = countProjectTasks(project.id);
+      const project = cloud ? await cloudResolveProject(cloud, opts.deregister) : resolveExplicitProject(opts.deregister);
+      const counts = cloud ? countTasksForDeregistration(await cloudListTasks(cloud, { project_id: project.id, include_subtasks: true })) : countProjectTasks(project.id);
       if (opts.pathPrefix && !pathIsWithinPrefix(project.path, opts.pathPrefix)) {
         handleError(new Error(`Refusing to deregister ${project.name}: path ${project.path} is not within ${opts.pathPrefix}`));
       }
@@ -26672,7 +26767,10 @@ function registerProjectCommands(program2) {
         tasks_preserved: true
       };
       if (!opts.dryRun) {
-        deleteProject(project.id);
+        if (cloud)
+          await cloudDeleteProject(cloud, project.id);
+        else
+          deleteProject(project.id);
       }
       if (globalOpts.json) {
         output(result, true);
@@ -31438,7 +31536,16 @@ class PostgresJsonRecordStore {
       updatedAt: stringValue2(row.updated_at) ?? new Date().toISOString()
     }));
   }
-  buildTaskFilterSql(filter) {
+  async resolveAssignedToAliases(ref) {
+    const agent = await resolveAgentForAssignedFilter(ref, this);
+    const aliases = new Set([ref]);
+    if (agent) {
+      aliases.add(agent.id);
+      aliases.add(agent.name);
+    }
+    return [...aliases];
+  }
+  async buildTaskFilterSql(filter) {
     const params = [this.service, "tasks"];
     const conds = ["service = $1", "object_type = $2", "deleted_at IS NULL"];
     const p = (value) => {
@@ -31464,8 +31571,10 @@ class PostgresJsonRecordStore {
       conds.push(inClause("payload->>'status'", toFilterArray(filter.status)));
     if (filter.priority !== undefined)
       conds.push(inClause("payload->>'priority'", toFilterArray(filter.priority)));
-    if (filter.assigned_to !== undefined)
-      conds.push(`payload->>'assigned_to' = ${p(filter.assigned_to)}`);
+    if (filter.assigned_to !== undefined) {
+      const aliases = [...new Set((await this.resolveAssignedToAliases(filter.assigned_to)).map((a) => a.toLowerCase()))];
+      conds.push(inClause("LOWER(payload->>'assigned_to')", aliases));
+    }
     if (filter.agent_id !== undefined)
       conds.push(`payload->>'agent_id' = ${p(filter.agent_id)}`);
     if (filter.created_by !== undefined)
@@ -31499,7 +31608,7 @@ class PostgresJsonRecordStore {
   }
   async listTasks(filter) {
     await this.ensureSchema();
-    const { where, params, queryRef } = this.buildTaskFilterSql(filter);
+    const { where, params, queryRef } = await this.buildTaskFilterSql(filter);
     const orderBy = queryRef ? `ORDER BY ts_rank_cd(task_search_tsv, websearch_to_tsquery('simple', todos_immutable_unaccent(${queryRef}))) DESC, ${TASK_ORDER_TIEBREAK}` : TASK_ORDER_BY;
     let sql = `/* todos:list-tasks */ SELECT payload FROM ${this.tableName} WHERE ${where} ${orderBy}`;
     if (filter.limit !== undefined) {
@@ -31559,7 +31668,7 @@ class PostgresJsonRecordStore {
   }
   async countTasks(filter) {
     await this.ensureSchema();
-    const { where, params } = this.buildTaskFilterSql(filter);
+    const { where, params } = await this.buildTaskFilterSql(filter);
     const sql = `/* todos:count-tasks */ SELECT COUNT(*)::int AS count FROM ${this.tableName} WHERE ${where}`;
     const result = await this.options.client.query(sql, params);
     return Number(result.rows[0]?.count ?? 0);
@@ -31720,9 +31829,13 @@ class PostgresJsonRecordStore {
     } : {};
     const hasEvidence = Object.keys(evidence).length > 0;
     const hasConfidence = options?.confidence !== undefined;
-    const result = await this.options.client.query(`/* todos:complete-task-atomic */ UPDATE ${this.tableName}
+    const lockExpiryCutoff2 = new Date(new Date(operationTimestamp).getTime() - CLOUD_LOCK_EXPIRY_MINUTES * 60 * 1000).toISOString();
+    const result = await this.options.client.query(`/* todos:complete-task-atomic todos:complete-task-lock-guard todos:complete-task-clears-lock */
+       UPDATE ${this.tableName}
        SET payload = payload || jsonb_build_object(
          'status', 'completed',
+         'locked_by', 'null'::jsonb,
+         'locked_at', 'null'::jsonb,
          'assigned_to', CASE
            WHEN jsonb_typeof(payload->'assigned_to') = 'string' THEN payload->'assigned_to'
            ELSE COALESCE(to_jsonb($3::text), 'null'::jsonb)
@@ -31750,6 +31863,16 @@ class PostgresJsonRecordStore {
        updated_at = $9::timestamptz,
        version = COALESCE(version, 0) + 1
        WHERE service = $1 AND object_type = 'tasks' AND object_id = $2 AND deleted_at IS NULL
+         AND (
+           payload->>'locked_by' IS NULL
+           OR BTRIM(payload->>'locked_by') = ''
+           OR payload->>'locked_at' IS NULL
+           OR payload->>'locked_at' < $10::text
+           OR (
+             $3::text IS NOT NULL
+             AND LOWER(BTRIM(payload->>'locked_by')) = LOWER(BTRIM($3::text))
+           )
+         )
        RETURNING payload`, [
       this.service,
       id,
@@ -31759,7 +31882,8 @@ class PostgresJsonRecordStore {
       jsonbParam(evidence),
       hasConfidence,
       options?.confidence ?? null,
-      operationTimestamp
+      operationTimestamp,
+      lockExpiryCutoff2
     ]);
     return result.rows[0] ? payloadRecord2(result.rows[0].payload) : null;
   }
@@ -32040,6 +32164,7 @@ async function updateTask2(id, input, store) {
   if (existing.version !== input.version) {
     throw new Error(`Task ${id} version conflict: expected ${existing.version}, got ${input.version}`);
   }
+  const reopened = existing.status === "completed" && input.status !== undefined && input.status !== "completed" && input.completed_at === undefined;
   const task = {
     ...existing,
     ...definedPatch(input),
@@ -32049,7 +32174,8 @@ async function updateTask2(id, input, store) {
     metadata: input.metadata ?? existing.metadata,
     requires_approval: input.requires_approval ?? existing.requires_approval,
     task_list_id: input.task_list_id !== undefined ? input.task_list_id : existing.task_list_id,
-    created_by: existing.created_by
+    created_by: existing.created_by,
+    completed_at: reopened ? null : input.completed_at !== undefined ? input.completed_at : existing.completed_at
   };
   await store.upsert("tasks", task);
   return task;
@@ -32057,11 +32183,11 @@ async function updateTask2(id, input, store) {
 async function startTask2(id, agentId, store) {
   const task = await requireRecord("tasks", id, store);
   if (task.status !== "pending" && task.status !== "in_progress") {
-    throw new Error(`Task is ${task.status} and cannot be started by ${agentId}`);
+    throw new TaskNotStartableError(task.id, task.status, agentId);
   }
   const started = await patchTask(task, {
     status: "in_progress",
-    assigned_to: task.assigned_to ?? agentId,
+    assigned_to: task.assigned_to || agentId,
     agent_id: task.agent_id ?? agentId,
     locked_by: agentId,
     locked_at: new Date().toISOString(),
@@ -32072,8 +32198,13 @@ async function startTask2(id, agentId, store) {
 }
 async function completeTask2(id, agentId, options, store) {
   const task = await store.completeTask(id, agentId, options);
-  if (!task)
+  if (!task) {
+    const current = await store.get("tasks", id);
+    if (current?.locked_by && !cloudLockExpired(current.locked_at) && !sameCloudLockHolder(current.locked_by, agentId)) {
+      throw new LockError(id, current.locked_by);
+    }
     throw new Error(`tasks record not found: ${id}`);
+  }
   return task;
 }
 async function failTask2(id, agentId, reason, options, store) {
@@ -32114,6 +32245,11 @@ async function patchTask(task, patch, store) {
   await store.upsert("tasks", updated);
   return updated;
 }
+function sameCloudLockHolder(stored, incoming) {
+  if (!stored || !incoming)
+    return false;
+  return canonicalAgentRef(stored) === canonicalAgentRef(incoming);
+}
 function cloudLockExpired(lockedAt) {
   if (!lockedAt)
     return true;
@@ -32431,6 +32567,16 @@ async function resolveAgent(idOrName, store) {
     return byId;
   return matchAgentByName(await store.list("agents"), idOrName);
 }
+async function resolveAgentForAssignedFilter(idOrName, store) {
+  const byId = await store.get("agents", idOrName);
+  if (byId)
+    return byId;
+  const target = normalizeAgentNameInput(idOrName);
+  if (!target)
+    return null;
+  const matches = (await store.list("agents")).filter((agent) => normalizeAgentNameInput(agent.name) === target);
+  return matches.length === 1 ? matches[0] : null;
+}
 async function heartbeatAgent(idOrName, store, context) {
   const agent = await resolveAgent(idOrName, store);
   if (!agent)
@@ -32746,6 +32892,7 @@ function postgresConstraintName(error) {
 var CLOUD_LOCK_EXPIRY_MINUTES = 30, TASK_ORDER_TIEBREAK = "CASE payload->>'priority' WHEN 'critical' THEN 0 WHEN 'high' THEN 1 WHEN 'medium' THEN 2 WHEN 'low' THEN 3 ELSE 4 END ASC, payload->>'created_at' ASC, payload->>'id' ASC", TASK_ORDER_BY;
 var init_postgres_adapter = __esm(() => {
   init_types();
+  init_creator_identity();
   init_postgres_sync();
   init_integrity();
   init_redaction();
@@ -34235,7 +34382,10 @@ function mapTaskError(e, json2) {
       retry_after: e.retryAfterSeconds ?? null
     }, 409);
   }
-  if (e instanceof Error && (/ is blocked by /.test(e.message) || /cannot be started/.test(e.message))) {
+  if (e instanceof TaskNotStartableError) {
+    return json2({ error: e.message, code: TaskNotStartableError.code }, 409);
+  }
+  if (e instanceof Error && / is blocked by /.test(e.message)) {
     return json2({ error: e.message, code: "TASK_NOT_STARTABLE" }, 409);
   }
   return null;
@@ -38800,6 +38950,9 @@ async function handleV1Request(req, url, dependencies = {}) {
     }
     if (e instanceof LockError)
       return error(409, e.message, { code: LockError.code });
+    if (e instanceof TaskNotStartableError) {
+      return error(409, e.message, { code: TaskNotStartableError.code });
+    }
     if (e instanceof ResourceConflictError)
       return error(409, e.message, { code: e.code, conflict: true });
     if (e instanceof ProjectNotFoundError)
@@ -62408,6 +62561,8 @@ var init_workflow_prompts2 = __esm(() => {
 // src/mcp/index.ts
 var exports_mcp = {};
 __export(exports_mcp, {
+  formatTaskDetail: () => formatTaskDetail,
+  formatTask: () => formatTask,
   buildServer: () => buildServer,
   applyFocus: () => applyFocus
 });
@@ -62556,7 +62711,8 @@ function resolveId(partialId, table = "tasks") {
 function formatTask(task2) {
   const id = task2.short_id || task2.id.slice(0, 8);
   const assigned = task2.assigned_to ? ` -> ${task2.assigned_to}` : "";
-  const lock = task2.locked_by ? ` [locked:${task2.locked_by}]` : "";
+  const lockState = lockDisplayState(task2.locked_by, task2.locked_at);
+  const lock = lockState.held ? ` [locked:${lockState.holder}]` : "";
   const recur = task2.recurrence_rule ? ` [\u21BB]` : "";
   return `${id} ${task2.status.padEnd(11)} ${task2.priority.padEnd(8)} ${task2.title}${assigned}${lock}${recur}`;
 }
@@ -62575,8 +62731,11 @@ function formatTaskDetail(task2, maxDescriptionChars) {
     parts.push(`Assigned to: ${task2.assigned_to}`);
   if (task2.agent_id)
     parts.push(`Agent: ${task2.agent_id}`);
-  if (task2.locked_by)
-    parts.push(`Locked by: ${task2.locked_by}`);
+  const detailLock = lockDisplayState(task2.locked_by, task2.locked_at);
+  if (detailLock.held)
+    parts.push(`Locked by: ${detailLock.holder}`);
+  else if (detailLock.expired)
+    parts.push(`Lock: ${formatExpiredLock(detailLock)}`);
   if (task2.parent_id)
     parts.push(`Parent: ${task2.parent_id}`);
   if (task2.project_id)
@@ -62660,6 +62819,7 @@ var agentFocusMap, isDirectRun;
 var init_mcp2 = __esm(() => {
   init_agents();
   init_database();
+  init_lock_display();
   init_types();
   init_dispatch2();
   init_task_crud2();
@@ -63705,7 +63865,7 @@ function TaskList({ tasks, selectedIndex }) {
               task2.assigned_to
             ]
           }, undefined, true, undefined, this),
-          task2.locked_by && /* @__PURE__ */ jsxDEV2(Text2, {
+          lockDisplayState(task2.locked_by, task2.locked_at).held && /* @__PURE__ */ jsxDEV2(Text2, {
             color: "magenta",
             children: [
               " \uD83D\uDD12",
@@ -63727,6 +63887,7 @@ function TaskList({ tasks, selectedIndex }) {
 }
 var statusIcons, statusColors2, priorityLabels, priorityColors2;
 var init_TaskList = __esm(() => {
+  init_lock_display();
   statusIcons = {
     pending: "\u25CB",
     in_progress: "\u25D0",
@@ -63889,7 +64050,7 @@ function TaskDetail({ task: task2 }) {
               }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this),
-          task2.locked_by && /* @__PURE__ */ jsxDEV3(Box3, {
+          lockDisplayState(task2.locked_by, task2.locked_at).held && /* @__PURE__ */ jsxDEV3(Box3, {
             children: [
               /* @__PURE__ */ jsxDEV3(Text3, {
                 dimColor: true,
@@ -63906,6 +64067,18 @@ function TaskDetail({ task: task2 }) {
               }, undefined, true, undefined, this)
             ]
           }, undefined, true, undefined, this),
+          lockDisplayState(task2.locked_by, task2.locked_at).expired && /* @__PURE__ */ jsxDEV3(Box3, {
+            children: [
+              /* @__PURE__ */ jsxDEV3(Text3, {
+                dimColor: true,
+                children: "Lock:     "
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsxDEV3(Text3, {
+                dimColor: true,
+                children: formatExpiredLock(lockDisplayState(task2.locked_by, task2.locked_at))
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this),
           task2.tags.length > 0 && /* @__PURE__ */ jsxDEV3(Box3, {
             children: [
               /* @__PURE__ */ jsxDEV3(Text3, {
@@ -64108,6 +64281,7 @@ function TaskDetail({ task: task2 }) {
 }
 var statusColors3;
 var init_TaskDetail = __esm(() => {
+  init_lock_display();
   statusColors3 = {
     pending: "yellow",
     in_progress: "blue",
@@ -68182,7 +68356,7 @@ No task claimed (nothing available).`));
   });
   program2.command("assign <id> <agent>").description("Assign a task to an agent").option("-j, --json", "Output as JSON").option("--assign-seat", "Allow <agent> to name a durable seat (a seat queue has no session watching it)").action(async (id, agentInput, opts) => {
     const globalOpts = program2.opts();
-    const agent = await resolveValidatedAssignee(agentInput, Boolean(opts.assignSeat));
+    const agent = await resolveValidatedAssignee(agentInput, Boolean(opts.assignSeat), (v) => `${id} ${v} --assign-seat`);
     const cloud = getTodosCloudClient();
     if (cloud) {
       try {